Alistair Leslie-Hughes : urlmon: Fix PutProperty_CLASSIDPROP check under win98 to w2k.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef2f455cdf08eb371c30535483aa498f208b7bd7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ef2f455cdf08eb371c30535483...

Author: Alistair Leslie-Hughes 
Date:   Tue Feb 17 20:06:18 2009 +1100

urlmon: Fix PutProperty_CLASSIDPROP check under win98 to w2k.

---

dlls/urlmon/tests/url.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index e5895c4..094d21d 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -69,6 +69,12 @@ DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x0
         expect_ ## func = called_ ## func = FALSE; \
     }while(0)

+#define CHECK_CALLED_BROKEN(func) \
+    do { \
+        ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \
+        expect_ ## func = called_ ## func = FALSE; \
+    }while(0)
+
 #define CLEAR_CALLED(func) \
     expect_ ## func = called_ ## func = FALSE

@@ -313,7 +319,7 @@ static DWORD WINAPI thread_proc(PVOID arg)
         CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION);
         CHECK_CALLED(CreateInstance);
         CHECK_CALLED(PutProperty_MIMETYPEPROP);
-        CHECK_CALLED(PutProperty_CLASSIDPROP);
+        CHECK_CALLED_BROKEN(PutProperty_CLASSIDPROP);
         CHECK_CALLED(Load);
         CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION);
         CHECK_CALLED(OnObjectAvailable);
@@ -612,7 +618,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
         CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION);
         CHECK_CALLED(CreateInstance);
         CHECK_CALLED(PutProperty_MIMETYPEPROP);
-        CHECK_CALLED(PutProperty_CLASSIDPROP);
+        CHECK_CALLED_BROKEN(PutProperty_CLASSIDPROP);
         CHECK_CALLED(Load);
         CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION);
         CHECK_CALLED(OnObjectAvailable);