Changeset 21855

Timestamp:

Dec 6, 2011, 6:19:13 PM (13 years ago)

Author:

dmik

Message:

Port OLE32 and REGSVR32 to GCC/kBuild.

Location:

branches/gcc-kmk

Files:

• include/win/wine/obj_base.h (modified) (1 diff)
• src/Makefile.kmk (modified) (1 diff)
• src/ole32/Makefile.kmk (added)
• src/ole32/antimoniker.c (modified) (1 diff)
• src/ole32/clipboard.c (modified) (6 diffs)
• src/ole32/compobj.c (modified) (2 diffs)
• src/ole32/compobj_private.h (modified) (1 diff)
• src/ole32/compositemoniker.c (modified) (2 diffs)
• src/ole32/datacache.c (modified) (8 diffs)
• src/ole32/dbgwrap.cpp (modified) (1 diff)
• src/ole32/filemoniker.c (modified) (1 diff)
• src/ole32/hglobalstream.c (modified) (15 diffs)
• src/ole32/ifs.c (modified) (3 diffs)
• src/ole32/initterm.cpp (moved) (moved from branches/gcc-kmk/src/ole32/initole32.cpp ) (3 diffs)
• src/ole32/itemmoniker.c (modified) (2 diffs)
• src/ole32/memlockbytes.c (modified) (10 diffs)
• src/ole32/ole2.c (modified) (11 diffs)
• src/ole32/ole2impl.c (modified) (1 diff)
• src/ole32/ole32.def (modified) (3 diffs)
• src/ole32/ole32dbg.def (modified) (3 diffs)
• src/ole32/oleproxy.c (modified) (1 diff)
• src/ole32/regsvr32.cpp (modified) (4 diffs)
• src/ole32/rpc.c (modified) (1 diff)
• src/ole32/stg_bigblockfile.c (modified) (10 diffs)
• src/ole32/stg_stream.c (modified) (20 diffs)
• src/ole32/storage32.c (modified) (41 diffs)

branches/gcc-kmk/include/win/wine/obj_base.h ¶

@@ -703 +703 @@
 typedef struct IMalloc16 IMalloc16,*LPMALLOC16;
 typedef struct IMalloc IMalloc,*LPMALLOC;
+typedef const IMalloc *LPCMALLOC;
 
 DEFINE_OLEGUID(IID_IUnknown,            0x00000000L, 0, 0);

branches/gcc-kmk/src/Makefile.kmk ¶

@@ -28 +28 @@
 include $(PATH_SUB_CURRENT)/advapi32/Makefile.kmk
 include $(PATH_SUB_CURRENT)/rpcrt4/Makefile.kmk
+include $(PATH_SUB_CURRENT)/oleaut32/Makefile.kmk
+include $(PATH_SUB_CURRENT)/ole32/Makefile.kmk
 
 include $(FILE_KBUILD_SUB_FOOTER)

branches/gcc-kmk/src/ole32/antimoniker.c ¶

@@ -281 +281 @@
     /* Normaly the sizemax must be the  size of DWORD ! but I tested this function it ususlly return 16 bytes */
     /* more than the number of bytes used by AntiMoniker::Save function */
-    pcbSize->s.LowPart =  sizeof(DWORD)+16;
-
-    pcbSize->s.HighPart=0;
+    pcbSize->DUMMYSTRUCTNAME_DOT LowPart =  sizeof(DWORD)+16;
+
+    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
 
     return S_OK;

branches/gcc-kmk/src/ole32/clipboard.c ¶

@@ -937 +937 @@
     hStorage = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, 0);
     hr = CreateILockBytesOnHGlobal(hStorage, FALSE, &ptrILockBytes);
-    hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.u.pstg);
+    hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.DUMMYUNIONNAME_DOT pstg);
 
     if (FAILED(hr = IDataObject_GetDataHere(theOleClipboard->pIDataObjectSrc, pFormatetc, &std)))
@@ -964 +964 @@
       if (!FAILED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2)))
       {
-        mfp = (METAFILEPICT *)GlobalLock(std2.u.hGlobal);
+        mfp = (METAFILEPICT *)GlobalLock(std2.DUMMYUNIONNAME_DOT hGlobal);
       }
 
@@ -994 +994 @@
         pdh.dwSize = nSize;
 
-        hr = IStorage_CreateStream(std.u.pstg, name, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
+        hr = IStorage_CreateStream(std.DUMMYUNIONNAME_DOT pstg, name, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
 
         hr = IStream_Write(pStream, &pdh, sizeof(PresentationDataHeader), NULL);
@@ -1007 +1007 @@
         HeapFree(GetProcessHeap(), 0, mfBits);
 
-        GlobalUnlock(std2.u.hGlobal);
-
-        ReadClassStg(std.u.pstg, &clsID);
+        GlobalUnlock(std2.DUMMYUNIONNAME_DOT hGlobal);
+
+        ReadClassStg(std.DUMMYUNIONNAME_DOT pstg, &clsID);
         ProgIDFromCLSID(&clsID, &strProgID);
 
         WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL );
-        OLECONVERT_CreateOleStream(std.u.pstg);
-        OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName);
+        OLECONVERT_CreateOleStream(std.DUMMYUNIONNAME_DOT pstg);
+        OLECONVERT_CreateCompObjStream(std.DUMMYUNIONNAME_DOT pstg, strOleTypeName);
       }
     }
@@ -1028 +1028 @@
     /* To put a copy back on the clipboard */
 
-    hStorage = std.u.hGlobal;
+    hStorage = std.DUMMYUNIONNAME_DOT hGlobal;
   }
 
@@ -1278 +1278 @@
    */
   pmedium->tymed = (hData == 0) ? TYMED_NULL : TYMED_HGLOBAL;
-  pmedium->u.hGlobal = (HGLOBAL)hData;
+  pmedium->DUMMYUNIONNAME_DOT hGlobal = (HGLOBAL)hData;
   pmedium->pUnkForRelease = NULL;
 

branches/gcc-kmk/src/ole32/compobj.c ¶

@@ -507 +507 @@
  *      the string representation and HRESULT
  */
-HRESULT WINE_StringFromCLSID(
+HRESULT WINAPI WINE_StringFromCLSID(
         const CLSID *id,        /* [in] GUID to be converted */
         LPSTR idstr             /* [out] pointer to buffer to contain converted guid */
@@ -899 +899 @@
     if (hres) return hres;
 
-    buflen = ststg.cbSize.s.LowPart;
+    buflen = ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
     buffer = HeapAlloc(GetProcessHeap(),0,buflen);
-    seekto.s.LowPart = 0;
-    seekto.s.HighPart = 0;
+    seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;
+    seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
     hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
     if (hres) {

branches/gcc-kmk/src/ole32/compobj_private.h ¶

@@ -36 +36 @@
 #include "wtypes.h"
 
-extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr);
+extern HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid);
 extern HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv);
 

branches/gcc-kmk/src/ole32/compositemoniker.c ¶

@@ -436 +436 @@
         return E_POINTER;
 
-    pcbSize->s.LowPart =0;
-    pcbSize->s.HighPart=0;
+    pcbSize->DUMMYSTRUCTNAME_DOT LowPart =0;
+    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
 
     IMoniker_Enum(iface,TRUE,&enumMk);
@@ -447 +447 @@
         IMoniker_Release(pmk);
 
-        pcbSize->s.LowPart +=ptmpSize.s.LowPart;
-        pcbSize->s.HighPart+=ptmpSize.s.HighPart;
+        pcbSize->DUMMYSTRUCTNAME_DOT LowPart +=ptmpSize.DUMMYSTRUCTNAME_DOT LowPart;
+        pcbSize->DUMMYSTRUCTNAME_DOT HighPart+=ptmpSize.DUMMYSTRUCTNAME_DOT HighPart;
     }
 

branches/gcc-kmk/src/ole32/datacache.c ¶

@@ -700 +700 @@
 
     return (elem->type == STGTY_STREAM)
-        && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
+        && (elem->cbSize.DUMMYSTRUCTNAME_DOT LowPart >= sizeof(PresentationDataHeader))
         && (strlenW(name) == 11)
         && (strncmpW(name, OlePres, 8) == 0)
@@ -769 +769 @@
                     /* Rewind the stream before returning it. */
                     LARGE_INTEGER offset;
-                    offset.s.LowPart = 0;
-                    offset.s.HighPart = 0;
+                    offset.DUMMYSTRUCTNAME_DOT LowPart = 0;
+                    offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
                     IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
 
@@ -839 +839 @@
    * Skip the header
    */
-  offset.s.HighPart = 0;
-  offset.s.LowPart  = sizeof(PresentationDataHeader);
+  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offset.DUMMYSTRUCTNAME_DOT LowPart  = sizeof(PresentationDataHeader);
 
   hres = IStream_Seek(
@@ -848 +848 @@
            NULL);
 
-  streamInfo.cbSize.s.LowPart -= offset.s.LowPart;
+  streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart -= offset.DUMMYSTRUCTNAME_DOT LowPart;
 
   /*
@@ -855 +855 @@
   metafileBits = HeapAlloc(GetProcessHeap(),
                            0,
-                           streamInfo.cbSize.s.LowPart);
+                           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
 
   /*
@@ -863 +863 @@
            presStream,
            metafileBits,
-           streamInfo.cbSize.s.LowPart,
+           streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart,
            NULL);
 
@@ -871 +871 @@
   if (SUCCEEDED(hres))
   {
-    newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.s.LowPart, metafileBits);
+    newMetafile = SetMetaFileBitsEx(streamInfo.cbSize.DUMMYSTRUCTNAME_DOT LowPart, metafileBits);
   }
 
@@ -1141 +1141 @@
     GlobalUnlock(hGlobalMF);
 
-    pmedium->u.hGlobal = hGlobalMF;
+    pmedium->DUMMYUNIONNAME_DOT hGlobal = hGlobalMF;
     pmedium->tymed = TYMED_MFPICT;
     hrRet = S_OK;

branches/gcc-kmk/src/ole32/dbgwrap.cpp ¶

@@ -10 +10 @@
 #include <winnls.h>
 #include <ntddk.h>
+#include "ole32.h"
 #include <heapstring.h>
-#include "ole32.h"
 #include "wine/obj_errorinfo.h"
 #include "wine/obj_oleaut.h"

branches/gcc-kmk/src/ole32/filemoniker.c ¶

@@ -452 +452 @@
                len*sizeof(WCHAR);       /* unicde filePath string */
 
-    pcbSize->s.LowPart=sizeMAx;
-    pcbSize->s.HighPart=0;
+    pcbSize->DUMMYSTRUCTNAME_DOT LowPart=sizeMAx;
+    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
 
     return S_OK;

branches/gcc-kmk/src/ole32/hglobalstream.c ¶

@@ -279 +279 @@
      * Start the stream at the beginning.
      */
-    newStream->currentPosition.s.HighPart = 0;
-    newStream->currentPosition.s.LowPart = 0;
+    newStream->currentPosition.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newStream->currentPosition.DUMMYSTRUCTNAME_DOT LowPart = 0;
 
     /*
      * Initialize the size of the stream to the size of the handle.
      */
-    newStream->streamSize.s.HighPart = 0;
-    newStream->streamSize.s.LowPart  = GlobalSize(newStream->supportHandle);
+    newStream->streamSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newStream->streamSize.DUMMYSTRUCTNAME_DOT LowPart  = GlobalSize(newStream->supportHandle);
   }
 
@@ -442 +442 @@
    * to read from the block chain
    */
-  bytesToReadFromBuffer = min( This->streamSize.s.LowPart - This->currentPosition.s.LowPart, cb);
+  bytesToReadFromBuffer = min( This->streamSize.DUMMYSTRUCTNAME_DOT LowPart - This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart, cb);
 
   /*
@@ -449 +449 @@
   supportBuffer = GlobalLock(This->supportHandle);
 
-  memcpy(pv, (char *) supportBuffer+This->currentPosition.s.LowPart, bytesToReadFromBuffer);
+  memcpy(pv, (char *) supportBuffer+This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart, bytesToReadFromBuffer);
 
   /*
    * Move the current position to the new position
    */
-  This->currentPosition.s.LowPart+=bytesToReadFromBuffer;
+  This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart+=bytesToReadFromBuffer;
 
   /*
@@ -515 +515 @@
   else
   {
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart = This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart + cb;
   }
 
@@ -522 +522 @@
    * Verify if we need to grow the stream
    */
-  if (newSize.s.LowPart > This->streamSize.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart > This->streamSize.DUMMYSTRUCTNAME_DOT LowPart)
   {
     /* grow stream */
@@ -533 +533 @@
   supportBuffer = GlobalLock(This->supportHandle);
 
-  memcpy((char *) supportBuffer+This->currentPosition.s.LowPart, pv, cb);
+  memcpy((char *) supportBuffer+This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart, pv, cb);
 
   /*
    * Move the current position to the new position
    */
-  This->currentPosition.s.LowPart+=cb;
+  This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart+=cb;
 
   /*
@@ -572 +572 @@
 
   TRACE("(%p, %ld, %ld, %p)\n", iface,
-        dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+        dlibMove.DUMMYSTRUCTNAME_DOT LowPart, dwOrigin, plibNewPosition);
 
   /*
@@ -581 +581 @@
   {
     case STREAM_SEEK_SET:
-      newPosition.s.HighPart = 0;
-      newPosition.s.LowPart = 0;
+      newPosition.DUMMYSTRUCTNAME_DOT HighPart = 0;
+      newPosition.DUMMYSTRUCTNAME_DOT LowPart = 0;
       break;
     case STREAM_SEEK_CUR:
@@ -627 +627 @@
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
 
-  TRACE("(%p, %ld)\n", iface, libNewSize.s.LowPart);
+  TRACE("(%p, %ld)\n", iface, libNewSize.DUMMYSTRUCTNAME_DOT LowPart);
 
   /*
    * As documented.
    */
-  if (libNewSize.s.HighPart != 0)
+  if (libNewSize.DUMMYSTRUCTNAME_DOT HighPart != 0)
     return STG_E_INVALIDFUNCTION;
 
-  if (This->streamSize.s.LowPart == libNewSize.s.LowPart)
+  if (This->streamSize.DUMMYSTRUCTNAME_DOT LowPart == libNewSize.DUMMYSTRUCTNAME_DOT LowPart)
     return S_OK;
 
@@ -642 +642 @@
    */
   This->supportHandle = GlobalReAlloc(This->supportHandle,
-                                      libNewSize.s.LowPart,
+                                      libNewSize.DUMMYSTRUCTNAME_DOT LowPart,
                                       0);
 
-  This->streamSize.s.LowPart = libNewSize.s.LowPart;
+  This->streamSize.DUMMYSTRUCTNAME_DOT LowPart = libNewSize.DUMMYSTRUCTNAME_DOT LowPart;
 
   return S_OK;
@@ -671 +671 @@
 
   TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
-        cb.s.LowPart, pcbRead, pcbWritten);
+        cb.DUMMYSTRUCTNAME_DOT LowPart, pcbRead, pcbWritten);
 
   /*
@@ -679 +679 @@
     return STG_E_INVALIDPOINTER;
 
-  totalBytesRead.s.LowPart = totalBytesRead.s.HighPart = 0;
-  totalBytesWritten.s.LowPart = totalBytesWritten.s.HighPart = 0;
+  totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart = totalBytesRead.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   /*
@@ -687 +687 @@
    * implementation will do the job
    */
