September 2016 - Wine-commits

Andrey Gusev : api-ms-win-core-versionansi-l1-1-0: Add dll.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: ba4d20cfcbedab32e29551763ffd5f30c4c13ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4d20cfcbedab32e29551763… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:59:46 2016 +0300 api-ms-win-core-versionansi-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 + dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 941ae9e..0bda5d3 100755 --- a/configure +++ b/configure @@ -953,6 +953,7 @@ enable_api_ms_win_core_toolhelp_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_version_l1_1_0 +enable_api_ms_win_core_versionansi_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 @@ -17609,6 +17610,7 @@ wine_fn_config_dll api-ms-win-core-toolhelp-l1-1-0 enable_api_ms_win_core_toolhe wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 +wine_fn_config_dll api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 diff --git a/configure.ac b/configure.ac index ab0feca..15c8469 100644 --- a/configure.ac +++ b/configure.ac @@ -2729,6 +2729,7 @@ WINE_CONFIG_DLL(api-ms-win-core-toolhelp-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..0691db9 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec new file mode 100644 index 0000000..58a1711 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-0/api-ms-win-core-versionansi-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index a45bb7d..6cfc4f0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -239,6 +239,7 @@ my @dll_groups = ], [ "version", + "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-version-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ],

1 0

Sebastian Lackner : hidclass.sys: Do not return last error / HRESULT values in NTSTATUS functions.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 8f76052902463e5788d623061ad613fa73a59d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f76052902463e5788d623061… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 12 15:47:36 2016 +0200 hidclass.sys: Do not return last error / HRESULT values in NTSTATUS functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b90e701..d2a4710 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -77,7 +77,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT IoAttachDeviceToDeviceStack(*device, native_device); - return S_OK; + return STATUS_SUCCESS; } NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) @@ -118,7 +118,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) if (!devinfo) { FIXME( "failed to get ClassDevs %x\n", GetLastError()); - return GetLastError(); + return STATUS_UNSUCCESSFUL; } Data.cbSize = sizeof(Data); if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) @@ -126,24 +126,28 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) { SetupDiDestroyDeviceInfoList(devinfo); - return ERROR_SUCCESS; + return STATUS_SUCCESS; } FIXME( "failed to Create Device Info %x\n", GetLastError()); - return GetLastError(); + goto error; } if (!SetupDiRegisterDeviceInfo( devinfo, &Data, 0, NULL, NULL, NULL )) { FIXME( "failed to Register Device Info %x\n", GetLastError()); - return GetLastError(); + goto error; } if (!SetupDiCreateDeviceInterfaceW( devinfo, &Data, &hidGuid, NULL, 0, NULL)) { FIXME( "failed to Create Device Interface %x\n", GetLastError()); - return GetLastError(); + goto error; } + SetupDiDestroyDeviceInfoList(devinfo); + return STATUS_SUCCESS; - return S_OK; +error: + SetupDiDestroyDeviceInfoList(devinfo); + return STATUS_UNSUCCESSFUL; } void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device)

1 0

Kai Blaschke : bcrypt/tests: Show that BCryptGetFipsAlgorithmMode checks a registry key.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: c1bc25dd38dab0504bd9eb45641a830ff08488b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bc25dd38dab0504bd9eb456… Author: Kai Blaschke <kai.blaschke(a)kb-dev.net> Date: Thu Sep 8 19:24:19 2016 -0300 bcrypt/tests: Show that BCryptGetFipsAlgorithmMode checks a registry key. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/Makefile.in | 2 +- dlls/bcrypt/tests/bcrypt.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index 0f130b1..1bf7d2c 100644 --- a/dlls/bcrypt/tests/Makefile.in +++ b/dlls/bcrypt/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = bcrypt.dll -IMPORTS = bcrypt user32 +IMPORTS = bcrypt user32 advapi32 C_SRCS = \ bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9bd2cea..5cdb065 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -61,11 +61,45 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - NTSTATUS ret; + static const WCHAR policyKeyVistaW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'L','s','a','\\', + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; + static const WCHAR policyKeyXPW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'L','s','a',0}; + static const WCHAR policyValueXPW[] = { + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + BOOLEAN expected; BOOLEAN enabled; + DWORD value, count[2] = {sizeof(value), sizeof(value)}; + NTSTATUS ret; + + if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, + RRF_RT_REG_DWORD, NULL, &value, &count[0])) + { + expected = !!value; + } + else if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW, + RRF_RT_REG_DWORD, NULL, &value, &count[1])) + { + expected = !!value; + } + else + { + expected = FALSE; +todo_wine + ok(0, "Neither XP or Vista key is present\n"); + } ret = BCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + ok(enabled == expected, "expected result %d, got %d\n", expected, enabled); ret = BCryptGetFipsAlgorithmMode(NULL); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.18
by Jeremy Newman 12 Sep '16

12 Sep '16

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

