From ba9f3dc198dfc81bb40159077b73b797006bb73c Mon Sep 17 00:00:00 2001
From: Jon Doron <arilou@gmail.com>
Date: Thu, 26 Jul 2018 09:49:14 +0300
Subject: [PATCH] kernel32: Fix BeginUpdateResource structure layout.

The utility muirct.exe for some reason accesses the opaque
HANDLE that is returned by BeginUpdateResource, it assumes
a certain structure in which (on 32bit systems) there is a
pointer to the wide repesentation of the file name in offset
0x18 (0x30 on 64bit).

Signed-off-by: Jon Doron <arilou@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/kernel32/resource.c       |  1 +
 dlls/kernel32/tests/resource.c | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index 73f3cca3634..a04fe621aae 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -635,6 +635,7 @@ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc )
 
 typedef struct
 {
+    void *unknown[6];
     LPWSTR pFileName;
     BOOL bDeleteExistingResources;
     struct list root;
diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c
index b3aaed6840c..aef131d32e5 100644
--- a/dlls/kernel32/tests/resource.c
+++ b/dlls/kernel32/tests/resource.c
@@ -24,6 +24,7 @@
 #include "wine/test.h"
 
 static const char filename[] = "test_.exe";
+static const WCHAR filenameW[] = {'t','e','s','t','_','.','e','x','e',0};
 static DWORD GLE;
 
 enum constants {
@@ -463,6 +464,30 @@ static void test_find_resource(void)
     ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() );
 }
 
+typedef struct
+{
+    void *unknown[6];
+    HGLOBAL pFileName;
+} QUEUEDUPDATES;
+
+static void test_internal_structure(void)
+{
+    HANDLE res;
+    QUEUEDUPDATES *res_data;
+    WCHAR *res_filenameW;
+
+    res = BeginUpdateResourceW( filenameW, FALSE );
+    ok( res != NULL, "BeginUpdateResourceW failed\n" );
+    res_data = GlobalLock(res);
+    ok( res_data != NULL, "GlobalLock failed\n" );
+    res_filenameW = GlobalLock( res_data->pFileName );
+    ok( res_filenameW != NULL, "GlobalLock for res_filenameW failed\n" );
+    ok( !lstrcmpW( res_filenameW, filenameW ), "Filename fields do not match\n" );
+    ok( GlobalUnlock( res_filenameW ), "GlobalUnlock res_filenamed failed\n" );
+    ok( GlobalUnlock( res_data ), "GlobalUnlock res_data failed\n" );
+    ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n");
+}
+
 START_TEST(resource)
 {
     DWORD i;
@@ -482,6 +507,7 @@ START_TEST(resource)
     {
         const struct _sec_variants *sec = &sec_variants[i];
         build_exe( &sec->build );
+        test_internal_structure();
         update_resources_none();
         check_exe( &sec->chk_none );
         update_resources_delete();