[PATCH] include: COMMCONFIG.wcProviderData is WCHAR, not DWORD.

Serge Gautherie winehq-git_serge_180711 at gautherie.fr
Sat Feb 29 00:37:35 CST 2020


Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
--
* See https://jira.reactos.org/browse/ROSTESTS-251?focusedCommentId=87960&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-87960
* I am not sure what the process is to update generated.c. Please, advice.
---
 dlls/kernel32/tests/generated.c | 8 ++++----
 include/winbase.h               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index ae1f966..a166d97 100644
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -546,8 +546,8 @@ static void test_pack_COMMCONFIG(void)
     TEST_FIELD_SIZE  (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44)
-    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 4)
-    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4)
+    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 2)
+    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2)
     TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48)
 }
 
@@ -2403,8 +2403,8 @@ static void test_pack_COMMCONFIG(void)
     TEST_FIELD_SIZE  (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44)
-    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 4)
-    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4)
+    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 2)
+    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2)
     TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48)
 }
 
diff --git a/include/winbase.h b/include/winbase.h
index 10b92fe..2aefd0e 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1409,7 +1409,7 @@ typedef struct tagCOMMCONFIG {
 	DWORD dwProviderSubType;
 	DWORD dwProviderOffset;
 	DWORD dwProviderSize;
-	DWORD wcProviderData[1];
+	WCHAR wcProviderData[1];
 } COMMCONFIG, *LPCOMMCONFIG;
 
 typedef struct tagCOMMPROP {
-- 
2.10.0.windows.1




More information about the wine-devel mailing list