--- Merging r14081 into '.':

U    packages/winunits-base/src/wininet.pp
--- Merging r14101 into '.':
U    packages/winunits-jedi/src/jwawindllnames.pas
--- Merging r14193 into '.':
U    packages/Makefile
U    packages/Makefile.fpc
--- Merging r14319 into '.':
U    packages/winunits-base/src/mmsystem.pp
--- Merging r14413 into '.':
U    packages/winunits-base/src/comobj.pp
--- Merging r14431 into '.':
U    packages/winunits-base/src/shlobj.pp
--- Merging r14440 into '.':
G    packages/winunits-base/src/comobj.pp
--- Merging r14471 into '.':
G    packages/winunits-base/src/comobj.pp
--- Merging r14600 into '.':
G    packages/winunits-base/src/mmsystem.pp

# revisions: 14081,14101,14193,14319,14413,14431,14440,14471,14600
------------------------------------------------------------------------
r14081 | marco | 2009-11-06 12:58:45 +0100 (Fri, 06 Nov 2009) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/wininet.pp

 * packrecords as per mantis 15009 + checking the packed records.

------------------------------------------------------------------------
------------------------------------------------------------------------
r14101 | marco | 2009-11-07 16:10:58 +0100 (Sat, 07 Nov 2009) | 2 lines
Changed paths:
   M /trunk/packages/winunits-jedi/src/jwawindllnames.pas

 * fix winspool name, mantis 10619.

------------------------------------------------------------------------
------------------------------------------------------------------------
r14193 | marco | 2009-11-15 22:53:19 +0100 (Sun, 15 Nov 2009) | 2 lines
Changed paths:
   M /trunk/packages/Makefile
   M /trunk/packages/Makefile.fpc

 * fixed the suffixes of fcl-registry dependance of winunits-base.  (non related remark in mantis 15079)

------------------------------------------------------------------------
------------------------------------------------------------------------
r14319 | marco | 2009-12-04 09:28:11 +0100 (Fri, 04 Dec 2009) | 1 line
Changed paths:
   M /trunk/packages/winunits-base/src/mmsystem.pp

 * mod_wavetable, mod_swsynth added, mantis 15250
------------------------------------------------------------------------
------------------------------------------------------------------------
r14413 | marco | 2009-12-11 23:04:32 +0100 (Fri, 11 Dec 2009) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/comobj.pp

 * wince comobj compiling again, Mantis 15079

------------------------------------------------------------------------
------------------------------------------------------------------------
r14431 | marco | 2009-12-13 01:03:26 +0100 (Sun, 13 Dec 2009) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/shlobj.pp

 * IFileDialogs and friends. Needed for Vista like fileopendialogs

------------------------------------------------------------------------
------------------------------------------------------------------------
r14440 | florian | 2009-12-13 22:22:00 +0100 (Sun, 13 Dec 2009) | 1 line
Changed paths:
   M /trunk/packages/winunits-base/src/comobj.pp

* as in #15337 reported, in newer Delphi versions EOleRegistrationError inherits from EOleSysError
------------------------------------------------------------------------
------------------------------------------------------------------------
r14471 | florian | 2009-12-23 22:25:42 +0100 (Wed, 23 Dec 2009) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/comobj.pp

* export CreateRegKey and friends from ComObj, resolves #15299
* CreateRegKey throws an EOleRegistrationError exception on error
------------------------------------------------------------------------
------------------------------------------------------------------------
r14600 | marco | 2010-01-10 16:15:17 +0100 (Sun, 10 Jan 2010) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/mmsystem.pp

 * fixed some minor aliases in header. From nldelphi.

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@14675 -

packages/Makefile

@@ -8876,11 +8876,11 @@ unixutil_shared: libc_shared fcl-base_shared
 unixutil_smart: libc_smart fcl-base_smart
 unixutil_debug: libc_debug fcl-base_debug
 unixutil_release: libc_release fcl-base_release
-winunits-base_all: fcl-registry fcl-base_all
-winunits-base_shared: fcl-registry fcl-base_shared
-winunits-base_smart: fcl-registry fcl-base_smart
-winunits-base_debug: fcl-registry fcl-base_debug
-winunits-base_release: fcl-registry fcl-base_release
+winunits-base_all: fcl-registry_all fcl-base_all
+winunits-base_shared: fcl-registry_shared fcl-base_shared
+winunits-base_smart: fcl-registry_smart fcl-base_smart
+winunits-base_debug: fcl-registry_debug fcl-base_debug
+winunits-base_release: fcl-registry_release fcl-base_release
 winunits-jedi_all: winunits-base_all fcl-registry fcl-base_all
 winunits-jedi_shared: winunits-base_shared fcl-registry fcl-base_shared
 winunits-jedi_smart: winunits-base_smart fcl-registry fcl-base_smart

