* fixed some more tchar cases into a proper ifdef unicode -W else -A structure.

git-svn-id: trunk@24922 -

rtl/win/wininc/struct.inc

@@ -579,7 +579,7 @@ Const
      TCHAR_INFO = CHAR_INFO;
      PCHAR_INFO = ^CHAR_INFO;
 
-     CHARFORMAT = record
+     CHARFORMATA = record
           cbSize : UINT;
           dwMask : DWORD;
           dwEffects : DWORD;
@@ -588,11 +588,37 @@ Const
           crTextColor : COLORREF;
           bCharSet : BYTE;
           bPitchAndFamily : BYTE;
-          szFaceName : array[0..(LF_FACESIZE)-1] of TCHAR;
+          szFaceName : array[0..(LF_FACESIZE)-1] of AnsiCHAR;
        end;
-     _charformat = CHARFORMAT;
-     Tcharformat = CHARFORMAT;
-     Pcharformat = ^CHARFORMAT;
+     _CHARFORMATA = CHARFORMATA;
+     TCHARFORMATA = CHARFORMATA;
+     PCHARFORMATA = ^CHARFORMATA;
+
+     CHARFORMATW = record
+          cbSize : UINT;
+          dwMask : DWORD;
+          dwEffects : DWORD;
+          yHeight : LONG;
+          yOffset : LONG;
+          crTextColor : COLORREF;
+          bCharSet : BYTE;
+          bPitchAndFamily : BYTE;
+          szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
+       end;
+     _CHARFORMATW = CHARFORMATW;
+     TCHARFORMATW = CHARFORMATW;
+     PCHARFORMATW = ^CHARFORMATW;
+{$ifdef Unicode}
+   CHARFORMAT  = CHARFORMATW;
+   _CHARFORMAT = CHARFORMATW;
+   TCHARFORMAT = CHARFORMATW;
+   PCHARFORMAT = PCHARFORMATW;
+{$else}
+   CHARFORMAT  = CHARFORMATA;
+   _CHARFORMAT = CHARFORMATA;
+   TCHARFORMAT = CHARFORMATA;
+   PCHARFORMAT = PCHARFORMATA;
+{$endif}
 
      CHARRANGE = record
           cpMin : LONG;
@@ -657,7 +683,7 @@ Const
           lfClipPrecision : BYTE;
           lfQuality : BYTE;
           lfPitchAndFamily : BYTE;
-          lfFaceName : array[0..(LF_FACESIZE)-1] of TCHAR;
+          lfFaceName : array[0..(LF_FACESIZE)-1] of AnsiCHAR;
        end;
      LPLOGFONTA = ^LOGFONTA;
      _LOGFONTA  = LOGFONTA;
@@ -1544,16 +1570,16 @@ Const
 
 {$ifndef UNICODE}
      CPINFOEX   = CPINFOEXA;
-     LPCPINFOEX = ^CPINFOEXA;
+     LPCPINFOEX = PCPINFOEXA;
      _cpinfoex  = CPINFOEXA;
      Tcpinfoex  = CPINFOEXA;
-     Pcpinfoex  = ^CPINFOEXA;
+     Pcpinfoex  = PCPINFOEXA;
 {$ELSE}
      CPINFOEX   = CPINFOEXW;
-     LPCPINFOEX = ^CPINFOEXW;
+     LPCPINFOEX = PCPINFOEXW;
      _cpinfoex  = CPINFOEXW;
      Tcpinfoex  = CPINFOEXW;
-     Pcpinfoex  = ^CPINFOEXW;
+     Pcpinfoex  = PCPINFOEXW;
 {$ENDIF}
 
      CPLINFO = record
@@ -2564,7 +2590,24 @@ Const
 
      LCSGAMUTMATCH = LONG;
 
-     LOGCOLORSPACE = record
+     LOGCOLORSPACEA = record
+          lcsSignature : DWORD;
+          lcsVersion : DWORD;
+          lcsSize : DWORD;
+          lcsCSType : LCSCSTYPE;
+          lcsIntent : LCSGAMUTMATCH;
+          lcsEndpoints : CIEXYZTRIPLE;
+          lcsGammaRed : DWORD;
+          lcsGammaGreen : DWORD;
+          lcsGammaBlue : DWORD;
+          lcsFilename : array[0..(MAX_PATH)-1] of ANSICHAR;
+       end;
+     LPLOGCOLORSPACEA  = ^LOGCOLORSPACEA;
+     tagLOGCOLORSPACEA = LOGCOLORSPACEA;
+     TLOGCOLORSPACEA   = LOGCOLORSPACEA;
+     PLOGCOLORSPACEA   = ^LOGCOLORSPACEA;
+
+     LOGCOLORSPACEW = record
           lcsSignature : DWORD;
           lcsVersion : DWORD;
           lcsSize : DWORD;
