December 2014 - Wine-commits

Jacek Caban : mshtml/tests: Added script element readyState and onreadystatechange tests.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: 0d0110970ec1a7fbc176d3bbe9e0e5dd1d870157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0110970ec1a7fbc176d3bbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 13:10:33 2014 +0100 mshtml/tests: Added script element readyState and onreadystatechange tests. --- dlls/mshtml/tests/events.html | 76 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/externscr.js | 2 ++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index d4e2644..ae83ebe 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -7,6 +7,10 @@ function ok(b,m) { return external.ok(b, m); } +function broken(expr) { + return external.broken(expr); +} + function ondataavailable_test() { var evobj, div, b = false; @@ -114,8 +118,35 @@ function test_handler_this() { ok(calls == "div2,div2*,div1,div1*,body,body*", "calls = " + calls); } +function test_insert_script() { + var e = document.createElement("script"); + + extern_cnt = 0; + e.src = "externscr.js"; + + var readystatechange_log = ""; + e.onreadystatechange = function() { + readystatechange_log += "," + e.readyState; + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + if(e.readyState === "complete") { + ok(readystatechange_log === "append,complete", "readystatechange_log = " + readystatechange_log); + external.reportSuccess(); + } + } + + document.body.appendChild(e); + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + readystatechange_log = "append"; +} + window.onload = function() { try { + ok(inlscr_complete_called, "onreadystatechange not fired"); + ok(extern_res_script_rs === "eval,complete1,", + "extern_res_script_rs = " + extern_res_script_rs + " expected eval,complete1,"); + ok(extern_http_script_rs === "loading,loaded,complete,", + "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,"); + ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); ok(this === window, "this !== window"); @@ -127,11 +158,10 @@ window.onload = function() { test_scriptfor(); ondataavailable_test(); test_handler_this(); + test_insert_script(); }catch(e) { ok(false, "Got an exception: " + e.message); } - - external.reportSuccess(); } </script> <script> @@ -165,6 +195,48 @@ img.onload = function() { })(); </script> <script> +var inlscr_complete_called = false, extern_res_script_rs = "", extern_http_script_rs = ""; +var extern_cnt = 0; + +function expect_inlscr_complete() { + var elem = document.getElementById("inlscr"); + ok(elem.readyState === "complete" || broken(elem.readyState === "loading"), "expect_inlscr_complete: elem.readyState = " + elem.readyState); + if(elem.readyState === "complete") + inlscr_complete_called = true; +} + +function extern_res_script_readystatechange() { + var elem = document.getElementById("extscr"); + if(elem.readyState != "loading") + extern_res_script_rs += elem.readyState + extern_cnt + ","; + else + external.trace("Got loading readyState from external res script."); +} + +function http_script_readystatechange() { + var elem = document.getElementById("httpscr"); + extern_http_script_rs += elem.readyState + ","; +} + +function on_externscr() { + var elem = document.getElementById("extscr"); + ok(elem.readyState === "interactive" || broken(elem.readyState === "loading"), + "on_externscr: elem.readyState = " + elem.readyState); + extern_res_script_rs += "eval,"; +} + +</script> +<script id="inlscr" onreadystatechange="expect_inlscr_complete();"> +(function() { + ok(inlscr_complete_called === false || broken(inlscr_complete_called), "onreadystatechange fired too early"); + + var elem = document.getElementById("inlscr"); + ok(elem.readyState === "interactive", "inlscr: elem.readyState = " + elem.readyState); +})(); +</script> +<script id="extscr" onreadystatechange="extern_res_script_readystatechange()" src="externscr.js"></script> +<script id="httpscr" onreadystatechange="http_script_readystatechange()" src="https://test.winehq.org/tests/empty.js?123456"></script> +<script> document.body.appendChild(img); </script> </body> diff --git a/dlls/mshtml/tests/externscr.js b/dlls/mshtml/tests/externscr.js index 5861363..f6649ce 100644 --- a/dlls/mshtml/tests/externscr.js +++ b/dlls/mshtml/tests/externscr.js @@ -1 +1,3 @@ extern_cnt++; +if("on_externscr" in window) + on_externscr();

1 0

