wine-commits December 2022

wine-commits@winehq.org

1 participants
539 discussions

Paul Gofman : winhttp: Factor out queue_receive_response().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 5a94affcfd0bed29aed5e93aa58e3534ad9c7f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a94affcfd0bed29aed5e93aa58e35… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 20:53:35 2022 -0600 winhttp: Factor out queue_receive_response(). --- dlls/winhttp/request.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 265a92c0d79..c8e19b6f0a8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2846,6 +2846,19 @@ static DWORD handle_passport_redirect( struct request *request ) return ERROR_SUCCESS; } +static void task_receive_response( void *ctx, BOOL abort ); + +static DWORD queue_receive_response( struct request *request ) +{ + struct receive_response *r; + DWORD ret; + + if (!(r = malloc( sizeof(*r) ))) return ERROR_OUTOFMEMORY; + if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) + free( r ); + return ret; +} + static DWORD receive_response( struct request *request, BOOL async ) { DWORD ret, size, query, status; @@ -2954,20 +2967,8 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) - { - struct receive_response *r; - - if (!(r = malloc( sizeof(*r) ))) - { - release_object( &request->hdr ); - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) - free( r ); - } - else ret = receive_response( request, FALSE ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) ret = queue_receive_response( request ); + else ret = receive_response( request, FALSE ); release_object( &request->hdr ); SetLastError( ret );

1 0

Paul Gofman : winhttp: Receive server reply in send_request().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: aa8f97e8294b0618de0e8a45ff2adef0c4e516da URL: https://gitlab.winehq.org/wine/wine/-/commit/aa8f97e8294b0618de0e8a45ff2ade… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 19:33:18 2022 -0600 winhttp: Receive server reply in send_request(). --- dlls/winhttp/request.c | 30 +++++++++++++++++++++++++----- dlls/winhttp/session.c | 1 + dlls/winhttp/tests/winhttp.c | 8 ++++---- dlls/winhttp/winhttp_private.h | 8 ++++++++ 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2e68decb761..265a92c0d79 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -800,6 +800,13 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, const WCHAR *n SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } + if (request->state < REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED && !(level & WINHTTP_QUERY_FLAG_REQUEST_HEADERS) + && ((level & ~QUERY_MODIFIER_MASK) != WINHTTP_QUERY_REQUEST_METHOD)) + { + release_object( &request->hdr ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } ret = query_headers( request, level, name, buffer, buflen, index ); @@ -2213,7 +2220,9 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; request->read_reply_len = 0; + request->state = REQUEST_RESPONSE_STATE_NONE; if (request->flags & REQUEST_FLAG_WEBSOCKET_UPGRADE && request->websocket_set_send_buffer_size < MIN_WEBSOCKET_SEND_BUFFER_SIZE) @@ -2293,6 +2302,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->optional_len = optional_len; len += optional_len; } + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); end: @@ -2839,15 +2850,20 @@ static DWORD receive_response( struct request *request, BOOL async ) { DWORD ret, size, query, status; - if (!request->netconn) return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + TRACE( "request state %d.\n", request->state ); + + if (request->state >= REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &request->read_reply_len, sizeof(request->read_reply_len) ); - if ((ret = read_reply( request ))) break; + if ((ret = request->read_reply_status)) break; size = sizeof(DWORD); query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; @@ -2885,8 +2901,12 @@ static DWORD receive_response( struct request *request, BOOL async ) break; } - if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - +done: + if (!ret) + { + request->state = REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED; + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + } if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NULL, 0 ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8aa99f0ece7..65e471f7ee5 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1271,6 +1271,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, const WCHAR *verb, cons request->websocket_receive_buffer_size = connect->session->websocket_receive_buffer_size; request->websocket_send_buffer_size = connect->session->websocket_send_buffer_size; request->websocket_set_send_buffer_size = request->websocket_send_buffer_size; + request->read_reply_status = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; if (!verb || !verb[0]) verb = L"GET"; if (!(request->verb = wcsdup( verb ))) goto end; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b7deaea324a..76f12837e86 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3277,14 +3277,14 @@ static void test_websocket(int port) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3312,14 +3312,14 @@ static void test_websocket(int port) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; buf[0] = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 88b5c890945..9c6d30eca77 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -174,6 +174,12 @@ enum request_flags REQUEST_FLAG_WEBSOCKET_UPGRADE = 0x01, }; +enum request_response_state +{ + REQUEST_RESPONSE_STATE_NONE, + REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, +}; + struct request { struct object_header hdr; @@ -221,6 +227,8 @@ struct request unsigned int websocket_receive_buffer_size; unsigned int websocket_send_buffer_size, websocket_set_send_buffer_size; int read_reply_len; + DWORD read_reply_status; + enum request_response_state state; }; enum socket_state