@@ -2574,13 +2617,25 @@ Const
           lcsGammaRed : DWORD;
           lcsGammaGreen : DWORD;
           lcsGammaBlue : DWORD;
-          lcsFilename : array[0..(MAX_PATH)-1] of TCHAR;
+          lcsFilename : array[0..(MAX_PATH)-1] of WIDECHAR;
        end;
-     LPLOGCOLORSPACE = ^LOGCOLORSPACE;
-     tagLOGCOLORSPACE = LOGCOLORSPACE;
-     TLOGCOLORSPACE = LOGCOLORSPACE;
-     TLOGCOLORSPACEA = LOGCOLORSPACE;
-     PLOGCOLORSPACE = ^LOGCOLORSPACE;
+     LPLOGCOLORSPACEW  = ^LOGCOLORSPACEW;
+     tagLOGCOLORSPACEW = LOGCOLORSPACEW;
+     TLOGCOLORSPACEW   = LOGCOLORSPACEW;
+     PLOGCOLORSPACEW   = ^LOGCOLORSPACEW;
+     {$ifdef UNICODE}
+        LPLOGCOLORSPACE  = PLOGCOLORSPACEW;
+        tagLOGCOLORSPACE = LOGCOLORSPACEW;
+        TLOGCOLORSPACE   = LOGCOLORSPACEW;
+        LOGCOLORSPACE    = LOGCOLORSPACEW;
+        PLOGCOLORSPACE   = PLOGCOLORSPACEW;
+     {$else}
+        LPLOGCOLORSPACE  = PLOGCOLORSPACEA;
+        tagLOGCOLORSPACE = LOGCOLORSPACEA;
+        TLOGCOLORSPACE   = LOGCOLORSPACEA;
+        LOGCOLORSPACE    = LOGCOLORSPACEA;
+        PLOGCOLORSPACE   = PLOGCOLORSPACEA;
+     {$endif}
 
      EMRCREATECOLORSPACE = record
           emr : EMR;
@@ -3720,36 +3775,100 @@ Const
      Tfindtextex = FINDTEXTEX;
      Pfindtextex = ^FINDTEXTEX;
 
-     FMS_GETDRIVEINFO = record
+     FMS_GETDRIVEINFOA = record
           dwTotalSpace : DWORD;
           dwFreeSpace : DWORD;
-          szPath : array[0..259] of TCHAR;
-          szVolume : array[0..13] of TCHAR;
-          szShare : array[0..127] of TCHAR;
+          szPath : array[0..259] of AnsiCHAR;
+          szVolume : array[0..13] of AnsiCHAR;
+          szShare : array[0..127] of AnsiCHAR;
        end;
-     _FMS_GETDRIVEINFO = FMS_GETDRIVEINFO;
-     TFMSGETDRIVEINFO = FMS_GETDRIVEINFO;
-     PFMSGETDRIVEINFO = ^FMS_GETDRIVEINFO;
+     _FMS_GETDRIVEINFOA = FMS_GETDRIVEINFOA;
+     TFMSGETDRIVEINFOA = FMS_GETDRIVEINFOA;
+     PFMSGETDRIVEINFOA = ^FMS_GETDRIVEINFOA;
+
+     FMS_GETDRIVEINFOW = record
+          dwTotalSpace : DWORD;
+          dwFreeSpace : DWORD;
+          szPath : array[0..259] of WCHAR;
+          szVolume : array[0..13] of WCHAR;
+          szShare : array[0..127] of WCHAR;
+       end;
+     _FMS_GETDRIVEINFOW = FMS_GETDRIVEINFOW;
+     TFMSGETDRIVEINFOW  = FMS_GETDRIVEINFOW;
+     PFMSGETDRIVEINFOW  = ^FMS_GETDRIVEINFOW;
+     {$ifdef Unicode}
+       _FMS_GETDRIVEINFO = FMS_GETDRIVEINFOW;
+       TFMSGETDRIVEINFO  = FMS_GETDRIVEINFOW;
+       PFMSGETDRIVEINFO  = PFMSGETDRIVEINFOW;
+       FMS_GETDRIVEINFO  = FMS_GETDRIVEINFOW;
+     {$else}
+       _FMS_GETDRIVEINFO = FMS_GETDRIVEINFOA;
+       TFMSGETDRIVEINFO  = FMS_GETDRIVEINFOA;
+       PFMSGETDRIVEINFO  = PFMSGETDRIVEINFOA;
+       FMS_GETDRIVEINFO  = FMS_GETDRIVEINFOA;
+     {$endif}
 
