September 2011 - Wine-Commits

Hans Leidekker : programs: Add a stub implementation of regasm.exe.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 29a072e7aaeb92b1d3f56fbb14a4a305ca53a9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a072e7aaeb92b1d3f56fbb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:44:17 2011 +0200 programs: Add a stub implementation of regasm.exe. --- configure | 1 + configure.ac | 1 + programs/regasm/Makefile.in | 8 ++++++++ programs/regasm/main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 563117e..7dd8070 100755 --- a/configure +++ b/configure @@ -15235,6 +15235,7 @@ wine_fn_config_program plugplay enable_plugplay install wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman install,po wine_fn_config_program reg enable_reg install,po +wine_fn_config_program regasm enable_regasm install wine_fn_config_program regedit enable_regedit install,installbin,manpage,po wine_fn_config_test programs/regedit/tests regedit.exe_test wine_fn_config_program regsvcs enable_regsvcs install diff --git a/configure.ac b/configure.ac index ed7a60c..0c97bfd 100644 --- a/configure.ac +++ b/configure.ac @@ -2928,6 +2928,7 @@ WINE_CONFIG_PROGRAM(plugplay,,[install]) WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[install,po]) WINE_CONFIG_PROGRAM(reg,,[install,po]) +WINE_CONFIG_PROGRAM(regasm,,[install]) WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) WINE_CONFIG_TEST(programs/regedit/tests) WINE_CONFIG_PROGRAM(regsvcs,,[install]) diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in new file mode 100644 index 0000000..9466c73 --- /dev/null +++ b/programs/regasm/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = regasm.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/regasm/main.c b/programs/regasm/main.c new file mode 100644 index 0000000..a3243c3 --- /dev/null +++ b/programs/regasm/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(regasm); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cd5e0e8..3d91981 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2577,6 +2577,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll +10,Microsoft.NET\Framework\v2.0.50727,regasm.exe 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe 10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe

1 0

Hans Leidekker : xolehlp: New dll.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 1edf2d4a03ee7eb0732c61a7d544962296e2aeda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edf2d4a03ee7eb0732c61a7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:44:51 2011 +0200 xolehlp: New dll. --- configure | 1 + configure.ac | 1 + dlls/xolehlp/Makefile.in | 5 +++++ dlls/xolehlp/xolehlp.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/xolehlp/xolehlp.spec | 6 ++++++ 5 files changed, 54 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7dd8070..7c1af08 100755 --- a/configure +++ b/configure @@ -15195,6 +15195,7 @@ wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test +wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev diff --git a/configure.ac b/configure.ac index 0c97bfd..0421c74 100644 --- a/configure.ac +++ b/configure.ac @@ -2888,6 +2888,7 @@ WINE_CONFIG_TEST(dlls/xinput1_3/tests) WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) +WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in new file mode 100644 index 0000000..b1389ca --- /dev/null +++ b/dlls/xolehlp/Makefile.in @@ -0,0 +1,5 @@ +MODULE = xolehlp.dll + +C_SRCS = xolehlp.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c new file mode 100644 index 0000000..3b970ef --- /dev/null +++ b/dlls/xolehlp/xolehlp.c @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec new file mode 100644 index 0000000..f774542 --- /dev/null +++ b/dlls/xolehlp/xolehlp.spec @@ -0,0 +1,6 @@ +@ stub GetDtcLocaleResourceHandle +@ stub DtcGetTransactionManager +@ stub DtcGetTransactionManagerEx +@ stub DtcGetTransactionManagerC +@ stub DtcGetTransactionManagerExA +@ stub DtcGetTransactionManagerExW

1 0

