Browse Source

* reverse merge 35193. This was originally not intended, but slipped in anyway

git-svn-id: branches/fixes_3_0@35311 -
marco 8 years ago
parent
commit
50a77e6b17
2 changed files with 5 additions and 49 deletions
  1. 3 25
      rtl/gba/sysutils.pp
  2. 2 24
      rtl/nds/sysutils.pp

+ 3 - 25
rtl/gba/sysutils.pp

@@ -278,39 +278,17 @@ begin
   result := '';
   result := '';
 end;
 end;
 
 
-function ExecuteProcess (const Path: RawByteString; const ComLine: RawByteString;Flags:TExecuteFlags=[]): integer;
+function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]): integer;
 begin
 begin
   result := -1;
   result := -1;
 end;
 end;
 
 
-function ExecuteProcess (const Path: RawByteString;
-                                  const ComLine: array of RawByteString;Flags:TExecuteFlags=[]): integer;
+function ExecuteProcess (const Path: AnsiString;
+                                  const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
 begin
 begin
   result := -1;
   result := -1;
 end;
 end;
 
 
-function ExecuteProcess(const Path: UnicodeString; const ComLine: UnicodeString;
-  Flags: TExecuteFlags = []): Integer;
-begin
-  { TODO : implement }
-  result := -1;
-end;
-
-function ExecuteProcess(const Path: UnicodeString;
-  const ComLine: Array of UnicodeString; Flags:TExecuteFlags = []): Integer;
-var
-  CommandLine: UnicodeString;
-  I: integer;
-begin
-  Commandline := '';
-  for I := 0 to High (ComLine) do
-   if Pos (' ', ComLine [I]) <> 0 then
-    CommandLine := CommandLine + ' ' + '"' + ComLine [I] + '"'
-   else
-    CommandLine := CommandLine + ' ' + Comline [I];
-  ExecuteProcess := ExecuteProcess (Path, CommandLine,Flags);
-end;
-
 
 
 {****************************************************************************
 {****************************************************************************
                               Initialization code
                               Initialization code

+ 2 - 24
rtl/nds/sysutils.pp

@@ -315,38 +315,16 @@ begin
   result := '';
   result := '';
 end;
 end;
 
 
-function ExecuteProcess (const Path: RawByteString; const ComLine: RawByteString;Flags:TExecuteFlags=[]): integer;
+function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]): integer;
 begin
 begin
   result := -1;
   result := -1;
 end;
 end;
 
 
-function ExecuteProcess (const Path: RawByteString; const ComLine: array of RawByteString;Flags:TExecuteFlags=[]): integer;
+function ExecuteProcess (const Path: AnsiString; const ComLine: array of AnsiString;Flags:TExecuteFlags=[]): integer;
 begin
 begin
   result := -1;
   result := -1;
 end;
 end;
 
 
-function ExecuteProcess(const Path: UnicodeString; const ComLine: UnicodeString;
-  Flags: TExecuteFlags = []): Integer;
-begin
-  { TODO : implement }
-  result := -1;
-end;
-
-function ExecuteProcess(const Path: UnicodeString;
-  const ComLine: Array of UnicodeString; Flags:TExecuteFlags = []): Integer;
-var
-  CommandLine: UnicodeString;
-  I: integer;
-begin
-  Commandline := '';
-  for I := 0 to High (ComLine) do
-   if Pos (' ', ComLine [I]) <> 0 then
-    CommandLine := CommandLine + ' ' + '"' + ComLine [I] + '"'
-   else
-    CommandLine := CommandLine + ' ' + Comline [I];
-  ExecuteProcess := ExecuteProcess (Path, CommandLine,Flags);
-end;
-
 function GetLastOSError: Integer;
 function GetLastOSError: Integer;
 begin
 begin
   Result := -1;
   Result := -1;