March 2008 - Wine-Commits - list.winehq.org

Francois Gouget : winetest: Add prototypes to the functions.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 146a6e063c59d45a8f7c62e553e6c1837a9dc93f URL: http://source.winehq.org/git/tools.git/?a=commit;h=146a6e063c59d45a8f7c62e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:23:05 2008 +0100 winetest: Add prototypes to the functions. --- winetest/dissect | 2 +- winetest/gather | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 5f48f9e..b5ea968 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -37,7 +37,7 @@ use Errno qw/ENOTEMPTY/; my ($report, $tmpdir); -sub mydie { +sub mydie($) { my $errdir = tempdir ("errXXXXX", DIR => $queuedir); if (!rename $tmpdir, $errdir) { print "can't rename $tmpdir to $errdir: $!\n"; diff --git a/winetest/gather b/winetest/gather index e93e34c..80aec78 100755 --- a/winetest/gather +++ b/winetest/gather @@ -268,7 +268,7 @@ $header EOF # Output a single cell of a test -sub singletest { +sub singletest($$$) { my ($test, $testname, $groupname) = @_; my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}};

1 0

Francois Gouget : winetest: When a dll is missing, mark the test as 'n/a' for 'not applicable'.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: f271cfcf2215949f4ef5a430440ebc85b8cdd2f4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f271cfcf2215949f4ef5a430… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:21:56 2008 +0100 winetest: When a dll is missing, mark the test as 'n/a' for 'not applicable'. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 4555701..e93e34c 100755 --- a/winetest/gather +++ b/winetest/gather @@ -283,7 +283,7 @@ sub singletest { print OUT <<"EOF"; <td class="skip_pass"><a title="No tests run as $dll.dll is not present on this system" - >0</a></td> + >n/a</a></td> EOF } elsif ($count eq "winetest crash") { print OUT <<"EOF";

1 0

Francois Gouget : winetest: Strip the LF from the winetest URL. Fixes an HTML warning.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 775a554f3f83647e0a16417317bfbd0962c6dfe7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=775a554f3f83647e0a164173… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:24:01 2008 +0100 winetest: Strip the LF from the winetest URL. Fixes an HTML warning. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index bda1f95..c9e490a 100755 --- a/winetest/gather +++ b/winetest/gather @@ -97,7 +97,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { close TEST; next; } - if (($url = <TEST>) !~ s/^Archive: (.*)$/$1/) { + if (($url = <TEST>) !~ s/^Archive: (.*)\n$/$1/) { print "$file: wrong archive url: $_"; close TEST; next;

1 0

Jacek Caban : urlmon: Added special URLACTION_SCRIPT_OVERRIDE_SAFETY handling.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 8ef6713acb5e3287c1b0c6ce6ff27485a427f482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef6713acb5e3287c1b0c6ce6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:42:42 2008 +0100 urlmon: Added special URLACTION_SCRIPT_OVERRIDE_SAFETY handling. --- dlls/urlmon/sec_mgr.c | 6 ++++++ dlls/urlmon/tests/misc.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 525a37a..049ed2a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -176,6 +176,12 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s LONG res; HRESULT hres; + switch(action) { + case URLACTION_SCRIPT_OVERRIDE_SAFETY: + *(DWORD*)policy = URLPOLICY_DISALLOW; + return S_OK; + } + switch(zone_reg) { case URLZONEREG_DEFAULT: case URLZONEREG_HKCU: diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 77b00ad..96612b0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -856,6 +856,23 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag } } +static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZoneManager *zonemgr, DWORD action) +{ + DWORD policy; + HRESULT hres; + + policy = 0xdeadbeef; + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, + sizeof(DWORD), URLZONEREG_DEFAULT); + ok(hres == S_OK, "GetZoneActionPolicy failed: %08x\n", hres); + ok(policy == URLPOLICY_DISALLOW, "(%x) policy=%x, expected URLPOLIVY_DISALLOW\n", action, policy); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, + sizeof(WCHAR), NULL, 0, 0, 0); + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); +} + static void test_polices(void) { IInternetZoneManager *zonemgr = NULL; @@ -872,6 +889,8 @@ static void test_polices(void) test_url_action(secmgr, zonemgr, URLACTION_CHANNEL_SOFTDIST_PERMISSIONS); test_url_action(secmgr, zonemgr, 0xdeadbeef); + test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); + IInternetSecurityManager_Release(secmgr); IInternetZoneManager_Release(zonemgr); }

