October 2013 - Wine-commits

Jacek Caban : crypt32: Get rid of no longer needed hCertStore checks.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 217e0119d92bb701e9a140ad4c42a6d9b7f4cb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=217e0119d92bb701e9a140ad4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:59:11 2013 +0200 crypt32: Get rid of no longer needed hCertStore checks. --- dlls/crypt32/cert.c | 10 +--------- dlls/crypt32/crl.c | 9 +-------- dlls/crypt32/ctl.c | 32 ++++++++++---------------------- dlls/crypt32/store.c | 40 ++++++++++++++-------------------------- 4 files changed, 26 insertions(+), 65 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f23629b..1858a1b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -555,15 +555,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; break; case CERT_ACCESS_STATE_PROP_ID: - if (pCertContext->hCertStore) - ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - DWORD state = 0; - - ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); - } + ret = CertGetStoreProperty(cert->ctx.hCertStore, dwPropId, pvData, pcbData); break; case CERT_KEY_PROV_HANDLE_PROP_ID: { diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 07e86b2..db80651 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -499,14 +499,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, } else { - if (pCRLContext->hCertStore) - ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 6893e2d..fa98556 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -341,26 +341,21 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { + WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; + ctl_t *ctl = ctl_from_ptr(pCtlContext); BOOL ret; TRACE("(%p)\n", pCtlContext); if (!pCtlContext) - ret = TRUE; - else if (!pCtlContext->hCertStore) - ret = CertFreeCTLContext(pCtlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; - ctl_t *ctl = ctl_from_ptr(pCtlContext); + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); - if (ret) - ret = CertFreeCTLContext(pCtlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); + if (ret) + ret = CertFreeCTLContext(pCtlContext); return ret; } @@ -621,14 +616,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, } else { - if (pCTLContext->hCertStore) - ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 7e22b95..6c34e55 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -949,24 +949,17 @@ PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_ BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) { - BOOL ret; + WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; TRACE("(%p)\n", pCertContext); if (!pCertContext) - ret = TRUE; - else if (!pCertContext->hCertStore) - ret = CertFreeCertificateContext(pCertContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); - } - return ret; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + return hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); } BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, @@ -1091,25 +1084,20 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) { + WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; BOOL ret; TRACE("(%p)\n", pCrlContext); if (!pCrlContext) - ret = TRUE; - else if (!pCrlContext->hCertStore) - ret = CertFreeCRLContext(pCrlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); - if (ret) - ret = CertFreeCRLContext(pCrlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); + if (ret) + ret = CertFreeCRLContext(pCrlContext); return ret; }

1 0

Alexandre Julliard : user32: Fix tick counter wrap-around handling.
by Alexandre Julliard 21 Oct '13

21 Oct '13

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

Alexandre Julliard : user32: Fix the scope of a local variable.
by Alexandre Julliard 21 Oct '13

21 Oct '13

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

Alexandre Julliard : wineps: Return the size directly from get_bbox to avoid compiler warnings.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 54ec6fca6ea4fdef8df0a81072a50c047c0572a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ec6fca6ea4fdef8df0a8107… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:50:53 2013 +0200 wineps: Return the size directly from get_bbox to avoid compiler warnings. --- dlls/wineps.drv/download.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index f476843..e5b57f7 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -169,16 +169,15 @@ static BOOL is_room_for_font(PSDRV_PDEVICE *physDev) * the font size we'll get the data directly from the TrueType HEAD table rather * than using GetOutlineTextMetrics. */ -static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) +static UINT get_bbox(HDC hdc, RECT *rc) { BYTE head[54]; /* the head table is 54 bytes long */ if(GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, sizeof(head)) == GDI_ERROR) { ERR("Can't retrieve head table\n"); - return FALSE; + return 0; } - *emsize = GET_BE_WORD(head + 18); /* unitsPerEm */ if(rc) { rc->left = (signed short)GET_BE_WORD(head + 36); /* xMin */ @@ -186,7 +185,7 @@ static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) rc->right = (signed short)GET_BE_WORD(head + 40); /* xMax */ rc->top = (signed short)GET_BE_WORD(head + 42); /* yMax */ } - return TRUE; + return GET_BE_WORD(head + 18); /* unitsPerEm */ } /**************************************************************************** @@ -231,7 +230,7 @@ static UINT calc_ppem_for_height(HDC hdc, LONG height) if(ascent + descent == 0) return height; - get_bbox(hdc, NULL, &emsize); + emsize = get_bbox(hdc, NULL); return MulDiv(emsize, height, ascent + descent); } @@ -314,9 +313,9 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) if(physDev->font.fontinfo.Download == NULL) { RECT bbox; - UINT emsize; + UINT emsize = get_bbox(dev->hdc, &bbox); - if (!get_bbox(dev->hdc, &bbox, &emsize)) { + if (!emsize) { HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, potm); return FALSE;

