Tim Clem : win32u: Correct GetRawInputBuffer alignment under WoW64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ca22f551d8d6094d0dc0344a633378be6cf10e6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5ca22f551d8d6094d0dc0344a633378...

Author: Tim Clem <tclem(a)codeweavers.com>
Date:   Fri Jan 13 10:20:55 2023 -0800

win32u: Correct GetRawInputBuffer alignment under WoW64.

Patch originally by Rémi Bernon.

---

 dlls/user32/tests/input.c |  1 -
 dlls/win32u/rawinput.c    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index c2b2e4ded80..95abdbb601b 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -2454,7 +2454,6 @@ static void test_GetRawInputBuffer(void)
     ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size);
 
     ok(HEADER_FIELD(dwType) == RIM_TYPEKEYBOARD, "Unexpected rawinput dwType: %ld\n", HEADER_FIELD(dwType));
-    todo_wine_if(is_wow64)
     ok(HEADER_FIELD(wParam) == 0 || HEADER_FIELD(wParam) == 1, "Expected wparam 0 or 1, got %Iu\n", (WPARAM)HEADER_FIELD(wParam));
     scan_code = is_wow64 ? ((RAWINPUT64 *)buffer)->data.keyboard.MakeCode : ((RAWINPUT *)buffer)->data.keyboard.MakeCode;
     ok(scan_code == 0x2d, "Unexpected rawinput keyboard scan code: %x\n", scan_code);
diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
index ab1252ccea6..1ddbca0896a 100644
--- a/dlls/win32u/rawinput.c
+++ b/dlls/win32u/rawinput.c
@@ -671,10 +671,20 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade
         if (!rawinput_from_hardware_message( data, msg_data )) break;
         if (overhead)
         {
+            /* Under WoW64, GetRawInputBuffer always gives 64-bit RAWINPUT structs. */
+            RAWINPUT64 *ri64 = (RAWINPUT64 *)data;
             memmove( (char *)&data->data + overhead, &data->data,
                      data->header.dwSize - sizeof(RAWINPUTHEADER) );
+            ri64->header.dwSize += overhead;
+
+            /* Need to copy wParam before hDevice so it's not overwritten. */
+            ri64->header.wParam = data->header.wParam;
+#ifdef _WIN64
+            ri64->header.hDevice = data->header.hDevice;
+#else
+            ri64->header.hDevice = HandleToULong(data->header.hDevice);
+#endif
         }
-        data->header.dwSize += overhead;
         remaining -= data->header.dwSize;
         data = NEXTRAWINPUTBLOCK(data);
         msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size);