-     FMS_GETFILESEL = record
+     FMS_GETFILESELA = record
           ftTime : FILETIME;
           dwSize : DWORD;
           bAttr : BYTE;
-          szName : array[0..259] of TCHAR;
+          szName : array[0..259] of AnsiCHAR;
+       end;
+     _FMS_GETFILESELA = FMS_GETFILESELA;
+     TFMSGETFILESELA  = FMS_GETFILESELA;
+     PFMSGETFILESELA  = ^FMS_GETFILESELA;
+
+     FMS_GETFILESELW = record
+          ftTime : FILETIME;
+          dwSize : DWORD;
+          bAttr : BYTE;
+          szName : array[0..259] of WCHAR;
+       end;
+     _FMS_GETFILESELW = FMS_GETFILESELW;
+     TFMSGETFILESELW  = FMS_GETFILESELW;
+     PFMSGETFILESELW  = ^FMS_GETFILESELW;
+     {$ifdef Unicode}
+       _FMS_GETFILESEL  = FMS_GETFILESELW;
+       TFMSGETFILESEL   = FMS_GETFILESELW;
+       FMS_GETFILESEL   = FMS_GETFILESELW;
+       PFMSGETFILESEL   = PFMSGETFILESELW;
+     {$else}
+       _FMS_GETFILESEL  = FMS_GETFILESELA;
+       TFMSGETFILESEL   = FMS_GETFILESELA;
+       FMS_GETFILESEL   = FMS_GETFILESELA;
+       PFMSGETFILESEL   = PFMSGETFILESELA;
+     {$endif}
+
+     FMS_LOADA = record
+          dwSize : DWORD;
+          szMenuName : array[0..(MENU_TEXT_LEN)-1] of AnsiCHAR;
+          hMenu : HMENU;
+          wMenuDelta : UINT;
        end;
-     _FMS_GETFILESEL = FMS_GETFILESEL;
-     TFMSGETFILESEL = FMS_GETFILESEL;
-     PFMSGETFILESEL = ^FMS_GETFILESEL;
+     _FMS_LOADA = FMS_LOADA;
+     TFMSLOADA  = FMS_LOADA;
+     PFMSLOADA  = ^FMS_LOADA;
 
-     FMS_LOAD = record
+     FMS_LOADW = record
           dwSize : DWORD;
-          szMenuName : array[0..(MENU_TEXT_LEN)-1] of TCHAR;
+          szMenuName : array[0..(MENU_TEXT_LEN)-1] of WCHAR;
           hMenu : HMENU;
           wMenuDelta : UINT;
        end;
-     _FMS_LOAD = FMS_LOAD;
-     TFMSLOAD = FMS_LOAD;
-     PFMSLOAD = ^FMS_LOAD;
+     _FMS_LOADW = FMS_LOADW;
+     TFMSLOADW = FMS_LOADW;
+     PFMSLOADW = ^FMS_LOADW;
+     {$ifdef unicode}
+       _FMS_LOAD = FMS_LOADW;
+       TFMSLOAD  = FMS_LOADW;
+       PFMSLOAD  = PFMSLOADW;
+       FMS_LOAD  = FMS_LOADW;
+     {$else}
+       _FMS_LOAD = FMS_LOADA;
+       TFMSLOAD  = FMS_LOADA;
+       PFMSLOAD  = PFMSLOADA;
+       FMS_LOAD  = FMS_LOADA;
+     {$endif}
 
      FMS_TOOLBARLOAD = record
           dwSize : DWORD;
