November 2011 - Wine-Commits

Dmitry Timoshkov : user32: Add tests for mixed WS_CHILD | WS_POPUP window styles.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 50d37fe0abc6c35ead2442970e256820cc176f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d37fe0abc6c35ead2442970… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 15 12:56:49 2011 +0800 user32: Add tests for mixed WS_CHILD | WS_POPUP window styles. --- dlls/user32/tests/win.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 16a56dc..804d452 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3710,7 +3710,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); /* WS_CLIPSIBLINGS can't be reset on top-level windows */ - if (dwStyleIn & WS_CHILD) dwStyleOut = dwStyleIn; + if ((dwStyleIn & (WS_CHILD|WS_POPUP)) == WS_CHILD) dwStyleOut = dwStyleIn; else dwStyleOut = dwStyleIn | WS_CLIPSIBLINGS; /* WS_EX_WINDOWEDGE can't always be changed */ if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || (dwStyleIn & WS_THICKFRAME)) @@ -3735,6 +3735,9 @@ static void test_window_styles(void) check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); check_window_style(WS_CHILD, 0, WS_CHILD, 0); + check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); + check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0);

1 0

Piotr Caban : services: Create service environment when first service is started.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 8141fb80eb4d11b31ff5b4c67449455b1512e57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8141fb80eb4d11b31ff5b4c67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 12:55:58 2011 +0100 services: Create service environment when first service is started. --- programs/services/Makefile.in | 2 +- programs/services/services.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 96ab500..e2c8086 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = services.exe APPMODE = -mconsole -IMPORTS = rpcrt4 advapi32 +IMPORTS = rpcrt4 advapi32 userenv C_SRCS = \ rpc.c \ diff --git a/programs/services/services.c b/programs/services/services.c index 7134ae7..94b4747 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -24,6 +24,7 @@ #include <windows.h> #include <winsvc.h> #include <rpc.h> +#include <userenv.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -40,6 +41,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 20000; +static void *env = NULL; static const int is_win64 = (sizeof(void *) > sizeof(int)); @@ -581,6 +583,17 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_lock_exclusive(service_entry); + if (!env) + { + HANDLE htok; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + CreateEnvironmentBlock(&env, htok, FALSE); + + if (!env) + WINE_ERR("failed to create services environment\n"); + } + size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); if (!path) @@ -632,7 +645,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_unlock(service_entry); - r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi); HeapFree(GetProcessHeap(),0,path); if (!r) { @@ -867,5 +880,7 @@ int main(int argc, char *argv[]) RPC_MainLoop(); } scmdatabase_destroy(active_database); + if (env) + DestroyEnvironmentBlock(env); return err; }

1 0

Piotr Caban : msvcr90: Added __vswprintf_l implementation.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 6aea3dcf25a23438d4f08b67a4c6fd97daeb0c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aea3dcf25a23438d4f08b67a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 14:20:49 2011 +0100 msvcr90: Added __vswprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0925c1f..4b5b525 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -480,7 +480,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4cde658..5de5586 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -304,7 +304,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9d0d9e6..77e0e45 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -296,7 +296,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c3a837d..b6ae4c3 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -98,6 +98,8 @@ static int* (__cdecl *p_fpecode)(void); static int (__cdecl *p_configthreadlocale)(int); static void* (__cdecl *p_get_terminate)(void); static void* (__cdecl *p_get_unexpected)(void); +static int (__cdecl *p__vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); +static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); /* type info */ @@ -264,6 +266,8 @@ static BOOL init(void) SET(p_configthreadlocale, "_configthreadlocale"); SET(p_get_terminate, "_get_terminate"); SET(p_get_unexpected, "_get_unexpected"); + SET(p__vswprintf_l, "__vswprintf_l"); + SET(p_vswprintf_l, "_vswprintf_l"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -981,6 +985,46 @@ static void test_getptd(void) ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); } +static int __cdecl __vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p_vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static void test__vswprintf_l(void) +{ + static const wchar_t format[] = {'t','e','s','t',0}; + + wchar_t buf[32]; + int ret; + + ret = __vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); + + ret = _vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); +} + START_TEST(msvcr90) { if(!init()) @@ -1001,4 +1045,5 @@ START_TEST(msvcr90) test__realloc_crt(); test_typeinfo(); test_getptd(); + test__vswprintf_l(); }

1 0

Piotr Caban : userenv: Improved CreateEnvironmentBlock implementation.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: f0d8c3383efecebc54c160dbce67730fbe29373a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8c3383efecebc54c160dbc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 12:55:36 2011 +0100 userenv: Improved CreateEnvironmentBlock implementation. --- dlls/userenv/tests/userenv.c | 94 ++++++----- dlls/userenv/userenv_main.c | 375 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 425 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0d8c3383efecebc54c16…