Sebastian Lackner : jscript: Properly handle \0 characters in String to{Lower, Upper}Case methods.
by Alexandre Julliard 09 Sep '16

09 Sep '16

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

Sebastian Lackner : jscript: Properly handle \0 characters in String indexOf method.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 1c3e0dd3d5ae6a4ba1cb2e5cc47f452a7115b803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3e0dd3d5ae6a4ba1cb2e5cc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:53:06 2016 +0200 jscript: Properly handle \0 characters in String indexOf 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/string.c | 20 ++++++++++++-------- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 40aa552..b5c0197 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -486,9 +486,9 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + unsigned pos = 0, search_len, length; jsstr_t *search_jsstr, *jsstr; const WCHAR *search_str, *str; - int length, pos = 0; INT ret = -1; HRESULT hres; @@ -498,7 +498,6 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(FAILED(hres)) return hres; - length = jsstr_length(jsstr); if(!argc) { if(r) *r = jsval_number(-1); @@ -512,6 +511,9 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return hres; } + search_len = jsstr_length(search_jsstr); + length = jsstr_length(jsstr); + if(argc >= 2) { double d; @@ -520,14 +522,16 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un pos = is_int32(d) ? min(length, d) : length; } - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres) && length >= search_len) { + const WCHAR *end = str+length-search_len; const WCHAR *ptr; - ptr = strstrW(str+pos, search_str); - if(ptr) - ret = ptr - str; - else - ret = -1; + for(ptr = str+pos; ptr <= end; ptr++) { + if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) { + ret = ptr-str; + break; + } + } } jsstr_release(search_jsstr); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e7b55fc..43f7a19 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -629,6 +629,12 @@ tmp = "abcd".indexOf(); ok(tmp == -1, "indexOf = " + tmp); tmp = "abcd".indexOf("b", bigInt); ok(tmp == -1, "indexOf = " + tmp); +tmp = "abcd".indexOf("abcd",0); +ok(tmp === 0, "indexOf = " + tmp); +tmp = "abcd".indexOf("abcd",1); +ok(tmp === -1, "indexOf = " + tmp); +tmp = ("ab" + String.fromCharCode(0) + "cd").indexOf(String.fromCharCode(0)); +ok(tmp === 2, "indexOf = " + tmp); tmp = "abcd".lastIndexOf("bc",1); ok(tmp === 1, "lastIndexOf = " + tmp); @@ -650,6 +656,12 @@ tmp = strObj.lastIndexOf("b"); ok(tmp === 1, "lastIndexOf = " + tmp); tmp = "bbb".lastIndexOf("b", bigInt); ok(tmp === 2, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("abcd",4); +ok(tmp === 0, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("abcd",0); +ok(tmp === 0, "lastIndexOf = " + tmp); +tmp = ("ab" + String.fromCharCode(0) + "cd").lastIndexOf(String.fromCharCode(0)); +ok(tmp === 2, "lastIndexOf = " + tmp); tmp = "".toLowerCase(); ok(tmp === "", "''.toLowerCase() = " + tmp);

1 0

Sebastian Lackner : jscript: Allocate string of correct size in Date toTimeString method.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: fd07a1572762a05de8f1269e2b1287af6a9c71e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd07a1572762a05de8f1269e2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:54:54 2016 +0200 jscript: Allocate string of correct size in Date toTimeString 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/date.c | 15 +++++++-------- dlls/jscript/tests/api.js | 6 ++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b6997ab..fdc3051 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -850,6 +850,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, ':','%','0','2','d',' ','U','T','C',0 }; DateInstance *date; jsstr_t *date_str; + WCHAR buf[32]; DOUBLE time; WCHAR sign; int offset; @@ -868,12 +869,6 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, time = local_time(date->time, date); if(r) { - WCHAR *ptr; - - date_str = jsstr_alloc_buf(17, &ptr); - if(!date_str) - return E_OUTOFMEMORY; - offset = date->bias + daylight_saving_ta(time, date); @@ -884,13 +879,17 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, else sign = '-'; if(offset) - sprintfW(ptr, formatW, (int)hour_from_time(time), + sprintfW(buf, formatW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60); else - sprintfW(ptr, formatUTCW, (int)hour_from_time(time), + sprintfW(buf, formatUTCW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time)); + date_str = jsstr_alloc(buf); + if(!date_str) + return E_OUTOFMEMORY; + *r = jsval_string(date_str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 43f7a19..083da93 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2147,9 +2147,11 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 201 "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); tmp = (new Date()).toLocaleDateString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toTimeString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Andrey Gusev : api-ms-win-core-registryuserspecific-l1-1-0: Add dll.
by Alexandre Julliard 09 Sep '16

09 Sep '16

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

Alexandre Julliard : user32: Clear last error in EnumClipboardFormats.
by Alexandre Julliard 09 Sep '16

09 Sep '16

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

Alexandre Julliard : user32/tests: Make the clipboard sequence tests more strict.
by Alexandre Julliard 09 Sep '16

09 Sep '16

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