Bladeren bron

Few missed ones.

Martijn Laan 1 jaar geleden
bovenliggende
commit
67d5e4c24e
4 gewijzigde bestanden met toevoegingen van 0 en 13 verwijderingen
  1. 0 4
      Projects/CompExeUpdate.pas
  2. 0 2
      Projects/InstFunc.pas
  3. 0 5
      Projects/Install.pas
  4. 0 2
      Projects/ScriptRunner.pas

+ 0 - 4
Projects/CompExeUpdate.pas

@@ -217,11 +217,7 @@ procedure UpdateVersionInfo(const F: TCustomFile;
   begin
     if not QueryValue(P, Path, Pointer(Value), ValueLen) then
       ResUpdateError('Unexpected version resource format (1)');
-{$IFDEF UNICODE}
     Move(Pointer(NewValue)^, Value^, (Min(Length(NewValue), lstrlenW(Value)))*SizeOf(Char));
-{$ELSE}
-    MultiByteToWideChar(CP_ACP, 0, PChar(NewValue), Length(NewValue), Value, lstrlenW(Value));
-{$ENDIF}
     ReplaceWithRealCopyrightSymbols(Value);
   end;
 

+ 0 - 2
Projects/InstFunc.pas

@@ -1298,7 +1298,6 @@ function DetermineDefaultLanguage(const GetLanguageEntryProc: TGetLanguageEntryP
 { Finds the index of the language entry that most closely matches the user's
   UI language / locale. If no match is found, ResultIndex is set to 0. }
 
-{$IFDEF UNICODE}
   function GetCodePageFromLangID(const ALangID: LANGID): Integer;
   const
     LOCALE_RETURN_NUMBER = $20000000;
@@ -1311,7 +1310,6 @@ function DetermineDefaultLanguage(const GetLanguageEntryProc: TGetLanguageEntryP
     else
       Result := -1;
   end;
-{$ENDIF}
 
 var
   I: Integer;

+ 0 - 5
Projects/Install.pas

@@ -409,11 +409,6 @@ var
   var
     LeadBytesStr, ExpandedApp, ExpandedGroup, CustomMessagesStr: String;
   begin
-{$IFNDEF UNICODE}
-    SetString(LeadBytesStr, PChar(@SetupHeader.LeadBytes),
-      SizeOf(SetupHeader.LeadBytes));
-{$ENDIF}
-
     { Only use app if Setup creates one }
     if shCreateAppDir in SetupHeader.Options then
       ExpandedApp := ExpandConst('{app}')

+ 0 - 2
Projects/ScriptRunner.pas

@@ -207,9 +207,7 @@ const
 var
   ScriptRunner: TScriptRunner;
   S, DllName, FunctionName: AnsiString;
-{$IFDEF UNICODE}
   UnicodeDllName: String;
-{$ENDIF}
   I: Integer;
   ForceDelayLoad, DelayLoad: Boolean;
   ErrorCode: LongInt;