December 2022 - Wine-commits

Paul Gofman : winhttp: Wait for WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE in request_send().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 8e0812ef9e3589a21593ff8a6c5d4cbe99227332 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e0812ef9e3589a21593ff8a6c5d4c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 22:05:37 2022 -0600 winhttp: Wait for WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE in request_send(). --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 130adeee8a2..d5eb1bfce3a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -5259,7 +5259,7 @@ static HRESULT request_send( struct winhttp_request *request ) size++; } } - wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE ); if (!WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 )) { err = GetLastError();

1 0

Paul Gofman : winhttp: Execute receive_response() synchronously when possible.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 32141dfa93f4b086a976c24769ca83d73f77a689 URL: https://gitlab.winehq.org/wine/wine/-/commit/32141dfa93f4b086a976c24769ca83… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 20:43:15 2022 -0600 winhttp: Execute receive_response() synchronously when possible. --- dlls/winhttp/request.c | 34 ++++++++++++++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 4 ++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d5eb1bfce3a..c99cb7ee195 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2220,6 +2220,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + TRACE( "request state %d.\n", request->state ); + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; request->read_reply_len = 0; request->state = REQUEST_RESPONSE_STATE_NONE; @@ -2289,6 +2291,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD } TRACE("full request: %s\n", debugstr_a(wire_req)); + request->state = REQUEST_RESPONSE_STATE_SENDING_REQUEST; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); ret = netconn_send( request->netconn, wire_req, len, &bytes_sent, NULL ); @@ -2306,6 +2309,11 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + else + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + end: if (async) { @@ -2863,6 +2871,7 @@ static DWORD receive_response( struct request *request ) { BOOL async_mode = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; DWORD ret, size, query, status; + BOOL return_to_send; TRACE( "request state %d.\n", request->state ); @@ -2878,7 +2887,24 @@ static DWORD receive_response( struct request *request ) if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done; } - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + return_to_send = async_mode && request->state == REQUEST_RESPONSE_STATE_SENDING_REQUEST; + if (request->state < REQUEST_RESPONSE_STATE_REQUEST_SENT && !return_to_send) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } + + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT) + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + else + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + + if (return_to_send) + { + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED; + return queue_receive_response( request ); + } + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &request->read_reply_len, sizeof(request->read_reply_len) ); if ((ret = request->read_reply_status)) goto done; @@ -2918,7 +2944,7 @@ static DWORD receive_response( struct request *request ) else goto done; request->state = REQUEST_RESPONSE_RECURSIVE_REQUEST; - return receive_response( request ); + return async_mode ? queue_receive_response( request ) : receive_response( request ); done: if (!ret) @@ -2936,6 +2962,7 @@ done: result.dwError = ret; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } + return ERROR_SUCCESS; } return ret; } @@ -2973,8 +3000,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) ret = queue_receive_response( request ); - else ret = receive_response( request ); + ret = receive_response( request ); release_object( &request->hdr ); SetLastError( ret ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index cc2187d4200..8e4789356ec 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -177,6 +177,10 @@ enum request_flags enum request_response_state { REQUEST_RESPONSE_STATE_NONE, + REQUEST_RESPONSE_STATE_SENDING_REQUEST, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED, + REQUEST_RESPONSE_STATE_REQUEST_SENT, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT, REQUEST_RESPONSE_RECURSIVE_REQUEST, REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, };

1 0

Paul Gofman : winhttp/tests: Test WinHttpReceiveResponse() synchronous behaviour.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5ac6eb434c104dce283a39255b382755d9dd516d URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac6eb434c104dce283a39255b3827… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 21:32:36 2022 -0600 winhttp/tests: Test WinHttpReceiveResponse() synchronous behaviour. --- dlls/winhttp/tests/notification.c | 198 +++++++++++++++++++++++++++++--------- 1 file changed, 152 insertions(+), 46 deletions(-)

1 0

Paul Gofman : winhttp/tests: Test calling WinHttpReceiveResponse() recursively from various send callbacks.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 8254905b120faf35ba92d4580339a9ffeb63fea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8254905b120faf35ba92d4580339a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 16 14:21:21 2022 -0600 winhttp/tests: Test calling WinHttpReceiveResponse() recursively from various send callbacks. --- dlls/winhttp/tests/notification.c | 86 +++++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 0c5ab64ac0e..dbdb958f061 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1848,6 +1848,10 @@ struct test_recursion_context LONG recursion_count, max_recursion_query, max_recursion_read; BOOL read_from_callback; BOOL have_sync_callback; + DWORD call_receive_response_status; + DWORD main_thread_id; + DWORD receive_response_thread_id; + BOOL headers_available; }; /* The limit is 128 before Win7 and 3 on newer Windows. */ @@ -1863,8 +1867,25 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex switch (status) { + case WINHTTP_CALLBACK_STATUS_SENDING_REQUEST: + case WINHTTP_CALLBACK_STATUS_REQUEST_SENT: case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: + if (status == context->call_receive_response_status) + { + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + } + break; + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: + if (context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) + ok( GetCurrentThreadId() == context->receive_response_thread_id, + "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); + else + ok( GetCurrentThreadId() != context->main_thread_id, + "expected callback to be called from the other thread, got main.\n" ); + context->headers_available = TRUE; SetEvent( context->wait ); break; @@ -1911,20 +1932,35 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; + case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: + case WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: + if (!context->headers_available + && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) + ok( GetCurrentThreadId() == context->receive_response_thread_id, + "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); + break; } } static void test_recursion(void) { + static DWORD request_callback_status_tests[] = + { + WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, + WINHTTP_CALLBACK_STATUS_REQUEST_SENT, + }; struct test_recursion_context context; HANDLE session, connection, request; DWORD size, status, err; + char buffer[1024]; + unsigned int i; BOOL ret; BYTE b; memset( &context, 0, sizeof(context) ); context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + context.main_thread_id = GetCurrentThreadId(); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok( !!session, "failed to open session, GetLastError() %lu\n", GetLastError() ); @@ -1938,6 +1974,11 @@ static void test_recursion(void) ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); context.request = request; + + ret = WinHttpReceiveResponse( request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + + context.call_receive_response_status = WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE; ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) @@ -1954,11 +1995,6 @@ static void test_recursion(void) WaitForSingleObject( context.wait, INFINITE ); - ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); - - WaitForSingleObject( context.wait, INFINITE ); - size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); @@ -1981,9 +2017,45 @@ static void test_recursion(void) } else skip( "no sync callbacks\n"); - WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); - WinHttpCloseHandle( request ); + + for (i = 0; i < ARRAY_SIZE(request_callback_status_tests); ++i) + { + winetest_push_context( "i %u", i ); + + request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); + ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); + + context.request = request; + context.call_receive_response_status = request_callback_status_tests[i]; + context.headers_available = FALSE; + + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip("Connection failed, skipping\n"); + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); + winetest_pop_context(); + return; + } + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReadData( request, buffer, sizeof(buffer), NULL ); + ok( ret, "failed to read data, GetLastError() %lu\n", GetLastError() ); + + WaitForSingleObject( context.wait, INFINITE ); + + WinHttpCloseHandle( request ); + winetest_pop_context(); + } + + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); WinHttpCloseHandle( connection ); WinHttpCloseHandle( session ); CloseHandle( context.wait );

