Changeset 7955 for trunk/src

Timestamp:

Feb 19, 2002, 12:24:24 AM (24 years ago)

Author:

phaller

Message:

Fixed dbgwrap for new defined prototypes

Location:

trunk/src/ole32

Files:

• clipboard.c (modified) (2 diffs)
• clsid.cpp (modified) (3 diffs)
• dbgwrap.cpp (modified) (5 diffs)
• stubs.cpp (modified) (2 diffs)

trunk/src/ole32/clipboard.c

@@ -296 +296 @@
  */
 
+#ifdef __WIN32OS2__
+HRESULT     WINAPI OleSetClipboard(LPDATAOBJECT pDataObj)
+#else
 HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj)
+#endif
 {
   HRESULT hr = S_OK;
@@ -571 +575 @@
  *           OleIsCurrentClipboard [OLE32.110]
  */
+#ifdef __WIN32OS2__
+HRESULT     WINAPI OleIsCurrentClipboard(LPDATAOBJECT pDataObject)
+#else
 HRESULT WINAPI OleIsCurrentClipboard (  IDataObject *pDataObject) 
+#endif
 {
   TRACE("()\n");

trunk/src/ole32/clsid.cpp

@@ -1 @@
-/* $Id: clsid.cpp,v 1.14 2001-04-26 19:32:42 sandervl Exp $ */
+/* $Id: clsid.cpp,v 1.15 2002-02-18 23:24:09 phaller Exp $ */
 /*
  *
@@ -29 +29 @@
 // IIDFromString
 // ----------------------------------------------------------------------
+#ifdef __WIN32OS2__
+HRESULT WINAPI IIDFromString(LPOLESTR lpsz, LPIID lpiid)
+#else
 HRESULT WIN32API IIDFromString(LPSTR lpsz, LPIID lpiid)
+#endif
 {
 //    dprintf(("OLE32: IIDFromString"));
@@ -42 +46 @@
 // Memory allocated here on behalf of application should be freed using CoTaskMemFree()
 // ----------------------------------------------------------------------
+#ifdef __WIN32OS2__
+HRESULT WINAPI StringFromIID(REFIID riid, LPOLESTR * ppsz)
+#else
 HRESULT WIN32API StringFromIID(REFIID riid, LPOLESTR *ppsz)
+#endif
 {
     char        tmp[50];

trunk/src/ole32/dbgwrap.cpp

@@ -94 +94 @@
 NODEF_DEBUGWRAP0(GetHookInterface)
 DEBUGWRAP8(GetRunningObjectTable)
-NODEF_DEBUGWRAP8(IIDFromString)
+DEBUGWRAP8(IIDFromString)
 DEBUGWRAP16(IsAccelerator)
 NODEF_DEBUGWRAP8(CONCRETE_IsEqualGUID)
@@ -121 +121 @@
 DEBUGWRAP4(OleDestroyMenuDescriptor)
 NODEF_DEBUGWRAP8(OleDoAutoConvert)
-NODEF_DEBUGWRAP16(OleDraw)
+DEBUGWRAP16(OleDraw)
 DEBUGWRAP12(OleDuplicateData)
 DEBUGWRAP0(OleFlushClipboard)
@@ -130 +130 @@
 DEBUGWRAP4(OleInitialize)
 NODEF_DEBUGWRAP0(OleInitializeWOW)
-NODEF_DEBUGWRAP4(OleIsCurrentClipboard)
+DEBUGWRAP4(OleIsCurrentClipboard)
 DEBUGWRAP4(OleIsRunning)
 DEBUGWRAP16(OleLoad)
@@ -147 +147 @@
 DEBUGWRAP8(OleSaveToStream)
 NODEF_DEBUGWRAP8(OleSetAutoConvert)
-NODEF_DEBUGWRAP4(OleSetClipboard)
+DEBUGWRAP4(OleSetClipboard)
 DEBUGWRAP8(OleSetContainedObject)
 DEBUGWRAP20(OleSetMenuDescriptor)
@@ -173 +173 @@
 DEBUGWRAP8(StringFromCLSID)
 DEBUGWRAP12(StringFromGUID2)
-NODEF_DEBUGWRAP8(StringFromIID)
+DEBUGWRAP8(StringFromIID)
 NODEF_DEBUGWRAP0(UtConvertDvtd16toDvtd32)
 NODEF_DEBUGWRAP0(UtConvertDvtd32toDvtd16)

trunk/src/ole32/stubs.cpp

@@ -1 @@
-/* $Id: stubs.cpp,v 1.19 2002-02-16 11:39:34 sandervl Exp $ */
+/* $Id: stubs.cpp,v 1.20 2002-02-18 23:24:09 phaller Exp $ */
 /* 
  * Win32 COM/OLE stubs for OS/2
@@ -225 +225 @@
 //*******************************************************************************
 HRESULT WIN32API OleDraw(IUnknown *pUnk, DWORD dwAspect, HDC hdcDraw,
-                            LPCRECT lprcBounds)
+                         LPCRECT lprcBounds)
 {
     dprintf(("OLE32: OleDraw - stub"));