September 2016 - Wine-Commits

Sebastian Lackner : jscript: Properly handle \0 characters in Array join method.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 79f18d027f7b9e537e79c22625ad4feaa5fa055e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f18d027f7b9e537e79c2262… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:46:41 2016 +0200 jscript: Properly handle \0 characters in Array join method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 17 +++++++++-------- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 66655f5..eda49cb 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -238,7 +238,8 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return S_OK; } -static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep, jsval_t *r) +static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep, + unsigned seplen, jsval_t *r) { jsstr_t **str_tab, *ret = NULL; jsval_t val; @@ -272,9 +273,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons } if(SUCCEEDED(hres)) { - DWORD seplen = 0, len = 0; - - seplen = strlenW(sep); + DWORD len = 0; if(str_tab[0]) len = jsstr_length(str_tab[0]); @@ -350,11 +349,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis, length, sep, r); + hres = array_join(ctx, jsthis, length, sep, jsstr_length(sep_str), r); jsstr_release(sep_str); }else { - hres = array_join(ctx, jsthis, length, default_separatorW, r); + hres = array_join(ctx, jsthis, length, default_separatorW, strlenW(default_separatorW), r); } return hres; @@ -935,7 +934,8 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(!array) return throw_type_error(ctx, JS_E_ARRAY_EXPECTED, NULL); - return array_join(ctx, &array->dispex, array->length, default_separatorW, r); + return array_join(ctx, &array->dispex, array->length, default_separatorW, + strlenW(default_separatorW), r); } static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1011,7 +1011,8 @@ static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) TRACE("\n"); - return array_join(ctx, &array->dispex, array->length, default_separatorW, r); + return array_join(ctx, &array->dispex, array->length, default_separatorW, + strlenW(default_separatorW), r); } static void Array_destructor(jsdisp_t *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 083da93..b365f3f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -933,6 +933,11 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = ["a", "b"]; + +tmp = arr.join(String.fromCharCode(0)); +ok(tmp === "a" + String.fromCharCode(0) + "b", "arr.join(String.fromCharCode(0)) = " + tmp); + arr = new Object(); arr.length = 3; arr[0] = "aa";

1 0

André Hentschel : kernel32/tests: Don' t test CloseHandle.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 6231d475a11550448ee9cd1f9e6b1f3e30515de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6231d475a11550448ee9cd1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 10 17:49:53 2016 +0200 kernel32/tests: Don't test CloseHandle. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c88db6a..d8584c4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -957,7 +957,7 @@ static void testWaitForConsoleInput(HANDLE input_handle) ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); /* Clean up */ - ok(CloseHandle(complete_event), "Failed to close event handle, last error %d\n", GetLastError()); + CloseHandle(complete_event); } static void test_GetSetConsoleInputExeName(void)

1 0

