From 7f012de1d0875bdb664440bf119cc5f8a5cf7b88 Mon Sep 17 00:00:00 2001 From: nidud Date: Tue, 20 Aug 2024 14:17:53 +0200 Subject: [PATCH] 2.35.03 --- include/commctrl.inc | 8 +- include/evntrace.inc | 4 +- include/prsht.inc | 888 ++++++++++++++++++++++++++++--------------- 3 files changed, 592 insertions(+), 308 deletions(-) diff --git a/include/commctrl.inc b/include/commctrl.inc index 7eeb8d9c7..320d8627a 100644 --- a/include/commctrl.inc +++ b/include/commctrl.inc @@ -5088,7 +5088,7 @@ TVINSERTSTRUCTA STRUC hParent HTREEITEM ? hInsertAfter HTREEITEM ? if (_WIN32_IE GE 0x0400) -UNION ;DUMMYUNIONNAME +UNION itemex TVITEMEXA <> item TV_ITEMA <> ENDS @@ -5102,7 +5102,7 @@ TVINSERTSTRUCTW STRUC hParent HTREEITEM ? hInsertAfter HTREEITEM ? if (_WIN32_IE GE 0x0400) -UNION ;DUMMYUNIONNAME +UNION itemex TVITEMEXW <> item TV_ITEMW <> ENDS @@ -7505,7 +7505,7 @@ hInstance HINSTANCE ? dwFlags TASKDIALOG_FLAGS ? dwCommonButtons TASKDIALOG_COMMON_BUTTON_FLAGS ? pszWindowTitle PCWSTR ? -UNION ;DUMMYUNIONNAME +UNION hMainIcon HICON ? pszMainIcon PCWSTR ? ENDS @@ -7521,7 +7521,7 @@ pszVerificationText PCWSTR ? pszExpandedInformation PCWSTR ? pszExpandedControlText PCWSTR ? pszCollapsedControlText PCWSTR ? -UNION ;DUMMYUNIONNAME2 +UNION hFooterIcon HICON ? pszFooterIcon PCWSTR ? ENDS diff --git a/include/evntrace.inc b/include/evntrace.inc index 54fd6ad8e..23a78f071 100644 --- a/include/evntrace.inc +++ b/include/evntrace.inc @@ -711,10 +711,10 @@ LogFileName LPSTR ? LoggerName LPSTR ? CurrentTime LONGLONG ? BuffersRead ULONG ? -UNION ; { +UNION LogFileMode ULONG ? ProcessTraceMode ULONG ? -ENDS ;DUMMYUNIONNAME +ENDS CurrentEvent EVENT_TRACE <> LogfileHeader TRACE_LOGFILE_HEADER <> BufferCallback PEVENT_TRACE_BUFFER_CALLBACKA ? diff --git a/include/prsht.inc b/include/prsht.inc index 167561928..6b13e250c 100644 --- a/include/prsht.inc +++ b/include/prsht.inc @@ -1,387 +1,563 @@ ifndef _PRSHT_H_ define _PRSHT_H_ ifndef __LIBC_INC - include libc.inc +include libc.inc endif ifndef _WIN32_IE -_WIN32_IE equ 0x0400 +define _WIN32_IE 0x0400 else if (_WIN32_IE LT 0x0400) AND defined(_WIN32_WINNT) AND (_WIN32_WINNT GE 0x0500) .err <_WIN32_IE setting conflicts with _WIN32_WINNT setting> endif endif -ifndef WINCOMMCTRLAPI -if NOT defined(_COMCTL32_) AND defined(_WIN32) -WINCOMMCTRLAPI equ DECSPEC_IMPORT -else -WINCOMMCTRLAPI equ 1 -endif -endif - ifndef CCSIZEOF_STRUCT CCSIZEOF_STRUCT macro structname, member exitm endm endif -ifndef DUMMYUNIONNAME -DUMMYUNIONNAME equ 1 -DUMMYUNIONNAME2 equ 1 -DUMMYUNIONNAME3 equ 1 -DUMMYUNIONNAME4 equ 1 -DUMMYUNIONNAME5 equ 1 -endif +.pragma pack(push, size_t) ifndef SNDMSG -SNDMSG equ +define SNDMSG endif -MAXPROPPAGES equ 100 -HPROPSHEETPAGE typedef ptr +define MAXPROPPAGES 100 +HPROPSHEETPAGE typedef ptr -ifndef MIDL_PASS -;PROPSHEETPAGEA; STRUC -;PROPSHEETPAGEW; STRUC -endif - -;UINT -CALLBACK(LPFNPSPCALLBACKA, hwnd:HWND, uMsg:UINT, ppsp:PVOID) -CALLBACK(LPFNPSPCALLBACKW, hwnd:HWND, uMsg:UINT, ppsp:PVOID) +CALLBACK(LPFNPSPCALLBACKA, :HWND, :UINT, :ptr) +CALLBACK(LPFNPSPCALLBACKW, :HWND, :UINT, :ptr) ifdef _UNICODE -LPFNPSPCALLBACK equ +define LPFNPSPCALLBACK else -LPFNPSPCALLBACK equ +define LPFNPSPCALLBACK endif -PSP_DEFAULT equ 0x00000000 -PSP_DLGINDIRECT equ 0x00000001 -PSP_USEHICON equ 0x00000002 -PSP_USEICONID equ 0x00000004 -PSP_USETITLE equ 0x00000008 -PSP_RTLREADING equ 0x00000010 +define PSP_DEFAULT 0x00000000 +define PSP_DLGINDIRECT 0x00000001 +define PSP_USEHICON 0x00000002 +define PSP_USEICONID 0x00000004 +define PSP_USETITLE 0x00000008 +define PSP_RTLREADING 0x00000010 -PSP_HASHELP equ 0x00000020 -PSP_USEREFPARENT equ 0x00000040 -PSP_USECALLBACK equ 0x00000080 -PSP_PREMATURE equ 0x00000400 +define PSP_HASHELP 0x00000020 +define PSP_USEREFPARENT 0x00000040 +define PSP_USECALLBACK 0x00000080 +define PSP_PREMATURE 0x00000400 if (_WIN32_IE GE 0x0400) -PSP_HIDEHEADER equ 0x00000800 -PSP_USEHEADERTITLE equ 0x00001000 -PSP_USEHEADERSUBTITLE equ 0x00002000 +define PSP_HIDEHEADER 0x00000800 +define PSP_USEHEADERTITLE 0x00001000 +define PSP_USEHEADERSUBTITLE 0x00002000 +endif +if (NTDDI_VERSION ge NTDDI_WINXP) or ISOLATION_AWARE_ENABLED +define PSP_USEFUSIONCONTEXT 0x00004000 endif +define PSPCB_ADDREF 0 +define PSPCB_RELEASE 1 +define PSPCB_CREATE 2 + +PROPSHEETPAGE_RESOURCE typedef ptr + +PROPSHEETPAGEA_V1_FIELDS macro + dwSize dd ? + dwFlags dd ? + hInstance HINSTANCE ? + UNION + pszTemplate LPCSTR ? + pResource PVOID ? + ENDS + UNION + hIcon HICON ? + pszIcon LPCSTR ? + ENDS + pszTitle LPCSTR ? + pfnDlgProc DLGPROC ? + lParam LPARAM ? + pfnCallback LPFNPSPCALLBACKA ? + pcRefParent LPDWORD ? + endm -PSPCB_RELEASE equ 1 -PSPCB_CREATE equ 2 - -PROPSHEETPAGEA_V1_SIZE equ CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) -PROPSHEETPAGEW_V1_SIZE equ CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) +PROPSHEETPAGEW_V1_FIELDS macro + dwSize dd ? + dwFlags dd ? + hInstance HINSTANCE ? + UNION + pszTemplate LPCWSTR ? + pResource PVOID ? + ENDS + UNION + hIcon HICON ? + pszIcon LPCWSTR ? + ENDS + pszTitle LPCWSTR ? + pfnDlgProc DLGPROC ? + lParam LPARAM ? + pfnCallback LPFNPSPCALLBACKW ? + pcRefParent PVOID ? + endm -PROPSHEETPAGEA STRUC -dwSize dd ? -dwFlags dd ? -hInstance HINSTANCE ? -UNION ;DUMMYUNIONNAME - pszTemplate LPCSTR ? -ifdef _WIN32 - pResource PVOID ?;LPCDLGTEMPLATE ? +if (NTDDI_VERSION ge NTDDI_VISTA) +define _PROPSHEETPAGEA_V4 <_PROPSHEETPAGEA> +define _PROPSHEETPAGEW_V4 <_PROPSHEETPAGEW> +elseif (NTDDI_VERSION ge NTDDI_WINXP) or ISOLATION_AWARE_ENABLED +define _PROPSHEETPAGEA_V3 <_PROPSHEETPAGEA> +define _PROPSHEETPAGEW_V3 <_PROPSHEETPAGEW> else - pResource PVOID ? +define _PROPSHEETPAGEA_V2 <_PROPSHEETPAGEA> +define _PROPSHEETPAGEW_V2 <_PROPSHEETPAGEW> endif -ENDS -UNION - hIcon HICON ? - pszIcon LPCSTR ? -ENDS -pszTitle LPCSTR ? -pfnDlgProc DLGPROC ? -lParam LPARAM ? -pfnCallback LPFNPSPCALLBACKA ? -pcRefParent LPDWORD ? -if (_WIN32_IE GE 0x0400) + +PROPSHEETPAGEA_V1 struct +PROPSHEETPAGEA_V1_FIELDS +PROPSHEETPAGEA_V1 ends +LPPROPSHEETPAGEA_V1 typedef ptr PROPSHEETPAGEA_V1 +LPCPROPSHEETPAGEA_V1 typedef ptr PROPSHEETPAGEA_V1 + +PROPSHEETPAGEA_V2 struct +PROPSHEETPAGEA_V1_FIELDS pszHeaderTitle LPCSTR ? pszHeaderSubTitle LPCSTR ? +PROPSHEETPAGEA_V2 ends +LPPROPSHEETPAGEA_V2 typedef ptr PROPSHEETPAGEA_V2 +LPCPROPSHEETPAGEA_V2 typedef ptr PROPSHEETPAGEA_V2 + +PROPSHEETPAGEA_V3 struct +PROPSHEETPAGEA_V1_FIELDS +pszHeaderTitle LPCSTR ? +pszHeaderSubTitle LPCSTR ? +hActCtx HANDLE ? +PROPSHEETPAGEA_V3 ends +LPPROPSHEETPAGEA_V3 typedef ptr PROPSHEETPAGEA_V3 +LPCPROPSHEETPAGEA_V3 typedef ptr PROPSHEETPAGEA_V3 + +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGEA_V4 struct +PROPSHEETPAGEA_V1_FIELDS +pszHeaderTitle LPCSTR ? +pszHeaderSubTitle LPCSTR ? +hActCtx HANDLE ? +union + hbmHeader HBITMAP ? + pszbmHeader LPCSTR ? +ends +PROPSHEETPAGEA_V4 ends +LPPROPSHEETPAGEA_V4 typedef ptr PROPSHEETPAGEA_V4 +LPCPROPSHEETPAGEA_V4 typedef ptr PROPSHEETPAGEA_V4 endif -PROPSHEETPAGEA ENDS -LPPROPSHEETPAGEA typedef ptr PROPSHEETPAGEA -LPCPROPSHEETPAGEA typedef ptr PROPSHEETPAGEA - -PROPSHEETPAGEW STRUC -dwSize dd ? -dwFlags dd ? -hInstance HINSTANCE ? -UNION DUMMYUNIONNAME - pszTemplate LPCWSTR ? -ifdef _WIN32 - pResource PVOID ?;LPCDLGTEMPLATE ? -else - pResource PVOID ? -endif -ENDS -UNION DUMMYUNIONNAME2 - hIcon HICON ? - pszIcon LPCWSTR ? -ENDS -pszTitle LPCWSTR ? -pfnDlgProc DLGPROC ? -lParam LPARAM ? -pfnCallback LPFNPSPCALLBACKW ? -pcRefParent PVOID ?;UINT ? -if (_WIN32_IE GE 0x0400) +PROPSHEETPAGEW_V1 struct +PROPSHEETPAGEW_V1_FIELDS +PROPSHEETPAGEW_V1 ends +LPPROPSHEETPAGEW_V1 typedef ptr PROPSHEETPAGEW_V1 +LPCPROPSHEETPAGEW_V1 typedef ptr PROPSHEETPAGEW_V1 + +PROPSHEETPAGEW_V2 struct +PROPSHEETPAGEW_V1_FIELDS +pszHeaderTitle LPCWSTR ? +pszHeaderSubTitle LPCWSTR ? +PROPSHEETPAGEW_V2 ends +LPPROPSHEETPAGEW_V2 typedef ptr PROPSHEETPAGEW_V2 +LPCPROPSHEETPAGEW_V2 typedef ptr PROPSHEETPAGEW_V2 + +PROPSHEETPAGEW_V3 struct +PROPSHEETPAGEW_V1_FIELDS pszHeaderTitle LPCWSTR ? pszHeaderSubTitle LPCWSTR ? +hActCtx HANDLE ? +PROPSHEETPAGEW_V3 ends +LPPROPSHEETPAGEW_V3 typedef ptr PROPSHEETPAGEW_V3 +LPCPROPSHEETPAGEW_V3 typedef ptr PROPSHEETPAGEW_V3 + +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGEW_V4 struct +PROPSHEETPAGEW_V1_FIELDS +pszHeaderTitle LPCWSTR ? +pszHeaderSubTitle LPCWSTR ? +hActCtx HANDLE ? +union + hbmHeader HBITMAP ? + pszbmHeader LPCWSTR ? +ends +PROPSHEETPAGEW_V4 ends +LPPROPSHEETPAGEW_V4 typedef ptr PROPSHEETPAGEW_V4 +LPCPROPSHEETPAGEW_V4 typedef ptr PROPSHEETPAGEW_V4 +endif + +define PROPSHEETPAGEA_V1_SIZE sizeof(PROPSHEETPAGEA_V1) +define PROPSHEETPAGEW_V1_SIZE sizeof(PROPSHEETPAGEW_V1) + +define PROPSHEETPAGEA_V2_SIZE sizeof(PROPSHEETPAGEA_V2) +define PROPSHEETPAGEW_V2_SIZE sizeof(PROPSHEETPAGEW_V2) + +define PROPSHEETPAGEA_V3_SIZE sizeof(PROPSHEETPAGEA_V3) +define PROPSHEETPAGEW_V3_SIZE sizeof(PROPSHEETPAGEW_V3) + +if (NTDDI_VERSION ge NTDDI_VISTA) +define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA_V4) +define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW_V4) +endif + +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGEA_LATEST typedef PROPSHEETPAGEA_V4 +PROPSHEETPAGEW_LATEST typedef PROPSHEETPAGEW_V4 +LPPROPSHEETPAGEA_LATEST typedef LPPROPSHEETPAGEA_V4 +LPPROPSHEETPAGEW_LATEST typedef LPPROPSHEETPAGEW_V4 +LPCPROPSHEETPAGEA_LATEST typedef LPCPROPSHEETPAGEA_V4 +LPCPROPSHEETPAGEW_LATEST typedef LPCPROPSHEETPAGEW_V4 +else +PROPSHEETPAGEA_LATEST typedef PROPSHEETPAGEA_V3 +PROPSHEETPAGEW_LATEST typedef PROPSHEETPAGEW_V3 +LPPROPSHEETPAGEA_LATEST typedef LPPROPSHEETPAGEA_V3 +LPPROPSHEETPAGEW_LATEST typedef LPPROPSHEETPAGEW_V3 +LPCPROPSHEETPAGEA_LATEST typedef LPCPROPSHEETPAGEA_V3 +LPCPROPSHEETPAGEW_LATEST typedef LPCPROPSHEETPAGEW_V3 +endif + +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGEA typedef PROPSHEETPAGEA_V4 +PROPSHEETPAGEW typedef PROPSHEETPAGEW_V4 +LPPROPSHEETPAGEA typedef LPPROPSHEETPAGEA_V4 +LPPROPSHEETPAGEW typedef LPPROPSHEETPAGEW_V4 +LPCPROPSHEETPAGEA typedef LPCPROPSHEETPAGEA_V4 +LPCPROPSHEETPAGEW typedef LPCPROPSHEETPAGEW_V4 +elseif (NTDDI_VERSION ge NTDDI_WINXP) or ISOLATION_AWARE_ENABLED +PROPSHEETPAGEA typedef PROPSHEETPAGEA_V3 +PROPSHEETPAGEW typedef PROPSHEETPAGEW_V3 +LPPROPSHEETPAGEA typedef LPPROPSHEETPAGEA_V3 +LPPROPSHEETPAGEW typedef LPPROPSHEETPAGEW_V3 +LPCPROPSHEETPAGEA typedef LPCPROPSHEETPAGEA_V3 +LPCPROPSHEETPAGEW typedef LPCPROPSHEETPAGEW_V3 +else +PROPSHEETPAGEA typedef PROPSHEETPAGEA_V2 +PROPSHEETPAGEW typedef PROPSHEETPAGEW_V2 +LPPROPSHEETPAGEA typedef LPPROPSHEETPAGEA_V2 +LPPROPSHEETPAGEW typedef LPPROPSHEETPAGEW_V2 +LPCPROPSHEETPAGEA typedef LPCPROPSHEETPAGEA_V2 +LPCPROPSHEETPAGEW typedef LPCPROPSHEETPAGEW_V2 endif -PROPSHEETPAGEW ENDS -LPPROPSHEETPAGEW typedef ptr PROPSHEETPAGEW -LPCPROPSHEETPAGEW typedef ptr PROPSHEETPAGEW ifdef _UNICODE -PROPSHEETPAGE equ PROPSHEETPAGEW -LPPROPSHEETPAGE equ LPPROPSHEETPAGEW -LPCPROPSHEETPAGE equ LPCPROPSHEETPAGEW -PROPSHEETPAGE_V1_SIZE equ PROPSHEETPAGEW_V1_SIZE +PROPSHEETPAGE typedef PROPSHEETPAGEW +LPPROPSHEETPAGE typedef LPPROPSHEETPAGEW +LPCPROPSHEETPAGE typedef LPCPROPSHEETPAGEW +define PROPSHEETPAGE_V1_SIZE PROPSHEETPAGEW_V1_SIZE +define PROPSHEETPAGE_V2_SIZE PROPSHEETPAGEW_V2_SIZE +PROPSHEETPAGE_V1 typedef PROPSHEETPAGEW_V1 +LPPROPSHEETPAGE_V1 typedef LPPROPSHEETPAGEW_V1 +LPCPROPSHEETPAGE_V1 typedef LPCPROPSHEETPAGEW_V1 +PROPSHEETPAGE_V2 typedef PROPSHEETPAGEW_V2 +LPPROPSHEETPAGE_V2 typedef LPPROPSHEETPAGEW_V2 +LPCPROPSHEETPAGE_V2 typedef LPCPROPSHEETPAGEW_V2 +PROPSHEETPAGE_V3 typedef PROPSHEETPAGEW_V3 +LPPROPSHEETPAGE_V3 typedef LPPROPSHEETPAGEW_V3 +LPCPROPSHEETPAGE_V3 typedef LPCPROPSHEETPAGEW_V3 +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGE_V4 typedef PROPSHEETPAGEW_V4 +LPPROPSHEETPAGE_V4 typedef LPPROPSHEETPAGEW_V4 +LPCPROPSHEETPAGE_V4 typedef LPCPROPSHEETPAGEW_V4 +endif +PROPSHEETPAGE_LATEST typedef PROPSHEETPAGEW_LATEST +LPPROPSHEETPAGE_LATEST typedef LPPROPSHEETPAGEW_LATEST +LPCPROPSHEETPAGE_LATEST typedef LPCPROPSHEETPAGEW_LATEST else -PROPSHEETPAGE equ PROPSHEETPAGEA -LPPROPSHEETPAGE equ LPPROPSHEETPAGEA -LPCPROPSHEETPAGE equ LPCPROPSHEETPAGEA -PROPSHEETPAGE_V1_SIZE equ PROPSHEETPAGEA_V1_SIZE +PROPSHEETPAGE typedef PROPSHEETPAGEA +LPPROPSHEETPAGE typedef LPPROPSHEETPAGEA +LPCPROPSHEETPAGE typedef LPCPROPSHEETPAGEA +define PROPSHEETPAGE_V1_SIZE PROPSHEETPAGEA_V1_SIZE +define PROPSHEETPAGE_V2_SIZE PROPSHEETPAGEA_V2_SIZE +PROPSHEETPAGE_V1 typedef PROPSHEETPAGEA_V1 +LPPROPSHEETPAGE_V1 typedef LPPROPSHEETPAGEA_V1 +LPCPROPSHEETPAGE_V1 typedef LPCPROPSHEETPAGEA_V1 +PROPSHEETPAGE_V2 typedef PROPSHEETPAGEA_V2 +LPPROPSHEETPAGE_V2 typedef LPPROPSHEETPAGEA_V2 +LPCPROPSHEETPAGE_V2 typedef LPCPROPSHEETPAGEA_V2 +PROPSHEETPAGE_V3 typedef PROPSHEETPAGEA_V3 +LPPROPSHEETPAGE_V3 typedef LPPROPSHEETPAGEA_V3 +LPCPROPSHEETPAGE_V3 typedef LPCPROPSHEETPAGEA_V3 +if (NTDDI_VERSION ge NTDDI_VISTA) +PROPSHEETPAGE_V4 typedef PROPSHEETPAGEA_V4 +LPPROPSHEETPAGE_V4 typedef LPPROPSHEETPAGEA_V4 +LPCPROPSHEETPAGE_V4 typedef LPCPROPSHEETPAGEA_V4 +endif +PROPSHEETPAGE_LATEST typedef PROPSHEETPAGEA_LATEST +LPPROPSHEETPAGE_LATEST typedef LPPROPSHEETPAGEA_LATEST +LPCPROPSHEETPAGE_LATEST typedef LPCPROPSHEETPAGEA_LATEST endif +define PSH_DEFAULT 0x00000000 +define PSH_PROPTITLE 0x00000001 +define PSH_USEHICON 0x00000002 +define PSH_USEICONID 0x00000004 +define PSH_PROPSHEETPAGE 0x00000008 -PSH_DEFAULT equ 0x00000000 -PSH_PROPTITLE equ 0x00000001 -PSH_USEHICON equ 0x00000002 -PSH_USEICONID equ 0x00000004 -PSH_PROPSHEETPAGE equ 0x00000008 -PSH_WIZARDHASFINISH equ 0x00000010 -PSH_WIZARD equ 0x00000020 -PSH_USEPSTARTPAGE equ 0x00000040 -PSH_NOAPPLYNOW equ 0x00000080 -PSH_USECALLBACK equ 0x00000100 -PSH_HASHELP equ 0x00000200 -PSH_MODELESS equ 0x00000400 -PSH_RTLREADING equ 0x00000800 -PSH_WIZARDCONTEXTHELP equ 0x00001000 +define PSH_WIZARDHASFINISH 0x00000010 +define PSH_WIZARD 0x00000020 +define PSH_USEPSTARTPAGE 0x00000040 +define PSH_NOAPPLYNOW 0x00000080 -if (_WIN32_IE GE 0x0400) -PSH_WIZARD97 equ 0x00002000 -PSH_WATERMARK equ 0x00008000 -PSH_USEHBMWATERMARK equ 0x00010000 -PSH_USEHPLWATERMARK equ 0x00020000 -PSH_STRETCHWATERMARK equ 0x00040000 -PSH_HEADER equ 0x00080000 -PSH_USEHBMHEADER equ 0x00100000 -PSH_USEPAGELANG equ 0x00200000 +define PSH_USECALLBACK 0x00000100 +define PSH_HASHELP 0x00000200 +define PSH_MODELESS 0x00000400 +define PSH_RTLREADING 0x00000800 + +define PSH_WIZARDCONTEXTHELP 0x00001000 + +if (_WIN32_IE lt 0x0500) +define PSH_WIZARD97 0x00002000 +else +define PSH_WIZARD97 0x01000000 endif +define PSH_WATERMARK 0x00008000 +define PSH_USEHBMWATERMARK 0x00010000 +define PSH_USEHPLWATERMARK 0x00020000 +define PSH_STRETCHWATERMARK 0x00040000 +define PSH_HEADER 0x00080000 + +define PSH_USEHBMHEADER 0x00100000 +define PSH_USEPAGELANG 0x00200000 + +define PSH_WIZARD_LITE 0x00400000 +define PSH_NOCONTEXTHELP 0x02000000 + +if (NTDDI_VERSION ge NTDDI_VISTA) +define PSH_AEROWIZARD 0x00004000 +define PSH_RESIZABLE 0x04000000 +define PSH_HEADERBITMAP 0x08000000 +define PSH_NOMARGIN 0x10000000 +endif CALLBACK(PFNPROPSHEETCALLBACK, :HWND, :UINT, :LPARAM) -PROPSHEETHEADERA_V1_SIZE equ CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback) -PROPSHEETHEADERW_V1_SIZE equ CCSIZEOF_STRUCT(PROPSHEETHEADERW, pfnCallback) - -PROPSHEETHEADERA STRUC -dwSize dd ? -dwFlags dd ? -hwndParent HWND ? -hInstance HINSTANCE ? -UNION DUMMYUNIONNAME - hIcon HICON ? - pszIcon LPCSTR ? -ENDS -pszCaption LPCSTR ? -nPages UINT ? -UNION DUMMYUNIONNAME2 - nStartPage UINT ? - pStartPage LPCSTR ? -ENDS -UNION DUMMYUNIONNAME3 - ppsp LPCPROPSHEETPAGEA ? - phpage PVOID ?;HPROPSHEETPAGE ? -ENDS -pfnCallback PFNPROPSHEETCALLBACK ? -if (_WIN32_IE GE 0x0400) -UNION DUMMYUNIONNAME4 +PROPSHEETHEADERA_V1_FIELDS macro + dwSize DWORD ? + dwFlags DWORD ? + hwndParent HWND ? + hInstance HINSTANCE ? + union + hIcon HICON ? + pszIcon LPCSTR ? + ends + pszCaption LPCSTR ? + nPages UINT ? + union + nStartPage UINT ? + pStartPage LPCSTR ? + ends + union + ppsp LPCPROPSHEETPAGEA ? + phpage ptr HPROPSHEETPAGE ? + ends + pfnCallback PFNPROPSHEETCALLBACK ? + endm + +PROPSHEETHEADERA_V1 struct +PROPSHEETHEADERA_V1_FIELDS +PROPSHEETHEADERA_V1 ends +LPPROPSHEETHEADERA_V1 typedef ptr PROPSHEETHEADERA_V1 +LPCPROPSHEETHEADERA_V1 typedef ptr PROPSHEETHEADERA_V1 + +PROPSHEETHEADERA_V2 struct +PROPSHEETHEADERA_V1_FIELDS +union hbmWatermark HBITMAP ? pszbmWatermark LPCSTR ? -ENDS +ends hplWatermark HPALETTE ? -UNION DUMMYUNIONNAME5 +union hbmHeader HBITMAP ? pszbmHeader LPCSTR ? -ENDS -endif -PROPSHEETHEADERA ENDS -LPPROPSHEETHEADERA typedef ptr PROPSHEETHEADERA -LPCPROPSHEETHEADERA typedef ptr PROPSHEETHEADERA - -PROPSHEETHEADERW STRUC -dwSize dd ? -dwFlags dd ? -hwndParent HWND ? -hInstance HINSTANCE ? -UNION DUMMYUNIONNAME - hIcon HICON ? - pszIcon LPCWSTR ? -ENDS -pszCaption LPCWSTR ? -nPages UINT ? -UNION DUMMYUNIONNAME2 - nStartPage UINT ? - pStartPage LPCWSTR ? -ENDS -UNION DUMMYUNIONNAME3 - ppsp LPCPROPSHEETPAGEW ? - phpage PVOID ?;HPROPSHEETPAGE ? -ENDS -pfnCallback PFNPROPSHEETCALLBACK ? -if (_WIN32_IE GE 0x0400) -UNION DUMMYUNIONNAME4 +ends +PROPSHEETHEADERA_V2 ends +LPPROPSHEETHEADERA_V2 typedef ptr PROPSHEETHEADERA_V2 +LPCPROPSHEETHEADERA_V2 typedef ptr PROPSHEETHEADERA_V2 + +PROPSHEETHEADERW_V1_FIELDS macro + dwSize DWORD ? + dwFlags DWORD ? + hwndParent HWND ? + hInstance HINSTANCE ? + union + hIcon HICON ? + pszIcon LPCWSTR ? + ends + pszCaption LPCWSTR ? + nPages UINT ? + union + nStartPage UINT ? + pStartPage LPCWSTR ? + ends + union + ppsp LPCPROPSHEETPAGEW ? + phpage ptr HPROPSHEETPAGE ? + ends + pfnCallback PFNPROPSHEETCALLBACK ? + endm + + +PROPSHEETHEADERW_V1 struct +PROPSHEETHEADERW_V1_FIELDS +PROPSHEETHEADERW_V1 ends +LPPROPSHEETHEADERW_V1 typedef ptr PROPSHEETHEADERW_V1 +LPCPROPSHEETHEADERW_V1 typedef ptr PROPSHEETHEADERW_V1 + +PROPSHEETHEADERW_V2 struct +PROPSHEETHEADERW_V1_FIELDS +union hbmWatermark HBITMAP ? pszbmWatermark LPCWSTR ? -ENDS +ends hplWatermark HPALETTE ? -UNION DUMMYUNIONNAME5 +union hbmHeader HBITMAP ? pszbmHeader LPCWSTR ? -ENDS -endif -PROPSHEETHEADERW ENDS -LPPROPSHEETHEADERW typedef ptr PROPSHEETHEADERW -LPCPROPSHEETHEADERW typedef ptr PROPSHEETHEADERW +ends +PROPSHEETHEADERW_V2 ends +LPPROPSHEETHEADERW_V2 typedef ptr PROPSHEETHEADERW_V2 +LPCPROPSHEETHEADERW_V2 typedef ptr PROPSHEETHEADERW_V2 + +define PROPSHEETHEADERA_V1_SIZE sizeof(PROPSHEETHEADERA_V1) +define PROPSHEETHEADERW_V1_SIZE sizeof(PROPSHEETHEADERW_V1) + +define PROPSHEETHEADERA_V2_SIZE sizeof(PROPSHEETHEADERA_V2) +define PROPSHEETHEADERW_V2_SIZE sizeof(PROPSHEETHEADERW_V2) + +define _PROPSHEETHEADERA +define _PROPSHEETHEADERW + +PROPSHEETHEADERA typedef PROPSHEETHEADERA_V2 +PROPSHEETHEADERW typedef PROPSHEETHEADERW_V2 +LPPROPSHEETHEADERA typedef LPPROPSHEETHEADERA_V2 +LPPROPSHEETHEADERW typedef LPPROPSHEETHEADERW_V2 +LPCPROPSHEETHEADERA typedef LPCPROPSHEETHEADERA_V2 +LPCPROPSHEETHEADERW typedef LPCPROPSHEETHEADERW_V2 ifdef _UNICODE -PROPSHEETHEADER equ PROPSHEETHEADERW -LPPROPSHEETHEADER equ LPPROPSHEETHEADERW -LPCPROPSHEETHEADER equ LPCPROPSHEETHEADERW -PROPSHEETHEADER_V1_SIZE equ PROPSHEETHEADERW_V1_SIZE +PROPSHEETHEADER typedef PROPSHEETHEADERW +LPPROPSHEETHEADER typedef LPPROPSHEETHEADERW +LPCPROPSHEETHEADER typedef LPCPROPSHEETHEADERW +define PROPSHEETHEADER_V1_SIZE PROPSHEETHEADERW_V1_SIZE +define PROPSHEETHEADER_V2_SIZE PROPSHEETHEADERW_V2_SIZE else -PROPSHEETHEADER equ PROPSHEETHEADERA -LPPROPSHEETHEADER equ LPPROPSHEETHEADERA -LPCPROPSHEETHEADER equ LPCPROPSHEETHEADERA -PROPSHEETHEADER_V1_SIZE equ PROPSHEETHEADERA_V1_SIZE +PROPSHEETHEADER typedef PROPSHEETHEADERA +LPPROPSHEETHEADER typedef LPPROPSHEETHEADERA +LPCPROPSHEETHEADER typedef LPCPROPSHEETHEADERA +define PROPSHEETHEADER_V1_SIZE PROPSHEETHEADERA_V1_SIZE +define PROPSHEETHEADER_V2_SIZE PROPSHEETHEADERA_V2_SIZE endif +define PSCB_INITIALIZED 1 +define PSCB_PRECREATE 2 + +if (NTDDI_VERSION ge NTDDI_WINXP) +define PSCB_BUTTONPRESSED 3 +endif -PSCB_INITIALIZED equ 1 -PSCB_PRECREATE equ 2 +CreatePropertySheetPageA proto WINAPI :LPCPROPSHEETPAGEA +CreatePropertySheetPageW proto WINAPI :LPCPROPSHEETPAGEW +DestroyPropertySheetPage proto WINAPI :HPROPSHEETPAGE -;HPROPSHEETPAGE -;HPROPSHEETPAGE -;BOOL -;int -;int +PropertySheetA proto WINAPI :LPCPROPSHEETHEADERA +PropertySheetW proto WINAPI :LPCPROPSHEETHEADERW ifdef _UNICODE -CreatePropertySheetPage equ -PropertySheet equ +define CreatePropertySheetPage +define PropertySheet else -CreatePropertySheetPage equ -PropertySheet equ +define CreatePropertySheetPage +define PropertySheet endif -;BOOL CALLBACK(LPFNADDPROPSHEETPAGE, :HPROPSHEETPAGE, :LPARAM) CALLBACK(LPFNADDPROPSHEETPAGES, :LPVOID, :LPFNADDPROPSHEETPAGE, :LPARAM) -PSHNOTIFY STRUC +PSHNOTIFY struct hdr NMHDR <> lParam LPARAM ? -PSHNOTIFY ENDS +PSHNOTIFY ends LPPSHNOTIFY typedef ptr PSHNOTIFY -PSN_FIRST equ (0-200) -PSN_LAST equ (0-299) - -PSN_SETACTIVE equ (PSN_FIRST-0) -PSN_KILLACTIVE equ (PSN_FIRST-1) -PSN_APPLY equ (PSN_FIRST-2) -PSN_RESET equ (PSN_FIRST-3) -PSN_HELP equ (PSN_FIRST-5) -PSN_WIZBACK equ (PSN_FIRST-6) -PSN_WIZNEXT equ (PSN_FIRST-7) -PSN_WIZFINISH equ (PSN_FIRST-8) -PSN_QUERYCANCEL equ (PSN_FIRST-9) -if (_WIN32_IE GE 0x0400) -PSN_GETOBJECT equ (PSN_FIRST-10) -endif - -PSNRET_NOERROR equ 0 -PSNRET_INVALID equ 1 -PSNRET_INVALID_NOCHANGEPAGE equ 2 - - -PSM_SETCURSEL equ (WM_USER + 101) +define PSN_FIRST (0-200) +define PSN_LAST (0-299) + +define PSN_SETACTIVE (PSN_FIRST-0) +define PSN_KILLACTIVE (PSN_FIRST-1) +define PSN_APPLY (PSN_FIRST-2) +define PSN_RESET (PSN_FIRST-3) +define PSN_HELP (PSN_FIRST-5) +define PSN_WIZBACK (PSN_FIRST-6) +define PSN_WIZNEXT (PSN_FIRST-7) +define PSN_WIZFINISH (PSN_FIRST-8) +define PSN_QUERYCANCEL (PSN_FIRST-9) +define PSN_GETOBJECT (PSN_FIRST-10) +define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12) +define PSN_QUERYINITIALFOCUS (PSN_FIRST-13) +define PSNRET_NOERROR 0 +define PSNRET_INVALID 1 +define PSNRET_INVALID_NOCHANGEPAGE 2 +define PSNRET_MESSAGEHANDLED 3 + +define PSM_SETCURSEL (WM_USER + 101) PropSheet_SetCurSel macro hDlg, hpage, index - exitm + exitm endm - -PSM_REMOVEPAGE equ (WM_USER + 102) +define PSM_REMOVEPAGE (WM_USER + 102) PropSheet_RemovePage macro hDlg, index, hpage - exitm + exitm endm - -PSM_ADDPAGE equ (WM_USER + 103) +define PSM_ADDPAGE (WM_USER + 103) PropSheet_AddPage macro hDlg, hpage - exitm + exitm endm - -PSM_CHANGED equ (WM_USER + 104) +define PSM_CHANGED (WM_USER + 104) PropSheet_Changed macro hDlg, hwnd - exitm + exitm endm - -PSM_RESTARTWINDOWS equ (WM_USER + 105) +define PSM_RESTARTWINDOWS (WM_USER + 105) PropSheet_RestartWindows macro hDlg exitm endm - -PSM_REBOOTSYSTEM equ (WM_USER + 106) +define PSM_REBOOTSYSTEM (WM_USER + 106) PropSheet_RebootSystem macro hDlg exitm endm - -PSM_CANCELTOCLOSE equ (WM_USER + 107) +define PSM_CANCELTOCLOSE (WM_USER + 107) PropSheet_CancelToClose macro hDlg exitm endm - -PSM_QUERYSIBLINGS equ (WM_USER + 108) +define PSM_QUERYSIBLINGS (WM_USER + 108) PropSheet_QuerySiblings macro hDlg, wParam, lParam - exitm + exitm endm - -PSM_UNCHANGED equ (WM_USER + 109) +define PSM_UNCHANGED (WM_USER + 109) PropSheet_UnChanged macro hDlg, hwnd - exitm + exitm endm - -PSM_APPLY equ (WM_USER + 110) +define PSM_APPLY (WM_USER + 110) PropSheet_Apply macro hDlg exitm endm - -PSM_SETTITLEA equ (WM_USER + 111) -PSM_SETTITLEW equ (WM_USER + 120) +define PSM_SETTITLEA (WM_USER + 111) +define PSM_SETTITLEW (WM_USER + 120) ifdef _UNICODE -PSM_SETTITLE equ PSM_SETTITLEW +define PSM_SETTITLE else -PSM_SETTITLE equ PSM_SETTITLEA +define PSM_SETTITLE endif PropSheet_SetTitle macro hDlg, wStyle, lpszText @@ -389,48 +565,52 @@ PropSheet_SetTitle macro hDlg, wStyle, lpszText endm -PSM_SETWIZBUTTONS equ (WM_USER + 112) +define PSM_SETWIZBUTTONS (WM_USER + 112) PropSheet_SetWizButtons macro hDlg, dwFlags exitm endm -PSWIZB_BACK equ 0x00000001 -PSWIZB_NEXT equ 0x00000002 -PSWIZB_FINISH equ 0x00000004 -PSWIZB_DISABLEDFINISH equ 0x00000008 +define PSWIZB_BACK 0x00000001 +define PSWIZB_NEXT 0x00000002 +define PSWIZB_FINISH 0x00000004 +define PSWIZB_DISABLEDFINISH 0x00000008 +define PSWIZBF_ELEVATIONREQUIRED 0x00000001 + +if (NTDDI_VERSION ge NTDDI_VISTA) +define PSWIZB_CANCEL 0x00000010 +endif -PSM_PRESSBUTTON equ (WM_USER + 113) + +define PSM_PRESSBUTTON (WM_USER + 113) PropSheet_PressButton macro hDlg, iButton exitm endm -PSBTN_BACK equ 0 -PSBTN_NEXT equ 1 -PSBTN_FINISH equ 2 -PSBTN_OK equ 3 -PSBTN_APPLYNOW equ 4 -PSBTN_CANCEL equ 5 -PSBTN_HELP equ 6 -PSBTN_MAX equ 6 - +define PSBTN_BACK 0 +define PSBTN_NEXT 1 +define PSBTN_FINISH 2 +define PSBTN_OK 3 +define PSBTN_APPLYNOW 4 +define PSBTN_CANCEL 5 +define PSBTN_HELP 6 +define PSBTN_MAX 6 -PSM_SETCURSELID equ (WM_USER + 114) +define PSM_SETCURSELID (WM_USER + 114) PropSheet_SetCurSelByID macro hDlg, id - exitm + exitm endm - -PSM_SETFINISHTEXTA equ (WM_USER + 115) -PSM_SETFINISHTEXTW equ (WM_USER + 121) +define PSM_SETFINISHTEXTA (WM_USER + 115) +define PSM_SETFINISHTEXTW (WM_USER + 121) ifdef _UNICODE -PSM_SETFINISHTEXT equ PSM_SETFINISHTEXTW +define PSM_SETFINISHTEXT else -PSM_SETFINISHTEXT equ PSM_SETFINISHTEXTA +define PSM_SETFINISHTEXT endif PropSheet_SetFinishText macro hDlg, lpszText @@ -438,40 +618,144 @@ PropSheet_SetFinishText macro hDlg, lpszText endm -PSM_GETTABCONTROL equ (WM_USER + 116) +define PSM_GETTABCONTROL (WM_USER + 116) PropSheet_GetTabControl macro hDlg exitm endm -PSM_ISDIALOGMESSAGE equ (WM_USER + 117) +define PSM_ISDIALOGMESSAGE (WM_USER + 117) PropSheet_IsDialogMessage macro hDlg, pMsg - exitm + exitm endm -PSM_GETCURRENTPAGEHWND equ (WM_USER + 118) +define PSM_GETCURRENTPAGEHWND (WM_USER + 118) PropSheet_GetCurrentPageHwnd macro hDlg exitm endm -ID_PSRESTARTWINDOWS equ 0x2 -ID_PSREBOOTSYSTEM equ (ID_PSRESTARTWINDOWS OR 0x1) +define PSM_INSERTPAGE (WM_USER + 119) +PropSheet_InsertPage macro hDlg, index, hpage + exitm + endm +if (NTDDI_VERSION ge NTDDI_VISTA) +define PSWIZF_SETCOLOR (-1) +endif -WIZ_CXDLG equ 276 -WIZ_CYDLG equ 140 +define PSM_SETHEADERTITLEA (WM_USER + 125) +define PSM_SETHEADERTITLEW (WM_USER + 126) -WIZ_CXBMP equ 80 +ifdef _UNICODE +define PSM_SETHEADERTITLE +else +define PSM_SETHEADERTITLE +endif -WIZ_BODYX equ 92 -WIZ_BODYCX equ 184 +PropSheet_SetHeaderTitle macro hDlg, index, lpszText + exitm + endm -PROP_SM_CXDLG equ 212 -PROP_SM_CYDLG equ 188 +define PSM_SETHEADERSUBTITLEA (WM_USER + 127) +define PSM_SETHEADERSUBTITLEW (WM_USER + 128) -PROP_MED_CXDLG equ 227 -PROP_MED_CYDLG equ 215 +ifdef _UNICODE +define PSM_SETHEADERSUBTITLE +else +define PSM_SETHEADERSUBTITLE +endif -PROP_LG_CXDLG equ 252 -PROP_LG_CYDLG equ 218 +PropSheet_SetHeaderSubTitle macro hDlg, index, lpszText + exitm + endm + +define PSM_HWNDTOINDEX (WM_USER + 129) +PropSheet_HwndToIndex macro hDlg, hwnd + exitm + endm + +define PSM_INDEXTOHWND (WM_USER + 130) +PropSheet_IndexToHwnd macro hDlg, i + exitm + endm + +define PSM_PAGETOINDEX (WM_USER + 131) +PropSheet_PageToIndex macro hDlg, hpage + exitm + endm + +define PSM_INDEXTOPAGE (WM_USER + 132) +PropSheet_IndexToPage macro hDlg, i + exitm + endm + +define PSM_IDTOINDEX (WM_USER + 133) +PropSheet_IdToIndex macro hDlg, id +exitm +endm + +define PSM_INDEXTOID (WM_USER + 134) +PropSheet_IndexToId macro hDlg, i + exitm + endm + +define PSM_GETRESULT (WM_USER + 135) +PropSheet_GetResult macro hDlg + exitm + endm + +define PSM_RECALCPAGESIZES (WM_USER + 136) +PropSheet_RecalcPageSizes macro hDlg + exitm + endm + +if (NTDDI_VERSION ge NTDDI_VISTA) +define PSM_SETNEXTTEXTW (WM_USER + 137) +define PSM_SETNEXTTEXT + +PropSheet_SetNextText macro hDlg, lpszText + exitm + endm + +define PSWIZB_SHOW 0 +define PSWIZB_RESTORE 1 + +define PSM_SHOWWIZBUTTONS (WM_USER + 138) +PropSheet_ShowWizButtons macro hDlg, dwFlag, dwButton + exitm + endm + +define PSM_ENABLEWIZBUTTONS (WM_USER + 139) +PropSheet_EnableWizButtons macro hDlg, dwState, dwMask + exitm + endm + +define PSM_SETBUTTONTEXTW (WM_USER + 140) +define PSM_SETBUTTONTEXT +PropSheet_SetButtonText macro hDlg, dwButton, lpszText + exitm + endm + +endif + + +define ID_PSRESTARTWINDOWS 0x2 +define ID_PSREBOOTSYSTEM (ID_PSRESTARTWINDOWS or 0x1) + +define WIZ_CXDLG 276 +define WIZ_CYDLG 140 +define WIZ_CXBMP 80 +define WIZ_BODYX 92 +define WIZ_BODYCX 184 +define PROP_SM_CXDLG 212 +define PROP_SM_CYDLG 188 +define PROP_MED_CXDLG 227 +define PROP_MED_CYDLG 215 +define PROP_LG_CXDLG 252 +define PROP_LG_CYDLG 218 + +if defined(ISOLATION_AWARE_ENABLED) and (ISOLATION_AWARE_ENABLED ne 0) +;include prsht.inl +endif +.pragma pack(pop) endif