Robert Shearman : ole32: Fix the loop in CompositeMonikerImpl_Hash, as IEnumMoniker_Next

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


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

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

ole32: Fix the loop in CompositeMonikerImpl_Hash, as IEnumMoniker_Next
will return S_FALSE when there are no more monikers left to enumerate.

---

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

diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 778945e..9122c1a 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -601,11 +601,7 @@ CompositeMonikerImpl_Hash(IMoniker* ifac
     if(FAILED(res))
         return res;
 
-    while(1){
-        res=IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL);
-        if(FAILED(res))
-            break;
-            
+    while(IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL)==S_OK){
         res = IMoniker_Hash(tempMk, &tempHash);
         if(FAILED(res))
             break;




More information about the wine-cvs mailing list