1 files changed, 13 insertions, 146 deletions

diff --git a/src/base/UPlatformWindows.pas b/src/base/UPlatformWindows.pas
index e198958a..a0372dad 100644
--- a/src/base/UPlatformWindows.pas
+++ b/src/base/UPlatformWindows.pas
@@ -38,21 +38,19 @@ interface
 
 uses
   Classes,
-  UPlatform;
+  UPlatform,
+  UPath;
 
 type
   TPlatformWindows = class(TPlatform)
     private
-      function GetSpecialPath(CSIDL: integer): WideString;
+      function GetSpecialPath(CSIDL: integer): IPath;
     public
-      function DirectoryFindFiles(Dir, Filter: WideString; ReturnAllSubDirs: Boolean): TDirectoryEntryArray; override;
       function TerminateIfAlreadyRunning(var WndTitle: String): Boolean; override;
 
-      function GetLogPath: WideString; override;
-      function GetGameSharedPath: WideString; override;
-      function GetGameUserPath: WideString; override;
-
-      function CopyFile(const Source, Target: WideString; FailIfExists: boolean): boolean; override;
+      function GetLogPath: IPath; override;
+      function GetGameSharedPath: IPath; override;
+      function GetGameUserPath: IPath; override;
   end;
 
 implementation
@@ -63,95 +61,6 @@ uses
   Windows,
   UConfig;
 
-type
-  TSearchRecW = record
-    Time: Integer;
-    Size: Integer;
-    Attr: Integer;
-    Name: WideString;
-    ExcludeAttr: Integer;
-    FindHandle: THandle;
-    FindData: TWin32FindDataW;
-  end;
-
-function  FindFirstW(const Path: WideString; Attr: Integer; var F: TSearchRecW): Integer; forward;
-function  FindNextW(var F: TSearchRecW): Integer; forward;
-procedure FindCloseW(var F: TSearchRecW); forward;
-function  FindMatchingFileW(var F: TSearchRecW): Integer; forward;
-function  DirectoryExistsW(const Directory: widestring): Boolean; forward;
-
-function FindFirstW(const Path: widestring; Attr: Integer; var F: TSearchRecW): Integer;
-const
-  faSpecial = faHidden or faSysFile or faVolumeID or faDirectory;
-begin
-  F.ExcludeAttr := not Attr and faSpecial;
-{$IFDEF Delphi}
-  F.FindHandle  := FindFirstFileW(PWideChar(Path), F.FindData);
-{$ELSE}
-  F.FindHandle  := FindFirstFileW(PWideChar(Path), @F.FindData);
-{$ENDIF}
-  if F.FindHandle <> INVALID_HANDLE_VALUE then
-  begin
-    Result := FindMatchingFileW(F);
-    if Result <> 0 then FindCloseW(F);
-  end else
-    Result := GetLastError;
-end;
-
-function FindNextW(var F: TSearchRecW): Integer;
-begin
-{$IFDEF Delphi}
-  if FindNextFileW(F.FindHandle, F.FindData) then
-{$ELSE}
-  if FindNextFileW(F.FindHandle, @F.FindData) then
-{$ENDIF}
-    Result := FindMatchingFileW(F)
-  else
-    Result := GetLastError;
-end;
-
-procedure FindCloseW(var F: TSearchRecW);
-begin
-  if F.FindHandle <> INVALID_HANDLE_VALUE then
-  begin
-    Windows.FindClose(F.FindHandle);
-    F.FindHandle := INVALID_HANDLE_VALUE;
-  end;
-end;
-
-function FindMatchingFileW(var F: TSearchRecW): Integer;
-var
-  LocalFileTime: TFileTime;
-begin
-  with F do
-  begin
-    while FindData.dwFileAttributes and ExcludeAttr <> 0 do
-{$IFDEF Delphi}
-      if not FindNextFileW(FindHandle, FindData) then
-{$ELSE}
-      if not FindNextFileW(FindHandle, @FindData) then
-{$ENDIF}
-      begin
-        Result := GetLastError;
-        Exit;
-      end;
-    FileTimeToLocalFileTime(FindData.ftLastWriteTime, LocalFileTime);
-    FileTimeToDosDateTime(LocalFileTime, LongRec(Time).Hi, LongRec(Time).Lo);
-    Size := FindData.nFileSizeLow;
-    Attr := FindData.dwFileAttributes;
-    Name := FindData.cFileName;
-  end;
-  Result := 0;
-end;
-
-function DirectoryExistsW(const Directory: widestring): Boolean;
-var
-  Code: Integer;
-begin
-  Code := GetFileAttributesW(PWideChar(Directory));
-  Result := (Code <> -1) and (FILE_ATTRIBUTE_DIRECTORY and Code <> 0);
-end;
-
 //------------------------------
 //Start more than One Time Prevention
 //------------------------------
