[PATCH 12/12] urlmon/tests: UrlMkGetSessionOption not present on W95B [last in patchset]

[Detlef Riekenberg]

The test is now loading without a dialog
---
 dlls/urlmon/tests/misc.c |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 71bf347..c75fd12 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -73,6 +73,8 @@ 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 HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD);
+
 
 static void test_CreateFormatEnum(void)
 {
@@ -1238,36 +1240,42 @@ static void test_UrlMkGetSessionOption(void)
     DWORD encoding, size;
     HRESULT hres;
 
+
+    if (!pUrlMkGetSessionOption) {
+        win_skip("UrlMkGetSessionOption not found\n");
+        return;
+    }
+
     size = encoding = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
                                  sizeof(encoding), &size, 0);
     ok(hres == S_OK, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(encoding != 0xdeadbeef, "encoding not changed\n");
     ok(size == sizeof(encoding), "size=%d\n", size);
 
     size = encoding = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
                                  sizeof(encoding)+1, &size, 0);
     ok(hres == S_OK, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(encoding != 0xdeadbeef, "encoding not changed\n");
     ok(size == sizeof(encoding), "size=%d\n", size);
 
     size = encoding = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
                                  sizeof(encoding)-1, &size, 0);
     ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding);
     ok(size == 0xdeadbeef, "size=%d\n", size);
 
     size = encoding = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, NULL,
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, NULL,
                                  sizeof(encoding)-1, &size, 0);
     ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding);
     ok(size == 0xdeadbeef, "size=%d\n", size);
 
     encoding = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding,
                                  sizeof(encoding)-1, NULL, 0);
     ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding);
@@ -1283,8 +1291,8 @@ static void test_user_agent(void)
     HRESULT hres;
     DWORD size, saved;
 
-    if (!pObtainUserAgentString) {
-        win_skip("ObtainUserAgentString not found\n");
+    if (!pObtainUserAgentString || !UrlMkGetSessionOption) {
+        win_skip("ObtainUserAgentString or UrlMkGetSessionOption not found\n");
         return;
     }
 
@@ -1329,18 +1337,18 @@ static void test_user_agent(void)
     ok(size == saved, "size=%d, expected %d\n", size, saved);
 
     size = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 0, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size, "size == 0\n");
 
     size = 0xdeadbeef;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 1000, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, NULL, 1000, &size, 0);
     ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size, "size == 0\n");
 
     saved = size;
     size = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved+10, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved+10, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == saved, "size = %d, expected %d\n", size, saved);
     ok(sizeof(expected) <= strlen(str2) && !memcmp(expected, str2, sizeof(expected)-1),
@@ -1349,7 +1357,7 @@ static void test_user_agent(void)
 
     size = 0;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == saved, "size = %d, expected %d\n", size, saved);
     ok(sizeof(expected) <= strlen(str2) && !memcmp(expected, str2, sizeof(expected)-1),
@@ -1358,14 +1366,14 @@ static void test_user_agent(void)
 
     size = saved;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved-1, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved-1, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == saved, "size = %d, expected %d\n", size, saved);
     ok(!str2[0], "buf changed\n");
 
     size = saved;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, NULL, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, NULL, 0);
     ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(!str2[0], "buf changed\n");
 
@@ -1374,7 +1382,7 @@ static void test_user_agent(void)
 
     size = 0;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == sizeof(test_str) && !memcmp(str2, test_str, sizeof(test_str)), "wrong user agent\n");
 
@@ -1383,7 +1391,7 @@ static void test_user_agent(void)
 
     size = 0;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == sizeof(test_str) && !memcmp(str2, test_str, sizeof(test_str)), "wrong user agent\n");
 
@@ -1392,7 +1400,7 @@ static void test_user_agent(void)
 
     size = 0;
     str2[0] = 0;
-    hres = UrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
+    hres = pUrlMkGetSessionOption(URLMON_OPTION_USERAGENT, str2, saved, &size, 0);
     ok(hres == E_OUTOFMEMORY, "UrlMkGetSessionOption failed: %08x\n", hres);
     ok(size == 3 && !strcmp(str2, "te"), "wrong user agent\n");
 
@@ -1480,6 +1488,7 @@ START_TEST(misc)
     pFindMimeFromData = (void*) GetProcAddress(hurlmon, "FindMimeFromData");
     pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString");
     pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
+    pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption");
 
     register_protocols();
 
-- 
1.7.0.4