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

git-svn-id: trunk@24692 -

packages/winunits-base/src/commctrl.pp

@@ -795,10 +795,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}
@@ -1440,7 +1440,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         TOOLBARCLASSNAMEW              = {L}'ToolbarWindow32';
+         TOOLBARCLASSNAMEW              = {L}'ToolbarWindow32'#$0000;
          TOOLBARCLASSNAMEA              = 'ToolbarWindow32';
 
 {$IFDEF  UNICODE}
@@ -1742,7 +1742,7 @@ TYPE
                                  pszValueName : LPCWSTR;
                                  END;
          TBSAVEPARAMSW        = tagTBSAVEPARAMSW;
-         LPTBSAVEPARAMW       = ^tagTBSAVEPARAMSW;
+         LPTBSAVEPARAMSW      = ^tagTBSAVEPARAMSW;
          TTBSAVEPARAMSW       = tagTBSAVEPARAMSW;
          PTBSAVEPARAMSW       = ^tagTBSAVEPARAMSW;
 
@@ -2252,7 +2252,9 @@ TYPE
                                  END;
          NMTOOLBARA           = tagNMTOOLBARA;
          LPNMTOOLBARA         = ^tagNMTOOLBARA;
+         {$ifndef unicode}
          LPNMTOOLBAR          = LPNMTOOLBARA;
+         {$endif}
          TNMTOOLBARA          = tagNMTOOLBARA;
          PNMTOOLBARA          = LPNMTOOLBARA;
 {$ENDIF}
@@ -2316,7 +2318,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         REBARCLASSNAMEW                = {L}'ReBarWindow32';
+         REBARCLASSNAMEW                = {L}'ReBarWindow32'#$0000;
          REBARCLASSNAMEA                = 'ReBarWindow32';
 
 {$IFDEF  UNICODE}
@@ -2770,7 +2772,7 @@ TYPE
 {$IFDEF _WIN32}
 
 CONST
-         TOOLTIPS_CLASSW                = {L}'tooltips_class32';
+         TOOLTIPS_CLASSW                = {L}'tooltips_class32'#$0000;
          TOOLTIPS_CLASSA                = 'tooltips_class32';
 
 {$IFDEF UNICODE}
@@ -3206,7 +3208,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}
@@ -3307,7 +3309,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;
@@ -3463,7 +3465,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;
@@ -3562,7 +3564,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;
@@ -3703,7 +3705,7 @@ CONST
 
 {$IFDEF _WIN32}
          WC_LISTVIEWA                   = 'SysListView32';
-         WC_LISTVIEWW                   = {L}'SysListView32';
+         WC_LISTVIEWW                   = {L}'SysListView32'#$0000;
 {$IFDEF UNICODE}
          WC_LISTVIEW                    = WC_LISTVIEWW;
 {$ELSE}
@@ -5778,7 +5780,7 @@ Type
 CONST
 {$IFDEF _WIN32}
          WC_TREEVIEWA                   = 'SysTreeView32';
-         WC_TREEVIEWW                   = {L}'SysTreeView32';
+         WC_TREEVIEWW                   = {L}'SysTreeView32'#$0000;
 
 {$IFDEF UNICODE}
          WC_TREEVIEW                    = WC_TREEVIEWW;
@@ -6235,8 +6237,6 @@ CONST
          TVM_GETITEMW                   = (TV_FIRST + 62);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_GETITEM         = TVM_GETITEMW;
 {$ELSE}
          TVM_GETITEM         = TVM_GETITEMA;
@@ -6255,8 +6255,6 @@ CONST
          TVM_SETITEMW                   = (TV_FIRST + 63);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_SETITEM         = TVM_SETITEMW;
 {$ELSE}
          TVM_SETITEM         = TVM_SETITEMA;
@@ -6272,8 +6270,6 @@ CONST
          TVM_EDITLABELA                 = (TV_FIRST + 14);
          TVM_EDITLABELW                 = (TV_FIRST + 65);
 {$IFDEF UNICODE}
