November 2009 - Wine-Commits

Alexandre Julliard : server: Only require REG_OPTION_VOLATILE when creating a new key.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 72ba00fffef95c1bb4adbcc5f955a619bcf488ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ba00fffef95c1bb4adbcc5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 11:39:55 2009 +0100 server: Only require REG_OPTION_VOLATILE when creating a new key. --- server/registry.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/registry.c b/server/registry.c index d83486b..1fa2c67 100644 --- a/server/registry.c +++ b/server/registry.c @@ -612,11 +612,6 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, set_error( STATUS_KEY_DELETED ); return NULL; } - if (!(flags & KEY_VOLATILE) && (key->flags & KEY_VOLATILE)) - { - set_error( STATUS_CHILD_MUST_BE_VOLATILE ); - return NULL; - } token.str = NULL; if (!get_path_token( name, &token )) return NULL; @@ -632,6 +627,11 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, /* create the remaining part */ if (!token.len) goto done; + if (!(flags & KEY_VOLATILE) && (key->flags & KEY_VOLATILE)) + { + set_error( STATUS_CHILD_MUST_BE_VOLATILE ); + return NULL; + } *created = 1; if (flags & KEY_DIRTY) make_dirty( key ); if (!(key = alloc_subkey( key, &token, index, modif ))) return NULL;

1 0

Jacek Caban : shdocvw: Get rid of Gecko checks in tests.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 655e0a0c54b44ef864dcbc693fcfb7b5ecad4f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e0a0c54b44ef864dcbc693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 21:31:51 2009 +0100 shdocvw: Get rid of Gecko checks in tests. --- dlls/shdocvw/tests/webbrowser.c | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 745ac15..41b7c7d 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2368,40 +2368,8 @@ static void test_WebBrowser(BOOL do_download) ok(ref == 0, "ref=%d, expected 0\n", ref); } -static void gecko_installer_workaround(BOOL disable) -{ - HKEY hkey; - DWORD res; - - static BOOL has_url = FALSE; - static char url[2048]; - - if(!disable && !has_url) - return; - - res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); - if(res != ERROR_SUCCESS) - return; - - if(disable) { - DWORD type, size = sizeof(url); - - res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) - has_url = TRUE; - - RegDeleteValue(hkey, "GeckoUrl"); - }else { - RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); - } - - RegCloseKey(hkey); -} - START_TEST(webbrowser) { - gecko_installer_workaround(TRUE); - container_hwnd = create_container_window(); OleInitialize(NULL); @@ -2412,6 +2380,4 @@ START_TEST(webbrowser) test_WebBrowser(TRUE); OleUninitialize(); - - gecko_installer_workaround(FALSE); }

1 0

Jacek Caban : urlmon: Get rid of gecko_installer_workaround in tests.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 9adbd8ab21fe582a269e8f31b9f71d902ef33b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adbd8ab21fe582a269e8f31b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 21:32:08 2009 +0100 urlmon: Get rid of gecko_installer_workaround in tests. --- dlls/urlmon/tests/url.c | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 53646d1..ecc4db7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2821,40 +2821,8 @@ static void test_StdURLMoniker(void) IMoniker_Release(mon); } -static void gecko_installer_workaround(BOOL disable) -{ - HKEY hkey; - DWORD res; - - static BOOL has_url = FALSE; - static char url[2048]; - - if(!disable && !has_url) - return; - - res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); - if(res != ERROR_SUCCESS) - return; - - if(disable) { - DWORD type, size = sizeof(url); - - res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) - has_url = TRUE; - - RegDeleteValue(hkey, "GeckoUrl"); - }else { - RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); - } - - RegCloseKey(hkey); -} - START_TEST(url) { - gecko_installer_workaround(TRUE); - complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); @@ -2994,6 +2962,4 @@ START_TEST(url) CloseHandle(complete_event); CloseHandle(complete_event2); CoUninitialize(); - - gecko_installer_workaround(FALSE); }

1 0

