Jacek Caban : wow64win: Fix NtGdiDdDDICreateDevice thunk.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a17bb304a0c7e0fa4ea09e5b9dfa1617a7962431
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a17bb304a0c7e0fa4ea09e5b9dfa161...

Author: Jacek Caban 
Date:   Thu Aug 18 01:15:13 2022 +0200

wow64win: Fix NtGdiDdDDICreateDevice thunk.

---

dlls/wow64win/gdi.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c
index 5ddadaa642b..6fa36b5f3a3 100644
--- a/dlls/wow64win/gdi.c
+++ b/dlls/wow64win/gdi.c
@@ -239,23 +239,20 @@ NTSTATUS WINAPI wow64_NtGdiDdDDICreateDevice( UINT *args )
         UINT PatchLocationListSize;
     } *desc32 = get_ptr( &args );

-    D3DKMT_CREATEDEVICE desc =
-    {
-        { desc32->hAdapter },
-        desc32->Flags
-    };
+    D3DKMT_CREATEDEVICE desc;
     NTSTATUS status;

+    if (!desc32) return STATUS_INVALID_PARAMETER;
+    desc.hAdapter = desc32->hAdapter;
+    desc.Flags = desc32->Flags;
+    desc.pCommandBuffer = UlongToPtr( desc32->pCommandBuffer );
+    desc.CommandBufferSize = desc32->CommandBufferSize;
+    desc.pAllocationList = UlongToPtr( desc32->pAllocationList );
+    desc.AllocationListSize = desc32->AllocationListSize;
+    desc.pPatchLocationList = UlongToPtr( desc32->pPatchLocationList );
+    desc.PatchLocationListSize = desc32->PatchLocationListSize;
     if (!(status = NtGdiDdDDICreateDevice( &desc )))
-    {
         desc32->hDevice = desc.hDevice;
-        desc32->pCommandBuffer = PtrToUlong( desc.pCommandBuffer );
-        desc32->CommandBufferSize = desc.CommandBufferSize;
-        desc32->pAllocationList = PtrToUlong( desc.pAllocationList );
-        desc32->AllocationListSize = desc.AllocationListSize;
-        desc32->pPatchLocationList = PtrToUlong( desc.pPatchLocationList );
-        desc32->PatchLocationListSize = desc.PatchLocationListSize;
-    }
     return status;
 }