* some {$ifdef unicode} added. + FPC_OS_UNICODE shebang.

git-svn-id: trunk@24447 -

packages/winunits-base/src/shlobj.pp

@@ -16,7 +16,11 @@
 {$mode objfpc}
 unit shlobj;
 
-  interface
+interface
+
+{$ifdef FPC_OS_UNICODE}
+  {$define UNICODE}
+{$endif}
 
 uses
       windows,activex,shellapi,commctrl;
@@ -1126,7 +1130,17 @@ Type
      LPSHFOLDERCUSTOMSETTINGSW = PSHFOLDERCUSTOMSETTINGSW;
      PLPSHFOLDERCUSTOMSETTINGSW = ^LPSHFOLDERCUSTOMSETTINGSW;
      TSHFOLDERCUSTOMSETTINGSW = SHFOLDERCUSTOMSETTINGSW;
-
+     {$ifdef unicode}
+       LPSHFOLDERCUSTOMSETTINGS  = PSHFOLDERCUSTOMSETTINGSW;
+       PLPSHFOLDERCUSTOMSETTINGS = PLPSHFOLDERCUSTOMSETTINGSW;
+       TSHFOLDERCUSTOMSETTINGS   = SHFOLDERCUSTOMSETTINGSW;
+       SHFOLDERCUSTOMSETTINGS    = SHFOLDERCUSTOMSETTINGSW;
+     {$else}
+       LPSHFOLDERCUSTOMSETTINGS  = PSHFOLDERCUSTOMSETTINGSA;
+       PLPSHFOLDERCUSTOMSETTINGS = PLPSHFOLDERCUSTOMSETTINGSA;
+       TSHFOLDERCUSTOMSETTINGS   = SHFOLDERCUSTOMSETTINGSA;
+       SHFOLDERCUSTOMSETTINGS    = SHFOLDERCUSTOMSETTINGSA;
+     {$endif}
      _browseinfoA = record
           hwndOwner : HWND;
           pidlRoot : LPCITEMIDLIST;
@@ -1160,7 +1174,21 @@ Type
      LPBROWSEINFOW = PbrowseinfoW;
      PLPBROWSEINFOW = ^LPBROWSEINFOW;
      TBROWSEINFOW = BROWSEINFOW;
-
+     {$IFDEF UNICODE}
+     BROWSEINFO     = _browseinfoW;
+     PBROWSEINFO    = PBROWSEINFOW;
+     PPBROWSEINFO   = PPBROWSEINFOW;
+     LPBROWSEINFO   = PbrowseinfoW;
+     PLPBROWSEINFO  = PLPBROWSEINFOW;
+     TBROWSEINFO    = BROWSEINFOW;
+     {$else}
+     BROWSEINFO     = _browseinfoA;
+     PBROWSEINFO    = PBROWSEINFOA;
+     TBROWSEINFO    = BROWSEINFOA;
+     PPBROWSEINFO   = PPBROWSEINFOA;
+     LPBROWSEINFO   = PbrowseinfoA;
+     PLPBROWSEINFO  = PLPBROWSEINFOA;
+     {$endif}
      P_EnumImageStoreDATAtag = ^_EnumImageStoreDATAtag;
      _EnumImageStoreDATAtag = record
           szPath : array[0..(MAX_PATH)-1] of WCHAR;