ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordpad: Fix compilation on systems that don't support nameless unions.

This commit is contained in:
Francois Gouget 2007-09-18 00:39:11 +02:00 committed by Alexandre Julliard
parent 4035b22bf7
commit 03d7f2d4ad
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
programs/wordpad/wordpad.c
View File

@ -40,6 +40,16 @@
#include "resource.h" #include "resource.h"
#ifdef NONAMELESSUNION
# define U(x) (x).u
# define U2(x) (x).u2
# define U3(x) (x).u3
#else
# define U(x) (x)
# define U2(x) (x)
# define U3(x) (x)
#endif
/* use LoadString */ /* use LoadString */
static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};
static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0}; static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0};
@ -1773,7 +1783,7 @@ static void dialog_viewproperties(void)
psp[0].dwSize = sizeof(PROPSHEETPAGEW); psp[0].dwSize = sizeof(PROPSHEETPAGEW);
psp[0].dwFlags = PSP_USETITLE; psp[0].dwFlags = PSP_USETITLE;
psp[0].pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); U(psp[0]).pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS);
psp[0].pfnDlgProc = formatopts_proc; psp[0].pfnDlgProc = formatopts_proc;
psp[0].hInstance = hInstance; psp[0].hInstance = hInstance;
psp[0].lParam = reg_formatindex(SF_TEXT); psp[0].lParam = reg_formatindex(SF_TEXT);
@ -1783,7 +1793,7 @@ static void dialog_viewproperties(void)
{ {
psp[i].dwSize = psp[0].dwSize; psp[i].dwSize = psp[0].dwSize;
psp[i].dwFlags = psp[0].dwFlags; psp[i].dwFlags = psp[0].dwFlags;
psp[i].pszTemplate = psp[0].pszTemplate; U(psp[i]).pszTemplate = U(psp[0]).pszTemplate;
psp[i].pfnDlgProc = psp[0].pfnDlgProc; psp[i].pfnDlgProc = psp[0].pfnDlgProc;
psp[i].hInstance = psp[0].hInstance; psp[i].hInstance = psp[0].hInstance;
psp[i].lParam = reg_formatindex(SF_RTF); psp[i].lParam = reg_formatindex(SF_RTF);
@ -1797,13 +1807,13 @@ static void dialog_viewproperties(void)
psh.hInstance = hInstance; psh.hInstance = hInstance;
psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE); psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE);
psh.nPages = sizeof(psp)/sizeof(psp[0]); psh.nPages = sizeof(psp)/sizeof(psp[0]);
psh.ppsp = ppsp; U3(psh).ppsp = ppsp;
psh.pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD);
if(fileFormat & SF_RTF) if(fileFormat & SF_RTF)
psh.nStartPage = 1; U2(psh).nStartPage = 1;
else else
psh.nStartPage = 0; U2(psh).nStartPage = 0;
PropertySheetW(&psh); PropertySheetW(&psh);
set_bar_states(); set_bar_states();
target_device(); target_device();