[PATCH 0/4] MR8411: More fixes to CallWindowProc[AW] calls storing the return value in a 4-byte type.
While preparing !8397 I wondered If there other uses of CallWindowProc[AW] which use a 4-byte sized type to store the return value, while at x86_64 LRESULT is 8 bytes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8411
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/comctl32/ipaddress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index be7e45def97..af1ae11300e 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -529,7 +529,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if(isdigit(c)) { if(len == 2 && startsel==endsel && endsel==len) { /* process the digit press before we check the field */ - int return_val = CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam); + LRESULT return_val = CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam); /* if the field value was changed stay at the current field */ if(!IPADDRESS_ConstrainField(infoPtr, index)) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8411
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/comdlg32/colordlg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 2ee331bb9ae..041c02fd7f6 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -848,7 +848,8 @@ static BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc ) static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) { CHOOSECOLORW *cc = (CHOOSECOLORW*)lParam; - int i, res; + int i; + LRESULT res; int r, g, b; HWND hwnd; RECT rect; @@ -1198,7 +1199,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { - int res; + INT_PTR res; CCPRIV *lpp = GetPropW( hDlg, L"colourdialogprop" ); if (message != WM_INITDIALOG) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8411
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/user32/tests/msg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5f7318dffd..2b5cc7bf680 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10145,7 +10145,8 @@ static void test_interthread_messages(void) WNDPROC proc; MSG msg; char buf[256]; - int len, expected_len; + LRESULT len; + int expected_len; struct wnd_event wnd_event; BOOL ret; @@ -10175,7 +10176,7 @@ static void test_interthread_messages(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); len = CallWindowProcA(proc, wnd_event.hwnd, WM_GETTEXT, sizeof(buf), (LPARAM)buf); - ok(len == expected_len, "CallWindowProcA(WM_GETTEXT) error %ld, len %d, expected len %d\n", GetLastError(), len, expected_len); + ok(len == expected_len, "CallWindowProcA(WM_GETTEXT) error %ld, len %Id, expected len %d\n", GetLastError(), len, expected_len); ok(!lstrcmpA(buf, "window caption text"), "window text mismatch\n"); msg.hwnd = wnd_event.hwnd; @@ -10186,7 +10187,7 @@ static void test_interthread_messages(void) SetLastError(0xdeadbeef); len = DispatchMessageA(&msg); ok((!len && GetLastError() == ERROR_MESSAGE_SYNC_ONLY) || broken(len), /* nt4 */ - "DispatchMessageA(WM_GETTEXT) succeeded on another thread window: ret %d, error %ld\n", len, GetLastError()); + "DispatchMessageA(WM_GETTEXT) succeeded on another thread window: ret %Id, error %ld\n", len, GetLastError()); /* the following test causes an exception in user.exe under win9x */ msg.hwnd = wnd_event.hwnd; @@ -10196,7 +10197,7 @@ static void test_interthread_messages(void) SetLastError(0xdeadbeef); len = DispatchMessageA(&msg); ok(!len && GetLastError() == 0xdeadbeef, - "DispatchMessageA(WM_TIMER) failed on another thread window: ret %d, error %ld\n", len, GetLastError()); + "DispatchMessageA(WM_TIMER) failed on another thread window: ret %Id, error %ld\n", len, GetLastError()); ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); ok( ret, "PostMessageA(WM_QUIT) error %ld\n", GetLastError()); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8411
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/winetest/gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 88ba105bf4d..b0b176c50b4 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -311,7 +311,7 @@ guiAsk (va_list ap) return ret; } -static BOOL CALLBACK +static LRESULT CALLBACK EditTagProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8411
Windows tests failing, need to investigate, switchting to draft. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8411#note_107767
participants (1)
-
Bernhard Übelacker