@@ -3915,17 +4034,39 @@ Const
      THELPINFO = HELPINFO;
      PHELPINFO = ^HELPINFO;
 
-     HELPWININFO = record
+     HELPWININFOA = record
           wStructSize : longint;
           x : longint;
           y : longint;
           dx : longint;
           dy : longint;
           wMax : longint;
-          rgchMember : array[0..1] of TCHAR;
+          rgchMember : array[0..1] of AnsiCHAR;
        end;
-     THELPWININFO = HELPWININFO;
-     PHELPWININFO = ^HELPWININFO;
+     THELPWININFOA = HELPWININFOA;
+     PHELPWININFOA = ^HELPWININFOA;
+
+     HELPWININFOW = record
+          wStructSize : longint;
+          x : longint;
+          y : longint;
+          dx : longint;
+          dy : longint;
+          wMax : longint;
+          rgchMember : array[0..1] of WCHAR;
+       end;
+     THELPWININFOW = HELPWININFOW;
+     PHELPWININFOW = ^HELPWININFOW;
+
+     {$ifdef Unicode}
+       HELPWININFO  = HELPWININFOW;
+       THELPWININFO = HELPWININFOW;
+       PHELPWININFO = PHELPWININFOW;
+     {$else}
+       HELPWININFO  = HELPWININFOA;
+       THELPWININFO = HELPWININFOA;
+       PHELPWININFO = PHELPWININFOA;
+     {$endif}
 
      HIGHCONTRAST = record
           cbSize : UINT;
@@ -4616,17 +4757,40 @@ Const
      TMONERRSTRUCT = MONERRSTRUCT;
      PMONERRSTRUCT = ^MONERRSTRUCT;
 
-     MONHSZSTRUCT = record
+     MONHSZSTRUCTA = record
           cb : UINT;
           fsAction : WINBOOL;
           dwTime : DWORD;
           hsz : HSZ;
           hTask : HANDLE;
-          str : array[0..0] of TCHAR;
+          str : array[0..0] of AnsiCHAR;
        end;
-     tagMONHSZSTRUCT = MONHSZSTRUCT;
-     TMONHSZSTRUCT = MONHSZSTRUCT;
-     PMONHSZSTRUCT = ^MONHSZSTRUCT;
+     tagMONHSZSTRUCTA = MONHSZSTRUCTA;
+     TMONHSZSTRUCTA   = MONHSZSTRUCTA;
+     PMONHSZSTRUCTA   = ^MONHSZSTRUCTA;
+
+     MONHSZSTRUCTW = record
+          cb : UINT;
+          fsAction : WINBOOL;
+          dwTime : DWORD;
+          hsz : HSZ;
+          hTask : HANDLE;
+          str : array[0..0] of WCHAR;
+       end;
+     tagMONHSZSTRUCTW = MONHSZSTRUCTW;
+     TMONHSZSTRUCTW   = MONHSZSTRUCTW;
+     PMONHSZSTRUCTW   = ^MONHSZSTRUCTW;
+     {$ifdef unicode}
+       tagMONHSZSTRUCT  = MONHSZSTRUCTW;
+       TMONHSZSTRUCT    = MONHSZSTRUCTW;
+       PMONHSZSTRUCT    = PMONHSZSTRUCTW;
+       MONHSZSTRUCT     = MONHSZSTRUCTW;
+     {$else}
+       tagMONHSZSTRUCT  = MONHSZSTRUCTA;
+       TMONHSZSTRUCT    = MONHSZSTRUCTA;
+       PMONHSZSTRUCT    = PMONHSZSTRUCTA;
+       MONHSZSTRUCT     = MONHSZSTRUCTA;
+     {$endif}
 
      MONITOR_INFO_1 = record
           pName : LPTSTR;
@@ -4729,14 +4893,34 @@ Const
      Tmsgfilter = MSGFILTER;
      Pmsgfilter = ^MSGFILTER;
 
-     MULTIKEYHELP = record
+     MULTIKEYHELPA = record
           mkSize : DWORD;
           mkKeylist : TCHAR;
-          szKeyphrase : array[0..0] of TCHAR;
+          szKeyphrase : array[0..0] of AnsiCHAR;
        end;
