wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Dmitry Timoshkov : windowscodecs: Fix a copy/paste mistake.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: aaddf1365a3371263827206eedf1464a83562c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaddf1365a3371263827206ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 7 09:00:32 2016 +0200 windowscodecs: Fix a copy/paste mistake. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4f5cb94..cd9165b 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -532,7 +532,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } This->end_info = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) + if (!This->end_info) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->png_ptr = NULL;

1 0

Piotr Caban : msvcrt: Fix i386 rethrown exceptions handling.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: ee5e06591f2045316775fedaf735cbdce5b71ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5e06591f2045316775fedaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 7 15:36:32 2016 +0200 msvcrt: Fix i386 rethrown exceptions handling. When __CxxRegisterExceptionObject was used and there was no catch_function_nested_handler frame to rewind nested_frame.frame_info.rec was incorrectly set to current exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 4 +++- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index dd807c4..f7f486d 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -447,7 +447,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame TRACE("found catch(...) block\n"); } - __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info); + /* Add frame info here so exception is not freed inside RtlUnwind call */ + _CreateFrameInfo(&nested_frame.frame_info.frame_info, + (void*)rec->ExceptionInformation[1]); /* unwind the stack */ RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b564dc1..5c26866 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -217,6 +217,7 @@ typedef struct void *unk; } cxx_frame_info; +frame_info* __cdecl _CreateFrameInfo(frame_info *fi, void *obj); BOOL __cdecl __CxxRegisterExceptionObject(EXCEPTION_RECORD**, cxx_frame_info*); void __cdecl __CxxUnregisterExceptionObject(cxx_frame_info*, BOOL); void CDECL __DestructExceptionObject(EXCEPTION_RECORD*);

1 0

