From f90be5cdeec5875d1022e1ef35f5b101bd76ac84 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Oct 2012 07:46:53 +0000 Subject: service call replaced with the direct function call git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/src/parse_miranda.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Variables/src/parse_miranda.cpp') diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 926f7fb67b..f5492eea77 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -554,7 +554,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) hMatchEvent = hSearchEvent = hSearchContact = NULL; matchTimestamp = priorTimestamp = 0; if (flags & DBE_FIRST) { - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + hSearchContact = db_find_first(); do { hSearchEvent = findDbEvent(hSearchContact, NULL, flags); dbe.cbBlob = 0; @@ -564,12 +564,12 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) matchTimestamp = dbe.timestamp; } } - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hSearchContact, 0); + hSearchContact = db_find_next(hSearchContact); } while (hSearchContact); hDbEvent = hMatchEvent; } else if (flags&DBE_LAST) { - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + hSearchContact = db_find_first(); do { hSearchEvent = findDbEvent(hSearchContact, NULL, flags); dbe.cbBlob = 0; @@ -579,7 +579,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) matchTimestamp = dbe.timestamp; } } - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hSearchContact, 0); + hSearchContact = db_find_next(hSearchContact); } while (hSearchContact); hDbEvent = hMatchEvent; } @@ -587,7 +587,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) dbe.cbBlob = 0; if (!CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbe)) { priorTimestamp = dbe.timestamp; - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + hSearchContact = db_find_first(); do { hSearchEvent = findDbEvent(hSearchContact, hDbEvent, flags); dbe.cbBlob = 0; @@ -597,7 +597,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) matchTimestamp = dbe.timestamp; } } - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hSearchContact, 0); + hSearchContact = db_find_next(hSearchContact); } while (hSearchContact); hDbEvent = hMatchEvent; } @@ -605,7 +605,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) else if (flags&DBE_PREV) { if (!CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbe)) { priorTimestamp = dbe.timestamp; - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + hSearchContact = db_find_first(); do { hSearchEvent = findDbEvent(hSearchContact, hDbEvent, flags); dbe.cbBlob = 0; @@ -615,7 +615,7 @@ static HANDLE findDbEvent(HANDLE hContact, HANDLE hDbEvent, int flags) matchTimestamp = dbe.timestamp; } } - hSearchContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hSearchContact, 0); + hSearchContact = db_find_next(hSearchContact); } while (hSearchContact); hDbEvent = hMatchEvent; } -- cgit v1.2.3