Jacek Caban : mshtml: Correctly handle NULL active element in IHTMLDocument2:: get_activeElement.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: 5135144d3a04a332299092fa83192022a83ab71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5135144d3a04a332299092fa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 14:13:23 2014 +0100 mshtml: Correctly handle NULL active element in IHTMLDocument2::get_activeElement. --- dlls/mshtml/htmldoc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e9b9dc9..ea56f5c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -282,6 +282,11 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM return E_FAIL; } + if(!nselem) { + *p = NULL; + return S_OK; + } + hres = get_elem(This->doc_node, nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Allow '#' to be the first char of resource name in res protocol.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: fecbc88daf04c9e9e298d64d7c6919e31bb513ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecbc88daf04c9e9e298d64d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 16:31:50 2014 +0100 mshtml: Allow '#' to be the first char of resource name in res protocol. --- dlls/mshtml/protocol.c | 2 +- dlls/mshtml/tests/protocol.c | 3 +++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 2499db4..9988c90 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -649,7 +649,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, /* Ignore query and hash parts. */ if((ptr = strchrW(url_file, '?'))) *ptr = 0; - if((ptr = strchrW(url_file, '#'))) + if(*url_file && (ptr = strchrW(url_file+1, '#'))) *ptr = 0; hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 00971be..f9803df 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -606,6 +606,9 @@ static void test_res_protocol(void) if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { test_res_url("/test/dir/dir2/res.html?query_part"); test_res_url("/test/dir/dir2/res.html#hash_part"); + test_res_url("/#123"); + test_res_url("/#23/#123"); + test_res_url("/#123#456"); }else { win_skip("IUri not supported\n"); } diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index d498b82..33ffef5 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -40,6 +40,9 @@ blank.html HTML "blank.html" /* @makedep: blank.html */ blank2.html HTML "blank.html" +/* @makedep: blank.html */ +123 HTML "blank.html" + /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb

1 0

Nikolay Sivov : dwrite: Split each text range into runs by script.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 894737ac5578655fac2d7c37ebde24593bfba936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894737ac5578655fac2d7c37e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 23 15:36:32 2014 +0300 dwrite: Split each text range into runs by script. --- dlls/dwrite/layout.c | 254 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/layout.c | 44 ++++++++ 2 files changed, 296 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=894737ac5578655fac2d7…

1 0

Jacek Caban : mshtml: Treat empty bstrHref as not specified in IHTMLDocument2:: createStyleSheet.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 8bfbe613867fde97f3db7e5173e2dec3cc9807fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfbe613867fde97f3db7e517… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 23 17:07:18 2014 +0100 mshtml: Treat empty bstrHref as not specified in IHTMLDocument2::createStyleSheet. --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2d89b45..e9b9dc9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1669,7 +1669,7 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR if(lIndex != -1) FIXME("Unsupported lIndex %d\n", lIndex); - if(bstrHref) { + if(bstrHref && *bstrHref) { FIXME("semi-stub for href %s\n", debugstr_w(bstrHref)); *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); return S_OK;

1 0

Piotr Caban : msvcrt: Add _wcsset_s implementation.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 3af24fe1f41d628ed64d958fc537645bd1313875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af24fe1f41d628ed64d958fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 23 17:44:28 2014 +0100 msvcrt: Add _wcsset_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 20 ++++++++++++++++++++ 9 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a6e7771..29cbe7f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1509,7 +1509,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 141697c..9017921 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1868,7 +1868,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9c765b3..355fe17 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1883,7 +1883,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ stub _wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5d73441..dd440c9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1579,7 +1579,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcr120._wcstod_l @ stub _wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fcad7cd..fbe42f3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1189,7 +1189,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7328b46..9623aa5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1164,7 +1164,7 @@ @ stub _wcsnset_s @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -@ stub _wcsset_s +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37046c3..141cd9e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1120,7 +1120,7 @@ # stub _wcsnset_s(wstr long long) @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset -# stub _wcsset_s(wstr long) +@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1788035..e2d53d4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); +static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -2749,6 +2750,40 @@ static void test__strnset_s(void) ok(!buf[0] && buf[1]=='c' && buf[2]=='b', "buf = %s\n", buf); } +static void test__wcsset_s(void) +{ + wchar_t str[10]; + int r; + + if(!p__wcsset_s) { + win_skip("_wcsset_s not available\n"); + return; + } + + r = p__wcsset_s(NULL, 0, 'a'); + ok(r == EINVAL, "r = %d\n", r); + + str[0] = 'a'; + r = p__wcsset_s(str, 0, 'a'); + ok(r == EINVAL, "r = %d\n", r); + ok(str[0] == 'a', "str[0] = %d\n", str[0]); + + str[0] = 'a'; + str[1] = 'b'; + r = p__wcsset_s(str, 2, 'c'); + ok(r == EINVAL, "r = %d\n", r); + ok(!str[0], "str[0] = %d\n", str[0]); + ok(str[1] == 'b', "str[1] = %d\n", str[1]); + + str[0] = 'a'; + str[1] = 0; + str[2] = 'b'; + r = p__wcsset_s(str, 3, 'c'); + ok(str[0] == 'c', "str[0] = %d\n", str[0]); + ok(str[1] == 0, "str[1] = %d\n", str[1]); + ok(str[2] == 'b', "str[2] = %d\n", str[2]); +} + START_TEST(string) { char mem[100]; @@ -2797,6 +2832,7 @@ START_TEST(string) p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); + p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2851,4 +2887,5 @@ START_TEST(string) test_strncpy(); test_strxfrm(); test__strnset_s(); + test__wcsset_s(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a6a4fe7..935c264 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -185,6 +185,26 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsrev( MSVCRT_wchar_t* str ) } /********************************************************************* + * _wcsset_s (MSVCRT.@) + */ +int CDECL MSVCRT__wcsset_s( MSVCRT_wchar_t *str, MSVCRT_size_t n, MSVCRT_wchar_t c ) +{ + MSVCRT_wchar_t *p = str; + + if(!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(n)) return MSVCRT_EINVAL; + + while(*p && --n) *p++ = c; + if(!n) { + str[0] = 0; + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + +/********************************************************************* * _wcsset (MSVCRT.@) */ MSVCRT_wchar_t* CDECL MSVCRT__wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c )

1 0

André Hentschel : ntdll: Always define UTIME_OMIT if not yet defined.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 9598a39bdbcd3def55b0cc4ca885306297a7299f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9598a39bdbcd3def55b0cc4ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 22 12:50:32 2014 +0100 ntdll: Always define UTIME_OMIT if not yet defined. --- dlls/ntdll/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b856b3d..5232027 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1708,10 +1708,13 @@ static int futimens( int fd, const struct timespec spec[2] ) { return syscall( __NR_utimensat, fd, NULL, spec, 0 ); } -#define UTIME_OMIT ((1 << 30) - 2) #define HAVE_FUTIMENS #endif /* __ANDROID__ */ +#ifndef UTIME_OMIT +#define UTIME_OMIT ((1 << 30) - 2) +#endif + static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) { NTSTATUS status = STATUS_SUCCESS;

1 0

Alex Henrie : kernel32/tests: Add tabular UTF-7 encoding tests.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 38027cda8f01ca0810f7539266b1a21f8fb679b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38027cda8f01ca0810f753926… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 12 14:56:11 2014 -0700 kernel32/tests: Add tabular UTF-7 encoding tests. --- dlls/kernel32/tests/codepage.c | 136 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 6e89533..aa7977d 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -433,6 +433,114 @@ static void test_utf7_encoding(void) static const char base64_encoding_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + const struct + { + /* inputs */ + WCHAR src[16]; + int srclen; + char *dst; + int dstlen; + /* expected outputs */ + char expected_dst[16]; + int chars_written; + int len; + } + tests[] = + { + /* tests string conversion with srclen=-1 */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, sizeof(output) - 1, + "+T2BZfVQX-", 11, 11 + }, + /* tests string conversion with srclen=-2 */ + { + {0x4F60,0x597D,0x5417,0}, -2, output, sizeof(output) - 1, + "+T2BZfVQX-", 11, 11 + }, + /* tests string conversion with dstlen=strlen(expected_dst) */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, 10, + "+T2BZfVQX-", 10, 0 + }, + /* tests string conversion with dstlen=strlen(expected_dst)+1 */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, 11, + "+T2BZfVQX-", 11, 11 + }, + /* tests string conversion with dstlen=strlen(expected_dst)+2 */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, 12, + "+T2BZfVQX-", 11, 11 + }, + /* tests dry run with dst=NULL and dstlen=0 */ + { + {0x4F60,0x597D,0x5417,0}, -1, NULL, 0, + {}, 0, 11 + }, + /* tests dry run with dst!=NULL and dstlen=0 */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, 0, + {}, 0, 11 + }, + /* tests srclen < strlenW(src) with directly encodable chars */ + { + {'h','e','l','l','o',0}, 2, output, sizeof(output) - 1, + "he", 2, 2 + }, + /* tests srclen < strlenW(src) with non-directly encodable chars */ + { + {0x4F60,0x597D,0x5417,0}, 2, output, sizeof(output) - 1, + "+T2BZfQ-", 8, 8 + }, + /* tests a single null char */ + { + {0}, -1, output, sizeof(output) - 1, + "", 1, 1 + }, + /* tests a buffer that runs out while not encoding a UTF-7 sequence */ + { + {'h','e','l','l','o',0}, -1, output, 2, + "he", 2, 0 + }, + /* tests a buffer that runs out after writing 1 base64 character */ + { + {0x4F60,0x0001,0}, -1, output, 2, + "+T", 2, 0 + }, + /* tests a buffer that runs out after writing 2 base64 characters */ + { + {0x4F60,0x0001,0}, -1, output, 3, + "+T2", 3, 0 + }, + /* tests a buffer that runs out after writing 3 base64 characters */ + { + {0x4F60,0x0001,0}, -1, output, 4, + "+T2A", 4, 0 + }, + /* tests a buffer that runs out just after writing the + sign */ + { + {0x4F60,0}, -1, output, 1, + "+", 1, 0 + }, + /* tests a buffer that runs out just before writing the - sign + * the number of bits to encode here is evenly divisible by 6 */ + { + {0x4F60,0x597D,0x5417,0}, -1, output, 9, + "+T2BZfVQX", 9, 0 + }, + /* tests a buffer that runs out just before writing the - sign + * the number of bits to encode here is NOT evenly divisible by 6 */ + { + {0x4F60,0}, -1, output, 4, + "+T2", 3, 0 + }, + /* tests a buffer that runs out in the middle of escaping a + sign */ + { + {'+',0}, -1, output, 1, + "+", 1, 0 + } + }; + if (WideCharToMultiByte(CP_UTF7, 0, foobarW, -1, NULL, 0, NULL, NULL) == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { @@ -525,6 +633,34 @@ static void test_utf7_encoding(void) ok(output[expected_len] == '#', "i=0x%04x: expected output[%i]='#', got output[%i]=%i\n", i, expected_len, expected_len, output[expected_len]); } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(output, '#', sizeof(output) - 1); + output[sizeof(output) - 1] = 0; + SetLastError(0xdeadbeef); + + len = WideCharToMultiByte(CP_UTF7, 0, tests[i].src, tests[i].srclen, + tests[i].dst, tests[i].dstlen, NULL, NULL); + + if (!tests[i].len) + { + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "tests[%i]: expected error=0x%x, got error=0x%x\n", + i, ERROR_INSUFFICIENT_BUFFER, GetLastError()); + } + ok(len == tests[i].len, "tests[%i]: expected len=%i, got len=%i\n", i, tests[i].len, len); + + if (tests[i].dst) + { + ok(memcmp(tests[i].dst, tests[i].expected_dst, tests[i].chars_written) == 0, + "tests[%i]: expected dst='%s', got dst='%s'\n", + i, tests[i].expected_dst, tests[i].dst); + ok(tests[i].dst[tests[i].chars_written] == '#', + "tests[%i]: expected dst[%i]='#', got dst[%i]=%i\n", + i, tests[i].chars_written, tests[i].chars_written, tests[i].dst[tests[i].chars_written]); + } + } } static void test_utf7_decoding(void)