-  while ( cb.s.LowPart > 0 )
-  {
-    if ( cb.s.LowPart >= 128 )
+  while ( cb.DUMMYSTRUCTNAME_DOT LowPart > 0 )
+  {
+    if ( cb.DUMMYSTRUCTNAME_DOT LowPart >= 128 )
       copySize = 128;
     else
-      copySize = cb.s.LowPart;
+      copySize = cb.DUMMYSTRUCTNAME_DOT LowPart;
 
     IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
 
-    totalBytesRead.s.LowPart += bytesRead;
+    totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart += bytesRead;
 
     IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
 
-    totalBytesWritten.s.LowPart += bytesWritten;
+    totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart += bytesWritten;
 
     /*
@@ -712 +712 @@
 
     if (bytesRead!=copySize)
-      cb.s.LowPart = 0;
+      cb.DUMMYSTRUCTNAME_DOT LowPart = 0;
     else
-      cb.s.LowPart -= bytesRead;
+      cb.DUMMYSTRUCTNAME_DOT LowPart -= bytesRead;
   }
 
@@ -722 +722 @@
   if (pcbRead)
   {
-    pcbRead->s.LowPart = totalBytesRead.s.LowPart;
-    pcbRead->s.HighPart = totalBytesRead.s.HighPart;
+    pcbRead->DUMMYSTRUCTNAME_DOT LowPart = totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart;
+    pcbRead->DUMMYSTRUCTNAME_DOT HighPart = totalBytesRead.DUMMYSTRUCTNAME_DOT HighPart;
   }
 
   if (pcbWritten)
   {
-    pcbWritten->s.LowPart = totalBytesWritten.s.LowPart;
-    pcbWritten->s.HighPart = totalBytesWritten.s.HighPart;
+    pcbWritten->DUMMYSTRUCTNAME_DOT LowPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart;
+    pcbWritten->DUMMYSTRUCTNAME_DOT HighPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT HighPart;
   }
   return hr;

branches/gcc-kmk/src/ole32/ifs.c ¶

@@ -256 +256 @@
  *      win2k:  size originally requested !!! (allocated on 8 byte boundarys)
  */
-static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) {
+static DWORD WINAPI IMalloc_fnGetSize(LPCMALLOC iface,LPVOID pv) {
 
         DWORD cb;
@@ -281 +281 @@
  * IMalloc32_DidAlloc [VTABLE]
  */
-static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) {
+static INT WINAPI IMalloc_fnDidAlloc(LPCMALLOC iface,LPVOID pv) {
 
         BOOL fSpyed = 0;
@@ -305 +305 @@
  * IMalloc32_HeapMinimize [VTABLE]
  */
-static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
+static LPVOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
         TRACE("()\n");
 

branches/gcc-kmk/src/ole32/initterm.cpp ¶

@@ -1 +1 @@
 /*
- * DLL entry point
+ * OLE32 DLL entry point
  *
  * Copyright 1998 Sander van Leeuwen
  * Copyright 1998 Peter Fitzsimmons
  *
- *
  * Project Odin Software License can be found in LICENSE.TXT
- *
  */
 
-/*-------------------------------------------------------------*/
-/* INITERM.C -- Source for a custom dynamic link library       */
-/*              initialization and termination (_DLL_InitTerm) */
-/*              function.                                      */
-/*                                                             */
-/* When called to perform initialization, this sample function */
-/* gets storage for an array of integers, and initializes its  */
-/* elements with random integers.  At termination time, it     */
-/* frees the array.  Substitute your own special processing.   */
-/*-------------------------------------------------------------*/
-
-
-/* Include files */
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
@@ -36 +21 @@
 #include <initdll.h>
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD ole32os2_PEResTab;
-}
+// Win32 resource table (produced by wrc)
+extern DWORD ole32_PEResTab;
+
 static HMODULE dllHandle = 0;
 
 BOOL WINAPI OLE32_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad);
-//******************************************************************************
-//******************************************************************************
+
 BOOL WINAPI LibMainOLE32(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
@@ -60 +43 @@
    return FALSE;
 }
-/****************************************************************************/
-/* _DLL_InitTerm is the function that gets called by the operating system   */
-/* loader when it loads and frees this DLL for each process that accesses   */
-/* this DLL.  However, it only gets called the first time the DLL is loaded */
-/* and the last time it is freed for a particular process.  The system      */
-/* linkage convention MUST be used because the operating system loader is   */
-/* calling this function.                                                   */
-/****************************************************************************/
-ULONG APIENTRY inittermOle32(unsigned long hModule, unsigned long ulFlag)
+
+ULONG SYSTEM DLL_InitOle32(ULONG hModule)
 {
-   size_t i;
-   APIRET rc;
+    CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-   /*-------------------------------------------------------------------------*/
-   /* If ulFlag is zero then the DLL is being loaded so initialization should */
-   /* be performed.  If ulFlag is 1 then the DLL is being freed so            */
-   /* termination should be performed.                                        */
-   /*-------------------------------------------------------------------------*/
+    dllHandle = RegisterLxDll(hModule, LibMainOLE32, (PVOID)&ole32_PEResTab);
+    if (dllHandle == 0)
+           return -1;
 
-   switch (ulFlag) {
-      case 0 :
-      {
-         dllHandle = RegisterLxDll(hModule, LibMainOLE32, (PVOID)&ole32os2_PEResTab);
-         if(dllHandle == 0) 
-                return 0UL;
+    return 0;
+}
 
-         break;
-      }
-      case 1 :
-         if(dllHandle) {
-                UnregisterLxDll(dllHandle);
-         }
-         break;
+void SYSTEM DLL_TermOle32(ULONG hModule)
+{
+    if (dllHandle)
+       UnregisterLxDll(dllHandle);
+}
 
-      default  :
-         return 0UL;
-   }
+ULONG SYSTEM DLL_Init(ULONG hModule)
+{
+    if (DLL_InitDefault(hModule) == -1)
+        return -1;
+    return DLL_InitOle32(hModule);
+}
 
-   /***********************************************************/
-   /* A non-zero value must be returned to indicate success.  */
-   /***********************************************************/
-   return 1UL;
+void SYSTEM DLL_Term(ULONG hModule)
+{
+    DLL_TermOle32(hModule);
+    DLL_TermDefault(hModule);
 }
-//******************************************************************************
-//******************************************************************************

branches/gcc-kmk/src/ole32/itemmoniker.c ¶

@@ -357 +357 @@
     /* for more details see ItemMonikerImpl_Save coments */
 
-    pcbSize->s.LowPart =  sizeof(DWORD) + /* DWORD which contains delimiter length */
+    pcbSize->DUMMYSTRUCTNAME_DOT LowPart =  sizeof(DWORD) + /* DWORD which contains delimiter length */
                         delimiterLength + /* item delimiter string */
                         sizeof(DWORD) + /* DWORD which contains item name length */
@@ -363 +363 @@
                         34; /* this constant was added ! because when I tested this function it usually */
                             /*  returns 34 bytes more than the number of bytes used by IMoniker::Save function */
-    pcbSize->s.HighPart=0;
+    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
 
     return S_OK;

branches/gcc-kmk/src/ole32/memlockbytes.c ¶

@@ -234 +234 @@
      * Initialize the size of the array to the size of the handle.
      */
-    newLockBytes->byteArraySize.s.HighPart = 0;
-    newLockBytes->byteArraySize.s.LowPart  = GlobalSize(
+    newLockBytes->byteArraySize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newLockBytes->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart  = GlobalSize(
                                               newLockBytes->supportHandle);
   }
@@ -384 +384 @@
    * Make sure the offset is valid.
    */
-  if (ulOffset.s.LowPart > This->byteArraySize.s.LowPart)
+  if (ulOffset.DUMMYSTRUCTNAME_DOT LowPart > This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart)
     return E_FAIL;
 
@@ -391 +391 @@
    * to read.
    */
-  bytesToReadFromBuffer = min(This->byteArraySize.s.LowPart -
-                              ulOffset.s.LowPart, cb);
+  bytesToReadFromBuffer = min(This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart -
+                              ulOffset.DUMMYSTRUCTNAME_DOT LowPart, cb);
 
   /*
@@ -400 +400 @@
 
   memcpy(pv,
-         (char *) supportBuffer + ulOffset.s.LowPart,
+         (char *) supportBuffer + ulOffset.DUMMYSTRUCTNAME_DOT LowPart,
          bytesToReadFromBuffer);
 
@@ -459 +459 @@
   else
   {
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart = ulOffset.s.LowPart + cb;
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart = ulOffset.DUMMYSTRUCTNAME_DOT LowPart + cb;
   }
 
@@ -466 +466 @@
    * Verify if we need to grow the stream
    */
-  if (newSize.s.LowPart > This->byteArraySize.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart > This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart)
   {
     /* grow stream */
@@ -478 +478 @@
   supportBuffer = GlobalLock(This->supportHandle);
 
-  memcpy((char *) supportBuffer + ulOffset.s.LowPart, pv, cb);
+  memcpy((char *) supportBuffer + ulOffset.DUMMYSTRUCTNAME_DOT LowPart, pv, cb);
 
   /*
@@ -519 +519 @@
    * As documented.
    */
-  if (libNewSize.s.HighPart != 0)
+  if (libNewSize.DUMMYSTRUCTNAME_DOT HighPart != 0)
     return STG_E_INVALIDFUNCTION;
 
-  if (This->byteArraySize.s.LowPart == libNewSize.s.LowPart)
+  if (This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart == libNewSize.DUMMYSTRUCTNAME_DOT LowPart)
     return S_OK;
 
@@ -529 +529 @@
    */
   This->supportHandle = GlobalReAlloc(This->supportHandle,
-                                      libNewSize.s.LowPart,
+                                      libNewSize.DUMMYSTRUCTNAME_DOT LowPart,
                                       0);
 
@@ -535 +535 @@
     return STG_E_MEDIUMFULL;
 
-  This->byteArraySize.s.LowPart = libNewSize.s.LowPart;
+  This->byteArraySize.DUMMYSTRUCTNAME_DOT LowPart = libNewSize.DUMMYSTRUCTNAME_DOT LowPart;
 
   return S_OK;

branches/gcc-kmk/src/ole32/ole2.c ¶

@@ -1545 +1545 @@
     {
       if ( (pmedium->pUnkForRelease==0) &&
-           (pmedium->u.hGlobal!=0) )
-        GlobalFree(pmedium->u.hGlobal);
-
-      pmedium->u.hGlobal = 0;
+           (pmedium->DUMMYUNIONNAME_DOT hGlobal!=0) )
+        GlobalFree(pmedium->DUMMYUNIONNAME_DOT hGlobal);
+
+      pmedium->DUMMYUNIONNAME_DOT hGlobal = 0;
       break;
     }
     case TYMED_FILE:
     {
-      if (pmedium->u.lpszFileName!=0)
+      if (pmedium->DUMMYUNIONNAME_DOT lpszFileName!=0)
       {
         if (pmedium->pUnkForRelease==0)
         {
-          DeleteFileW(pmedium->u.lpszFileName);
+          DeleteFileW(pmedium->DUMMYUNIONNAME_DOT lpszFileName);
         }
 
-        CoTaskMemFree(pmedium->u.lpszFileName);
+        CoTaskMemFree(pmedium->DUMMYUNIONNAME_DOT lpszFileName);
       }
 
-      pmedium->u.lpszFileName = 0;
+      pmedium->DUMMYUNIONNAME_DOT lpszFileName = 0;
       break;
     }
     case TYMED_ISTREAM:
     {
-      if (pmedium->u.pstm!=0)
+      if (pmedium->DUMMYUNIONNAME_DOT pstm!=0)
       {
-        IStream_Release(pmedium->u.pstm);
+        IStream_Release(pmedium->DUMMYUNIONNAME_DOT pstm);
       }
 
-      pmedium->u.pstm = 0;
+      pmedium->DUMMYUNIONNAME_DOT pstm = 0;
       break;
     }
     case TYMED_ISTORAGE:
     {
-      if (pmedium->u.pstg!=0)
+      if (pmedium->DUMMYUNIONNAME_DOT pstg!=0)
       {
-        IStorage_Release(pmedium->u.pstg);
+        IStorage_Release(pmedium->DUMMYUNIONNAME_DOT pstg);
       }
 
-      pmedium->u.pstg = 0;
+      pmedium->DUMMYUNIONNAME_DOT pstg = 0;
       break;
     }
@@ -1589 +1589 @@
     {
       if ( (pmedium->pUnkForRelease==0) &&
-           (pmedium->u.hGlobal!=0) )
-        DeleteObject(pmedium->u.hGlobal);
-
-      pmedium->u.hGlobal = 0;
+           (pmedium->DUMMYUNIONNAME_DOT hGlobal!=0) )
+        DeleteObject(pmedium->DUMMYUNIONNAME_DOT hGlobal);
+
+      pmedium->DUMMYUNIONNAME_DOT hGlobal = 0;
       break;
     }
@@ -1598 +1598 @@
     {
       if ( (pmedium->pUnkForRelease==0) &&
-           (pmedium->u.hMetaFilePict!=0) )
+           (pmedium->DUMMYUNIONNAME_DOT hMetaFilePict!=0) )
       {
-        LPMETAFILEPICT pMP = GlobalLock(pmedium->u.hGlobal);
+        LPMETAFILEPICT pMP = GlobalLock(pmedium->DUMMYUNIONNAME_DOT hGlobal);
         DeleteMetaFile(pMP->hMF);
-        GlobalUnlock(pmedium->u.hGlobal);
-        GlobalFree(pmedium->u.hGlobal);
+        GlobalUnlock(pmedium->DUMMYUNIONNAME_DOT hGlobal);
+        GlobalFree(pmedium->DUMMYUNIONNAME_DOT hGlobal);
       }
 
-      pmedium->u.hMetaFilePict = 0;
+      pmedium->DUMMYUNIONNAME_DOT hMetaFilePict = 0;
       break;
     }
@@ -1612 +1612 @@
     {
       if ( (pmedium->pUnkForRelease==0) &&
-           (pmedium->u.hEnhMetaFile!=0) )
+           (pmedium->DUMMYUNIONNAME_DOT hEnhMetaFile!=0) )
       {
-        DeleteEnhMetaFile(pmedium->u.hEnhMetaFile);
+        DeleteEnhMetaFile(pmedium->DUMMYUNIONNAME_DOT hEnhMetaFile);
       }
 
-      pmedium->u.hEnhMetaFile = 0;
+      pmedium->DUMMYUNIONNAME_DOT hEnhMetaFile = 0;
       break;
     }
@@ -2946 +2946 @@
                  && (This->pFormatEtc[i].tymed == pformatetcIn->tymed))
             {
-            pmedium->u.hGlobal = This->pStgMedium[i].u.hGlobal;
+            pmedium->DUMMYUNIONNAME_DOT hGlobal = This->pStgMedium[i].DUMMYUNIONNAME_DOT hGlobal;
                 break;
             }
         }
-        if (pmedium->u.hGlobal)
+        if (pmedium->DUMMYUNIONNAME_DOT hGlobal)
         {
             pmedium->tymed = TYMED_HGLOBAL;
@@ -3265 +3265 @@
     fe.tymed    = TYMED_HGLOBAL;
 
-    medium.u.hGlobal      = hDrop;
+    medium.DUMMYUNIONNAME_DOT hGlobal      = hDrop;
     medium.tymed          = TYMED_HGLOBAL;
     medium.pUnkForRelease = NULL;
@@ -3419 +3419 @@
     LPVOID  lpData;
     DROPFILES *lpDrop;
-    LPSTR     *lpStringData;
+    LPSTR     lpStringData;
     ICOM_THIS(IDropTargetImpl,iface);
     DWORD   supportedformats[] = {CF_HDROP, CF_TEXT};
@@ -3463 +3463 @@
             continue;
         }
-        size = GlobalSize(This->medium.u.hGlobal);
+        size = GlobalSize(This->medium.DUMMYUNIONNAME_DOT hGlobal);
         if(size == 0) {
-            dprintf(("GlobalSize failed for %x", This->medium.u.hGlobal));
+            dprintf(("GlobalSize failed for %x", This->medium.DUMMYUNIONNAME_DOT hGlobal));
             ReleaseStgMedium(&This->medium);
             return E_OUTOFMEMORY;
         }
-        dprintf(("handle %x size %d, format %x tymed %x", This->medium.u.hGlobal, size, This->format.cfFormat, This->format.tymed));
+        dprintf(("handle %x size %d, format %x tymed %x", This->medium.DUMMYUNIONNAME_DOT hGlobal, size, This->format.cfFormat, This->format.tymed));
 
         if(size == 1) {//empty string; use previous data
@@ -3477 +3477 @@
                  return E_OUTOFMEMORY;
              }
-             This->medium.u.hGlobal = This->hDndData;
+             This->medium.DUMMYUNIONNAME_DOT hGlobal = This->hDndData;
 
              dprintf(("Reuse old global handle %x", This->hDndData));