Bruno Jesus : xinput1_3: Test every xinput DLL version.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 50cb6434bb5ec4c7258067af7a28696908aef7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cb6434bb5ec4c7258067af7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:26 2016 -0300 xinput1_3: Test every xinput DLL version. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 93 +++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index fadacae..ef11b50 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -47,14 +47,14 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); - pXInputEnable(0); + if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); - pXInputEnable(1); + if (pXInputEnable) pXInputEnable(1); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator); @@ -218,37 +218,70 @@ static void test_get_batteryinformation(void) START_TEST(xinput) { + struct + { + const char *name; + int version; + } libs[] = { + { "xinput1_1.dll", 1 }, + { "xinput1_2.dll", 2 }, + { "xinput1_3.dll", 3 }, + { "xinput1_4.dll", 4 }, + { "xinput9_1_0.dll", 0 } /* legacy for XP/Vista */ + }; HMODULE hXinput; void *pXInputGetStateEx_Ordinal; - hXinput = LoadLibraryA( "xinput1_3.dll" ); + int i; - if (!hXinput) + for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) { - win_skip("Could not load xinput1_3.dll\n"); - return; - } + hXinput = LoadLibraryA( libs[i].name ); + + if (!hXinput) + { + win_skip("Could not load %s\n", libs[i].name); + continue; + } + trace("Testing %s\n", libs[i].name); + + pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); + pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); + pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetStateEx = (void*)GetProcAddress(hXinput, "XInputGetStateEx"); /* Win >= 8 */ + pXInputGetStateEx_Ordinal = (void*)GetProcAddress(hXinput, (LPCSTR) 100); + pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); + pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); + pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); + pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); + + /* XInputGetStateEx may not be present by name, use ordinal in this case */ + if (!pXInputGetStateEx) + pXInputGetStateEx = pXInputGetStateEx_Ordinal; + + test_set_state(); + test_get_state(); + test_get_capabilities(); + + if (libs[i].version != 4) + test_get_dsoundaudiodevice(); + else + ok(!pXInputGetDSoundAudioDeviceGuids, "XInputGetDSoundAudioDeviceGuids exists in %s\n", libs[i].name); + + if (libs[i].version > 2) + { + test_get_keystroke(); + test_get_batteryinformation(); + ok(pXInputGetStateEx != NULL, "XInputGetStateEx not found in %s\n", libs[i].name); + } + else + { + ok(!pXInputGetKeystroke, "XInputGetKeystroke exists in %s\n", libs[i].name); + ok(!pXInputGetStateEx, "XInputGetStateEx exists in %s\n", libs[i].name); + ok(!pXInputGetBatteryInformation, "XInputGetBatteryInformation exists in %s\n", libs[i].name); + if (libs[i].version == 0) + ok(!pXInputEnable, "XInputEnable exists in %s\n", libs[i].name); + } - pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); - pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); - pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); - pXInputGetStateEx = (void*)GetProcAddress(hXinput, "XInputGetStateEx"); /* Win >= 8 */ - pXInputGetStateEx_Ordinal = (void*)GetProcAddress(hXinput, (LPCSTR) 100); - pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); - pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); - pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); - pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); - - /* XInputGetStateEx may not be present by name, use ordinal in this case */ - if (!pXInputGetStateEx) - pXInputGetStateEx = pXInputGetStateEx_Ordinal; - ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n"); - - test_set_state(); - test_get_state(); - test_get_keystroke(); - test_get_capabilities(); - test_get_dsoundaudiodevice(); - test_get_batteryinformation(); - - FreeLibrary(hXinput); + FreeLibrary(hXinput); + } }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.18
by Jeremy Newman Sept. 12, 2016

Sept. 12, 2016

Module: website Branch: master Commit: cc00d0c128f48a8282b2e0136fd7d3dc8f15a635 URL: http://source.winehq.org/git/website.git/?a=commit;h=cc00d0c128f48a8282b2e0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 10 07:29:01 2016 +0200 Polish translation for release 1.9.18 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016090301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/pl/2016090301.xml b/news/pl/2016090301.xml new file mode 100644 index 0000000..05705b8 --- /dev/null +++ b/news/pl/2016090301.xml @@ -0,0 +1,19 @@ +<news> +<date>Wrzesień 3, 2016</date> +<title>Wydano Wine 1.9.18</title> +<body> + Wydanie rozwojowe Wine 1.9.18 jest już dostępne. + <a href="{$root}/announce/1.9.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wielu sterowników jądra w pojedynczym procesie.</li> + <li>Szersze wsparcie czytnika Usług Sieciowych.</li> + <li>Rozmaite usprawnienia w obsłudze joysticka.</li> + <li>Postęp w kierunku strumienia poleceń Direct3D.</li> + <li>Zwiększenie wydajności w GDI.</li> + <li>Ulepszona obsługa okien IME.</li> + <li>Poprawki zgodności w obsłudze schowka.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : user32/tests: Add more tests for GDI and private clipboard formats.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: ed97fa1cb2ed24af9a05a05ff2e601d1de8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed97fa1cb2ed24af9a05a05ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:49:27 2016 +0900 user32/tests: Add more tests for GDI and private clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 142 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/clipboard.c | 5 +- 2 files changed, 91 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed97fa1cb2ed24af9a05a…

