Make it compile.

This commit is contained in:
Martijn Laan 2016-02-07 12:36:38 +01:00
parent 96c253ef65
commit c87ec25e23
8 changed files with 56 additions and 6 deletions

View File

@ -1194,6 +1194,14 @@ begin
RecreateWnd; RecreateWnd;
end; end;
function GetSystemDir: String;
var
Buf: array[0..MAX_PATH-1] of Char;
begin
GetSystemDirectory(Buf, SizeOf(Buf) div SizeOf(Buf[0]));
Result := StrPas(Buf);
end;
initialization initialization
InitThemeLibrary; InitThemeLibrary;
SHPathPrepareForWriteFunc := GetProcAddress(LoadLibrary(PChar(AddBackslash(GetSystemDir) + shell32)), SHPathPrepareForWriteFunc := GetProcAddress(LoadLibrary(PChar(AddBackslash(GetSystemDir) + shell32)),

View File

@ -204,7 +204,8 @@ procedure Register;
implementation implementation
uses uses
TmSchemaISX, {$IFDEF DELPHI2} Ole2 {$ELSE} ActiveX {$ENDIF}, BidiUtils{$IFDEF DELPHI2009}, Types{$ENDIF}; TmSchemaISX, PathFunc, {$IFDEF DELPHI2} Ole2 {$ELSE} ActiveX {$ENDIF},
BidiUtils{$IFDEF DELPHI2009}, Types{$ENDIF};
const const
sRadioCantHaveDisabledChildren = 'Radio item cannot have disabled child items'; sRadioCantHaveDisabledChildren = 'Radio item cannot have disabled child items';
@ -353,11 +354,20 @@ var
const riidInterface: TGUID; var ppvObject: Pointer): HRESULT; stdcall; const riidInterface: TGUID; var ppvObject: Pointer): HRESULT; stdcall;
function InitializeOleAcc: Boolean; function InitializeOleAcc: Boolean;
function GetSystemDir: String;
var
Buf: array[0..MAX_PATH-1] of Char;
begin
GetSystemDirectory(Buf, SizeOf(Buf) div SizeOf(Buf[0]));
Result := StrPas(Buf);
end;
var var
M: HMODULE; M: HMODULE;
begin begin
if not OleAccInited then begin if not OleAccInited then begin
M := LoadLibrary(AddBackslash(GetSystemDir) + 'oleacc.dll'); M := LoadLibrary(PChar(AddBackslash(GetSystemDir) + 'oleacc.dll'));
if M <> 0 then begin if M <> 0 then begin
LresultFromObjectFunc := GetProcAddress(M, 'LresultFromObject'); LresultFromObjectFunc := GetProcAddress(M, 'LresultFromObject');
CreateStdAccessibleObjectFunc := GetProcAddress(M, 'CreateStdAccessibleObject'); CreateStdAccessibleObjectFunc := GetProcAddress(M, 'CreateStdAccessibleObject');

View File

@ -107,6 +107,9 @@ implementation
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
uses
SysUtils, PathFunc;
const const
restartmanagerlib = 'Rstrtmgr.dll'; restartmanagerlib = 'Rstrtmgr.dll';
@ -136,6 +139,15 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
function InitRestartManagerLibrary: Boolean; function InitRestartManagerLibrary: Boolean;
function GetSystemDir: String;
var
Buf: array[0..MAX_PATH-1] of Char;
begin
GetSystemDirectory(Buf, SizeOf(Buf) div SizeOf(Buf[0]));
Result := StrPas(Buf);
end;
begin begin
Inc(ReferenceCount); Inc(ReferenceCount);

View File

@ -49,7 +49,7 @@ procedure Register;
implementation implementation
uses uses
RichEdit, ShellApi, BidiUtils; RichEdit, ShellApi, BidiUtils, PathFunc;
const const
{ Note: There is no 'W' 1.0 class } { Note: There is no 'W' 1.0 class }
@ -82,6 +82,15 @@ var
RichEditVersion: Integer; RichEditVersion: Integer;
procedure LoadRichEdit; procedure LoadRichEdit;
function GetSystemDir: String;
var
Buf: array[0..MAX_PATH-1] of Char;
begin
GetSystemDirectory(Buf, SizeOf(Buf) div SizeOf(Buf[0]));
Result := StrPas(Buf);
end;
begin begin
if RichEditUseCount = 0 then begin if RichEditUseCount = 0 then begin
{$IFDEF UNICODE} {$IFDEF UNICODE}

View File

@ -1013,6 +1013,9 @@ implementation
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
uses
SysUtils, PathFunc;
const const
themelib = 'uxtheme.dll'; themelib = 'uxtheme.dll';
@ -1098,6 +1101,14 @@ function InitThemeLibrary: Boolean;
Result := True; Result := True;
end; end;
function GetSystemDir: String;
var
Buf: array[0..MAX_PATH-1] of Char;
begin
GetSystemDirectory(Buf, SizeOf(Buf) div SizeOf(Buf[0]));
Result := StrPas(Buf);
end;
begin begin
Inc(ReferenceCount); Inc(ReferenceCount);

View File

@ -1669,7 +1669,7 @@ var
M: HMODULE; M: HMODULE;
begin begin
if not SHAutoCompleteInitialized then begin if not SHAutoCompleteInitialized then begin
M := SafeLoadLibrary(AddBackslash(GetSystemDir) + 'shlwapi.dll'), M := SafeLoadLibrary(AddBackslash(GetSystemDir) + 'shlwapi.dll',
SEM_NOOPENFILEERRORBOX); SEM_NOOPENFILEERRORBOX);
if M <> 0 then if M <> 0 then
SHAutoCompleteFunc := GetProcAddress(M, 'SHAutoComplete'); SHAutoCompleteFunc := GetProcAddress(M, 'SHAutoComplete');

View File

@ -46,7 +46,7 @@ procedure FreeHtmlHelpLibrary;
implementation implementation
uses uses
Messages, SysUtils; Messages, SysUtils, CmnFunc2, PathFunc;
var var
HHCtrl: THandle; HHCtrl: THandle;

View File

@ -104,7 +104,7 @@ type
implementation implementation
uses uses
CmnFunc2; CmnFunc2, PathFunc;
var var
Wow64DisableWow64FsRedirectionFunc: function(var OldValue: Pointer): BOOL; stdcall; Wow64DisableWow64FsRedirectionFunc: function(var OldValue: Pointer): BOOL; stdcall;