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

Francois Gouget : winetest: Add a missing </tr> tag.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: tools Branch: master Commit: c282a32676d030be2a1fd265ef3849534cd81c73 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c282a32676d030be2a1fd265… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:23:51 2008 +0100 winetest: Add a missing </tr> tag. --- winetest/gather | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/winetest/gather b/winetest/gather index a40c2f6..bda1f95 100755 --- a/winetest/gather +++ b/winetest/gather @@ -411,6 +411,9 @@ EOF <a href="$alltests{$testname}">$testname</a></td> EOF singletest ($_, $testname, $group->{name}) foreach (@{$group->{tests}}); + print OUT <<"EOF"; + </tr> +EOF } print OUT <<"EOF"; </tbody>

1 0

Francois Gouget : winetest: Strip the LF from the winetest URL. Fixes an HTML warning.
by Alexandre Julliard 14 Mar '08

14 Mar '08

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

Francois Gouget : winetest: Copy the winetest start, result summary and done lines to the per-test logs.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: tools Branch: master Commit: f7fc108fa5af7f89263395fe1015e1dffa14a739 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f7fc108fa5af7f89263395fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:24:41 2008 +0100 winetest: Copy the winetest start, result summary and done lines to the per-test logs. --- winetest/dissect | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index b5ea968..0d017fc 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -163,14 +163,15 @@ while (<IN>) { or mydie "no start line:$.: $_"; ($unit,$test,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; - } elsif (s/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { + print OUT; + } elsif (/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; $total += $2; $todo += $3; $failed += $4; $skipped += $5; print OUT; - } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { + } elsif (/$unit:$test done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0) { $result = "failed $1 - -";

1 0

Jacek Caban : urlmon: Added special URLACTION_SCRIPT_OVERRIDE_SAFETY handling.
by Alexandre Julliard 14 Mar '08

14 Mar '08

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 14 Mar '08

14 Mar '08

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 14 Mar '08

14 Mar '08

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 14 Mar '08

14 Mar '08

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 14 Mar '08

14 Mar '08

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

Aric Stewart : dsound: Set the status from STATE_STARTING to STATE_PLAYING before mixing our next buffer so that we do not potentially skip early event when starting .
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 6e8c8c28ebbdc15292612b7b6657e44ce8c5040f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8c8c28ebbdc15292612b7b6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 14 19:54:35 2008 +0900 dsound: Set the status from STATE_STARTING to STATE_PLAYING before mixing our next buffer so that we do not potentially skip early event when starting. --- dlls/dsound/mixer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 0e76adf..384709a 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -669,13 +669,13 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos dsb->primary_mixpos = writepos; } - /* mix next buffer into the main buffer */ - len = DSOUND_MixOne(dsb, writepos, mixlen); - /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING) dsb->state = STATE_PLAYING; + /* mix next buffer into the main buffer */ + len = DSOUND_MixOne(dsb, writepos, mixlen); + if (!minlen) minlen = len; /* record the minimum length mixed from all buffers */

1 0

Jacek Caban : urlmon: Move InternetParseUrl(PARSE_SECURITY_URL) call to map_url_to_zone and fix buffer size.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: cc159d832deea4e0a4a5d28b9c8152d4be848637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc159d832deea4e0a4a5d28b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:40:22 2008 +0100 urlmon: Move InternetParseUrl(PARSE_SECURITY_URL) call to map_url_to_zone and fix buffer size. --- dlls/urlmon/sec_mgr.c | 161 ++++++++++++++++++++++++------------------------- 1 files changed, 80 insertions(+), 81 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 6ed72dc..59b2448 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -23,65 +23,27 @@ #include "urlmon_main.h" #include "winreg.h" +#include "wininet.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -/*********************************************************************** - * InternetSecurityManager implementation - * - */ -typedef struct { - const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; +static const WCHAR fileW[] = {'f','i','l','e',0}; - LONG ref; - - IInternetSecurityMgrSite *mgrsite; - IInternetSecurityManager *custom_manager; -} SecManagerImpl; - -#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) - -static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) +static HRESULT get_zone_from_reg(LPCWSTR schema, DWORD *zone) { - WCHAR schema[64]; - DWORD res, size=0; + DWORD res, size; HKEY hkey; - HRESULT hres; static const WCHAR wszZoneMapProtocolKey[] = {'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','M','a','p','\\', - 'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0}; - static const WCHAR wszFile[] = {'f','i','l','e',0}; - - *zone = -1; - - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); - if(FAILED(hres)) - return hres; - if(!*schema) - return E_INVALIDARG; - - /* file protocol is a special case */ - if(!strcmpW(schema, wszFile)) { - WCHAR path[MAX_PATH]; - - hres = CoInternetParseUrl(url, PARSE_PATH_FROM_URL, 0, path, - sizeof(path)/sizeof(WCHAR), &size, 0); - - if(SUCCEEDED(hres) && strchrW(path, '\\')) { - *zone = 0; - return S_OK; - } - } - - WARN("domains are not yet implemented\n"); + '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','M','a','p','\\', + 'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0}; res = RegOpenKeyW(HKEY_CURRENT_USER, wszZoneMapProtocolKey, &hkey); if(res != ERROR_SUCCESS) { @@ -111,6 +73,65 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) return S_OK; } +static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +{ + LPWSTR secur_url; + WCHAR schema[64]; + DWORD size=0; + HRESULT hres; + + secur_url = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); + *zone = -1; + + hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, secur_url, INTERNET_MAX_URL_LENGTH, &size, 0); + if(hres != S_OK) + strcpyW(secur_url, url); + + hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); + if(FAILED(hres) || !*schema) { + heap_free(secur_url); + return E_INVALIDARG; + } + + /* file protocol is a special case */ + if(!strcmpW(schema, fileW)) { + WCHAR path[MAX_PATH]; + + hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, + sizeof(path)/sizeof(WCHAR), &size, 0); + + if(SUCCEEDED(hres) && strchrW(path, '\\')) + *zone = 0; + } + + if(*zone == -1) { + WARN("domains are not yet implemented\n"); + hres = get_zone_from_reg(schema, zone); + } + + if(FAILED(hres) || !ret_url) + heap_free(secur_url); + else + *ret_url = secur_url; + + return hres; +} + +/*********************************************************************** + * InternetSecurityManager implementation + * + */ +typedef struct { + const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; + + LONG ref; + + IInternetSecurityMgrSite *mgrsite; + IInternetSecurityManager *custom_manager; +} SecManagerImpl; + +#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) + static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* iface,REFIID riid,void** ppvObject) { SecManagerImpl *This = SECMGR_THIS(iface); @@ -230,8 +251,6 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac DWORD dwFlags) { SecManagerImpl *This = SECMGR_THIS(iface); - LPWSTR url; - DWORD size; HRESULT hres; TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); @@ -251,26 +270,15 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac if(dwFlags) FIXME("not supported flags: %08x\n", dwFlags); - size = (strlenW(pwszUrl)+16) * sizeof(WCHAR); - url = heap_alloc(size); - - hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, url, size/sizeof(WCHAR), &size, 0); - if(FAILED(hres)) - memcpy(url, pwszUrl, size); - - hres = map_url_to_zone(url, pdwZone); - - heap_free(url); - - return hres; + return map_url_to_zone(pwszUrl, pdwZone, NULL); } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); - LPWSTR buf, ptr, ptr2; - DWORD size, zone, len; + LPWSTR url, ptr, ptr2; + DWORD zone, len; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -291,26 +299,17 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa if(dwReserved) FIXME("dwReserved is not supported\n"); - len = strlenW(pwszUrl)+1; - buf = heap_alloc((len+16)*sizeof(WCHAR)); - - hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, buf, len, &size, 0); + hres = map_url_to_zone(pwszUrl, &zone, &url); if(FAILED(hres)) - memcpy(buf, pwszUrl, len*sizeof(WCHAR)); - - hres = map_url_to_zone(buf, &zone); - if(FAILED(hres)) { - heap_free(buf); return hres == 0x80041001 ? E_INVALIDARG : hres; - } /* file protocol is a special case */ if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(buf, wszFile, sizeof(wszFile))) { + && !memcmp(url, wszFile, sizeof(wszFile))) { static const BYTE secidFile[] = {'f','i','l','e',':'}; - heap_free(buf); + heap_free(url); if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); @@ -322,7 +321,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa return S_OK; } - ptr = strchrW(buf, ':'); + ptr = strchrW(url, ':'); ptr2 = ++ptr; while(*ptr2 == '/') ptr2++; @@ -333,15 +332,15 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa if(ptr) *ptr = 0; - len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; + len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; if(len+sizeof(DWORD) > *pcbSecurityId) { - heap_free(buf); + heap_free(url); return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); - heap_free(buf); + WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); + heap_free(url); *(DWORD*)(pbSecurityId+len) = zone;

1 0