From 787798e96f3fea5a0751982e00f8389cffbf38b8 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Fri, 2 Apr 2021 14:54:40 +0000
Subject: [PATCH]  * split propsheetheader in  -A and -W variants.

git-svn-id: trunk@49101 -
---
 rtl/win/wininc/struct.inc | 73 +++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/rtl/win/wininc/struct.inc b/rtl/win/wininc/struct.inc
index ea67cfebed..87c26e767d 100644
--- a/rtl/win/wininc/struct.inc
+++ b/rtl/win/wininc/struct.inc
@@ -6304,41 +6304,92 @@ Const
      lpemptyrecord = ^emptyrecord;
      HPROPSHEETPAGE = ^emptyrecord;
 
-     PROPSHEETHEADER = record
+     PROPSHEETHEADERA = record
           dwSize : DWORD;
           dwFlags : DWORD;
           hwndParent : HWND;
           hInstance : HINST;
           case longint of
               0 : (hIcon : HICON);
-              1 : (pszIcon : LPCTSTR;
-                   pszCaption : LPCTSTR;
+              1 : (pszIcon : LPCSTR;
+                   pszCaption : LPCSTR;
                    nPages : UINT;
                    case longint of
                       0 : (nStartPage : UINT);
-                      1 : (pStartPage : LPCTSTR;
+                      1 : (pStartPage : LPCSTR;
                            case longint of
                               0 : (ppsp : LPCPROPSHEETPAGE);
                               1 : (phpage : ^HPROPSHEETPAGE;
                                    pfnCallback : PFNPROPSHEETCALLBACK;
                                    case longint of
                                      0 : (hbmWatermark : HBITMAP);
-                                     1 : (pszbmWatermark : LPCTSTR;
+                                     1 : (pszbmWatermark : LPCSTR;
                                           hplWatermark : HPALETTE;
                                           case longint of
                                              0 : (hbmHeader : HBITMAP);
-                                             1 : (pszbmHeader: PAnsiChar);
+                                             1 : (pszbmHeader: LPCStr);
                                          );
                                   );
                           );
                   );
        end;
-     LPPROPSHEETHEADER = ^PROPSHEETHEADER;
-     LPCPROPSHEETHEADER = ^PROPSHEETHEADER;
-     _PROPSHEETHEADER = PROPSHEETHEADER;
-     TPROPSHEETHEADER = PROPSHEETHEADER;
-     PPROPSHEETHEADER = ^PROPSHEETHEADER;
+     LPPROPSHEETHEADERA = ^PROPSHEETHEADERA;
+     LPCPROPSHEETHEADERA = ^PROPSHEETHEADERA;
+     _PROPSHEETHEADERA = PROPSHEETHEADERA;
+     TPROPSHEETHEADERA = PROPSHEETHEADERA;
+     PPROPSHEETHEADERA = ^PROPSHEETHEADERA;
 
+     PROPSHEETHEADERW = record
+          dwSize : DWORD;
+          dwFlags : DWORD;
+          hwndParent : HWND;
+          hInstance : HINST;
+          case longint of
+              0 : (hIcon : HICON);
+              1 : (pszIcon : LPCWSTR;
+                   pszCaption : LPCWSTR;
+                   nPages : UINT;
+                   case longint of
+                      0 : (nStartPage : UINT);
+                      1 : (pStartPage : LPCWSTR;
+                           case longint of
+                              0 : (ppsp : LPCPROPSHEETPAGE);
+                              1 : (phpage : ^HPROPSHEETPAGE;
+                                   pfnCallback : PFNPROPSHEETCALLBACK;
+                                   case longint of
+                                     0 : (hbmWatermark : HBITMAP);
+                                     1 : (pszbmWatermark : LPCWSTR;
+                                          hplWatermark : HPALETTE;
+                                          case longint of
+                                             0 : (hbmHeader : HBITMAP);
+                                             1 : (pszbmHeader: LPCWStr);
+                                         );
+                                  );
+                          );
+                  );
+       end;
+     LPPROPSHEETHEADERW = ^PROPSHEETHEADERW;
+     LPCPROPSHEETHEADERW = ^PROPSHEETHEADERW;
+     _PROPSHEETHEADERW = PROPSHEETHEADERW;
+     TPROPSHEETHEADERW = PROPSHEETHEADERW;
+     PPROPSHEETHEADERW = ^PROPSHEETHEADERW;
+
+     {$ifdef Unicode}
+     PROPSHEETHEADER    = PROPSHEETHEADERW;
+     LPPROPSHEETHEADER  = LPPROPSHEETHEADERW;
+     LPCPROPSHEETHEADER = LPCPROPSHEETHEADERW;
+     _PROPSHEETHEADER   = _PROPSHEETHEADERW;
+     TPROPSHEETHEADER   = TPROPSHEETHEADERW;
+     PPROPSHEETHEADER   = PPROPSHEETHEADERW;
+     {$else}
+     PROPSHEETHEADER    = PROPSHEETHEADERA;
+     LPPROPSHEETHEADER  = LPPROPSHEETHEADERA;
+     LPCPROPSHEETHEADER = LPCPROPSHEETHEADERA;
+     _PROPSHEETHEADER   = _PROPSHEETHEADERA;
+     TPROPSHEETHEADER   = TPROPSHEETHEADERA;
+     PPROPSHEETHEADER   = PPROPSHEETHEADERA;
+     {$endif}
+    
      { PropertySheet callbacks  }
      LPFNADDPROPSHEETPAGE = function (_para1:HPROPSHEETPAGE; _para2:LPARAM):WINBOOL;stdcall;
      TFNADDPROPSHEETPAGE = LPFNADDPROPSHEETPAGE;