February 2016 - Wine-Commits

Jacek Caban : user32: Don't use window' s parent as an owner if WS_CHILD style is not set.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: d13a44e4aa12fa5ad3498c39934e88a7dcd30916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13a44e4aa12fa5ad3498c399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 12:54:59 2016 +0100 user32: Don't use window's parent as an owner if WS_CHILD style is not set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 25 +++++++++++++++++++++++++ server/window.c | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 71459e1..988aa6c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -652,6 +652,31 @@ static void test_parent_owner(void) DestroyWindow( child ); DestroyWindow( test ); DestroyWindow( owner ); + + /* Test that owner window takes into account WS_CHILD flag even if parent is set by SetParent. */ + owner = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, NULL, NULL, hwndMain, owner ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, owner, NULL, owner, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); + + owner = create_tool_window( WS_VISIBLE | WS_CHILD, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, hwndMain, NULL, hwndMain, hwndMain ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, hwndMain, NULL, hwndMain, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); + + owner = create_tool_window( WS_VISIBLE | WS_POPUP | WS_CHILD, desktop ); + SetParent(owner, hwndMain); + check_parents( owner, hwndMain, hwndMain, NULL, NULL, hwndMain, owner ); + test = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + check_parents( test, desktop, owner, NULL, owner, test, test ); + DestroyWindow( owner ); + DestroyWindow( test ); } static BOOL CALLBACK enum_proc( HWND hwnd, LPARAM lParam) diff --git a/server/window.c b/server/window.c index 9328211..143b60c 100644 --- a/server/window.c +++ b/server/window.c @@ -1901,7 +1901,8 @@ DECL_HANDLER(create_window) return; } else /* owner must be a top-level window */ - while (!is_desktop_window(owner->parent)) owner = owner->parent; + while ((owner->style & (WS_POPUP|WS_CHILD)) == WS_CHILD && !is_desktop_window(owner->parent)) + owner = owner->parent; } atom = cls_name.len ? find_global_atom( NULL, &cls_name ) : req->atom;

1 0

Hugh McMaster : reg: Add support for REG_MULTI_SZ.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 47b2238b3dc7ad5f0f482d0c9cd525cfeb4537f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b2238b3dc7ad5f0f482d0c9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 24 15:30:20 2016 +1100 reg: Add support for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 23 ++++++++++++++++++++++- programs/reg/tests/reg.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c6351a9..0155912 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -284,7 +284,28 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r break; } case REG_MULTI_SZ: - /* FIXME: Needs handling */ + { + int i, destindex, len = strlenW(data); + WCHAR *buffer = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + + for (i = 0, destindex = 0; i < len; i++, destindex++) + { + if (data[i] == '\\' && data[i + 1] == '0') + { + buffer[destindex] = 0; + i++; + } + else if (data[i] == separator) + buffer[destindex] = 0; + else + buffer[destindex] = data[i]; + } + buffer[destindex] = 0; + if (destindex && buffer[destindex - 1]) + buffer[++destindex] = 0; + *reg_count = (destindex + 1) * sizeof(WCHAR); + return (BYTE *)buffer; + } default: output_message(STRING_UNHANDLED_TYPE, reg_type, data); } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5455021..ac01631 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -326,25 +326,25 @@ static void test_add(void) /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - todo_wine verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - todo_wine verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -353,16 +353,16 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - todo_wine verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -371,23 +371,23 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); buffer[0] = 0; buffer[1] = 0; - todo_wine verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); RegCloseKey(hkey);

1 0

