PATCH: compiler flaw workaround in msi/dialog.c

Marcus Meissner meissner at suse.de
Fri Jun 17 09:19:19 CDT 2005


Hi,

This works around a problem in gcc4 which shokes on the 
RICHEDIT_CLASS20W expression we throw at it.

This class name is not really going to change I guess.

Ciao, Marcus

Changelog:
	Use a simpler expression for the "RichEdit20W" string
	to workaround compiler bug.


Index: dlls/msi/dialog.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/dialog.c,v
retrieving revision 1.24
diff -u -r1.24 dialog.c
--- dlls/msi/dialog.c	16 Jun 2005 20:37:53 -0000	1.24
+++ dlls/msi/dialog.c	17 Jun 2005 14:16:58 -0000
@@ -506,7 +506,9 @@
 
 static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec )
 {
-    const LPCWSTR szRichEdit = RICHEDIT_CLASS20W;
+    const static WCHAR szRichEdit20W[] = {
+    	'R','i','c','h','E','d','i','t','2','0','W',0
+    };
     struct msi_streamin_info info;
     msi_control *control;
     LPCWSTR text;
@@ -514,7 +516,7 @@
     DWORD style;
 
     style = WS_BORDER | ES_MULTILINE | WS_VSCROLL | ES_READONLY | ES_AUTOVSCROLL;
-    control = msi_dialog_add_control( dialog, rec, szRichEdit, style );
+    control = msi_dialog_add_control( dialog, rec, szRichEdit20W, style );
 
     text = MSI_RecordGetString( rec, 10 );
     info.string = strdupWtoA( text );
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20050617/6cbb1e75/attachment.pgp


More information about the wine-patches mailing list