From dbf9fba460c37f783414ee04e34ed0e224d65db9 Mon Sep 17 00:00:00 2001 From: Bertho Stultiens <bertho@panter.soci.aau.dk> Date: Sat, 13 Mar 1999 17:09:13 +0000 Subject: [PATCH] Changed the DLGTEMPLATE and DLGITEMTEMPLATE types to adhere to the AW structure for compatibility. --- include/prsht.h | 4 ++-- include/winuser.h | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index 26bbaa2823c..d47cad33d34 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -58,7 +58,7 @@ typedef struct _PROPSHEETPAGEA union { LPCSTR pszTemplate; - LPCDLGTEMPLATE pResource; + LPCDLGTEMPLATEA pResource; }DUMMYUNIONNAME1; union { @@ -84,7 +84,7 @@ typedef struct _PROPSHEETPAGEW union { LPCWSTR pszTemplate; - LPCDLGTEMPLATE pResource; + LPCDLGTEMPLATEW pResource; }DUMMYUNIONNAME1; union { diff --git a/include/winuser.h b/include/winuser.h index 8a1c5ed4e7d..5b01fc15b97 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1642,8 +1642,15 @@ typedef struct tagDLGTEMPLATE short y; short cx; short cy; -}DLGTEMPLATE, *LPDLGTEMPLATE; -typedef const DLGTEMPLATE *LPCDLGTEMPLATE; +} DLGTEMPLATE; + +typedef DLGTEMPLATE *LPDLGTEMPLATEA; +typedef DLGTEMPLATE *LPDLGTEMPLATEW; +#define LPDLGTEMPLATE WINELIB_NAME_AW(LPDLGTEMPLATE) +typedef const DLGTEMPLATE *LPCDLGTEMPLATEA; +typedef const DLGTEMPLATE *LPCDLGTEMPLATEW; +#define LPCDLGTEMPLATE WINELIB_NAME_AW(LPCDLGTEMPLATE) + /* Fixme: use this instaed of LPCVOID for CreateDialogIndirectParam and DialogBoxIndirectParam*/ typedef struct tagDLGITEMTEMPLATE { @@ -1655,9 +1662,15 @@ typedef struct tagDLGITEMTEMPLATE short cx; short cy; WORD id; -}DLGITEMTEMPLATE, *LPDLGITEMTEMPLATE; +} DLGITEMTEMPLATE; + +typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEA; +typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEW; +#define LPDLGITEMTEMPLATE WINELIB_NAME_AW(LPDLGITEMTEMPLATE) +typedef const DLGITEMTEMPLATE *LPCDLGITEMTEMPLATEA; +typedef const DLGITEMTEMPLATE *LPCDLGITEMTEMPLATEW; +#define LPCDLGITEMTEMPLATE WINELIB_NAME_AW(LPCDLGITEMTEMPLATE) -typedef const DLGITEMTEMPLATE *LPCDLGITEMTEMPLATE; /* CBT hook values */ #define HCBT_MOVESIZE 0 -- GitLab