Changeset 7958 for trunk/src

Timestamp:

Feb 19, 2002, 1:36:54 PM (24 years ago)

Author:

sandervl

Message:

put back old code

Location:

trunk/src/ole32

Files:

• clipboard.c (modified) (2 diffs)
• clsid.cpp (modified) (3 diffs)
• compobj_private.h (modified) (2 diffs)
• dbgwrap.cpp (modified) (2 diffs)
• marshal.c (modified) (1 diff)
• 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;
@@ -575 +571 @@
  *           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.15 2002-02-18 23:24:09 phaller Exp $ */
+/* $Id: clsid.cpp,v 1.16 2002-02-19 12:34:49 sandervl 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"));
@@ -46 +42 @@
 // 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/compobj_private.h

@@ -17 +17 @@
 extern HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv);
 
-#ifndef __WIN32OS2__
 inline static HRESULT
 get_facbuf_for_iid(REFIID riid,IPSFactoryBuffer **facbuf) {
@@ -27 +26 @@
     return CoGetClassObject(&pxclsid,CLSCTX_INPROC_SERVER,NULL,&IID_IPSFactoryBuffer,(LPVOID*)facbuf);
 }
-#endif
 
 #define PIPEPREF "\\\\.\\pipe\\"

trunk/src/ole32/dbgwrap.cpp

@@ -94 +94 @@
 NODEF_DEBUGWRAP0(GetHookInterface)
 DEBUGWRAP8(GetRunningObjectTable)
-DEBUGWRAP8(IIDFromString)
+NODEF_DEBUGWRAP8(IIDFromString)
 DEBUGWRAP16(IsAccelerator)
 NODEF_DEBUGWRAP8(CONCRETE_IsEqualGUID)
@@ -173 +173 @@
 DEBUGWRAP8(StringFromCLSID)
 DEBUGWRAP12(StringFromGUID2)
-DEBUGWRAP8(StringFromIID)
+NODEF_DEBUGWRAP8(StringFromIID)
 NODEF_DEBUGWRAP0(UtConvertDvtd16toDvtd32)
 NODEF_DEBUGWRAP0(UtConvertDvtd32toDvtd16)

trunk/src/ole32/marshal.c

@@ -63 +63 @@
 static int nrofproxies = 0;
 
-#ifdef __WIN32OS2__
-inline static HRESULT
-get_facbuf_for_iid(REFIID riid,IPSFactoryBuffer **facbuf) {
-    HRESULT       hres;
-    CLSID         pxclsid;
-
-    if ((hres = CoGetPSClsid(riid,&pxclsid)))
-        return hres;
-    return CoGetClassObject(&pxclsid,CLSCTX_INPROC_SERVER,NULL,&IID_IPSFactoryBuffer,(LPVOID*)facbuf);
-}
-#endif
-
-
 HRESULT
 MARSHAL_Find_Stub_Server(wine_marshal_id *mid,LPUNKNOWN *punk) {

trunk/src/ole32/stubs.cpp

@@ -1 @@
-/* $Id: stubs.cpp,v 1.20 2002-02-18 23:24:09 phaller Exp $ */
+/* $Id: stubs.cpp,v 1.21 2002-02-19 12:34:50 sandervl 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"));