October 2013 - Wine-Commits

Jacek Caban : crypt32: Clone CRL context instead of using link in CertAddCRLContextToStore.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 0f57425a8ff0e16b8eaab9e03af73dcb1d40fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f57425a8ff0e16b8eaab9e03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:58:38 2013 +0200 crypt32: Clone CRL context instead of using link in CertAddCRLContextToStore. --- dlls/crypt32/crl.c | 39 ++++++++++++++++++++++++++++++++------- dlls/crypt32/store.c | 2 +- dlls/crypt32/tests/crl.c | 20 +++++++++++++++++++- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 4686e11..8eb587a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -37,19 +37,44 @@ static void CRL_free(context_t *context) LocalFree(crl->ctx.pCrlInfo); } +static const context_vtbl_t crl_vtbl; + static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store, BOOL use_link) { crl_t *crl; - if(!use_link) { - FIXME("Only links supported\n"); - return NULL; + if(use_link) { + crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); + if(!crl) + return NULL; + }else { + const crl_t *cloned = (const crl_t*)context; + void *new_context; + DWORD size = 0; + BOOL res; + + new_context = Context_CreateDataContext(sizeof(CRL_CONTEXT), &crl_vtbl, store); + if(!new_context) + return NULL; + crl = crl_from_ptr(new_context); + + Context_CopyProperties(&crl->ctx, &cloned->ctx); + + crl->ctx.dwCertEncodingType = cloned->ctx.dwCertEncodingType; + crl->ctx.pbCrlEncoded = CryptMemAlloc(cloned->ctx.cbCrlEncoded); + memcpy(crl->ctx.pbCrlEncoded, cloned->ctx.pbCrlEncoded, cloned->ctx.cbCrlEncoded); + crl->ctx.cbCrlEncoded = cloned->ctx.cbCrlEncoded; + + /* FIXME: We don't need to decode the object here, we could just clone crl info. */ + res = CryptDecodeObjectEx(crl->ctx.dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + crl->ctx.pbCrlEncoded, crl->ctx.cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + &crl->ctx.pCrlInfo, &size); + if(!res) { + CertFreeCRLContext(&crl->ctx); + return NULL; + } } - crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context, store); - if(!crl) - return NULL; - crl->ctx.hCertStore = store; return &crl->base; } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 70c9150..7e22b95 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1074,7 +1074,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, if (store) { context_t *ret_context; ret = store->vtbl->crls.addContext(store, context_from_ptr(toAdd), - existing ? context_from_ptr(existing) : NULL, ppStoreContext ? &ret_context : NULL, TRUE); + existing ? context_from_ptr(existing) : NULL, ppStoreContext ? &ret_context : NULL, FALSE); if (ret && ppStoreContext) *ppStoreContext = context_ptr(ret_context); }else if (ppStoreContext) { diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index f39d02e..9515c38 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -144,7 +144,7 @@ static void testAddCRL(void) { HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - PCCRL_CONTEXT context; + PCCRL_CONTEXT context, context2; BOOL ret; DWORD GLE; @@ -229,6 +229,24 @@ static void testAddCRL(void) ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed\n"); + + context = CertCreateCRLContext(X509_ASN_ENCODING, CRL, sizeof(CRL)); + ok(context != NULL, "CertCreateCRLContext failed\n"); + + ret = CertAddCRLContextToStore(store, context, CERT_STORE_ADD_NEW, &context2); + ok(ret, "CertAddCRLContextToStore failed\n"); + ok(context2 != NULL && context2 != context, "unexpected context2\n"); + + ok(context->pbCrlEncoded != context2->pbCrlEncoded, "Unexpected pbCrlEncoded\n"); + ok(context->cbCrlEncoded == context2->cbCrlEncoded, "Unexpected cbCrlEncoded\n"); + ok(context->pCrlInfo != context2->pCrlInfo, "Unexpected pCrlInfo\n"); + + CertFreeCRLContext(context2); + CertFreeCRLContext(context); + CertCloseStore(store, 0); } static const BYTE v1CRLWithIssuerAndEntry[] = { 0x30, 0x44, 0x30, 0x02, 0x06,

1 0

Dmitry Timoshkov : kernel32/tests: Fix FormatMessage tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: d44cc84381604fc0708caa366c6921a3e4a2910d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44cc84381604fc0708caa366… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:59 2013 +0900 kernel32/tests: Fix FormatMessage tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/format_msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 005e6c4..e98e083 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1543,7 +1543,7 @@ static void test_message_from_hmodule(void) HMODULE h; CHAR out[0x100] = {0}; - h = GetModuleHandle("kernel32.dll"); + h = GetModuleHandleA("kernel32.dll"); ok(h != 0, "GetModuleHandle failed\n"); /*Test existing messageID; as the message strings from wine's kernel32 differ from windows' kernel32 we don't compare

1 0

Dmitry Timoshkov : kernel32/tests: Fix fiber tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: f8fbe80cc724b017990f8079d24fdb98760957a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8fbe80cc724b017990f8079d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:46 2013 +0900 kernel32/tests: Fix fiber tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/fiber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 0e68535..96f60d0 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -39,7 +39,7 @@ static WORD cbCount; static VOID init_funcs(void) { - HMODULE hKernel32 = GetModuleHandle("kernel32"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); X(CreateFiber);

1 0

Dmitry Timoshkov : kernel32/tests: Fix file change notification tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 93a54c03be3942515e9b83594d5091b6991096a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a54c03be3942515e9b83594… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:34 2013 +0900 kernel32/tests: Fix file change notification tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/change.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 6142e43..9226950 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -426,7 +426,7 @@ static void test_readdirectorychanges(void) OPEN_EXISTING, fflags, NULL); ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - ov.hEvent = CreateEvent( NULL, 1, 0, NULL ); + ov.hEvent = CreateEventW( NULL, 1, 0, NULL ); SetLastError(0xd0b00b00); r = pReadDirectoryChangesW(hdir,NULL,0,FALSE,0,NULL,NULL,NULL); @@ -644,7 +644,7 @@ static void test_readdirectorychanges_null(void) OPEN_EXISTING, fflags, NULL); ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - ov.hEvent = CreateEvent( NULL, 1, 0, NULL ); + ov.hEvent = CreateEventW( NULL, 1, 0, NULL ); filter = FILE_NOTIFY_CHANGE_FILE_NAME; filter |= FILE_NOTIFY_CHANGE_DIR_NAME; @@ -733,7 +733,7 @@ static void test_readdirectorychanges_filedir(void) DeleteFileW( file ); RemoveDirectoryW( subdir ); RemoveDirectoryW( path ); - + r = CreateDirectoryW(path, NULL); ok( r == TRUE, "failed to create directory\n"); @@ -743,7 +743,7 @@ static void test_readdirectorychanges_filedir(void) OPEN_EXISTING, fflags, NULL); ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); - ov.hEvent = CreateEvent( NULL, 0, 0, NULL ); + ov.hEvent = CreateEventW( NULL, 0, 0, NULL ); filter = FILE_NOTIFY_CHANGE_FILE_NAME; @@ -1088,7 +1088,7 @@ static void test_ffcn_directory_overlap(void) START_TEST(change) { - HMODULE hkernel32 = GetModuleHandle("kernel32"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW"); test_ffcnMultipleThreads();

1 0

Dmitry Timoshkov : kernel32/test: Fix activation context tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 519e2d8a9847e66f7b9ac5f81353d34c17fa873c URL: http://source.winehq.org/git/wine.git/?a=commit;h=519e2d8a9847e66f7b9ac5f81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:29 2013 +0900 kernel32/test: Fix activation context tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/actctx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ff0e481..19bab72 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2001,7 +2001,7 @@ static void run_child_process(void) char path[MAX_PATH]; char **argv; PROCESS_INFORMATION pi; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; HANDLE file; FILETIME now; BOOL ret; @@ -2025,7 +2025,7 @@ static void run_child_process(void) CloseHandle(file); } sprintf(cmdline, "\"%s\" %s manifest1", argv[0], argv[1]); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); winetest_wait_child_process( pi.hProcess ); CloseHandle(pi.hThread); @@ -2125,7 +2125,7 @@ todo_wine static BOOL init_funcs(void) { - HMODULE hKernel32 = GetModuleHandle("kernel32"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); #define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE; X(ActivateActCtx);

1 0

Alexandre Julliard : wineconsole: Avoid an empty for loop.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: ded5ad8a8ce3acfc85d6c4da834013b333acf986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded5ad8a8ce3acfc85d6c4da8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 20:23:39 2013 +0200 wineconsole: Avoid an empty for loop. --- programs/wineconsole/dialog.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index d69432e..8ca6563 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -369,12 +369,13 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, if (WCUSER_ValidateFontMetric(di->data, tm, FontType)) { - int idx; + int idx = 0; /* we want the string to be sorted with a numeric order, not a lexicographic... * do the job by hand... get where to insert the new string */ - for (idx = 0; idx < di->nFont && tm->tmHeight > di->font[idx].height; idx++); + while (idx < di->nFont && tm->tmHeight > di->font[idx].height) + idx++; while (idx < di->nFont && tm->tmHeight == di->font[idx].height && tm->tmWeight > di->font[idx].weight)

1 0

Alexandre Julliard : user32: Fix the scope of a local variable.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 6d0d7e08e51f6dd5870a0b20d2a5b3f2419f2381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0d7e08e51f6dd5870a0b20d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:20 2013 +0200 user32: Fix the scope of a local variable. --- dlls/user32/message.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b6720fb..d09e5dd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1999,6 +1999,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL hunlock = 0; int i; DWORD res; + ULONGLONG hpack; if (!UnpackDDElParam( info->msg, info->lparam, &uiLo, &uiHi )) return FALSE; @@ -2019,7 +2020,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL h = dde_get_pair( (HANDLE)uiHi ); if (h) { - ULONGLONG hpack = pack_ptr( h ); + hpack = pack_ptr( h ); /* send back the value of h on the other side */ push_data( data, &hpack, sizeof(hpack) ); lp = uiLo;

1 0

Dmitry Timoshkov : kernel32/tests: Fix debugger tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 79ac1fa33f993da192c5f41ba2d1fe31db0d310b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ac1fa33f993da192c5f41ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:42 2013 +0900 kernel32/tests: Fix debugger tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/debugger.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e578cdd..41e4f1a 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -113,9 +113,9 @@ static void get_events(const char* name, HANDLE *start_event, HANDLE *done_event event_name=HeapAlloc(GetProcessHeap(), 0, 6+strlen(basename)+1); sprintf(event_name, "start_%s", basename); - *start_event=CreateEvent(NULL, 0,0, event_name); + *start_event=CreateEventA(NULL, 0,0, event_name); sprintf(event_name, "done_%s", basename); - *done_event=CreateEvent(NULL, 0,0, event_name); + *done_event=CreateEventA(NULL, 0,0, event_name); HeapFree(GetProcessHeap(), 0, event_name); } @@ -429,8 +429,8 @@ static void test_ExitCode(void) reg_save_value auto_value; reg_save_value debugger_value; - GetModuleFileNameA(GetModuleHandle(NULL), test_exe, sizeof(test_exe)); - if (GetFileAttributes(test_exe) == INVALID_FILE_ATTRIBUTES) + GetModuleFileNameA(GetModuleHandleA(NULL), test_exe, sizeof(test_exe)); + if (GetFileAttributesA(test_exe) == INVALID_FILE_ATTRIBUTES) strcat(test_exe, ".so"); if (GetFileAttributesA(test_exe) == INVALID_FILE_ATTRIBUTES) { @@ -686,7 +686,7 @@ static void doChildren(int argc, char **argv) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_init"); - event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); SetEvent(event); CloseHandle(event); @@ -695,7 +695,7 @@ static void doChildren(int argc, char **argv) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_attach"); - event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); WaitForSingleObject(event, INFINITE); CloseHandle(event); @@ -747,14 +747,14 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_init"); - event_init = CreateEvent(NULL, FALSE, FALSE, event_name); + event_init = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event_init != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); p = strrchr(blackbox_file, '\\'); p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_attach"); - event_attach = CreateEvent(NULL, FALSE, flag!=0, event_name); + event_attach = CreateEventA(NULL, FALSE, flag!=0, event_name); ok(event_attach != NULL, "CreateEvent failed, last error %d.\n", GetLastError()); memset(&si, 0, sizeof(si)); @@ -814,12 +814,12 @@ START_TEST(debugger) { HMODULE hdll; - hdll=GetModuleHandle("kernel32.dll"); + hdll=GetModuleHandleA("kernel32.dll"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); - hdll=GetModuleHandle("ntdll.dll"); + hdll=GetModuleHandleA("ntdll.dll"); if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb"); myARGC=winetest_get_mainargs(&myARGV);

1 0

Alexandre Julliard : gdi32: Always initialize the em_scale variable.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 67d452d8acd8394aa475bf90ed346e3a03925b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d452d8acd8394aa475bf90e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 17:08:49 2013 +0200 gdi32: Always initialize the em_scale variable. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 69779b8..b39f2ed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6386,11 +6386,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } + em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); + if(FT_IS_SCALABLE(incoming_font->ft_face)) { TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); if (avgAdvance && (metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale))

1 0

Alexandre Julliard : user32: Fix tick counter wrap-around handling.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 7b2eafbc8a7073cb70c4eb4d19691ef5c25807b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2eafbc8a7073cb70c4eb4d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:01 2013 +0200 user32: Fix tick counter wrap-around handling. --- dlls/user32/dde_client.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 91e1549..7a30ed2 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1017,22 +1017,20 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h */ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, const WDML_XACT* pXAct, DWORD *ack) { - DWORD dwTime; + DWORD start, elapsed; DWORD err; WDML_CONV* pConv; TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); - /* FIXME: time 32 bit wrap around */ - dwTimeout += GetCurrentTime(); - - while ((dwTime = GetCurrentTime()) < dwTimeout) + start = GetTickCount(); + while ((elapsed = GetTickCount() - start) < dwTimeout) { /* we cannot be in the crit sect all the time because when client and server run in a * single process they need to share the access to the internal data */ if (MsgWaitForMultipleObjects(0, NULL, FALSE, - dwTimeout - dwTime, QS_POSTMESSAGE) == WAIT_OBJECT_0) + dwTimeout - elapsed, QS_POSTMESSAGE) == WAIT_OBJECT_0) { MSG msg;

1 0