-
-TYPE
          TVM_EDITLABEL       = TVM_EDITLABELW;
 {$ELSE}
          TVM_EDITLABEL       = TVM_EDITLABELA;
@@ -6402,8 +6398,6 @@ CONST
          TVM_GETISEARCHSTRINGW          = (TV_FIRST + 64);
 
 {$IFDEF UNICODE}
-
-TYPE
          TVM_GETISEARCHSTRING= TVM_GETISEARCHSTRINGW;
 {$ELSE}
          TVM_GETISEARCHSTRING= TVM_GETISEARCHSTRINGA;
@@ -7030,7 +7024,7 @@ CONST
 
 ////////////////////  ComboBoxEx ////////////////////////////////
 
-         WC_COMBOBOXEXW                 = {L}'ComboBoxEx32';
+         WC_COMBOBOXEXW                 = {L}'ComboBoxEx32'#$0000;
          WC_COMBOBOXEXA                 = 'ComboBoxEx32';
 
 
@@ -7342,11 +7336,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;
@@ -7568,8 +7560,6 @@ CONST
          TCM_GETITEMW                   = (TCM_FIRST + 60);
 
 {$IFDEF UNICODE}
-
-TYPE
          TCM_GETITEM         = TCM_GETITEMW;
 {$ELSE}
          TCM_GETITEM         = TCM_GETITEMA;
@@ -7586,8 +7576,6 @@ CONST
          TCM_SETITEMW                   = (TCM_FIRST + 61);
 
 {$IFDEF UNICODE}
-
-TYPE
          TCM_SETITEM         = TCM_SETITEMW;
 {$ELSE}
          TCM_SETITEM         = TCM_SETITEMA;
@@ -7871,7 +7859,7 @@ CONST
 
 {$IFDEF _WIN32}
 
-         ANIMATE_CLASSW                 = {L}'SysAnimate32';
+         ANIMATE_CLASSW                 = {L}'SysAnimate32'#$0000;
          ANIMATE_CLASSA                 = 'SysAnimate32';
 
 {$IFDEF UNICODE}
@@ -7949,7 +7937,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';
 
 
@@ -8469,7 +8457,7 @@ CONST
 {$IFNDEF NODATETIMEPICK}
 {$IFDEF _WIN32}
 
-         DATETIMEPICK_CLASSW            = {L}'SysDateTimePick32';
+         DATETIMEPICK_CLASSW            = {L}'SysDateTimePick32'#$0000;
          DATETIMEPICK_CLASSA            = 'SysDateTimePick32';
 
 {$IFDEF UNICODE}
@@ -8553,8 +8541,6 @@ CONST
          DTM_SETFORMATW                 = (DTM_FIRST + 50);
 
 {$IFDEF UNICODE}
-
-TYPE
          DTM_SETFORMAT       = DTM_SETFORMATW;
 {$ELSE}
          DTM_SETFORMAT       = DTM_SETFORMATA;
@@ -8886,12 +8872,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;
@@ -8956,12 +8940,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;
@@ -9229,12 +9211,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;
@@ -9265,7 +9245,7 @@ CONST
 
 // Button Class Name
          WC_BUTTONA                     = 'Button';
-         WC_BUTTONW                     = {L}'Button';
+         WC_BUTTONW                     = {L}'Button'#$0000;
 
 CONST
 {$IFDEF UNICODE}
@@ -9458,11 +9438,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;
@@ -9486,11 +9464,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;
@@ -9576,11 +9552,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;
@@ -9605,11 +9579,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;
@@ -9656,11 +9628,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;
@@ -9687,7 +9657,7 @@ CONST
 
 
 
-         WC_LINK                        = {L}'SysLink';
+         WC_LINK                        = {L}'SysLink'#$0000;
 
          LWS_TRANSPARENT                = $0001;
          LWS_IGNORERETURN               = $0002;

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);

packages/winunits-base/src/wininet.pp

@@ -815,7 +815,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}
@@ -2587,7 +2587,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';