* minor delphi compat fixes for jcl

git-svn-id: trunk@10175 -
This commit is contained in:
marco 2008-02-03 10:59:39 +00:00
parent 9c1a5f6b92
commit fc2a1eb190
4 changed files with 34 additions and 19 deletions

View File

@ -1402,7 +1402,7 @@ Type
_SHELLEXECUTEINFOA = record
cbSize : DWORD;
fMask : ULONG;
hwnd : HWND;
wnd : HWND;
lpVerb : LPCSTR;
lpFile : LPCSTR;
lpParameters : LPCSTR;
@ -1429,7 +1429,7 @@ Type
_SHELLEXECUTEINFOW = record
cbSize : DWORD;
fMask : ULONG;
hwnd : HWND;
wnd : HWND;
lpVerb : lpcwstr;
lpFile : lpcwstr;
lpParameters : lpcwstr;

View File

@ -35,6 +35,7 @@ Const
IID_IEnumExtraSearch: TGUID ='{0E700BE1-9DB6-11d1-A1CE-00C04FD75D13}';
IID_IShellFolder2 : TGUID ='{93F2F68C-1D1B-11d3-A30E-00C04F79ABD1}';
IID_IEXtractIconW : TGUID ='{000214fa-0000-0000-c000-000000000046}';
IID_IEXtractIconA : TGUID ='{000214eb-0000-0000-c000-000000000046}';
Const
SV2GV_CURRENTVIEW = DWORD(-1);
@ -1478,14 +1479,14 @@ Type
end;
IEXtractIconA = interface(IUNknown)
['{000214eb-0000-0000-c000-000000000046}']
function GetIconLocation(uFlags:UINT;szIconFIle:LPSTR;cchMax:UINT;piIndex : pint; pwflags:puint):HResult;StdCall;
function Extract(pszFile:LPCStr;nIconIndex:UINT;phiconLarge:PHICON;phiconSmall:PHICON;nIconSize:UINT):HResult;StdCall;
function GetIconLocation(uFlags:UINT;szIconFIle:LPSTR;cchMax:UINT;piIndex : pint; var pwflags:uint):HResult;StdCall;
function Extract(pszFile:LPCStr;nIconIndex:UINT;var phiconLarge:HICON;var phiconSmall:HICON;nIconSize:UINT):HResult;StdCall;
end;
IEXtractIconW = interface(IUNknown)
['{000214fa-0000-0000-c000-000000000046}']
function GetIconLocation(uFlags:UINT;szIconFIle:LPWSTR;cchMax:UINT;piIndex : pint; pwflags:puint):HResult;StdCall;
function Extract(pszFile:LPCWStr;nIconIndex:UINT;phiconLarge:PHICON;phiconSmall:PHICON;nIconSize:UINT):HResult;StdCall;
function GetIconLocation(uFlags:UINT;szIconFIle:LPWSTR;cchMax:UINT;piIndex : pint; var pwflags:uint):HResult;StdCall;
function Extract(pszFile:LPCWStr;nIconIndex:UINT;var phiconLarge:HICON;var hiconSmall:HICON;nIconSize:UINT):HResult;StdCall;
end;
IEXtractIcon=IExtractIconA;

View File

@ -2769,12 +2769,24 @@
SPIF_SENDCHANGE = 2;
{ TrackPopupMenu, TrackPopMenuEx }
TPM_CENTERALIGN = $4;
TPM_LEFTALIGN = 0;
TPM_RIGHTALIGN = $8;
TPM_LEFTBUTTON = 0;
TPM_LEFTALIGN = 0;
TPM_RIGHTALIGN = $8;
TPM_LEFTBUTTON = 0;
TPM_RIGHTBUTTON = $2;
TPM_HORIZONTAL = 0;
TPM_VERTICAL = $40;
TPM_HORIZONTAL = 0;
TPM_VERTICAL = $40;
TPM_TOPALIGN = 0;
TPM_VCENTERALIGN= $10;
TPM_BOOTOMALIGN = $20;
TPM_NONOTIFY = $80;
TPM_RETURNCMD = $100;
TPM_RECURSE = $0001;
TPM_HORPOSANIMATION = $0400;
TPM_HORNEGANIMATION = $0800;
TPM_VERPOSANIMATION = $1000;
TPM_VERNEGANIMATION = $2000;
TPM_NOANIMATION = $4000;
TPM_LAYOUTRTL = $8000;
{ TranslateCharsetInfo }
TCI_SRCCHARSET = 1;
TCI_SRCCODEPAGE = 2;
@ -5542,6 +5554,10 @@ const
IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT = 13; // Delay Load Import Descriptors
IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR = 14; // COM Runtime descriptor
STRRET_WSTR = 0;
STRRET_OFFSET = 1;
STRRET_CSTR = 2;
{$endif read_interface}

View File

@ -5950,14 +5950,12 @@
TSTICKYKEYS = STICKYKEYS;
PSTICKYKEYS = ^STICKYKEYS;
STRRET = record
uType : UINT;
DUMMYUNIONNAME : record
case longint of
0 : ( pOleStr : LPWSTR );
1 : ( uOffset : UINT );
2 : ( cStr : array[0..(MAX_PATH)-1] of char );
end;
STRRET = record
utype : UINT;
case longint of
0: ( polestr:LPWSTR);
1: ( uOffset : UINT);
2: ( cStr : array[0..(MAX_PATH)-1] of char );
end;
LPSTRRET = ^STRRET;
_STRRET = STRRET;