1 0

Alexandre Julliard : jscript: Reorganize StringConstr_value slightly to avoid confusing gcc.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 82c4fa35aad73b328b59e9c39444f03ca4814032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c4fa35aad73b328b59e9c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 16:26:35 2013 +0200 jscript: Reorganize StringConstr_value slightly to avoid confusing gcc. --- dlls/jscript/string.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 8ef1656..3ca29af 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1645,26 +1645,21 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags break; } case DISPATCH_CONSTRUCT: { + jsstr_t *str; jsdisp_t *ret; if(argc) { - jsstr_t *str; - hres = to_string(ctx, argv[0], &str); if(FAILED(hres)) return hres; - - hres = create_string(ctx, str, &ret); - jsstr_release(str); }else { - hres = create_string(ctx, jsstr_empty(), &ret); + str = jsstr_empty(); } - if(FAILED(hres)) - return hres; - - *r = jsval_obj(ret); - break; + hres = create_string(ctx, str, &ret); + if (SUCCEEDED(hres)) *r = jsval_obj(ret); + jsstr_release(str); + return hres; } default:

1 0

Alexandre Julliard : gdi32: Always initialize the em_scale variable.
by Alexandre Julliard 21 Oct '13

21 Oct '13

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 : wineconsole: Avoid an empty for loop.
by Alexandre Julliard 21 Oct '13

21 Oct '13

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 : include: Add inline wrappers for some underscore-prefixed math functions.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: a40574577072da11d8eda570e934636b5e83e528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40574577072da11d8eda570e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 18:45:27 2013 +0200 include: Add inline wrappers for some underscore-prefixed math functions. --- include/msvcrt/math.h | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4d0655e..34aa268 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -68,13 +68,13 @@ double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); -double __cdecl hypot(double, double); -double __cdecl j0(double); -double __cdecl j1(double); -double __cdecl jn(int, double); -double __cdecl y0(double); -double __cdecl y1(double); -double __cdecl yn(int, double); +double __cdecl _hypot(double, double); +double __cdecl _j0(double); +double __cdecl _j1(double); +double __cdecl _jn(int, double); +double __cdecl _y0(double); +double __cdecl _y1(double); +double __cdecl _yn(int, double); #ifdef __x86_64__ @@ -129,7 +129,7 @@ float __cdecl fmodf(float, float); #define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) -float __cdecl hypotf(float, float); +float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); @@ -171,4 +171,15 @@ static const union { #endif /* !_MATH_DEFINES_DEFINED */ #endif /* _USE_MATH_DEFINES */ +static inline double hypot( double x, double y ) { return _hypot( x, y ); } +static inline double j0( double x ) { return _j0( x ); } +static inline double j1( double x ) { return _j1( x ); } +static inline double jn( int n, double x ) { return _jn( n, x ); } +static inline double y0( double x ) { return _y0( x ); } +static inline double y1( double x ) { return _y1( x ); } +static inline double yn( int n, double x ) { return _yn( n, x ); } +static inline double cabs(struct _complex z) { return _cabs( z ); } + +static inline float hypotf( float x, float y ) { return _hypotf( x, y ); } + #endif /* __WINE_MATH_H */

1 0

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

21 Oct '13

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

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

21 Oct '13

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