Jacek Caban : mshtml: Added more IHTMLXMLHttpRequst::send tests.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 8c00ee2ac69b44d082023d3af9e477a08ec60ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c00ee2ac69b44d082023d3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:44 2016 +0200 mshtml: Added more IHTMLXMLHttpRequst::send tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 143 ++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index e1c2ef1..df5d644 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -573,6 +573,47 @@ static void test_responseXML(const char *expect_text) IDispatch_Release(disp); } +#define xhr_open(a,b) _xhr_open(__LINE__,a,b) +static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) +{ + BSTR method = a2bstr(method_a); + BSTR url = a2bstr(url_a); + VARIANT async, empty; + HRESULT hres; + + V_VT(&async) = VT_BOOL; + V_BOOL(&async) = VARIANT_TRUE; + V_VT(&empty) = VT_EMPTY; + + hres = IHTMLXMLHttpRequest_open(xhr, method, url, async, empty, empty); + ok_(__FILE__,line)(hres == S_OK, "open failed: %08x\n", hres); + + SysFreeString(method); + SysFreeString(url); + return hres; +} + +#define test_response_text(a) _test_response_text(__LINE__,a) +static void _test_response_text(unsigned line, const char *expect_text) +{ + BSTR text = NULL; + HRESULT hres; + + hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); + ok(hres == S_OK, "get_responseText failed: %08x\n", hres); + ok(text != NULL, "test == NULL\n"); + if(expect_text) { + unsigned len; + /* Some recent version of IE strip trailing '\n' from post.php response, while others don't. */ + len = SysStringLen(text); + if(text[len-1] == '\n') + text[len-1] = 0; + ok_(__FILE__,line)(!strcmp_wa(text, expect_text), "expect %s, got %s\n", + expect_text, wine_dbgstr_w(text)); + } + SysFreeString(text); +} + static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) { VARIANT vbool, vempty, var; @@ -725,14 +766,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 4, "Expect DONE, got %d\n", val); - hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); - ok(text != NULL, "test == NULL\n"); - if(expect_text) - ok(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); - SysFreeString(text); - + test_response_text(expect_text); test_responseXML(expect_text); IHTMLXMLHttpRequest_Release(xhr); @@ -741,8 +775,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) { - VARIANT vbool, vempty, var; - BSTR method, url; + VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; @@ -804,20 +837,10 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 0, "Expect UNSENT, got %d\n", val); - method = a2bstr("GET"); - url = a2bstr(xml_url); - V_VT(&vbool) = VT_BOOL; - V_BOOL(&vbool) = VARIANT_TRUE; - V_VT(&vempty) = VT_EMPTY; - SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + hres = xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); - SysFreeString(method); - SysFreeString(url); - if(FAILED(hres)) { IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; @@ -855,6 +878,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char SET_EXPECT(xmlhttprequest_onreadystatechange_loading); SET_EXPECT(xmlhttprequest_onreadystatechange_done); loading_cnt = 0; + V_VT(&vempty) = VT_EMPTY; hres = IHTMLXMLHttpRequest_send(xhr, vempty); ok(hres == S_OK, "send failed: %08x\n", hres); @@ -900,15 +924,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 4, "Expect DONE, got %d\n", val); - text = NULL; - hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); - ok(text != NULL, "test == NULL\n"); - if(expect_text) - ok(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); - SysFreeString(text); - + test_response_text(expect_text); test_responseXML(expect_text); IHTMLXMLHttpRequest_Release(xhr); @@ -917,15 +933,10 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) { - VARIANT vbool, vempty, var; - BSTR method, url; + VARIANT vempty, var; LONG val; HRESULT hres; - method = a2bstr("GET"); - url = a2bstr(xml_url); - V_VT(&vbool) = VT_BOOL; - V_BOOL(&vbool) = VARIANT_TRUE; V_VT(&vempty) = VT_EMPTY; trace("abort before send() is fired\n"); @@ -938,8 +949,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); @@ -963,8 +973,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - ok(hres == S_OK, "open failed: %08x\n", hres); + xhr_open(xml_url, "GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); loading_cnt = 0; @@ -992,9 +1001,56 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; +} - SysFreeString(method); - SysFreeString(url); +static void test_xhr_post(IHTMLDocument2 *doc) +{ + VARIANT v; + HRESULT hres; + + trace("send string...\n"); + + create_xmlhttprequest(doc); + if(!xhr) + return; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; + hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, v); + ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); + xhr_open("http://test.winehq.org/tests/post.php", "POST"); + CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); + + set_request_header(xhr, "Content-Type", "application/x-www-form-urlencoded"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("X=Testing"); + + loading_cnt = 0; + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); + SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); + SET_EXPECT(xmlhttprequest_onreadystatechange_loading); + SET_EXPECT(xmlhttprequest_onreadystatechange_done); + + hres = IHTMLXMLHttpRequest_send(xhr, v); + ok(hres == S_OK, "send failed: %08x\n", hres); + if(SUCCEEDED(hres)) + pump_msgs(&called_xmlhttprequest_onreadystatechange_done); + + todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); + CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); + CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); + CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt); + + SysFreeString(V_BSTR(&v)); + + test_response_text("X => Testing"); + + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; } static IHTMLDocument2 *create_doc_from_url(const char *start_url) @@ -1045,7 +1101,7 @@ START_TEST(xmlhttprequest) static const char start_url[] = "http://test.winehq.org/tests/hello.html"; static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; - static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL); @@ -1057,6 +1113,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, xml_url, expect_response_text); test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); + test_xhr_post(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type);

1 0