1 0

Rémi Bernon : opengl32: Avoid calling functions that have not been queried yet.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 640e9766fd6aa998d345656bfa76e037989e2706 URL: https://gitlab.winehq.org/wine/wine/-/commit/640e9766fd6aa998d345656bfa76e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 9 12:59:36 2022 +0100 opengl32: Avoid calling functions that have not been queried yet. The glMapBuffer and al. functions are all duplicated between EXT/ARB and core functions, and we reduced code duplication by redirecting the EXT to the core functions. The internal function table is only filled as the functions are queried, and it causes crahes when games are using the EXT functions without querying the core function first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53990 --- dlls/opengl32/unix_wgl.c | 105 ++++++++++++++++++++++++++++++++++------------- dlls/opengl32/wgl.c | 61 +++++++++++++++++++-------- 2 files changed, 119 insertions(+), 47 deletions(-)

1 0

Alexandre Julliard : configure: Only require frame pointer on the MSVCRT side.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 79650e403b2a5632485e34e6e7d4e672b32cafbb URL: https://gitlab.winehq.org/wine/wine/-/commit/79650e403b2a5632485e34e6e7d4e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:10:06 2022 +0100 configure: Only require frame pointer on the MSVCRT side. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f79d5244cfc..84f02c91689 100755 --- a/configure +++ b/configure @@ -19319,7 +19319,7 @@ fi printf "%s\n" "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes then : - EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" + MSVCRTFLAGS="$MSVCRTFLAGS -fno-omit-frame-pointer" fi ;; *x86_64*) case $host_os in diff --git a/configure.ac b/configure.ac index adb0c1546da..b2cdb192400 100644 --- a/configure.ac +++ b/configure.ac @@ -1900,7 +1900,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= case $host_cpu in dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections - *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; + *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-omit-frame-pointer"]) ;; *x86_64*) case $host_os in dnl Mingw uses Windows 64-bit types, not Unix ones