Alexandre Julliard : advapi32/tests: Add some tests for creation of volatile keys.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 36efda3d3950cf8dfc7b710fa4c5865d7eb2d8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36efda3d3950cf8dfc7b710fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 11:40:07 2009 +0100 advapi32/tests: Add some tests for creation of volatile keys. --- dlls/advapi32/tests/registry.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index abc2eb4..dee7664 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -956,6 +956,28 @@ static void test_reg_create_key(void) /* clean up */ RegDeleteKey(hkey2, ""); RegDeleteKey(hkey1, ""); + RegCloseKey(hkey2); + RegCloseKey(hkey1); + + /* test creation of volatile keys */ + ret = RegCreateKeyExA(hkey_main, "Volatile", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey1, NULL); + ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); + ret = RegCreateKeyExA(hkey1, "Subkey2", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey2, NULL); + ok(ret == ERROR_CHILD_MUST_BE_VOLATILE || broken(!ret), /* win9x */ + "RegCreateKeyExA failed with error %d\n", ret); + if (!ret) RegCloseKey( hkey2 ); + ret = RegCreateKeyExA(hkey1, "Subkey2", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey2, NULL); + ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); + RegCloseKey(hkey2); + /* should succeed if the key already exists */ + ret = RegCreateKeyExA(hkey1, "Subkey2", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey2, NULL); + ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); + + /* clean up */ + RegDeleteKey(hkey2, ""); + RegDeleteKey(hkey1, ""); + RegCloseKey(hkey2); + RegCloseKey(hkey1); /* beginning backslash character */ ret = RegCreateKeyExA(hkey_main, "\\Subkey3", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); @@ -964,6 +986,7 @@ static void test_reg_create_key(void) else { ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); RegDeleteKey(hkey1, NULL); + RegCloseKey(hkey1); } /* WOW64 flags - open an existing key */

1 0

Paul Vriens : shell32/tests: Fix some tests on Win7.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: f9a931070dd4b0959ec6345e4441cd4dacd0e08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a931070dd4b0959ec6345e4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 20 09:53:08 2009 +0100 shell32/tests: Fix some tests on Win7. --- dlls/shell32/tests/shlfileop.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 33d1a94..0a5cdca 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -965,9 +965,10 @@ static void test_copy(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); retval = SHFileOperation(&shfo); - if (retval == DE_FLDDESTISFILE) + if (retval == DE_FLDDESTISFILE || /* Vista and W2K8 */ + retval == DE_INVALIDFILES) /* Win7 */ { - /* Vista and W2K8 (broken or new behavior ?) */ + /* Most likely new behavior */ ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); } else

1 0

