* resync with Jedi version. Mostly all dll names moved to a unit, and a new mass unit jwawindows, as well as 3 or 4 smaller units.

   jwanative now also includes a dynloading mechanism. 
   
  Also enabled dispid and dispinterfaces for 2.1+ plus after today. (dispinterface RTTI patch required)

  cleaned up makefile and checked proper building. Only commctrl is still not compiled due to nameclash with Lazarus. Will page Lazarus team again about this.

git-svn-id: trunk@6774 -

.gitattributes

@@ -1524,6 +1524,7 @@ packages/base/winunits/jwaaccctrl.pas svneol=native#text/plain
 packages/base/winunits/jwaaclapi.pas svneol=native#text/plain
 packages/base/winunits/jwaaclui.pas svneol=native#text/plain
 packages/base/winunits/jwaactiveds.pas svneol=native#text/plain
+packages/base/winunits/jwaactivex.pas svneol=native#text/plain
 packages/base/winunits/jwaadsdb.pas svneol=native#text/plain
 packages/base/winunits/jwaadserr.pas svneol=native#text/plain
 packages/base/winunits/jwaadshlp.pas svneol=native#text/plain
@@ -1546,6 +1547,7 @@ packages/base/winunits/jwabluetoothapis.pas svneol=native#text/plain
 packages/base/winunits/jwabthdef.pas svneol=native#text/plain
 packages/base/winunits/jwabthsdpdef.pas svneol=native#text/plain
 packages/base/winunits/jwabugcodes.pas svneol=native#text/plain
+packages/base/winunits/jwacarderr.pas svneol=native#text/plain
 packages/base/winunits/jwacderr.pas svneol=native#text/plain
 packages/base/winunits/jwacmnquery.pas svneol=native#text/plain
 packages/base/winunits/jwacolordlg.pas svneol=native#text/plain
@@ -1592,6 +1594,7 @@ packages/base/winunits/jwaiprtrmib.pas svneol=native#text/plain
 packages/base/winunits/jwaiptypes.pas svneol=native#text/plain
 packages/base/winunits/jwaisguids.pas svneol=native#text/plain
 packages/base/winunits/jwaissper16.pas svneol=native#text/plain
+packages/base/winunits/jwalm.pas svneol=native#text/plain
 packages/base/winunits/jwalmaccess.pas svneol=native#text/plain
 packages/base/winunits/jwalmalert.pas svneol=native#text/plain
 packages/base/winunits/jwalmapibuf.pas svneol=native#text/plain
@@ -1689,7 +1692,9 @@ packages/base/winunits/jwawincon.pas svneol=native#text/plain
 packages/base/winunits/jwawincpl.pas svneol=native#text/plain
 packages/base/winunits/jwawincred.pas svneol=native#text/plain
 packages/base/winunits/jwawincrypt.pas svneol=native#text/plain
+packages/base/winunits/jwawindllnames.pas svneol=native#text/plain
 packages/base/winunits/jwawindns.pas svneol=native#text/plain
+packages/base/winunits/jwawindows.pas svneol=native#text/plain
 packages/base/winunits/jwawinefs.pas svneol=native#text/plain
 packages/base/winunits/jwawinerror.pas svneol=native#text/plain
 packages/base/winunits/jwawinfax.pas svneol=native#text/plain
@@ -1706,6 +1711,7 @@ packages/base/winunits/jwawinsafer.pas svneol=native#text/plain
 packages/base/winunits/jwawinsock.pas svneol=native#text/plain
 packages/base/winunits/jwawinsock2.pas svneol=native#text/plain
 packages/base/winunits/jwawinsvc.pas svneol=native#text/plain
+packages/base/winunits/jwawinternl.pas svneol=native#text/plain
 packages/base/winunits/jwawintype.pas svneol=native#text/plain
 packages/base/winunits/jwawinuser.pas svneol=native#text/plain
 packages/base/winunits/jwawinver.pas svneol=native#text/plain

packages/base/winunits/Makefile.fpc

@@ -45,11 +45,13 @@ implicitunits=winver mmsystem comobj comconst ole2 activex shellapi shlobj olese
  jwawpcrsmsg jwawpftpmsg jwawppstmsg jwawpspihlp jwawptypes \
  jwawpwizmsg jwaws2atm jwaws2bth jwaws2dnet jwaws2spi jwaws2tcpip \
  jwawshisotp jwawsnetbs jwawsnwlink jwawtsapi32 jwazmouse jwasensevts \
- jwaadstlb jwanative shfolder richedit
+ jwaadstlb jwanative shfolder richedit jwawindows jwacarderr jwaactivex \
+ jwawindllnames jwawinternl
+
 
 examples=examples
 
-rsts = jwawintype
+rsts = jwawintype comconst
 
 [install]
 buildunit=buildjwa

packages/base/winunits/buildjwa.pp

@@ -58,7 +58,7 @@ uses
     jwawpcrsmsg, jwawpftpmsg, jwawppstmsg, jwawpspihlp, jwawptypes,
     jwawpwizmsg, jwaws2atm, jwaws2bth, jwaws2dnet, jwaws2spi, jwaws2tcpip,
     jwawshisotp, jwawsnetbs, jwawsnwlink, jwawtsapi32, jwazmouse, jwasensevts,
-    jwaadstlb, jwanative;
+    jwaadstlb, jwanative, jwawindows;
 
 implementation
 

packages/base/winunits/jedi.inc

@@ -46,7 +46,7 @@
 {                                                                              }
 {******************************************************************************}
 