packages/Makefile.fpc

@@ -321,11 +321,11 @@ unixutil_smart: libc_smart fcl-base_smart
 unixutil_debug: libc_debug fcl-base_debug
 unixutil_release: libc_release fcl-base_release
 
-winunits-base_all: fcl-registry fcl-base_all
-winunits-base_shared: fcl-registry fcl-base_shared
-winunits-base_smart: fcl-registry fcl-base_smart
-winunits-base_debug: fcl-registry fcl-base_debug
-winunits-base_release: fcl-registry fcl-base_release
+winunits-base_all: fcl-registry_all fcl-base_all
+winunits-base_shared: fcl-registry_shared fcl-base_shared
+winunits-base_smart: fcl-registry_smart fcl-base_smart
+winunits-base_debug: fcl-registry_debug fcl-base_debug
+winunits-base_release: fcl-registry_release fcl-base_release
 
 winunits-jedi_all: winunits-base_all fcl-registry fcl-base_all
 winunits-jedi_shared: winunits-base_shared fcl-registry fcl-base_shared

packages/winunits-base/src/comobj.pp

@@ -19,7 +19,10 @@ unit comobj;
   interface
 
 { $define DEBUG_COM}
-{ $define DUMMY_REG}
+
+{$ifdef wince}
+  {$define DUMMY_REG}
+{$endif}
     uses
       Windows,Types,Variants,Sysutils,ActiveX,classes;
 
@@ -44,11 +47,11 @@ unit comobj;
         property Source: string read FSource write FSource;
       end;
 
-      EOleRegistrationError = class(EOleError);
+      EOleRegistrationError = class(EOleSysError);
 
       TOleStream = Class(TProxyStream)
-                  procedure Check(err:integer);override;
-		end;
+        procedure Check(err:integer);override;
+      end;
 
       TComServerObject = class(TObject)
       protected
@@ -282,6 +285,9 @@ unit comobj;
 
     function ComClassManager : TComClassManager;
 