@@ -180,41 +89,6 @@ begin
     end;
 end;
 
-function TPlatformWindows.DirectoryFindFiles(Dir, Filter: WideString; ReturnAllSubDirs: Boolean): TDirectoryEntryArray;
-var
-    i : Integer;
-    SR : TSearchRecW;
-    Attrib : Integer;
-begin
-  i := 0;
-  Filter := LowerCase(Filter);
-
-  if FindFirstW(Dir + '*', faAnyFile or faDirectory, SR) = 0 then
-  repeat
-    if (SR.Name <> '.') and (SR.Name <> '..') then
-    begin
-      Attrib := FileGetAttr(Dir + SR.name);
-      if ReturnAllSubDirs and ((Attrib and faDirectory) <> 0) then
-      begin
-        SetLength( Result, i + 1);
-        Result[i].Name        := SR.name;
-        Result[i].IsDirectory := true;
-        Result[i].IsFile      := false;
-        i := i + 1;
-      end
-      else if (Length(Filter) = 0) or (Pos( Filter, LowerCase(SR.Name)) > 0) then
-      begin
-        SetLength( Result, i + 1);
-        Result[i].Name        := SR.Name;
-        Result[i].IsDirectory := false;
-        Result[i].IsFile      := true;
-        i := i + 1;
-      end;
-    end;
-  until FindNextW(SR) <> 0;
-  FindCloseW(SR);
-end;
-
 (**
  * Returns the path of a special folder.
  *
@@ -225,37 +99,30 @@ end;
  * CSIDL_PERSONAL      (e.g. C:\Documents and Settings\username\My Documents)
  * CSIDL_MYMUSIC       (e.g. C:\Documents and Settings\username\My Documents\My Music)
  *)
-function TPlatformWindows.GetSpecialPath(CSIDL: integer): WideString;
+function TPlatformWindows.GetSpecialPath(CSIDL: integer): IPath;
 var
   Buffer: array [0..MAX_PATH-1] of WideChar;
 begin
-{$IF Defined(Delphi) or (FPC_VERSION_INT >= 2002002)} // >= 2.2.2
   if (SHGetSpecialFolderPathW(0, @Buffer, CSIDL, false)) then
-    Result := Buffer
+    Result := Path(Buffer)
   else
-{$IFEND}
-    Result := '';
+    Result := PATH_NONE;
 end;
 
-function TPlatformWindows.GetLogPath: WideString;
+function TPlatformWindows.GetLogPath: IPath;
 begin
   Result := GetExecutionDir();
 end;
 
-function TPlatformWindows.GetGameSharedPath: WideString;
+function TPlatformWindows.GetGameSharedPath: IPath;
 begin
   Result := GetExecutionDir();
 end;
 
-function TPlatformWindows.GetGameUserPath: WideString;
+function TPlatformWindows.GetGameUserPath: IPath;
 begin
-  //Result := GetSpecialPath(CSIDL_APPDATA) + PathDelim + 'UltraStarDX' + PathDelim;
+  //Result := GetSpecialPath(CSIDL_APPDATA).Append('UltraStarDX', pdAppend);
   Result := GetExecutionDir();
 end;
 
-function TPlatformWindows.CopyFile(const Source, Target: WideString; FailIfExists: boolean): boolean;
-begin
-  Result := Windows.CopyFileW(PWideChar(Source), PWideChar(Target), FailIfExists);
-end;
-
 end.