appwiz.cpl: Fix compilation on systems that don't support nameless unions.
Francois Gouget
fgouget at free.fr
Sat Jul 26 12:11:37 CDT 2008
---
Note: NONAMELESSUNION must be defined before including wine/unicode.h
because it includes winnt.h which uses it.
dlls/appwiz.cpl/appwiz.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index e06d810..6da1a77 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -23,6 +23,8 @@
*
*/
+#define NONAMELESSUNION
+
#include "config.h"
#include "wine/port.h"
#include "wine/unicode.h"
@@ -708,8 +710,8 @@ static void StartApplet(HWND hWnd)
psp.dwSize = sizeof (PROPSHEETPAGEW);
psp.dwFlags = PSP_USETITLE;
psp.hInstance = hInst;
- psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
- psp.pszIcon = NULL;
+ psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
+ psp.u2.pszIcon = NULL;
psp.pfnDlgProc = (DLGPROC) MainDlgProc;
psp.pszTitle = tab_title;
psp.lParam = 0;
@@ -719,12 +721,12 @@ static void StartApplet(HWND hWnd)
psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID;
psh.hwndParent = hWnd;
psh.hInstance = hInst;
- psh.pszIcon = NULL;
+ psh.u.pszIcon = NULL;
psh.pszCaption = app_title;
psh.nPages = 1;
- psh.ppsp = &psp;
+ psh.u3.ppsp = &psp;
psh.pfnCallback = NULL;
- psh.nStartPage = 0;
+ psh.u2.nStartPage = 0;
/* Display the property sheet */
PropertySheetW (&psh);
--
1.5.6.2
More information about the wine-patches
mailing list