Changeset 9400 for trunk/src/ole32/filemoniker.c

Timestamp:

Nov 12, 2002, 6:07:48 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/ole32/filemoniker.c (modified) (2 diffs)

trunk/src/ole32/filemoniker.c

@@ -871 +871 @@
 
     if (!IsEqualCLSID(&clsid,&CLSID_FileMoniker))
-
         return S_FALSE;
 
-    res=CreateBindCtx(0,&bind);
-    if (FAILED(res))
-        return res;
-
-    IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&filePath);
-
-    if (lstrcmpiW(filePath,
-                  This->filePathName)!=0)
-
-        return S_FALSE;
-
-    return S_OK;
+    res = CreateBindCtx(0,&bind);
+    if (FAILED(res)) return res;
+
+    if (SUCCEEDED(IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&filePath))) {
+        int result = lstrcmpiW(filePath, This->filePathName);
+        CoTaskMemFree(filePath);
+        if ( result == 0 ) return S_OK;
+    }
+    return S_FALSE;
+
 }
 
@@ -1100 +1097 @@
     int len=lstrlenW(str);
 
+    TRACE("%s, %p\n", debugstr_w(str), *stringTable);
+
     strgtable =CoTaskMemAlloc(len*sizeof(LPOLESTR));