1 0

Dmitry Timoshkov : user32: Dialog creation code should force WS_CHILD style for dialog controls.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 2429ef905c46aec91465ac187c5f0b528cd35612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2429ef905c46aec91465ac187… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 15 15:27:13 2011 +0800 user32: Dialog creation code should force WS_CHILD style for dialog controls. --- dlls/user32/dialog.c | 4 +++- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 ++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 1e47374..7643241 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -263,7 +263,9 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL { template = (LPCSTR)DIALOG_GetControl32( (const WORD *)template, &info, dlgTemplate->dialogEx ); - /* Is this it? */ + info.style &= ~WS_POPUP; + info.style |= WS_CHILD; + if (info.style & WS_BORDER) { info.style &= ~WS_BORDER; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f749278..a716f79 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -33,6 +33,8 @@ #include <stdio.h> #include <stdarg.h> +#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ + #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -1058,11 +1060,50 @@ static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, return FALSE; } +static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + HWND control; + DWORD style, exstyle; + char buf[256]; + + switch (msg) + { + case WM_INITDIALOG: + control = GetDlgItem(hdlg, 7); + ok(control != 0, "dialog control with id 7 not found\n"); + style = GetWindowLong(control, GWL_STYLE); + ok(style == (WS_CHILD|WS_VISIBLE), "expected WS_CHILD|WS_VISIBLE, got %#x\n", style); + exstyle = GetWindowLong(control, GWL_EXSTYLE); + ok(exstyle == (WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT|WS_EX_CLIENTEDGE), "expected WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT|WS_EX_CLIENTEDGE, got %#x\n", exstyle); + buf[0] = 0; + GetWindowText(control, buf, sizeof(buf)); + ok(lstrcmp(buf, "bump7") == 0, "expected bump7, got %s\n", buf); + + control = GetDlgItem(hdlg, 8); + ok(control != 0, "dialog control with id 8 not found\n"); + style = GetWindowLong(control, GWL_STYLE); + ok(style == (WS_CHILD|WS_VISIBLE), "expected WS_CHILD|WS_VISIBLE, got %#x\n", style); + exstyle = GetWindowLong(control, GWL_EXSTYLE); + ok(exstyle == (WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT), "expected WS_EX_NOPARENTNOTIFY|WS_EX_TRANSPARENT, got %#x\n", exstyle); + buf[0] = 0; + GetWindowText(control, buf, sizeof(buf)); + ok(lstrcmp(buf, "bump8") == 0, "expected bump8, got %s\n", buf); + + EndDialog(hdlg, -7); + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; + ret = DialogBoxParamA(GetModuleHandle(0), "TEST_DLG_CHILD_POPUP", 0, TestControlStyleDlgProc, 0); + ok(ret == -7, "expected -7, got %ld\n", ret); + SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG" , hwnd_invalid, 0 , 0); ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %ld, expected 0\n", ret); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 4341710..cce1478 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -45,6 +45,16 @@ STRINGTABLE 65534 "Test high id" } +/* Test dialog with a mixed style WS_CHILD | WS_POPUP control */ +TEST_DLG_CHILD_POPUP DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog with mixed style controls" +FONT 8, "MS Shell Dlg" +{ + CONTROL "bump7",7,"static",WS_CHILD|WS_POPUP|WS_BORDER,0,0,40,10,WS_EX_TRANSPARENT + CONTROL "bump8",8,"static",WS_POPUP,0,10,40,10,WS_EX_TRANSPARENT +} + TEST_DIALOG DIALOG 0, 0, 60, 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Test dialog"

1 0

Jacek Caban : mshtml: Properly implement nsIURI::CloneIgnoreRef.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9751e3c65f2ba87f52879d8095d395cb71b5f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9751e3c65f2ba87f52879d809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:12 2011 +0100 mshtml: Properly implement nsIURI::CloneIgnoreRef. --- dlls/mshtml/nsio.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7b6bb78..547f258 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -86,6 +86,33 @@ static BOOL ensure_uri(nsWineURI *This) return TRUE; } +static IUri *get_uri_nofrag(IUri *uri) +{ + IUriBuilder *uri_builder; + IUri *ret; + BOOL b; + HRESULT hres; + + hres = IUri_HasProperty(uri, Uri_PROPERTY_FRAGMENT, &b); + if(SUCCEEDED(hres) && !b) { + IUri_AddRef(uri); + return uri; + } + + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NULL; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &ret); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NULL; + + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2232,13 +2259,6 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return NS_OK; } -static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p)\n", This, _retval); - return nsIURL_Clone(&This->nsIURL_iface, _retval); -} - static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePath, nsACString *_retval) { @@ -2314,6 +2334,33 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *wine_uri; + IUri *uri; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, _retval); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + uri = get_uri_nofrag(This->uri); + if(!uri) + return NS_ERROR_FAILURE; + + nsres = create_nsuri(uri, NULL, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + IUri_Release(uri); + if(NS_FAILED(nsres)) { + WARN("create_nsuri failed: %08x\n", nsres); + return nsres; + } + + *_retval = (nsIURI*)&wine_uri->nsIURL_iface; + return NS_OK; +} + static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIURL *iface, nsACString *aSpecIgnoringRef) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Andrew Eikum : urlmon: Improve parsing of SCHEME_MK URIs.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 31853fc203c175db96f70440b2ee5593f2dec6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=31853fc203c175db96f70440b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 15 08:32:26 2011 -0600 urlmon: Improve parsing of SCHEME_MK URIs. --- dlls/urlmon/tests/uri.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 15 +++++- 2 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3483878..327b9a2 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4316,7 +4316,32 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_WILDCARD,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } - } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, }; typedef struct _invalid_uri { @@ -6336,6 +6361,87 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::\\subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir\\file.txt",0, + "relative\\path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9fd0fe0..8f0e7e7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3086,6 +3086,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_mk = data->scheme_type == URL_SCHEME_MK; if(!data->path) { uri->path_start = -1; @@ -3095,6 +3096,12 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_start = uri->canon_len; + if(is_mk){ + /* hijack this flag for SCHEME_MK to tell the function when to start + * converting slashes */ + flags |= Uri_CREATE_FILE_USE_DOS_PATH; + } + /* For javascript: URIs, simply copy path part without any canonicalization */ if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { if(!computeOnly) @@ -3137,13 +3144,15 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla ++uri->canon_len; do_default_action = FALSE; } else if(*ptr == '\\') { - if(is_file && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if((data->is_relative || is_mk || is_file) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert to a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; do_default_action = FALSE; } + } else if(is_mk && *ptr == ':' && ptr + 1 < data->path + data->path_len && *(ptr + 1) == ':') { + flags &= ~Uri_CREATE_FILE_USE_DOS_PATH; } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { @@ -3161,7 +3170,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } } - if(data->scheme_type == URL_SCHEME_MK && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { + if(is_mk && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { DWORD new_len = remove_dot_segments(uri->canon_uri + uri->path_start, uri->canon_len - uri->path_start); uri->canon_len = uri->path_start + new_len; @@ -5165,7 +5174,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU memset(&data, 0, sizeof(parse_data)); data.uri = ret->raw_uri; - /* Validate and parse the URI into it's components. */ + /* Validate and parse the URI into its components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ IUri_Release(&ret->IUri_iface);

