[PATCH 11/11] urlmon/tests: ReleaseBindInfo not present on W95B

Detlef Riekenberg wine.dev at web.de
Thu Apr 15 18:00:38 CDT 2010


---
 dlls/urlmon/tests/misc.c     |   15 +++++++++++----
 dlls/urlmon/tests/protocol.c |    5 ++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 5415d56..71bf347 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -72,6 +72,7 @@ static HRESULT (WINAPI *pCopyStgMedium)(const STGMEDIUM *, STGMEDIUM *);
 static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR,
                         DWORD, LPWSTR*, DWORD);
 static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*);
+static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*);
 
 static void test_CreateFormatEnum(void)
 {
@@ -1150,13 +1151,18 @@ static void test_ReleaseBindInfo(void)
     BINDINFO bi;
     IUnknown unk = { &unk_vtbl };
 
-    ReleaseBindInfo(NULL); /* shouldn't crash */
+    if (!pReleaseBindInfo) {
+        win_skip("ReleaseBindInfo not found\n");
+        return;
+    }
+
+    pReleaseBindInfo(NULL); /* shouldn't crash */
 
     memset(&bi, 0, sizeof(bi));
     bi.cbSize = sizeof(BINDINFO);
     bi.pUnk = &unk;
     SET_EXPECT(unk_Release);
-    ReleaseBindInfo(&bi);
+    pReleaseBindInfo(&bi);
     ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%d\n", bi.cbSize);
     ok(bi.pUnk == NULL, "bi.pUnk=%p, expected NULL\n", bi.pUnk);
     CHECK_CALLED(unk_Release);
@@ -1164,13 +1170,13 @@ static void test_ReleaseBindInfo(void)
     memset(&bi, 0, sizeof(bi));
     bi.cbSize = offsetof(BINDINFO, pUnk);
     bi.pUnk = &unk;
-    ReleaseBindInfo(&bi);
+    pReleaseBindInfo(&bi);
     ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%d\n", bi.cbSize);
     ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk);
 
     memset(&bi, 0, sizeof(bi));
     bi.pUnk = &unk;
-    ReleaseBindInfo(&bi);
+    pReleaseBindInfo(&bi);
     ok(!bi.cbSize, "bi.cbSize=%d, expected 0\n", bi.cbSize);
     ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk);
 }
@@ -1473,6 +1479,7 @@ START_TEST(misc)
     pCopyStgMedium = (void*) GetProcAddress(hurlmon, "CopyStgMedium");
     pFindMimeFromData = (void*) GetProcAddress(hurlmon, "FindMimeFromData");
     pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString");
+    pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
 
     register_protocols();
 
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 341a5c3..89b54ce 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -30,6 +30,8 @@
 #include "wininet.h"
 
 static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD);
+static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*);
+
 
 #define DEFINE_EXPECT(func) \
     static BOOL expect_ ## func = FALSE, called_ ## func = FALSE
@@ -1320,7 +1322,7 @@ static HRESULT WINAPI ProtocolEmul_Start(IInternetProtocol *iface, LPCWSTR szUrl
     ok(cbindf == (bindf|BINDF_FROMURLMON), "bindf = %x, expected %x\n",
        cbindf, (bindf|BINDF_FROMURLMON));
     ok(!memcmp(&exp_bindinfo, &bindinfo, sizeof(bindinfo)), "unexpected bindinfo\n");
-    ReleaseBindInfo(&bindinfo);
+    pReleaseBindInfo(&bindinfo);
 
     SET_EXPECT(ReportProgress_SENDINGREQUEST);
     hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, emptyW);
@@ -3061,6 +3063,7 @@ START_TEST(protocol)
 
     hurlmon = GetModuleHandle("urlmon.dll");
     pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession");
+    pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
 
     event_complete = CreateEvent(NULL, FALSE, FALSE, NULL);
     event_complete2 = CreateEvent(NULL, FALSE, FALSE, NULL);
-- 
1.7.0.4




More information about the wine-patches mailing list