--- Merging r19617 into '.':

U    packages/winunits-base/src/shfolder.pp

# revisions: 19617
------------------------------------------------------------------------
r19617 | marco | 2011-11-10 11:39:44 +0100 (Thu, 10 Nov 2011) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/shfolder.pp

 * shgetfolderpath copy-and-paste fix, mantis 20660

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19732 -

packages/winunits-base/src/shfolder.pp

@@ -84,7 +84,7 @@ Const
 { Original entry points }
 
 Function SHGetFolderPathA(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
-Function SHGetFolderPathW(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathW';
+Function SHGetFolderPathW(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PWideChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathW';
 
 Function SHGetFolderPath (Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall; external LibName name 'SHGetFolderPathA';
 
@@ -93,7 +93,7 @@ Function SHGetFolderPath (Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DW
 
 type
   PFNSHGetFolderPathA = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall;
-  PFNSHGetFolderPathW = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PChar): HRESULT; stdcall;
+  PFNSHGetFolderPathW = Function(Ahwnd: HWND; Csidl: longint; Token: THandle; Flags: DWord; Path: PWideChar): HRESULT; stdcall;
   PFNSHGetFolderPath = PFNSHGetFolderPathA;
 
   TSHGetFolderPathA = PFNSHGetFolderPathA;