1 0

Paul Gofman : winhttp: Send notifications from receive_response() directly.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: ee2de0b8fe93c84df3d7c4a3da0840ad27864f02 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee2de0b8fe93c84df3d7c4a3da0840… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 20:19:52 2022 -0600 winhttp: Send notifications from receive_response() directly. --- dlls/winhttp/request.c | 8 +++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 37508f1c81c..2e68decb761 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1772,6 +1772,7 @@ static DWORD read_more_data( struct request *request, int maxlen, BOOL notify ) maxlen - request->read_size, 0, &len ); if (notify) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &len, sizeof(len) ); + request->read_reply_len += len; request->read_size += len; return ret; @@ -2212,6 +2213,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; + request->read_reply_len = 0; + if (request->flags & REQUEST_FLAG_WEBSOCKET_UPGRADE && request->websocket_set_send_buffer_size < MIN_WEBSOCKET_SEND_BUFFER_SIZE) { @@ -2530,7 +2533,7 @@ static DWORD read_line( struct request *request, char *buffer, DWORD *len ) remove_data( request, bytes_read ); if (eol) break; - if ((ret = read_more_data( request, -1, TRUE ))) return ret; + if ((ret = read_more_data( request, -1, FALSE ))) return ret; if (!request->read_size) { *len = 0; @@ -2841,6 +2844,9 @@ static DWORD receive_response( struct request *request, BOOL async ) netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, + &request->read_reply_len, sizeof(request->read_reply_len) ); if ((ret = read_reply( request ))) break; size = sizeof(DWORD); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0326a8fc1e3..88b5c890945 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -220,6 +220,7 @@ struct request } creds[TARGET_MAX][SCHEME_MAX]; unsigned int websocket_receive_buffer_size; unsigned int websocket_send_buffer_size, websocket_set_send_buffer_size; + int read_reply_len; }; enum socket_state

1 0