-// Last modified: $Date: 2005/04/04 07:56:11 $
+// Last modified: $Date: 2005/04/15 08:19:38 $
 // For history see end of file
 
 (*
@@ -263,7 +263,8 @@
   SUPPORTS_WIDECHAR             Compiler supports the WideChar type (D2+)
   SUPPORTS_WIDESTRING           Compiler supports the WideString type (D3+/BCB3+)
   SUPPORTS_INTERFACE            Compiler supports interfaces (D3+/BCB3+)
-  SUPPORTS_DISPINTERFACE        Compiler supports dispinterfaces (D3+/BCB3+)
+  SUPPORTS_DISPINTERFACE        Compiler supports dispatch interfaces (D3+/BCB3+)
+  SUPPORTS_DISPID               Compiler supports dispatch ids (D3+/BCB3+/FPC)
   SUPPORTS_EXTSYM               Compiler supports the $EXTERNALSYM directive (D4+/BCB3+)
   SUPPORTS_NODEFINE             Compiler supports the $NODEFINE directive (D4+/BCB3+)
   SUPPORTS_LONGWORD             Compiler supports the LongWord type (unsigned 32 bit) (D4+/BCB4+)
@@ -276,6 +277,7 @@
   SUPPORTS_PLATFORM             Compiler supports the platform directive (D6+/BCB6+)
   SUPPORTS_LIBRARY              Compiler supports the library directive (D6+/BCB6+)
   SUPPORTS_LOCAL                Compiler supports the local directive (D6+/BCB6+)
+  SUPPORTS_INLINE               Compiler supports the inline directive (D9+)
   ACCEPT_DEPRECATED             Compiler supports or ignore the deprecated directive (D6/BCB6/FPC)
   ACCEPT_PLATFORM               Compiler supports or ignore the platform directive (D6+/BCB6+)
   ACCEPT_LIBRARY                Compiler supports or ignore the library directive (D6+/BCB6+)
@@ -829,12 +831,18 @@
 {------------------------------------------------------------------------------}
 
 {$IFDEF FPC}
-  {$MODE Delphi}
+  {$IFDEF  VER1_0}
+     Please use FPC 1.1 or later to compile this.
+  {$ELSE}
     {$DEFINE SUPPORTS_OUTPARAMS}
     {$DEFINE SUPPORTS_WIDECHAR}
     {$DEFINE SUPPORTS_WIDESTRING}
-    {$DEFINE SUPPORTS_INTERFACE}
-    {$DEFINE SUPPORTS_VARIANT}
+    {$IFDEF HASINTF}
+      {$DEFINE SUPPORTS_INTERFACE}
+    {$ENDIF}
+    {$IFDEF HASVARIANT}
+      {$DEFINE SUPPORTS_VARIANT}
+    {$ENDIF}
     {$IFDEF FPC_HAS_TYPE_SINGLE}
       {$DEFINE SUPPORTS_SINGLE}
     {$ENDIF}
@@ -844,7 +852,9 @@
     {$IFDEF FPC_HAS_TYPE_EXTENDED}
       {$DEFINE SUPPORTS_EXTENDED}
     {$ENDIF}
-    {$DEFINE SUPPORTS_CURRENCY}
+    {$IFDEF HASCURRENCY}
+      {$DEFINE SUPPORTS_CURRENCY}
+    {$ENDIF}
     {$DEFINE SUPPORTS_THREADVAR}
     {$DEFINE SUPPORTS_CONSTPARAMS}
     {$DEFINE SUPPORTS_LONGWORD}
@@ -852,6 +862,7 @@
     {$DEFINE SUPPORTS_DYNAMICARRAYS}
     {$DEFINE SUPPORTS_DEFAULTPARAMS}
     {$DEFINE SUPPORTS_OVERLOAD}
+    {$DEFINE SUPPORTS_INLINE}
     {$DEFINE ACCEPT_DEPRECATED}
     {$DEFINE ACCEPT_PLATFORM}
     {$DEFINE ACCEPT_LIBRARY}
@@ -867,12 +878,18 @@
     {$DEFINE HAS_UNIT_TYPES}
     {$DEFINE HAS_UNIT_VARIANTS}
     {$DEFINE HAS_UNIT_STRUTILS}
+    {$DEFINE HAS_UNIT_RTLCONSTS}
 
     {$DEFINE XPLATFORM_RTL}
-
+    {$DEFINE NOVCL}  // mostly around oleserver etc.
+    {$if (FPC_VERSION>2) or ((FPC_VERSION=2) and (fpc_release>=1))}
+    {$DEFINE SUPPORTS_DISPINTERFACE }
+    {$DEFINE SUPPORTS_IMPLEMENTS }
+    {$ELSE}
     {$UNDEF SUPPORTS_DISPINTERFACE}
-    {$UNDEF SUPPORTS_DISPID} // is used outside of dispinterfaces
     {$UNDEF SUPPORTS_IMPLEMENTS}
+    {$ENDIF}
+
     {$UNDEF SUPPORTS_UNSAFE_WARNINGS}
   {$ENDIF}
 {$ENDIF FPC}
@@ -935,6 +952,10 @@
   {$DEFINE SUPPORTS_UNSAFE_WARNINGS}
 {$ENDIF COMPILER7_UP}
 
+{$IFDEF COMPILER9_UP}
+  {$DEFINE SUPPORTS_INLINE}
+{$ENDIF COMPILER9_UP}
+
 {$IFDEF RTL140_UP}
   {$IFDEF LINUX}
     {$DEFINE HAS_UNIT_LIBC}
@@ -1011,23 +1032,32 @@
 
 // History:
 
-
-// Revision 1.1  2005/04/04 07:56:11  marco
-//  * Jedi Windows Api initial import
+// $Log: jedi.inc,v $
+// Revision 1.3  2005/04/15 08:19:38  marquardt
+// fixed HAS_UNIT_RTLCONSTS declaration for FPC
+//
+// Revision 1.2  2005/04/15 07:49:33  marquardt
+// updated to match newest version of JVCL
 //
-// Revision 1.1  2004/11/11 09:39:29  marquardt
-// added several directory trees, added jedi.inc to files, misc style changes
+// Revision 1.12  2005/02/22 07:37:21  marquardt
+// introduced SUPPORTS_INLINE
 //
-// Revision 1.19  2004/11/06 02:11:20  mthoma
-// history cleaning.
+// Revision 1.11  2005/01/06 18:54:49  marquardt
+// updated to match JCL version of file
 //
-// Revision 1.18  2004/08/10 02:52:02  rrossmair
-// - moved {$ENDIF ~JEDI_INC} to EOF.
+// Revision 1.10  2004/08/09 06:40:54  marquardt
+// add JvWStrUtils.pas as JclWideStrings.pas to JCL
 //
-// Revision 1.17  2004/08/09 06:38:08  peter3
+// Revision 1.9  2004/08/08 20:13:05  peter3
+// - Missing ENDIF added
+//
+// Revision 1.8  2004/08/08 16:04:17  peter3
 // - D8 support added
 // - D9 support added (guesswork)
 //
+// Revision 1.7  2004/07/30 07:33:34  marquardt
+// inc files on JCL level, minor cleanings
+//
 // Revision 1.16  2004/07/29 17:12:28  rrossmair
 // fixed comment ("KYLIXX_UP from KYLIXX mappings")
 //

packages/base/winunits/jediapilib.inc

@@ -35,15 +35,25 @@
 { For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html }
 {                                                                              }
 {******************************************************************************}
-{$ifndef FPC}
-{$A+}
-{$endif FPC}
-{$Z4}
+{$A+,Z4}
 
 // This file is intended for C header conversions.
 // It defines several mutually exclusive IFDEFs which determine
 // the Windows version the API conversion is usable with.
 
+{$I jedi.inc}
+
+{$IFNDEF JEDI_INC}
+ALERT_jedi_inc_incompatible
+// secure against old versions of jedi.inc.
+{$ENDIF !JEDI_INC}
+
+// activate standalone feature for files
+{$IFNDEF JWA_INCLUDEMODE}
+{$DEFINE JWA_INTERFACESECTION}
+{$DEFINE JWA_IMPLEMENTATIONSECTION}
+{$ENDIF !JWA_INCLUDEMODE}
+
 // Global switch to enable dynamic linking of some APIs
 {.DEFINE DYNAMIC_LINK}
 {$IFDEF DYNAMIC_LINK}
@@ -51,14 +61,6 @@
   {$WARNINGS OFF}
 {$ENDIF DYNAMIC_LINK}
 
-// allow FPC compat without any extra params.
-{$ifdef FPC}
-{$MODE Delphi}
-{$DEFINE NOVCL}
-{$else}
-{$DEFINE SUPPORTS_DISPID}
-{$ENDIF}
-
 // Global switch to make UNICODE versions of API functions default
 {.DEFINE UNICODE}
 
@@ -258,4 +260,4 @@
  {$DEFINE HTMLHELP11_UP}
 {$ENDIF HTMLHELP11}
 
-{$ENDIF ~JEDIAPILIB_INC}
+{$ENDIF ~JEDIAPILIB_INC}

packages/base/winunits/jwaObjsel.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaObjSel.pas,v 1.6 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaObjSel;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "ObjSel.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaWinType;
+  JwaActiveX, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "ObjSel.h"'}
+{$HPPEMIT ''}
 
 //  Contents:   Object Picker Dialog public header
 

packages/base/winunits/jwaaccctrl.pas

@@ -36,11 +36,19 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAccCtrl.pas,v 1.7 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaAccCtrl;
 
 {$WEAKPACKAGEUNIT}
 
+{$I jediapilib.inc}
+
+interface
+
+uses
+  JwaWindows;
+
 {$HPPEMIT ''}
 {$HPPEMIT '#include "aclapi.h"'}
 {$HPPEMIT ''}
@@ -53,13 +61,6 @@ unit JwaAccCtrl;
 {$HPPEMIT '#endif'}
 {$HPPEMIT ''}
 
-{$I jediapilib.inc}
-
-interface
-
-uses
-  JwaWinNT, JwaWinType;
-
 (* Dependencies
 // winnt
 PSID
@@ -1215,9 +1216,6 @@ type
 
 implementation
 
-uses
-  JwaWinBase;
-
 // (rom) MACRO implementation
 function AccFree(hMem: HLOCAL): HLOCAL;
 begin
@@ -1225,3 +1223,4 @@ begin
 end;
 
 end.
+

packages/base/winunits/jwaaclapi.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAclApi.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAclApi;
 
@@ -54,7 +55,7 @@ unit JwaAclApi;
 interface
 
 uses
-  JwaAccCtrl, JwaWinNT, JwaWinType;
+  JwaAccCtrl, JwaWindows;
 
 //
 // Progress Function:
@@ -353,13 +354,8 @@ function GetMultipleTrustee(pTrustee: PTRUSTEE): PTRUSTEE; stdcall;
 
 implementation
 
-const
-  aclapilib = 'advapi32.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaaclui.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAclUI.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAclUI;
 
@@ -54,7 +55,7 @@ unit JwaAclUI;
 interface
 
 uses
-  JwaAccCtrl, JwaWinNT, JwaWinUser, JwaWinType;
+  JwaAccCtrl, JwaWindows;
 
 //
 // ISecurityInformation interface
@@ -90,7 +91,7 @@ type
   {$EXTERNALSYM PSI_OBJECT_INFO}
   _SI_OBJECT_INFO = record
     dwFlags: DWORD;
-    hInstance: HINSTANCE;  // resources (e.g. strings) reside here
+    hInstance: HINST;      // resources (e.g. strings) reside here
     pszServerName: LPWSTR; // must be present
     pszObjectName: LPWSTR; // must be present
     pszPageTitle: LPWSTR;  // only valid if SI_PAGE_TITLE is set
@@ -332,8 +333,8 @@ function EditSecurity(hwndOwner: HWND; psi: LPSECURITYINFO): BOOL; stdcall;
 
 implementation
 
-const
-  acluilib = 'aclui.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaactiveds.pas

@@ -40,23 +40,24 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaActiveDS.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaActiveDS;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "activeds.h"'}
-{$HPPEMIT ''}
-{$HPPEMIT 'typedef GUID REFIID'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaAdsTLB, JwaWinNT, JwaWinType, JwaWinUser;
+  JwaActiveX, JwaAdsTLB, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "activeds.h"'}
+{$HPPEMIT ''}
+{$HPPEMIT 'typedef GUID REFIID'}
+{$HPPEMIT ''}
 
 type
   REFIID = GUID;
@@ -852,9 +853,8 @@ function ADsPropCheckIfWritable(pwzAttr: PWSTR; pWritableAttrs: PADS_ATTR_INFO):
 
 implementation
 
-const
-  adslib = 'activeds.dll';
-  dsprop = 'dsprop.dll';
+uses
+  JwaWinDLLNames;
 
 // adshlp.h
 

packages/base/winunits/jwaactivex.pas

@@ -0,0 +1,798 @@
+{******************************************************************************}
+{                                                                              }
+{ Windows API interface Unit for Object Pascal                                 }
+{ Master file for Windows applications                                         }
+{                                                                              }
+{ Portions created by Microsoft are Copyright (C) Microsoft Corporation.       }
+{  All Rights Reserved.                                                        }
+{                                                                              }
+{ The original Pascal code is: JwaActiveX.pas, released September 2005.        }
+{ The initial developer of the Pascal code is                                  }
+{ Robert Marquardt (robert_marquardt att gmx dott de).                         }
+{                                                                              }
+{ Portions created by Robert Marquardt are Copyright (C) 2005                  }
+{ Robert Marquardt. All Rights Reserved.                                       }
+{                                                                              }
+{ Obtained through: Joint Endeavour of Delphi Innovators (Project JEDI)        }
+{                                                                              }
+{ You may retrieve the latest version of this file at the Project JEDI         }
+{ APILIB home page, located at http://jedi-apilib.sourceforge.net              }
+{                                                                              }
+{ The contents of this file are used with permission, subject to the Mozilla   }
+{ Public License Version 1.1 (the "License"); you may not use this file except }
+{ in compliance with the License. You may obtain a copy of the License at      }
+{ http://www.mozilla.org/MPL/MPL-1.1.html                                      }
+{                                                                              }
+{ Software distributed under the License is distributed on an "AS IS" basis,   }
+{ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for }
+{ the specific language governing rights and limitations under the License.    }
+{                                                                              }
+{ Alternatively, the contents of this file may be used under the terms of the  }
+{ GNU Lesser General Public License (the  "LGPL License"), in which case the   }
+{ provisions of the LGPL License are applicable instead of those above.        }
+{ If you wish to allow use of your version of this file only under the terms   }
+{ of the LGPL License and not to allow others to use your version of this file }
+{ under the MPL, indicate your decision by deleting  the provisions above and  }
+{ replace  them with the notice and other provisions required by the LGPL      }
+{ License.  If you do not delete the provisions above, a recipient may use     }
+{ your version of this file under either the MPL or the LGPL License.          }
+{                                                                              }
+{ For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html }
+{                                                                              }
+{******************************************************************************}
+
+// $Id: JwaActiveX.pas,v 1.1 2005/09/03 13:12:10 marquardt Exp $
+
+unit JwaActiveX;
+
+{$WEAKPACKAGEUNIT}
+
+{$I jediapilib.inc}
+
+interface
+
+uses
+  JwaWindows;
+
+const
+  { IConnectionPoint status codes }
+
+  CONNECT_E_FIRST = HRESULT($80040200);
+  {$EXTERNALSYM CONNECT_E_FIRST}
+  CONNECT_E_LAST  = HRESULT($8004020F);
+  {$EXTERNALSYM CONNECT_E_LAST}
+  CONNECT_S_FIRST = $00040200;
+  {$EXTERNALSYM CONNECT_S_FIRST}
+  CONNECT_S_LAST  = $0004020F;
+  {$EXTERNALSYM CONNECT_S_LAST}
+
+  CONNECT_E_NOCONNECTION  = CONNECT_E_FIRST + 0;
+  {$EXTERNALSYM CONNECT_E_NOCONNECTION}
+  CONNECT_E_ADVISELIMIT   = CONNECT_E_FIRST + 1;
+  {$EXTERNALSYM CONNECT_E_ADVISELIMIT}
+  CONNECT_E_CANNOTCONNECT = CONNECT_E_FIRST + 2;
+  {$EXTERNALSYM CONNECT_E_CANNOTCONNECT}
+  CONNECT_E_OVERRIDDEN    = CONNECT_E_FIRST + 3;
+  {$EXTERNALSYM CONNECT_E_OVERRIDDEN}
+
+type
+  IStream = interface;
+  IMoniker = interface;
+  IEnumMoniker = interface;
+  IConnectionPointContainer = interface;
+  IEnumSTATPROPSTG = interface;
+  IEnumSTATPROPSETSTG = interface;
+
+  TOleChar = WideChar;
+  POleStr = PWideChar;
+  PPOleStr = ^POleStr;
+
+  PIID = PGUID;
+  TIID = TGUID;
+
+  PCLSID = PGUID;
+  TCLSID = TGUID;
+
+  Largeint = Int64;
+  {$EXTERNALSYM Largeint}
+
+  TClipFormat = Word;
+  {$EXTERNALSYM TClipFormat}
+  PClipFormat = ^TClipFormat;
+  {$EXTERNALSYM PClipFormat}
+
+  POleBool = ^TOleBool;
+  TOleBool = WordBool;
+  {$EXTERNALSYM TOleBool}
+
+  POleDate = ^TOleDate;
+  TOleDate = Double;
+  {$EXTERNALSYM TOleDate}
+
+  PBStr = ^TBStr;
+  TBStr = POleStr;
+
+  PSCODE = ^SCODE;
+  {$EXTERNALSYM PSCODE}
+  SCODE = Integer;
+  {$EXTERNALSYM SCODE}
+
+  PPropID = ^PROPID;
+  PROPID = ULONG;
+  {$EXTERNALSYM PROPID}
+  TPropID = PROPID;
+
+  PFmtID = ^FMTID;
+  FMTID = TGUID;
+  {$EXTERNALSYM FMTID}
+  TFmtID = FMTID;
+
+  PSafeArrayBound = ^SAFEARRAYBOUND;
+  SAFEARRAYBOUND = record
+    cElements: Longint;
+    lLbound: Longint;
+  end;
+  TSafeArrayBound = SAFEARRAYBOUND;
+  {$EXTERNALSYM SAFEARRAYBOUND}
+
+  PSafeArray = ^SAFEARRAY;
+  SAFEARRAY = record
+    cDims: Word;
+    fFeatures: Word;
+    cbElements: Longint;
+    cLocks: Longint;
+    pvData: Pointer;
+    rgsabound: array [0..0] of TSafeArrayBound;
+  end;
+  TSafeArray = SAFEARRAY;
+  {$EXTERNALSYM SAFEARRAY}
+
+  (* tagBLOB related types cause problem due to two definitions of BLOB in wtypes.h/nspapi.h *)
+  (* Investigating something that will always work even when a BLOB is not a tagBLOB         *)
+  {$EXTERNALSYM PBlob}
+  PBlob = ^TBlob;
+  {$EXTERNALSYM tagBLOB}
+  tagBLOB = record
+    cbSize: Longint;
+    pBlobData: Pointer;
+  end;
+  (* tagBLOB related types cause problem due to two definitions of BLOB in wtypes.h/nspapi.h *)
+  (* Investigating something that will always work even when a BLOB is not a tagBLOB         *)
+  {$EXTERNALSYM TBlob}
+  TBlob = tagBLOB;
+  {$EXTERNALSYM BLOB}
+  BLOB = TBlob;
+
+  PClipData = ^CLIPDATA;
+  CLIPDATA = record
+    cbSize: Longint;
+    ulClipFmt: Longint;
+    pClipData: Pointer;
+  end;
+  TClipData = CLIPDATA;
+  {$EXTERNALSYM CLIPDATA}
+
+  PDVTargetDevice = ^TDVTargetDevice;
+  DVTARGETDEVICE = record
+    tdSize: Longint;
+    tdDriverNameOffset: Word;
+    tdDeviceNameOffset: Word;
+    tdPortNameOffset: Word;
+    tdExtDevmodeOffset: Word;
+    tdData: record end;
+  end;
+  {$EXTERNALSYM DVTARGETDEVICE}
+  TDVTargetDevice = DVTARGETDEVICE;
+
+  PFormatEtc = ^FORMATETC;
+  FORMATETC = record
+    cfFormat: TClipFormat;
+    ptd: PDVTargetDevice;
+    dwAspect: Longint;
+    lindex: Longint;
+    tymed: Longint;
+  end;
+  TFormatEtc = FORMATETC;
+  {$EXTERNALSYM FORMATETC}
+
+  PStgMedium = ^STGMEDIUM;
+  STGMEDIUM = record
+    tymed: Longint;
+    case Integer of
+      0: (hBitmap: THandle; // HBITMAP
+          unkForRelease: Pointer); // IUnknown
+      1: (hMetaFilePict: THandle);
+      2: (hEnhMetaFile: THandle);
+      3: (hGlobal: HGLOBAL);
+      4: (lpszFileName: POleStr);
+      5: (stm: Pointer); // IStream
+      6: (stg: Pointer); // IStorage
+  end;
+  TStgMedium = STGMEDIUM;
+  {$EXTERNALSYM STGMEDIUM}
+
+  IEnumVariant = interface(IUnknown)
+    ['{00020404-0000-0000-C000-000000000046}']
+    function Next(celt: Longword; var rgvar: OleVariant;
+      out pceltFetched: Longword): HRESULT; stdcall;
+    function Skip(celt: Longword): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out Enum: IEnumVariant): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumVariant}
+
+  IPersist = interface(IUnknown)
+    ['{0000010C-0000-0000-C000-000000000046}']
+    function GetClassID(out classID: TCLSID): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IPersist}
+
+  IEnumFORMATETC = interface(IUnknown)
+    ['{00000103-0000-0000-C000-000000000046}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out Enum: IEnumFormatEtc): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumFORMATETC}
+
+  IPersistStream = interface(IPersist)
+    ['{00000109-0000-0000-C000-000000000046}']
+    function IsDirty: HRESULT; stdcall;
+    function Load(const stm: IStream): HRESULT; stdcall;
+    function Save(const stm: IStream; fClearDirty: BOOL): HRESULT; stdcall;
+    function GetSizeMax(out cbSize: Largeint): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IPersistStream}
+
+  PStatStg = ^TStatStg;
+  STATSTG = record
+    pwcsName: POleStr;
+    dwType: Longint;
+    cbSize: Largeint;
+    mtime: TFileTime;
+    ctime: TFileTime;
+    atime: TFileTime;
+    grfMode: Longint;
+    grfLocksSupported: Longint;
+    clsid: TCLSID;
+    grfStateBits: Longint;
+    reserved: Longint;
+  end;
+  TStatStg = STATSTG;
+  {$EXTERNALSYM STATSTG}
+
+  {$EXTERNALSYM ISequentialStream}
+  ISequentialStream = interface(IUnknown)
+    ['{0c733a30-2a1c-11ce-ade5-00aa0044773d}']
+    function Read(pv: Pointer; cb: Longint; pcbRead: PLongint): HRESULT; stdcall;
+    function Write(pv: Pointer; cb: Longint; pcbWritten: PLongint): HRESULT; stdcall;
+  end;
+
+  IStream = interface(ISequentialStream)
+    ['{0000000C-0000-0000-C000-000000000046}']
+    function Seek(dlibMove: Largeint; dwOrigin: Longint;
+      out libNewPosition: Largeint): HRESULT; stdcall;
+    function SetSize(libNewSize: Largeint): HRESULT; stdcall;
+    function CopyTo(stm: IStream; cb: Largeint; out cbRead: Largeint;
+      out cbWritten: Largeint): HRESULT; stdcall;
+    function Commit(grfCommitFlags: Longint): HRESULT; stdcall;
+    function Revert: HRESULT; stdcall;
+    function LockRegion(libOffset: Largeint; cb: Largeint;
+      dwLockType: Longint): HRESULT; stdcall;
+    function UnlockRegion(libOffset: Largeint; cb: Largeint;
+      dwLockType: Longint): HRESULT; stdcall;
+    function Stat(out statstg: TStatStg; grfStatFlag: Longint): HRESULT; stdcall;
+    function Clone(out stm: IStream): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IStream}
+
+  IEnumString = interface(IUnknown)
+    ['{00000101-0000-0000-C000-000000000046}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out enm: IEnumString): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumString}
+
+  IRunningObjectTable = interface(IUnknown)
+    ['{00000010-0000-0000-C000-000000000046}']
+    function Register(grfFlags: Longint; const unkObject: IUnknown;
+      const mkObjectName: IMoniker; out dwRegister: Longint): HRESULT; stdcall;
+    function Revoke(dwRegister: Longint): HRESULT; stdcall;
+    function IsRunning(const mkObjectName: IMoniker): HRESULT; stdcall;
+    function GetObject(const mkObjectName: IMoniker;
+      out unkObject: IUnknown): HRESULT; stdcall;
+    function NoteChangeTime(dwRegister: Longint; const filetime: TFileTime): HRESULT; stdcall;
+    function GetTimeOfLastChange(const mkObjectName: IMoniker;
+      out filetime: TFileTime): HRESULT; stdcall;
+    function EnumRunning(out enumMoniker: IEnumMoniker): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IRunningObjectTable}
+
+  PBindOpts = ^TBindOpts;
+  BIND_OPTS = record
+    cbStruct: Longint;
+    grfFlags: Longint;
+    grfMode: Longint;
+    dwTickCountDeadline: Longint;
+  end;
+  TBindOpts = BIND_OPTS;
+  {$EXTERNALSYM BIND_OPTS}
+
+  IBindCtx = interface(IUnknown)
+    ['{0000000E-0000-0000-C000-000000000046}']
+    function RegisterObjectBound(const unk: IUnknown): HRESULT; stdcall;
+    function RevokeObjectBound(const unk: IUnknown): HRESULT; stdcall;
+    function ReleaseBoundObjects: HRESULT; stdcall;
+    function SetBindOptions(const bindopts: TBindOpts): HRESULT; stdcall;
+    function GetBindOptions(var bindopts: TBindOpts): HRESULT; stdcall;
+    function GetRunningObjectTable(out rot: IRunningObjectTable): HRESULT; stdcall;
+    function RegisterObjectParam(pszKey: POleStr; const unk: IUnknown): HRESULT; stdcall;
+    function GetObjectParam(pszKey: POleStr; out unk: IUnknown): HRESULT; stdcall;
+    function EnumObjectParam(out Enum: IEnumString): HRESULT; stdcall;
+    function RevokeObjectParam(pszKey: POleStr): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IBindCtx}
+
+  PIMoniker = ^IMoniker;
+  {$EXTERNALSYM PIMoniker}
+  IMoniker = interface(IPersistStream)
+    ['{0000000F-0000-0000-C000-000000000046}']
+    function BindToObject(const bc: IBindCtx; const mkToLeft: IMoniker;
+      const iidResult: TIID; out vResult): HRESULT; stdcall;
+    function BindToStorage(const bc: IBindCtx; const mkToLeft: IMoniker;
+      const iid: TIID; out vObj): HRESULT; stdcall;
+    function Reduce(const bc: IBindCtx; dwReduceHowFar: Longint;
+      mkToLeft: PIMoniker; out mkReduced: IMoniker): HRESULT; stdcall;
+    function ComposeWith(const mkRight: IMoniker; fOnlyIfNotGeneric: BOOL;
+      out mkComposite: IMoniker): HRESULT; stdcall;
+    function Enum(fForward: BOOL; out enumMoniker: IEnumMoniker): HRESULT; stdcall;
+    function IsEqual(const mkOtherMoniker: IMoniker): HRESULT; stdcall;
+    function Hash(out dwHash: Longint): HRESULT; stdcall;
+    function IsRunning(const bc: IBindCtx; const mkToLeft: IMoniker;
+      const mkNewlyRunning: IMoniker): HRESULT; stdcall;
+    function GetTimeOfLastChange(const bc: IBindCtx; const mkToLeft: IMoniker;
+      out filetime: TFileTime): HRESULT; stdcall;
+    function Inverse(out mk: IMoniker): HRESULT; stdcall;
+    function CommonPrefixWith(const mkOther: IMoniker;
+      out mkPrefix: IMoniker): HRESULT; stdcall;
+    function RelativePathTo(const mkOther: IMoniker;
+      out mkRelPath: IMoniker): HRESULT; stdcall;
+    function GetDisplayName(const bc: IBindCtx; const mkToLeft: IMoniker;
+      out pszDisplayName: POleStr): HRESULT; stdcall;
+    function ParseDisplayName(const bc: IBindCtx; const mkToLeft: IMoniker;
+      pszDisplayName: POleStr; out chEaten: Longint;
+      out mkOut: IMoniker): HRESULT; stdcall;
+    function IsSystemMoniker(out dwMksys: Longint): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IMoniker}
+
+  {$EXTERNALSYM IEnumMoniker}
+  IEnumMoniker = interface(IUnknown)
+    ['{00000102-0000-0000-C000-000000000046}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out enm: IEnumMoniker): HRESULT; stdcall;
+  end;
+
+  IAdviseSink = interface(IUnknown)
+    ['{0000010F-0000-0000-C000-000000000046}']
+    procedure OnDataChange(const formatetc: TFormatEtc; const stgmed: TStgMedium); stdcall;
+    procedure OnViewChange(dwAspect: Longint; lindex: Longint); stdcall;
+    procedure OnRename(const mk: IMoniker); stdcall;
+    procedure OnSave; stdcall;
+    procedure OnClose; stdcall;
+  end;
+  {$EXTERNALSYM IAdviseSink}
+
+  PStatData = ^TStatData;
+  STATDATA = record
+    formatetc: TFormatEtc;
+    advf: Longint;
+    advSink: IAdviseSink;
+    dwConnection: Longint;
+  end;
+  TStatData = STATDATA;
+  {$EXTERNALSYM STATDATA}
+
+  IEnumSTATDATA = interface(IUnknown)
+    ['{00000105-0000-0000-C000-000000000046}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out Enum: IEnumSTATDATA): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumSTATDATA}
+
+  IDataObject = interface(IUnknown)
+    ['{0000010E-0000-0000-C000-000000000046}']
+    function GetData(const formatetcIn: TFormatEtc; out medium: TStgMedium): HRESULT; stdcall;
+    function GetDataHere(const formatetc: TFormatEtc; out medium: TStgMedium): HRESULT; stdcall;
+    function QueryGetData(const formatetc: TFormatEtc): HRESULT; stdcall;
+    function GetCanonicalFormatEtc(const formatetc: TFormatEtc; out formatetcOut: TFormatEtc): HRESULT; stdcall;
+    function SetData(const formatetc: TFormatEtc; var medium: TStgMedium; fRelease: BOOL): HRESULT; stdcall;
+    function EnumFormatEtc(dwDirection: Longint; out enumFormatEtc: IEnumFORMATETC): HRESULT; stdcall;
+    function DAdvise(const formatetc: TFormatEtc; advf: Longint;
+      const advSink: IAdviseSink; out dwConnection: Longint): HRESULT; stdcall;
+    function DUnadvise(dwConnection: Longint): HRESULT; stdcall;
+    function EnumDAdvise(out enumAdvise: IEnumSTATDATA): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IDataObject}
+
+  IEnumConnectionPoints = interface
+    ['{B196B285-BAB4-101A-B69C-00AA00341D07}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out Enum: IEnumConnectionPoints): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumConnectionPoints}
+
+  IEnumConnections = interface
+    ['{B196B287-BAB4-101A-B69C-00AA00341D07}']
+    function Next(celt: Longint; out elt; pceltFetched: PLongint): HRESULT; stdcall;
+    function Skip(celt: Longint): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out Enum: IEnumConnections): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumConnections}
+
+  IConnectionPoint = interface
+    ['{B196B286-BAB4-101A-B69C-00AA00341D07}']
+    function GetConnectionInterface(out iid: TIID): HRESULT; stdcall;
+    function GetConnectionPointContainer(out cpc: IConnectionPointContainer): HRESULT; stdcall;
+    function Advise(const unkSink: IUnknown; out dwCookie: Longint): HRESULT; stdcall;
+    function Unadvise(dwCookie: Longint): HRESULT; stdcall;
+    function EnumConnections(out Enum: IEnumConnections): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IConnectionPoint}
+
+  IConnectionPointContainer = interface
+    ['{B196B284-BAB4-101A-B69C-00AA00341D07}']
+    function EnumConnectionPoints(out Enum: IEnumConnectionPoints): HRESULT; stdcall;
+    function FindConnectionPoint(const iid: TIID; out cp: IConnectionPoint): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IConnectionPointContainer}
+
+  PPropVariant = ^TPropVariant;
+
+  CAUB = packed record
+    cElems: ULONG;
+    pElems: PByte;
+  end;
+  {$EXTERNALSYM CAUB}
+  PCAUB = ^TCAUB;
+  TCAUB = CAUB;
+
+  CAI = packed record
+    cElems: ULONG;
+    pElems: PShortInt;
+  end;
+  {$EXTERNALSYM CAI}
+  PCAI = ^TCAI;
+  TCAI = CAI;
+
+  CAUI = packed record
+    cElems: ULONG;
+    pElems: PWord;
+  end;
+  {$EXTERNALSYM CAUI}
+  PCAUI = ^TCAUI;
+  TCAUI = CAUI;
+
+  CAL = packed record
+    cElems: ULONG;
+    pElems: PLongint;
+  end;
+  {$EXTERNALSYM CAL}
+  PCAL = ^TCAL;
+  TCAL = CAL;
+
+  CAUL = packed record
+    cElems: ULONG;
+    pElems: PULONG;
+  end;
+  {$EXTERNALSYM CAUL}
+  PCAUL = ^TCAUL;
+  TCAUL = CAUL;
+
+  CAFLT = packed record
+    cElems: ULONG;
+    pElems: PSingle;
+  end;
+  {$EXTERNALSYM CAFLT}
+  PCAFLT = ^TCAFLT;
+  TCAFLT = CAFLT;
+
+  CADBL = packed record
+    cElems: ULONG;
+    pElems: PDouble;
+  end;
+  {$EXTERNALSYM CADBL}
+  PCADBL = ^TCADBL;
+  TCADBL = CADBL;
+
+  CACY = packed record
+    cElems: ULONG;
+    pElems: PCurrency;
+  end;
+  {$EXTERNALSYM CACY}
+  PCACY = ^TCACY;
+  TCACY = CACY;
+
+  CADATE = packed record
+    cElems: ULONG;
+    pElems: POleDate;
+  end;
+  {$EXTERNALSYM CADATE}
+  PCADATE = ^TCADATE;
+  TCADATE = CADATE;
+
+  CABSTR = packed record
+    cElems: ULONG;
+    pElems: PBSTR;
+  end;
+  {$EXTERNALSYM CABSTR}
+  PCABSTR = ^TCABSTR;
+  TCABSTR = CABSTR;
+
+  CABOOL = packed record
+    cElems: ULONG;
+    pElems: POleBool;
+  end;
+  {$EXTERNALSYM CABOOL}
+  PCABOOL = ^TCABOOL;
+  TCABOOL = CABOOL;
+
+  CASCODE = packed record
+    cElems: ULONG;
+    pElems: PSCODE;
+  end;
+  {$EXTERNALSYM CASCODE}
+  PCASCODE = ^TCASCODE;
+  TCASCODE = CASCODE;
+
+  CAPROPVARIANT = packed record
+    cElems: ULONG;
+    pElems: PPropVariant;
+  end;
+  {$EXTERNALSYM CAPROPVARIANT}
+  PCAPROPVARIANT = ^TCAPROPVARIANT;
+  TCAPROPVARIANT = CAPROPVARIANT;
+
+  CAH = packed record
+    cElems: ULONG;
+    pElems: PLargeInteger;
+  end;
+  {$EXTERNALSYM CAH}
+  PCAH = ^TCAH;
+  TCAH = CAH;
+
+  CAUH = packed record
+    cElems: ULONG;
+    pElems: PULargeInteger;
+  end;
+  {$EXTERNALSYM CAUH}
+  PCAUH = ^TCAUH;
+  TCAUH = CAUH;
+
+  CALPSTR = packed record
+    cElems: ULONG;
+    pElems: PLPSTR;
+  end;
+  {$EXTERNALSYM CALPSTR}
+  PCALPSTR = ^TCALPSTR;
+  TCALPSTR = CALPSTR;
+
+  CALPWSTR = packed record
+    cElems: ULONG;
+    pElems: PLPWSTR;
+  end;
+  {$EXTERNALSYM CALPWSTR}
+  PCALPWSTR = ^TCALPWSTR;
+  TCALPWSTR = CALPWSTR;
+
+  CAFILETIME = packed record
+    cElems: ULONG;
+    pElems: PFileTime;
+  end;
+  {$EXTERNALSYM CAFILETIME}
+  PCAFILETIME = ^TCAFILETIME;
+  TCAFILETIME = CAFILETIME;
+
+  CACLIPDATA = packed record
+    cElems: ULONG;
+    pElems: PClipData;
+  end;
+  {$EXTERNALSYM CACLIPDATA}
+  PCACLIPDATA = ^TCACLIPDATA;
+  TCACLIPDATA = CACLIPDATA;
+
+  CACLSID = packed record
+    cElems: ULONG;
+    pElems: PCLSID;
+  end;
+  {$EXTERNALSYM CACLSID}
+  PCACLSID = ^TCACLSID;
+  TCACLSID = CACLSID;
+
+  PROPVARIANT = packed record
+    vt: TVarType;
+    wReserved1: Word;
+    wReserved2: Word;
+    wReserved3: Word;
+    case Integer of
+      0: (bVal: Byte);
+      1: (iVal: Smallint);
+      2: (uiVal: Word);
+      3: (boolVal: TOleBool);
+      4: (bool: TOleBool);
+      5: (lVal: Longint);
+      6: (ulVal: Cardinal);
+      7: (fltVal: Single);
+      8: (scode: SCODE);
+      9: (hVal: LARGE_INTEGER);
+      10: (uhVal: ULARGE_INTEGER);
+      11: (dblVal: Double);
+      12: (cyVal: Currency);
+      13: (date: TOleDate);
+      14: (filetime: TFileTime);
+      15: (puuid: PGUID);
+      16: (blob: TBlob);
+      17: (pclipdata: PClipData);
+      18: (pStream: Pointer);  // IStream
+      19: (pStorage: Pointer);  // IStorage
+      20: (bstrVal: TBStr);
+      21: (pszVal: PAnsiChar);
+      22: (pwszVal: PWideChar);
+      23: (caub: TCAUB);
+      24: (cai: TCAI);
+      25: (caui: TCAUI);
+      26: (cabool: TCABOOL);
+      27: (cal: TCAL);
+      28: (caul: TCAUL);
+      29: (caflt: TCAFLT);
+      30: (cascode: TCASCODE);
+      31: (cah: TCAH);
+      32: (cauh: TCAUH);
+      33: (cadbl: TCADBL);
+      34: (cacy: TCACY);
+      35: (cadate: TCADATE);
+      36: (cafiletime: TCAFILETIME);
+      37: (cauuid: TCACLSID);
+      38: (caclipdata: TCACLIPDATA);
+      39: (cabstr: TCABSTR);
+      40: (calpstr: TCALPSTR);
+      41: (calpwstr: TCALPWSTR );
+      42: (capropvar: TCAPROPVARIANT);
+  end;
+  {$EXTERNALSYM PROPVARIANT}
+  TPropVariant = PROPVARIANT;
+
+  PROPSPEC = packed record
+    ulKind: ULONG;
+    case Integer of
+      0: (propid: TPropID);
+      1: (lpwstr: POleStr);
+  end;
+  {$EXTERNALSYM PROPSPEC}
+  PPropSpec = ^TPropSpec;
+  TPropSpec = PROPSPEC;
+
+  STATPROPSTG = record
+    lpwstrName: POleStr;
+    propid: TPropID;
+    vt: TVarType;
+  end;
+  {$EXTERNALSYM STATPROPSTG}
+  PStatPropStg = ^TStatPropStg;
+  TStatPropStg = STATPROPSTG;
+
+  STATPROPSETSTG = packed record
+    fmtid: TFmtID;
+    clsid: TClsID;
+    grfFlags: DWORD;
+    mtime: TFileTime;
+    ctime: TFileTime;
+    atime: TFileTime;
+    dwOSVersion: DWORD;
+  end;
+  {$EXTERNALSYM STATPROPSETSTG}
+  PStatPropSetStg = ^TStatPropSetStg;
+  TStatPropSetStg = STATPROPSETSTG;
+
+  IPropertyStorage = interface(IUnknown)
+    ['{00000138-0000-0000-C000-000000000046}']
+    function ReadMultiple(cpspec: ULONG; rgpspec : PPropSpec; rgpropvar: PPropVariant): HRESULT; stdcall;
+    function WriteMultiple(cpspec: ULONG; rgpspec : PPropSpec; rgpropvar: PPropVariant;
+      propidNameFirst: TPropID): HRESULT; stdcall;
+    function DeleteMultiple(cpspec: ULONG; rgpspec: PPropSpec): HRESULT; stdcall;
+    function ReadPropertyNames(cpropid: ULONG; rgpropid: PPropID;
+      rglpwstrName: PPOleStr): HRESULT; stdcall;
+    function WritePropertyNames(cpropid: ULONG; rgpropid: PPropID;
+      rglpwstrName: PPOleStr): HRESULT; stdcall;
+    function DeletePropertyNames(cpropid: ULONG; rgpropid: PPropID): HRESULT; stdcall;
+    function Commit(grfCommitFlags: DWORD): HRESULT; stdcall;
+    function Revert: HRESULT; stdcall;
+    function Enum(out ppenum: IEnumSTATPROPSTG): HRESULT; stdcall;
+    function SetTimes(const pctime, patime, pmtime: TFileTime): HRESULT; stdcall;
+    function SetClass(const clsid: TCLSID): HRESULT; stdcall;
+    function Stat(pstatpsstg: PStatPropSetStg): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IPropertyStorage}
+
+  IPropertySetStorage = interface(IUnknown)
+    ['{0000013A-0000-0000-C000-000000000046}']
+    function Create(const rfmtid: TFmtID; const pclsid: TCLSID; grfFlags,
+      grfMode: DWORD; out ppprstg: IPropertyStorage): HRESULT; stdcall;
+    function Open(const rfmtid: TFmtID; grfMode: DWORD;
+      out ppprstg: IPropertyStorage): HRESULT; stdcall;
+    function Delete(const rfmtid: TFmtID): HRESULT; stdcall;
+    function Enum(out ppenum: IEnumSTATPROPSETSTG): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IPropertySetStorage}
+
+  IEnumSTATPROPSTG = interface(IUnknown)
+    ['{00000139-0000-0000-C000-000000000046}']
+    function Next(celt: ULONG; out rgelt; pceltFetched: PULONG): HRESULT; stdcall;
+    function Skip(celt: ULONG): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out ppenum: IEnumSTATPROPSTG): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumSTATPROPSTG}
+
+  IEnumSTATPROPSETSTG = interface(IUnknown)
+    ['{0000013B-0000-0000-C000-000000000046}']
+    function Next(celt: ULONG; out rgelt; pceltFetched: PULONG): HRESULT; stdcall;
+    function Skip(celt: ULONG): HRESULT; stdcall;
+    function Reset: HRESULT; stdcall;
+    function Clone(out ppenum: IEnumSTATPROPSETSTG): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IEnumSTATPROPSETSTG}
+
+  IEnumStatStg = interface(IUnknown)
+    ['{0000000D-0000-0000-C000-000000000046}']
+    function Next(celt: Longint; out elt;
+      pceltFetched: PLongint): HResult; stdcall;
+    function Skip(celt: Longint): HResult; stdcall;
+    function Reset: HResult; stdcall;
+    function Clone(out enm: IEnumStatStg): HResult; stdcall;
+  end;
+  {$EXTERNALSYM IEnumStatStg}
+
+  TSNB = ^POleStr;
+
+  IStorage = interface(IUnknown)
+    ['{0000000B-0000-0000-C000-000000000046}']
+    function CreateStream(pwcsName: POleStr; grfMode: Longint; reserved1: Longint;
+      reserved2: Longint; out stm: IStream): HRESULT; stdcall;
+    function OpenStream(pwcsName: POleStr; reserved1: Pointer; grfMode: Longint;
+      reserved2: Longint; out stm: IStream): HRESULT; stdcall;
+    function CreateStorage(pwcsName: POleStr; grfMode: Longint;
+      dwStgFmt: Longint; reserved2: Longint; out stg: IStorage): HRESULT; stdcall;
+    function OpenStorage(pwcsName: POleStr; const stgPriority: IStorage;
+      grfMode: Longint; snbExclude: TSNB; reserved: Longint; out stg: IStorage): HRESULT; stdcall;
+    function CopyTo(ciidExclude: Longint; rgiidExclude: PIID;
+      snbExclude: TSNB; const stgDest: IStorage): HRESULT; stdcall;
+    function MoveElementTo(pwcsName: POleStr; const stgDest: IStorage;
+      pwcsNewName: POleStr; grfFlags: Longint): HRESULT; stdcall;
+    function Commit(grfCommitFlags: Longint): HRESULT; stdcall;
+    function Revert: HRESULT; stdcall;
+    function EnumElements(reserved1: Longint; reserved2: Pointer; reserved3: Longint;
+      out enm: IEnumStatStg): HRESULT; stdcall;
+    function DestroyElement(pwcsName: POleStr): HRESULT; stdcall;
+    function RenameElement(pwcsOldName: POleStr; pwcsNewName: POleStr): HRESULT; stdcall;
+    function SetElementTimes(pwcsName: POleStr; const ctime: TFileTime;
+      const atime: TFileTime; const mtime: TFileTime): HRESULT; stdcall;
+    function SetClass(const clsid: TCLSID): HRESULT; stdcall;
+    function SetStateBits(grfStateBits: Longint; grfMask: Longint): HRESULT; stdcall;
+    function Stat(out statstg: TStatStg; grfStatFlag: Longint): HRESULT; stdcall;
+  end;
+  {$EXTERNALSYM IStorage}
+
+implementation
+
+end.

