Robert Shearman : ole32: Fix CompositeMonikerImpl_GetSizeMax to match the data written by CompositeMonikerImpl_Save .

Alexandre Julliard julliard at wine.codeweavers.com
Mon May 8 09:06:07 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 3a77ee1d5e48f676f3e954749fe0bae0ef0d79eb
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=3a77ee1d5e48f676f3e954749fe0bae0ef0d79eb

Author: Robert Shearman <rob at codeweavers.com>
Date:   Mon May  8 12:38:13 2006 +0100

ole32: Fix CompositeMonikerImpl_GetSizeMax to match the data written by CompositeMonikerImpl_Save.

---

 dlls/ole32/compositemoniker.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 9122c1a..36b4c27 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -303,19 +303,17 @@ CompositeMonikerImpl_GetSizeMax(IMoniker
     if (!pcbSize)
         return E_POINTER;
 
-    pcbSize->u.LowPart =0;
-    pcbSize->u.HighPart=0;
+    pcbSize->QuadPart = sizeof(DWORD);
 
     IMoniker_Enum(iface,TRUE,&enumMk);
 
-    while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)){
+    while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)==S_OK){
 
         IMoniker_GetSizeMax(pmk,&ptmpSize);
 
         IMoniker_Release(pmk);
 
-        pcbSize->u.LowPart +=ptmpSize.u.LowPart;
-        pcbSize->u.HighPart+=ptmpSize.u.HighPart;
+        pcbSize->QuadPart = ptmpSize.QuadPart + sizeof(CLSID);
     }
 
     IEnumMoniker_Release(enumMk);




More information about the wine-cvs mailing list