-     tagMULTIKEYHELP = MULTIKEYHELP;
-     TMULTIKEYHELP = MULTIKEYHELP;
-     PMULTIKEYHELP = ^MULTIKEYHELP;
+     tagMULTIKEYHELPA = MULTIKEYHELPA;
+     TMULTIKEYHELPA   = MULTIKEYHELPA;
+     PMULTIKEYHELPA   = ^MULTIKEYHELPA;
+
+     MULTIKEYHELPW = record
+          mkSize : DWORD;
+          mkKeylist : TCHAR;
+          szKeyphrase : array[0..0] of WideCHAR;
+       end;
+     tagMULTIKEYHELPW = MULTIKEYHELPW;
+     TMULTIKEYHELPW   = MULTIKEYHELPW;
+     PMULTIKEYHELPW   = ^MULTIKEYHELPW;
+     {$ifdef Unicode}
+        tagMULTIKEYHELP = MULTIKEYHELPW;
+        TMULTIKEYHELP   = MULTIKEYHELPW;
+        PMULTIKEYHELP   = PMULTIKEYHELPW;
+        MULTIKEYHELP    = MULTIKEYHELPW;
+     {$else}
+        tagMULTIKEYHELP = MULTIKEYHELPA;
+        TMULTIKEYHELP   = MULTIKEYHELPA;
+        PMULTIKEYHELP   = PMULTIKEYHELPA;
+        MULTIKEYHELP    = MULTIKEYHELPA;
+     {$endif}
 
      NAME_BUFFER = record
           name : array[0..(NCBNAMSZ)-1] of UCHAR;
@@ -4811,20 +4995,45 @@ Const
      PNETRESOURCE = ^NETRESOURCE;
      PNETRESOURCEA = ^NETRESOURCE;
 
-     NEWCPLINFO = record
+     NEWCPLINFOA = record
           dwSize : DWORD;
           dwFlags : DWORD;
           dwHelpContext : DWORD;
           lData : LONG;
           hIcon : HICON;
-          szName : array[0..31] of TCHAR;
-          szInfo : array[0..63] of TCHAR;
-          szHelpFile : array[0..127] of TCHAR;
+          szName : array[0..31] of AnsiCHAR;
+          szInfo : array[0..63] of AnsiCHAR;
+          szHelpFile : array[0..127] of AnsiCHAR;
        end;
-     tagNEWCPLINFO = NEWCPLINFO;
-     TNEWCPLINFO = NEWCPLINFO;
-     PNEWCPLINFO = ^NEWCPLINFO;
+     tagNEWCPLINFOA = NEWCPLINFOA;
+     TNEWCPLINFOA   = NEWCPLINFOA;
+     PNEWCPLINFOA   = ^NEWCPLINFOA;
 
+     NEWCPLINFOW = record
+          dwSize : DWORD;
+          dwFlags : DWORD;
+          dwHelpContext : DWORD;
+          lData : LONG;
+          hIcon : HICON;
+          szName : array[0..31] of WideCHAR;
+          szInfo : array[0..63] of WideCHAR;
+          szHelpFile : array[0..127] of WideCHAR;
+       end;
+     tagNEWCPLINFOW = NEWCPLINFOW;
+     TNEWCPLINFOW   = NEWCPLINFOW;
+     PNEWCPLINFOW   = ^NEWCPLINFOW;
+
+     {$ifdef Unicode}
+       tagNEWCPLINFO = NEWCPLINFOW;
+       TNEWCPLINFO   = NEWCPLINFOW;
+       PNEWCPLINFO   = PNEWCPLINFOW;
+       NEWCPLINFO    = NEWCPLINFOW;
+     {$else}
+       tagNEWCPLINFO = NEWCPLINFOA;
+       TNEWCPLINFO   = NEWCPLINFOA;
+       PNEWCPLINFO   = PNEWCPLINFOA;
+       NEWCPLINFO    = NEWCPLINFOA;
+     {$endif}
      NEWTEXTMETRICA = record
           tmHeight : LONG;
           tmAscent : LONG;
@@ -5169,7 +5378,7 @@ Const
           dwMinorVersion : DWORD;
           dwBuildNumber : DWORD;
           dwPlatformId : DWORD;
-          szCSDVersion : array[0..127] of TCHAR;
+          szCSDVersion : array[0..127] of AnsiCHAR;
        end;
      LPOSVERSIONINFOA= ^OSVERSIONINFOA;
      _OSVERSIONINFOA = OSVERSIONINFOA;