mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 22:09:32 +02:00
* fixed compilation with 1.0.10
This commit is contained in:
parent
6f17e37fe4
commit
ed174f891c
@ -612,7 +612,7 @@ Procedure InitInternational;
|
|||||||
begin
|
begin
|
||||||
InitInternationalGeneric;
|
InitInternationalGeneric;
|
||||||
SysLocale.MBCS:=GetSystemMetrics(SM_DBCSENABLED)<>0;
|
SysLocale.MBCS:=GetSystemMetrics(SM_DBCSENABLED)<>0;
|
||||||
SysLocale.RightToLeft:=GetSystemMetrics(SM_MIDEASTENABLED)<>0;
|
SysLocale.RightToLeft:=GetSystemMetrics(SM_MIDEASTENABLED)<>0;
|
||||||
InitAnsi;
|
InitAnsi;
|
||||||
GetFormatSettings;
|
GetFormatSettings;
|
||||||
end;
|
end;
|
||||||
@ -994,6 +994,8 @@ end;
|
|||||||
Target Dependent WideString stuff
|
Target Dependent WideString stuff
|
||||||
****************************************************************************}
|
****************************************************************************}
|
||||||
|
|
||||||
|
{$ifdef HASWIDESTRING}
|
||||||
|
|
||||||
function Win32CompareWideString(const s1, s2 : WideString) : PtrInt;
|
function Win32CompareWideString(const s1, s2 : WideString) : PtrInt;
|
||||||
begin
|
begin
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
@ -1002,8 +1004,8 @@ function Win32CompareWideString(const s1, s2 : WideString) : PtrInt;
|
|||||||
if GetLastError<>0 then
|
if GetLastError<>0 then
|
||||||
RaiseLastOSError;
|
RaiseLastOSError;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
function Win32CompareTextWideString(const s1, s2 : WideString) : PtrInt;
|
function Win32CompareTextWideString(const s1, s2 : WideString) : PtrInt;
|
||||||
begin
|
begin
|
||||||
SetLastError(0);
|
SetLastError(0);
|
||||||
@ -1012,8 +1014,8 @@ function Win32CompareTextWideString(const s1, s2 : WideString) : PtrInt;
|
|||||||
if GetLastError<>0 then
|
if GetLastError<>0 then
|
||||||
RaiseLastOSError;
|
RaiseLastOSError;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
{ there is a similiar procedure in the system unit which inits the fields which
|
{ there is a similiar procedure in the system unit which inits the fields which
|
||||||
are relevant already for the system unit }
|
are relevant already for the system unit }
|
||||||
procedure InitWin32Widestrings;
|
procedure InitWin32Widestrings;
|
||||||
@ -1022,14 +1024,18 @@ procedure InitWin32Widestrings;
|
|||||||
widestringmanager.CompareTextWideStringProc:=@Win32CompareTextWideString;
|
widestringmanager.CompareTextWideStringProc:=@Win32CompareTextWideString;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
{$endif HASWIDESTRING}
|
||||||
|
|
||||||
|
|
||||||
Initialization
|
Initialization
|
||||||
|
{$ifdef HASWIDESTRING}
|
||||||
InitWin32Widestrings;
|
InitWin32Widestrings;
|
||||||
|
{$endif HASWIDESTRING}
|
||||||
InitExceptions; { Initialize exceptions. OS independent }
|
InitExceptions; { Initialize exceptions. OS independent }
|
||||||
InitInternational; { Initialize internationalization settings }
|
InitInternational; { Initialize internationalization settings }
|
||||||
LoadVersionInfo;
|
LoadVersionInfo;
|
||||||
InitSysConfigDir;
|
InitSysConfigDir;
|
||||||
|
|
||||||
Finalization
|
Finalization
|
||||||
DoneExceptions;
|
DoneExceptions;
|
||||||
if kernel32dll<>0 then
|
if kernel32dll<>0 then
|
||||||
@ -1039,7 +1045,10 @@ Finalization
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.42 2005-02-26 20:43:52 florian
|
Revision 1.43 2005-03-02 21:10:08 florian
|
||||||
|
* fixed compilation with 1.0.10
|
||||||
|
|
||||||
|
Revision 1.42 2005/02/26 20:43:52 florian
|
||||||
+ WideCompareString and WideCompareText for win32 implemented
|
+ WideCompareString and WideCompareText for win32 implemented
|
||||||
|
|
||||||
Revision 1.41 2005/02/26 14:38:14 florian
|
Revision 1.41 2005/02/26 14:38:14 florian
|
||||||
|
Loading…
Reference in New Issue
Block a user