February 2022 - Wine-Commits

Eric Pouech : reg/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 72ca5d732aace208a98712c9f562d394dec67843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ca5d732aace208a98712c9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:28 2022 +0100 reg/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 - programs/reg/tests/add.c | 302 +++++++-------- programs/reg/tests/copy.c | 192 +++++----- programs/reg/tests/delete.c | 114 +++--- programs/reg/tests/export.c | 98 ++--- programs/reg/tests/import.c | 816 ++++++++++++++++++++--------------------- programs/reg/tests/query.c | 94 ++--- 7 files changed, 808 insertions(+), 809 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72ca5d732aace208a987…

1 0

Paul Gofman : winhttp: Use lock when attempting to send frame synchronously().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 6d7d92269a7cde33c44db0b19d9af1151f5ad6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7d92269a7cde33c44db0b1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 2 15:38:24 2022 +0300 winhttp: Use lock when attempting to send frame synchronously(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 15 +++++++++++---- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 728b1895ba7..a3a6389a938 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3111,6 +3111,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeSRWLock( &socket->send_lock ); addref_object( &request->hdr ); socket->request = request; @@ -3391,6 +3392,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ERROR_OUTOFMEMORY; } + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3419,10 +3421,11 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { TRACE("sent sync.\n"); - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); socket_send_complete( socket, ret, type, len ); ret = ERROR_SUCCESS; @@ -3535,6 +3538,7 @@ static DWORD socket_send_pong( struct socket *socket ) if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1; if (!async_send) { @@ -3563,6 +3567,7 @@ static DWORD socket_send_pong( struct socket *socket ) InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); } + ReleaseSRWLockExclusive( &socket->send_lock ); return ret; } return send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); @@ -3817,6 +3822,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (!(s = malloc( sizeof(*s) ))) return FALSE; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3845,9 +3851,10 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); if (send_callback) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 3e4e1eb298d..732f0afaa88 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -259,6 +259,7 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + SRWLOCK send_lock; }; struct send_request

1 0

Eric Pouech : fsutil/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 9111ef38c8f8e516125e7ced3608077861e04794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9111ef38c8f8e516125e7ced… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:16 2022 +0100 fsutil/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/tests/Makefile.in | 1 - programs/fsutil/tests/fsutil.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index 01605e695f7..f0490b3b660 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = fsutil.exe IMPORTS = advapi32 user32 diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index aa0d5d3884b..0e02d8cac65 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -97,7 +97,7 @@ static void test_hardlink(void) FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "failed to open the hardlink\n"); boolrc = GetFileInformationByHandle(hfile, &info); - ok(boolrc, "failed to get info about hardlink, error %#x\n", GetLastError()); + ok(boolrc, "failed to get info about hardlink, error %#lx\n", GetLastError()); CloseHandle(hfile); ok(info.nNumberOfLinks == 2, "our link is not a hardlink\n"); @@ -109,9 +109,9 @@ static void test_hardlink(void) ok(rc == 1, "fsutil didn't complain about nonexisting source file\n"); boolrc = DeleteFileA("link"); - ok(boolrc, "failed to delete the hardlink, error %#x\n", GetLastError()); + ok(boolrc, "failed to delete the hardlink, error %#lx\n", GetLastError()); boolrc = DeleteFileA("file"); - ok(boolrc, "failed to delete the file, error %#x\n", GetLastError()); + ok(boolrc, "failed to delete the file, error %#lx\n", GetLastError()); } START_TEST(fsutil)

1 0

Eric Pouech : find/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 18100a15a01e2602a1f75aafac64cdb29f6add95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18100a15a01e2602a1f75aaf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:10 2022 +0100 find/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/tests/Makefile.in | 1 - programs/find/tests/find.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in index 5c4e5e39250..c5b359bd98f 100644 --- a/programs/find/tests/Makefile.in +++ b/programs/find/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = find.exe IMPORTS = user32 diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b7c2d7b77c4..a85bda85bec 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -174,7 +174,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %ld\n", exitcode_expected, exitcode); heap_free(child_output); }

1 0

Piotr Caban : msvcrt: Use InitOnceExecuteOnce to allocate TLS index.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 3fbfddbd534709f9e0185d608f954390baf4f45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fbfddbd534709f9e0185d60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 2 19:48:19 2022 +0100 msvcrt: Use InitOnceExecuteOnce to allocate TLS index. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index e9047ab41b9..f0a97f98e41 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -345,7 +345,7 @@ enum ConcRT_EventType CONCRT_EVENT_DETACH }; -static int context_tls_index = TLS_OUT_OF_INDEXES; +static DWORD context_tls_index = TLS_OUT_OF_INDEXES; static CRITICAL_SECTION default_scheduler_cs; static CRITICAL_SECTION_DEBUG default_scheduler_cs_debug = @@ -620,21 +620,23 @@ static Context* try_get_current_context(void) return TlsGetValue(context_tls_index); } +static BOOL WINAPI init_context_tls_index(INIT_ONCE *once, void *param, void **context) +{ + context_tls_index = TlsAlloc(); + return context_tls_index != TLS_OUT_OF_INDEXES; +} + static Context* get_current_context(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; Context *ret; - if (context_tls_index == TLS_OUT_OF_INDEXES) { - int tls_index = TlsAlloc(); - if (tls_index == TLS_OUT_OF_INDEXES) { - scheduler_resource_allocation_error e; - scheduler_resource_allocation_error_ctor_name(&e, NULL, - HRESULT_FROM_WIN32(GetLastError())); - _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); - } - - if(InterlockedCompareExchange(&context_tls_index, tls_index, TLS_OUT_OF_INDEXES) != TLS_OUT_OF_INDEXES) - TlsFree(tls_index); + if(!InitOnceExecuteOnce(&init_once, init_context_tls_index, NULL, NULL)) + { + scheduler_resource_allocation_error e; + scheduler_resource_allocation_error_ctor_name(&e, NULL, + HRESULT_FROM_WIN32(GetLastError())); + _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); } ret = TlsGetValue(context_tls_index);

