Browse Source

--- Merging r24687 into '.':
U packages/aspell/src/aspelldyn.pp
--- Merging r24688 into '.':
U packages/cdrom/src/wincd.pp
U packages/cdrom/src/wnaspi32.pp
--- Merging r24690 into '.':
U packages/fcl-process/src/win/simpleipc.inc
--- Merging r24692 into '.':
U packages/winunits-base/src/wininet.pp
U packages/winunits-base/src/typelib.pas
U packages/winunits-base/src/commctrl.pp

# revisions: 24687,24688,24690,24692
r24687 | marco | 2013-06-01 11:15:01 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
M /trunk/packages/aspell/src/aspelldyn.pp

* Explicitly call -A functions for the registry key. FPC_UNICODE_RTL
r24688 | marco | 2013-06-01 11:17:51 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
M /trunk/packages/cdrom/src/wincd.pp
M /trunk/packages/cdrom/src/wnaspi32.pp

* use dynlibs and -A versions
r24690 | marco | 2013-06-01 11:30:32 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/win/simpleipc.inc

* fixes some allochwnd functions for FPC_UNICODE_RTL (use -A explicitly)
r24692 | marco | 2013-06-01 11:55:07 +0200 (Sat, 01 Jun 2013) | 1 line
Changed paths:
M /trunk/packages/winunits-base/src/commctrl.pp
M /trunk/packages/winunits-base/src/typelib.pas
M /trunk/packages/winunits-base/src/wininet.pp

* Changes for activation of ifdef UNICODE by FPC_UNICODE_RTL and FPC_OS_UNICODE.

git-svn-id: branches/fixes_2_6@25024 -

marco 12 years ago
parent
commit
ee449b7f8c

+ 3 - 3
packages/aspell/src/aspelldyn.pp