1 0

Alexandre Julliard : configure: Enable printf format warnings for 64-bit PE builds.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 42b0a3b917a24f1cf4595139d90a7cb414954811 URL: https://gitlab.winehq.org/wine/wine/-/commit/42b0a3b917a24f1cf4595139d90a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:10:20 2022 +0100 configure: Enable printf format warnings for 64-bit PE builds. --- configure | 68 +-------------------------------------------------------- configure.ac | 4 +--- tools/makedep.c | 6 ----- 3 files changed, 2 insertions(+), 76 deletions(-) diff --git a/configure b/configure index 84f02c91689..3960734a764 100755 --- a/configure +++ b/configure @@ -11450,40 +11450,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_LDFLAGS " -Wl,--disable-stdcall-fixup" fi } ;; - x86_64) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wno-format" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-format" >&5 -printf %s "checking whether $CC supports -Wno-format... " >&6; } -if eval test \${$as_ac_var+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wno-format" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - eval "$as_ac_var=yes" -else $as_nop - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -eval ac_res=\$$as_ac_var - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_var"\" = x"yes" -then : - as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-format" -fi } - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wformat-overflow" | $as_tr_sh` + x86_64) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wformat-overflow" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wformat-overflow" >&5 printf %s "checking whether $CC supports -Wformat-overflow... " >&6; } if eval test \${$as_ac_var+y} @@ -11581,39 +11548,6 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -mcx16" -fi } ;; - aarch64) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wno-format" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-format" >&5 -printf %s "checking whether $CC supports -Wno-format... " >&6; } -if eval test \${$as_ac_var+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wno-format" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - eval "$as_ac_var=yes" -else $as_nop - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -eval ac_res=\$$as_ac_var - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_var"\" = x"yes" -then : - as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-format" fi } ;; esac diff --git a/configure.ac b/configure.ac index b2cdb192400..3c30db8fd45 100644 --- a/configure.ac +++ b/configure.ac @@ -959,11 +959,9 @@ do i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer]) WINE_TRY_PE_CFLAGS([-Wl,--disable-stdcall-fixup], [AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--disable-stdcall-fixup"])]) ;; - x86_64) WINE_TRY_PE_CFLAGS([-Wno-format]) - WINE_TRY_PE_CFLAGS([-Wformat-overflow]) + x86_64) WINE_TRY_PE_CFLAGS([-Wformat-overflow]) WINE_TRY_PE_CFLAGS([-Wnonnull]) WINE_TRY_PE_CFLAGS([-mcx16]) ;; - aarch64) WINE_TRY_PE_CFLAGS([-Wno-format]) ;; esac dnl Determine debug info format diff --git a/tools/makedep.c b/tools/makedep.c index cab573c0488..6379b5b69d9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3174,12 +3174,6 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - /* force -Wformat when using 'long' types, until all modules have been converted - * and we can remove -Wno-format */ - if (!make->extlib && strarray_exists( &extra_cflags[arch], "-Wno-format" ) && - !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) - output_filename( "-Wformat" ); - output_filenames( cpp_flags ); output_filename( arch_make_variable( "CFLAGS", arch )); output( "\n" );

1 0

