Changeset 7926 for trunk/src/ole32/ole2.c

Timestamp:

Feb 15, 2002, 6:18:52 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync

File:

• trunk/src/ole32/ole2.c (modified) (18 diffs)

trunk/src/ole32/ole2.c

@@ +1 @@
+
 /*
  *      OLE2 library
@@ -6 +7 @@
  *      Copyright 1999  Noel Borthwick 
  */
+
+#include "config.h"
 
 #include <assert.h>
@@ -12 +15 @@
 #include <string.h>
 
+#include "commctrl.h"
+#include "ole2.h"
+#include "ole2ver.h"
 #include "windef.h"
 #include "winbase.h"
-#include "wingdi.h"
+#include "winerror.h"
 #include "winuser.h"
-#include "winerror.h"
-#include "ole2.h"
-#include "commctrl.h"
+#include "winreg.h"
+
 #include "wine/obj_clientserver.h"
 #include "wine/winbase16.h"
 #include "wine/wingdi16.h"
 #include "wine/winuser16.h"
+#include "ole32_main.h"
+
 #include "debugtools.h"
-#include "ole2ver.h"
-#include "winreg.h"
-#include "ole32_main.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
@@ -146 +150 @@
 /******************************************************************************
  *              OleBuildVersion [OLE2.1]
+ *              OleBuildVersion [OLE32.84]
  */
 DWORD WINAPI OleBuildVersion(void)
@@ -154 +159 @@
 
 /***********************************************************************
- *           OleInitialize       (OLE2.2) (OLE32.108)
+ *           OleInitialize       (OLE2.2)
+ *           OleInitialize       (OLE32.108)
  */
 HRESULT WINAPI OleInitialize(LPVOID reserved)
@@ -183 +189 @@
    */
   if (OLE_moduleLockCount==0)
-{
+  {
     /* 
      * Initialize the libraries.
@@ -203 +209 @@
      */
     OLEMenu_Initialize();
-}
+  }
 
   /*
@@ -214 +220 @@
 
 /******************************************************************************
- *              CoGetCurrentProcess     [COMPOBJ.34] [OLE2.2][OLE32.108]
+ *              CoGetCurrentProcess     [COMPOBJ.34]
+ *              CoGetCurrentProcess     [OLE32.18]
  *
  * NOTES
@@ -225 +232 @@
 
 /******************************************************************************
- *              OleUninitialize [OLE2.3] [OLE32.131]
+ *              OleUninitialize [OLE2.3]
+ *              OleUninitialize [OLE32.131]
  */
 void WINAPI OleUninitialize(void)
@@ -268 +276 @@
 }
 
-#ifndef __WIN32OS2__
-//imessagefilter.cpp
 /******************************************************************************
  *              CoRegisterMessageFilter [OLE32.38]
@@ -283 +289 @@
     return S_OK;
 }
-#endif
 
 /******************************************************************************
@@ -294 +299 @@
 
 /***********************************************************************
- *           RegisterDragDrop16 (OLE2.35)
+ *           RegisterDragDrop (OLE2.35)
  */
 HRESULT WINAPI RegisterDragDrop16(
@@ -348 +353 @@
 
 /***********************************************************************
- *           RevokeDragDrop16 (OLE2.36)
+ *           RevokeDragDrop (OLE2.36)
  */
 HRESULT WINAPI RevokeDragDrop16(
@@ -1067 +1072 @@
    * The Edit, Object & Help groups belong to the server object
    * and the other three belong to the container.
-   * Loop thru the group widths and locate the group we are a member of.
+   * Loop through the group widths and locate the group we are a member of.
    */
   for ( i = 0, nWidth = 0; i < 6; i++ )
@@ -1413 +1418 @@
 
     if(!lpMsg) return FALSE;
+
 #ifdef __WIN32OS2__
     if (!hAccel || !(lpAccelTbl = (LPACCEL16)LockResource(hAccel)))
@@ -1546 +1552 @@
            (pmedium->u.hMetaFilePict!=0) )
       {
-        LPMETAFILEPICT pMP = GlobalLock(pmedium->u.hMetaFilePict);
+        LPMETAFILEPICT pMP = GlobalLock(pmedium->u.hGlobal);
         DeleteMetaFile(pMP->hMF);
-        GlobalUnlock(pmedium->u.hMetaFilePict);
-        GlobalFree(pmedium->u.hMetaFilePict);
+        GlobalUnlock(pmedium->u.hGlobal);
+        GlobalFree(pmedium->u.hGlobal);
       }
 
@@ -2200 +2206 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- * OleMetaFilePictFromIconAndLabel
+ * OleMetaFilePictFromIconAndLabel (OLE2.56)
  *
  * Returns a global memory handle to a metafile which contains the icon and
@@ -2243 +2249 @@
 }
 #endif
+
 /******************************************************************************
- * DllDebugObjectRPCHook
+ * DllDebugObjectRPCHook (OLE32.62)
  * turns on and off internal debugging,  pointer is only used on macintosh
  */