Paul Gofman : winhttp: Don't refill buffer after receiving server response.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 0ed844712fbef442d9670f665e126c06a5256e3c URL: https://gitlab.winehq.org/wine/wine/-/commit/0ed844712fbef442d9670f665e126c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 5 18:49:35 2022 -0600 winhttp: Don't refill buffer after receiving server response. --- dlls/winhttp/request.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e04d5a04e9d..37508f1c81c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1795,6 +1795,38 @@ static DWORD discard_eol( struct request *request, BOOL notify ) return ERROR_SUCCESS; } +static void update_value_from_digit( DWORD *value, char ch ) +{ + if (ch >= '0' && ch <= '9') *value = *value * 16 + ch - '0'; + else if (ch >= 'a' && ch <= 'f') *value = *value * 16 + ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') *value = *value * 16 + ch - 'A' + 10; +} + +/* read chunk size if already in the read buffer */ +static BOOL get_chunk_size( struct request *request ) +{ + DWORD chunk_size; + char *p, *eol; + + if (request->read_chunked_size != ~0ul) return TRUE; + + eol = memchr( request->read_buf + request->read_pos, '\n', request->read_size ); + if (!eol) return FALSE; + + chunk_size = 0; + for (p = request->read_buf + request->read_pos; p != eol; ++p) + { + if (*p == ';' || *p == '\r') break; + update_value_from_digit( &chunk_size, *p ); + } + + request->read_chunked_size = chunk_size; + if (!chunk_size) request->read_chunked_eof = TRUE; + + remove_data( request, (eol + 1) - (request->read_buf + request->read_pos) ); + return TRUE; +} + /* read the size of the next chunk */ static DWORD start_next_chunk( struct request *request, BOOL notify ) { @@ -1812,10 +1844,8 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) while (request->read_size) { char ch = request->read_buf[request->read_pos]; - if (ch >= '0' && ch <= '9') chunk_size = chunk_size * 16 + ch - '0'; - else if (ch >= 'a' && ch <= 'f') chunk_size = chunk_size * 16 + ch - 'a' + 10; - else if (ch >= 'A' && ch <= 'F') chunk_size = chunk_size * 16 + ch - 'A' + 10; - else if (ch == ';' || ch == '\r' || ch == '\n') + + if (ch == ';' || ch == '\r' || ch == '\n') { TRACE( "reading %lu byte chunk\n", chunk_size ); @@ -1827,6 +1857,7 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) return discard_eol( request, notify ); } + update_value_from_digit( &chunk_size, ch ); remove_data( request, 1 ); } if ((ret = read_more_data( request, -1, notify ))) return ret; @@ -1902,7 +1933,11 @@ static void finished_reading( struct request *request ) /* return the size of data available to be read immediately */ static DWORD get_available_data( struct request *request ) { - if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); + if (request->read_chunked) + { + if (!get_chunk_size( request )) return 0; + return min( request->read_chunked_size, request->read_size ); + } return request->read_size; } @@ -1920,6 +1955,9 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD int count, bytes_read = 0; DWORD ret = ERROR_SUCCESS; + if (request->read_chunked && request->read_chunked_size == ~0u + && (ret = start_next_chunk( request, async ))) goto done; + if (end_of_read_data( request )) goto done; while (size) @@ -2842,7 +2880,6 @@ static DWORD receive_response( struct request *request, BOOL async ) } if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - if (request->content_length) ret = refill_buffer( request, FALSE ); if (async) {

1 0

Paul Gofman : winhttp: Do not open connection in handle_redirect().
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 9caf603ad69e2de9109886331539954328e6881f URL: https://gitlab.winehq.org/wine/wine/-/commit/9caf603ad69e2de910988633153995… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 28 12:37:33 2022 -0600 winhttp: Do not open connection in handle_redirect(). Let send_request() do it. --- dlls/winhttp/request.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1a9b4e14ee8..e04d5a04e9d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2733,7 +2733,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else free( hostname ); if ((ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; - if ((ret = open_connection( request ))) goto end; free( request->path ); request->path = NULL;

1 0

Alexandre Julliard : apisetschema: Add a few more API sets pointing to existing dlls.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7d81575c680212f7bef7a7d7d11d2615ffde4c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/7d81575c680212f7bef7a7d7d11d26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:12:27 2022 +0100 apisetschema: Add a few more API sets pointing to existing dlls. --- dlls/apisetschema/apisetschema.spec | 76 +++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

1 0

Alexandre Julliard : winecrt0: Include basetsd.h to get the _WIN64 definition.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7585376ee88d07f6c67a16451548298d80fa9431 URL: https://gitlab.winehq.org/wine/wine/-/commit/7585376ee88d07f6c67a1645154829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:22:09 2022 +0100 winecrt0: Include basetsd.h to get the _WIN64 definition. --- dlls/winecrt0/dll_soinit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecrt0/dll_soinit.c b/dlls/winecrt0/dll_soinit.c index be02307c89d..e0ed9a1be1e 100644 --- a/dlls/winecrt0/dll_soinit.c +++ b/dlls/winecrt0/dll_soinit.c @@ -38,6 +38,7 @@ #ifdef HAVE_LINK_H # include <link.h> #endif +#include "basetsd.h" #ifdef __FreeBSD__

1 0

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

09 Dec '22

Module: wine Branch: master Commit: dae4031a285eb0932e61257a1564e65a7e2a1241 URL: https://gitlab.winehq.org/wine/wine/-/commit/dae4031a285eb0932e61257a1564e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:48:43 2022 +0100 wintab: Consistently use %I printf format for ULONG_PTR values. --- dlls/wintab.dll16/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintab.dll16/wintab.c b/dlls/wintab.dll16/wintab.c index ccf5127c823..b5870228f03 100644 --- a/dlls/wintab.dll16/wintab.c +++ b/dlls/wintab.dll16/wintab.c @@ -329,7 +329,7 @@ BOOL16 WINAPI WTMgrClose16(HMGR16 hMgr) */ BOOL16 WINAPI WTMgrContextEnum16(HMGR16 hMgr, WTENUMPROC16 lpEnumFunc, LPARAM lParam) { - FIXME("(0x%04hx, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(0x%04hx, %p, %Ix): stub\n", hMgr, lpEnumFunc, lParam); return FALSE; } @@ -444,7 +444,7 @@ BOOL16 WINAPI WTMgrPacketUnhook16(HWTHOOK16 hHook) LRESULT WINAPI WTMgrPacketHookDefProc16(INT16 nCode, WPARAM16 wParam, LPARAM lParam, LPWTHOOKPROC16 lplpFunc) { - FIXME("(%hd, %hu, %lu, %p): stub\n", nCode, wParam, lParam, lplpFunc); + FIXME("(%hd, %hu, %Iu, %p): stub\n", nCode, wParam, lParam, lplpFunc); return 0; } @@ -455,7 +455,7 @@ LRESULT WINAPI WTMgrPacketHookDefProc16(INT16 nCode, WPARAM16 wParam, LRESULT WINAPI WTMgrPacketHookNext16(HWTHOOK16 hHook, INT16 nCode, WPARAM16 wParam, LPARAM lParam) { - FIXME("(0x%04hx, %hd, %hu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(0x%04hx, %hd, %hu, %Iu): stub\n", hHook, nCode, wParam, lParam); return 0; }

1 0

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

09 Dec '22

Module: wine Branch: master Commit: 3925f42452aab8075107936cae33a0e37a138d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/3925f42452aab8075107936cae33a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:48:17 2022 +0100 user.exe: Consistently use %I printf format for ULONG_PTR values. --- dlls/user.exe16/bidi.c | 6 +++--- dlls/user.exe16/dialog.c | 2 +- dlls/user.exe16/message.c | 8 ++++---- dlls/user.exe16/user.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index 7b91a322a10..6d346e26b3b 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -81,7 +81,7 @@ HWND16 WINAPI CreateDialogIndirectParamML16( HINSTANCE16 hinstWnd, LPCSTR lpDlgName, HINSTANCE16 hinstLoad ) { - FIXME( "( %04hx, %p, %04hx, %p, %08lx, %hu, %hu, %p, %04hx ): stub\n", + FIXME( "( %04hx, %p, %04hx, %p, %08Ix, %hu, %hu, %p, %04hx ): stub\n", hinstWnd, lpvDlgTmp, hwndOwner, dlgProc, lParamInit, iCodePage, iLang, lpDlgName, hinstLoad ); return 0; @@ -100,7 +100,7 @@ HWND16 WINAPI DialogBoxIndirectParamML16( HINSTANCE16 hinstWnd, LPCSTR lpDlgName, HINSTANCE16 hinstLoad ) { - FIXME( "( %04hx, %04hx, %04hx, %p, %08lx, %hu, %hu, %p, %04hx ): stub\n", + FIXME( "( %04hx, %04hx, %04hx, %p, %08Ix, %hu, %hu, %p, %04hx ): stub\n", hinstWnd, hglbDlgTemp, hwndOwner, dlgprc, lParamInit, iCodePage, iLang, lpDlgName, hinstLoad ); return 0; @@ -267,7 +267,7 @@ INT16 WINAPI MessageBoxEx16( HWND16 hwndParent, LPCSTR lpszText, LRESULT WINAPI QueryCodePage16( UINT16 idxLang, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) { - FIXME( "( %hu, %hu, %04hx, %08lx ): stub\n", idxLang, msg, wParam, lParam ); + FIXME( "( %hu, %hu, %04hx, %08Ix ): stub\n", idxLang, msg, wParam, lParam ); return 0; } diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 315f70dd6f3..b61ae5cd519 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -789,7 +789,7 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate, HGLOBAL16 hmem; LPCVOID data; - TRACE("%04x,%s,%04x,%p,%ld\n", + TRACE("%04x,%s,%04x,%p,%Ix\n", hInst, debugstr_a(dlgTemplate), owner, dlgProc, param ); if (!(hRsrc = FindResource16( hInst, dlgTemplate, (LPSTR)RT_DIALOG ))) return 0; diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 9af217bf5f1..59c58ed9bd9 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1503,9 +1503,9 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx\n", hwnd16, msg, wparam, lparam ); + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix\n", hwnd16, msg, wparam, lparam ); result = CallWindowProc16( winproc, hwnd16, msg, wparam, lparam ); - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx returned %08lx\n", + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix returned %08Ix\n", hwnd16, msg, wparam, lparam, result ); } else /* map to 32-bit unicode for inter-thread/process message */ @@ -1730,9 +1730,9 @@ LONG WINAPI DispatchMessage16( const MSG16* msg ) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx\n", msg->hwnd, msg->message, msg->wParam, msg->lParam ); + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix\n", msg->hwnd, msg->message, msg->wParam, msg->lParam ); retval = CallWindowProc16( winproc, msg->hwnd, msg->message, msg->wParam, msg->lParam ); - TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08lx returned %08lx\n", + TRACE_(message)("(0x%04x) [%04x] wp=%04x lp=%08Ix returned %08Ix\n", msg->hwnd, msg->message, msg->wParam, msg->lParam, retval ); return retval; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 75b81b0ea05..e1b44d28101 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1619,7 +1619,7 @@ UINT16 WINAPI GetMenuState16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags ) LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(%04x, %04x, %08lx, %08lx): stub\n", hDriver, msg, lParam1, lParam2); + FIXME("(%04x, %04x, %08Ix, %08Ix): stub\n", hDriver, msg, lParam1, lParam2); return 0; } @@ -1629,7 +1629,7 @@ LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1, */ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2) { - FIXME( "(%s, %s, %08lx): stub\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); + FIXME( "(%s, %s, %08Ix): stub\n", debugstr_a(lpDriverName), debugstr_a(lpSectionName), lParam2); return 0; } @@ -1639,7 +1639,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP */ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2) { - FIXME( "(%04x, %08lx, %08lx): stub\n", hDrvr, lParam1, lParam2); + FIXME( "(%04x, %08Ix, %08Ix): stub\n", hDrvr, lParam1, lParam2); return FALSE; } @@ -1660,7 +1660,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", + FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08Ix lP2=0x%08Ix: stub\n", dwDevID, hDriv, wMsg, lParam1, lParam2); return 0; }

1 0

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

09 Dec '22

Module: wine Branch: master Commit: 9f6b7eef4306b9c45729a93de58111f4cb6dd38c URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6b7eef4306b9c45729a93de58111… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:47:28 2022 +0100 shell: Consistently use %I printf format for ULONG_PTR values. --- dlls/shell.dll16/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 1b55478be7f..bc3cfdfc97d 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -470,7 +470,7 @@ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length) */ static LRESULT WINAPI SHELL_HookProc(INT code, WPARAM wParam, LPARAM lParam) { - TRACE("%i, %x, %08lx\n", code, wParam, lParam ); + TRACE("%i, %x, %08Ix\n", code, wParam, lParam ); if (SHELL_hWnd) {

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2022