Alexandre Julliard : commdlg: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 8e6317ffeeec6b15b04cfe93b1f1607a7c15109d URL: https://gitlab.winehq.org/wine/wine/-/commit/8e6317ffeeec6b15b04cfe93b1f160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:42:14 2022 +0100 commdlg: Consistently use %I printf format for ULONG_PTR values. --- dlls/commdlg.dll16/colordlg.c | 2 +- dlls/commdlg.dll16/filedlg.c | 6 +++--- dlls/commdlg.dll16/fontdlg.c | 6 +++--- dlls/commdlg.dll16/printdlg.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/commdlg.dll16/colordlg.c b/dlls/commdlg.dll16/colordlg.c index dfdea6a4b09..91837bcb9ca 100644 --- a/dlls/commdlg.dll16/colordlg.c +++ b/dlls/commdlg.dll16/colordlg.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); */ BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam ) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, message, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, message, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 5ad67a4a91f..2631febb6ae 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -218,7 +218,7 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR CONTEXT context; WORD params[5]; - TRACE( "%p: %p %08x %x %lx: stub\n", hook, hwnd, msg, wp, lp ); + TRACE( "%p: %p %08x %x %Ix: stub\n", hook, hwnd, msg, wp, lp ); memset( &context, 0, sizeof(context) ); context.SegDs = context.SegEs = CURRENT_SS; @@ -547,7 +547,7 @@ static UINT_PTR CALLBACK dummy_hook( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) */ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hWnd16, wMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hWnd16, wMsg, wParam, lParam ); return FALSE; } @@ -556,7 +556,7 @@ BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L */ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hWnd16, wMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hWnd16, wMsg, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/fontdlg.c b/dlls/commdlg.dll16/fontdlg.c index 79efb3a292f..0bf94976d9d 100644 --- a/dlls/commdlg.dll16/fontdlg.c +++ b/dlls/commdlg.dll16/fontdlg.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %Ix\n", logfont, metrics, nFontType, lParam ); return 0; } @@ -53,7 +53,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ) { - FIXME( "%08lx %08lx %u %lx\n", logfont, metrics, nFontType, lParam ); + FIXME( "%08lx %08lx %u %Ix\n", logfont, metrics, nFontType, lParam ); return 0; } @@ -138,6 +138,6 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, message, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, message, wParam, lParam ); return FALSE; } diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index ac4741ee4e9..c44d21c0e23 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -153,7 +153,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) */ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam) { - FIXME( "%04x %04x %04x %08lx: stub\n", hDlg16, uMsg, wParam, lParam ); + FIXME( "%04x %04x %04x %08Ix: stub\n", hDlg16, uMsg, wParam, lParam ); return FALSE; } @@ -167,7 +167,7 @@ BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, switch (wMsg) { case WM_INITDIALOG: - TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); + TRACE("WM_INITDIALOG lParam=%08IX\n", lParam); ShowWindow(hWnd, SW_SHOWNORMAL); return (TRUE); case WM_COMMAND:

1 0

Alexandre Julliard : gdi.exe: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 8414449ce7c8ce14bb2fbe857c9b42e86ded5106 URL: https://gitlab.winehq.org/wine/wine/-/commit/8414449ce7c8ce14bb2fbe857c9b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:42:38 2022 +0100 gdi.exe: Consistently use %I printf format for ULONG_PTR values. --- dlls/gdi.exe16/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/metafile.c b/dlls/gdi.exe16/metafile.c index f88c0cddbb7..35fdd5b6bc2 100644 --- a/dlls/gdi.exe16/metafile.c +++ b/dlls/gdi.exe16/metafile.c @@ -199,7 +199,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, WORD args[8]; BOOL16 result = TRUE; - TRACE("(%p, %04x, %p, %08lx)\n", hdc, hmf, lpEnumFunc, lpData); + TRACE("(%p, %04x, %p, %08Ix)\n", hdc, hmf, lpEnumFunc, lpData); if(!mh) return FALSE;

1 0

Alexandre Julliard : kernel32/tests: Consistently use %I printf format for ULONG_PTR values.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: e2b8fad779fd4f6a85ad4112f286fa11ea5a6687 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2b8fad779fd4f6a85ad4112f286fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:43:10 2022 +0100 kernel32/tests: Consistently use %I printf format for ULONG_PTR values. --- dlls/kernel32/tests/virtual.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)

1 0