1 0

Jacek Caban : urlmon: Added more policy tests.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 3a736c6677cecf588368c44314390ebff239df72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a736c6677cecf588368c4431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:42:27 2008 +0100 urlmon: Added more policy tests. --- dlls/urlmon/tests/misc.c | 78 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 40701db..77b00ad 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -744,7 +744,7 @@ static void test_SecurityManager(void) int i; IInternetSecurityManager *secmgr = NULL; BYTE buf[512]; - DWORD zone, size; + DWORD zone, size, policy; HRESULT hres; hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); @@ -798,9 +798,84 @@ static void test_SecurityManager(void) ok(hres == E_INVALIDARG, "GetSecurityId failed: %08x, expected E_INVALIDARG\n", hres); + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, NULL, URLACTION_SCRIPT_RUN, (BYTE*)&policy, + sizeof(WCHAR), NULL, 0, 0, 0); + ok(hres == E_INVALIDARG, "ProcessUrlAction failed: %08x, expected E_INVALIDARG\n", hres); + IInternetSecurityManager_Release(secmgr); } +static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManager *zonemgr, DWORD action) +{ + DWORD res, size, policy, reg_policy; + char buf[10]; + HKEY hkey; + HRESULT hres; + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Zones\\3", &hkey); + if(res != ERROR_SUCCESS) { + ok(0, "Could not open zone key\n"); + return; + } + + wsprintf(buf, "%X", action); + size = sizeof(DWORD); + res = RegQueryValueExA(hkey, buf, NULL, NULL, (BYTE*)&reg_policy, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || size != sizeof(DWORD)) { + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + sizeof(WCHAR), NULL, 0, 0, 0); + ok(hres == E_FAIL, "ProcessUrlAction(%x) failed: %08x, expected E_FAIL\n", action, hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + + policy = 0xdeadbeef; + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, + sizeof(DWORD), URLZONEREG_DEFAULT); + ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + return; + } + + policy = 0xdeadbeef; + hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, + sizeof(DWORD), URLZONEREG_DEFAULT); + ok(hres == S_OK, "GetZoneActionPolicy failed: %08x\n", hres); + ok(policy == reg_policy, "(%x) policy=%x, expected %x\n", action, policy, reg_policy); + + if(policy != URLPOLICY_QUERY) { + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + sizeof(WCHAR), NULL, 0, 0, 0); + if(reg_policy == URLPOLICY_DISALLOW) + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + else + ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + } +} + +static void test_polices(void) +{ + IInternetZoneManager *zonemgr = NULL; + IInternetSecurityManager *secmgr = NULL; + HRESULT hres; + + hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); + hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); + + test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN); + test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY); + test_url_action(secmgr, zonemgr, URLACTION_CHANNEL_SOFTDIST_PERMISSIONS); + test_url_action(secmgr, zonemgr, 0xdeadbeef); + + IInternetSecurityManager_Release(secmgr); + IInternetZoneManager_Release(zonemgr); +} + static void test_ZoneManager(void) { IInternetZoneManager *zonemgr = NULL; @@ -1392,6 +1467,7 @@ START_TEST(misc) test_CoInternetQueryInfo(); test_FindMimeFromData(); test_SecurityManager(); + test_polices(); test_ZoneManager(); test_NameSpace(); test_MimeFilter();

1 0

Jacek Caban : urlmon: Added ProcessUrlAction implementation.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 15feb50d424a4cd017d1e4dacfc5c4302c24a550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15feb50d424a4cd017d1e4dac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:42:07 2008 +0100 urlmon: Added ProcessUrlAction implementation. --- dlls/urlmon/sec_mgr.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index efba140..525a37a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -457,6 +457,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * DWORD dwFlags, DWORD dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); + DWORD zone, policy; HRESULT hres; TRACE("(%p)->(%s %08x %p %08x %p %08x %08x %08x)\n", iface, debugstr_w(pwszUrl), dwAction, @@ -469,8 +470,36 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + if(pContext || cbContext || dwFlags || dwReserved) + FIXME("Unsupported arguments\n"); + + if(!pwszUrl) + return E_INVALIDARG; + + hres = map_url_to_zone(pwszUrl, &zone, NULL); + if(FAILED(hres)) + return hres; + + hres = get_action_policy(zone, dwAction, (BYTE*)&policy, sizeof(policy), URLZONEREG_DEFAULT); + if(FAILED(hres)) + return hres; + + TRACE("policy %x\n", policy); + + switch(GetUrlPolicyPermissions(policy)) { + case URLPOLICY_ALLOW: + case URLPOLICY_CHANNEL_SOFTDIST_PRECACHE: + return S_OK; + case URLPOLICY_DISALLOW: + return S_FALSE; + case URLPOLICY_QUERY: + FIXME("URLPOLICY_QUERY not implemented\n"); + return E_FAIL; + default: + FIXME("Not implemented policy %x\n", policy); + } + + return E_FAIL; }

