[PATCH 0/1] MR3314: wow64win: Skip WM_CREATE/WM_NCCREATE lParam conversion if NULL

[Billy Laws (＠bylaws)]

lParam being NULL is handled in win32u/defwnd.c so make sure to pass the NULL through rather than relying on the pointer always being valid since it may not be in this case.

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

[PATCH 1/1] wow64win: Skip WM_CREATE/WM_NCCREATE lParam conversion if NULL

[Billy Laws]

From: Billy Laws <blaws05(a)gmail.com>

lParam being NULL is handled in win32u/defwnd.c so make sure to pass the NULL
through rather than relying on the pointer always being valid since it may not
be in this case.
---
 dlls/wow64win/user.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 8065a05f44a..96e7c2ac935 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -2841,7 +2841,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
     {
     case WM_NCCREATE:
     case WM_CREATE:
-        {
+        if (lparam) {
             CREATESTRUCT32 *cs32 = (void *)lparam;
             CREATESTRUCTW cs;
 
@@ -2850,6 +2850,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
             createstruct_64to32( &cs, cs32 );
             return ret;
         }
+        return NtUserMessageCall( hwnd, msg, wparam, lparam, result_info, type, ansi );
 
     case WM_MDICREATE:
         {
-- 
GitLab

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