-             size = GlobalSize(This->medium.u.hGlobal);
+             size = GlobalSize(This->medium.DUMMYUNIONNAME_DOT hGlobal);
              if(size == 0) {
-                 dprintf(("GlobalSize failed for %x", This->medium.u.hGlobal));
+                 dprintf(("GlobalSize failed for %x", This->medium.DUMMYUNIONNAME_DOT hGlobal));
                  ReleaseStgMedium(&This->medium);
                  return E_OUTOFMEMORY;
              }
-             dprintf(("handle %x size %d, format %x tymed %x", This->medium.u.hGlobal, size, This->format.cfFormat, This->format.tymed));
+             dprintf(("handle %x size %d, format %x tymed %x", This->medium.DUMMYUNIONNAME_DOT hGlobal, size, This->format.cfFormat, This->format.tymed));
         }
-        else This->hDndData = This->medium.u.hGlobal;
+        else This->hDndData = This->medium.DUMMYUNIONNAME_DOT hGlobal;
 
         This->lpDnDData = (LPVOID)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
@@ -3500 +3500 @@
             return E_OUTOFMEMORY;
         }
-        lpData = GlobalLock(This->medium.u.hGlobal);
+        lpData = GlobalLock(This->medium.DUMMYUNIONNAME_DOT hGlobal);
 
         if(This->format.cfFormat == CF_HDROP) {
@@ -3521 +3521 @@
         }
         dprintf(("Drop string %s", This->lpOS2StringData));
-        GlobalUnlock(This->medium.u.hGlobal);
+        GlobalUnlock(This->medium.DUMMYUNIONNAME_DOT hGlobal);
 
         This->pt = pt;

branches/gcc-kmk/src/ole32/ole2impl.c ¶

@@ -132 +132 @@
           /* Create ILock bytes */
 
-          hr1 = CreateILockBytesOnHGlobal(std.u.hGlobal, FALSE, &ptrILockBytes);
+          hr1 = CreateILockBytesOnHGlobal(std.DUMMYUNIONNAME_DOT hGlobal, FALSE, &ptrILockBytes);
 
           /* Open storage on the ILock bytes */

branches/gcc-kmk/src/ole32/ole32.def ¶

@@ -5 +5 @@
 
 EXPORTS
-    BindMoniker                = _BindMoniker@16             @1
-    CLSIDFromProgID            = _CLSIDFromProgID@8          @2
-    CLSIDFromString            = _CLSIDFromString@8          @3
-    CoBuildVersion             = _CoBuildVersion@0           @4
-    CoCreateFreeThreadedMarshaler  = _CoCreateFreeThreadedMarshaler@8  @5
-    CoCreateGuid               = _CoCreateGuid@4             @6
-    CoCreateInstance           = _CoCreateInstance@20        @7
-    CoDisconnectObject         = _CoDisconnectObject@8       @8
-    CoDosDateTimeToFileTime    = _CoDosDateTimeToFileTime@12 @9
-    CoFileTimeNow              = _CoFileTimeNow@4            @10
-    CoFileTimeToDosDateTime    = _CoFileTimeToDosDateTime@12 @11
-    CoFreeAllLibraries         = _CoFreeAllLibraries@0       @12
-    CoFreeLibrary              = _CoFreeLibrary@4            @13
-    CoFreeUnusedLibraries      = _CoFreeUnusedLibraries@0    @14
-    CoGetCallerTID             = _CoGetCallerTID@0           @15
-    CoGetClassObject           = _CoGetClassObject@20        @16
-    CoGetCurrentLogicalThreadId  = _CoGetCurrentLogicalThreadId@0  @17
-    CoGetCurrentProcess        = _CoGetCurrentProcess@0      @18
-    CoGetInterfaceAndReleaseStream  = _CoGetInterfaceAndReleaseStream@12 @19
-    CoGetMalloc                = _CoGetMalloc@8              @20
-    CoGetMarshalSizeMax        = _CoGetMarshalSizeMax@24     @21
-    CoGetPSClsid               = _CoGetPSClsid@8             @22
-    CoGetStandardMarshal       = _CoGetStandardMarshal@24    @23
-    CoGetState                 = _CoGetState@0               @24
-    CoGetTreatAsClass          = _CoGetTreatAsClass@8        @25
-    CoInitialize               = _CoInitialize@4             @26
-    CoInitializeWOW            = _CoInitializeWOW@8          @27
-    CoIsHandlerConnected       = _CoIsHandlerConnected@4     @28
-    CoIsOle1Class              = _CoIsOle1Class@4            @29
-    CoLoadLibrary              = _CoLoadLibrary@8            @30
-    CoLockObjectExternal       = _CoLockObjectExternal@12    @31
-    CoMarshalHresult           = _CoMarshalHresult@8         @32
-    CoMarshalInterThreadInterfaceInStream  = _CoMarshalInterThreadInterfaceInStream@12 @33
-    CoMarshalInterface         = _CoMarshalInterface@24      @34
-    CoQueryReleaseObject       = _CoQueryReleaseObject@0     @35
-    CoRegisterClassObject      = _CoRegisterClassObject@20   @36
-    CoRegisterMallocSpy        = _CoRegisterMallocSpy@4      @37
-    CoRegisterMessageFilter    = _CoRegisterMessageFilter@8  @38
-    CoReleaseMarshalData       = _CoReleaseMarshalData@4     @39
-    CoRevokeClassObject        = _CoRevokeClassObject@4      @40
-    CoRevokeMallocSpy          = _CoRevokeMallocSpy@0        @41
-    CoSetState                 = _CoSetState@4               @42
-    CoTaskMemAlloc             = _CoTaskMemAlloc@4           @43
-    CoTaskMemFree              = _CoTaskMemFree@4            @44
-    CoTaskMemRealloc           = _CoTaskMemRealloc@8         @45
-    CoTreatAsClass             = _CoTreatAsClass@8           @46
-    CoUninitialize             = _CoUninitialize@0           @47
-    CoUnloadingWOW             = _CoUnloadingWOW@0           @48
-    CoUnmarshalHresult         = _CoUnmarshalHresult@8       @49
-    CoUnmarshalInterface       = _CoUnmarshalInterface@12    @50
-    CreateAntiMoniker          = _CreateAntiMoniker@4        @51
-    CreateBindCtx              = _CreateBindCtx@8            @52
-    CreateDataAdviseHolder     = _CreateDataAdviseHolder@4   @53
-    CreateDataCache            = _CreateDataCache@16         @54
-    CreateFileMoniker          = _CreateFileMoniker@8        @55
-    CreateGenericComposite     = _CreateGenericComposite@12  @56
-    CreateILockBytesOnHGlobal  = _CreateILockBytesOnHGlobal@12 @57
-    CreateItemMoniker          = _CreateItemMoniker@12       @58
-    CreateOleAdviseHolder      = _CreateOleAdviseHolder@4    @59
-    CreatePointerMoniker       = _CreatePointerMoniker@8     @60
-    CreateStreamOnHGlobal      = _CreateStreamOnHGlobal@12   @61
-    DllDebugObjectRPCHook      = _DllDebugObjectRPCHook@0    @62
-    DllGetClassObject          = _OLE32_DllGetClassObject@12       @63
-    DllGetClassObjectWOW       = _DllGetClassObjectWOW@0     @64
-    DoDragDrop                 = _DoDragDrop@16              @65
-    EnableHookObject           = _EnableHookObject@0         @66
-    GetClassFile               = _GetClassFile@8             @67
-    GetConvertStg              = _GetConvertStg@4            @68
-    GetDocumentBitStg          = _GetDocumentBitStg@0        @69
-    GetHGlobalFromILockBytes   = _GetHGlobalFromILockBytes@8  @70
-    GetHGlobalFromStream       = _GetHGlobalFromStream@8     @71
-    GetHookInterface           = _GetHookInterface@0         @72
-    GetRunningObjectTable      = _GetRunningObjectTable@8    @73
-    IIDFromString              = _CLSIDFromString@8          @74
-    IsAccelerator              = _IsAccelerator@16           @75
-    IsEqualGUID                = _IsEqualGUID@8              @76
-    IsValidIid                 = _IsValidIid@4               @77
-    IsValidInterface           = _IsValidInterface@4         @78
-    IsValidPtrIn               = _IsValidPtrIn@4             @79
-    IsValidPtrOut              = _IsValidPtrOut@4            @80
-    MkParseDisplayName         = _MkParseDisplayName@16      @81
-    MonikerCommonPrefixWith    = _MonikerCommonPrefixWith@12 @82
-    MonikerRelativePathTo      = _MonikerRelativePathTo@16   @83
-    OleBuildVersion            = _OleBuildVersion@0          @84
-    OleConvertIStorageToOLESTREAM  = _OleConvertIStorageToOLESTREAM@8  @85
-    OleConvertIStorageToOLESTREAMEx  = _OleConvertIStorageToOLESTREAMEx@28 @86
-    OleConvertOLESTREAMToIStorage  = _OleConvertOLESTREAMToIStorage@12 @87
-    OleConvertOLESTREAMToIStorageEx  = _OleConvertOLESTREAMToIStorageEx@28 @88
-    OleCreate                  = _OleCreate@28               @89
-    OleCreateDefaultHandler    = _OleCreateDefaultHandler@16 @90
-    OleCreateEmbeddingHelper   = _OleCreateEmbeddingHelper@24 @91
-    OleCreateFromData          = _OleCreateFromData@28       @92
-    OleCreateFromFile          = _OleCreateFromFile@32       @93
-    OleCreateLink              = _OleCreateLink@28           @94
-    OleCreateLinkFromData      = _OleCreateLinkFromData@28   @95
-    OleCreateLinkToFile        = _OleCreateLinkToFile@28     @96
-    OleCreateMenuDescriptor    = _OleCreateMenuDescriptor@8  @97
-    OleCreateStaticFromData    = _OleCreateStaticFromData@28 @98
-    OleDestroyMenuDescriptor   = _OleDestroyMenuDescriptor@4  @99
-    OleDoAutoConvert           = _OleDoAutoConvert@8         @100
-    OleDraw                    = _OleDraw@16                 @101
-    OleDuplicateData           = _OleDuplicateData@12        @102
-    OleFlushClipboard          = _OleFlushClipboard@0        @103
-    OleGetAutoConvert          = _OleGetAutoConvert@8        @104
-    OleGetClipboard            = _OleGetClipboard@4          @105
-    OleGetIconOfClass          = _OleGetIconOfClass@12       @106
-    OleGetIconOfFile           = _OleGetIconOfFile@8         @107
-    OleInitialize              = _OleInitialize@4            @108
-    OleInitializeWOW           = _OleInitializeWOW@0         @109
-    OleIsCurrentClipboard      = _OleIsCurrentClipboard@4    @110
-    OleIsRunning               = _OleIsRunning@4             @111
-    OleLoad                    = _OleLoad@16                 @112
-    OleLoadFromStream          = _OleLoadFromStream@12       @113
-    OleLockRunning             = _OleLockRunning@12          @114
-    OleMetafilePictFromIconAndLabel  = _OleMetafilePictFromIconAndLabel@16 @115
-    OleNoteObjectVisible       = _OleNoteObjectVisible@8     @116
-    OleQueryCreateFromData     = _OleQueryCreateFromData@4   @117
-    OleQueryLinkFromData       = _OleQueryLinkFromData@4     @118
-    OleRegEnumFormatEtc        = _OleRegEnumFormatEtc@12     @119
-    OleRegEnumVerbs            = _OleRegEnumVerbs@8          @120
-    OleRegGetMiscStatus        = _OleRegGetMiscStatus@12     @121
-    OleRegGetUserType          = _OleRegGetUserType@12       @122
-    OleRun                     = _OleRun@4                   @123
-    OleSave                    = _OleSave@12                 @124
-    OleSaveToStream            = _OleSaveToStream@8          @125
-    OleSetAutoConvert          = _OleSetAutoConvert@8        @126
-    OleSetClipboard            = _OleSetClipboard@4          @127
-    OleSetContainedObject      = _OleSetContainedObject@8    @128
-    OleSetMenuDescriptor       = _OleSetMenuDescriptor@20    @129
-    OleTranslateAccelerator    = _OleTranslateAccelerator@12 @130
-    OleUninitialize            = _OleUninitialize@0          @131
-    OpenOrCreateStream         = _OpenOrCreateStream@0       @132
-    ProgIDFromCLSID            = _ProgIDFromCLSID@8          @133
-    ReadClassStg               = _ReadClassStg@8             @134
-    ReadClassStm               = _ReadClassStm@8             @135
-    ReadFmtUserTypeStg         = _ReadFmtUserTypeStg@12      @136
-    ReadOleStg                 = _ReadOleStg@0               @137
-    ReadStringStream           = _ReadStringStream@0         @138
-    RegisterDragDrop           = _RegisterDragDrop@8         @139
-    ReleaseStgMedium           = _ReleaseStgMedium@4         @140
-    RevokeDragDrop             = _RevokeDragDrop@4           @141
-    SetConvertStg              = _SetConvertStg@8            @142
-    SetDocumentBitStg          = _SetDocumentBitStg@0        @143
-    StgCreateDocfile           = _StgCreateDocfile@16        @144
-    StgCreateDocfileOnILockBytes  = _StgCreateDocfileOnILockBytes@16 @145
-    StgIsStorageFile           = _StgIsStorageFile@4         @146
-    StgIsStorageILockBytes     = _StgIsStorageILockBytes@4   @147
-    StgOpenStorage             = _StgOpenStorage@24           @148
-    StgOpenStorageOnILockBytes  = _StgOpenStorageOnILockBytes@24 @149
-    StgSetTimes                = _StgSetTimes@16             @150
-    StringFromCLSID            = _StringFromCLSID@8          @151
-    StringFromGUID2            = _StringFromGUID2@12         @152
-    StringFromIID              = _StringFromCLSID@8          @153
-    UtConvertDvtd16toDvtd32    = _UtConvertDvtd16toDvtd32@0  @154
-    UtConvertDvtd32toDvtd16    = _UtConvertDvtd32toDvtd16@0  @155
-    UtGetDvtd16Info            = _UtGetDvtd16Info@0          @156
-    UtGetDvtd32Info            = _UtGetDvtd32Info@0          @157
-    WriteClassStg              = _WriteClassStg@8            @158
-    WriteClassStm              = _WriteClassStm@8            @159
-    WriteFmtUserTypeStg        = _WriteFmtUserTypeStg@12     @160
-    WriteOleStg                = _WriteOleStg@0              @161
-    WriteStringStream          = _WriteStringStream@0        @162
-    CoInitializeEx             = _CoInitializeEx@8           @163
-    CoInitializeSecurity       = _CoInitializeSecurity@36    @164
-    CoCreateInstanceEx         = _CoCreateInstanceEx@24      @165
-    PropVariantClear           = _PropVariantClear@4         @166
+    BindMoniker                = "_BindMoniker@16"           @1
+    CLSIDFromProgID            = "_CLSIDFromProgID@8"        @2
+    CLSIDFromString            = "_CLSIDFromString@8"        @3
+    CoBuildVersion             = "_CoBuildVersion@0"         @4
+    CoCreateFreeThreadedMarshaler  = "_CoCreateFreeThreadedMarshaler@8"  @5
+    CoCreateGuid               = "_CoCreateGuid@4"           @6
+    CoCreateInstance           = "_CoCreateInstance@20"      @7
+    CoDisconnectObject         = "_CoDisconnectObject@8"     @8
+    CoDosDateTimeToFileTime    = "_CoDosDateTimeToFileTime@12" @9
+    CoFileTimeNow              = "_CoFileTimeNow@4"          @10
+    CoFileTimeToDosDateTime    = "_CoFileTimeToDosDateTime@12" @11
+    CoFreeAllLibraries         = "_CoFreeAllLibraries@0"     @12
+    CoFreeLibrary              = "_CoFreeLibrary@4"          @13
+    CoFreeUnusedLibraries      = "_CoFreeUnusedLibraries@0"  @14
+    CoGetCallerTID             = "_CoGetCallerTID@0"         @15
+    CoGetClassObject           = "_CoGetClassObject@20"      @16
+    CoGetCurrentLogicalThreadId  = "_CoGetCurrentLogicalThreadId@0"  @17
+    CoGetCurrentProcess        = "_CoGetCurrentProcess@0"    @18
+    CoGetInterfaceAndReleaseStream  = "_CoGetInterfaceAndReleaseStream@12" @19
+    CoGetMalloc                = "_CoGetMalloc@8"            @20
+    CoGetMarshalSizeMax        = "_CoGetMarshalSizeMax@24"   @21
+    CoGetPSClsid               = "_CoGetPSClsid@8"           @22
+    CoGetStandardMarshal       = "_CoGetStandardMarshal@24"  @23
+    CoGetState                 = "_CoGetState@0"             @24
+    CoGetTreatAsClass          = "_CoGetTreatAsClass@8"      @25
+    CoInitialize               = "_CoInitialize@4"           @26
+    CoInitializeWOW            = "_CoInitializeWOW@8"        @27
+    CoIsHandlerConnected       = "_CoIsHandlerConnected@4"   @28
+    CoIsOle1Class              = "_CoIsOle1Class@4"          @29
+    CoLoadLibrary              = "_CoLoadLibrary@8"          @30
+    CoLockObjectExternal       = "_CoLockObjectExternal@12"  @31
+    CoMarshalHresult           = "_CoMarshalHresult@8"       @32
+    CoMarshalInterThreadInterfaceInStream  = "_CoMarshalInterThreadInterfaceInStream@12" @33
+    CoMarshalInterface         = "_CoMarshalInterface@24"    @34
+    CoQueryReleaseObject       = "_CoQueryReleaseObject@0"   @35
+    CoRegisterClassObject      = "_CoRegisterClassObject@20" @36
+    CoRegisterMallocSpy        = "_CoRegisterMallocSpy@4"    @37
+    CoRegisterMessageFilter    = "_CoRegisterMessageFilter@8"  @38
+    CoReleaseMarshalData       = "_CoReleaseMarshalData@4"   @39
+    CoRevokeClassObject        = "_CoRevokeClassObject@4"    @40
+    CoRevokeMallocSpy          = "_CoRevokeMallocSpy@0"      @41
+    CoSetState                 = "_CoSetState@4"             @42
+    CoTaskMemAlloc             = "_CoTaskMemAlloc@4"         @43
+    CoTaskMemFree              = "_CoTaskMemFree@4"          @44
+    CoTaskMemRealloc           = "_CoTaskMemRealloc@8"       @45
+    CoTreatAsClass             = "_CoTreatAsClass@8"         @46
+    CoUninitialize             = "_CoUninitialize@0"         @47
+    CoUnloadingWOW             = "_CoUnloadingWOW@0"         @48
+    CoUnmarshalHresult         = "_CoUnmarshalHresult@8"     @49
+    CoUnmarshalInterface       = "_CoUnmarshalInterface@12"  @50
+    CreateAntiMoniker          = "_CreateAntiMoniker@4"      @51
+    CreateBindCtx              = "_CreateBindCtx@8"          @52
+    CreateDataAdviseHolder     = "_CreateDataAdviseHolder@4" @53
+    CreateDataCache            = "_CreateDataCache@16"       @54
+    CreateFileMoniker          = "_CreateFileMoniker@8"      @55
+    CreateGenericComposite     = "_CreateGenericComposite@12"  @56
+    CreateILockBytesOnHGlobal  = "_CreateILockBytesOnHGlobal@12" @57
+    CreateItemMoniker          = "_CreateItemMoniker@12"     @58
+    CreateOleAdviseHolder      = "_CreateOleAdviseHolder@4"  @59
+    CreatePointerMoniker       = "_CreatePointerMoniker@8"   @60
+    CreateStreamOnHGlobal      = "_CreateStreamOnHGlobal@12" @61
+    DllDebugObjectRPCHook      = "_DllDebugObjectRPCHook@0"  @62
+    DllGetClassObject          = "_OLE32_DllGetClassObject@12"     @63
+    DllGetClassObjectWOW       = "_DllGetClassObjectWOW@0"   @64
+    DoDragDrop                 = "_DoDragDrop@16"            @65
+    EnableHookObject           = "_EnableHookObject@0"       @66
+    GetClassFile               = "_GetClassFile@8"           @67
+    GetConvertStg              = "_GetConvertStg@4"          @68
+    GetDocumentBitStg          = "_GetDocumentBitStg@0"      @69
+    GetHGlobalFromILockBytes   = "_GetHGlobalFromILockBytes@8"  @70
+    GetHGlobalFromStream       = "_GetHGlobalFromStream@8"   @71
+    GetHookInterface           = "_GetHookInterface@0"       @72
+    GetRunningObjectTable      = "_GetRunningObjectTable@8"  @73
+    IIDFromString              = "_CLSIDFromString@8"        @74
+    IsAccelerator              = "_IsAccelerator@16"         @75
+    IsEqualGUID                = "_IsEqualGUID@8"            @76
+    IsValidIid                 = "_IsValidIid@4"             @77
+    IsValidInterface           = "_IsValidInterface@4"       @78
+    IsValidPtrIn               = "_IsValidPtrIn@4"           @79
+    IsValidPtrOut              = "_IsValidPtrOut@4"          @80
+    MkParseDisplayName         = "_MkParseDisplayName@16"    @81
+    MonikerCommonPrefixWith    = "_MonikerCommonPrefixWith@12" @82
+    MonikerRelativePathTo      = "_MonikerRelativePathTo@16" @83
+    OleBuildVersion            = "_OleBuildVersion@0"        @84
+    OleConvertIStorageToOLESTREAM  = "_OleConvertIStorageToOLESTREAM@8"  @85
+    OleConvertIStorageToOLESTREAMEx  = "_OleConvertIStorageToOLESTREAMEx@28" @86
+    OleConvertOLESTREAMToIStorage  = "_OleConvertOLESTREAMToIStorage@12" @87
+    OleConvertOLESTREAMToIStorageEx  = "_OleConvertOLESTREAMToIStorageEx@28" @88
+    OleCreate                  = "_OleCreate@28"             @89
+    OleCreateDefaultHandler    = "_OleCreateDefaultHandler@16" @90
+    OleCreateEmbeddingHelper   = "_OleCreateEmbeddingHelper@24" @91
+    OleCreateFromData          = "_OleCreateFromData@28"     @92
+    OleCreateFromFile          = "_OleCreateFromFile@32"     @93
+    OleCreateLink              = "_OleCreateLink@28"         @94
+    OleCreateLinkFromData      = "_OleCreateLinkFromData@28" @95
+    OleCreateLinkToFile        = "_OleCreateLinkToFile@28"   @96
+    OleCreateMenuDescriptor    = "_OleCreateMenuDescriptor@8"  @97
+    OleCreateStaticFromData    = "_OleCreateStaticFromData@28" @98
+    OleDestroyMenuDescriptor   = "_OleDestroyMenuDescriptor@4"  @99
+    OleDoAutoConvert           = "_OleDoAutoConvert@8"       @100
+    OleDraw                    = "_OleDraw@16"               @101
+    OleDuplicateData           = "_OleDuplicateData@12"      @102
+    OleFlushClipboard          = "_OleFlushClipboard@0"      @103
+    OleGetAutoConvert          = "_OleGetAutoConvert@8"      @104
+    OleGetClipboard            = "_OleGetClipboard@4"        @105
+    OleGetIconOfClass          = "_OleGetIconOfClass@12"     @106
+    OleGetIconOfFile           = "_OleGetIconOfFile@8"       @107
+    OleInitialize              = "_OleInitialize@4"          @108
+    OleInitializeWOW           = "_OleInitializeWOW@0"       @109
+    OleIsCurrentClipboard      = "_OleIsCurrentClipboard@4"  @110
+    OleIsRunning               = "_OleIsRunning@4"           @111
+    OleLoad                    = "_OleLoad@16"               @112
+    OleLoadFromStream          = "_OleLoadFromStream@12"     @113
+    OleLockRunning             = "_OleLockRunning@12"        @114
+    OleMetafilePictFromIconAndLabel  = "_OleMetafilePictFromIconAndLabel@16" @115
+    OleNoteObjectVisible       = "_OleNoteObjectVisible@8"   @116
+    OleQueryCreateFromData     = "_OleQueryCreateFromData@4" @117
+    OleQueryLinkFromData       = "_OleQueryLinkFromData@4"   @118
+    OleRegEnumFormatEtc        = "_OleRegEnumFormatEtc@12"   @119
+    OleRegEnumVerbs            = "_OleRegEnumVerbs@8"        @120
+    OleRegGetMiscStatus        = "_OleRegGetMiscStatus@12"   @121
+    OleRegGetUserType          = "_OleRegGetUserType@12"     @122
+    OleRun                     = "_OleRun@4"                 @123
+    OleSave                    = "_OleSave@12"               @124
+    OleSaveToStream            = "_OleSaveToStream@8"        @125
+    OleSetAutoConvert          = "_OleSetAutoConvert@8"      @126
+    OleSetClipboard            = "_OleSetClipboard@4"        @127
+    OleSetContainedObject      = "_OleSetContainedObject@8"  @128
+    OleSetMenuDescriptor       = "_OleSetMenuDescriptor@20"  @129
+    OleTranslateAccelerator    = "_OleTranslateAccelerator@12" @130
+    OleUninitialize            = "_OleUninitialize@0"        @131
+    OpenOrCreateStream         = "_OpenOrCreateStream@0"     @132
+    ProgIDFromCLSID            = "_ProgIDFromCLSID@8"        @133
+    ReadClassStg               = "_ReadClassStg@8"           @134
+    ReadClassStm               = "_ReadClassStm@8"           @135
+    ReadFmtUserTypeStg         = "_ReadFmtUserTypeStg@12"    @136
+    ReadOleStg                 = "_ReadOleStg@0"             @137
+    ReadStringStream           = "_ReadStringStream@0"       @138
+    RegisterDragDrop           = "_RegisterDragDrop@8"       @139
+    ReleaseStgMedium           = "_ReleaseStgMedium@4"       @140
+    RevokeDragDrop             = "_RevokeDragDrop@4"         @141
+    SetConvertStg              = "_SetConvertStg@8"          @142
+    SetDocumentBitStg          = "_SetDocumentBitStg@0"      @143
+    StgCreateDocfile           = "_StgCreateDocfile@16"      @144
+    StgCreateDocfileOnILockBytes  = "_StgCreateDocfileOnILockBytes@16" @145
+    StgIsStorageFile           = "_StgIsStorageFile@4"       @146
+    StgIsStorageILockBytes     = "_StgIsStorageILockBytes@4" @147
+    StgOpenStorage             = "_StgOpenStorage@24"         @148
+    StgOpenStorageOnILockBytes  = "_StgOpenStorageOnILockBytes@24" @149
+    StgSetTimes                = "_StgSetTimes@16"           @150
+    StringFromCLSID            = "_StringFromCLSID@8"        @151
+    StringFromGUID2            = "_StringFromGUID2@12"       @152
+    StringFromIID              = "_StringFromCLSID@8"        @153
+    UtConvertDvtd16toDvtd32    = "_UtConvertDvtd16toDvtd32@0"  @154
+    UtConvertDvtd32toDvtd16    = "_UtConvertDvtd32toDvtd16@0"  @155
+    UtGetDvtd16Info            = "_UtGetDvtd16Info@0"        @156
+    UtGetDvtd32Info            = "_UtGetDvtd32Info@0"        @157
+    WriteClassStg              = "_WriteClassStg@8"          @158
+    WriteClassStm              = "_WriteClassStm@8"          @159
+    WriteFmtUserTypeStg        = "_WriteFmtUserTypeStg@12"   @160
+    WriteOleStg                = "_WriteOleStg@0"            @161
+    WriteStringStream          = "_WriteStringStream@0"      @162
+    CoInitializeEx             = "_CoInitializeEx@8"         @163
+    CoInitializeSecurity       = "_CoInitializeSecurity@36"  @164
+    CoCreateInstanceEx         = "_CoCreateInstanceEx@24"    @165
+    PropVariantClear           = "_PropVariantClear@4"       @166
 ;167 stub CoCopyProxy                # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
 ;168 stub CoGetCallContext           # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