1 0

Jacek Caban : urlmon: Added URLACTION_* and URLPOLICY_* declarations.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 19b6cf8135e74bde820b669f248efacda221fbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b6cf8135e74bde820b669f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 19:15:44 2008 +0100 urlmon: Added URLACTION_* and URLPOLICY_* declarations. --- include/urlmon.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index c0e0a77..c77971f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1019,6 +1019,120 @@ cpp_quote("#define MAX_SIZE_SECURITY_ID 512") [in] DWORD dwFlags); } +cpp_quote("#define URLACTION_MIN 0x00001000") +cpp_quote("#define URLACTION_DOWNLOAD_MIN 0x00001000") +cpp_quote("#define URLACTION_DOWNLOAD_SIGNED_ACTIVEX 0x00001001") +cpp_quote("#define URLACTION_DOWNLOAD_UNSIGNED_ACTIVEX 0x00001004") +cpp_quote("#define URLACTION_DOWNLOAD_CURR_MAX 0x00001004") +cpp_quote("#define URLACTION_DOWNLOAD_MAX 0x000011ff") + +cpp_quote("#define URLACTION_ACTIVEX_MIN 0x00001200") +cpp_quote("#define URLACTION_ACTIVEX_RUN 0x00001200") +cpp_quote("#define URLPOLICY_ACTIVEX_CHECK_LIST 0x00010000") +cpp_quote("#define URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY 0x00001201") +cpp_quote("#define URLACTION_ACTIVEX_OVERRIDE_DATA_SAFETY 0x00001202") +cpp_quote("#define URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY 0x00001203") +cpp_quote("#define URLACTION_SCRIPT_OVERRIDE_SAFETY 0x00001401") +cpp_quote("#define URLACTION_ACTIVEX_CONFIRM_NOOBJECTSAFETY 0x00001204") +cpp_quote("#define URLACTION_ACTIVEX_TREATASUNTRUSTED 0x00001205") +cpp_quote("#define URLACTION_ACTIVEX_CURR_MAX 0x00001205") +cpp_quote("#define URLACTION_ACTIVEX_MAX 0x000013ff") + +cpp_quote("#define URLACTION_SCRIPT_MIN 0x00001400") +cpp_quote("#define URLACTION_SCRIPT_RUN 0x00001400") +cpp_quote("#define URLACTION_SCRIPT_JAVA_USE 0x00001402") +cpp_quote("#define URLACTION_SCRIPT_SAFE_ACTIVEX 0x00001405") +cpp_quote("#define URLACTION_CROSS_DOMAIN_DATA 0x00001406") +cpp_quote("#define URLACTION_SCRIPT_PASTE 0x00001407") +cpp_quote("#define URLACTION_SCRIPT_CURR_MAX 0x00001407") +cpp_quote("#define URLACTION_SCRIPT_MAX 0x000015ff") + +cpp_quote("#define URLACTION_HTML_MIN 0x00001600") +cpp_quote("#define URLACTION_HTML_SUBMIT_FORMS 0x00001601") +cpp_quote("#define URLACTION_HTML_SUBMIT_FORMS_FROM 0x00001602") +cpp_quote("#define URLACTION_HTML_SUBMIT_FORMS_TO 0x00001603") +cpp_quote("#define URLACTION_HTML_FONT_DOWNLOAD 0x00001604") +cpp_quote("#define URLACTION_HTML_JAVA_RUN 0x00001605") +cpp_quote("#define URLACTION_HTML_USERDATA_SAVE 0x00001606") +cpp_quote("#define URLACTION_HTML_SUBFRAME_NAVIGATE 0x00001607") +cpp_quote("#define URLACTION_HTML_META_REFRESH 0x00001608") +cpp_quote("#define URLACTION_HTML_MIXED_CONTENT 0x00001609") +cpp_quote("#define URLACTION_HTML_MAX 0x000017ff") + +cpp_quote("#define URLACTION_SHELL_MIN 0x00001800") +cpp_quote("#define URLACTION_SHELL_INSTALL_DTITEMS 0x00001800") +cpp_quote("#define URLACTION_SHELL_MOVE_OR_COPY 0x00001802") +cpp_quote("#define URLACTION_SHELL_FILE_DOWNLOAD 0x00001803") +cpp_quote("#define URLACTION_SHELL_VERB 0x00001804") +cpp_quote("#define URLACTION_SHELL_WEBVIEW_VERB 0x00001805") +cpp_quote("#define URLACTION_SHELL_CURR_MAX 0x00001805") +cpp_quote("#define URLACTION_SHELL_MAX 0x000019ff") + +cpp_quote("#define URLACTION_NETWORK_MIN 0x00001a00") +cpp_quote("#define URLACTION_CREDENTIALS_USE 0x00001a00") +cpp_quote("#define URLACTION_AUTHENTICATE_CLIENT 0x00001a01") +cpp_quote("#define URLACTION_COOKIES 0x00001a02") +cpp_quote("#define URLACTION_COOKIES_SESSION 0x00001a03") +cpp_quote("#define URLACTION_CLIENT_CERT_PROMPT 0x00001a04") +cpp_quote("#define URLACTION_COOKIES_THIRD_PARTY 0x00001a05") +cpp_quote("#define URLACTION_COOKIES_SESSION_THIRD_PARTY 0x00001a06") +cpp_quote("#define URLACTION_COOKIES_ENABLED 0x00001a10") +cpp_quote("#define URLACTION_NETWORK_CURR_MAX 0x00001a10") +cpp_quote("#define URLACTION_NETWORK_MAX 0x00001bff") + +cpp_quote("#define URLACTION_JAVA_MIN 0x00001c00") +cpp_quote("#define URLACTION_JAVA_PERMISSIONS 0x00001c00") +cpp_quote("#define URLPOLICY_JAVA_PROHIBIT 0x00000000") +cpp_quote("#define URLPOLICY_JAVA_HIGH 0x00010000") +cpp_quote("#define URLPOLICY_JAVA_MEDIUM 0x00020000") +cpp_quote("#define URLPOLICY_JAVA_LOW 0x00030000") +cpp_quote("#define URLPOLICY_JAVA_CUSTOM 0x00800000") +cpp_quote("#define URLACTION_JAVA_CURR_MAX 0x00001c00") +cpp_quote("#define URLACTION_JAVA_MAX 0x00001cff") + +cpp_quote("#define URLACTION_INFODELIVERY_MIN 0x00001d00") +cpp_quote("#define URLACTION_INFODELIVERY_NO_ADDING_CHANNELS 0x00001d00") +cpp_quote("#define URLACTION_INFODELIVERY_NO_EDITING_CHANNELS 0x00001d01") +cpp_quote("#define URLACTION_INFODELIVERY_NO_REMOVING_CHANNELS 0x00001d02") +cpp_quote("#define URLACTION_INFODELIVERY_NO_ADDING_SUBSCRIPTIONS 0x00001d03") +cpp_quote("#define URLACTION_INFODELIVERY_NO_EDITING_SUBSCRIPTIONS 0x00001d04") +cpp_quote("#define URLACTION_INFODELIVERY_NO_REMOVING_SUBSCRIPTIONS 0x00001d05") +cpp_quote("#define URLACTION_INFODELIVERY_NO_CHANNEL_LOGGING 0x00001d06") +cpp_quote("#define URLACTION_INFODELIVERY_CURR_MAX 0x00001d06") +cpp_quote("#define URLACTION_INFODELIVERY_MAX 0x00001dff") + +cpp_quote("#define URLACTION_CHANNEL_SOFTDIST_MIN 0x00001e00") +cpp_quote("#define URLACTION_CHANNEL_SOFTDIST_PERMISSIONS 0x00001e05") +cpp_quote("#define URLPOLICY_CHANNEL_SOFTDIST_PROHIBIT 0x00010000") +cpp_quote("#define URLPOLICY_CHANNEL_SOFTDIST_PRECACHE 0x00020000") +cpp_quote("#define URLPOLICY_CHANNEL_SOFTDIST_AUTOINSTALL 0x00030000") +cpp_quote("#define URLACTION_CHANNEL_SOFTDIST_MAX 0x00001eff") + +cpp_quote("#define URLPOLICY_ALLOW 0x00") +cpp_quote("#define URLPOLICY_QUERY 0x01") +cpp_quote("#define URLPOLICY_DISALLOW 0x03") + +cpp_quote("#define URLPOLICY_NOTIFY_ON_ALLOW 0x10") +cpp_quote("#define URLPOLICY_NOTIFY_ON_DISALLOW 0x20") + +cpp_quote("#define URLPOLICY_LOG_ON_ALLOW 0x40") +cpp_quote("#define URLPOLICY_LOG_ON_DISALLOW 0x80") + +cpp_quote("#define URLPOLICY_DONTCHECKDLGBOX 0x100") + +cpp_quote("#define URLPOLICY_CREDENTIALS_SILENT_LOGON_OK 0x00000000") +cpp_quote("#define URLPOLICY_CREDENTIALS_MUST_PROMPT_USER 0x00010000") +cpp_quote("#define URLPOLICY_CREDENTIALS_CONDITIONAL_PROMPT 0x00020000") +cpp_quote("#define URLPOLICY_CREDENTIALS_ANONYMOUS_ONLY 0x00030000") + +cpp_quote("#define URLPOLICY_AUTHENTICATE_CLEARTEXT_OK 0x00000000") +cpp_quote("#define URLPOLICY_AUTHENTICATE_CHALLENGE_RESPONSE 0x00010000") +cpp_quote("#define URLPOLICY_AUTHENTICATE_MUTUAL_ONLY 0x00030000") + +cpp_quote("#define URLPOLICY_MASK_PERMISSIONS 0x0f") +cpp_quote("#define GetUrlPolicyPermissions(dw) (dw & URLPOLICY_MASK_PERMISSIONS)") +cpp_quote("#define SetUrlPolicyPermissions(dw,dw2) ((dw) = ((dw) & ~URLPOLICY_MASK_PERMISSIONS) | (dw2))") + /***************************************************************************** * IInternetZoneManager interface */