Jacek Caban : mshtml: Added support for sending BSTR over IHTMLXMLHttpRequst::send.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 5ae224dee81fcf4bb5ee76cf0980ac197c6748fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae224dee81fcf4bb5ee76cf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:34 2016 +0200 mshtml: Added support for sending BSTR over IHTMLXMLHttpRequst::send. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d55570c..ada3b20 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -524,22 +524,37 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - nsresult nsres; + nsIWritableVariant *nsbody = NULL; + nsresult nsres = NS_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&varBody)); switch(V_VT(&varBody)) { - case VT_NULL: - case VT_EMPTY: - case VT_ERROR: - break; - default: - FIXME("varBody(%s) unsupported\n", debugstr_variant(&varBody)); - return E_FAIL; - } + case VT_NULL: + case VT_EMPTY: + case VT_ERROR: + break; + case VT_BSTR: { + nsAString nsstr; + + nsbody = create_nsvariant(); + if(!nsbody) + return E_OUTOFMEMORY; - nsres = nsIXMLHttpRequest_Send(This->nsxhr, NULL); + nsAString_InitDepend(&nsstr, V_BSTR(&varBody)); + nsres = nsIWritableVariant_SetAsAString(nsbody, &nsstr); + nsAString_Finish(&nsstr); + break; + } + default: + FIXME("unsupported body type %s\n", debugstr_variant(&varBody)); + return E_NOTIMPL; + } + if(NS_SUCCEEDED(nsres)) + nsres = nsIXMLHttpRequest_Send(This->nsxhr, (nsIVariant*)nsbody); + if(nsbody) + nsIWritableVariant_Release(nsbody); if(NS_FAILED(nsres)) { ERR("nsIXMLHttpRequest_Send failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : mshtml: Skip headers problematic for cache.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 80893bcf5236c5f0097ddd3aeda59b900b7edf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80893bcf5236c5f0097ddd3ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:33:27 2016 +0200 mshtml: Skip headers problematic for cache. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 7e75b79..e1c2ef1 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -386,7 +386,6 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; const char *value; - BOOL skip_all_headers; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -451,9 +450,6 @@ static void test_header(const struct HEADER_TYPE expect[], int num) SysFreeString(key); SysFreeString(text); - if(expect[i].skip_all_headers) - continue; - strcpy(buf, expect[i].key); strcat(buf, ": "); strcat(buf, expect[i].value); @@ -585,7 +581,6 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Accept-Ranges", "bytes", TRUE}, {"Content-Length", "51"}, {"Content-Type", "application/xml"} };

1 0