@@ -177 +177 @@
 ;171 stub CoRegisterPSClsid          # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
 ;172 stub CoReleaseServerProcess     # stdcall () return 0,ERR_NOTIMPLEMENTED
-    CoResumeClassObjects       = _CoResumeClassObjects@0     @173
+    CoResumeClassObjects       = "_CoResumeClassObjects@0"   @173
 ;174 stub CoRevertToSelf             # stdcall () return 0,ERR_NOTIMPLEMENTED
 ;175 stub CoSetProxyBlanket          # stdcall (ptr long long wstr long long ptr long) return 0,ERR_NOTIMPLEMENTED
@@ -196 +196 @@
 ;190 stub CoRegisterSurrogate
 ;191 stub CoSwitchCallContext
-    CreateErrorInfo            = _CreateErrorInfo@4          @192
+    CreateErrorInfo            = "_CreateErrorInfo@4"        @192
 ;193 stub CreateObjrefMoniker
-    DllRegisterServer          = _OLE32_DllRegisterServer@0  @194
-    FreePropVariantArray       = _FreePropVariantArray@8     @195
-    GetErrorInfo               = _GetErrorInfo@8             @196
-
-    PropVariantCopy            = _PropVariantCopy@8          @246
-
-    SetErrorInfo               = _SetErrorInfo@8             @255
-
-    CoImpersonateClient        = _CoImpersonateClient@0      @997   ; suppress warning
-    CoInitializeSecurity       = _CoInitializeSecurity@36    @998   ; suppress warning
-    CoRegisterSurrogate        = _CoRegisterSurrogate@4      @999   ; suppress warning
+    DllRegisterServer          = "_OLE32_DllRegisterServer@0"  @194
+    FreePropVariantArray       = "_FreePropVariantArray@8"   @195
+    GetErrorInfo               = "_GetErrorInfo@8"           @196
+
+    PropVariantCopy            = "_PropVariantCopy@8"        @246
+
+    SetErrorInfo               = "_SetErrorInfo@8"           @255
+
+    CoImpersonateClient        = "_CoImpersonateClient@0"    @997   ; suppress warning
+    CoInitializeSecurity_998   = "_CoInitializeSecurity@36"  @998   ; suppress warning
+    CoRegisterSurrogate        = "_CoRegisterSurrogate@4"    @999   ; suppress warning
 
 ;
 ;   Helper Functions
 ;
-    WINE_StringFromCLSID       = _WINE_StringFromCLSID@8     @1000
-    CLSIDFromStringA           = _CLSIDFromStringA@8         @1001
-    CLSIDFromString16          = _CLSIDFromString16@8        @1002  ; COMPOBJ.19
+    WINE_StringFromCLSID       = "_WINE_StringFromCLSID@8"   @1000
+    CLSIDFromStringA           = "_CLSIDFromStringA@8"       @1001
+    CLSIDFromString16          = "_CLSIDFromString16@8"      @1002  ; COMPOBJ.19
 
 ; private functions for drag and drop (used by user32\dragdrop.cpp)
-    OLEDD_AcceptsDragDrop      = _OLEDD_AcceptsDragDrop@4    @1010
-    OLEDD_DropFiles            = _OLEDD_DropFiles@4          @1011
-    OLEDD_DragOver             = _OLEDD_DragOver@8           @1012
-    OLEDD_DragEnter            = _OLEDD_DragEnter@12         @1013
-    OLEDD_DragLeave            = _OLEDD_DragLeave@4          @1014
+    OLEDD_AcceptsDragDrop      = "_OLEDD_AcceptsDragDrop@4"  @1010
+    OLEDD_DropFiles            = "_OLEDD_DropFiles@4"        @1011
+    OLEDD_DragOver             = "_OLEDD_DragOver@8"         @1012
+    OLEDD_DragEnter            = "_OLEDD_DragEnter@12"       @1013
+    OLEDD_DragLeave            = "_OLEDD_DragLeave@4"        @1014

branches/gcc-kmk/src/ole32/ole32dbg.def ¶

@@ -5 +5 @@
 
 EXPORTS