1 0

Jacek Caban : urlmon: Fixed URLZONEREG_DEFAULT handling in GetZoneActionPolicy.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: dfb1089a45f17c596fdcf86ebcda8acfced6259b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb1089a45f17c596fdcf86eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:41:50 2008 +0100 urlmon: Fixed URLZONEREG_DEFAULT handling in GetZoneActionPolicy. --- dlls/urlmon/sec_mgr.c | 144 ++++++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 68 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 027bec8..efba140 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -143,6 +143,80 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) return hres; } +static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) +{ + static const WCHAR wszZonesKey[] = + {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','s','\\',0}; + static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; + + WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; + DWORD res; + + wsprintfW(key_name, wszFormat, wszZonesKey, zone); + + res = RegOpenKeyW(parent_key, key_name, hkey); + + if(res != ERROR_SUCCESS) { + WARN("RegOpenKey failed\n"); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD size, URLZONEREG zone_reg) +{ + HKEY parent_key; + HKEY hkey; + LONG res; + HRESULT hres; + + switch(zone_reg) { + case URLZONEREG_DEFAULT: + case URLZONEREG_HKCU: + parent_key = HKEY_CURRENT_USER; + break; + case URLZONEREG_HKLM: + parent_key = HKEY_LOCAL_MACHINE; + break; + default: + WARN("Unknown URLZONEREG: %d\n", zone_reg); + return E_FAIL; + }; + + hres = open_zone_key(parent_key, zone, &hkey); + if(SUCCEEDED(hres)) { + WCHAR action_str[16]; + DWORD len = size; + + static const WCHAR formatW[] = {'%','X',0}; + + wsprintfW(action_str, formatW, action); + + res = RegQueryValueExW(hkey, action_str, NULL, NULL, policy, &len); + if(res == ERROR_MORE_DATA) { + hres = E_INVALIDARG; + }else if(res == ERROR_FILE_NOT_FOUND) { + hres = E_FAIL; + }else if(res != ERROR_SUCCESS) { + ERR("RegQueryValue failed: %d\n", res); + hres = E_UNEXPECTED; + } + + RegCloseKey(hkey); + } + + if(FAILED(hres) && zone_reg == URLZONEREG_DEFAULT) + return get_action_policy(zone, action, policy, size, URLZONEREG_HKLM); + + return hres; +} + /*********************************************************************** * InternetSecurityManager implementation * @@ -330,7 +404,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa return hres == 0x80041001 ? E_INVALIDARG : hres; /* file protocol is a special case */ - if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) + if(strlenW(url) >= sizeof(wszFile)/sizeof(WCHAR) && !memcmp(url, wszFile, sizeof(wszFile)) && strchrW(url, '\\')) { static const BYTE secidFile[] = {'f','i','l','e',':'}; @@ -506,46 +580,6 @@ typedef struct { LONG ref; } ZoneMgrImpl; -static HRESULT open_zone_key(DWORD zone, HKEY *hkey, URLZONEREG zone_reg) -{ - static const WCHAR wszZonesKey[] = - {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'Z','o','n','e','s','\\',0}; - static const WCHAR wszFormat[] = {'%','s','%','l','d',0}; - - WCHAR key_name[sizeof(wszZonesKey)/sizeof(WCHAR)+8]; - HKEY parent_key; - DWORD res; - - switch(zone_reg) { - case URLZONEREG_DEFAULT: /* FIXME: TEST */ - case URLZONEREG_HKCU: - parent_key = HKEY_CURRENT_USER; - break; - case URLZONEREG_HKLM: - parent_key = HKEY_LOCAL_MACHINE; - break; - default: - WARN("Unknown URLZONEREG: %d\n", zone_reg); - return E_FAIL; - }; - - wsprintfW(key_name, wszFormat, wszZonesKey, zone); - - res = RegOpenKeyW(parent_key, key_name, hkey); - - if(res != ERROR_SUCCESS) { - WARN("RegOpenKey failed\n"); - return E_INVALIDARG; - } - - return S_OK; -} - /******************************************************************** * IInternetZoneManager_QueryInterface */ @@ -659,39 +693,13 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManager* ifac static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManager* iface, DWORD dwZone, DWORD dwAction, BYTE* pPolicy, DWORD cbPolicy, URLZONEREG urlZoneReg) { - WCHAR action[16]; - HKEY hkey; - LONG res; - DWORD size = cbPolicy; - HRESULT hres; - - static const WCHAR wszFormat[] = {'%','l','X',0}; - TRACE("(%p)->(%d %08x %p %d %d)\n", iface, dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg); if(!pPolicy) return E_INVALIDARG; - hres = open_zone_key(dwZone, &hkey, urlZoneReg); - if(FAILED(hres)) - return hres; - - wsprintfW(action, wszFormat, dwAction); - - res = RegQueryValueExW(hkey, action, NULL, NULL, pPolicy, &size); - if(res == ERROR_MORE_DATA) { - hres = E_INVALIDARG; - }else if(res == ERROR_FILE_NOT_FOUND) { - hres = E_FAIL; - }else if(res != ERROR_SUCCESS) { - ERR("RegQueryValue failed: %d\n", res); - hres = E_UNEXPECTED; - } - - RegCloseKey(hkey); - - return hres; + return get_action_policy(dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg); } /********************************************************************

1 0

Jacek Caban : urlmon: Remove tests that fail on IE7 and make Wine behave like IE7.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: de1816f9e3de7dd4847f1637744b66359b3c6504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1816f9e3de7dd4847f16377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:41:27 2008 +0100 urlmon: Remove tests that fail on IE7 and make Wine behave like IE7. --- dlls/urlmon/sec_mgr.c | 34 ++++++++++++++++++++++++++++++---- dlls/urlmon/tests/misc.c | 10 ++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 59b2448..027bec8 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -95,13 +95,39 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) /* file protocol is a special case */ if(!strcmpW(schema, fileW)) { - WCHAR path[MAX_PATH]; + WCHAR path[MAX_PATH], root[20]; + WCHAR *ptr; hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); - if(SUCCEEDED(hres) && strchrW(path, '\\')) - *zone = 0; + if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)/sizeof(WCHAR)) { + UINT type; + + memcpy(root, path, (ptr-path)*sizeof(WCHAR)); + root[ptr-path] = 0; + + type = GetDriveTypeW(root); + + switch(type) { + case DRIVE_UNKNOWN: + case DRIVE_NO_ROOT_DIR: + break; + case DRIVE_REMOVABLE: + case DRIVE_FIXED: + case DRIVE_CDROM: + case DRIVE_RAMDISK: + *zone = 0; + hres = S_OK; + break; + case DRIVE_REMOTE: + *zone = 3; + hres = S_OK; + break; + default: + FIXME("unsupported drive type %d\n", type); + } + } } if(*zone == -1) { @@ -305,7 +331,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa /* file protocol is a special case */ if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(url, wszFile, sizeof(wszFile))) { + && !memcmp(url, wszFile, sizeof(wszFile)) && strchrW(url, '\\')) { static const BYTE secidFile[] = {'f','i','l','e',':'}; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 01c5eaf..40701db 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -250,7 +250,7 @@ static void test_RegisterFormatEnumerator(void) static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; -static const WCHAR url3[] = {'f','i','l','e',':','c',':','\\','I','n','d','e','x','.','h','t','m',0}; +static const WCHAR url3[] = {'f','i','l','e',':','/','/','c',':','\\','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e', '%','2','e','j','p','g',0}; static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', @@ -262,7 +262,8 @@ static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', '/','s','i','t','e','/','a','b','o','u','t',0}; - +static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', + '.','j','p','g',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -713,12 +714,13 @@ static void test_FindMimeFromData(void) } static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; -static const BYTE secid4[] ={'f','i','l','e',':',3,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q', '.','o','r','g',3,0,0,0}; static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g', 3,0,0,0}; +static const BYTE secid10[] = + {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; static struct secmgr_test { LPCWSTR url; @@ -731,7 +733,7 @@ static struct secmgr_test { {url1, 0, S_OK, sizeof(secid1), secid1, S_OK}, {url2, 100, 0x80041001, 0, NULL, E_INVALIDARG}, {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, - {url4, 3, S_OK, sizeof(secid4), secid4, S_OK}, + {url10,3, S_OK, sizeof(secid10),secid10,S_OK}, {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, {url7, 3, S_OK, sizeof(secid7), secid7, S_OK}