packages/base/winunits/jwaadsdb.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdsDb.pas,v 1.5 2004/12/08 08:18:35 marquardt Exp $
 
 unit JwaAdsDb;
 

packages/base/winunits/jwaadserr.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdsErr.pas,v 1.5 2004/12/08 08:18:35 marquardt Exp $
 
 unit JwaAdsErr;
 

packages/base/winunits/jwaadshlp.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdsHlp.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAdsHlp;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "adshlp.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
+{$HPPEMIT ''}
+{$HPPEMIT '#include "adshlp.h"'}
+{$HPPEMIT ''}
+
 uses
-  ActiveX {TODO}, JwaAdsTLB, JwaWinType, JwaWinNT;
+  JwaActiveX, JwaAdsTLB, JwaWindows;
 
 function ADsGetObject(lpszPathName: LPCWSTR; const riid: TGUID; out ppObject: Pointer): HRESULT; stdcall;
 {$EXTERNALSYM ADsGetObject}
@@ -161,8 +162,8 @@ function SecurityDescriptorToBinarySD(vVarSecDes: VARIANT;
 
 implementation
 
-const
-  adslib = 'activeds.dll';
+uses
+  JwaWinDLLNames;
 
 //procedure ADsFreeAllErrorRecords
 

packages/base/winunits/jwaadsnms.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdsnms.pas,v 1.5 2004/12/08 08:18:35 marquardt Exp $
 
 unit JwaAdsnms;
 

packages/base/winunits/jwaadsprop.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdsProp.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAdsProp;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "adsprop.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaAdsTLB, JwaWinUser, JwaWinType;
+  JwaAdsTLB, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "adsprop.h"'}
+{$HPPEMIT ''}
 
 //  Windows NT Active Directory Service Property Pages
 //
@@ -277,8 +278,8 @@ function ADsPropShowErrorDialog(hNotifyObj: HWND; hPage: HWND): BOOL; stdcall;
 
 implementation
 
-const
-  dsprop = 'dsprop.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaadssts.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdssts.pas,v 1.6 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaAdssts;
 
@@ -54,7 +55,7 @@ unit JwaAdssts;
 interface
 
 uses
-  JwaWinNT;
+  JwaWindows;
 
 //  Contents:   Status Codes for ADS objects
 

packages/base/winunits/jwaadstlb.pas

@@ -1,3 +1,4 @@
+// $Id: JwaAdsTLB.pas,v 1.5 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaAdsTLB;
 
@@ -73,7 +74,7 @@ unit JwaAdsTLB;
 interface
 {$i jediapilib.inc}
 uses
-  Windows, ActiveX, Classes {$IFNDEF NOVCL} ,Graphics, OleServer, OleCtrls, StdVCL {$ENDIF} ;
+  Windows, ActiveX, Classes {$IFNDEF NOVCL} , Graphics, OleServer, OleCtrls, StdVCL {$ENDIF} ;
 
 {$IFDEF FPC}
 Type

packages/base/winunits/jwaadtgen.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAdtGen.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAdtGen;
 
@@ -54,7 +55,7 @@ unit JwaAdtGen;
 interface
 
 uses
-  JwaWinNT, JwaWinType;
+  JwaWindows;
 
 //
 // type of audit 
@@ -435,8 +436,8 @@ const
 
 implementation
 
-const
-  authzlib = 'authz.dll';
+uses
+  JwaWinDLLNames;
 
 // (rom) MACRO implementation
 function ApExtractType(TypeFlags: DWORD): AUDIT_PARAM_TYPE;

packages/base/winunits/jwaaf_irda.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAF_Irda.pas,v 1.6 2005/09/08 07:49:25 marquardt Exp $
 
 unit JwaAF_Irda;
 
@@ -54,7 +55,7 @@ unit JwaAF_Irda;
 interface
 
 uses
-  JwaWinSock2;
+  JwaWindows;
 
 //
 // Winsock1.1, IrDA1.1, WindowsNT5.0, Windows98 and WindowsCE1.0.

packages/base/winunits/jwaatalkwsh.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAtalkWsh.pas,v 1.7 2005/09/08 07:49:25 marquardt Exp $
 
 unit JwaAtalkWsh;
 
@@ -54,7 +55,7 @@ interface
 {$I jediapilib.inc}
 
 uses
-  JwaWinSock2;
+  JwaWindows;
 
 //
 //  All protocol types should be specified in the Decimal base

packages/base/winunits/jwaauthif.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAuthif.pas,v 1.6 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaAuthif;
 
@@ -54,7 +55,7 @@ unit JwaAuthif;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 //  Enumerates the attribute types that are passed to the extension DLL.  The

packages/base/winunits/jwaauthz.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaAuthz.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaAuthz;
 
@@ -54,7 +55,7 @@ unit JwaAuthz;
 interface
 
 uses
-  JwaWinNT, JwaWinType;
+  JwaWindows;
 
 //
 // Flags which may be used at the time of client context creation using a sid.
@@ -467,8 +468,8 @@ AuthzReportSecurityEventFromParams(
 
 implementation
 
-const
-  authzlib = 'authz.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwabatclass.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBatClass.pas,v 1.6 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBatClass;
 
@@ -54,7 +55,7 @@ unit JwaBatClass;
 interface
 
 uses
-  JwaWinIoctl, JwaWinType;
+  JwaWinIoctl, JwaWindows;
 
 //
 // Battery device GUID

packages/base/winunits/jwabits.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBits.pas,v 1.7 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBits;
 
@@ -54,7 +55,7 @@ unit JwaBits;
 interface
 
 uses
-  JwaWinBase, JwaWinType, JwaBitsMsg;
+  JwaWindows, JwaBitsMsg;
 
 const
   BG_SIZE_UNKNOWN = Int64(-1);

packages/base/winunits/jwabits1_5.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBits1_5.pas,v 1.7 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBits1_5;
 
@@ -54,7 +55,7 @@ unit JwaBits1_5;
 interface
 
 uses
-  JwaWinBase, JwaWinType, JwaBits;
+  JwaWindows, JwaBits;
 
 type
   _BG_JOB_REPLY_PROGRESS = record

packages/base/winunits/jwabitscfg.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBitscfg.pas,v 1.7 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBitscfg;
 
@@ -54,7 +55,7 @@ unit JwaBitscfg;
 interface
 
 uses
-  JwaWinBase, JwaWinType;
+  JwaWindows;
 
 const
   IID_IBITSExtensionSetup: TGUID = '{29cfbbf7-09e4-4b97-b0bc-f2287e3d8eb3}';

packages/base/winunits/jwabitsmsg.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBitsMsg.pas,v 1.6 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBitsMsg;
 
@@ -54,7 +55,7 @@ unit JwaBitsMsg;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 //  Values are 32 bit values layed out as follows:

packages/base/winunits/jwablberr.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBLBErr.pas,v 1.5 2004/12/08 08:18:35 marquardt Exp $
 
 unit JwaBLBErr;
 

packages/base/winunits/jwabluetoothapis.pas

@@ -38,6 +38,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBluetoothAPIs.pas,v 1.11 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaBluetoothAPIs;
 
@@ -52,7 +53,7 @@ unit JwaBluetoothAPIs;
 interface
 
 uses
-  JwaWinType, JwaWinBase, JwaBthSdpDef;
+  JwaWindows, JwaBthSdpDef;
 
 const
   BLUETOOTH_MAX_NAME_SIZE            = 248;
@@ -1587,8 +1588,8 @@ function BluetoothEnumAttributes(
 
 implementation
 
-const
-  btapi = 'irprops.cpl';
+uses
+  JwaWinDLLNames;
 
 // (rom) MACRO implementation
 function BluetoothEnumAttributes(pSDPStream: PBYTE; cbStreamSize: ULONG;

packages/base/winunits/jwabthdef.pas

@@ -38,6 +38,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBtHDef.pas,v 1.10 2005/09/03 14:27:47 marquardt Exp $
 
 unit JwaBtHDef;
 
@@ -52,7 +53,7 @@ unit JwaBtHDef;
 interface
 
 uses
-  JwaWinType, JwaBthSdpDef;
+  JwaWindows, JwaBthSdpDef;
 
 const
   GUID_BTHPORT_DEVICE_INTERFACE: TGUID =     '{0850302A-B344-4FDA-9BE9-90576B8D46F0}';

packages/base/winunits/jwabthsdpdef.pas

@@ -38,8 +38,9 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBthSdpDef.pas,v 1.1 2005/09/05 06:29:33 marquardt Exp $
 
-unit JWaBthSdpDef;
+unit JwaBthSdpDef;
 
 {$WEAKPACKAGEUNIT}
 
@@ -52,7 +53,7 @@ unit JWaBthSdpDef;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 type
   SDP_LARGE_INTEGER_16 = record

packages/base/winunits/jwabugcodes.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaBugCodes.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaBugCodes;
 
@@ -54,7 +55,7 @@ unit JwaBugCodes;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 {$I jediapilib.inc}
 

packages/base/winunits/jwacarderr.pas

@@ -0,0 +1,606 @@
+{*
+ scarderr.mc
+
+   Error message codes from the Smart Card Resource Manager
+   These messages must be reconciled with winerror.w
+   They exist here to provide error messages on pre-Win2K systems.
+
+*}
+
+unit JwaCardErr;
+
+interface
+
+const
+  // =============================
+  // Facility SCARD Error Messages
+  // =============================
+  //
+  SCARD_S_SUCCESS = 0;
+  //
+  //  Values are 32 bit values layed out as follows:
+  //
+  //   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+  //   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+  //  +---+-+-+-----------------------+-------------------------------+
+  //  |Sev|C|R|     Facility          |               Code            |
+  //  +---+-+-+-----------------------+-------------------------------+
+  //
+  //  where
+  //
+  //      Sev - is the severity code
+  //
+  //          00 - Success
+  //          01 - Informational
+  //          10 - Warning
+  //          11 - Error
+  //
+  //      C - is the Customer code flag
+  //
+  //      R - is a reserved bit
+  //
+  //      Facility - is the facility code
+  //
+  //      Code - is the facility's status code
+  //
+  //
+  // Define the facility codes
+  //
+  FACILITY_SYSTEM                  = $0;
+  FACILITY_SCARD                   = $10;
+
+
+  //
+  // Define the severity codes
+  //
+  STATUS_SEVERITY_WARNING          = $2;
+  STATUS_SEVERITY_INFORMATIONAL    = $1;
+  STATUS_SEVERITY_ERROR            = $3;
+
+
+  //
+  // MessageId: SCARD_F_INTERNAL_ERROR
+  //
+  // MessageText:
+  //
+  //  An internal consistency check failed.
+  //
+  SCARD_F_INTERNAL_ERROR           = $80100001;
+
+  //
+  // MessageId: SCARD_E_CANCELLED
+  //
+  // MessageText:
+  //
+  //  The action was cancelled by an SCardCancel request.
+  //
+  SCARD_E_CANCELLED                = $80100002;
+
+  //
+  // MessageId: SCARD_E_INVALID_HANDLE
+  //
+  // MessageText:
+  //
+  //  The supplied handle was invalid.
+  //
+  SCARD_E_INVALID_HANDLE           = $80100003;
+
+  //
+  // MessageId: SCARD_E_INVALID_PARAMETER
+  //
+  // MessageText:
+  //
+  //  One or more of the supplied parameters could not be properly interpreted.
+  //
+  SCARD_E_INVALID_PARAMETER        = $80100004;
+
+  //
+  // MessageId: SCARD_E_INVALID_TARGET
+  //
+  // MessageText:
+  //
+  //  Registry startup information is missing or invalid.
+  //
+  SCARD_E_INVALID_TARGET           = $80100005;
+
+  //
+  // MessageId: SCARD_E_NO_MEMORY
+  //
+  // MessageText:
+  //
+  //  Not enough memory available to complete this command.
+  //
+  SCARD_E_NO_MEMORY                = $80100006;
+
+  //
+  // MessageId: SCARD_F_WAITED_TOO_LONG
+  //
+  // MessageText:
+  //
+  //  An internal consistency timer has expired.
+  //
+  SCARD_F_WAITED_TOO_LONG          = $80100007;
+
+  //
+  // MessageId: SCARD_E_INSUFFICIENT_BUFFER
+  //
+  // MessageText:
+  //
+  //  The data buffer to receive returned data is too small for the returned data.
+  //
+  SCARD_E_INSUFFICIENT_BUFFER      = $80100008;
+
+  //
+  // MessageId: SCARD_E_UNKNOWN_READER
+  //
+  // MessageText:
+  //
+  //  The specified reader name is not recognized.
+  //
+  SCARD_E_UNKNOWN_READER           = $80100009;
+
+  //
+  // MessageId: SCARD_E_TIMEOUT
+  //
+  // MessageText:
+  //
+  //  The user-specified timeout value has expired.
+  //
+  SCARD_E_TIMEOUT                  = $8010000A;
+
+  //
+  // MessageId: SCARD_E_SHARING_VIOLATION
+  //
+  // MessageText:
+  //
+  //  The smart card cannot be accessed because of other connections outstanding.
+  //
+  SCARD_E_SHARING_VIOLATION        = $8010000B;
+
+  //
+  // MessageId: SCARD_E_NO_SMARTCARD
+  //
+  // MessageText:
+  //
+  //  The operation requires a Smart Card, but no Smart Card is currently in the device.
+  //
+  SCARD_E_NO_SMARTCARD             = $8010000C;
+
+  //
+  // MessageId: SCARD_E_UNKNOWN_CARD
+  //
+  // MessageText:
+  //
+  //  The specified smart card name is not recognized.
+  //
+  SCARD_E_UNKNOWN_CARD             = $8010000D;
+
+  //
+  // MessageId: SCARD_E_CANT_DISPOSE
+  //
+  // MessageText:
+  //
+  //  The system could not dispose of the media in the requested manner.
+  //
+  SCARD_E_CANT_DISPOSE             = $8010000E;
+
+  //
+  // MessageId: SCARD_E_PROTO_MISMATCH
+  //
+  // MessageText:
+  //
+  //  The requested protocols are incompatible with the protocol currently in use with the smart card.
+  //
+  SCARD_E_PROTO_MISMATCH           = $8010000F;
+
+  //
+  // MessageId: SCARD_E_NOT_READY
+  //
+  // MessageText:
+  //
+  //  The reader or smart card is not ready to accept commands.
+  //
+  SCARD_E_NOT_READY                = $80100010;
+
+  //
+  // MessageId: SCARD_E_INVALID_VALUE
+  //
+  // MessageText:
+  //
+  //  One or more of the supplied parameters values could not be properly interpreted.
+  //
+  SCARD_E_INVALID_VALUE            = $80100011;
+
+  //
+  // MessageId: SCARD_E_SYSTEM_CANCELLED
+  //
+  // MessageText:
+  //
+  //  The action was cancelled by the system, presumably to log off or shut down.
+  //
+  SCARD_E_SYSTEM_CANCELLED         = $80100012;
+
+  //
+  // MessageId: SCARD_F_COMM_ERROR
+  //
+  // MessageText:
+  //
+  //  An internal communications error has been detected.
+  //
+  SCARD_F_COMM_ERROR               = $80100013;
+
+  //
+  // MessageId: SCARD_F_UNKNOWN_ERROR
+  //
+  // MessageText:
+  //
+  //  An internal error has been detected, but the source is unknown.
+  //
+  SCARD_F_UNKNOWN_ERROR            = $80100014;
+
+  //
+  // MessageId: SCARD_E_INVALID_ATR
+  //
+  // MessageText:
+  //
+  //  An ATR obtained from the registry is not a valid ATR string.
+  //
+  SCARD_E_INVALID_ATR              = $80100015;
+
+  //
+  // MessageId: SCARD_E_NOT_TRANSACTED
+  //
+  // MessageText:
+  //
+  //  An attempt was made to end a non-existent transaction.
+  //
+  SCARD_E_NOT_TRANSACTED           = $80100016;
+
+  //
+  // MessageId: SCARD_E_READER_UNAVAILABLE
+  //
+  // MessageText:
+  //
+  //  The specified reader is not currently available for use.
+  //
+  SCARD_E_READER_UNAVAILABLE       = $80100017;
+
+  //
+  // MessageId: SCARD_P_SHUTDOWN
+  //
+  // MessageText:
+  //
+  //  The operation has been aborted to allow the server application to exit.
+  //
+  SCARD_P_SHUTDOWN                 = $80100018;
+
+  //
+  // MessageId: SCARD_E_PCI_TOO_SMALL
+  //
+  // MessageText:
+  //
+  //  The PCI Receive buffer was too small.
+  //
+  SCARD_E_PCI_TOO_SMALL            = $80100019;
+
+  //
+  // MessageId: SCARD_E_READER_UNSUPPORTED
+  //
+  // MessageText:
+  //
+  //  The reader driver does not meet minimal requirements for support.
+  //
+  SCARD_E_READER_UNSUPPORTED       = $8010001A;
+
+  //
+  // MessageId: SCARD_E_DUPLICATE_READER
+  //
+  // MessageText:
+  //
+  //  The reader driver did not produce a unique reader name.
+  //
+  SCARD_E_DUPLICATE_READER         = $8010001B;
+
+  //
+  // MessageId: SCARD_E_CARD_UNSUPPORTED
+  //
+  // MessageText:
+  //
+  //  The smart card does not meet minimal requirements for support.
+  //
+  SCARD_E_CARD_UNSUPPORTED         = $8010001C;
+
+  //
+  // MessageId: SCARD_E_NO_SERVICE
+  //
+  // MessageText:
+  //
+  //  The Smart card resource manager is not running.
+  //
+  SCARD_E_NO_SERVICE               = $8010001D;
+
+  //
+  // MessageId: SCARD_E_SERVICE_STOPPED
+  //
+  // MessageText:
+  //
+  //  The Smart card resource manager has shut down.
+  //
+  SCARD_E_SERVICE_STOPPED          = $8010001E;
+
+  //
+  // MessageId: SCARD_E_UNEXPECTED
+  //
+  // MessageText:
+  //
+  //  An unexpected card error has occurred.
+  //
+  SCARD_E_UNEXPECTED               = $8010001F;
+
+  //
+  // MessageId: SCARD_E_ICC_INSTALLATION
+  //
+  // MessageText:
+  //
+  //  No Primary Provider can be found for the smart card.
+  //
+  SCARD_E_ICC_INSTALLATION         = $80100020;
+
+  //
+  // MessageId: SCARD_E_ICC_CREATEORDER
+  //
+  // MessageText:
+  //
+  //  The requested order of object creation is not supported.
+  //
+  SCARD_E_ICC_CREATEORDER          = $80100021;
+
+  //
+  // MessageId: SCARD_E_UNSUPPORTED_FEATURE
+  //
+  // MessageText:
+  //
+  //  This smart card does not support the requested feature.
+  //
+  SCARD_E_UNSUPPORTED_FEATURE      = $80100022;
+
+  //
+  // MessageId: SCARD_E_DIR_NOT_FOUND
+  //
+  // MessageText:
+  //
+  //  The identified directory does not exist in the smart card.
+  //
+  SCARD_E_DIR_NOT_FOUND            = $80100023;
+
+  //
+  // MessageId: SCARD_E_FILE_NOT_FOUND
+  //
+  // MessageText:
+  //
+  //  The identified file does not exist in the smart card.
+  //
+  SCARD_E_FILE_NOT_FOUND           = $80100024;
+
+  //
+  // MessageId: SCARD_E_NO_DIR
+  //
+  // MessageText:
+  //
+  //  The supplied path does not represent a smart card directory.
+  //
+  SCARD_E_NO_DIR                   = $80100025;
+
+  //
+  // MessageId: SCARD_E_NO_FILE
+  //
+  // MessageText:
+  //
+  //  The supplied path does not represent a smart card file.
+  //
+  SCARD_E_NO_FILE                  = $80100026;
+
+  //
+  // MessageId: SCARD_E_NO_ACCESS
+  //
+  // MessageText:
+  //
+  //  Access is denied to this file.
+  //
+  SCARD_E_NO_ACCESS                = $80100027;
+
+  //
+  // MessageId: SCARD_E_WRITE_TOO_MANY
+  //
+  // MessageText:
+  //
+  //  The smartcard does not have enough memory to store the information.
+  //
+  SCARD_E_WRITE_TOO_MANY           = $80100028;
+
+  //
+  // MessageId: SCARD_E_BAD_SEEK
+  //
+  // MessageText:
+  //
+  //  There was an error trying to set the smart card file object pointer.
+  //
+  SCARD_E_BAD_SEEK                 = $80100029;
+
+  //
+  // MessageId: SCARD_E_INVALID_CHV
+  //
+  // MessageText:
+  //
+  //  The supplied PIN is incorrect.
+  //
+  SCARD_E_INVALID_CHV              = $8010002A;
+
+  //
+  // MessageId: SCARD_E_UNKNOWN_RES_MNG
+  //
+  // MessageText:
+  //
+  //  An unrecognized error code was returned from a layered component.
+  //
+  SCARD_E_UNKNOWN_RES_MNG          = $8010002B;
+
+  //
+  // MessageId: SCARD_E_NO_SUCH_CERTIFICATE
+  //
+  // MessageText:
+  //
+  //  The requested certificate does not exist.
+  //
+  SCARD_E_NO_SUCH_CERTIFICATE      = $8010002C;
+
+  //
+  // MessageId: SCARD_E_CERTIFICATE_UNAVAILABLE
+  //
+  // MessageText:
+  //
+  //  The requested certificate could not be obtained.
+  //
+  SCARD_E_CERTIFICATE_UNAVAILABLE  = $8010002D;
+
+  //
+  // MessageId: SCARD_E_NO_READERS_AVAILABLE
+  //
+  // MessageText:
+  //
+  //  Cannot find a smart card reader.
+  //
+  SCARD_E_NO_READERS_AVAILABLE     = $8010002E;
+
+  //
+  // MessageId: SCARD_E_COMM_DATA_LOST
+  //
+  // MessageText:
+  //
+  //  A communications error with the smart card has been detected.  Retry the operation.
+  //
+  SCARD_E_COMM_DATA_LOST           = $8010002F;
+
+  //
+  // MessageId: SCARD_E_NO_KEY_CONTAINER
+  //
+  // MessageText:
+  //
+  //  The requested key container does not exist on the smart card.
+  //
+  SCARD_E_NO_KEY_CONTAINER         = $80100030;
+
+  //
+  // MessageId: SCARD_E_SERVER_TOO_BUSY
+  //
+  // MessageText:
+  //
+  //  The Smart card resource manager is too busy to complete this operation.
+  //
+  SCARD_E_SERVER_TOO_BUSY          = $80100031;
+
+  //
+  // These are warning codes.
+  //
+  //
+  // MessageId: SCARD_W_UNSUPPORTED_CARD
+  //
+  // MessageText:
+  //
+  //  The reader cannot communicate with the smart card, due to ATR configuration conflicts.
+  //
+  SCARD_W_UNSUPPORTED_CARD         = $80100065;
+
+  //
+  // MessageId: SCARD_W_UNRESPONSIVE_CARD
+  //
+  // MessageText:
+  //
+  //  The smart card is not responding to a reset.
+  //
+  SCARD_W_UNRESPONSIVE_CARD        = $80100066;
+
+  //
+  // MessageId: SCARD_W_UNPOWERED_CARD
+  //
+  // MessageText:
+  //
+  //  Power has been removed from the smart card, so that further communication is not possible.
+  //
+  SCARD_W_UNPOWERED_CARD           = $80100067;
+
+  //
+  // MessageId: SCARD_W_RESET_CARD
+  //
+  // MessageText:
+  //
+  //  The smart card has been reset, so any shared state information is invalid.
+  //
+  SCARD_W_RESET_CARD               = $80100068;
+
+  //
+  // MessageId: SCARD_W_REMOVED_CARD
+  //
+  // MessageText:
+  //
+  //  The smart card has been removed, so that further communication is not possible.
+  //
+  SCARD_W_REMOVED_CARD             = $80100069;
+
+  //
+  // MessageId: SCARD_W_SECURITY_VIOLATION
+  //
+  // MessageText:
+  //
+  //  Access was denied because of a security violation.
+  //
+  SCARD_W_SECURITY_VIOLATION       = $8010006A;
+
+  //
+  // MessageId: SCARD_W_WRONG_CHV
+  //
+  // MessageText:
+  //
+  //  The card cannot be accessed because the wrong PIN was presented.
+  //
+  SCARD_W_WRONG_CHV                = $8010006B;
+
+  //
+  // MessageId: SCARD_W_CHV_BLOCKED
+  //
+  // MessageText:
+  //
+  //  The card cannot be accessed because the maximum number of PIN entry attempts has been reached.
+  //
+  SCARD_W_CHV_BLOCKED              = $8010006C;
+
+  //
+  // MessageId: SCARD_W_EOF
+  //
+  // MessageText:
+  //
+  //  The end of the smart card file has been reached.
+  //
+  SCARD_W_EOF                      = $8010006D;
+
+  //
+  // MessageId: SCARD_W_CANCELLED_BY_USER
+  //
+  // MessageText:
+  //
+  //  The action was cancelled by the user.
+  //
+  SCARD_W_CANCELLED_BY_USER        = $8010006E;
+
+  //
+  // MessageId: SCARD_W_CARD_NOT_AUTHENTICATED
+  //
+  // MessageText:
+  //
+  //  No PIN was presented to the smart card.
+  //
+  SCARD_W_CARD_NOT_AUTHENTICATED   = $8010006F;
+
+implementation
+
+end.

packages/base/winunits/jwacderr.pas

@@ -40,19 +40,26 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaCdErr.pas,v 1.6 2005/09/04 07:02:38 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaCdErr;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "cderr.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "cderr.h"'}
+{$HPPEMIT ''}
+
 const
   CDERR_DIALOGFAILURE = $FFFF;
   {$EXTERNALSYM CDERR_DIALOGFAILURE}
@@ -135,6 +142,15 @@ const
   CCERR_CHOOSECOLORCODES = $5000;
   {$EXTERNALSYM CCERR_CHOOSECOLORCODES}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 implementation
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
 
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwacmnquery.pas

@@ -40,22 +40,23 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaCmnQuery.pas,v 1.8 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaCmnQuery;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "cmnquery.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX, // IPersist todo objidl, ocidl
-  JwaWinUser, JwaWinType;
+  JwaActiveX, // IPersist todo objidl, ocidl
+  JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "cmnquery.h"'}
+{$HPPEMIT ''}
 
 const
   IID_IQueryForm: TGUID = (D1:$8cfcee30; D2:$39bd; D3:$11d0; D4:($b8, $d1, $0, $a0, $24, $ab, $2d, $bb));
@@ -139,7 +140,7 @@ type
     cbStruct: DWORD;
     dwFlags: DWORD;
     pPageProc: Pointer{LPCQPAGEPROC};
-    hInstance: HINSTANCE;
+    hInstance: HINST;
     idPageName: Integer;
     idPageTemplate: Integer;
     pDlgProc: DLGPROC;

packages/base/winunits/jwacolordlg.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaColorDlg.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaColorDlg;
 

packages/base/winunits/jwacpl.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaCpl.pas,v 1.7 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaCpl;
 
@@ -54,7 +55,7 @@ unit JwaCpl;
 interface
 
 uses
-  JwaWinUser, JwaWinType;
+  JwaWindows;
 
 //
 // General rules for being installed in the Control Panel:

packages/base/winunits/jwacplext.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaCplext.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaCplext;
 

packages/base/winunits/jwacryptuiapi.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaCryptUIApi.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaCryptUIApi;
 
@@ -54,7 +55,7 @@ unit JwaCryptUIApi;
 interface
 
 uses
-  JwaWinCrypt, JwaWinType;
+  JwaWindows;
 
 // #include <pshpack8.h>
 
@@ -115,8 +116,8 @@ const
 
 implementation
 
-const
-  cryptuiapi = 'cryptui.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadbt.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDbt.pas,v 1.7 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaDbt;
 
@@ -54,7 +55,7 @@ unit JwaDbt;
 interface
 
 uses
-  JwaWinType, JwaWinUser;
+  JwaWindows;
 
 //
 // BroadcastSpecialMessage constants.

packages/base/winunits/jwadde.pas

@@ -40,15 +40,14 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDde.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaDde;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "Dde.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
@@ -56,6 +55,14 @@ interface
 uses
   JwaWinNT, JwaWinType;
 
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "Dde.h"'}
+{$HPPEMIT ''}
+
 // DDE window messages
 
 const
@@ -230,10 +237,18 @@ function FreeDDElParam(msg: UINT; lParam: LPARAM): BOOL; stdcall;
 function ReuseDDElParam(lParam: LPARAM; msgIn, msgOut: UINT; uiLo, uiHi: UINT_PTR): LPARAM; stdcall;
 {$EXTERNALSYM ReuseDDElParam}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
-const
-  user32 = 'user32.dll';
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
 
 {$IFDEF DYNAMIC_LINK}
 
@@ -326,4 +341,8 @@ function ReuseDDElParam; external user32 name 'ReuseDDElParam';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwadhcpcsdk.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDhcpCSdk.pas,v 1.8 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDhcpCSdk;
 
@@ -54,7 +55,7 @@ unit JwaDhcpCSdk;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 // DHCP Standard Options.
@@ -337,8 +338,8 @@ function DhcpRemoveDNSRegistrations: DWORD; stdcall;
 
 implementation
 
-const
-  dhcpapi = 'dhcpcsvc.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadhcpsapi.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDhcpsApi.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDhcpsApi;
 
@@ -54,7 +55,7 @@ unit JwaDhcpsApi;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 type
   DHCP_IP_ADDRESS = DWORD;
@@ -441,8 +442,8 @@ procedure DhcpRpcFreeMemory(BufferPointer: PVOID); stdcall;
 
 implementation
 
-const
-  dhcplib = 'dhcpsapi.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadhcpssdk.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDhcpSSdk.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaDhcpSSdk;
 
@@ -56,7 +57,7 @@ unit JwaDhcpSSdk;
 interface
 
 uses
-  JwaWinNT, JwaWinType;
+  JwaWindows;
 
 //  This structure could change any day.  This will be accurate only for version 0 -- which
 //  has to be checked for by any CalloutDLL that is hooking onto the DhcpHandleOptionsHook.

packages/base/winunits/jwadlgs.pas

@@ -40,19 +40,26 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDlgs.pas,v 1.7 2005/09/01 09:39:07 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaDlgs;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "dlgs.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "dlgs.h"'}
+{$HPPEMIT ''}
+
 //
 //  Constant Declarations.
 //
@@ -491,6 +498,15 @@ type
   CRGB = tagCRGB;
   {$EXTERNALSYM CRGB}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 implementation
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
 
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwadsadmin.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDSAdmin.pas,v 1.6 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaDSAdmin;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "dsadmin.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaAdsTLB, JwaPrSht, JwaWinType;
+  JwaActiveX, JwaAdsTLB, JwaPrSht, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "dsadmin.h"'}
+{$HPPEMIT ''}
 
 //
 // CoClass for the Object creation dialog object

packages/base/winunits/jwadsclient.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDSClient.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDSClient;
 
@@ -54,7 +55,7 @@ unit JwaDSClient;
 interface
 
 uses
-  JwaAdsTLB, JwaWinType;
+  JwaAdsTLB, JwaWindows;
 
 //---------------------------------------------------------------------------//
 // CLSIDs exposed for the dsclient.
@@ -682,13 +683,8 @@ procedure DsGetFriendlyClassName(pszObjectClass, pszBuffer: LPWSTR;
 
 implementation
 
-const
-  dsuiext = 'dsuiext.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadsgetdc.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDSGetDc.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDSGetDc;
 
@@ -54,7 +55,7 @@ unit JwaDSGetDc;
 interface
 
 uses
-  JwaNtSecApi, JwaWinNT, JwaWinType;
+  JwaNtSecApi, JwaWindows;
 
 //
 // Structure definitions
@@ -519,13 +520,8 @@ procedure DsGetDcClose(GetDcContextHandle: HANDLE); stdcall;
 
 implementation
 
-const
-  netapi32 = 'netapi32.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadskquota.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDskQuota.pas,v 1.7 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaDskQuota;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "DskQuota.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaWinNT, JwaWinType;
+  JwaActiveX, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "DskQuota.h"'}
+{$HPPEMIT ''}
 
 const
 

packages/base/winunits/jwadsquery.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDSQuery.pas,v 1.8 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaDSQuery;
 
@@ -54,7 +55,7 @@ unit JwaDSQuery;
 interface
 
 uses
-  JwaCmnQuery, JwaWinType;
+  JwaCmnQuery, JwaWindows;
 
 const
   CLSID_DsQuery: TGUID = (D1:$8a23e65e; D2:$31c2; D3:$11d0; D4:($89, $1c, $0, $a0, $24, $ab, $2d, $bb));
@@ -162,7 +163,7 @@ type
   DSQUERYPARAMS = record
     cbStruct: DWORD;
     dwFlags: DWORD;
-    hInstance: HINSTANCE; // instance handle used for string extraction
+    hInstance: HINST; // instance handle used for string extraction
     offsetQuery: LONG; // offset to LDAP filter string
     iColumns: LONG; // column count
     dwReserved: DWORD; // reserved field for this query

packages/base/winunits/jwadsrole.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDSRole.pas,v 1.8 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDSRole;
 
@@ -54,7 +55,7 @@ unit JwaDSRole;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 // Domain information
@@ -174,8 +175,8 @@ procedure DsRoleFreeMemory(Buffer: PVOID); stdcall;
 
 implementation
 
-const
-  netapi32 = 'netapi32.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwadssec.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaDsSec.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaDsSec;
 
@@ -54,7 +55,7 @@ unit JwaDsSec;
 interface
 
 uses
-  JwaWinType, JwaWinNT, JwaPrSht;
+  JwaWindows, JwaPrSht;
 
 //+---------------------------------------------------------------------------
 //
@@ -147,8 +148,8 @@ type
 
 implementation
 
-const
-  dssec = 'dssec.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaerrorrep.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaErrorRep.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaErrorRep;
 
@@ -54,7 +55,7 @@ unit JwaErrorRep;
 interface
 
 uses
-  JwaWinBase, JwaWinType;
+  JwaWindows;
 
 type
   tagEFaultRepRetVal = (
@@ -93,13 +94,8 @@ type
 
 implementation
 
-const
-  faultreplib = 'faultrep.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaexcpt.pas

@@ -40,15 +40,14 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaExcpt.pas,v 1.7 2005/09/04 07:02:38 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaExcpt;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "excpt.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
@@ -56,6 +55,14 @@ interface
 uses
   JwaWinType;
 
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "excpt.h"'}
+{$HPPEMIT ''}
+
 // This file contains the definitions and prototypes for the compiler-
 // dependent intrinsics, support functions and keywords which implement
 // the structured exception handling extensions.
@@ -87,6 +94,15 @@ const
   EXCEPTION_CONTINUE_EXECUTION   = DWORD(-1);
   {$EXTERNALSYM EXCEPTION_CONTINUE_EXECUTION}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 implementation
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
 
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwafaxdev.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaFaxDev.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaFaxDev;
 
@@ -54,7 +55,7 @@ unit JwaFaxDev;
 interface
 
 uses
-  JwaWinType, JwaPrSht;
+  JwaWindows, JwaPrSht;
 
 //
 // FAX status constants

packages/base/winunits/jwafaxext.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaFaxExt.pas,v 1.7 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaFaxExt;
 
@@ -54,7 +55,7 @@ unit JwaFaxExt;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 {************************************
 *                                   *
@@ -81,7 +82,7 @@ type
 // Prototype of FaxExtSetData
 //
 
-  PFAX_EXT_SET_DATA = function(hInst: HINSTANCE; dwDeviceId: DWORD; DevIdSrc: FAX_ENUM_DEVICE_ID_SOURCE; lpcwstrDataGUID: LPCWSTR; pData: LPBYTE; dwDataSize: DWORD): DWORD; stdcall;
+  PFAX_EXT_SET_DATA = function(hInst: HINST; dwDeviceId: DWORD; DevIdSrc: FAX_ENUM_DEVICE_ID_SOURCE; lpcwstrDataGUID: LPCWSTR; pData: LPBYTE; dwDataSize: DWORD): DWORD; stdcall;
   {$EXTERNALSYM PFAX_EXT_SET_DATA}
 
   PFAX_EXT_CONFIG_CHANGE = function(dwDeviceId: DWORD; lpcwstrDataGUID: LPCWSTR; lpData: LPBYTE; dwDataSize: DWORD): HRESULT; stdcall;
@@ -91,7 +92,7 @@ type
 // Prototype of FaxExtRegisterForEvents 
 //
 
-  PFAX_EXT_REGISTER_FOR_EVENTS = function(hInst: HINSTANCE; dwDeviceId: DWORD; DevIdSrc: FAX_ENUM_DEVICE_ID_SOURCE; lpcwstrDataGUID: LPCWSTR; lpConfigChangeCallback: PFAX_EXT_CONFIG_CHANGE): HANDLE; stdcall;
+  PFAX_EXT_REGISTER_FOR_EVENTS = function(hInst: HINST; dwDeviceId: DWORD; DevIdSrc: FAX_ENUM_DEVICE_ID_SOURCE; lpcwstrDataGUID: LPCWSTR; lpConfigChangeCallback: PFAX_EXT_CONFIG_CHANGE): HANDLE; stdcall;
   {$EXTERNALSYM PFAX_EXT_REGISTER_FOR_EVENTS}
 
 //

packages/base/winunits/jwafaxmmc.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaFaxMmc.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaFaxMmc;
 
@@ -54,7 +55,7 @@ unit JwaFaxMmc;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 type
   OLESTR = WideString; // todo 

packages/base/winunits/jwafaxroute.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaFaxRoute.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaFaxRoute;
 
@@ -54,7 +55,7 @@ unit JwaFaxRoute;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 // microsoft routing guids

packages/base/winunits/jwagpedit.pas

@@ -40,21 +40,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaGPEdit.pas,v 1.8 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaGPEdit;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "GPEdit.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {TODO}, JwaPrSht, JwaWinType;
+  JwaActiveX, JwaPrSht, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "GPEdit.h"'}
+{$HPPEMIT ''}
 
 type
   LPOLESTR = POleStr;
@@ -852,8 +853,8 @@ function ExportRSoPData(lpNameSpace, lpFileName: LPOLESTR): HRESULT; stdcall;
 
 implementation
 
-const
-  gpeditlib = 'gpedit.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwahherror.pas

@@ -42,6 +42,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaHhError.pas,v 1.8 2005/09/03 16:10:30 marquardt Exp $
 
 unit JwaHhError;
 
@@ -52,7 +53,7 @@ interface
 {$I jediapilib.inc}
 
 uses
-  JwaWinType, JwaWinError;
+  JwaWindows;
 
 // Published: http://support.microsoft.com/default.aspx?scid=kb;en-us;297768
 

packages/base/winunits/jwahtmlGuid.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaHtmlGuid.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaHtmlGuid;
 

packages/base/winunits/jwahtmlhelp.pas

@@ -43,6 +43,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaHtmlHelp.pas,v 1.12 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaHtmlHelp;
 
@@ -67,7 +68,7 @@ uses
   {$IFDEF HAS_UNIT_VARIANTS}
   Variants,
   {$ENDIF HAS_UNIT_VARIANTS}
-  JwaWinType, JwaWinUser;
+  JwaWindows;
 
 // Commands to pass to HtmlHelp()
 
@@ -400,7 +401,7 @@ type
   PHHPopup = ^THHPopup;
   tagHH_POPUP = packed record
     cbStruct: Integer;                     // sizeof this structure
-    hinst_: HINSTANCE;                     // instance handle for string resource
+    hinst_: HINST;                         // instance handle for string resource
     idString: UINT;                        // string resource id, or text id if pszFile is specified in HtmlHelp call
     pszText: LPCTSTR;                      // used if idString is zero
     pt: POINT;                             // top center of popup window
@@ -739,17 +740,11 @@ type
 
 implementation
 
-{$IFDEF DYNAMIC_LINK}
 uses
-  JwaWinBase, JwaWinError, JwaWinNT, JwaWinReg;
-{$ENDIF DYNAMIC_LINK}
-
-const
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+  {$IFDEF DYNAMIC_LINK}
+  JwaWindows, JwaWinReg,
+  {$ENDIF DYNAMIC_LINK}
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 
@@ -818,9 +813,6 @@ end;
 
 {$ELSE}
 
-const
-  hhctrl = 'hhctrl.ocx';
-
 function HtmlHelpA; external hhctrl name 'HtmlHelpA';
 function HtmlHelpW; external hhctrl name 'HtmlHelpW';
 function HtmlHelp; external hhctrl name 'HtmlHelp' + AWSuffix;

packages/base/winunits/jwaiaccess.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIAccess.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIAccess;
 
@@ -54,7 +55,7 @@ unit JwaIAccess;
 interface
 
 uses
-  JwaAccCtrl, JwaWinType;
+  JwaAccCtrl, JwaWindows;
 
 {****************************************************************************
  *  Storage access control interface
@@ -112,3 +113,4 @@ type
 implementation
 
 end.
+

packages/base/winunits/jwaiadmext.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIAdmExt.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIAdmExt;
 
@@ -54,7 +55,7 @@ unit JwaIAdmExt;
 interface
 
 uses
-  JwaIisCnfg, JwaWinType;
+  JwaIisCnfg, JwaWindows;
 
 //
 // The Main Interface. All extensions must support this interface.
@@ -126,3 +127,4 @@ type
 implementation
 
 end.
+

packages/base/winunits/jwaicmpapi.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIcmpApi.pas,v 1.14 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaIcmpApi;
 
@@ -54,7 +55,7 @@ unit JwaIcmpApi;
 interface
 
 uses
-  JwaWinType, JwaIpExport, JwaNative, JwaWS2tcpip;
+  JwaWindows, JwaIpExport, JwaWS2tcpip, JwaWinternl;
 
 //    Declarations for the Win32 ICMP Echo request API.
 
@@ -272,6 +273,7 @@ function IcmpSendEcho2(
   ReplyBuffer: LPVOID;
   ReplySize: DWORD;
   Timeout: DWORD): DWORD; stdcall;
+{$EXTERNALSYM IcmpSendEcho2}
 
 function Icmp6SendEcho2(
   IcmpHandle: HANDLE;
@@ -286,6 +288,7 @@ function Icmp6SendEcho2(
   ReplyBuffer: LPVOID;
   ReplySize: DWORD;
   Timeout: DWORD): DWORD; stdcall;
+{$EXTERNALSYM Icmp6SendEcho2}
 
 //++
 //
@@ -319,8 +322,8 @@ function Icmp6ParseReplies(ReplyBuffer: LPVOID; ReplySize: DWORD): DWORD; stdcal
 
 implementation
 
-const
-  icmplib = 'iphlpapi.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaiiscnfg.pas

@@ -44,16 +44,16 @@ unit JwaIisCnfg;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "iiscnfg.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "iiscnfg.h"'}
+{$HPPEMIT ''}
 
 //
 // Paths
@@ -1770,3 +1770,4 @@ end;
 }
 
 end.
+

packages/base/winunits/jwaimagehlp.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaImageHlp.pas,v 1.10 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaImageHlp;
 
@@ -54,7 +55,7 @@ unit JwaImageHlp;
 interface
 
 uses
-  Windows, JwaWinBase, JwaWinNT, JwaWinType;
+  Windows, JwaWindows;
 
 const
   IMAGE_SEPARATION = 64*1024;
@@ -2743,13 +2744,8 @@ function MiniDumpReadDumpStream(BaseOfDump: PVOID; StreamNumber: ULONG; var Dir:
 
 implementation
 
-const
-  ImageHlpLib = 'imagehlp.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 procedure Address32To64(a32: LPADDRESS; a64: LPADDRESS64);
 begin

packages/base/winunits/jwaimapi.pas

@@ -40,27 +40,23 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaImapi.pas,v 1.7 2005/09/03 13:12:10 marquardt Exp $
 
 unit JwaImapi;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "imapi.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  ActiveX {todo},
-  JwaWinType;
+  JwaActiveX, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "imapi.h"'}
+{$HPPEMIT ''}
 
-{$IFDEF FPC}
-Type
-  IPropertyStorage = interface end;
-{$ENDIF}
 //
 // interface IDiscRecorder
 //
@@ -122,7 +118,6 @@ const
   IID_IDiscRecorder: TGUID = '{85AC9776-CA88-4cf2-894E-09598C078A41}';
   {$EXTERNALSYM IID_IDiscRecorder}
 
-
 type
   IDiscRecorder = interface(IUnknown)
   ['{85AC9776-CA88-4cf2-894E-09598C078A41}']
@@ -152,7 +147,6 @@ const
   IID_IEnumDiscRecorders: TGUID = '{9B1921E1-54AC-11d3-9144-00104BA11C5E}';
   {$EXTERNALSYM IID_IEnumDiscRecorders}
 
-
 type
   IEnumDiscRecorders = interface(IUnknown)
   ['{9B1921E1-54AC-11d3-9144-00104BA11C5E}']
@@ -211,7 +205,6 @@ const
   IID_IJolietDiscMaster: TGUID = '{E3BC42CE-4E5C-11D3-9144-00104BA11C5E}';
   {$EXTERNALSYM IID_IJolietDiscMaster}
 
-
 type
   IJolietDiscMaster = interface(IUnknown)
   ['{E3BC42CE-4E5C-11D3-9144-00104BA11C5E}']

packages/base/winunits/jwaimapierror.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaImapiError.pas,v 1.7 2005/09/03 16:10:31 marquardt Exp $
 
 unit JwaImapiError;
 
@@ -47,14 +48,14 @@ interface
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "imapi.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 uses
-  JwaWinError, JwaWinType;
+  JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "imapi.h"'}
+{$HPPEMIT ''}
 
 const
   IMAPI_S_PROPERTIESIGNORED     = HRESULT((SEVERITY_SUCCESS shl 31) or (FACILITY_ITF shl 16) or $200);

packages/base/winunits/jwaime.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIme.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaIme;
 
@@ -54,7 +55,7 @@ unit JwaIme;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 const
   IME_MAXPROCESS = 32;
@@ -392,13 +393,8 @@ type
 
 implementation
 
-const
-  imelib = 'user32.dll';
-  {$IFDEF UNICODE}
-  AWSuffix = 'W';
-  {$ELSE}
-  AWSuffix = 'A';
-  {$ENDIF UNICODE}
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaioevent.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIoEvent.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIoEvent;
 
@@ -54,7 +55,7 @@ unit JwaIoEvent;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 //  Label change event.  This event is signalled upon successful completion

packages/base/winunits/jwaipexport.pas

@@ -43,6 +43,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpExport.pas,v 1.8 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIpExport;
 
@@ -57,7 +58,7 @@ unit JwaIpExport;
 interface
 
 uses
-  JwaWinType, JwaWS2tcpip;
+  JwaWindows, JwaWS2tcpip;
 
 //
 // IP type definitions.

packages/base/winunits/jwaiphlpapi.pas

@@ -43,21 +43,22 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpHlpApi.pas,v 1.9 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaIpHlpApi;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "iphlpapi.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaIpExport, JwaIpRtrMib, JwaIpTypes, JwaWinType, JwaWinBase, JwaWinSock;
+  JwaIpExport, JwaIpRtrMib, JwaIpTypes, JwaWindows;
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "iphlpapi.h"'}
+{$HPPEMIT ''}
 
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
@@ -387,8 +388,8 @@ function GetIpErrorString(ErrorCode: IP_STATUS; Buffer: PWCHAR; var Size: DWORD)
 
 implementation
 
-const
-  iphlpapilib = 'iphlpapi.dll';
+uses
+  JwaWinDLLNames;
 
 {$IFDEF DYNAMIC_LINK}
 

packages/base/winunits/jwaipifcons.pas

@@ -43,6 +43,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpIfCons.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaIpIfCons;
 

packages/base/winunits/jwaipinfoid.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpInfoId.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIpInfoId;
 
@@ -54,7 +55,7 @@ unit JwaIpInfoId;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 const
   IP_ROUTER_MANAGER_VERSION = 1;

packages/base/winunits/jwaiprtrmib.pas

@@ -43,6 +43,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpRtrMib.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIpRtrMib;
 
@@ -57,7 +58,7 @@ unit JwaIpRtrMib;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //

packages/base/winunits/jwaiptypes.pas

@@ -43,6 +43,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIpTypes.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaIpTypes;
 
@@ -57,7 +58,7 @@ unit JwaIpTypes;
 interface
 
 uses
-  JwaWinsock2, JwaWinType;
+  JwaWinsock2, JwaWindows;
 
 type
   // #include <time.h>  // TODO

packages/base/winunits/jwaisguids.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIsGuids.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaIsGuids;
 

packages/base/winunits/jwaissper16.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaIssPer16.pas,v 1.5 2004/12/08 08:18:36 marquardt Exp $
 
 unit JwaIssPer16;
 

packages/base/winunits/jwalm.pas

@@ -0,0 +1,110 @@
+{******************************************************************************}
+{                                                                              }
+{ Windows API interface Unit for Object Pascal                                 }
+{ Master file for Lan Manager applications                                     }
+{                                                                              }
+{ Portions created by Microsoft are Copyright (C) Microsoft Corporation.       }
+{  All Rights Reserved.                                                        }
+{                                                                              }
+{ The original Pascal code is: JwaLM.pas, released September 2005.             }
+{ The initial developer of the Pascal code is                                  }
+{ Robert Marquardt (robert_marquardt att gmx dott de).                         }
+{                                                                              }
+{ Portions created by Robert Marquardt are Copyright (C) 2005                  }
+{ Robert Marquardt. All Rights Reserved.                                       }
+{                                                                              }
+{ Obtained through: Joint Endeavour of Delphi Innovators (Project JEDI)        }
+{                                                                              }
+{ You may retrieve the latest version of this file at the Project JEDI         }
+{ APILIB home page, located at http://jedi-apilib.sourceforge.net              }
+{                                                                              }
+{ The contents of this file are used with permission, subject to the Mozilla   }
+{ Public License Version 1.1 (the "License"); you may not use this file except }
+{ in compliance with the License. You may obtain a copy of the License at      }
+{ http://www.mozilla.org/MPL/MPL-1.1.html                                      }
+{                                                                              }
+{ Software distributed under the License is distributed on an "AS IS" basis,   }
+{ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for }
+{ the specific language governing rights and limitations under the License.    }
+{                                                                              }
+{ Alternatively, the contents of this file may be used under the terms of the  }
+{ GNU Lesser General Public License (the  "LGPL License"), in which case the   }
+{ provisions of the LGPL License are applicable instead of those above.        }
+{ If you wish to allow use of your version of this file only under the terms   }
+{ of the LGPL License and not to allow others to use your version of this file }
+{ under the MPL, indicate your decision by deleting  the provisions above and  }
+{ replace  them with the notice and other provisions required by the LGPL      }
+{ License.  If you do not delete the provisions above, a recipient may use     }
+{ your version of this file under either the MPL or the LGPL License.          }
+{                                                                              }
+{ For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html }
+{                                                                              }
+{******************************************************************************}
+
+// $Id: JwaLM.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+unit JwaLM;
+
+{$WEAKPACKAGEUNIT}
+
+{$DEFINE JWALM_PAS}
+{$DEFINE JWA_INCLUDEMODE}
+
+{$I jediapilib.inc}
+
+interface
+
+uses
+  JwaWindows;
+
+{$DEFINE JWA_INTERFACESECTION}
+{$I JwaLmErr.pas}      // LAN Manager network error definitions
+{$I JwaLmCons.pas}     // LAN Manager common definitions
+
+{$I JwaLmAccess.pas}   // Access, Domain, Group and User classes
+{$I JwaLmAlert.pas}    // Alerter
+{$I JwaLmShare.pas}    // Connection, File, Session and Share classes
+{$I JwaLmMsg.pas}      // Message class
+{$I JwaLmRemUtl.pas}   // Remote Utility class
+{$I JwaLmRepl.pas}     // Replicator class
+{$I JwaLmServer.pas}   // Server class
+{$I JwaLmSvc.pas}      // Service class
+{$I JwaLmUse.pas}      // Use class
+{$I JwaLmWkSta.pas}    // Workstation class
+{$I JwaLmApiBuf.pas}   // NetApiBuffer class
+{$I JwaLmErrLog.pas}   // NetErrorLog class
+{$I JwaLmConfig.pas}   // NetConfig class
+{$I JwaLmStats.pas}    // NetStats class
+{$I JwaLmAudit.pas}    // NetAudit class
+{$I JwaLmJoin.pas}     // NetJoinDomain class
+{$UNDEF JWA_INTERFACESECTION}
+
+implementation
+
+uses
+  JwaWinDLLNames;
+
+{$DEFINE JWA_IMPLEMENTATIONSECTION}
+{$I JwaLmCons.pas}     // LAN Manager common definitions
+{$I JwaLmErr.pas}      // LAN Manager network error definitions
+
+{$I JwaLmAccess.pas}   // Access, Domain, Group and User classes
+{$I JwaLmAlert.pas}    // Alerter
+{$I JwaLmShare.pas}    // Connection, File, Session and Share classes
+{$I JwaLmMsg.pas}      // Message class
+{$I JwaLmRemUtl.pas}   // Remote Utility class
+{$I JwaLmRepl.pas}     // Replicator class
+{$I JwaLmServer.pas}   // Server class
+{$I JwaLmSvc.pas}      // Service class
+{$I JwaLmUse.pas}      // Use class
+{$I JwaLmWkSta.pas}    // Workstation class
+{$I JwaLmApiBuf.pas}   // NetApiBuffer class
+{$I JwaLmErrLog.pas}   // NetErrorLog class
+{$I JwaLmConfig.pas}   // NetConfig class
+{$I JwaLmStats.pas}    // NetStats class
+{$I JwaLmAudit.pas}    // NetAudit class
+{$I JwaLmJoin.pas}     // NetJoinDomain class
+{$UNDEF JWA_IMPLEMENTATIONSECTION}
+
+end.
+

packages/base/winunits/jwalmaccess.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmAccess.pas,v 1.11 2005/09/07 09:54:53 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmAccess;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmaccess.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaWinNT, JwaWinType, JwaLmCons;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmaccess.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes - User
@@ -2163,8 +2170,19 @@ const
   NETLOGON_VERIFY_STATUS_RETURNED  = $80; // Trust verification status returned in netlog2_pdc_connection_status
   {$EXTERNALSYM NETLOGON_VERIFY_STATUS_RETURNED}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -2816,4 +2834,8 @@ function NetEnumerateTrustedDomains; external netapi32 name 'NetEnumerateTrusted
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmalert.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmAlert.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmAlert;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmalert.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmalert.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes
@@ -230,8 +237,19 @@ const
   PRJOB_QS_PRINTING = 3;
   {$EXTERNALSYM PRJOB_QS_PRINTING}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 function ALERT_OTHER_INFO(x: Pointer): Pointer;
 begin
   Result := Pointer(PChar(x) + SizeOf(STD_ALERT));
@@ -272,4 +290,8 @@ function NetAlertRaiseEx; external netapi32 name 'NetAlertRaiseEx';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmapibuf.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmApiBuf.pas,v 1.9 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmApiBuf;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmapibuf.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmapibuf.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes
@@ -77,8 +84,19 @@ function NetApiBufferSize(Buffer: LPVOID; var ByteCount: DWORD): NET_API_STATUS;
 function NetapipBufferAllocate(ByteCount: DWORD; var Buffer: LPVOID): NET_API_STATUS; stdcall;
 {$EXTERNALSYM NetapipBufferAllocate}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -156,4 +174,8 @@ function NetapipBufferAllocate; external netapi32 name 'NetapipBufferAllocate';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmat.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmAt.pas,v 1.8 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaLmAt;
 
@@ -54,7 +55,7 @@ unit JwaLmAt;
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
 
 //
 //  The following bits are used with Flags field in structures below.
@@ -158,6 +159,9 @@ function NetScheduleJobGetInfo(Servername: LPCWSTR; JobId: DWORD; var PointerToB
 
 implementation
 
+uses
+  JwaWinDLLNames;
+
 {$IFDEF DYNAMIC_LINK}
 
 var

packages/base/winunits/jwalmaudit.pas

@@ -40,21 +40,30 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmAudit.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmAudit;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmaudit.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmaudit.h"'}
+{$HPPEMIT ''}
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 type
   _HLOG = record
@@ -79,6 +88,8 @@ const
   LOGFLAGS_SEEK     = $2;
   {$EXTERNALSYM LOGFLAGS_SEEK}
 
+{$ENDIF !JWA_INCLUDEMODE}
+
 //
 // Function Prototypes - Audit
 //
@@ -667,8 +678,19 @@ const
   AA_A_ALL    = AA_F_OPEN or AA_F_WRITE or AA_F_DELETE or AA_F_ACL;
   {$EXTERNALSYM AA_A_ALL}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -718,4 +740,8 @@ function NetAuditWrite; external netapi32 name 'NetAuditWrite';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmconfig.pas

@@ -40,6 +40,9 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmConfig.pas,v 1.11 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmConfig;
 
@@ -50,7 +53,11 @@ unit JwaLmConfig;
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
 
 {$HPPEMIT ''}
 {$HPPEMIT '#include "lmconfig.h"'}
@@ -108,8 +115,19 @@ type
   TConfigInfo0 = CONFIG_INFO_0;
   PConfigInfo0 = PCONFIG_INFO_0;  
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -187,4 +205,8 @@ function NetUnregisterDomainNameChangeNotification; external netapi32 name 'NetU
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmcons.pas

@@ -40,24 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmCons.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmCons;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lm.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaWinType, JwaLmErr;
+  JwaWindows, JwaLmErr;
 
-const
-  NetApi32 = 'netapi32.dll';
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lm.h"'}
+{$HPPEMIT ''}
 
 //
 // NOTE:  Lengths of strings are given as the maximum lengths of the
@@ -357,6 +361,15 @@ const
   MAX_LANMAN_MESSAGE_ID = 5899;
   {$EXTERNALSYM MAX_LANMAN_MESSAGE_ID}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 implementation
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
 
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmdfs.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmDFS.pas,v 1.8 2005/09/06 16:36:50 marquardt Exp $
 
 unit JwaLmDFS;
 
@@ -54,7 +55,7 @@ unit JwaLmDFS;
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
 
 //
 // DFS Volume state
@@ -482,6 +483,9 @@ function NetDfsRename(Path: LPWSTR; NewPath: LPWSTR): NET_API_STATUS; stdcall;
 
 implementation
 
+uses
+  JwaWinDLLNames;
+
 {$IFDEF DYNAMIC_LINK}
 
 var

packages/base/winunits/jwalmerr.pas

@@ -40,19 +40,26 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmErr.pas,v 1.7 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmErr;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmerr.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmerr.h"'}
+{$HPPEMIT ''}
+
 const
   NERR_Success = 0; // Success
   {$EXTERNALSYM NERR_Success}
@@ -924,6 +931,15 @@ const
 //    WARNING:  Do not exceed MAX_NERR; values above this are used by
 //              other error code ranges (errlog.h, service.h, apperr.h).
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 implementation
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
 
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmerrlog.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmErrLog.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmErrLog;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmerrlog.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmerrlog.h"'}
+{$HPPEMIT ''}
 
 //
 // Data Structures - Config
@@ -2133,8 +2140,19 @@ const
      * service on this machine and verify that this event log no longer appears.
      *)
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -2184,4 +2202,8 @@ function NetErrorLogWrite; external netapi32 name 'NetErrorLogWrite';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmjoin.pas

@@ -40,6 +40,9 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmJoin.pas,v 1.11 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmJoin;
 
@@ -50,7 +53,11 @@ unit JwaLmJoin;
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
 
 {$HPPEMIT ''}
 {$HPPEMIT '#include "lmjoin.h"'}
@@ -213,8 +220,19 @@ type
 function NetEnumerateComputerNames(Server: LPCWSTR; NameType: NET_COMPUTER_NAME_TYPE; Reserved: ULONG; EntryCount: PDWORD; var ComputerNames: LPLPWSTR): NET_API_STATUS; stdcall;
 {$EXTERNALSYM NetEnumerateComputerNames}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -362,4 +380,8 @@ function NetEnumerateComputerNames; external netapi32 name 'NetEnumerateComputer
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmmsg.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmMsg.pas,v 1.9 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmMsg;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmmsg.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmmsg.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes
@@ -124,8 +131,19 @@ const
   MSGNAME_FORWARDED_FROM = $10;    // Name forwarded from remote station
   {$EXTERNALSYM MSGNAME_FORWARDED_FROM}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -203,4 +221,8 @@ function NetMessageBufferSend; external netapi32 name 'NetMessageBufferSend';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmremutl.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmRemUtl.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmRemUtl;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmremutl.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmremutl.h"'}
+{$HPPEMIT ''}
 
 //
 // Type Definitions
@@ -154,8 +161,19 @@ const
   USE_SPECIFIC_TRANSPORT = DWORD($80000000);
   {$EXTERNALSYM USE_SPECIFIC_TRANSPORT}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 // todo cdecl function so no dynamic linking for the time being...
 
 {$IFDEF SUPPORTS_VARARGS}
@@ -197,4 +215,8 @@ function NetRemoteComputerSupports; external netapi32 name 'NetRemoteComputerSup
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmrepl.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmRepl.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmRepl;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmrepl.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmrepl.h"'}
+{$HPPEMIT ''}
 
 //
 // Replicator Configuration APIs
@@ -341,8 +348,19 @@ const
   REPL_STATE_NEVER_REPLICATED = 3;
   {$EXTERNALSYM REPL_STATE_NEVER_REPLICATED}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -560,4 +578,8 @@ function NetReplImportDirUnlock; external netapi32 name 'NetReplImportDirUnlock'
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmserver.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmServer.pas,v 1.11 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmServer;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmserver.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinSvc, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmserver.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes - SERVER
@@ -2409,8 +2416,19 @@ const
   SVTI2_REMAP_PIPE_NAMES = $2;
   {$EXTERNALSYM SVTI2_REMAP_PIPE_NAMES}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -2600,4 +2618,8 @@ function SetServiceBits; external netapi32 name 'SetServiceBits';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmshare.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmShare.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmShare;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmshare.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinNT, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmshare.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes - Share
@@ -575,8 +582,19 @@ const
   PERM_FILE_CREATE = $4; // user has create access
   {$EXTERNALSYM PERM_FILE_CREATE}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -794,4 +812,8 @@ function NetFileGetInfo; external netapi32 name 'NetFileGetInfo';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}

packages/base/winunits/jwalmsname.pas

@@ -40,6 +40,7 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmSName.pas,v 1.6 2005/09/03 14:27:48 marquardt Exp $
 
 unit JwaLmSName;
 
@@ -54,7 +55,7 @@ unit JwaLmSName;
 interface
 
 uses
-  JwaWinType;
+  JwaWindows;
 
 //
 //  Standard LAN Manager service names.

packages/base/winunits/jwalmstats.pas

@@ -40,21 +40,28 @@
 {                                                                              }
 {******************************************************************************}
 
+// $Id: JwaLmStats.pas,v 1.10 2005/09/07 09:54:54 marquardt Exp $
+
+{$IFNDEF JWA_INCLUDEMODE}
 
 unit JwaLmStats;
 
 {$WEAKPACKAGEUNIT}
 
-{$HPPEMIT ''}
-{$HPPEMIT '#include "lmstats.h"'}
-{$HPPEMIT ''}
-
 {$I jediapilib.inc}
 
 interface
 
 uses
-  JwaLmCons, JwaWinType;
+  JwaWindows, JwaLmCons;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_INTERFACESECTION}
+
+{$HPPEMIT ''}
+{$HPPEMIT '#include "lmstats.h"'}
+{$HPPEMIT ''}
 
 //
 // Function Prototypes - Statistics
@@ -221,8 +228,19 @@ const
   STATS_OVERFLOW = ULONG(-2);
   {$EXTERNALSYM STATS_OVERFLOW}
 
+{$ENDIF JWA_INTERFACESECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
+
 implementation
 
+uses
+  JwaWinDLLNames;
+
+{$ENDIF !JWA_INCLUDEMODE}
+
+{$IFDEF JWA_IMPLEMENTATIONSECTION}
+
 {$IFDEF DYNAMIC_LINK}
 
 var
@@ -244,4 +262,8 @@ function NetStatisticsGet; external netapi32 name 'NetStatisticsGet';
 
 {$ENDIF DYNAMIC_LINK}
 
+{$ENDIF JWA_IMPLEMENTATIONSECTION}
+
+{$IFNDEF JWA_INCLUDEMODE}
 end.
+{$ENDIF !JWA_INCLUDEMODE}