-    BindMoniker                = _DbgBindMoniker@16             @1
-    CLSIDFromProgID            = _DbgCLSIDFromProgID@8          @2
-    CLSIDFromString            = _DbgCLSIDFromString@8          @3
-    CoBuildVersion             = _DbgCoBuildVersion@0           @4
-    CoCreateFreeThreadedMarshaler  = _DbgCoCreateFreeThreadedMarshaler@8  @5
-    CoCreateGuid               = _DbgCoCreateGuid@4             @6
-    CoCreateInstance           = _DbgCoCreateInstance@20        @7
-    CoDisconnectObject         = _DbgCoDisconnectObject@8       @8
-    CoDosDateTimeToFileTime    = _DbgCoDosDateTimeToFileTime@12 @9
-    CoFileTimeNow              = _DbgCoFileTimeNow@4            @10
-    CoFileTimeToDosDateTime    = _DbgCoFileTimeToDosDateTime@12 @11
-    CoFreeAllLibraries         = _DbgCoFreeAllLibraries@0       @12
-    CoFreeLibrary              = _DbgCoFreeLibrary@4            @13
-    CoFreeUnusedLibraries      = _DbgCoFreeUnusedLibraries@0    @14
-    CoGetCallerTID             = _DbgCoGetCallerTID@0           @15
-    CoGetClassObject           = _DbgCoGetClassObject@20        @16
-    CoGetCurrentLogicalThreadId  = _DbgCoGetCurrentLogicalThreadId@0  @17
-    CoGetCurrentProcess        = _DbgCoGetCurrentProcess@0      @18
-    CoGetInterfaceAndReleaseStream  = _DbgCoGetInterfaceAndReleaseStream@12 @19
-    CoGetMalloc                = _DbgCoGetMalloc@8              @20
-    CoGetMarshalSizeMax        = _DbgCoGetMarshalSizeMax@24     @21
-    CoGetPSClsid               = _DbgCoGetPSClsid@8             @22
-    CoGetStandardMarshal       = _DbgCoGetStandardMarshal@24    @23
-    CoGetState                 = _DbgCoGetState@0               @24
-    CoGetTreatAsClass          = _DbgCoGetTreatAsClass@8        @25
-    CoInitialize               = _DbgCoInitialize@4             @26
-    CoInitializeWOW            = _DbgCoInitializeWOW@8          @27
-    CoIsHandlerConnected       = _DbgCoIsHandlerConnected@4     @28
-    CoIsOle1Class              = _DbgCoIsOle1Class@4            @29
-    CoLoadLibrary              = _DbgCoLoadLibrary@8            @30
-    CoLockObjectExternal       = _DbgCoLockObjectExternal@12    @31
-    CoMarshalHresult           = _DbgCoMarshalHresult@8         @32
-    CoMarshalInterThreadInterfaceInStream  = _DbgCoMarshalInterThreadInterfaceInStream@12 @33
-    CoMarshalInterface         = _DbgCoMarshalInterface@24      @34
-    CoQueryReleaseObject       = _DbgCoQueryReleaseObject@0     @35
-    CoRegisterClassObject      = _DbgCoRegisterClassObject@20   @36
-    CoRegisterMallocSpy        = _DbgCoRegisterMallocSpy@4      @37
-    CoRegisterMessageFilter    = _DbgCoRegisterMessageFilter@8  @38
-    CoReleaseMarshalData       = _DbgCoReleaseMarshalData@4     @39
-    CoRevokeClassObject        = _DbgCoRevokeClassObject@4      @40
-    CoRevokeMallocSpy          = _DbgCoRevokeMallocSpy@0        @41
-    CoSetState                 = _DbgCoSetState@4               @42
-    CoTaskMemAlloc             = _DbgCoTaskMemAlloc@4           @43
-    CoTaskMemFree              = _DbgCoTaskMemFree@4            @44
-    CoTaskMemRealloc           = _DbgCoTaskMemRealloc@8         @45
-    CoTreatAsClass             = _DbgCoTreatAsClass@8           @46
-    CoUninitialize             = _DbgCoUninitialize@0           @47
-    CoUnloadingWOW             = _DbgCoUnloadingWOW@0           @48
-    CoUnmarshalHresult         = _DbgCoUnmarshalHresult@8       @49
-    CoUnmarshalInterface       = _DbgCoUnmarshalInterface@12    @50
-    CreateAntiMoniker          = _DbgCreateAntiMoniker@4        @51
-    CreateBindCtx              = _DbgCreateBindCtx@8            @52
-    CreateDataAdviseHolder     = _DbgCreateDataAdviseHolder@4   @53
-    CreateDataCache            = _DbgCreateDataCache@16         @54
-    CreateFileMoniker          = _DbgCreateFileMoniker@8        @55
-    CreateGenericComposite     = _DbgCreateGenericComposite@12  @56
-    CreateILockBytesOnHGlobal  = _DbgCreateILockBytesOnHGlobal@12 @57
-    CreateItemMoniker          = _DbgCreateItemMoniker@12       @58
-    CreateOleAdviseHolder      = _DbgCreateOleAdviseHolder@4    @59
-    CreatePointerMoniker       = _DbgCreatePointerMoniker@8     @60
-    CreateStreamOnHGlobal      = _DbgCreateStreamOnHGlobal@12   @61
-    DllDebugObjectRPCHook      = _DbgDllDebugObjectRPCHook@0    @62
-    DllGetClassObject          = _DbgOLE32_DllGetClassObject@12       @63
-    DllGetClassObjectWOW       = _DbgDllGetClassObjectWOW@0     @64
-    DoDragDrop                 = _DbgDoDragDrop@16              @65
-    EnableHookObject           = _DbgEnableHookObject@0         @66
-    GetClassFile               = _DbgGetClassFile@8             @67
-    GetConvertStg              = _DbgGetConvertStg@4            @68
-    GetDocumentBitStg          = _DbgGetDocumentBitStg@0        @69
-    GetHGlobalFromILockBytes   = _DbgGetHGlobalFromILockBytes@8  @70
-    GetHGlobalFromStream       = _DbgGetHGlobalFromStream@8     @71
-    GetHookInterface           = _DbgGetHookInterface@0         @72
-    GetRunningObjectTable      = _DbgGetRunningObjectTable@8    @73
-    IIDFromString              = _DbgCLSIDFromString@8          @74
-    IsAccelerator              = _DbgIsAccelerator@16           @75
-    IsEqualGUID                = _DbgIsEqualGUID@8              @76
-    IsValidIid                 = _DbgIsValidIid@4               @77
-    IsValidInterface           = _DbgIsValidInterface@4         @78
-    IsValidPtrIn               = _DbgIsValidPtrIn@4             @79
-    IsValidPtrOut              = _DbgIsValidPtrOut@4            @80
-    MkParseDisplayName         = _DbgMkParseDisplayName@16      @81
-    MonikerCommonPrefixWith    = _DbgMonikerCommonPrefixWith@12 @82
-    MonikerRelativePathTo      = _DbgMonikerRelativePathTo@16   @83
-    OleBuildVersion            = _DbgOleBuildVersion@0          @84
-    OleConvertIStorageToOLESTREAM  = _DbgOleConvertIStorageToOLESTREAM@8  @85
-    OleConvertIStorageToOLESTREAMEx  = _DbgOleConvertIStorageToOLESTREAMEx@28 @86
-    OleConvertOLESTREAMToIStorage  = _DbgOleConvertOLESTREAMToIStorage@12 @87
-    OleConvertOLESTREAMToIStorageEx  = _DbgOleConvertOLESTREAMToIStorageEx@28 @88
-    OleCreate                  = _DbgOleCreate@28               @89
-    OleCreateDefaultHandler    = _DbgOleCreateDefaultHandler@16 @90
-    OleCreateEmbeddingHelper   = _DbgOleCreateEmbeddingHelper@24 @91
-    OleCreateFromData          = _DbgOleCreateFromData@28       @92
-    OleCreateFromFile          = _DbgOleCreateFromFile@32       @93
-    OleCreateLink              = _DbgOleCreateLink@28           @94
-    OleCreateLinkFromData      = _DbgOleCreateLinkFromData@28   @95
-    OleCreateLinkToFile        = _DbgOleCreateLinkToFile@28     @96
-    OleCreateMenuDescriptor    = _DbgOleCreateMenuDescriptor@8  @97
-    OleCreateStaticFromData    = _DbgOleCreateStaticFromData@28 @98
-    OleDestroyMenuDescriptor   = _DbgOleDestroyMenuDescriptor@4  @99
-    OleDoAutoConvert           = _DbgOleDoAutoConvert@8         @100
-    OleDraw                    = _DbgOleDraw@16                 @101
-    OleDuplicateData           = _DbgOleDuplicateData@12        @102
-    OleFlushClipboard          = _DbgOleFlushClipboard@0        @103
-    OleGetAutoConvert          = _DbgOleGetAutoConvert@8        @104
-    OleGetClipboard            = _DbgOleGetClipboard@4          @105
-    OleGetIconOfClass          = _DbgOleGetIconOfClass@12       @106
-    OleGetIconOfFile           = _DbgOleGetIconOfFile@8         @107
-    OleInitialize              = _DbgOleInitialize@4            @108
-    OleInitializeWOW           = _DbgOleInitializeWOW@0         @109
-    OleIsCurrentClipboard      = _DbgOleIsCurrentClipboard@4    @110
-    OleIsRunning               = _DbgOleIsRunning@4             @111
-    OleLoad                    = _DbgOleLoad@16                 @112
-    OleLoadFromStream          = _DbgOleLoadFromStream@12       @113
-    OleLockRunning             = _DbgOleLockRunning@12          @114
-    OleMetafilePictFromIconAndLabel  = _DbgOleMetafilePictFromIconAndLabel@16 @115
-    OleNoteObjectVisible       = _DbgOleNoteObjectVisible@8     @116
-    OleQueryCreateFromData     = _DbgOleQueryCreateFromData@4   @117
-    OleQueryLinkFromData       = _DbgOleQueryLinkFromData@4     @118
-    OleRegEnumFormatEtc        = _DbgOleRegEnumFormatEtc@12     @119
-    OleRegEnumVerbs            = _DbgOleRegEnumVerbs@8          @120
-    OleRegGetMiscStatus        = _DbgOleRegGetMiscStatus@12     @121
-    OleRegGetUserType          = _DbgOleRegGetUserType@12       @122
-    OleRun                     = _DbgOleRun@4                   @123
-    OleSave                    = _DbgOleSave@12                 @124
-    OleSaveToStream            = _DbgOleSaveToStream@8          @125
-    OleSetAutoConvert          = _DbgOleSetAutoConvert@8        @126
-    OleSetClipboard            = _DbgOleSetClipboard@4          @127
-    OleSetContainedObject      = _DbgOleSetContainedObject@8    @128
-    OleSetMenuDescriptor       = _DbgOleSetMenuDescriptor@20    @129
-    OleTranslateAccelerator    = _DbgOleTranslateAccelerator@12 @130
-    OleUninitialize            = _DbgOleUninitialize@0          @131
-    OpenOrCreateStream         = _DbgOpenOrCreateStream@0       @132
-    ProgIDFromCLSID            = _DbgProgIDFromCLSID@8          @133
-    ReadClassStg               = _DbgReadClassStg@8             @134
-    ReadClassStm               = _DbgReadClassStm@8             @135
-    ReadFmtUserTypeStg         = _DbgReadFmtUserTypeStg@12      @136
-    ReadOleStg                 = _DbgReadOleStg@0               @137
-    ReadStringStream           = _DbgReadStringStream@0         @138
-    RegisterDragDrop           = _DbgRegisterDragDrop@8         @139
-    ReleaseStgMedium           = _DbgReleaseStgMedium@4         @140
-    RevokeDragDrop             = _DbgRevokeDragDrop@4           @141
-    SetConvertStg              = _DbgSetConvertStg@8            @142
-    SetDocumentBitStg          = _DbgSetDocumentBitStg@0        @143
-    StgCreateDocfile           = _DbgStgCreateDocfile@16        @144
-    StgCreateDocfileOnILockBytes  = _DbgStgCreateDocfileOnILockBytes@16 @145
-    StgIsStorageFile           = _DbgStgIsStorageFile@4         @146
-    StgIsStorageILockBytes     = _DbgStgIsStorageILockBytes@4   @147
-    StgOpenStorage             = _DbgStgOpenStorage@24           @148
-    StgOpenStorageOnILockBytes  = _DbgStgOpenStorageOnILockBytes@24 @149
-    StgSetTimes                = _DbgStgSetTimes@16             @150
-    StringFromCLSID            = _DbgStringFromCLSID@8          @151
-    StringFromGUID2            = _DbgStringFromGUID2@12         @152
-    StringFromIID              = _DbgStringFromCLSID@8          @153
-    UtConvertDvtd16toDvtd32    = _DbgUtConvertDvtd16toDvtd32@0  @154
-    UtConvertDvtd32toDvtd16    = _DbgUtConvertDvtd32toDvtd16@0  @155
-    UtGetDvtd16Info            = _DbgUtGetDvtd16Info@0          @156
-    UtGetDvtd32Info            = _DbgUtGetDvtd32Info@0          @157
-    WriteClassStg              = _DbgWriteClassStg@8            @158
-    WriteClassStm              = _DbgWriteClassStm@8            @159
-    WriteFmtUserTypeStg        = _DbgWriteFmtUserTypeStg@12     @160
-    WriteOleStg                = _DbgWriteOleStg@0              @161
-    WriteStringStream          = _DbgWriteStringStream@0        @162
-
-    CoInitializeEx             = _DbgCoInitializeEx@8           @163
-    CoInitializeSecurity       = _DbgCoInitializeSecurity@36    @164
-    CoCreateInstanceEx         = _DbgCoCreateInstanceEx@24      @165
-    PropVariantClear           = _DbgPropVariantClear@4         @166
+    BindMoniker                = "_DbgBindMoniker@16"           @1
+    CLSIDFromProgID            = "_DbgCLSIDFromProgID@8"        @2
+    CLSIDFromString            = "_DbgCLSIDFromString@8"        @3
+    CoBuildVersion             = "_DbgCoBuildVersion@0"         @4
+    CoCreateFreeThreadedMarshaler  = "_DbgCoCreateFreeThreadedMarshaler@8"  @5
+    CoCreateGuid               = "_DbgCoCreateGuid@4"           @6
+    CoCreateInstance           = "_DbgCoCreateInstance@20"      @7
+    CoDisconnectObject         = "_DbgCoDisconnectObject@8"     @8
+    CoDosDateTimeToFileTime    = "_DbgCoDosDateTimeToFileTime@12" @9
+    CoFileTimeNow              = "_DbgCoFileTimeNow@4"          @10
+    CoFileTimeToDosDateTime    = "_DbgCoFileTimeToDosDateTime@12" @11
+    CoFreeAllLibraries         = "_DbgCoFreeAllLibraries@0"     @12
+    CoFreeLibrary              = "_DbgCoFreeLibrary@4"          @13
+    CoFreeUnusedLibraries      = "_DbgCoFreeUnusedLibraries@0"  @14
+    CoGetCallerTID             = "_DbgCoGetCallerTID@0"         @15
+    CoGetClassObject           = "_DbgCoGetClassObject@20"      @16
+    CoGetCurrentLogicalThreadId  = "_DbgCoGetCurrentLogicalThreadId@0"  @17
+    CoGetCurrentProcess        = "_DbgCoGetCurrentProcess@0"    @18
+    CoGetInterfaceAndReleaseStream  = "_DbgCoGetInterfaceAndReleaseStream@12" @19
+    CoGetMalloc                = "_DbgCoGetMalloc@8"            @20
+    CoGetMarshalSizeMax        = "_DbgCoGetMarshalSizeMax@24"   @21
+    CoGetPSClsid               = "_DbgCoGetPSClsid@8"           @22
+    CoGetStandardMarshal       = "_DbgCoGetStandardMarshal@24"  @23
+    CoGetState                 = "_DbgCoGetState@0"             @24
+    CoGetTreatAsClass          = "_DbgCoGetTreatAsClass@8"      @25
+    CoInitialize               = "_DbgCoInitialize@4"           @26
+    CoInitializeWOW            = "_DbgCoInitializeWOW@8"        @27
+    CoIsHandlerConnected       = "_DbgCoIsHandlerConnected@4"   @28
+    CoIsOle1Class              = "_DbgCoIsOle1Class@4"          @29
+    CoLoadLibrary              = "_DbgCoLoadLibrary@8"          @30
+    CoLockObjectExternal       = "_DbgCoLockObjectExternal@12"  @31
+    CoMarshalHresult           = "_DbgCoMarshalHresult@8"       @32
+    CoMarshalInterThreadInterfaceInStream  = "_DbgCoMarshalInterThreadInterfaceInStream@12" @33
+    CoMarshalInterface         = "_DbgCoMarshalInterface@24"    @34
+    CoQueryReleaseObject       = "_DbgCoQueryReleaseObject@0"   @35
+    CoRegisterClassObject      = "_DbgCoRegisterClassObject@20" @36
+    CoRegisterMallocSpy        = "_DbgCoRegisterMallocSpy@4"    @37
+    CoRegisterMessageFilter    = "_DbgCoRegisterMessageFilter@8"  @38
+    CoReleaseMarshalData       = "_DbgCoReleaseMarshalData@4"   @39
+    CoRevokeClassObject        = "_DbgCoRevokeClassObject@4"    @40
+    CoRevokeMallocSpy          = "_DbgCoRevokeMallocSpy@0"      @41
+    CoSetState                 = "_DbgCoSetState@4"             @42
+    CoTaskMemAlloc             = "_DbgCoTaskMemAlloc@4"         @43
+    CoTaskMemFree              = "_DbgCoTaskMemFree@4"          @44
+    CoTaskMemRealloc           = "_DbgCoTaskMemRealloc@8"       @45
+    CoTreatAsClass             = "_DbgCoTreatAsClass@8"         @46
+    CoUninitialize             = "_DbgCoUninitialize@0"         @47
+    CoUnloadingWOW             = "_DbgCoUnloadingWOW@0"         @48
+    CoUnmarshalHresult         = "_DbgCoUnmarshalHresult@8"     @49
+    CoUnmarshalInterface       = "_DbgCoUnmarshalInterface@12"  @50
+    CreateAntiMoniker          = "_DbgCreateAntiMoniker@4"      @51
+    CreateBindCtx              = "_DbgCreateBindCtx@8"          @52
+    CreateDataAdviseHolder     = "_DbgCreateDataAdviseHolder@4" @53
+    CreateDataCache            = "_DbgCreateDataCache@16"       @54
+    CreateFileMoniker          = "_DbgCreateFileMoniker@8"      @55
+    CreateGenericComposite     = "_DbgCreateGenericComposite@12"  @56
+    CreateILockBytesOnHGlobal  = "_DbgCreateILockBytesOnHGlobal@12" @57
+    CreateItemMoniker          = "_DbgCreateItemMoniker@12"     @58
+    CreateOleAdviseHolder      = "_DbgCreateOleAdviseHolder@4"  @59
+    CreatePointerMoniker       = "_DbgCreatePointerMoniker@8"   @60
+    CreateStreamOnHGlobal      = "_DbgCreateStreamOnHGlobal@12" @61
+    DllDebugObjectRPCHook      = "_DbgDllDebugObjectRPCHook@0"  @62
+    DllGetClassObject          = "_DbgOLE32_DllGetClassObject@12"     @63
+    DllGetClassObjectWOW       = "_DbgDllGetClassObjectWOW@0"   @64
+    DoDragDrop                 = "_DbgDoDragDrop@16"            @65
+    EnableHookObject           = "_DbgEnableHookObject@0"       @66
+    GetClassFile               = "_DbgGetClassFile@8"           @67
+    GetConvertStg              = "_DbgGetConvertStg@4"          @68
+    GetDocumentBitStg          = "_DbgGetDocumentBitStg@0"      @69
+    GetHGlobalFromILockBytes   = "_DbgGetHGlobalFromILockBytes@8"  @70
+    GetHGlobalFromStream       = "_DbgGetHGlobalFromStream@8"   @71
+    GetHookInterface           = "_DbgGetHookInterface@0"       @72
+    GetRunningObjectTable      = "_DbgGetRunningObjectTable@8"  @73
+    IIDFromString              = "_DbgCLSIDFromString@8"        @74
+    IsAccelerator              = "_DbgIsAccelerator@16"         @75
+    IsEqualGUID                = "_DbgIsEqualGUID@8"            @76
+    IsValidIid                 = "_DbgIsValidIid@4"             @77
+    IsValidInterface           = "_DbgIsValidInterface@4"       @78
+    IsValidPtrIn               = "_DbgIsValidPtrIn@4"           @79
+    IsValidPtrOut              = "_DbgIsValidPtrOut@4"          @80
+    MkParseDisplayName         = "_DbgMkParseDisplayName@16"    @81
+    MonikerCommonPrefixWith    = "_DbgMonikerCommonPrefixWith@12" @82
+    MonikerRelativePathTo      = "_DbgMonikerRelativePathTo@16" @83
+    OleBuildVersion            = "_DbgOleBuildVersion@0"        @84
+    OleConvertIStorageToOLESTREAM  = "_DbgOleConvertIStorageToOLESTREAM@8"  @85
+    OleConvertIStorageToOLESTREAMEx  = "_DbgOleConvertIStorageToOLESTREAMEx@28" @86
+    OleConvertOLESTREAMToIStorage  = "_DbgOleConvertOLESTREAMToIStorage@12" @87
+    OleConvertOLESTREAMToIStorageEx  = "_DbgOleConvertOLESTREAMToIStorageEx@28" @88
+    OleCreate                  = "_DbgOleCreate@28"             @89
+    OleCreateDefaultHandler    = "_DbgOleCreateDefaultHandler@16" @90
+    OleCreateEmbeddingHelper   = "_DbgOleCreateEmbeddingHelper@24" @91
+    OleCreateFromData          = "_DbgOleCreateFromData@28"     @92
+    OleCreateFromFile          = "_DbgOleCreateFromFile@32"     @93
+    OleCreateLink              = "_DbgOleCreateLink@28"         @94
+    OleCreateLinkFromData      = "_DbgOleCreateLinkFromData@28" @95
+    OleCreateLinkToFile        = "_DbgOleCreateLinkToFile@28"   @96
+    OleCreateMenuDescriptor    = "_DbgOleCreateMenuDescriptor@8"  @97
+    OleCreateStaticFromData    = "_DbgOleCreateStaticFromData@28" @98
+    OleDestroyMenuDescriptor   = "_DbgOleDestroyMenuDescriptor@4"  @99
+    OleDoAutoConvert           = "_DbgOleDoAutoConvert@8"       @100
+    OleDraw                    = "_DbgOleDraw@16"               @101
+    OleDuplicateData           = "_DbgOleDuplicateData@12"      @102
+    OleFlushClipboard          = "_DbgOleFlushClipboard@0"      @103
+    OleGetAutoConvert          = "_DbgOleGetAutoConvert@8"      @104
+    OleGetClipboard            = "_DbgOleGetClipboard@4"        @105
+    OleGetIconOfClass          = "_DbgOleGetIconOfClass@12"     @106
+    OleGetIconOfFile           = "_DbgOleGetIconOfFile@8"       @107
+    OleInitialize              = "_DbgOleInitialize@4"          @108
+    OleInitializeWOW           = "_DbgOleInitializeWOW@0"       @109
+    OleIsCurrentClipboard      = "_DbgOleIsCurrentClipboard@4"  @110
+    OleIsRunning               = "_DbgOleIsRunning@4"           @111
+    OleLoad                    = "_DbgOleLoad@16"               @112
+    OleLoadFromStream          = "_DbgOleLoadFromStream@12"     @113
+    OleLockRunning             = "_DbgOleLockRunning@12"        @114
+    OleMetafilePictFromIconAndLabel  = "_DbgOleMetafilePictFromIconAndLabel@16" @115
+    OleNoteObjectVisible       = "_DbgOleNoteObjectVisible@8"   @116
+    OleQueryCreateFromData     = "_DbgOleQueryCreateFromData@4" @117
+    OleQueryLinkFromData       = "_DbgOleQueryLinkFromData@4"   @118
+    OleRegEnumFormatEtc        = "_DbgOleRegEnumFormatEtc@12"   @119
+    OleRegEnumVerbs            = "_DbgOleRegEnumVerbs@8"        @120
+    OleRegGetMiscStatus        = "_DbgOleRegGetMiscStatus@12"   @121
+    OleRegGetUserType          = "_DbgOleRegGetUserType@12"     @122
+    OleRun                     = "_DbgOleRun@4"                 @123
+    OleSave                    = "_DbgOleSave@12"               @124
+    OleSaveToStream            = "_DbgOleSaveToStream@8"        @125
+    OleSetAutoConvert          = "_DbgOleSetAutoConvert@8"      @126
+    OleSetClipboard            = "_DbgOleSetClipboard@4"        @127
+    OleSetContainedObject      = "_DbgOleSetContainedObject@8"  @128
+    OleSetMenuDescriptor       = "_DbgOleSetMenuDescriptor@20"  @129
+    OleTranslateAccelerator    = "_DbgOleTranslateAccelerator@12" @130
+    OleUninitialize            = "_DbgOleUninitialize@0"        @131
+    OpenOrCreateStream         = "_DbgOpenOrCreateStream@0"     @132
+    ProgIDFromCLSID            = "_DbgProgIDFromCLSID@8"        @133
+    ReadClassStg               = "_DbgReadClassStg@8"           @134
+    ReadClassStm               = "_DbgReadClassStm@8"           @135
+    ReadFmtUserTypeStg         = "_DbgReadFmtUserTypeStg@12"    @136
+    ReadOleStg                 = "_DbgReadOleStg@0"             @137
+    ReadStringStream           = "_DbgReadStringStream@0"       @138
+    RegisterDragDrop           = "_DbgRegisterDragDrop@8"       @139
+    ReleaseStgMedium           = "_DbgReleaseStgMedium@4"       @140
+    RevokeDragDrop             = "_DbgRevokeDragDrop@4"         @141
+    SetConvertStg              = "_DbgSetConvertStg@8"          @142
+    SetDocumentBitStg          = "_DbgSetDocumentBitStg@0"      @143
+    StgCreateDocfile           = "_DbgStgCreateDocfile@16"      @144
+    StgCreateDocfileOnILockBytes  = "_DbgStgCreateDocfileOnILockBytes@16" @145
+    StgIsStorageFile           = "_DbgStgIsStorageFile@4"       @146
+    StgIsStorageILockBytes     = "_DbgStgIsStorageILockBytes@4" @147
+    StgOpenStorage             = "_DbgStgOpenStorage@24"         @148
+    StgOpenStorageOnILockBytes  = "_DbgStgOpenStorageOnILockBytes@24" @149
+    StgSetTimes                = "_DbgStgSetTimes@16"           @150
+    StringFromCLSID            = "_DbgStringFromCLSID@8"        @151
+    StringFromGUID2            = "_DbgStringFromGUID2@12"       @152
+    StringFromIID              = "_DbgStringFromCLSID@8"        @153
+    UtConvertDvtd16toDvtd32    = "_DbgUtConvertDvtd16toDvtd32@0"  @154
+    UtConvertDvtd32toDvtd16    = "_DbgUtConvertDvtd32toDvtd16@0"  @155
+    UtGetDvtd16Info            = "_DbgUtGetDvtd16Info@0"        @156
+    UtGetDvtd32Info            = "_DbgUtGetDvtd32Info@0"        @157
+    WriteClassStg              = "_DbgWriteClassStg@8"          @158
+    WriteClassStm              = "_DbgWriteClassStm@8"          @159
+    WriteFmtUserTypeStg        = "_DbgWriteFmtUserTypeStg@12"   @160
+    WriteOleStg                = "_DbgWriteOleStg@0"            @161
+    WriteStringStream          = "_DbgWriteStringStream@0"      @162
+
+    CoInitializeEx             = "_DbgCoInitializeEx@8"         @163
+    CoInitializeSecurity       = "_DbgCoInitializeSecurity@36"  @164
+    CoCreateInstanceEx         = "_DbgCoCreateInstanceEx@24"    @165
+    PropVariantClear           = "_DbgPropVariantClear@4"       @166
 ;167 stub CoCopyProxy                # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
 ;168 stub CoGetCallContext           # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