Thomas Mullaly : urlmon: Added basic MapUrlToZoneEx2 implementation.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 98d5dfb83df923fae91bd5bc4d00929d141ac96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d5dfb83df923fae91bd5bc4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Aug 22 20:51:59 2011 -0400 urlmon: Added basic MapUrlToZoneEx2 implementation. --- dlls/urlmon/sec_mgr.c | 131 ++++++++++++++++++++++++++++++++----------- dlls/urlmon/tests/sec_mgr.c | 22 ++++--- 2 files changed, 112 insertions(+), 41 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index c81f44d..11f8c2a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -57,6 +57,11 @@ static const WCHAR wszZoneMapDomainsKey[] = {'S','o','f','t','w','a','r','e','\\ 'Z','o','n','e','M','a','p','\\', 'D','o','m','a','i','n','s',0}; +static inline BOOL is_drive_path(const WCHAR *path) +{ + return isalphaW(*path) && *(path+1) == ':'; +} + /******************************************************************** * get_string_from_reg [internal] * @@ -501,45 +506,37 @@ static HRESULT get_zone_from_domains(LPCWSTR url, LPCWSTR schema, DWORD *zone) return hres; } -static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) { - LPWSTR secur_url; - WCHAR schema[64]; - DWORD size=0; HRESULT hres; + BSTR scheme; *zone = URLZONE_INVALID; - hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); - if(hres != S_OK) { - size = strlenW(url)*sizeof(WCHAR); - - secur_url = CoTaskMemAlloc(size); - if(!secur_url) - return E_OUTOFMEMORY; - - memcpy(secur_url, url, size); - } + hres = IUri_GetSchemeName(uri, &scheme); + if(FAILED(hres)) + return hres; - hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); - if(FAILED(hres) || !*schema) { - CoTaskMemFree(secur_url); - return E_INVALIDARG; - } + if(!strcmpiW(scheme, fileW)) { + BSTR path; + WCHAR *ptr, *path_start, root[20]; - /* file protocol is a special case */ - if(!strcmpW(schema, fileW)) { - WCHAR path[MAX_PATH], root[20]; - WCHAR *ptr; + hres = IUri_GetPath(uri, &path); + if(FAILED(hres)) { + SysFreeString(scheme); + return hres; + } - hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, - sizeof(path)/sizeof(WCHAR), &size, 0); + if(*path == '/' && is_drive_path(path+1)) + path_start = path+1; + else + path_start = path; - if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)/sizeof(WCHAR)) { + if(((ptr = strchrW(path_start, '\\')) || (ptr = strchrW(path_start, '/'))) && ptr-path_start < sizeof(root)/sizeof(WCHAR)) { UINT type; - memcpy(root, path, (ptr-path)*sizeof(WCHAR)); - root[ptr-path] = 0; + memcpy(root, path_start, (ptr-path_start)*sizeof(WCHAR)); + root[ptr-path_start] = 0; type = GetDriveTypeW(root); @@ -562,14 +559,56 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) FIXME("unsupported drive type %d\n", type); } } + SysFreeString(path); } if(*zone == URLZONE_INVALID) { - hres = get_zone_from_domains(secur_url, schema, zone); + BSTR secur_url; + + hres = IUri_GetDisplayUri(uri, &secur_url); + if(FAILED(hres)) { + SysFreeString(scheme); + return hres; + } + + hres = get_zone_from_domains(secur_url, scheme, zone); + SysFreeString(secur_url); if(hres == S_FALSE) - hres = get_zone_from_reg(schema, zone); + hres = get_zone_from_reg(scheme, zone); } + SysFreeString(scheme); + return hres; +} + +static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +{ + IUri *secur_uri; + LPWSTR secur_url; + HRESULT hres; + + *zone = URLZONE_INVALID; + + hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); + if(hres != S_OK) { + DWORD size = strlenW(url)*sizeof(WCHAR); + + secur_url = CoTaskMemAlloc(size); + if(!secur_url) + return E_OUTOFMEMORY; + + memcpy(secur_url, url, size); + } + + hres = CreateUri(secur_url, 0, 0, &secur_uri); + if(FAILED(hres)) { + CoTaskMemFree(secur_url); + return hres; + } + + hres = map_security_uri_to_zone(secur_uri, zone); + IUri_Release(secur_uri); + if(FAILED(hres) || !ret_url) CoTaskMemFree(secur_url); else @@ -578,6 +617,21 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) return hres; } +static HRESULT map_uri_to_zone(IUri *uri, DWORD *zone) +{ + HRESULT hres; + IUri *secur_uri; + + hres = CoInternetGetSecurityUrlEx(uri, &secur_uri, PSU_SECURITY_URL_ONLY, 0); + if(FAILED(hres)) + return hres; + + hres = map_security_uri_to_zone(secur_uri, zone); + IUri_Release(secur_uri); + + return hres; +} + static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { static const WCHAR wszFormat[] = {'%','s','%','u',0}; @@ -1033,8 +1087,21 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2 IUri *pUri, DWORD *pdwZone, DWORD dwFlags, LPWSTR *ppwszMappedUrl, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %p %08x %p %p) stub\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); + + if(!pdwZone) + return E_INVALIDARG; + + if(!pUri) { + *pdwZone = URLZONE_INVALID; + return E_INVALIDARG; + } + + if(dwFlags) + FIXME("Unsupported flags: %08x\n", dwFlags); + + return map_uri_to_zone(pUri, pdwZone); } static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManagerEx2 *iface, diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a064b17..3e8cef3 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1620,12 +1620,16 @@ static const struct { DWORD zone; BOOL map_todo; } sec_mgr_ex2_tests[] = { - {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,TRUE}, - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,TRUE}, - {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,TRUE}, - {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,TRUE}, - {"about:blank",0,0,URLZONE_INTERNET,TRUE}, - {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,TRUE} + {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE}, + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE}, + {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET}, + {"about:blank",0,0,URLZONE_INTERNET}, + {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET}, + {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"zip://testing.com/",0,0,URLZONE_INTERNET}, + {"zip:testing.com",0,0,URLZONE_INTERNET} }; static void test_SecurityManagerEx2(void) @@ -1652,14 +1656,14 @@ static void test_SecurityManagerEx2(void) zone = 0xdeadbeef; hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, NULL, &zone, 0, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); - todo_wine ok(zone == URLZONE_INVALID, "zone was %d\n", zone); + ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + ok(zone == URLZONE_INVALID, "zone was %d\n", zone); hres = pCreateUri(url5, 0, 0, &uri); ok(hres == S_OK, "CreateUri failed: %08x\n", hres); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, NULL, 0, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); IUri_Release(uri);

1 0

Thomas Mullaly : urlmon: Made domain mapping support IUri based and added wildcard scheme domain mapping tests .
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: dac6d862eca9a4428a8eea77ea6b242e1f550cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac6d862eca9a4428a8eea77e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 4 20:56:09 2011 -0400 urlmon: Made domain mapping support IUri based and added wildcard scheme domain mapping tests. --- dlls/urlmon/sec_mgr.c | 62 ++++++++++++++---------------------------- dlls/urlmon/tests/sec_mgr.c | 8 ++++- 2 files changed, 27 insertions(+), 43 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 11f8c2a..314605e 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -444,50 +444,38 @@ static HRESULT search_for_domain_mapping(HKEY domains, LPCWSTR schema, LPCWSTR h return hres; } -static HRESULT get_zone_from_domains(LPCWSTR url, LPCWSTR schema, DWORD *zone) +static HRESULT get_zone_from_domains(IUri *uri, DWORD *zone) { HRESULT hres; - WCHAR *host_name; - DWORD host_len = lstrlenW(url)+1; + BSTR host, scheme; DWORD res; HKEY domains; + DWORD scheme_type; - host_name = heap_alloc(host_len*sizeof(WCHAR)); - if(!host_name) - return E_OUTOFMEMORY; - - hres = CoInternetParseUrl(url, PARSE_DOMAIN, 0, host_name, host_len, &host_len, 0); - if(hres == S_FALSE) { - WCHAR *tmp = heap_realloc(host_name, (host_len+1)*sizeof(WCHAR)); - if(!tmp) { - heap_free(host_name); - return E_OUTOFMEMORY; - } - - host_name = tmp; - hres = CoInternetParseUrl(url, PARSE_DOMAIN, 0, host_name, host_len+1, &host_len, 0); - } + hres = IUri_GetScheme(uri, &scheme_type); + if(FAILED(hres)) + return hres; /* Windows doesn't play nice with unknown scheme types when it tries * to check if a host name maps into any domains. - * - * The reason is with how CoInternetParseUrl handles unknown scheme types - * when it's parsing the domain of a URL (IE it always returns E_FAIL). - * - * Windows doesn't compensate for this and simply doesn't check if - * the URL maps into any domains. */ - if(hres != S_OK) { - heap_free(host_name); - if(hres == E_FAIL) - return S_FALSE; + if(scheme_type == URL_SCHEME_UNKNOWN) + return S_FALSE; + + hres = IUri_GetHost(uri, &host); + if(FAILED(hres)) + return hres; + + hres = IUri_GetSchemeName(uri, &scheme); + if(FAILED(hres)) { + SysFreeString(host); return hres; } /* First try CURRENT_USER. */ res = RegOpenKeyW(HKEY_CURRENT_USER, wszZoneMapDomainsKey, &domains); if(res == ERROR_SUCCESS) { - hres = search_for_domain_mapping(domains, schema, host_name, host_len, zone); + hres = search_for_domain_mapping(domains, scheme, host, SysStringLen(host), zone); RegCloseKey(domains); } else WARN("Failed to open HKCU's %s key\n", debugstr_w(wszZoneMapDomainsKey)); @@ -496,13 +484,14 @@ static HRESULT get_zone_from_domains(LPCWSTR url, LPCWSTR schema, DWORD *zone) if(hres == S_FALSE) { res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszZoneMapDomainsKey, &domains); if(res == ERROR_SUCCESS) { - hres = search_for_domain_mapping(domains, schema, host_name, host_len, zone); + hres = search_for_domain_mapping(domains, scheme, host, SysStringLen(host), zone); RegCloseKey(domains); } else WARN("Failed to open HKLM's %s key\n", debugstr_w(wszZoneMapDomainsKey)); } - heap_free(host_name); + SysFreeString(host); + SysFreeString(scheme); return hres; } @@ -563,16 +552,7 @@ static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) } if(*zone == URLZONE_INVALID) { - BSTR secur_url; - - hres = IUri_GetDisplayUri(uri, &secur_url); - if(FAILED(hres)) { - SysFreeString(scheme); - return hres; - } - - hres = get_zone_from_domains(secur_url, scheme, zone); - SysFreeString(secur_url); + hres = get_zone_from_domains(uri, zone); if(hres == S_FALSE) hres = get_zone_from_reg(scheme, zone); } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 3e8cef3..c8d5b8b 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -604,7 +604,8 @@ static const zone_domain_mapping zone_domain_mappings[] = { {"www.testing.com",NULL,"http",URLZONE_CUSTOM}, {"www.testing.com","testing","http",URLZONE_CUSTOM2}, {"org",NULL,"http",URLZONE_CUSTOM}, - {"org","testing","http",URLZONE_CUSTOM2} + {"org","testing","http",URLZONE_CUSTOM2}, + {"wine.testing",NULL,"*",URLZONE_CUSTOM2} }; static void register_zone_domains(void) @@ -751,7 +752,10 @@ static const zone_mapping_test zone_mapping_tests[] = { /* Tests for "org" zone mappings. */ {"http://google.org/",URLZONE_INTERNET,FALSE,URLZONE_CUSTOM}, {"http://org/",URLZONE_CUSTOM}, - {"http://testing.org/",URLZONE_CUSTOM2} + {"http://testing.org/",URLZONE_CUSTOM2}, + /* Tests for "wine.testing" mapping */ + {"*:wine.testing/test",URLZONE_CUSTOM2}, + {"http://wine.testing/testing",URLZONE_CUSTOM2} }; static void test_zone_domain_mappings(void)