1 0

Alexandre Julliard : user32/tests: Make the clipboard sequence tests more strict.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 3bab02d02a296a0653ffbe00b0961348116d761b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bab02d02a296a0653ffbe00b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:48:58 2016 +0900 user32/tests: Make the clipboard sequence tests more strict. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4211ae4..dd724d9 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1041,7 +1041,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1066,7 +1066,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1093,7 +1093,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1115,7 +1115,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1137,7 +1137,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1166,7 +1166,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1223,7 +1223,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1321,7 +1321,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1370,7 +1370,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1396,7 +1396,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1443,7 +1443,8 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine_if (!cross_thread) + ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1469,7 +1470,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread)

1 0

Alexandre Julliard : user32: Clear last error in EnumClipboardFormats.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: ef08bd76750908a86317cb9c1f184772002545e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef08bd76750908a86317cb9c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:48:32 2016 +0900 user32: Clear last error in EnumClipboardFormats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 1 + dlls/user32/tests/clipboard.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index d11dd23..326ea03 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -738,6 +738,7 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat) SetLastError(ERROR_CLIPBOARD_NOT_OPEN); return 0; } + SetLastError( 0 ); return USER_Driver->pEnumClipboardFormats(wFormat); } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index da2163b..4211ae4 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -680,16 +680,30 @@ static void test_synthesized(void) r = OpenClipboard( NULL ); ok(r, "gle %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(0); ok( cf == CF_UNICODETEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_TEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_OEMTEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_LOCALE, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats( cf ); ok( cf == 0, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + cf = EnumClipboardFormats( 0xdead ); + ok( cf == 0, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError());

1 0

Sebastian Lackner : configure: Fix a typo in the udev help message.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 4bfefc5c7132023ee40d70572b677ae0e441df38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfefc5c7132023ee40d70572… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 9 15:14:01 2016 +0200 configure: Fix a typo in the udev help message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bb18a6e..5e33a01 100755 --- a/configure +++ b/configure @@ -2281,7 +2281,7 @@ Optional Packages: --without-pulse do not use PulseAudio sound support --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF - --without-udev do not use udev (play and play support) + --without-udev do not use udev (plug and play support) --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension diff --git a/configure.ac b/configure.ac index cadaa5e..8007469 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) -AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (play and play support)])) +AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])

1 0