1 0

Eric Pouech : vbscript: Use correct integral type.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 32deecbca16e3a8f823c03a51899ee1d6e5ff883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32deecbca16e3a8f823c03a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:15 2022 +0100 vbscript: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbdisp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d9d1eee741..f33454604d0 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -563,7 +563,7 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V } for(i=0; i<argc; i++) { - hres = to_int(get_arg(dp, i), indices+i); + hres = to_int(get_arg(dp, i), (int *)(indices+i)); if(FAILED(hres)) { heap_free(indices); SafeArrayUnlock(array); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6b9a1a0a5d0..d67a1831bbe 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1683,7 +1683,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */); IDispatchEx_Release(dispex); }else { - ULONG err = 0; + UINT err = 0; TRACE("using IDispatch\n"); hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err);

1 0

Eric Pouech : mf: Use correct integral types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 8b17e3e8218a76d07fc79dbd55fa40b78e81fc85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b17e3e8218a76d07fc79dbd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 10:32:49 2022 +0300 mf: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/copier.c | 4 ++-- dlls/mf/evr.c | 4 ++-- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 7 ++++--- dlls/mf/session.c | 31 +++++++++++++++++-------------- dlls/mf/topology.c | 11 ++++++----- 6 files changed, 33 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b17e3e8218a76d07fc7…

1 0

Zebediah Figura : quartz/tests: Test more interfaces exposed by the filter graph.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 09cf9b8a13594bd9f344a5c1771536017b939c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cf9b8a13594bd9f344a5c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 2 22:58:06 2022 -0600 quartz/tests: Test more interfaces exposed by the filter graph. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index bd086445a3b..98f7b30717d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -98,23 +98,30 @@ static void test_interfaces(void) IFilterGraph2 *graph = create_graph(); check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo, TRUE); check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph, TRUE); check_interface(graph, &IID_IFilterGraph2, TRUE); check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper2, TRUE); check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphBuilder, TRUE); check_interface(graph, &IID_IGraphConfig, TRUE); check_interface(graph, &IID_IGraphVersion, TRUE); check_interface(graph, &IID_IMediaControl, TRUE); check_interface(graph, &IID_IMediaEvent, TRUE); - check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventEx, TRUE); check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); + check_interface(graph, &IID_IUnknown, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); + check_interface(graph, &IID_IDispatch, FALSE); IFilterGraph2_Release(graph); }

1 0

Zebediah Figura : shell32: Move StrRetToStrN*() helpers to shell32_main.h.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 2d6a314ecf6d4bba3f266a8ef0c8c5813837059b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6a314ecf6d4bba3f266a8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:41 2022 -0600 shell32: Move StrRetToStrN*() helpers to shell32_main.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 3 +++ dlls/shell32/undocshell.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ea8019a85e2..14011489e86 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -290,4 +290,7 @@ typedef struct ITEMIDLIST idl; } CWTESTPATHSTRUCT; +BOOL WINAPI StrRetToStrNA(char *, DWORD, STRRET *, const ITEMIDLIST *); +BOOL WINAPI StrRetToStrNW(WCHAR *, DWORD, STRRET *, const ITEMIDLIST *); + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 881832c5185..61c2ff4069f 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,12 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/* - string functions -*/ -BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); -BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); - /**************************************************************************** * Memory Routines */

1 0

Eric Pouech : wscript/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 63a9879aef5fee88779d271f5626f971bcc25542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a9879aef5fee88779d271f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:46 2022 +0100 wscript/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/Makefile.in | 1 - programs/wscript/tests/run.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in index bdb231353b7..1f038b04588 100644 --- a/programs/wscript/tests/Makefile.in +++ b/programs/wscript/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wscript.exe IMPORTS = ole32 oleaut32 psapi advapi32 diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index dbd10f537a7..7bccf097f87 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -260,7 +260,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF break; } default: - ok(0, "unexpected dispIdMember %d\n", dispIdMember); + ok(0, "unexpected dispIdMember %ld\n", dispIdMember); return E_NOTIMPL; } @@ -345,8 +345,8 @@ static void run_script_file(const char *file_name, DWORD expected_exit_code) WaitForSingleObject(pi.hProcess, INFINITE); bres = GetExitCodeProcess(pi.hProcess, &exit_code); - ok(bres, "GetExitCodeProcess failed: %u\n", GetLastError()); - ok(exit_code == expected_exit_code, "exit_code = %u, expected %u\n", exit_code, expected_exit_code); + ok(bres, "GetExitCodeProcess failed: %lu\n", GetLastError()); + ok(exit_code == expected_exit_code, "exit_code = %lu, expected %lu\n", exit_code, expected_exit_code); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -371,13 +371,13 @@ static void run_script(const char *name, const char *script_data, size_t script_ file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return; res = WriteFile(file, script_data, script_size, &size, NULL); CloseHandle(file); - ok(res, "Could not write to file: %u\n", GetLastError()); + ok(res, "Could not write to file: %lu\n", GetLastError()); if(!res) return; @@ -400,7 +400,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_ trace("running %s test...\n", name); src = FindResourceA(NULL, name, type); - ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + ok(src != NULL, "Could not find resource %s: %lu\n", name, GetLastError()); if(!src) return TRUE; @@ -451,7 +451,7 @@ static BOOL register_activex(void) hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid); - ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + ok(hres == S_OK, "Could not register script engine: %08lx\n", hres); return TRUE; }

1 0