1 0

Jacek Caban : vbscript: Added more uninitialization tests and fixes.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: aff6961bacb75b42636c21142cdfd95842508d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff6961bacb75b42636c21142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:29 2011 +0200 vbscript: Added more uninitialization tests and fixes. --- dlls/vbscript/tests/vbscript.c | 127 ++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 24 +++++--- 2 files changed, 138 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 9dd3f0f..ab5c8af 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -23,6 +23,7 @@ #include <ole2.h> #include <activscp.h> #include <objsafe.h> +#include <dispex.h> #include "wine/test.h" @@ -282,6 +283,24 @@ static void test_safety(IActiveScript *script) IObjectSafety_Release(safety); } +static IDispatchEx *get_script_dispatch(IActiveScript *script) +{ + IDispatchEx *dispex; + IDispatch *disp; + HRESULT hres; + + disp = (void*)0xdeadbeef; + hres = IActiveScript_GetScriptDispatch(script, NULL, &disp); + ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); + if(FAILED(hres)) + return NULL; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + return dispex; +} + static void test_no_script_dispatch(IActiveScript *script) { IDispatch *disp; @@ -349,9 +368,7 @@ static void test_vbscript(void) SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(vbscript); ok(hres == S_OK, "Close failed: %08x\n", hres); - todo_wine CHECK_CALLED(OnStateChange_DISCONNECTED); - todo_wine CHECK_CALLED(OnStateChange_INITIALIZED); CHECK_CALLED(OnStateChange_CLOSED); @@ -364,6 +381,106 @@ static void test_vbscript(void) ok(!ref, "ref = %d\n", ref); } +static void test_vbscript_uninitializing(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IDispatchEx *dispex; + ULONG ref; + HRESULT hres; + + static const WCHAR script_textW[] = + {'F','u','n','c','t','i','o','n',' ','f','\n','E','n','d',' ','F','u','n','c','t','i','o','n','\n',0}; + + script = create_vbscript(); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScriptParse64_InitNew(parse); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(script, SCRIPTSTATE_INITIALIZED); + + hres = IActiveScriptParse64_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + todo_wine + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == E_UNEXPECTED, "SetScriptSite failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + todo_wine + CHECK_CALLED(OnEnterScript); + todo_wine + CHECK_CALLED(OnLeaveScript); + + test_state(script, SCRIPTSTATE_CONNECTED); + + dispex = get_script_dispatch(script); + ok(dispex != NULL, "dispex == NULL\n"); + if(dispex) + IDispatchEx_Release(dispex); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_UNINITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_UNINITIALIZED); + + test_state(script, SCRIPTSTATE_UNINITIALIZED); + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x, expected E_UNEXPECTED\n", hres); + + test_state(script, SCRIPTSTATE_CLOSED); + + IUnknown_Release(parse); + + ref = IActiveScript_Release(script); + ok(!ref, "ref = %d\n", ref); +} + + static BOOL check_vbscript(void) { IActiveScript *vbscript; @@ -381,10 +498,12 @@ START_TEST(vbscript) { CoInitialize(NULL); - if(check_vbscript()) + if(check_vbscript()) { test_vbscript(); - else + test_vbscript_uninitializing(); + }else { win_skip("VBScript engine not available\n"); + } CoUninitialize(); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 9d23499..2ca5584 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -98,27 +98,33 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) { switch(This->state) { case SCRIPTSTATE_CONNECTED: + change_state(This, SCRIPTSTATE_DISCONNECTED); + if(state == SCRIPTSTATE_DISCONNECTED) + return; + /* FALLTHROUGH */ case SCRIPTSTATE_STARTED: case SCRIPTSTATE_DISCONNECTED: - FIXME("unimplemented state %d\n", This->state); + if(This->state == SCRIPTSTATE_DISCONNECTED) + change_state(This, SCRIPTSTATE_INITIALIZED); if(state == SCRIPTSTATE_INITIALIZED) break; /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: - destroy_script(This->ctx); - This->ctx = NULL; - This->thread_id = 0; - - change_state(This, state); - if(state == SCRIPTSTATE_UNINITIALIZED) - break; - /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: + change_state(This, state); + if(This->site) { IActiveScriptSite_Release(This->site); This->site = NULL; } + This->thread_id = 0; + + if(state == SCRIPTSTATE_CLOSED) { + destroy_script(This->ctx); + This->ctx = NULL; + } + break; default: assert(0);