Andrey Gusev : api-ms-win-core-registryuserspecific-l1-1-0: Add dll.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 64fba3e3961bbaff0cbb7cd143f673b85bc27a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fba3e3961bbaff0cbb7cd14… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Sep 9 12:52:27 2016 +0300 api-ms-win-core-registryuserspecific-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + ...pi-ms-win-core-registryuserspecific-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 30 insertions(+) diff --git a/configure b/configure index 2cc532b..bb18a6e 100755 --- a/configure +++ b/configure @@ -931,6 +931,7 @@ enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 +enable_api_ms_win_core_registryuserspecific_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 @@ -17584,6 +17585,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 +wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 diff --git a/configure.ac b/configure.ac index 6809558..cadaa5e 100644 --- a/configure.ac +++ b/configure.ac @@ -2707,6 +2707,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d11856 --- /dev/null +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registryuserspecific-l1-1-0.dll diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec new file mode 100644 index 0000000..1da9379 --- /dev/null +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey +@ stdcall SHRegCreateUSKeyA(str long long ptr long) shlwapi.SHRegCreateUSKeyA +@ stdcall SHRegCreateUSKeyW(wstr long long ptr long) shlwapi.SHRegCreateUSKeyW +@ stdcall SHRegDeleteEmptyUSKeyA(long str long) shlwapi.SHRegDeleteEmptyUSKeyA +@ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) shlwapi.SHRegDeleteEmptyUSKeyW +@ stdcall SHRegDeleteUSValueA(long str long) shlwapi.SHRegDeleteUSValueA +@ stdcall SHRegDeleteUSValueW(long wstr long) shlwapi.SHRegDeleteUSValueW +@ stdcall SHRegEnumUSKeyA(long long str ptr long) shlwapi.SHRegEnumUSKeyA +@ stdcall SHRegEnumUSKeyW(long long wstr ptr long) shlwapi.SHRegEnumUSKeyW +@ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) shlwapi.SHRegEnumUSValueA +@ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) shlwapi.SHRegEnumUSValueW +@ stdcall SHRegGetBoolUSValueA(str str long long) shlwapi.SHRegGetBoolUSValueA +@ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW +@ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA +@ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW +@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegQueryInfoUSKeyA( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyA +@ stdcall SHRegQueryInfoUSKeyW( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyW +@ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA +@ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW +@ stdcall SHRegSetUSValueA( str str long ptr long long) shlwapi.SHRegSetUSValueA +@ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW +@ stdcall SHRegWriteUSValueA(long str long ptr long long) shlwapi.SHRegWriteUSValueA +@ stdcall SHRegWriteUSValueW(long wstr long ptr long long) shlwapi.SHRegWriteUSValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 0b0bf28..68274f8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,6 +224,7 @@ my @dll_groups = "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", + "api-ms-win-core-registryuserspecific-l1-1-0", "api-ms-win-core-shlwapi-legacy-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-1-0", "api-ms-win-core-url-l1-1-0",

1 0

Sebastian Lackner : jscript: Properly handle \0 characters in String to{Lower, Upper}Case methods.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 54e6736032c59a3978918c3d3ac2ea8347f5d3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e6736032c59a3978918c3d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:52:19 2016 +0200 jscript: Properly handle \0 characters in String to{Lower,Upper}Case methods. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 12 ++++++++---- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 80c3dd8..40aa552 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1402,17 +1402,19 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return hres; if(r) { + unsigned len = jsstr_length(str); jsstr_t *ret; WCHAR *buf; - ret = jsstr_alloc_buf(jsstr_length(str), &buf); + ret = jsstr_alloc_buf(len, &buf); if(!ret) { jsstr_release(str); return E_OUTOFMEMORY; } jsstr_flush(str, buf); - strlwrW(buf); + for (; len--; buf++) *buf = tolowerW(*buf); + *r = jsval_string(ret); } jsstr_release(str); @@ -1432,17 +1434,19 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return hres; if(r) { + unsigned len = jsstr_length(str); jsstr_t *ret; WCHAR *buf; - ret = jsstr_alloc_buf(jsstr_length(str), &buf); + ret = jsstr_alloc_buf(len, &buf); if(!ret) { jsstr_release(str); return E_OUTOFMEMORY; } jsstr_flush(str, buf); - struprW(buf); + for (; len--; buf++) *buf = toupperW(*buf); + *r = jsval_string(ret); } jsstr_release(str); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c7f2bcd..e7b55fc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -661,6 +661,8 @@ tmp = "tEsT".toLowerCase(); ok(tmp === "test", "''.toLowerCase() = " + tmp); tmp = "tEsT".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); +tmp = ("tE" + String.fromCharCode(0) + "sT").toLowerCase(); +ok(tmp === "te" + String.fromCharCode(0) + "st", "''.toLowerCase() = " + tmp); tmp = "".toUpperCase(); ok(tmp === "", "''.toUpperCase() = " + tmp); @@ -672,6 +674,8 @@ tmp = "tEsT".toUpperCase(); ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = ("tE" + String.fromCharCode(0) + "sT").toUpperCase(); +ok(tmp === "TE" + String.fromCharCode(0) + "ST", "''.toUpperCase() = " + tmp); tmp = "".anchor(); ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp);

1 0