1 0

Austin English : include/ddk: Add csq.h.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 0db8da707550e26d372fecea4c81a7d5d26e6546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db8da707550e26d372fecea4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 15 21:32:16 2014 -0600 include/ddk: Add csq.h. --- include/Makefile.in | 1 + include/ddk/csq.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b05fa29..dcee132 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -246,6 +246,7 @@ SRCDIR_INCLUDES = \ dde.rh \ ddeml.h \ ddk/compstui.h \ + ddk/csq.h \ ddk/hidsdi.h \ ddk/imm.h \ ddk/mountmgr.h \ diff --git a/include/ddk/csq.h b/include/ddk/csq.h new file mode 100644 index 0000000..7b4121f --- /dev/null +++ b/include/ddk/csq.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2014 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ddk/ntddk.h" + +#ifndef __WINE_CSQ_H +#define __WINE_CSQ_H + +typedef struct _IO_CSQ IO_CSQ, *PIO_CSQ; +typedef VOID (WINAPI *PIO_CSQ_ACQUIRE_LOCK)(PIO_CSQ Csq, PKIRQL Irql); +typedef VOID (WINAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)(PIO_CSQ Csq, PIRP Irp); +typedef VOID (WINAPI *PIO_CSQ_INSERT_IRP)(struct _IO_CSQ *Csq, PIRP Irp); +typedef PIRP (WINAPI *PIO_CSQ_PEEK_NEXT_IRP)(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext); +typedef VOID (WINAPI *PIO_CSQ_RELEASE_LOCK)(PIO_CSQ Csq, KIRQL Irql); +typedef VOID (WINAPI *PIO_CSQ_REMOVE_IRP)(PIO_CSQ Csq, PIRP Irp); + +#endif /* __WINE_CSQ_H */

1 0

Ken Thomases : shell32: Don' t append a trailing space to the arguments in a shell link if the command info has an empty parameters string.
by Alexandre Julliard 23 Dec '14

23 Dec '14

Module: wine Branch: master Commit: 14490909856e6bea715e215625d7461082a146d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14490909856e6bea715e21562… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 22 20:05:43 2014 -0600 shell32: Don't append a trailing space to the arguments in a shell link if the command info has an empty parameters string. --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index ebcaa25..bd3507e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2449,7 +2449,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) args[0] = 0; if ( This->sArgs ) lstrcatW( args, This->sArgs ); - if ( iciex->lpParametersW ) + if ( iciex->lpParametersW && iciex->lpParametersW[0] ) { static const WCHAR space[] = { ' ', 0 }; lstrcatW( args, space );

1 0