1 0

Michael Mc Donnell : d3dx9/tests: Test for D3DXMESH_VB_SHARE option.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 656e8a872677e849d63f64463aeaae6b297acbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=656e8a872677e849d63f64463… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 11:45:58 2011 -0500 d3dx9/tests: Test for D3DXMESH_VB_SHARE option. --- dlls/d3dx9_36/tests/mesh.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=656e8a872677e849d63f6…

1 0

Alistair Leslie-Hughes : mscoree: Implement ICorDebug CreateProcess.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 3d6708a194370153a25c49e0a58d75a36e9ec2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6708a194370153a25c49e0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 4 12:18:21 2011 +1100 mscoree: Implement ICorDebug CreateProcess. --- dlls/mscoree/cordebug.c | 431 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 427 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6708a194370153a25c4…

1 0

Jacek Caban : mshtml: Added nsIURI::GetSpecIgnoringRef implementation.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: af9508a13a1c605d0ba9ab07af73e79a3b661a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9508a13a1c605d0ba9ab07a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:44 2011 +0100 mshtml: Added nsIURI::GetSpecIgnoringRef implementation. --- dlls/mshtml/nsio.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b507446..e16c25e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2411,8 +2411,20 @@ static nsresult NSAPI nsURI_GetSpecIgnoringRef(nsIURL *iface, nsACString *aSpecI static nsresult NSAPI nsURI_GetHasRef(nsIURL *iface, PRBool *aHasRef) { nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p)\n", This, aHasRef); - return NS_ERROR_NOT_IMPLEMENTED; + BOOL b; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aHasRef); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_HasProperty(This->uri, Uri_PROPERTY_FRAGMENT, &b); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + *aHasRef = b; + return NS_OK; } static nsresult NSAPI nsURL_GetFilePath(nsIURL *iface, nsACString *aFilePath)

1 0