Jacek Caban : mshtml: Get rid of no longer needed Gecko checks in tests.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 785fb1d2e13618c3e8125e680a04ccd0c1687747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785fb1d2e13618c3e8125e680… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 19 21:31:26 2009 +0100 mshtml: Get rid of no longer needed Gecko checks in tests. --- dlls/mshtml/tests/dom.c | 44 +------------------------ dlls/mshtml/tests/htmldoc.c | 76 +++++++------------------------------------ dlls/mshtml/tests/script.c | 40 ---------------------- 3 files changed, 13 insertions(+), 147 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5484134..8681164 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5917,10 +5917,8 @@ typedef void (*domtest_t)(IHTMLDocument2*); static void run_domtest(const char *str, domtest_t test) { IHTMLDocument2 *doc; - IHTMLElement *body = NULL; ULONG ref; MSG msg; - HRESULT hres; doc = create_doc_with_string(str); if(!doc) @@ -5933,15 +5931,7 @@ static void run_domtest(const char *str, domtest_t test) DispatchMessage(&msg); } - hres = IHTMLDocument2_get_body(doc, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); - - if(body) { - IHTMLElement_Release(body); - test(doc); - }else { - skip("Could not get document body. Assuming no Gecko installed.\n"); - } + test(doc); ref = IHTMLDocument2_Release(doc); ok(!ref || @@ -5949,39 +5939,8 @@ static void run_domtest(const char *str, domtest_t test) "ref = %d\n", ref); } -static void gecko_installer_workaround(BOOL disable) -{ - HKEY hkey; - DWORD res; - - static BOOL has_url = FALSE; - static char url[2048]; - - if(!disable && !has_url) - return; - - res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); - if(res != ERROR_SUCCESS) - return; - - if(disable) { - DWORD type, size = sizeof(url); - - res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) - has_url = TRUE; - - RegDeleteValue(hkey, "GeckoUrl"); - }else { - RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); - } - - RegCloseKey(hkey); -} - START_TEST(dom) { - gecko_installer_workaround(TRUE); CoInitialize(NULL); run_domtest(doc_str1, test_doc_elem); @@ -6001,5 +5960,4 @@ START_TEST(dom) run_domtest(frameset_str, test_frameset); CoUninitialize(); - gecko_installer_workaround(FALSE); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 79d7786..08973f6 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -184,7 +184,6 @@ static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n', static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_MSHTML_QueryStatus(IUnknown*,DWORD); -static BOOL nogecko = FALSE; #define test_readyState(u) _test_readyState(__LINE__,u) static void _test_readyState(unsigned,IUnknown*); @@ -2919,26 +2918,12 @@ static void test_download(DWORD flags) if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); if(flags & DWL_CSS) { - if(called_CreateInstance) { - CHECK_CALLED(CreateInstance); - CHECK_CALLED(Start); - CHECK_CALLED(LockRequest); - CHECK_CALLED(Terminate); - CHECK_CALLED(Protocol_Read); - CHECK_CALLED(UnlockRequest); - }else { - skip("CreateInstance not called. Assuming no Gecko installed.\n"); - - SET_CALLED(Exec_ShellDocView_84); - SET_CALLED(CreateInstance); - SET_CALLED(Start); - SET_CALLED(LockRequest); - SET_CALLED(Terminate); - SET_CALLED(Protocol_Read); - SET_CALLED(UnlockRequest); - - nogecko = TRUE; - } + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Start); + CHECK_CALLED(LockRequest); + CHECK_CALLED(Terminate); + CHECK_CALLED(Protocol_Read); + CHECK_CALLED(UnlockRequest); } SET_CALLED(Exec_Explorer_69); SET_CALLED(EnableModeless_TRUE); /* IE7 */ @@ -3327,13 +3312,12 @@ static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) } hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_FONTNAME, 0, in, out); - if(!nogecko) - ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres); + ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres); if(in) VariantClear(in); - if(out && !nogecko) { + if(out) { ok(V_VT(out) == VT_BSTR, "V_VT(out) = %x\n", V_VT(out)); if(V_VT(out) == VT_BSTR) { if(exname) @@ -4300,17 +4284,15 @@ static void test_editing_mode(BOOL do_load) test_exec_noargs(unk, IDM_JUSTIFYRIGHT); test_timer(EXPECT_UPDATEUI); - if(!nogecko) - test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, - OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, + OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); test_exec_noargs(unk, IDM_JUSTIFYCENTER); test_timer(EXPECT_UPDATEUI); test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, OLECMDF_SUPPORTED|OLECMDF_ENABLED); - if(!nogecko) - test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER, - OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER, + OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); test_exec_noargs(unk, IDM_HORIZONTALLINE); test_timer(EXPECT_UPDATEUI); @@ -4348,36 +4330,6 @@ static void register_protocol(void) IInternetSession_Release(session); } -static void gecko_installer_workaround(BOOL disable) -{ - HKEY hkey; - DWORD res; - - static BOOL has_url = FALSE; - static char url[2048]; - - if(!disable && !has_url) - return; - - res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); - if(res != ERROR_SUCCESS) - return; - - if(disable) { - DWORD type, size = sizeof(url); - - res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) - has_url = TRUE; - - RegDeleteValue(hkey, "GeckoUrl"); - }else { - RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); - } - - RegCloseKey(hkey); -} - static void test_HTMLDoc_ISupportErrorInfo(void) { HRESULT hres; @@ -4425,8 +4377,6 @@ static void test_IPersistHistory(void) START_TEST(htmldoc) { - gecko_installer_workaround(TRUE); - CoInitialize(NULL); container_hwnd = create_container_window(); register_protocol(); @@ -4445,6 +4395,4 @@ START_TEST(htmldoc) DestroyWindow(container_hwnd); CoUninitialize(); - - gecko_installer_workaround(FALSE); } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index c5cc72f..22ed48e 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -516,7 +516,6 @@ static IHTMLDocument2 *create_and_load_doc(const char *str) { IHTMLDocument2 *doc; IHTMLElement *body = NULL; - ULONG ref; MSG msg; HRESULT hres; static const WCHAR ucPtr[] = {'b','a','c','k','g','r','o','u','n','d',0}; @@ -535,13 +534,6 @@ static IHTMLDocument2 *create_and_load_doc(const char *str) hres = IHTMLDocument2_get_body(doc, &body); ok(hres == S_OK, "get_body failed: %08x\n", hres); - if(!body) { - skip("Could not get document body. Assuming no Gecko installed.\n"); - ref = IHTMLDocument2_Release(doc); - ok(!ref, "ref = %d\n", ref); - return NULL; - } - /* Check we can query for function on the IHTMLElementBody interface */ name = (WCHAR*)ucPtr; hres = IHTMLElement_GetIDsOfNames(body, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispID); @@ -1618,39 +1610,8 @@ static BOOL register_script_engine(void) return TRUE; } -static void gecko_installer_workaround(BOOL disable) -{ - HKEY hkey; - DWORD res; - - static BOOL has_url = FALSE; - static char url[2048]; - - if(!disable && !has_url) - return; - - res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); - if(res != ERROR_SUCCESS) - return; - - if(disable) { - DWORD type, size = sizeof(url); - - res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) - has_url = TRUE; - - RegDeleteValue(hkey, "GeckoUrl"); - }else { - RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); - } - - RegCloseKey(hkey); -} - START_TEST(script) { - gecko_installer_workaround(TRUE); CoInitialize(NULL); if(winetest_interactive || ! is_ie_hardened()) { @@ -1665,5 +1626,4 @@ START_TEST(script) } CoUninitialize(); - gecko_installer_workaround(FALSE); }

1 0

Jacek Caban : mshtml: Check for CATID_SafeForScripting in GUID_CUSTOM_CONFIRMOBJECTSAFETY implementation if IObjectSafety is not available .
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: b2ffe78729e13f89e3f936a001b0bae9792d94e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ffe78729e13f89e3f936a00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 00:00:41 2009 +0100 mshtml: Check for CATID_SafeForScripting in GUID_CUSTOM_CONFIRMOBJECTSAFETY implementation if IObjectSafety is not available. --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/secmgr.c | 38 +++++++++++---- dlls/mshtml/tests/script.c | 104 +++++++++++++++++++++++++++++++++--------- 4 files changed, 114 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 836f1ae..5dfc4db 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1765,6 +1765,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) if(This->nsevent_listener) release_nsevents(This); + if(This->catmgr) + ICatInformation_Release(This->catmgr); if(This->secmgr) IInternetSecurityManager_Release(This->secmgr); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cc04106..ce13b48 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -18,6 +18,7 @@ #include "wingdi.h" #include "docobj.h" +#include "comcat.h" #include "mshtml.h" #include "mshtmhst.h" #include "hlink.h" @@ -503,6 +504,7 @@ struct HTMLDocumentNode { BOOL content_ready; IInternetSecurityManager *secmgr; + ICatInformation *catmgr; nsDocumentEventListener *nsevent_listener; BOOL *event_vector; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 8938943..e35a83b 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -84,7 +84,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost pContext, cbContext, dwFlags, dwReserved); } -static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown *obj) +static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct CONFIRMSAFETY *cs, DWORD *ret) { DWORD policy, enabled_opts, supported_opts; IObjectSafety *obj_safety; @@ -94,12 +94,29 @@ static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown * hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); - if(FAILED(hres) || policy != URLPOLICY_ALLOW) - return URLPOLICY_DISALLOW; + if(FAILED(hres) || policy != URLPOLICY_ALLOW) { + *ret = URLPOLICY_DISALLOW; + return S_OK; + } + + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IObjectSafety, (void**)&obj_safety); + if(FAILED(hres)) { + CATID scripting_catid = CATID_SafeForScripting; + + if(!This->catmgr) { + hres = CoCreateInstance(&CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, + &IID_ICatInformation, (void**)&This->catmgr); + if(FAILED(hres)) + return hres; + } + + hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &scripting_catid, 0, NULL); + if(FAILED(hres)) + return hres; - hres = IUnknown_QueryInterface(obj, &IID_IObjectSafety, (void**)&obj_safety); - if(FAILED(hres)) - return URLPOLICY_DISALLOW; + *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; + return S_OK; + } hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); if(SUCCEEDED(hres)) { @@ -109,10 +126,9 @@ static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown * hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); } IObjectSafety_Release(obj_safety); - if(FAILED(hres)) - return URLPOLICY_DISALLOW; - return URLPOLICY_ALLOW; + *ret = SUCCEEDED(hres) ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; + return S_OK; } static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, @@ -149,7 +165,9 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos return E_FAIL; } - policy = confirm_safety(This, url, cs->pUnk); + hres = confirm_safety(This, url, cs, &policy); + if(FAILED(hres)) + return hres; *ppPolicy = CoTaskMemAlloc(sizeof(policy)); if(!*ppPolicy) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 8daa9bc..c5cc72f 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -121,6 +121,7 @@ DEFINE_EXPECT(AXGetInterfaceSafetyOptions); DEFINE_EXPECT(AXSetInterfaceSafetyOptions); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" +#define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" #define DISPID_SCRIPT_TESTPROP 0x100000 @@ -133,6 +134,7 @@ static IHTMLDocument2 *notif_doc; static IDispatchEx *window_dispex; static BOOL doc_complete; static IDispatch *script_disp; +static BOOL ax_objsafe; static const char *debugstr_guid(REFIID riid) { @@ -165,6 +167,28 @@ static BSTR a2bstr(const char *str) return ret; } +static BOOL init_key(const char *key_name, const char *def_value, BOOL init) +{ + HKEY hkey; + DWORD res; + + if(!init) { + RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + return TRUE; + } + + res = RegCreateKeyA(HKEY_CLASSES_ROOT, key_name, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + if(def_value) + res = RegSetValueA(hkey, NULL, REG_SZ, def_value, strlen(def_value)); + + RegCloseKey(hkey); + + return res == ERROR_SUCCESS; +} + static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, REFIID riid, void**ppv) { @@ -599,6 +623,8 @@ static HRESULT WINAPI AXObjectSafety_QueryInterface(IObjectSafety *iface, REFIID if(IsEqualGUID(&IID_IObjectSafety, riid)) { CHECK_EXPECT(AXQueryInterface_IObjectSafety); + if(!ax_objsafe) + return E_NOINTERFACE; *ppv = iface; return S_OK; } @@ -647,6 +673,12 @@ static const IObjectSafetyVtbl AXObjectSafetyVtbl = { static IObjectSafety AXObjectSafety = { &AXObjectSafetyVtbl }; +static BOOL set_safe_reg(BOOL init) +{ + return init_key("CLSID\\"TESTACTIVEX_CLSID"\\Implemented Categories\\{7dd95801-9882-11cf-9fa9-00aa006c42c4}", + NULL, init); +} + static void test_security(void) { IInternetHostSecurityManager *sec_mgr; @@ -673,6 +705,7 @@ static void test_security(void) cs.pUnk = (IUnknown*)&AXObjectSafety; cs.dwFlags = 0; + ax_objsafe = TRUE; SET_EXPECT(AXQueryInterface_IActiveScript); SET_EXPECT(AXQueryInterface_IObjectSafety); SET_EXPECT(AXGetInterfaceSafetyOptions); @@ -689,6 +722,55 @@ static void test_security(void) ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); CoTaskMemFree(ppolicy); + ax_objsafe = FALSE; + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_DISALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + + if(set_safe_reg(TRUE)) { + ax_objsafe = FALSE; + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + + ax_objsafe = TRUE; + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + SET_EXPECT(AXGetInterfaceSafetyOptions); + SET_EXPECT(AXSetInterfaceSafetyOptions); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + CHECK_CALLED(AXGetInterfaceSafetyOptions); + CHECK_CALLED(AXSetInterfaceSafetyOptions); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + + set_safe_reg(FALSE); + }else { + skip("Could not set safety registry\n"); + } + IInternetHostSecurityManager_Release(sec_mgr); } @@ -1510,28 +1592,6 @@ static void test_simple_script(void) CHECK_CALLED(Close); } -static BOOL init_key(const char *key_name, const char *def_value, BOOL init) -{ - HKEY hkey; - DWORD res; - - if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); - return TRUE; - } - - res = RegCreateKeyA(HKEY_CLASSES_ROOT, key_name, &hkey); - if(res != ERROR_SUCCESS) - return FALSE; - - if(def_value) - res = RegSetValueA(hkey, NULL, REG_SZ, def_value, strlen(def_value)); - - RegCloseKey(hkey); - - return res == ERROR_SUCCESS; -} - static BOOL init_registry(BOOL init) { return init_key("TestScript\\CLSID", TESTSCRIPT_CLSID, init)

