Changeset 4258 for trunk/src/ole32/antimoniker.cpp

Timestamp:

Sep 14, 2000, 4:57:01 PM (25 years ago)

Author:

davidr

Message:

BugFixes & Updates (CorelWine)

File:

• trunk/src/ole32/antimoniker.cpp (modified) (6 diffs)

trunk/src/ole32/antimoniker.cpp

@@ -1 @@
-/* $Id: antimoniker.cpp,v 1.2 1999-09-24 21:49:42 davidr Exp $ */
+/* $Id: antimoniker.cpp,v 1.3 2000-09-14 14:57:00 davidr Exp $ */
 /* 
  * AntiMonikers functions.
  * 
- * 20/9/99
- * 
- * Copyright 1999 David J. Raison
+ * Copyright 1999, 2000 David J. Raison
  * 
  * Direct port of Wine Implementation
  *   Copyright 1999  Noomen Hamza
+ *
+ * Updates.
+ *   14/09/2000 Updated from CorelWine
+ * 
  */
 
@@ -14 +16 @@
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(moniker)
 
 /* AntiMoniker data structure */
@@ -196 +198 @@
 HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID)
 {
-    TRACE("(%p,%p),stub!\n",iface,pClassID);
+    TRACE("(iface:%p ClassID:%p [CLSID_AntiMoniker])\n",iface,pClassID);
 
     if (pClassID==NULL)
@@ -252 +254 @@
 
 /******************************************************************************
+ *        AntiMonikerImpl_GetSizeToSave
+ ******************************************************************************/
+HRESULT AntiMonikerImpl_GetSizeToSave(IMoniker* iface,ULARGE_INTEGER* pcbSize)
+{
+    if (pcbSize==NULL)
+        return E_POINTER;
+
+    pcbSize->LowPart =  sizeof(DWORD);
+    pcbSize->HighPart = 0;
+
+    return S_OK;
+}
+
+/******************************************************************************
  *        AntiMoniker_GetSizeMax
  ******************************************************************************/
@@ -259 +275 @@
     TRACE("(%p,%p)\n",iface,pcbSize);
 
-    if (pcbSize!=NULL)
-        return E_POINTER;
-
-    /* for more details see AntiMonikerImpl_Save coments */
-    
-    /* 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->LowPart =  sizeof(DWORD)+16;
-
-    pcbSize->HighPart=0;
-
-    return S_OK;
-}
+    if (pcbSize == NULL)
+        return E_POINTER;
+
+    /* GetSizeMax = SizeToSave + 16 */
+    AntiMonikerImpl_GetSizeToSave(iface,pcbSize);
+    pcbSize->LowPart += 16;     //FIXME - 64bit math
+//    pcbSize->HighPart = 0;
+
+    return S_OK;
+}
+
 
 /******************************************************************************
@@ -434 +448 @@
 
     if (FAILED(res))
-    return res;
+        return res;
 
     res = IRunningObjectTable_IsRunning(rot,iface);