Daniel Lehman : msvcr120: Add remainder.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: d9a0c55e7eb6ea9cb822260decef4a49d425c6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a0c55e7eb6ea9cb822260de… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 5 12:53:12 2016 -0700 msvcr120: Add remainder. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120/tests/msvcr120.c | 48 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 40 ++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- include/config.h.in | 6 +++ 9 files changed, 110 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 0547967..223d5c6 100755 --- a/configure +++ b/configure @@ -16876,6 +16876,8 @@ for ac_func in \ lrintf \ lround \ lroundf \ + remainder \ + remainderf \ rint \ rintf \ round \ diff --git a/configure.ac b/configure.ac index 20478df..6189aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,6 +2534,8 @@ AC_CHECK_FUNCS(\ lrintf \ lround \ lroundf \ + remainder \ + remainderf \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 2809b66..f752c83 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -304,9 +304,9 @@ @ stub norml @ cdecl pow(double double) ucrtbase.pow @ cdecl -arch=arm,x86_64 powf(float float) ucrtbase.powf -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) ucrtbase.remainder +@ cdecl remainderf(float float) ucrtbase.remainderf +@ cdecl remainderl(double double) ucrtbase.remainderl @ stub remquo @ stub remquof @ stub remquol diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 58d04e1..ad9749a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2324,9 +2324,9 @@ @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) MSVCRT_realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) MSVCR120_remainder +@ cdecl remainderf(float float) MSVCR120_remainderf +@ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove @ stub remquo @ stub remquof diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 54c86c6..e267111 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -88,6 +88,12 @@ static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); +static double (CDECL *p_remainder)(double, double); +static int* (CDECL *p_errno)(void); + +/* make sure we use the correct errno */ +#undef errno +#define errno (*p_errno()) static BOOL init(void) { @@ -113,6 +119,8 @@ static BOOL init(void) p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); p_wcstof = (void*)GetProcAddress(module, "wcstof"); + p_remainder = (void*)GetProcAddress(module, "remainder"); + p_errno = (void*)GetProcAddress(module, "_errno"); return TRUE; } @@ -389,6 +397,45 @@ static void test__strtof(void) p_setlocale(LC_ALL, "C"); } +static void test_remainder(void) +{ + struct { + double x, y, r; + errno_t e; + } tests[] = { + { 3.0, 2.0, -1.0, -1 }, + { 1.0, 1.0, 0.0, -1 }, + { INFINITY, 0.0, NAN, EDOM }, + { INFINITY, 42.0, NAN, EDOM }, + { NAN, 0.0, NAN, EDOM }, + { NAN, 42.0, NAN, EDOM }, + { 0.0, INFINITY, 0.0, -1 }, + { 42.0, INFINITY, 42.0, -1 }, + { 0.0, NAN, NAN, EDOM }, + { 42.0, NAN, NAN, EDOM }, + { 1.0, 0.0, NAN, EDOM }, + { INFINITY, INFINITY, NAN, EDOM }, + }; + errno_t e; + double r; + int i; + + if(sizeof(void*) != 8) /* errno handling slightly different on 32-bit */ + return; + + for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + errno = -1; + r = p_remainder(tests[i].x, tests[i].y); + e = errno; + + ok(tests[i].e == e, "expected errno %i, but got %i\n", tests[i].e, e); + if(_isnan(tests[i].r)) + ok(_isnan(r), "expected NAN, but got %f\n", r); + else + ok(tests[i].r == r, "expected result %f, but got %f\n", tests[i].r, r); + } +} + START_TEST(msvcr120) { if (!init()) return; @@ -400,4 +447,5 @@ START_TEST(msvcr120) test__GetConcurrency(); test__W_Gettnames(); test__strtof(); + test_remainder(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7f195e4..fb3e4a3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1987,9 +1987,9 @@ @ cdecl rand() msvcr120.rand @ cdecl rand_s(ptr) msvcr120.rand_s @ cdecl realloc(ptr long) msvcr120.realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) msvcr120.remainder +@ cdecl remainderf(float float) msvcr120.remainderf +@ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove @ stub remquo @ stub remquof diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bd0b92b..b9e0533 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2790,3 +2790,43 @@ LDOUBLE CDECL MSVCR120_scalbnl(LDOUBLE num, MSVCRT_long power) { return MSVCRT__scalb(num, power); } + +/********************************************************************* + * remainder (MSVCR120.@) + */ +double CDECL MSVCR120_remainder(double x, double y) +{ +#ifdef HAVE_REMAINDER + /* this matches 64-bit Windows. 32-bit Windows is slightly different */ + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remainder(x, y); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remainderf (MSVCR120.@) + */ +float CDECL MSVCR120_remainderf(float x, float y) +{ +#ifdef HAVE_REMAINDERF + /* this matches 64-bit Windows. 32-bit Windows is slightly different */ + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnanf(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remainderf(x, y); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remainderl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) +{ + return MSVCR120_remainder(x, y); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ef5c3b..0670f6e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2458,9 +2458,9 @@ @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) MSVCRT_realloc -@ stub remainder -@ stub remainderf -@ stub remainderl +@ cdecl remainder(double double) MSVCR120_remainder +@ cdecl remainderf(float float) MSVCR120_remainderf +@ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove @ stub remquo @ stub remquof diff --git a/include/config.h.in b/include/config.h.in index cb0ddd6..0650f31 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -726,6 +726,12 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK +/* Define to 1 if you have the `remainder' function. */ +#undef HAVE_REMAINDER + +/* Define to 1 if you have the `remainderf' function. */ +#undef HAVE_REMAINDERF + /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Jactry Zeng : gdi32: Load system fonts on Android.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 5bf43458240e07a31d7034dd064fcaaae08193a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf43458240e07a31d7034dd0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 7 16:59:48 2016 +0900 gdi32: Load system fonts on Android. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a7ac1bb..f8b4235 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4238,6 +4238,8 @@ static void init_font_list(void) load_fontconfig_fonts(); #elif defined(HAVE_CARBON_CARBON_H) load_mac_fonts(); +#elif defined(__ANDROID__) + ReadFontDir("/system/fonts", TRUE); #endif /* then look in any directories that we've specified in the config file */

1 0

