[PATCH v2 0/3] MR8411: Draft: More fixes to CallWindowProc[AW] calls storing the return value in a 4-byte type.

[Bernhard Übelacker (＠bernhardu)]

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.

--
  v2: winetest: Use LRESULT to return value from CallWindowProcA.

https://gitlab.winehq.org/wine/wine/-/merge_requests/8411

[PATCH v2 1/3] comctl32: Use LRESULT to store return value from CallWindowProcW.

[Bernhard Übelacker]

From: Bernhard Übelacker

---
 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))

[PATCH v2 2/3] comdlg32: Use LRESULT/INT_PTR to store return value from CallWindowProcA.

[Bernhard Übelacker]

From: Bernhard Übelacker

---
 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)

[PATCH v2 3/3] winetest: Use LRESULT to return value from CallWindowProcA.

[Bernhard Übelacker]

From: Bernhard Übelacker

---
 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) {

[Bernhard Übelacker (＠bernhardu)]

v2:
- Removed the user32/tests patch.

[PATCH v2 0/3] MR8411: More fixes to CallWindowProc[AW] calls storing the return value in a 4-byte type. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.

[PATCH v2 0/3] MR8411: More fixes to CallWindowProc[AW] calls storing the return value in a 4-byte type. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.