@@ -178 +178 @@
 ;171 stub CoRegisterPSClsid          # stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED
 ;172 stub CoReleaseServerProcess     # stdcall () return 0,ERR_NOTIMPLEMENTED
-    CoResumeClassObjects       = _DbgCoResumeClassObjects@0     @173
+    CoResumeClassObjects       = "_DbgCoResumeClassObjects@0"   @173
 ;174 stub CoRevertToSelf             # stdcall () return 0,ERR_NOTIMPLEMENTED
 ;175 stub CoSetProxyBlanket          # stdcall (ptr long long wstr long long ptr long) return 0,ERR_NOTIMPLEMENTED
@@ -197 +197 @@
 ;190 stub CoRegisterSurrogate
 ;191 stub CoSwitchCallContext
-    CreateErrorInfo            = _DbgCreateErrorInfo@4          @192
+    CreateErrorInfo            = "_DbgCreateErrorInfo@4"        @192
 ;193 stub CreateObjrefMoniker
-    DllRegisterServer          = _DbgOLE32_DllRegisterServer@0  @194
-    FreePropVariantArray       = _DbgFreePropVariantArray@8     @195
-    GetErrorInfo               = _DbgGetErrorInfo@8             @196
-
-    PropVariantCopy            = _DbgPropVariantCopy@8          @246
-
-    SetErrorInfo               = _DbgSetErrorInfo@8             @255
-
-    CoImpersonateClient        = _DbgCoImpersonateClient@0      @997   ; suppress warning
-    CoInitializeSecurity       = _DbgCoInitializeSecurity@36    @998   ; suppress warning
-    CoRegisterSurrogate        = _DbgCoRegisterSurrogate@4      @999   ; suppress warning
+    DllRegisterServer          = "_DbgOLE32_DllRegisterServer@0"  @194
+    FreePropVariantArray       = "_DbgFreePropVariantArray@8"   @195
+    GetErrorInfo               = "_DbgGetErrorInfo@8"           @196
+
+    PropVariantCopy            = "_DbgPropVariantCopy@8"        @246
+
+    SetErrorInfo               = "_DbgSetErrorInfo@8"           @255
+
+    CoImpersonateClient        = "_DbgCoImpersonateClient@0"    @997   ; suppress warning
+    CoInitializeSecurity_998   = "_DbgCoInitializeSecurity@36"  @998   ; suppress warning
+    CoRegisterSurrogate        = "_DbgCoRegisterSurrogate@4"    @999   ; suppress warning
 
 ;
 ;   Helper Functions
 ;
-    WINE_StringFromCLSID       = _DbgWINE_StringFromCLSID@8     @1000
-    CLSIDFromStringA           = _DbgCLSIDFromStringA@8         @1001
-    CLSIDFromString16          = _DbgCLSIDFromString16@8        @1002  ; COMPOBJ.19
+    WINE_StringFromCLSID       = "_DbgWINE_StringFromCLSID@8"   @1000
+    CLSIDFromStringA           = "_DbgCLSIDFromStringA@8"       @1001
+    CLSIDFromString16          = "_DbgCLSIDFromString16@8"      @1002  ; COMPOBJ.19
 
 ; private functions for drag and drop (used by user32\dragdrop.cpp)
-    OLEDD_AcceptsDragDrop      = _OLEDD_AcceptsDragDrop@4    @1010
-    OLEDD_DropFiles            = _OLEDD_DropFiles@4          @1011
-    OLEDD_DragOver             = _OLEDD_DragOver@8           @1012
-    OLEDD_DragEnter            = _OLEDD_DragEnter@12         @1013
-    OLEDD_DragLeave            = _OLEDD_DragLeave@4          @1014
+    OLEDD_AcceptsDragDrop      = "_OLEDD_AcceptsDragDrop@4"  @1010
+    OLEDD_DropFiles            = "_OLEDD_DropFiles@4"        @1011
+    OLEDD_DragOver             = "_OLEDD_DragOver@8"         @1012
+    OLEDD_DragEnter            = "_OLEDD_DragEnter@12"       @1013
+    OLEDD_DragLeave            = "_OLEDD_DragLeave@4"        @1014

branches/gcc-kmk/src/ole32/oleproxy.c ¶

@@ -180 +180 @@
         }
 