Sebastian Lackner : ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 9acff7550de83767438f83207827e1154a0e9c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acff7550de83767438f83207… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 10:02:42 2016 +0200 ntdll: Do not update iosb.Status after FSCTL_PIPE_LISTEN call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 6 +++++- dlls/ntdll/tests/pipe.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 77381f2..a896843 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2141,7 +2141,7 @@ static void test_overlapped_error(void) err = GetLastError(); ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err); - todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); CloseHandle(file); CloseHandle(pipe); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 46fea51..7e5da59 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1757,6 +1757,11 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } break; + case FSCTL_PIPE_LISTEN: + status = server_ioctl_file( handle, event, apc, apc_context, io, code, + in_buffer, in_size, out_buffer, out_size ); + return status; + case FSCTL_PIPE_IMPERSONATE: FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); @@ -1797,7 +1802,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc io->Information = 0; status = STATUS_SUCCESS; break; - case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 0551d23..90ba950 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -308,7 +308,7 @@ static void test_overlapped(void) memset(&iosb, 0x55, sizeof(iosb)); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res); - todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); CloseHandle(hClient); } @@ -392,7 +392,7 @@ static void test_alertable(void) todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); ok(userapc_called, "user apc didn't run\n"); - todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n"); ok(!ioapc_called, "IOAPC ran\n");

1 0

Michael Müller : kernel32/tests: Add additional tests for overlapped handling of CreateNamedPipe.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 96aca1ad02a129f8bae5f0b9ad02cd59f6f74942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96aca1ad02a129f8bae5f0b9a… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 08:45:53 2016 +0200 kernel32/tests: Add additional tests for overlapped handling of CreateNamedPipe. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 60336f8..77381f2 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2091,6 +2091,64 @@ static void test_overlapped(void) CloseHandle(thread); } +static void test_overlapped_error(void) +{ + HANDLE pipe, file, event; + DWORD err, numbytes; + OVERLAPPED overlapped; + BOOL ret; + + event = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(event != NULL, "CreateEventA failed with %u\n", GetLastError()); + + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + ret = ConnectNamedPipe(pipe, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", err); + + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + numbytes = 0xdeadbeef; + ret = GetOverlappedResult(pipe, &overlapped, &numbytes, TRUE); + ok(ret == TRUE, "GetOverlappedResult failed\n"); + ok(numbytes == 0, "expected 0, got %u\n", numbytes); + ok(overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", overlapped.Internal); + + CloseHandle(file); + CloseHandle(pipe); + + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_WAIT_FOREVER, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %u\n", GetLastError()); + + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed with %u\n", GetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + ret = ConnectNamedPipe(pipe, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", err); + todo_wine ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + + CloseHandle(file); + CloseHandle(pipe); + + CloseHandle(event); +} + static void test_NamedPipeHandleState(void) { HANDLE server, client; @@ -2372,6 +2430,7 @@ START_TEST(pipe) test_CloseHandle(); test_impersonation(); test_overlapped(); + test_overlapped_error(); test_NamedPipeHandleState(); test_readfileex_pending(); }

1 0

Sebastian Lackner : ntdll/tests: Add tests for iosb.Status value after pending FSCTL_PIPE_LISTEN call.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: f4a5b4561d1e047484c88f266779d1b1966835a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a5b4561d1e047484c88f266… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 7 08:45:06 2016 +0200 ntdll/tests: Add tests for iosb.Status value after pending FSCTL_PIPE_LISTEN call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 0862f1c..0551d23 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -277,10 +277,9 @@ static void test_overlapped(void) ok(!res, "NtCreateNamedPipeFile returned %x\n", res); memset(&iosb, 0x55, sizeof(iosb)); - -/* try with event and apc */ res = listen_pipe(hPipe, hEvent, &iosb, TRUE); ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); @@ -294,9 +293,28 @@ static void test_overlapped(void) ok(ioapc_called, "IOAPC didn't run\n"); - CloseHandle(hEvent); CloseHandle(hPipe); CloseHandle(hClient); + + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); + ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */, + "can't open pipe, GetLastError: %x\n", GetLastError()); + + if (hClient != INVALID_HANDLE_VALUE) + { + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, TRUE); + ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res); + todo_wine ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status); + + CloseHandle(hClient); + } + + CloseHandle(hPipe); + CloseHandle(hEvent); } static BOOL userapc_called;

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016