@@ -1,4 +1,4 @@
-unit aspelldyn;
+unit aspelldyn;
 
 { * This file is header translation of The New Aspell
   * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL
@@ -471,9 +471,9 @@ begin
   bufsize:=maxkeysize;
   buftype:=REG_SZ;
   key:=HKEY_LOCAL_MACHINE;
-  res:=RegOpenKeyEx (key,p,0,KEY_QUERY_VALUE,rkey);
+  res:=RegOpenKeyExA (key,p,0,KEY_QUERY_VALUE,rkey);
   if res<>ERROR_SUCCESS then exit;
-  res:=RegQueryValueEx (rkey,sp,nil,@buftype,@buf[1],@bufsize);
+  res:=RegQueryValueExA (rkey,sp,nil,@buftype,@buf[1],@bufsize);
   if res<>ERROR_SUCCESS then exit;
   buf[0]:=chr(bufsize-1);
   RegCloseKey (rkey);

+ 4 - 4
packages/cdrom/src/wincd.pp

@@ -164,7 +164,7 @@ begin
   if (CDOSVer>4) then
     Flags:=Flags or Cardinal(GENERIC_WRITE);
   Device:=Upcase('\\.\'+Device);
-  DriveHandle:=CreateFile(pchar(Device),Flags,FILE_SHARE_READ,
+  DriveHandle:=CreateFileA(pchar(Device),Flags,FILE_SHARE_READ,
                           nil,OPEN_EXISTING, 0, 0 );
   if (DriveHandle=INVALID_HANDLE_VALUE) then
     begin
@@ -336,7 +336,7 @@ Var
 begin
   Flags:=Cardinal(GENERIC_READ);
   device:=Upcase('\\.\'+device);
-  DriveHandle:=CreateFile(PChar(Device), Flags,
+  DriveHandle:=CreateFileA(PChar(Device), Flags,
                           FILE_SHARE_READ, nil, OPEN_EXISTING, 0, 0 );
   if (DriveHandle = INVALID_HANDLE_VALUE) then
     begin
@@ -375,12 +375,12 @@ var
 
 begin
   FillChar(Drives,SizeOf(Drives),0);
-  GetLogicalDriveStrings(105,Drives);
+  GetLogicalDriveStringsA(105,Drives);
   P:=@Drives[0];
   Result:=0;
   While P[0]<>#0 do
     begin
-    If GetDriveType(p)=DRIVE_CDROM then
+    If GetDriveTypeA(p)=DRIVE_CDROM then
       begin
       If CopyDrives and (Result<High(CDDrives)) then
         CDDrives[Result]:=Upcase(P[0])+':';

+ 5 - 3
packages/cdrom/src/wnaspi32.pp

@@ -218,9 +218,11 @@ procedure UnloadASPI;
 
 implementation
 
+uses dynlibs;
+
 const
-  HWNASPI : THandle = 0;
-  WNASPI  : pchar = 'wnaspi32.dll';
+  HWNASPI : TLibHandle = 0;
+  WNASPI  = 'wnaspi32.dll';
 
 Function ASPILoaded : Boolean;
 
@@ -245,7 +247,7 @@ begin
   if (HWNASPI<>0) then
     begin
     FreeLibrary(HWNASPI);
-    HWNASPI:=0;
+    HWNASPI:=TLibHandle(0);
     SendASPI32Command:=nil;
     GetASPI32SupportInfo:=nil;
     end;

+ 7 - 7
packages/fcl-process/src/win/simpleipc.inc

@@ -24,7 +24,7 @@ Resourcestring
   SErrFailedToCreateWindow = 'Failed to create message window %s';
 
 var
-  MsgWindowClass: TWndClass = (
+  MsgWindowClass: TWndClassA = (
     style: 0;
     lpfnWndProc: Nil;
     cbClsExtra: 0;
@@ -90,18 +90,18 @@ end;
 function TWinMsgServerComm.AllocateHWnd(const aWindowName: String): HWND;
 
 var
-  cls: TWndClass;
+  cls: TWndClassA;
   isreg : Boolean;
 
 begin
   Pointer(MsgWindowClass.lpfnWndProc):=@MsgWndProc;
   MsgWindowClass.hInstance := HInstance;
   MsgWindowClass.lpszClassName:=MsgWndClassName;
-  isreg:=GetClassInfo(HInstance,MsgWndClassName,cls);
+  isreg:=GetClassInfoA(HInstance,MsgWndClassName,cls);
   if not isreg then
-    if (Windows.RegisterClass(MsgWindowClass)=0) then
+    if (Windows.RegisterClassA(MsgWindowClass)=0) then
       Owner.DoError(SErrFailedToRegisterWindowClass,[]);
-  Result:=CreateWindowEx(WS_EX_TOOLWINDOW, MsgWndClassName,
+  Result:=CreateWindowExA(WS_EX_TOOLWINDOW, MsgWndClassName,
     PChar(aWindowName), WS_POPUP {!0}, 0, 0, 0, 0, 0, 0, HInstance, nil);
   if (Result=0) then
     Owner.DoError(SErrFailedToCreateWindow,[aWindowName]);
@@ -221,7 +221,7 @@ end;
 
 procedure TWinMsgClientComm.Connect;
 begin
-  FHWND:=FindWindow(MsgWndClassName,PChar(FWindowName));
+  FHWND:=FindWindowA(MsgWndClassName,PChar(FWindowName));
   If (FHWND=0) then
     Owner.DoError(SErrServerNotActive,[Owner.ServerID]);
 end;
@@ -265,7 +265,7 @@ end;
 
 function TWinMsgClientComm.ServerRunning: Boolean;
 begin
-  Result:=FindWindow(MsgWndClassName,PChar(FWindowName))<>0;
+  Result:=FindWindowA(MsgWndClassName,PChar(FWindowName))<>0;
 end;
 
 { ---------------------------------------------------------------------

+ 29 - 59
packages/winunits-base/src/commctrl.pp

@@ -791,10 +791,10 @@ function ImageList_Duplicate(himl:HIMAGELIST):HIMAGELIST; stdcall; external comm
 {$IFNDEF NOHEADER}
 
 {$IFDEF _WIN32}
-
+// L'xx' translates to 'xx'#$0000 because that forces a wide literal in FPC.
 CONST
          WC_HEADERA                     = 'SysHeader32';
-         WC_HEADERW                     = {L}'SysHeader32';
+         WC_HEADERW                     = {L}'SysHeader32'#$0000;
 {$IFDEF UNICODE}
          WC_HEADER           = WC_HEADERW;
 {$ELSE}
@@ -1436,7 +1436,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         TOOLBARCLASSNAMEW              = {L}'ToolbarWindow32';
+         TOOLBARCLASSNAMEW              = {L}'ToolbarWindow32'#$0000;
          TOOLBARCLASSNAMEA              = 'ToolbarWindow32';
 
 {$IFDEF  UNICODE}
@@ -1738,7 +1738,7 @@ TYPE
                                  pszValueName : LPCWSTR;
                                  END;
          TBSAVEPARAMSW        = tagTBSAVEPARAMSW;
-         LPTBSAVEPARAMW       = ^tagTBSAVEPARAMSW;
+         LPTBSAVEPARAMSW      = ^tagTBSAVEPARAMSW;
          TTBSAVEPARAMSW       = tagTBSAVEPARAMSW;
          PTBSAVEPARAMSW       = ^tagTBSAVEPARAMSW;
 
@@ -2248,7 +2248,9 @@ TYPE
                                  END;
          NMTOOLBARA           = tagNMTOOLBARA;
          LPNMTOOLBARA         = ^tagNMTOOLBARA;
+         {$ifndef unicode}
          LPNMTOOLBAR          = LPNMTOOLBARA;
+         {$endif}
          TNMTOOLBARA          = tagNMTOOLBARA;
          PNMTOOLBARA          = LPNMTOOLBARA;
 {$ENDIF}
@@ -2312,7 +2314,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         REBARCLASSNAMEW                = {L}'ReBarWindow32';
+         REBARCLASSNAMEW                = {L}'ReBarWindow32'#$0000;
          REBARCLASSNAMEA                = 'ReBarWindow32';
 
 {$IFDEF  UNICODE}
@@ -2766,7 +2768,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         TOOLTIPS_CLASSW                = {L}'tooltips_class32';
+         TOOLTIPS_CLASSW                = {L}'tooltips_class32'#$0000;
          TOOLTIPS_CLASSA                = 'tooltips_class32';
 
 {$IFDEF UNICODE}
@@ -3202,7 +3204,7 @@ Procedure DrawStatusText(hDC:HDC;lprc:LPRECT;pszText:LPCWSTR;uFlags:UINT); stdca
 
 CONST
 {$IFDEF _WIN32}
-         STATUSCLASSNAMEW               = {L}'msctls_statusbar32';
+         STATUSCLASSNAMEW               = {L}'msctls_statusbar32'#$0000;
          STATUSCLASSNAMEA               = 'msctls_statusbar32';
 
 {$IFDEF UNICODE}
@@ -3303,7 +3305,7 @@ CONST
 {$IFDEF _WIN32}
 
          TRACKBAR_CLASSA                = 'msctls_trackbar32';
-         TRACKBAR_CLASSW                = {L}'msctls_trackbar32';
+         TRACKBAR_CLASSW                = {L}'msctls_trackbar32'#$0000;
 
 {$IFDEF UNICODE}
          TRACKBAR_CLASS                 = TRACKBAR_CLASSW;
@@ -3459,7 +3461,7 @@ CONST
 {$IFDEF _WIN32}
 
          UPDOWN_CLASSA                  = 'msctls_updown32';
-         UPDOWN_CLASSW                  = {L}'msctls_updown32';
+         UPDOWN_CLASSW                  = {L}'msctls_updown32'#$0000;
 
 {$IFDEF UNICODE}
          UPDOWN_CLASS                   = UPDOWN_CLASSW;
@@ -3558,7 +3560,7 @@ CONST
 {$IFDEF _WIN32}
 
          PROGRESS_CLASSA                = 'msctls_progress32';
-         PROGRESS_CLASSW                = {L}'msctls_progress32';
+         PROGRESS_CLASSW                = {L}'msctls_progress32'#$0000;
 
 {$IFDEF UNICODE}
          PROGRESS_CLASS      = PROGRESS_CLASSW;
@@ -3699,7 +3701,7 @@ CONST
 
 {$IFDEF _WIN32}
          WC_LISTVIEWA                   = 'SysListView32';
-         WC_LISTVIEWW                   = {L}'SysListView32';
+         WC_LISTVIEWW                   = {L}'SysListView32'#$0000;
 {$IFDEF UNICODE}
          WC_LISTVIEW                    = WC_LISTVIEWW;
 {$ELSE}
@@ -5774,7 +5776,7 @@ Type
 CONST
 {$IFDEF _WIN32}
          WC_TREEVIEWA                   = 'SysTreeView32';
-         WC_TREEVIEWW                   = {L}'SysTreeView32';
+         WC_TREEVIEWW                   = {L}'SysTreeView32'#$0000;
 
 {$IFDEF UNICODE}
          WC_TREEVIEW                    = WC_TREEVIEWW;
@@ -6231,8 +6233,6 @@ CONST
          TVM_GETITEMW                   = (TV_FIRST + 62);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_GETITEM         = TVM_GETITEMW;
 {$ELSE}
          TVM_GETITEM         = TVM_GETITEMA;
@@ -6251,8 +6251,6 @@ CONST
          TVM_SETITEMW                   = (TV_FIRST + 63);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_SETITEM         = TVM_SETITEMW;
 {$ELSE}
          TVM_SETITEM         = TVM_SETITEMA;
@@ -6268,8 +6266,6 @@ CONST
          TVM_EDITLABELA                 = (TV_FIRST + 14);
          TVM_EDITLABELW                 = (TV_FIRST + 65);
 {$IFDEF UNICODE}
-
-TYPE
          TVM_EDITLABEL       = TVM_EDITLABELW;
 {$ELSE}
          TVM_EDITLABEL       = TVM_EDITLABELA;
@@ -6398,8 +6394,6 @@ CONST
          TVM_GETISEARCHSTRINGW          = (TV_FIRST + 64);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_GETISEARCHSTRING= TVM_GETISEARCHSTRINGW;
 {$ELSE}
          TVM_GETISEARCHSTRING= TVM_GETISEARCHSTRINGA;
@@ -7026,7 +7020,7 @@ CONST
 
 ////////////////////  ComboBoxEx ////////////////////////////////
 
-         WC_COMBOBOXEXW                 = {L}'ComboBoxEx32';
+         WC_COMBOBOXEXW                 = {L}'ComboBoxEx32'#$0000;
          WC_COMBOBOXEXA                 = 'ComboBoxEx32';
 
 
@@ -7338,11 +7332,9 @@ TYPE
 
 CONST
          WC_TABCONTROLA                 = 'SysTabControl32';
-         WC_TABCONTROLW                 = {L}'SysTabControl32';
+         WC_TABCONTROLW                 = {L}'SysTabControl32'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_TABCONTROL       = WC_TABCONTROLW;
 {$ELSE}
          WC_TABCONTROL       = WC_TABCONTROLA;
@@ -7564,8 +7556,6 @@ CONST
          TCM_GETITEMW                   = (TCM_FIRST + 60);
 
 {$IFDEF UNICODE}
-
-TYPE
          TCM_GETITEM         = TCM_GETITEMW;
 {$ELSE}
          TCM_GETITEM         = TCM_GETITEMA;
@@ -7582,8 +7572,6 @@ CONST
          TCM_SETITEMW                   = (TCM_FIRST + 61);
 
 {$IFDEF UNICODE}
-
-TYPE
          TCM_SETITEM         = TCM_SETITEMW;
 {$ELSE}
          TCM_SETITEM         = TCM_SETITEMA;
@@ -7867,7 +7855,7 @@ CONST
 
 {$IFDEF _WIN32}
 
-         ANIMATE_CLASSW                 = {L}'SysAnimate32';
+         ANIMATE_CLASSW                 = {L}'SysAnimate32'#$0000;
          ANIMATE_CLASSA                 = 'SysAnimate32';
 
 {$IFDEF UNICODE}
@@ -7945,7 +7933,7 @@ Function Animate_Create(hwndP :HWND;id:HMENU;dwStyle:dword;hInstance:HINST):HWND
 
 
 CONST
-         MONTHCAL_CLASSW                = {L}'SysMonthCal32';
+         MONTHCAL_CLASSW                = {L}'SysMonthCal32'#$0000;
          MONTHCAL_CLASSA                = 'SysMonthCal32';
 
 
@@ -8465,7 +8453,7 @@ CONST
 {$IFNDEF NODATETIMEPICK}
 {$IFDEF _WIN32}
 
-         DATETIMEPICK_CLASSW            = {L}'SysDateTimePick32';
+         DATETIMEPICK_CLASSW            = {L}'SysDateTimePick32'#$0000;
          DATETIMEPICK_CLASSA            = 'SysDateTimePick32';
 
 {$IFDEF UNICODE}
@@ -8549,8 +8537,6 @@ CONST
          DTM_SETFORMATW                 = (DTM_FIRST + 50);
 
 {$IFDEF UNICODE}
-
-TYPE
          DTM_SETFORMAT       = DTM_SETFORMATW;
 {$ELSE}
          DTM_SETFORMAT       = DTM_SETFORMATA;
@@ -8882,12 +8868,10 @@ CONST
          IPM_SETFOCUS                   = (WM_USER+104);      // wparam = field
          IPM_ISBLANK                    = (WM_USER+105);      // no parameters
 
-         WC_IPADDRESSW                  = {L}'SysIPAddress32';
+         WC_IPADDRESSW                  = {L}'SysIPAddress32'#$0000;
          WC_IPADDRESSA                  = 'SysIPAddress32';
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_IPADDRESS        = WC_IPADDRESSW;
 {$ELSE}
          WC_IPADDRESS        = WC_IPADDRESSA;
@@ -8952,12 +8936,10 @@ TYPE
 //Pager Class Name
 
 CONST
-         WC_PAGESCROLLERW               = {L}'SysPager';
+         WC_PAGESCROLLERW               = {L}'SysPager'#$0000;
          WC_PAGESCROLLERA               = 'SysPager';
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_PAGESCROLLER     = WC_PAGESCROLLERW;
 {$ELSE}
          WC_PAGESCROLLER     = WC_PAGESCROLLERA;
@@ -9225,12 +9207,10 @@ TYPE
 //NativeFont Class Name
 
 CONST
-         WC_NATIVEFONTCTLW              = {L}'NativeFontCtl';
+         WC_NATIVEFONTCTLW              = {L}'NativeFontCtl'#$0000;
          WC_NATIVEFONTCTLA              = 'NativeFontCtl';
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_NATIVEFONTCTL    = WC_NATIVEFONTCTLW;
 {$ELSE}
          WC_NATIVEFONTCTL    = WC_NATIVEFONTCTLA;
@@ -9261,7 +9241,7 @@ CONST
 
 // Button Class Name
          WC_BUTTONA                     = 'Button';
-         WC_BUTTONW                     = {L}'Button';
+         WC_BUTTONW                     = {L}'Button'#$0000;
 
 CONST
 {$IFDEF UNICODE}
@@ -9454,11 +9434,9 @@ const
 
 // Static Class Name
          WC_STATICA                     = 'Static';
-         WC_STATICW                     = {L}'Static';
+         WC_STATICW                     = {L}'Static'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_STATIC           = WC_STATICW;
 {$ELSE}
          WC_STATIC           = WC_STATICA;
@@ -9482,11 +9460,9 @@ CONST
 
 // Edit Class Name
          WC_EDITA                       = 'Edit';
-         WC_EDITW                       = {L}'Edit';
+         WC_EDITW                       = {L}'Edit'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_EDIT             = WC_EDITW;
 {$ELSE}
          WC_EDIT             = WC_EDITA;
@@ -9572,11 +9548,9 @@ function Edit_GetHilite(hwndCtl:hwnd):DWORD;
 
 CONST
          WC_LISTBOXA                    = 'ListBox';
-         WC_LISTBOXW                    = {L}'ListBox';
+         WC_LISTBOXW                    = 'ListBox'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_LISTBOX          = WC_LISTBOXW;
 {$ELSE}
          WC_LISTBOX          = WC_LISTBOXA;
@@ -9601,11 +9575,9 @@ CONST
 
 // Combobox Class Name
          WC_COMBOBOXA                   = 'ComboBox';
-         WC_COMBOBOXW                   = {L}'ComboBox';
+         WC_COMBOBOXW                   = {L}'ComboBox'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_COMBOBOX         = WC_COMBOBOXW;
 {$ELSE}
          WC_COMBOBOX         = WC_COMBOBOXA;
@@ -9652,11 +9624,9 @@ Function ComboBox_GetMinVisible( hwnd : hwnd):cint;
 
 CONST
          WC_SCROLLBARA                  = 'ScrollBar';
-         WC_SCROLLBARW                  = {L}'ScrollBar';
+         WC_SCROLLBARW                  = {L}'ScrollBar'#$0000;
 
 {$IFDEF UNICODE}
-
-TYPE
          WC_SCROLLBAR        = WC_SCROLLBARW;
 {$ELSE}
          WC_SCROLLBAR        = WC_SCROLLBARA;
@@ -9683,7 +9653,7 @@ CONST
 
 
 
-         WC_LINK                        = {L}'SysLink';
+         WC_LINK                        = {L}'SysLink'#$0000;
 
          LWS_TRANSPARENT                = $0001;
          LWS_IGNORERETURN               = $0002;

+ 1 - 1
packages/winunits-base/src/typelib.pas

@@ -1678,7 +1678,7 @@ begin
             sl:=trim(copy(sRefSrc,pos(',',sRefSrc)+1,length(sRefSrc))); //format: filename, id
             sRefSrc:=copy(sRefSrc,1,pos(',',sRefSrc)-1);
             //Load bitmap
-            ResHandle:=LoadLibraryEx(pchar(sRefSrc),0,$00000022); //LOAD_LIBRARY_AS_IMAGE_RESOURCE or LOAD_LIBRARY_AS_DATAFILE
+            ResHandle:=LoadLibraryExA(pchar(sRefSrc),0,$00000022); //LOAD_LIBRARY_AS_IMAGE_RESOURCE or LOAD_LIBRARY_AS_DATAFILE
             if (ResHandle<>0) then
               begin
               bmhandle:=FindResource(ResHandle,makeintresource(StrToIntDef(sl,0)),RT_BITMAP);

+ 2 - 2
packages/winunits-base/src/wininet.pp

@@ -811,7 +811,7 @@ Const
      HTTP_MINOR_VERSION      = 0;
 
      HTTP_VERSIONA           = 'HTTP/1.0';
-     HTTP_VERSIONW           : widestring = 'HTTP/1.0';
+     HTTP_VERSIONW           = 'HTTP/1.0'#$0000; // force unicode url.
      {$ifdef UNICODE}
        HTTP_VERSION = HTTP_VERSIONW;
      {$ELSE}
@@ -2583,7 +2583,7 @@ Type
              lpReserved:LPVOID):BOOL;stdcall;external WININETLIBNAME name 'FindNextUrlCacheEntryExW';
   function FindFirstUrlCacheEntry(lpszUrlSearchPattern:LPCWSTR; lpFirstCacheEntryInfo:LPINTERNET_CACHE_ENTRY_INFOW; lpcbCacheEntryInfo:LPDWORD):HANDLE;stdcall;external WININETLIBNAME name 'FindFirstUrlCacheEntryW';
   function FindNextUrlCacheEntry(hEnumHandle:HANDLE; lpNextCacheEntryInfo:LPINTERNET_CACHE_ENTRY_INFOW; lpcbCacheEntryInfo:LPDWORD):BOOL;stdcall;external WININETLIBNAME name 'FindNextUrlCacheEntryW';
-  function FindCloseUrlCache(hEnumHandle:HANDLE):BOOL;stdcall;external WININETLIBNAME name 'FindCloseUrlCache';
+//  function FindCloseUrlCache(hEnumHandle:HANDLE):BOOL;stdcall;external WININETLIBNAME name 'FindCloseUrlCache';
   function DeleteUrlCacheEntry(lpszUrlName:LPCWSTR):BOOL;stdcall;external WININETLIBNAME name 'DeleteUrlCacheEntryW';
   function InternetDial(hwndParent:HWND; lpszConnectoid:LPWSTR; dwFlags:DWORD; lpdwConnection:PDWORD_PTR; dwReserved:DWORD):DWORD;stdcall;external WININETLIBNAME name 'InternetDialW';