Jacek Caban : mshtml: Expose XMLHttpRequest constructor to scripts.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: c0fda9824e213e5a779bddfba6052dfc20b9c8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fda9824e213e5a779bddfba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 15:21:24 2016 +0100 mshtml: Expose XMLHttpRequest constructor to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 52 +++++++++++++++++++++++++++---------------- dlls/mshtml/htmlwindow.c | 3 ++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 9 ++++++++ 5 files changed, 69 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3980daf..90e5c72 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -241,8 +241,8 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN if(info == data->funcs+data->func_cnt) { if(data->func_cnt == *size) data->funcs = heap_realloc_zero(data->funcs, (*size <<= 1)*sizeof(func_info_t)); - info = data->funcs+data->func_cnt; + hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); if(FAILED(hres)) return; @@ -315,6 +315,31 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN } } +static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo, DWORD *size) +{ + unsigned i = 7; /* skip IDispatch functions */ + ITypeInfo *typeinfo; + FUNCDESC *funcdesc; + HRESULT hres; + + hres = get_typeinfo(tid, &typeinfo); + if(FAILED(hres)) + return hres; + + while(1) { + hres = ITypeInfo_GetFuncDesc(typeinfo, i++, &funcdesc); + if(FAILED(hres)) + break; + + TRACE("adding...\n"); + + add_func_info(data, size, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); + ITypeInfo_ReleaseFuncDesc(typeinfo, funcdesc); + } + + return S_OK; +} + static int dispid_cmp(const void *p1, const void *p2) { return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; @@ -327,11 +352,10 @@ static int func_name_cmp(const void *p1, const void *p2) static dispex_data_t *preprocess_dispex_data(DispatchEx *This) { - const tid_t *tid = This->data->iface_tids; - FUNCDESC *funcdesc; + const tid_t *tid; dispex_data_t *data; DWORD size = 16, i; - ITypeInfo *ti, *dti; + ITypeInfo *dti; HRESULT hres; TRACE("(%p)\n", This); @@ -359,24 +383,15 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } list_add_tail(&dispex_data_list, &data->entry); - while(*tid) { - hres = get_typeinfo(*tid, &ti); + for(tid = This->data->iface_tids; *tid; tid++) { + hres = process_interface(data, *tid, dti, &size); if(FAILED(hres)) break; - - i=7; - while(1) { - hres = ITypeInfo_GetFuncDesc(ti, i++, &funcdesc); - if(FAILED(hres)) - break; - - add_func_info(data, &size, *tid, funcdesc, dti); - ITypeInfo_ReleaseFuncDesc(ti, funcdesc); - } - - tid++; } + if(This->data->additional_tid) + process_interface(data, This->data->additional_tid, NULL, &size); + if(!data->func_cnt) { heap_free(data->funcs); data->name_table = NULL; @@ -392,7 +407,6 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i; qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); - return data; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d7d133a..f203405 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2939,7 +2939,8 @@ static dispex_static_data_t HTMLWindow_dispex = { &HTMLWindow_dispex_vtbl, DispHTMLWindow2_tid, NULL, - HTMLWindow_iface_tids + HTMLWindow_iface_tids, + IHTMLWindow5_tid }; static void *alloc_window(size_t size) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f0255f..f4e6668 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -248,6 +248,7 @@ typedef struct { const tid_t disp_tid; dispex_data_t *data; const tid_t* const iface_tids; + const tid_t additional_tid; } dispex_static_data_t; struct DispatchEx { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4b2b825..e27339a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6598,6 +6598,28 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDOMImplementation_Release(dom_implementation); } +static void test_xhr(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IDispatchEx *dispex; + DISPID id; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + str = a2bstr("XMLHttpRequest"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(str); + + IHTMLWindow2_Release(window); +} + static void test_defaults(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *stylesheetcol; @@ -6670,6 +6692,8 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + test_xhr(doc); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index f0d3e3b..2a5a447 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -354,6 +354,14 @@ function test_text_node() { ok(text2.data == "testing", "text2.data = " + text2.data); } +function test_xhr() { + ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); + ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); + + var xhr = new XMLHttpRequest(); + ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); +} + var globalVar = false; function runTests() { @@ -379,6 +387,7 @@ function runTests() { test_whitespace_nodes(); test_language_attribute(); test_text_node(); + test_xhr(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Alexandre Julliard : make_unicode: Mark most data tables as hidden.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 0bbeaae678b9bcc91b73e3686013a872e8c39042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbeaae678b9bcc91b73e3686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:39:01 2016 +0900 make_unicode: Mark most data tables as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++-- dlls/dwrite/bidi.c | 4 ++-- dlls/dwrite/bracket.c | 4 +++- dlls/dwrite/linebreak.c | 4 +++- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 4 +++- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/vertical.c | 4 +++- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/nameprep.c | 6 ++++-- dlls/usp10/bidi.c | 2 +- dlls/usp10/bracket.c | 4 +++- dlls/usp10/breaking.c | 2 +- dlls/usp10/indicsyllable.c | 4 +++- dlls/usp10/linebreak.c | 4 +++- dlls/usp10/mirror.c | 2 +- dlls/usp10/shape.c | 6 +++--- dlls/usp10/shaping.c | 6 ++++-- dlls/usp10/usp10.c | 2 +- dlls/wineps.drv/text.c | 2 +- dlls/wineps.drv/vertical.c | 4 +++- tools/make_unicode | 15 +++++++++++---- 22 files changed, 59 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bbeaae678b9bcc91b73e…

1 0

Hugh McMaster : reg/tests: Add two more tests for REG_MULTI_SZ.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 786eb1a70ed642f7ea047c1e9f743bfc3ebf002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786eb1a70ed642f7ea047c1e9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 24 15:30:19 2016 +1100 reg/tests: Add two more tests for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index db3b5a2..5455021 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -380,6 +380,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + buffer[0] = 0; buffer[1] = 0; + todo_wine verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Alexandre Julliard : libport: Mark internal functions and data tables as hidden.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 34174e2ca8cb61150d3d880400d8231a39d38307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34174e2ca8cb61150d3d88040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:36:41 2016 +0900 libport: Mark internal functions and data tables as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 4 ++-- libs/port/fold.c | 4 ++-- libs/port/mbtowc.c | 2 +- libs/port/utf8.c | 2 +- libs/port/wctomb.c | 2 +- tools/make_unicode | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/port/compose.c b/libs/port/compose.c index da49b44..8903d32 100644 --- a/libs/port/compose.c +++ b/libs/port/compose.c @@ -392,7 +392,7 @@ static inline int binary_search( WCHAR ch, int low, int high ) return -1; } -WCHAR wine_compose( const WCHAR *str ) +WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) { int pos, idx = 1, start = 0, count = 70; for (;;) diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 3e4a28b..34e83ec 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -747,7 +747,7 @@ static const WCHAR table[4704] = 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 }; -unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res; diff --git a/libs/port/digitmap.c b/libs/port/digitmap.c index e6b398d..c200497 100644 --- a/libs/port/digitmap.c +++ b/libs/port/digitmap.c @@ -4,7 +4,7 @@ #include "wine/unicode.h" -const WCHAR wine_digitmap[5933] = +const WCHAR DECLSPEC_HIDDEN wine_digitmap[5933] = { /* index */ 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x028a, 0x0384, @@ -786,7 +786,7 @@ const WCHAR wine_digitmap[5933] = 0x0000, 0x0000 }; -const WCHAR wine_compatmap[1497] = +const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] = { /* index */ 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, diff --git a/libs/port/fold.c b/libs/port/fold.c index 87a4a41..738469c 100644 --- a/libs/port/fold.c +++ b/libs/port/fold.c @@ -22,13 +22,13 @@ static inline WCHAR to_unicode_digit( WCHAR ch ) { - extern const WCHAR wine_digitmap[]; + extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; return ch + wine_digitmap[wine_digitmap[ch >> 8] + (ch & 0xff)]; } static inline WCHAR to_unicode_native( WCHAR ch ) { - extern const WCHAR wine_compatmap[]; + extern const WCHAR wine_compatmap[] DECLSPEC_HIDDEN; return ch + wine_compatmap[wine_compatmap[ch >> 8] + (ch & 0xff)]; } diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 9a4bc23..fd7764e 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ); +extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ diff --git a/libs/port/utf8.c b/libs/port/utf8.c index 5943dda..f47561e 100644 --- a/libs/port/utf8.c +++ b/libs/port/utf8.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ static const char utf8_length[128] = diff --git a/libs/port/wctomb.c b/libs/port/wctomb.c index e7f35e5..65e4aa0 100644 --- a/libs/port/wctomb.c +++ b/libs/port/wctomb.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /****************************************************************/ /* sbcs support */ diff --git a/tools/make_unicode b/tools/make_unicode index 19c6cb1..3a8d610 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1599,9 +1599,9 @@ sub dump_digit_folding($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - DUMP_CASE_TABLE( "wine_digitmap", @digitmap_table ); + DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); print OUTPUT "\n"; - DUMP_CASE_TABLE( "wine_compatmap", @compatmap_table ); + DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); close OUTPUT; save_file($filename); } @@ -2113,7 +2113,7 @@ static inline int binary_search( WCHAR ch, int low, int high ) return -1; } -WCHAR wine_compose( const WCHAR *str ) +WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) { int pos, idx = 1, start = 0, count = $count; for (;;) @@ -2218,7 +2218,7 @@ sub dump_decompose_table($) printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res;

1 0

Alexandre Julliard : shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 262a41ca4a9eb581c94088b94fa8aae118451b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262a41ca4a9eb581c94088b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 12:40:59 2016 +0900 shlwapi: Use the standard WideCharToMultiByte instead of wine_utf8_wcstombs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 0680a55..85fa3c1 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1200,16 +1200,15 @@ HRESULT WINAPI UrlEscapeW( if ((cur >= 0xd800 && cur <= 0xdfff) && (src[1] >= 0xdc00 && src[1] <= 0xdfff)) { - WCHAR sur[2]; - - sur[0] = cur; - sur[1] = *++src; - len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf)); + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, + utf, sizeof(utf), NULL, NULL ); + src++; } else - len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf)); + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1, + utf, sizeof(utf), NULL, NULL ); - if(len < 0) { + if (!len) { utf[0] = 0xef; utf[1] = 0xbf; utf[2] = 0xbd;

1 0

Piotr Caban : msvcp120/tests: Run _Unlink tests inside temp directory.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 0301c09d3e52d29f97553992e7f5b517984102e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0301c09d3e52d29f97553992e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:35 2016 +0100 msvcp120/tests: Run _Unlink tests inside temp directory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index c310b89..915f58a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1614,6 +1614,7 @@ static void test_tr2_sys__Symlink(void) static void test_tr2_sys__Unlink(void) { + char temp_path[MAX_PATH], current_path[MAX_PATH]; int ret, i; HANDLE file; LARGE_INTEGER file_size; @@ -1631,6 +1632,10 @@ static void test_tr2_sys__Unlink(void) { NULL, ERROR_PATH_NOT_FOUND, FALSE } }; + GetCurrentDirectoryA(MAX_PATH, current_path); + GetTempPathA(MAX_PATH, temp_path); + ok(SetCurrentDirectoryA(temp_path), "SetCurrentDirectoryA to temp_path failed\n"); + ret = p_tr2_sys__Make_dir("tr2_test_dir"); ok(ret == 1, "tr2_sys__Make_dir(): expect 1 got %d\n", ret); file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -1664,6 +1669,8 @@ static void test_tr2_sys__Unlink(void) ok(!DeleteFileA("tr2_test_dir/f1_symlink"), "expect tr2_test_dir/f1_symlink not to exist\n"); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); + + ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } static int __cdecl thrd_thread(void *arg)

1 0

Stefan Dösinger : wined3d: Keep track of FBOs through the GL names.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: b76fcbe0da45329ff784b027457b4c14c691e215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76fcbe0da45329ff784b0274… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:57 2016 +0000 wined3d: Keep track of FBOs through the GL names. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 280 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 17 ++- 2 files changed, 186 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b76fcbe0da45329ff784b…

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer().
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: a81152df36d96754dd3ce81c6860079d1a90e489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81152df36d96754dd3ce81c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:21:58 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 91a22a3..b9343aa 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -152,7 +152,6 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; @@ -171,8 +170,7 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*backbuffer); }

1 0