Changeset 6711 for trunk/src/ole32/moniker.c

Timestamp:

Sep 15, 2001, 11:32:00 AM (24 years ago)

Author:

sandervl

Message:

restored old version + wine update

File:

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

trunk/src/ole32/moniker.c

@@ -1 @@
-/* $Id: moniker.c,v 1.3 2001-09-05 13:17:10 bird Exp $ */
 /*
- *  Monikers
+ *      Monikers
  *
- *  Copyright 1998  Marcus Meissner
+ *      Copyright 1998  Marcus Meissner
  *      Copyright 1999  Noomen Hamza
  */
@@ -23 +22 @@
 #include "compobj_private.h"
 
+#ifdef __WIN32OS2__
+#undef FIXME
+#undef TRACE
+#ifdef DEBUG
+#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
+#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
+#else
+#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#endif
+#endif
+
 DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -47 +58 @@
     DWORD      runObjTabLastIndx;  /* first free index element in the table.        */
     DWORD      runObjTabRegister; /* registration key of the next registered object */
-
+    
 } RunningObjectTableImpl;
 
@@ -137 +148 @@
 {
     TRACE("()\n");
-
+    
     if (runningObjectTableInstance==NULL)
         return E_INVALIDARG;
@@ -170 +181 @@
             if (( This->runObjTab[i].regTypeObj &  ROTFLAGS_REGISTRATIONKEEPSALIVE) != 0)
                 IUnknown_Release(This->runObjTab[i].pObj);
-
+ 
             IMoniker_Release(This->runObjTab[i].pmkObj);
         }
@@ -230 +241 @@
     if (runningObjectTableInstance==NULL)
         return E_POINTER;
-
+    
     RunningObjectTableImpl_Release((IRunningObjectTable*)runningObjectTableInstance);
 
@@ -271 +282 @@
     This->runObjTab[This->runObjTabLastIndx].identRegObj = This->runObjTabRegister;
     CoFileTimeNow(&(This->runObjTab[This->runObjTabLastIndx].lastModifObj));
-
+    
     /* gives a registration identifier to the registered object*/
     (*pdwRegister)= This->runObjTabRegister;
@@ -278 +289 @@
 
         FIXME("runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
-    return E_FAIL;
+        return E_FAIL;
 }
     This->runObjTabRegister++;
     This->runObjTabLastIndx++;
-
+    
     if (This->runObjTabLastIndx == This->runObjTabSize){ /* table is full ! so it must be resized */
 
@@ -296 +307 @@
 
     IMoniker_AddRef(pmkObjectName);
-
+    
     return res;
 }
@@ -322 +333 @@
 
     IMoniker_Release(This->runObjTab[index].pmkObj);
-
+    
     /* remove the object from the table */
     for(j=index; j<This->runObjTabLastIndx-1; j++)
         This->runObjTab[j]= This->runObjTab[j+1];
-
+    
     This->runObjTabLastIndx--;
 
@@ -337 +348 @@
 HRESULT WINAPI RunningObjectTableImpl_IsRunning(  IRunningObjectTable* iface,
                                                   IMoniker *pmkObjectName)  /* Pointer to the moniker of the object whose status is desired */
-{
+{    
     ICOM_THIS(RunningObjectTableImpl,iface);
 
@@ -359 +370 @@
     if (ppunkObject==NULL)
         return E_POINTER;
-
+    
     *ppunkObject=0;
 
@@ -394 +405 @@
     return S_OK;
 }
-
+    
 /***********************************************************************
  *        RunningObjectTable_GetTimeOfLastChange
@@ -448 +459 @@
         /* search object identified by a register identifier */
         for(i=0;((i<This->runObjTabLastIndx)&&(This->runObjTab[i].identRegObj!=identReg));i++);
-
+    
     if (i==This->runObjTabLastIndx)  return S_FALSE;
 
@@ -457 +468 @@
 
 /******************************************************************************
- *      GetRunningObjectTable16 [OLE2.30]
+ *              GetRunningObjectTable16 [OLE2.30]
  */
 HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
-    FIXME("(%ld,%p),stub!\n",reserved,pprot);
+        FIXME("(%ld,%p),stub!\n",reserved,pprot);
     return E_NOTIMPL;
 }
@@ -491 +502 @@
 HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
 {
-  IRunnableObject   *runable;
+  IRunnableObject       *runable;
   ICOM_THIS(IRunnableObject,pUnknown);
-  LRESULT       ret;
+  LRESULT               ret;
 
 #ifdef __WIN32OS2__
@@ -502 +513 @@
 
   ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)&runable);
-  if (ret)
-    return 0; /* Appears to return no error. */
+  if (ret) 
+        return 0; /* Appears to return no error. */
   ret  = IRunnableObject_Run(runable,NULL);
   IRunnableObject_Release(runable);
@@ -513 +524 @@
  */
 HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName,
-                LPDWORD pchEaten, LPMONIKER *ppmk)
+                                LPDWORD pchEaten, LPMONIKER *ppmk)
 {
     FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk);
     if (!(IsValidInterface((LPUNKNOWN) pbc)))
-    return E_INVALIDARG;
+        return E_INVALIDARG;
 
     return MK_E_SYNTAX;