paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 00:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r36461 into '.':

Browse Source 
U    rtl/objpas/fpwidestring.pp
--- Recording mergeinfo for merge of r36461 into '.':
 U   .
--- Merging r36477 into '.':
U    packages/x11/src/xlib.pp
--- Recording mergeinfo for merge of r36477 into '.':
 G   .

# revisions: 36461,36477

git-svn-id: branches/fixes_3_0@36478 -
This commit is contained in:
marco 2017-06-10 15:52:14 +00:00
parent da0edf83d0
commit f9a1b21224
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/x11/src/xlib.pp
View File

@ -1019,9 +1019,9 @@ type
TXIC = record
end;
TXIMProc = procedure (para1:TXIM; para2:TXPointer; para3:TXPointer);cdecl;
TXIMProc = procedure (para1:PXIM; para2:TXPointer; para3:TXPointer);cdecl;
TXICProc = function (para1:TXIC; para2:TXPointer; para3:TXPointer):TBoolResult;cdecl;
TXICProc = function (para1:PXIC; para2:TXPointer; para3:TXPointer):TBoolResult;cdecl;
TXIDProc = procedure (para1:PDisplay; para2:TXPointer; para3:TXPointer);cdecl;
@ -1756,20 +1756,20 @@ procedure Xutf8DrawImageString(para1:PDisplay; para2:TDrawable; para3:TXFontSet;
para6:cint; para7:Pchar; para8:cint);cdecl;external libX11;
function XOpenIM(para1:PDisplay; para2:PXrmHashBucketRec; para3:Pchar; para4:Pchar):PXIM;cdecl;external libX11;
function XCloseIM(para1:PXIM):TStatus;cdecl;external libX11;
function XGetIMValues(para1:TXIM; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XSetIMValues(para1:TXIM; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XDisplayOfIM(para1:TXIM):PDisplay;cdecl;external libX11;
function XLocaleOfIM(para1:TXIM):Pchar;cdecl;external libX11;
function XGetIMValues(para1:PXIM; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XSetIMValues(para1:PXIM; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XDisplayOfIM(para1:PXIM):PDisplay;cdecl;external libX11;
function XLocaleOfIM(para1:PXIM):Pchar;cdecl;external libX11;
function XCreateIC(para1:PXIM; dotdotdot:array of const):PXIC;cdecl;external libX11;
procedure XDestroyIC(para1:PXIC);cdecl;external libX11;
procedure XSetICFocus(para1:PXIC);cdecl;external libX11;
procedure XUnsetICFocus(para1:PXIC);cdecl;external libX11;
function XwcResetIC(para1:TXIC):PWideChar;cdecl;external libX11;
function XmbResetIC(para1:TXIC):Pchar;cdecl;external libX11;
function XwcResetIC(para1:PXIC):PWideChar;cdecl;external libX11;
function XmbResetIC(para1:PXIC):Pchar;cdecl;external libX11;
function Xutf8ResetIC(para1:PXIC):Pchar;cdecl;external libX11;
function XSetICValues(para1:TXIC; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XGetICValues(para1:TXIC; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XIMOfIC(para1:TXIC):TXIM;cdecl;external libX11;
function XSetICValues(para1:PXIC; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XGetICValues(para1:PXIC; dotdotdot:array of const):Pchar;cdecl;external libX11;
function XIMOfIC(para1:PXIC):PXIM;cdecl;external libX11;
function XFilterEvent(para1:PXEvent; para2:TWindow):TBoolResult;cdecl;external libX11;
function XmbLookupString(para1:PXIC; para2:PXKeyPressedEvent; para3:Pchar; para4:cint; para5:PKeySym;
para6:PStatus):cint;cdecl;external libX11;

6
rtl/objpas/fpwidestring.pp
View File

@ -680,6 +680,8 @@ end;
function StrLCompAnsiString(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
begin
if (current_Collation.DataPtr=nil) then
exit(OldManager.StrLCompAnsiStringProc(s1,s2,MaxLen));
if (MaxLen=0) then
exit(0);
Result := InternalCompareStrAnsiString(S1,S2,MaxLen,MaxLen);
@ -689,6 +691,8 @@ function CompareStrAnsiString(const S1, S2: ansistring): PtrInt;
var
l1, l2 : PtrInt;
begin
if (current_Collation.DataPtr=nil) then
exit(OldManager.CompareStrAnsiStringProc(s1,s2));
if (Pointer(S1)=Pointer(S2)) then
exit(0);
l1:=Length(S1);
@ -716,6 +720,8 @@ function StrCompAnsiString(S1, S2: PChar): PtrInt;
var
l1,l2 : PtrInt;
begin
if (current_Collation.DataPtr=nil) then
exit(OldManager.StrCompAnsiStringProc(s1,s2));
l1:=strlen(S1);
l2:=strlen(S2);
Result := InternalCompareStrAnsiString(S1,S2,l1,l2);