Serge Gautherie : include: COMMCONFIG.wcProviderData is WCHAR, not DWORD.

Alexandre Julliard julliard at winehq.org
Mon Mar 2 16:22:22 CST 2020


Module: wine
Branch: master
Commit: a59d6387b6734cf0acb187e9c178d7c540751cae
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a59d6387b6734cf0acb187e9c178d7c540751cae

Author: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
Date:   Sat Feb 29 07:37:35 2020 +0100

include: COMMCONFIG.wcProviderData is WCHAR, not DWORD.

Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 ae1f96613a..a166d9746c 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 10b92feb45..2aefd0e043 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 {




More information about the wine-cvs mailing list