1 0

Jacek Caban : mshtml: Return full patch in res protocol's secure URL.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 4f7748b9b577397ac874f3479874ae95c55bf62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7748b9b577397ac874f3479… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:40:46 2008 +0100 mshtml: Return full patch in res protocol's secure URL. --- dlls/mshtml/protocol.c | 31 +++++++++++++++++++++---------- dlls/mshtml/tests/protocol.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 5f91087..6419d73 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -833,8 +833,9 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); if(ParseAction == PARSE_SECURITY_URL) { + WCHAR file_part[MAX_PATH], full_path[MAX_PATH]; WCHAR *ptr; - DWORD size; + DWORD size, len; static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; @@ -846,19 +847,29 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC if(!ptr) return E_INVALIDARG; - size = ptr-pwzUrl + sizeof(wszFile)/sizeof(WCHAR) - sizeof(wszRes)/sizeof(WCHAR); - if(size >= cchResult) - return S_FALSE; + len = ptr - (pwzUrl + sizeof(wszRes)/sizeof(WCHAR)); + if(len > sizeof(file_part)/sizeof(WCHAR)) { + FIXME("Too long URL\n"); + return MK_E_SYNTAX; + } - /* FIXME: return full path */ - memcpy(pwzResult, wszFile, sizeof(wszFile)); - memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), - pwzUrl + sizeof(wszRes)/sizeof(WCHAR), - size*sizeof(WCHAR) - sizeof(wszFile)); - pwzResult[size] = 0; + memcpy(file_part, pwzUrl + sizeof(wszRes)/sizeof(WCHAR), len*sizeof(WCHAR)); + file_part[len] = 0; + + len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); + if(!len) { + WARN("Could not find file %s\n", debugstr_w(file_part)); + return MK_E_SYNTAX; + } + size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; if(pcchResult) *pcchResult = size; + if(size >= cchResult) + return S_FALSE; + + memcpy(pwzResult, wszFile, sizeof(wszFile)); + memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), full_path, (len+1)*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 01a6a06..df3c337 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -70,6 +70,13 @@ static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n', static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0}; static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -247,6 +254,29 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } +static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) +{ + WCHAR buf[MAX_PATH]; + DWORD len; + + static const WCHAR fileW[] = {'f','i','l','e',':','/','/'}; + + if(size < sizeof(fileW)/sizeof(WCHAR) || memcmp(url, fileW, sizeof(fileW))) { + ok(0, "wrong URL protocol\n"); + return; + } + + len = SearchPathW(NULL, file, NULL, sizeof(buf)/sizeof(WCHAR), buf, NULL); + if(!len) { + ok(0, "SearchPath failed: %u\n", GetLastError()); + return; + } + + len += sizeof(fileW)/sizeof(WCHAR)+1; + ok(len == size, "wrong size %u, expected %u\n", size, len); + ok(!lstrcmpW(url + sizeof(fileW)/sizeof(WCHAR), buf), "wrong file part %s\n", debugstr_w(url)); +} + static void test_res_protocol(void) { IInternetProtocolInfo *protocol_info; @@ -265,7 +295,9 @@ static void test_res_protocol(void) {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l','/','x','x','.','h','t','m',0}; static const WCHAR wrong_url4[] = {'r','e','s',':','/','/','x','x','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; - + static const WCHAR wrong_url5[] = + {'r','e','s',':','/','/','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; + static const WCHAR mshtml_dllW[] = {'m','s','h','t','m','l','.','d','l','l',0}; hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); @@ -291,16 +323,23 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + res_sec_url_cmp(buf, size, mshtml_dllW); + size = 0; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); + ok(size, "size=0\n"); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == MK_E_SYNTAX || hres == E_INVALIDARG, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url5, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,

1 0