1 0

Jacek Caban : vbscript: Added GetScriptDispatch implementation.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 71cbb6e17cd0aa3f44ddff97f2dca03687547b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cbb6e17cd0aa3f44ddff97f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:14 2011 +0200 vbscript: Added GetScriptDispatch implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/tests/vbscript.c | 12 +++ dlls/vbscript/vbdisp.c | 205 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 24 +++++- dlls/vbscript/vbscript.h | 11 ++ 5 files changed, 251 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71cbb6e17cd0aa3f44ddf…

1 0

Michael Stefaniuc : ntdll: Don' t use HIWORD to check if an atom is a small int.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 5a886316b4575b2ee2dae5b556c5891d22b17dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a886316b4575b2ee2dae5b55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 5 11:18:17 2011 +0200 ntdll: Don't use HIWORD to check if an atom is a small int. --- dlls/ntdll/atom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index 8ac4b97..3789567 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -212,7 +212,7 @@ NTSTATUS WINAPI RtlAddAtomToAtomTable( RTL_ATOM_TABLE table, const WCHAR* name, if (!table) status = STATUS_INVALID_PARAMETER; else { - size_t len = HIWORD(name) ? strlenW(name) : 0; + size_t len = IS_INTATOM(name) ? 0 : strlenW(name); status = is_integral_atom( name, len, atom ); if (status == STATUS_MORE_ENTRIES) { @@ -242,7 +242,7 @@ NTSTATUS WINAPI RtlLookupAtomInAtomTable( RTL_ATOM_TABLE table, const WCHAR* nam if (!table) status = STATUS_INVALID_PARAMETER; else { - size_t len = HIWORD(name) ? strlenW(name) : 0; + size_t len = IS_INTATOM(name) ? 0 : strlenW(name); status = is_integral_atom( name, len, atom ); if (status == STATUS_MORE_ENTRIES) {

1 0

Francois Gouget : po: Mark a couple of broken Korean translations as fuzzy.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: dfa0acd1fd84f491ca4957feefe30d9734f04f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa0acd1fd84f491ca4957fee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:17:27 2011 +0200 po: Mark a couple of broken Korean translations as fuzzy. --- po/ko.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index 17121b0..62eacda 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8117,7 +8117,7 @@ msgid "" msgstr "" "FTYPE은 파일 형식과 관련한 열기 명령을 보여주거나 고침\n" "\n" -"형식:FSTYPE[파일형식[=[열기명령]]]\n" +"형식:FTYPE[파일형식[=[열기명령]]]\n" "\n" "매개변수가 없으면, 열기 명령 문자열에 현재 정의된 파일 형식을 보여 줍니다\n" "만약 파일 형식만 사용된다면, 열기 명령 문자열에 연결된 가능 한 것을 보여줍니" @@ -8149,6 +8149,7 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:288 +#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8593,6 +8594,7 @@ msgid "Reconnecting" msgstr "다시 연결중" #: net.rc:40 +#, fuzzy msgid "The following services are running:\n" msgstr "의존하고 있는 서비스가 실행중임\n"

1 0

Francois Gouget : crypt32 & cryptdlg: Specify a message context for 'CA', ' OCSP' and 'CPS'.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

1 0

Francois Gouget : wordpad: Specify a message context for 'cm', 'in' and 'pt '.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

1 0