1 0

Vincent Povirk : ole32: Invalidate open storage objects that are deleted.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 669af158dadf3635abcae95a72f3570ebe28a8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669af158dadf3635abcae95a7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 14:02:23 2009 -0600 ole32: Invalidate open storage objects that are deleted. --- dlls/ole32/storage32.c | 10 ++++++++++ dlls/ole32/tests/storage32.c | 6 +----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4e667c6..708f263 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1936,6 +1936,16 @@ static HRESULT deleteStorageContents( STATSTG currentElement; HRESULT hr; HRESULT destroyHr = S_OK; + StorageInternalImpl *stg, *stg2; + + /* Invalidate any open storage objects. */ + LIST_FOR_EACH_ENTRY_SAFE(stg, stg2, &parentStorage->storageHead, StorageInternalImpl, ParentListEntry) + { + if (stg->base.storageDirEntry == indexToDelete) + { + StorageInternalImpl_Invalidate(stg); + } + } /* * Open the storage and enumerate it diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 05d1473..53811db 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1076,19 +1076,15 @@ static void test_substorage_share(void) ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stgname); -#if 0 - /* This crashes on Wine. */ - /* destroying an object while it's open invalidates it */ r = IStorage_DestroyElement(stg, stgname); ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); - todo_wine ok(r==STG_E_REVERTED, "IStorage->CreateStream failed, hr=%08x\n", r); + ok(r==STG_E_REVERTED, "IStorage->CreateStream failed, hr=%08x\n", r); if (r == S_OK) IStorage_Release(stm); -#endif IStorage_Release(stg2); }