-        msg->cbBuffer = ststg.cbSize.s.LowPart;
-        msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.s.LowPart);
-        seekto.s.LowPart = 0;seekto.s.HighPart = 0;
+        msg->cbBuffer = ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart;
+        msg->Buffer = HeapReAlloc(GetProcessHeap(),0,msg->Buffer,ststg.cbSize.DUMMYSTRUCTNAME_DOT LowPart);
+        seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
         hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
         if (hres) {

branches/gcc-kmk/src/ole32/regsvr32.cpp ¶

@@ -39 +39 @@
 static  HRESULT sign_on(void);
 static  HRESULT sign_off(void);
-static  HRESULT report_msg(char * fmt, ...);
-static  HRESULT report_err(HRESULT hr, char * fmt, ...);
-static  HRESULT usage(char * fmt, ...);
+static  HRESULT report_msg(const char * fmt, ...);
+static  HRESULT report_err(HRESULT hr, const char * fmt, ...);
+static  HRESULT usage(const char * fmt, ...);
 static int WIN32API EntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     LPSTR lpCmdLine, int nCmdShow);
@@ -259 +259 @@
 // report_msg
 // ----------------------------------------------------------------------
-static  HRESULT report_msg(char * fmt, ...)
+static  HRESULT report_msg(const char * fmt, ...)
 {
     if (!fSilent)
@@ -279 +279 @@
 // report_err
 // ----------------------------------------------------------------------
-static  HRESULT report_err(HRESULT hr, char * fmt, ...)
+static  HRESULT report_err(HRESULT hr, const char * fmt, ...)
 {
     va_list     va_ptr;
@@ -297 +297 @@
 // usage
 // ----------------------------------------------------------------------
-static  HRESULT usage(char * fmt, ...)
+static  HRESULT usage(const char * fmt, ...)
 {
     va_list     va_ptr;

branches/gcc-kmk/src/ole32/rpc.c ¶

@@ -547 +547 @@
   hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res);
   if (hres) goto out;
-  seekto.s.LowPart = 0;seekto.s.HighPart = 0;
+  seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
   hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
   hres = CoUnmarshalInterface(pStm,&IID_IClassFactory,ppv);

branches/gcc-kmk/src/ole32/stg_bigblockfile.c ¶

@@ -233 +233 @@
   }
 
-  This->filesize.s.LowPart = GetFileSize(This->hfile,
-                                         &This->filesize.s.HighPart);
+  This->filesize.DUMMYSTRUCTNAME_DOT LowPart = GetFileSize(This->hfile,
+                                         &This->filesize.DUMMYSTRUCTNAME_DOT HighPart);
 
   This->maplist = NULL;
 
-  TRACE("file len %lu\n", This->filesize.s.LowPart);
+  TRACE("file len %lu\n", This->filesize.DUMMYSTRUCTNAME_DOT LowPart);
 
   return TRUE;
@@ -270 +270 @@
   ILockBytes_AddRef(This->pLkbyt);
 
-  This->filesize.s.LowPart = GlobalSize(This->hbytearray);
-  This->filesize.s.HighPart = 0;
+  This->filesize.DUMMYSTRUCTNAME_DOT LowPart = GlobalSize(This->hbytearray);
+  This->filesize.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   This->pbytearray = GlobalLock(This->hbytearray);
 
-  TRACE("mem on %p len %lu\n", This->pbytearray, This->filesize.s.LowPart);
+  TRACE("mem on %p len %lu\n", This->pbytearray, This->filesize.DUMMYSTRUCTNAME_DOT LowPart);
 
   return TRUE;
@@ -330 +330 @@
    */
   if (This->blocksize * (index + 1)
-      > ROUND_UP(This->filesize.s.LowPart, This->blocksize))
+      > ROUND_UP(This->filesize.DUMMYSTRUCTNAME_DOT LowPart, This->blocksize))
   {
     TRACE("out of range %lu vs %lu\n", This->blocksize * (index + 1),
-          This->filesize.s.LowPart);
+          This->filesize.DUMMYSTRUCTNAME_DOT LowPart);
     return NULL;
   }
@@ -360 +360 @@
    * make sure that the block physically exists
    */
-  if ((This->blocksize * (index + 1)) > This->filesize.s.LowPart)
+  if ((This->blocksize * (index + 1)) > This->filesize.DUMMYSTRUCTNAME_DOT LowPart)
   {
     ULARGE_INTEGER newSize;
 
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart = This->blocksize * (index + 1);
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart = This->blocksize * (index + 1);
 
     BIGBLOCKFILE_SetSize(This, newSize);
@@ -401 +401 @@
 void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize)
 {
-  if (This->filesize.s.LowPart == newSize.s.LowPart)
+  if (This->filesize.DUMMYSTRUCTNAME_DOT LowPart == newSize.DUMMYSTRUCTNAME_DOT LowPart)
     return;
 
-  TRACE("from %lu to %lu\n", This->filesize.s.LowPart, newSize.s.LowPart);
+  TRACE("from %lu to %lu\n", This->filesize.DUMMYSTRUCTNAME_DOT LowPart, newSize.DUMMYSTRUCTNAME_DOT LowPart);
   /*
    * unmap all views, must be done before call to SetEndFile
@@ -433 +433 @@
      */
     memset(buf, '0', 10);
-    SetFilePointer(This->hfile, newSize.s.LowPart, NULL, FILE_BEGIN);
+    SetFilePointer(This->hfile, newSize.DUMMYSTRUCTNAME_DOT LowPart, NULL, FILE_BEGIN);
     WriteFile(This->hfile, buf, 10, NULL, NULL);
     /*
@@ -442 +442 @@
      * set the new end of file
      */
-    SetFilePointer(This->hfile, newSize.s.LowPart, NULL, FILE_BEGIN);
+    SetFilePointer(This->hfile, newSize.DUMMYSTRUCTNAME_DOT LowPart, NULL, FILE_BEGIN);
     SetEndOfFile(This->hfile);
 
@@ -470 +470 @@
   }
 
-  This->filesize.s.LowPart = newSize.s.LowPart;
-  This->filesize.s.HighPart = newSize.s.HighPart;
+  This->filesize.DUMMYSTRUCTNAME_DOT LowPart = newSize.DUMMYSTRUCTNAME_DOT LowPart;
+  This->filesize.DUMMYSTRUCTNAME_DOT HighPart = newSize.DUMMYSTRUCTNAME_DOT HighPart;
 
   BIGBLOCKFILE_RemapAllMappedPages(This);
@@ -659 +659 @@
         DWORD desired_access;
 
-        if (lowoffset + PAGE_SIZE > This->filesize.s.LowPart)
-            numBytesToMap = This->filesize.s.LowPart - lowoffset;
+        if (lowoffset + PAGE_SIZE > This->filesize.DUMMYSTRUCTNAME_DOT LowPart)
+            numBytesToMap = This->filesize.DUMMYSTRUCTNAME_DOT LowPart - lowoffset;
         else
             numBytesToMap = PAGE_SIZE;
@@ -819 +819 @@
         MappedPage *next = list->next;
 