+    procedure CreateRegKey(const Key, ValueName, Value: string; RootKey: DWord = HKEY_CLASSES_ROOT);
+    procedure DeleteRegKey(const Key: string; RootKey: DWord = HKEY_CLASSES_ROOT);
+    function GetRegStringValue(const Key, ValueName: string; RootKey: DWord = HKEY_CLASSES_ROOT): string;
 
     type
       TCoCreateInstanceExProc = function(const clsid: TCLSID; unkOuter: IUnknown; dwClsCtx: DWORD; ServerInfo: PCoServerInfo;
@@ -305,7 +311,7 @@ unit comobj;
 implementation
 
     uses
-      ComConst, Ole2, Registry, RtlConsts;
+      ComConst, Ole2, {$ifndef dummy_reg} Registry, {$endif} RtlConsts;
 
     var
       Uninitializing : boolean;
@@ -439,7 +445,7 @@ implementation
      end;
 {$endif wince}
 
-    procedure CreateRegKey(const Key, ValueName, Value: string);
+    procedure CreateRegKey(const Key, ValueName, Value: string; RootKey: DWord = HKEY_CLASSES_ROOT);
 {$ifndef DUMMY_REG}
       var
         Reg: TRegistry;
@@ -451,7 +457,7 @@ implementation
 {$ifndef DUMMY_REG}
         Reg := TRegistry.Create;
         try
-          Reg.RootKey := HKEY_CLASSES_ROOT;
+          Reg.RootKey := RootKey;
           if Reg.OpenKey(Key, True) then
           begin
             try
@@ -461,7 +467,7 @@ implementation
             end;
           end
           else
-            raise ERegistryException.CreateResFmt(@SRegCreateFailed, [Key]);
+            raise EOleRegistrationError.CreateResFmt(@SRegCreateFailed,[Key]);
         finally
           Reg.Free;
         end;
@@ -471,7 +477,8 @@ implementation
 {$endif}
       end;
 
-    procedure DeleteRegKey(const Key: string);
+
+    procedure DeleteRegKey(const Key: string; RootKey: DWord = HKEY_CLASSES_ROOT);
 {$ifndef DUMMY_REG}
       var
         Reg: TRegistry;
@@ -483,7 +490,7 @@ implementation
 {$ifndef DUMMY_REG}
         Reg := TRegistry.Create;
         try
-          Reg.RootKey := HKEY_CLASSES_ROOT;
+          Reg.RootKey := RootKey;
           Reg.DeleteKey(Key);
         finally
           Reg.Free;
@@ -491,13 +498,17 @@ implementation
 {$endif}
       end;
 
-    function GetRegStringValue(const Key, ValueName: string): string;
+
+    function GetRegStringValue(const Key, ValueName: string; RootKey: DWord = HKEY_CLASSES_ROOT): string;
+    {$ifndef DUMMY_REG}
       var
         Reg: TRegistry;
+    {$endif}
       begin
+       {$ifndef DUMMY_REG}
         Reg := TRegistry.Create();
         try
-          Reg.RootKey := HKEY_CLASSES_ROOT;
+          Reg.RootKey := RootKey;
           if Reg.OpenKeyReadOnly(Key) then
           begin
             try
@@ -511,8 +522,10 @@ implementation
         finally
           Reg.Free;
         end;
+       {$endif}
       end;
 
+
    procedure OleError(Code: HResult);
      begin
        raise EOleSysError.Create('',Code,0);
@@ -972,7 +985,9 @@ HKCR
 
     procedure TComObjectFactory.UpdateRegistry(Register: Boolean);
       var
+        {$ifndef DUMMY_REG}
         reg: TRegistry;
+        {$endif}
         classidguid: String;
 
         function ThreadModelToString(model: TThreadingModel): String;
@@ -987,6 +1002,7 @@ HKCR
         end;
 
       begin
+{$ifndef DUMMY_REG}
 {$ifdef DEBUG_COM}
         WriteLn('UpdateRegistry begin');
 {$endif}
@@ -1036,6 +1052,7 @@ HKCR
 {$ifdef DEBUG_COM}
         WriteLn('UpdateRegistry end');
 {$endif}
+{$endif DUMMY_REG}
       end;
 
 
@@ -1648,11 +1665,11 @@ HKCR
         inherited Create(AComServer, AutoClass, AClassID, AInstancing, AThreadingModel);
       end;
 
-procedure TOleStream.Check(err:integer);
-begin
-  OleCheck(err);
-end;
 
+    procedure TOleStream.Check(err:integer);
+      begin
+        OleCheck(err);
+      end;
 
 const
   Initialized : boolean = false;

packages/winunits-base/src/mmsystem.pp

@@ -245,6 +245,8 @@ Const
     MOD_SQSYNTH = 3;
     MOD_FMSYNTH = 4;
     MOD_MAPPER = 5;
+    MOD_WAVETABLE =  6;  { hardware wavetable synth }
+    MOD_SWSYNTH   =  7;  { software synth }
     MIDICAPS_VOLUME = 1;
     MIDICAPS_LRVOLUME = 2;
     MIDICAPS_CACHE = 4;
@@ -1141,7 +1143,9 @@ Type
  HMIDISTRM = THandle;
  LPHMIDI = ^HMIDI;
  LPHMIDIIN = ^HMIDIIN;
+ PHMIDIIN = LPHMIDIIN;
  LPHMIDIOUT = ^HMIDIOUT;
+ PHMIDIOUT =  LPHMIDIOUT;
  LPHMIDISTRM = ^HMIDISTRM;
  LPMIDICALLBACK = PDRVCALLBACK;
 
@@ -1231,6 +1235,7 @@ Type
   LPMIDIINCAPS  = LPMIDIINCAPSA;
  {$endif}
  TMIDIINCAPS  = MIDIINCAPS;
+ TMIDIOUTCAPS = MIDIOUTCAPS;
 
  PMIDIHDR = ^_midihdr;
  _midihdr = packed Record

packages/winunits-base/src/shlobj.pp

@@ -838,11 +838,51 @@ Const
   SMSET_DONTOWN           = $00000001;    // The Menuband doesn't own the non-ref counted object
   SMINV_REFRESH           = $00000001;
   SMINV_ID                = $00000008;
-
+  FDEOR_DEFAULT           = 0;
+  FDEOR_ACCEPT	          = 1;
+  FDEOR_REFUSE            = 2;
+  FDESVR_DEFAULT          = 0;
+  FDESVR_ACCEPT           = 1;
+  FDESVR_REFUSE           = 2;
+  FDAP_BOTTOM             = 0;
+  FDAP_TOP                = 1;
+  FOS_OVERWRITEPROMPT     =        $2;
+  FOS_STRICTFILETYPES     =        $4;
+  FOS_NOCHANGEDIR         =        $8;
+  FOS_PICKFOLDERS         =       $20;
+  FOS_FORCEFILESYSTEM	  =       $40;
+  FOS_ALLNONSTORAGEITEMS  =       $80;
+  FOS_NOVALIDATE	  =      $100;
+  FOS_ALLOWMULTISELECT    =      $200;
+  FOS_PATHMUSTEXIST       =      $800;
+  FOS_FILEMUSTEXIST       =     $1000;
+  FOS_CREATEPROMPT        =     $2000;
+  FOS_SHAREAWARE          =     $4000;
+  FOS_NOREADONLYRETURN    =     $8000;
+  FOS_NOTESTFILECREATE    =    $10000;
+  FOS_HIDEMRUPLACES       =    $20000;
+  FOS_HIDEPINNEDPLACES    =    $40000;
+  FOS_NODEREFERENCELINKS  =   $100000;
+  FOS_DONTADDTORECENT     =  $2000000;
+  FOS_FORCESHOWHIDDEN     = $10000000;
+  FOS_DEFAULTNOMINIMODE	  = $20000000;
+  FOS_FORCEPREVIEWPANEON  = $40000000;
+   
 Type
-      SFGAOF = ULONG;
+      SFGAOF  = ULONG;
       TSFGAOF = SFGAOF;
       PSFGAOF = ^SFGAOF;
+      SHCONTF    = longint;
+      TSHCONTF   = SHCONTF;
+      PSHCONTF   = ^SHCONTF;
+      SIGDN      = longint;
+      TSIGDN     = SIGDN;
+      PSIGDN     = ^SIGDN;
+      SICHINTF   = longint;
+      TSICHINTF  = SICHINTF;
+      PSICHINTF  = ^SICHINTF; 
+
+
       PROPERTYUI_NAME_FLAGS = DWord; // enum
       PROPERTYUI_FORMAT_FLAGS = DWord;
       PROPERTYUI_FLAGS = Dword;
@@ -1715,7 +1755,28 @@ Type
      LPAASHELLMENUITEM = PtagAASHELLMENUITEM;
      PLPAASHELLMENUITEM = ^LPAASHELLMENUITEM;
 
-
+   FDE_OVERWRITE_RESPONSE       = longint;
+   TFDE_OVERWRITE_RESPONSE      = FDE_OVERWRITE_RESPONSE;
+   PFDE_OVERWRITE_RESPONSE      = ^longint;
+   FDE_SHAREVIOLATION_RESPONSE  = longint;
+   TFDE_SHAREVIOLATION_RESPONSE = FDE_SHAREVIOLATION_RESPONSE;
+   PFDE_SHAREVIOLATION_RESPONSE = ^FDE_SHAREVIOLATION_RESPONSE;    
+   FILEOPENDIALOGOPTIONS        = longint;
+   TFILEOPENDIALOGOPTIONS       = FILEOPENDIALOGOPTIONS;
+   PFILEOPENDIALOGOPTIONS       = ^TFILEOPENDIALOGOPTIONS;
+   FDAP = longint;
+   TFDAP= FDAP;
+   PFDAP= ^FDAP;
+   _COMDLG_FILTERSPEC = packed record
+                            pszName : LPCWSTR;
+			    pszSpec : LPCWSTR;
+                          end;
+
+   COMDLG_FILTERSPEC  = _COMDLG_FILTERSPEC;
+   TCOMDLG_FILTERSPEC = _COMDLG_FILTERSPEC;
+   PCOMDLG_FILTERSPEC = ^_COMDLG_FILTERSPEC;
+
+	
    IPersistFolder = Interface(IPersist)
         ['{000214EA-0000-0000-C000-000000000046}']
         function Initialize (pild : LPCITEMIDLIST): HResult; StdCall;
@@ -1999,6 +2060,67 @@ Type
         end;
      IShellLink = IShellLinkA;
 
+    PIShellItem= ^IShellItem;
+    IShellItem = interface(IUnknown)
+               ['{43826d1e-e718-42ee-bc55-a1e261c37bfe}']
+               function BindToHandler(pbc:IBindCTX;bhid:PGUID;RIID:PIID;ppv:ppointer):HResult;Stdcall;          
+               function GetParent(ppsi:PISHellItem):HResult;Stdcall;
+               function GetDisplayName(sigdnname:SIGDN;ppszName:LPWSTR):HResult; Stdcall;
+               function GetAttributes(sfgaomask:SFGAOF;psfgaoAttribs:PSFGAOF):HResult;Stdcall;
+               function Compare(psi:IShellItem;hint:SICHINTF;piorder:PINT):HResult; Stdcall;
+               end;
+
+    IModalWindow = Interface(IUnknown)
+	             ['{b4db1657-70d7-485e-8e3e-6fcb5a5c1802}']
+				   function Show(hwndparent:HWND):HResult;StdCall;
+				   end;
+				   
+    IShellItemFilter = Interface(IUnknown)
+	              ['{2659B475-EEB8-48b7-8F07-B378810F48CF}']
+                    function IncludeItem(psi:IShellItem):HResult;StdCall;
+                    function GetEnumFlagsForItem(psi:IShellItem;pgrfflags :PSHCONTF):HRESULT;Stdcall;
+                   end;					
+
+    IFileDialog = Interface;     
+    IFileDialogEvents = Interface(IUnknown)
+                   ['{973510db-7d7f-452b-8975-74a85828d354}']
+                    function OnFileOk         (pfd:IFileDialog):HResult; Stdcall;
+                    function OnFolderChanging (pfd:IFileDialog;psifolder:IShellItem):HResult; Stdcall;
+                    function OnFolderChange   (pfd:IFileDialog):HResult; Stdcall;
+                    function OnSelectionChange(pfd:IFileDialog):HResult; Stdcall;
+                    function OnShareViolation (pfd:IFileDialog;psi:IShellItem;pResponse :pFDE_SHAREVIOLATION_RESPONSE):HResult; Stdcall;
+                    function OnTypeChange     (pfd:IFileDialog):HResult; Stdcall;
+                    function OnOverwrite      (pfd:IFileDialog;psi:IShellItem;pResponse :pFDE_OVERWRITE_RESPONSE):HResult; Stdcall;
+                 end;
+
+    IFileDialog = Interface(IModalWindow) 
+                  ['{42f85136-db7e-439c-85f1-e4075d135fc8}']
+                    function SetFileTypes(cFileTypes:UINT;rgFilterSpec:pCOMDLG_FILTERSPEC):HRESULT;Stdcall;
+		    function SetFileTypeIndex(iFileType:UINT):HRESULT;Stdcall;
+		    function GetFileTypeIndex(piFileType:pUINT):HRESULT;Stdcall;
+		    function Advise(pdfde:IFileDialogEvents;pdwcookie:PDWORD):HRESULT;Stdcall;
+		    function unadvise(dwCookie:DWORD):HRESULT;Stdcall;
+		    function SetOptions(fos:FILEOPENDIALOGOPTIONS):HRESULT;Stdcall;
+		    function GetOptions(pfos:pFILEOPENDIALOGOPTIONS):HRESULT;Stdcall;
+		    function SetDefaultFolder(psi:IShellItem):HRESULT;Stdcall;
+		    function SetFolder(psi:IShellItem):HRESULT;Stdcall;
+		    function Getfolder(ppsi:pIShellItem):HRESULT;Stdcall;
+		    function GetCurrentSelection(ppsi:pIShellItem):HRESULT;Stdcall;
+		    function SetFileName(pszName:LPCWSTR):HRESULT;Stdcall;
+		    function GetFileName(pszName:pLPWSTR):HRESULT;Stdcall;
+		    function SetTitle(pszTitle:LPCWSTR):HRESULT;Stdcall;
+		    function SetOkButtonLabel(pszText:LPCWSTR):HRESULT;Stdcall;
+		    function SetFileNameLabel(pszLabel:LPCWSTR):HRESULT;Stdcall;
+		    function GetResult(ppsi:pIShellItem):HRESULT;Stdcall;
+		    function AddPlace(psi:IShellItem;fdap:FDAP):HRESULT;Stdcall;
+		    function SetDefaultExtension(pszDefaultExtension:LPCWSTR):HRESULT;Stdcall;
+		    function Close(hr:HRESULT):HRESULT;Stdcall;
+		    function SetClientGuid(GUID:PGUID):HRESULT;Stdcall;
+		    function ClearClientData:HRESULT;Stdcall;
+		    function SetFilter(pfilter:IShellItemFilter):HRESULT;Stdcall;
+		  end;
+
+
 function SHGetMalloc(out ppmalloc: IMalloc):HResult;StdCall; external 'shell32' name 'SHGetMalloc';
 function SHGetDesktopFolder(out ppshf:IShellFolder):HResult;StdCall; external 'shell32' name 'SHGetDesktopFolder';
 

packages/winunits-base/src/wininet.pp

@@ -20,6 +20,12 @@ interface
 
 Uses Windows;
 
+{$ifdef win64}
+  {$packrecords 8}
+{$else}
+  {$packrecords 4}
+{$endif}
+
 //
 // Internet APIs
 //
@@ -1389,7 +1395,7 @@ Const
 	
 Type	
 	
-     INTERNET_ASYNC_RESULT = packed record
+     INTERNET_ASYNC_RESULT = record
           dwResult : DWORD_PTR;
           dwError : DWORD;
        end;
@@ -1401,7 +1407,7 @@ Type
      PINTERNETASYNCRESULT = PINTERNET_ASYNC_RESULT;	
 
   { INTERNET_DIAGNOSTIC_SOCKET_INFO - info about the socket in use }
-     INTERNET_DIAGNOSTIC_SOCKET_INFO =packed  record
+     INTERNET_DIAGNOSTIC_SOCKET_INFO = record
           Socket : DWORD_PTR;
           SourcePort : DWORD;
           DestPort : DWORD;
@@ -1411,7 +1417,7 @@ Type
      LPINTERNET_DIAGNOSTIC_SOCKET_INFO = ^INTERNET_DIAGNOSTIC_SOCKET_INFO;
      PINTERNET_DIAGNOSTIC_SOCKET_INFO = LPINTERNET_DIAGNOSTIC_SOCKET_INFO;	
 
-    INTERNET_PREFETCH_STATUS = packed record
+    INTERNET_PREFETCH_STATUS = record
     			dwStatus,
 			dwSize : DWord;
                         end;
@@ -1422,7 +1428,7 @@ Type
     PINTERNETPREFETCHSTATUS= PINTERNET_PREFETCH_STATUS; 
     LPINTERNETPREFETCHSTATUS= PINTERNET_PREFETCH_STATUS; 
 
-     INTERNET_PROXY_INFO = packed record
+     INTERNET_PROXY_INFO =  record
           dwAccessType : DWORD;
           lpszProxy : LPCTSTR;
           lpszProxyBypass : LPCTSTR;
@@ -1904,7 +1910,7 @@ Type
      PFN_AUTH_NOTIFY = function (dwContext:DWORD_PTR; dwReturn:DWORD; lpreserved:LPVOID):DWORD;stdcall;
 	 InternetAuthNotifyCallback = PFN_AUTH_NOTIFY;
 
-     _INTERNET_CACHE_ENTRY_INFOA = packed record
+     _INTERNET_CACHE_ENTRY_INFOA = record
           dwStructSize : DWORD;
           lpszSourceUrlName : LPSTR;
           lpszLocalFileName : LPSTR;
@@ -1930,7 +1936,7 @@ Type
      LPINTERNET_CACHE_ENTRY_INFOA = PINTERNET_CACHE_ENTRY_INFOA;
      PLPINTERNET_CACHE_ENTRY_INFOA = ^LPINTERNET_CACHE_ENTRY_INFOA;
 
-     _INTERNET_CACHE_ENTRY_INFOW = packed record
+     _INTERNET_CACHE_ENTRY_INFOW = record
           dwStructSize : DWORD;
           lpszSourceUrlName : LPWSTR;
           lpszLocalFileName : LPWSTR;
@@ -2047,7 +2053,7 @@ Type
 
 
   PAutoProxyHelperVtbl = ^AutoProxyHelperVtbl;
-  AutoProxyHelperVtbl = packed record
+  AutoProxyHelperVtbl =  record
           IsResolvable                : TIsResolvable;
           GetIPAddress                : TGetIPAddress;
           ResolveHostName             : TResolveHostName;

packages/winunits-jedi/src/jwawindllnames.pas

@@ -118,7 +118,7 @@ const
   versionlib = 'version.dll';
   winberapi = 'wldap32.dll';
   winfax = 'winfax.dll';
-  winspool32 = 'winspool32.drv';
+  winspool32 = 'winspool.drv';
   winstaDLL = 'winsta.dll';
   winternl_lib = 'ntdll.dll';
   wow16lib = 'kernel32.dll';