1 0

Vincent Povirk : ole32: Forbid renaming an open storage.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 8569d547b986c84a924836bb84a9ecfd14a65fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8569d547b986c84a924836bb8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 13:57:43 2009 -0600 ole32: Forbid renaming an open storage. --- dlls/ole32/storage32.c | 5 +++-- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 773855f..4e667c6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -765,9 +765,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (currentEntryRef != DIRENTRY_NULL) { - if (StorageBaseImpl_IsStreamOpen(This, currentEntryRef)) + if (StorageBaseImpl_IsStreamOpen(This, currentEntryRef) || + StorageBaseImpl_IsStorageOpen(This, currentEntryRef)) { - WARN("Stream is already open; cannot rename.\n"); + WARN("Element is already open; cannot rename.\n"); return STG_E_ACCESSDENIED; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 42741ac..05d1473 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1073,7 +1073,7 @@ static void test_substorage_share(void) /* cannot rename the storage while it's open */ r = IStorage_RenameElement(stg, stgname, othername); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stgname); #if 0

1 0

Juan Lang : crypt32: Correct CertIsValidCRLForCertificate for certificates that do not contain a CRL dist points extension .
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: f378394acda10cb7b9daa9889cf4774940c944ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f378394acda10cb7b9daa9889… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 11:48:53 2009 -0800 crypt32: Correct CertIsValidCRLForCertificate for certificates that do not contain a CRL dist points extension. --- dlls/crypt32/crl.c | 12 ++++-------- dlls/crypt32/tests/crl.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 03f9b78..5b93d3a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -649,15 +649,11 @@ BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, } else { - /* no CRL dist points extension in cert, compare CRL's issuer - * to cert's issuer. + /* no CRL dist points extension in cert, can't match the CRL + * (which has an issuing dist point extension) */ - if (!CertCompareCertificateName(pCrl->dwCertEncodingType, - &pCrl->pCrlInfo->Issuer, &pCert->pCertInfo->Issuer)) - { - ret = FALSE; - SetLastError(CRYPT_E_NO_MATCH); - } + ret = FALSE; + SetLastError(CRYPT_E_NO_MATCH); } LocalFree(idp); } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index bd70d32..dfb9356 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -530,6 +530,7 @@ static void testFindCRL(void) * match cert's issuer, but verisignCRL does not, so the expected count * is 0. */ + todo_wine { ok(count == 3 || broken(count == 0 /* NT4, Win9x */), "expected 3 matching CRLs, got %d\n", count); /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain @@ -537,6 +538,7 @@ static void testFindCRL(void) */ ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4, Win9x */), "expected 2 matching CRL entries, got %d\n", revoked_count); + } CertFreeCertificateContext(cert); @@ -1000,11 +1002,9 @@ static void testIsValidCRLForCert(void) sizeof(v2CRLWithIssuingDistPoint)); ok(crl != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); - todo_wine { ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); - } ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError());

1 0