-        if (list->page_index * PAGE_SIZE > This->filesize.s.LowPart)
+        if (list->page_index * PAGE_SIZE > This->filesize.DUMMYSTRUCTNAME_DOT LowPart)
         {
             TRACE("discarding %lu\n", list->page_index);

branches/gcc-kmk/src/ole32/stg_stream.c ¶

@@ -101 +101 @@
      * Start the stream at the beginning.
      */
-    newStream->currentPosition.s.HighPart = 0;
-    newStream->currentPosition.s.LowPart = 0;
+    newStream->currentPosition.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newStream->currentPosition.DUMMYSTRUCTNAME_DOT LowPart = 0;
 
     /*
      * Initialize the rest of the data.
      */
-    newStream->streamSize.s.HighPart = 0;
-    newStream->streamSize.s.LowPart  = 0;
+    newStream->streamSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newStream->streamSize.DUMMYSTRUCTNAME_DOT LowPart  = 0;
     newStream->bigBlockChain       = 0;
     newStream->smallBlockChain     = 0;
@@ -289 +289 @@
      * This code supports only streams that are <32 bits in size.
      */
-    assert(This->streamSize.s.HighPart == 0);
+    assert(This->streamSize.DUMMYSTRUCTNAME_DOT HighPart == 0);
 
     if(curProperty.startingBlock == BLOCK_END_OF_CHAIN)
     {
-      assert( (This->streamSize.s.HighPart == 0) && (This->streamSize.s.LowPart == 0) );
+      assert( (This->streamSize.DUMMYSTRUCTNAME_DOT HighPart == 0) && (This->streamSize.DUMMYSTRUCTNAME_DOT LowPart == 0) );
     }
     else
     {
-      if ( (This->streamSize.s.HighPart == 0) &&
-           (This->streamSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
+      if ( (This->streamSize.DUMMYSTRUCTNAME_DOT HighPart == 0) &&
+           (This->streamSize.DUMMYSTRUCTNAME_DOT LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
       {
         This->smallBlockChain = SmallBlockChainStream_Construct(
@@ -350 +350 @@
    * to read from the block chain
    */
-  bytesToReadFromBuffer = min( This->streamSize.s.LowPart - This->currentPosition.s.LowPart, cb);
+  bytesToReadFromBuffer = min( This->streamSize.DUMMYSTRUCTNAME_DOT LowPart - This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart, cb);
 
   /*
@@ -394 +394 @@
    * Advance the pointer for the number of positions read.
    */
-  This->currentPosition.s.LowPart += *pcbRead;
+  This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart += *pcbRead;
 
   if(*pcbRead != cb)
@@ -464 +464 @@
   else
   {
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart = This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart + cb;
   }
 
@@ -471 +471 @@
    * Verify if we need to grow the stream
    */
-  if (newSize.s.LowPart > This->streamSize.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart > This->streamSize.DUMMYSTRUCTNAME_DOT LowPart)
   {
     /* grow stream */
@@ -504 +504 @@
    * Advance the position pointer for the number of positions written.
    */
-  This->currentPosition.s.LowPart += *pcbWritten;
+  This->currentPosition.DUMMYSTRUCTNAME_DOT LowPart += *pcbWritten;
 
   return S_OK;
@@ -528 +528 @@
 
   TRACE("(%p, %ld, %ld, %p)\n",
-        iface, dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+        iface, dlibMove.DUMMYSTRUCTNAME_DOT LowPart, dwOrigin, plibNewPosition);
 
   /*
@@ -547 +547 @@
   {
     case STREAM_SEEK_SET:
-      plibNewPosition->s.HighPart = 0;
-      plibNewPosition->s.LowPart  = 0;
+      plibNewPosition->DUMMYSTRUCTNAME_DOT HighPart = 0;
+      plibNewPosition->DUMMYSTRUCTNAME_DOT LowPart  = 0;
       break;
     case STREAM_SEEK_CUR:
@@ -560 +560 @@
   }
 
-#if defined(__WIN32OS2__) && defined(__IBMC__)
+#ifdef __WIN32OS2__
   *((LARGE_INTEGER*)plibNewPosition )= RtlpLargeIntegerAdd( (LARGE_INTEGER *)plibNewPosition, &dlibMove );
 #else
@@ -591 +591 @@
   BOOL         Success;
 
-  TRACE("(%p, %ld)\n", iface, libNewSize.s.LowPart);
+  TRACE("(%p, %ld)\n", iface, libNewSize.DUMMYSTRUCTNAME_DOT LowPart);
 
   /*
    * As documented.
    */
-  if (libNewSize.s.HighPart != 0)
+  if (libNewSize.DUMMYSTRUCTNAME_DOT HighPart != 0)
     return STG_E_INVALIDFUNCTION;
 
@@ -605 +605 @@
     return STG_E_ACCESSDENIED;
 
-  if (This->streamSize.s.LowPart == libNewSize.s.LowPart)
+  if (This->streamSize.DUMMYSTRUCTNAME_DOT LowPart == libNewSize.DUMMYSTRUCTNAME_DOT LowPart)
     return S_OK;
 
@@ -613 +613 @@
   if ((This->smallBlockChain == 0) && (This->bigBlockChain == 0))
   {
-    if (libNewSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK)
+    if (libNewSize.DUMMYSTRUCTNAME_DOT LowPart < LIMIT_TO_USE_SMALL_BLOCK)
     {
       This->smallBlockChain = SmallBlockChainStream_Construct(
@@ -638 +638 @@
    */
   if ( (This->smallBlockChain!=0) &&
-       (curProperty.size.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
-  {
-    if (libNewSize.s.LowPart >= LIMIT_TO_USE_SMALL_BLOCK)
+       (curProperty.size.DUMMYSTRUCTNAME_DOT LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
+  {
+    if (libNewSize.DUMMYSTRUCTNAME_DOT LowPart >= LIMIT_TO_USE_SMALL_BLOCK)
     {
       /*
@@ -667 +667 @@
                                        &curProperty);
 
-  curProperty.size.s.HighPart = libNewSize.s.HighPart;
-  curProperty.size.s.LowPart = libNewSize.s.LowPart;
+  curProperty.size.DUMMYSTRUCTNAME_DOT HighPart = libNewSize.DUMMYSTRUCTNAME_DOT HighPart;
+  curProperty.size.DUMMYSTRUCTNAME_DOT LowPart = libNewSize.DUMMYSTRUCTNAME_DOT LowPart;
 
   if (Success)
@@ -703 +703 @@
 
   TRACE("(%p, %p, %ld, %p, %p)\n",
-        iface, pstm, cb.s.LowPart, pcbRead, pcbWritten);
+        iface, pstm, cb.DUMMYSTRUCTNAME_DOT LowPart, pcbRead, pcbWritten);
 
   /*
@@ -711 +711 @@
     return STG_E_INVALIDPOINTER;
 
-  totalBytesRead.s.LowPart = totalBytesRead.s.HighPart = 0;
-  totalBytesWritten.s.LowPart = totalBytesWritten.s.HighPart = 0;
+  totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart = totalBytesRead.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   /*
@@ -719 +719 @@
    * implementation will do the job
    */
-  while ( cb.s.LowPart > 0 )
-  {
-    if ( cb.s.LowPart >= 128 )
+  while ( cb.DUMMYSTRUCTNAME_DOT LowPart > 0 )
+  {
+    if ( cb.DUMMYSTRUCTNAME_DOT LowPart >= 128 )
       copySize = 128;
     else
-      copySize = cb.s.LowPart;
+      copySize = cb.DUMMYSTRUCTNAME_DOT LowPart;
 
     IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
 
-    totalBytesRead.s.LowPart += bytesRead;
+    totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart += bytesRead;
 
     IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
 
-    totalBytesWritten.s.LowPart += bytesWritten;
+    totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart += bytesWritten;
 
     /*
@@ -744 +744 @@
 
     if (bytesRead!=copySize)
-      cb.s.LowPart = 0;
+      cb.DUMMYSTRUCTNAME_DOT LowPart = 0;
     else
-      cb.s.LowPart -= bytesRead;
+      cb.DUMMYSTRUCTNAME_DOT LowPart -= bytesRead;
   }
 
@@ -754 +754 @@
   if (pcbRead)
   {
-    pcbRead->s.LowPart = totalBytesRead.s.LowPart;
-    pcbRead->s.HighPart = totalBytesRead.s.HighPart;
+    pcbRead->DUMMYSTRUCTNAME_DOT LowPart = totalBytesRead.DUMMYSTRUCTNAME_DOT LowPart;
+    pcbRead->DUMMYSTRUCTNAME_DOT HighPart = totalBytesRead.DUMMYSTRUCTNAME_DOT HighPart;
   }
 
   if (pcbWritten)
   {
-    pcbWritten->s.LowPart = totalBytesWritten.s.LowPart;
-    pcbWritten->s.HighPart = totalBytesWritten.s.HighPart;
+    pcbWritten->DUMMYSTRUCTNAME_DOT LowPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT LowPart;
+    pcbWritten->DUMMYSTRUCTNAME_DOT HighPart = totalBytesWritten.DUMMYSTRUCTNAME_DOT HighPart;
   }
   return hr;

branches/gcc-kmk/src/ole32/storage32.c ¶

@@ -681 +681 @@
   if (res == S_OK)
   {
-    TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.s.LowPart, pstatstg->cbSize.s.HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
+    TRACE("<-- STATSTG: pwcsName: %s, type: %ld, cbSize.Low/High: %ld/%ld, grfMode: %08lx, grfLocksSupported: %ld, grfStateBits: %08lx\n", debugstr_w(pstatstg->pwcsName), pstatstg->type, pstatstg->cbSize.DUMMYSTRUCTNAME_DOT LowPart, pstatstg->cbSize.DUMMYSTRUCTNAME_DOT HighPart, pstatstg->grfMode, pstatstg->grfLocksSupported, pstatstg->grfStateBits);
   }
   TRACE("<-- %08lx\n", res);
@@ -765 +765 @@
     renamedProperty.propertyType  = currentProperty.propertyType;
     renamedProperty.startingBlock = currentProperty.startingBlock;
-    renamedProperty.size.s.LowPart  = currentProperty.size.s.LowPart;
-    renamedProperty.size.s.HighPart = currentProperty.size.s.HighPart;
+    renamedProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = currentProperty.size.DUMMYSTRUCTNAME_DOT LowPart;
+    renamedProperty.size.DUMMYSTRUCTNAME_DOT HighPart = currentProperty.size.DUMMYSTRUCTNAME_DOT HighPart;
 
     renamedProperty.previousProperty = PROPERTY_NULL;
@@ -939 +939 @@
   newStreamProperty.propertyType  = PROPTYPE_STREAM;
   newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN;
-  newStreamProperty.size.s.LowPart  = 0;
-  newStreamProperty.size.s.HighPart = 0;
+  newStreamProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
+  newStreamProperty.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   newStreamProperty.previousProperty = PROPERTY_NULL;
@@ -1124 +1124 @@
   newProperty.propertyType  = PROPTYPE_STORAGE;
   newProperty.startingBlock = BLOCK_END_OF_CHAIN;
-  newProperty.size.s.LowPart  = 0;
-  newProperty.size.s.HighPart = 0;
+  newProperty.size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
+  newProperty.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   newProperty.previousProperty = PROPERTY_NULL;
@@ -1246 +1246 @@
      * initialize the size used by the property stream
      */
-    newSize.s.HighPart = 0;
-    newSize.s.LowPart  = storage->bigBlockSize * blockCount;
+    newSize.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    newSize.DUMMYSTRUCTNAME_DOT LowPart  = storage->bigBlockSize * blockCount;
 
     /*
@@ -1875 +1875 @@
   ULARGE_INTEGER size;
 
-  size.s.HighPart = 0;
-  size.s.LowPart = 0;
+  size.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  size.DUMMYSTRUCTNAME_DOT LowPart = 0;
 
   hr = StorageBaseImpl_OpenStream(
@@ -2283 +2283 @@
      * Add one block for the big block depot and one block for the properties
      */
-    size.s.HighPart = 0;
-    size.s.LowPart  = This->bigBlockSize * 3;
+    size.DUMMYSTRUCTNAME_DOT HighPart = 0;
+    size.DUMMYSTRUCTNAME_DOT LowPart  = This->bigBlockSize * 3;
     BIGBLOCKFILE_SetSize(This->bigBlockFile, size);
 
@@ -2351 +2351 @@
     rootProp.dirProperty      = PROPERTY_NULL;
     rootProp.startingBlock    = BLOCK_END_OF_CHAIN;
-    rootProp.size.s.HighPart    = 0;
-    rootProp.size.s.LowPart     = 0;
+    rootProp.size.DUMMYSTRUCTNAME_DOT HighPart    = 0;
+    rootProp.size.DUMMYSTRUCTNAME_DOT LowPart     = 0;
 
     StorageImpl_WriteProperty(This, 0, &rootProp);
@@ -3128 +3128 @@
   ULONG          bytesRead;
 
-  offsetInPropSet.s.HighPart = 0;
-  offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
+  offsetInPropSet.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offsetInPropSet.DUMMYSTRUCTNAME_DOT LowPart  = index * PROPSET_BLOCK_SIZE;
 
   readSuccessful = BlockChainStream_ReadAt(
@@ -3206 +3206 @@
       currentProperty,
       OFFSET_PS_SIZE,
-      &buffer->size.s.LowPart);
-
-    buffer->size.s.HighPart = 0;
+      &buffer->size.DUMMYSTRUCTNAME_DOT LowPart);
+
+    buffer->size.DUMMYSTRUCTNAME_DOT HighPart = 0;
   }
 
@@ -3227 +3227 @@
   ULONG          bytesWritten;
 
-  offsetInPropSet.s.HighPart = 0;
-  offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
+  offsetInPropSet.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offsetInPropSet.DUMMYSTRUCTNAME_DOT LowPart  = index * PROPSET_BLOCK_SIZE;
 
   memset(currentProperty, 0, PROPSET_BLOCK_SIZE);
@@ -3292 +3292 @@
     currentProperty,
       OFFSET_PS_SIZE,
-      buffer->size.s.LowPart);
+      buffer->size.DUMMYSTRUCTNAME_DOT LowPart);
 
   writeSuccessful = BlockChainStream_WriteAt(This->rootBlockChain,
@@ -3404 +3404 @@
    * by small block size increments.
    */
-  offset.s.LowPart = 0;
-  offset.s.HighPart = 0;
+  offset.DUMMYSTRUCTNAME_DOT LowPart = 0;
+  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
   cbTotalRead = 0;
   cbTotalWritten = 0;
@@ -3426 +3426 @@
     cbTotalWritten += cbWritten;
 
-    offset.s.LowPart += This->smallBlockSize;
+    offset.DUMMYSTRUCTNAME_DOT LowPart += This->smallBlockSize;
 
   } while (successRead && successWrite);
@@ -3437 +3437 @@
    */
   propertyIndex = (*ppsbChain)->ownerPropertyIndex;
-  size.s.HighPart = 0;
-  size.s.LowPart  = 0;
+  size.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  size.DUMMYSTRUCTNAME_DOT LowPart  = 0;
   SmallBlockChainStream_SetSize(*ppsbChain, size);
   SmallBlockChainStream_Destroy(*ppsbChain);
@@ -4265 +4265 @@
   ULONG*         bytesRead)
 {
-  ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
-  ULONG offsetInBlock     = offset.s.LowPart % This->parentStorage->bigBlockSize;
+  ULONG blockNoInSequence = offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
+  ULONG offsetInBlock     = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize;
   ULONG bytesToReadInBuffer;
   ULONG blockIndex;
@@ -4353 +4353 @@
   ULONG*            bytesWritten)
 {
-  ULONG blockNoInSequence = offset.s.LowPart / This->parentStorage->bigBlockSize;
-  ULONG offsetInBlock     = offset.s.LowPart % This->parentStorage->bigBlockSize;
+  ULONG blockNoInSequence = offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
+  ULONG offsetInBlock     = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize;
   ULONG bytesToWrite;
   ULONG blockIndex;
@@ -4449 +4449 @@
    * Figure out how many blocks are needed to contain the new size
    */
-  numBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
-
-  if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
+  numBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
+
+  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize) != 0)
     numBlocks++;
 
@@ -4549 +4549 @@
    * Figure out how many blocks are needed to contain this stream
    */
-  newNumBlocks = newSize.s.LowPart / This->parentStorage->bigBlockSize;
-
-  if ((newSize.s.LowPart % This->parentStorage->bigBlockSize) != 0)
+  newNumBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->bigBlockSize;
+
+  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->bigBlockSize) != 0)
     newNumBlocks++;
 
@@ -4623 +4623 @@
   ULARGE_INTEGER size = BlockChainStream_GetSize(This);
 
-  if (newSize.s.LowPart == size.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart == size.DUMMYSTRUCTNAME_DOT LowPart)
     return TRUE;
 
-  if (newSize.s.LowPart < size.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart < size.DUMMYSTRUCTNAME_DOT LowPart)
   {
     BlockChainStream_Shrink(This, newSize);
@@ -4635 +4635 @@
       BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
 
-    ULONG diff = newSize.s.LowPart - size.s.LowPart;
+    ULONG diff = newSize.DUMMYSTRUCTNAME_DOT LowPart - size.DUMMYSTRUCTNAME_DOT LowPart;
 
     /*
@@ -4644 +4644 @@
                 (diff % This->parentStorage->bigBlockSize) );
 
-    fileSize.s.LowPart += diff;
+    fileSize.DUMMYSTRUCTNAME_DOT LowPart += diff;
     BIGBLOCKFILE_SetSize(This->parentStorage->bigBlockFile, fileSize);
 
@@ -4684 +4684 @@
      */
     ULARGE_INTEGER result;
-    result.s.HighPart = 0;
-
-    result.s.LowPart  =
+    result.DUMMYSTRUCTNAME_DOT HighPart = 0;
+
+    result.DUMMYSTRUCTNAME_DOT LowPart  =
       BlockChainStream_GetCount(This) *
       This->parentStorage->bigBlockSize;
@@ -4767 +4767 @@
   *nextBlockInChain = BLOCK_END_OF_CHAIN;
 
-  offsetOfBlockInDepot.s.HighPart = 0;
-  offsetOfBlockInDepot.s.LowPart  = blockIndex * sizeof(ULONG);
+  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart  = blockIndex * sizeof(ULONG);
 
   /*
@@ -4806 +4806 @@
   ULONG  bytesWritten;
 
-  offsetOfBlockInDepot.s.HighPart = 0;
-  offsetOfBlockInDepot.s.LowPart  = blockIndex * sizeof(ULONG);
+  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart  = blockIndex * sizeof(ULONG);
 
   StorageUtl_WriteDWord(&buffer, 0, nextBlock);
@@ -4852 +4852 @@
   ULONG smallBlocksPerBigBlock;
 
-  offsetOfBlockInDepot.s.HighPart = 0;
+  offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
   /*
@@ -4859 +4859 @@
   while (nextBlockIndex != BLOCK_UNUSED)
   {
-    offsetOfBlockInDepot.s.LowPart = blockIndex * sizeof(ULONG);
+    offsetOfBlockInDepot.DUMMYSTRUCTNAME_DOT LowPart = blockIndex * sizeof(ULONG);
 
     success = BlockChainStream_ReadAt(
@@ -4946 +4946 @@
 
         rootProp.startingBlock = sbStartIndex;
-        rootProp.size.s.HighPart = 0;
-        rootProp.size.s.LowPart  = This->parentStorage->bigBlockSize;
+        rootProp.size.DUMMYSTRUCTNAME_DOT HighPart = 0;
+        rootProp.size.DUMMYSTRUCTNAME_DOT LowPart  = This->parentStorage->bigBlockSize;
 
         StorageImpl_WriteProperty(
@@ -4973 +4973 @@
       &rootProp);
 
-    if (rootProp.size.s.LowPart <
+    if (rootProp.size.DUMMYSTRUCTNAME_DOT LowPart <
        (blocksRequired * This->parentStorage->bigBlockSize))
     {
-      rootProp.size.s.LowPart += This->parentStorage->bigBlockSize;
+      rootProp.size.DUMMYSTRUCTNAME_DOT LowPart += This->parentStorage->bigBlockSize;
 
       BlockChainStream_SetSize(
@@ -5008 +5008 @@
   ULARGE_INTEGER offsetInBigBlockFile;
   ULONG blockNoInSequence =
-    offset.s.LowPart / This->parentStorage->smallBlockSize;
-
-  ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
+    offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
+
+  ULONG offsetInBlock = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize;
   ULONG bytesToReadInBuffer;
   ULONG blockIndex;
@@ -5019 +5019 @@
    * This should never happen on a small block file.
    */
-  assert(offset.s.HighPart==0);
+  assert(offset.DUMMYSTRUCTNAME_DOT HighPart==0);
 
   /*
@@ -5051 +5051 @@
      * Calculate the offset of the small block in the small block file.
      */
-    offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   =
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT HighPart  = 0;
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart   =
       blockIndex * This->parentStorage->smallBlockSize;
 
-    offsetInBigBlockFile.s.LowPart  += offsetInBlock;
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart  += offsetInBlock;
 
     /*
@@ -5098 +5098 @@
   ULARGE_INTEGER offsetInBigBlockFile;
   ULONG blockNoInSequence =
-    offset.s.LowPart / This->parentStorage->smallBlockSize;
-
-  ULONG offsetInBlock = offset.s.LowPart % This->parentStorage->smallBlockSize;
+    offset.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
+
+  ULONG offsetInBlock = offset.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize;
   ULONG bytesToWriteInBuffer;
   ULONG blockIndex;
@@ -5109 +5109 @@
    * This should never happen on a small block file.
    */
-  assert(offset.s.HighPart==0);
+  assert(offset.DUMMYSTRUCTNAME_DOT HighPart==0);
 
   /*
@@ -5142 +5142 @@
      * Calculate the offset of the small block in the small block file.
      */
-    offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   =
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT HighPart  = 0;
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart   =
       blockIndex * This->parentStorage->smallBlockSize;
 
-    offsetInBigBlockFile.s.LowPart  += offsetInBlock;
+    offsetInBigBlockFile.DUMMYSTRUCTNAME_DOT LowPart  += offsetInBlock;
 
     /*
@@ -5187 +5187 @@
   ULONG count = 0;
 
-  numBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
-
-  if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
+  numBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
+
+  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize) != 0)
     numBlocks++;
 
@@ -5300 +5300 @@
    * Figure out how many blocks are needed to contain this stream
    */
-  newNumBlocks = newSize.s.LowPart / This->parentStorage->smallBlockSize;
-
-  if ((newSize.s.LowPart % This->parentStorage->smallBlockSize) != 0)
+  newNumBlocks = newSize.DUMMYSTRUCTNAME_DOT LowPart / This->parentStorage->smallBlockSize;
+
+  if ((newSize.DUMMYSTRUCTNAME_DOT LowPart % This->parentStorage->smallBlockSize) != 0)
     newNumBlocks++;
 
@@ -5376 +5376 @@
   ULARGE_INTEGER size = SmallBlockChainStream_GetSize(This);
 
-  if (newSize.s.LowPart == size.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart == size.DUMMYSTRUCTNAME_DOT LowPart)
     return TRUE;
 
-  if (newSize.s.LowPart < size.s.LowPart)
+  if (newSize.DUMMYSTRUCTNAME_DOT LowPart < size.DUMMYSTRUCTNAME_DOT LowPart)
   {
     SmallBlockChainStream_Shrink(This, newSize);
@@ -5822 +5822 @@
   ULARGE_INTEGER offset;
 
-  offset.s.HighPart = 0;
-  offset.s.LowPart  = 0;
+  offset.DUMMYSTRUCTNAME_DOT HighPart = 0;
+  offset.DUMMYSTRUCTNAME_DOT LowPart  = 0;
 
   ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL);
@@ -6810 +6810 @@
 
         /*Get the OleType from the CompObj Stream */
-        iSeekPos.s.LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
-        iSeekPos.s.HighPart = 0;
+        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = sizeof(CompObj.byUnknown1) + sizeof(CompObj.clsid);
+        iSeekPos.DUMMYSTRUCTNAME_DOT HighPart = 0;
 
         IStream_Seek(pStream, iSeekPos, STREAM_SEEK_SET, NULL);
         IStream_Read(pStream, &CompObj.dwCLSIDNameLength, sizeof(CompObj.dwCLSIDNameLength), NULL);
-        iSeekPos.s.LowPart = CompObj.dwCLSIDNameLength;
+        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = CompObj.dwCLSIDNameLength;
         IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
         IStream_Read(pStream, &CompObj.dwOleTypeNameLength, sizeof(CompObj.dwOleTypeNameLength), NULL);
-        iSeekPos.s.LowPart = CompObj.dwOleTypeNameLength;
+        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = CompObj.dwOleTypeNameLength;
         IStream_Seek(pStream, iSeekPos, STREAM_SEEK_CUR , NULL);
 
@@ -6957 +6957 @@
         strcpy(pOleStreamData[1].strOleTypeName, strMetafilePictName);
 
-        iSeekPos.s.HighPart = 0;
-        iSeekPos.s.LowPart = sizeof(olePress.byUnknown1);
+        iSeekPos.DUMMYSTRUCTNAME_DOT HighPart = 0;
+        iSeekPos.DUMMYSTRUCTNAME_DOT LowPart = sizeof(olePress.byUnknown1);
 
         /* Get Presentation Data */