April 2016 - Wine-commits - list.winehq.org

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

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

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

Caron Wills : wined3d: Add Nvidia GeForce 820M.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 9ecc547c6a91f3fdfe4cddf99690d4613865992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ecc547c6a91f3fdfe4cddf99… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 6 14:06:54 2016 +0000 wined3d: Add Nvidia GeForce 820M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02fb587..749a328 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1285,6 +1285,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1749,6 +1750,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ @@ -2114,6 +2116,7 @@ cards_nvidia_mesa[] = {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, + {"NVD7", CARD_NVIDIA_GEFORCE_820M}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96bcf6b..7f384a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1788,6 +1788,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Henri Verbeet : wined3d: Recognise Intel Ivybridge on MacOS.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 668fd0b1941dc85f8600aa2036ee145a75d825f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668fd0b1941dc85f8600aa203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:02 2016 +0200 wined3d: Recognise Intel Ivybridge on MacOS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 749a328..3cb94ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1978,6 +1978,7 @@ cards_intel[] = {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM}, {"Ivybridge Desktop", CARD_INTEL_IVBD}, + {"HD Graphics 4000", CARD_INTEL_IVBD}, /* MacOS */ /* Sandybridge */ {"Sandybridge Server", CARD_INTEL_SNBS}, {"Sandybridge Mobile", CARD_INTEL_SNBM},

1 0

Henri Verbeet : wined3d: Explicitly pass a wined3d_state structure to context_apply_clear_state().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: e686b5a62ff938a285bc4e58f6669e28708fbc7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e686b5a62ff938a285bc4e58f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:03 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to context_apply_clear_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 670bf6f..48c82cf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2507,7 +2507,7 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge } /* Context activation is done by the caller. */ -BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) { struct wined3d_rendertarget_view **rts = fb->render_targets; @@ -2516,8 +2516,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win DWORD rt_mask = 0, *cur_mask; UINT i; - if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb - || rt_count != context->gl_info->limits.buffers) + if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != state->fb + || rt_count != gl_info->limits.buffers) { if (!context_validate_rt_config(rt_count, rts, dsv)) return FALSE; @@ -2534,7 +2534,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); } - while (i < context->gl_info->limits.buffers) + while (i < gl_info->limits.buffers) { context->blit_targets[i] = NULL; ++i; @@ -2601,7 +2601,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { - if (needs_srgb_write(context, &device->state, fb)) + if (needs_srgb_write(context, state, fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5231533..619ad1e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -294,6 +294,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; struct wined3d_surface *depth_stencil = fb->depth_stencil ? wined3d_rendertarget_view_get_surface(fb->depth_stencil) : NULL; + const struct wined3d_state *state = &device->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; struct wined3d_color corrected_color; @@ -359,7 +360,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c draw_rect, rect_count, clear_rect, &ds_rect); } - if (!context_apply_clear_state(context, device, rt_count, fb)) + if (!context_apply_clear_state(context, state, rt_count, fb)) { context_release(context); WARN("Failed to apply clear state, skipping clear.\n"); @@ -415,7 +416,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); } - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, &device->state, fb)) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) { if (rt_count > 1) WARN("Clearing multiple sRGB render targets with no GL_ARB_framebuffer_sRGB " diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f384a0..6a105cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,7 +1575,7 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

Henri Verbeet : wined3d: Use struct wined3d_ffp_attrib_ops for generic attributes as well.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: eeac4013cda54d71d50c934a18521d4abc53a773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeac4013cda54d71d50c934a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:04 2016 +0200 wined3d: Use struct wined3d_ffp_attrib_ops for generic attributes as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 80 ++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 117 ++--------------------------------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 86 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeac4013cda54d71d50c9…

1 0

Francois Gouget : testbot/TestAgent: Harmonise the receive, skip and send code.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: tools Branch: master Commit: 68452e3bfed226edda25d7b6341d732ad2054b1c URL: http://source.winehq.org/git/tools.git/?a=commit;h=68452e3bfed226edda25d7b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 7 12:31:14 2016 +0200 testbot/TestAgent: Harmonise the receive, skip and send code. Avoid ifs at the end of long lines. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 81 +++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 55a1431..74e7395 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -2,7 +2,7 @@ # to run scripts. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014 Francois Gouget +# Copyright 2012-2016 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -251,7 +251,7 @@ sub _RecvRawData($$$) return undef if (!defined $self->{fd}); my $Result; - my ($Received, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -265,17 +265,17 @@ sub _RecvRawData($$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Data .= $Buffer; - $Received += $r; + $Pos += $r; $Remaining -= $r; } alarm(0); @@ -283,7 +283,10 @@ sub _RecvRawData($$$) }; if ($@) { - $@ = "network read timed out ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network read timed out ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } return $Result; @@ -295,7 +298,7 @@ sub _SkipRawData($$) return undef if (!defined $self->{fd}); my $Success; - my ($Received, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -309,16 +312,16 @@ sub _SkipRawData($$) if (!defined $n) { alarm(0); - $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($n == 0) { alarm(0); - $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } - $Received += $n; + $Pos += $n; $Remaining -= $n; } alarm(0); @@ -326,7 +329,10 @@ sub _SkipRawData($$) }; if ($@) { - $@ = "network skip timed out ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network skip timed out ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } return $Success; @@ -466,7 +472,7 @@ sub _RecvFile($$$$) return undef if (!defined $Size); my $Success; - my ($Start, $Received, $Remaining) = (now(), 0, $Size); + my ($Start, $Pos, $Remaining) = (now(), 0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -480,22 +486,22 @@ sub _RecvFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Remaining -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); - $Received += $w if (defined $w); + $Pos += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); $self->_SkipRawData($Name, $Remaining); return; # out of eval } @@ -505,11 +511,14 @@ sub _RecvFile($$$$) }; if ($@) { - $@ = "timed out while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "timed out while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } - trace_speed($Received, now() - $Start); + trace_speed($Pos, now() - $Start); return $Success; } @@ -662,24 +671,24 @@ sub _Write($$$) return undef if (!defined $self->{fd}); my $Size = length($Data); - my ($Sent, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); while ($Remaining) { - my $w = syswrite($self->{fd}, $Data, $Remaining, $Sent); + my $w = syswrite($self->{fd}, $Data, $Remaining, $Pos); if (!defined $w) { - $self->_SetError($FATAL, "network write error ($self->{rpc}:$Name:$Sent/$Size): $!"); + $self->_SetError($FATAL, "network write error ($self->{rpc}:$Name:$Pos/$Size): $!"); return undef; } if ($w == 0) { - $self->_SetError($FATAL, "unable to send more data ($self->{rpc}:$Name:$Sent/$Size)"); - return $Sent; + $self->_SetError($FATAL, "unable to send more data ($self->{rpc}:$Name:$Pos/$Size)"); + return $Pos; } - $Sent += $w; + $Pos += $w; $Remaining -= $w; } - return $Sent; + return $Pos; } sub _SendRawData($$$) @@ -700,7 +709,10 @@ sub _SendRawData($$$) }; if ($@) { - $@ = "network write timed out ($self->{rpc}:$Name)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network write timed out ($self->{rpc}:$Name)"; + } $self->_SetError($FATAL, $@); } return $Success; @@ -779,8 +791,8 @@ sub _SendFile($$$$) my $Size = -s $Filename; return undef if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); - my ($Start, $Sent, $Remaining) = (now(), 0, $Size); my $Success; + my ($Start, $Pos, $Remaining) = (now(), 0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -794,22 +806,22 @@ sub _SendFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size): $!"); + $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size)"); + $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Remaining -= $r; my $w = $self->_Write($Name, $Buffer); - $Sent += $w if (defined $w); + $Pos += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Sent+$s/$Size): $!"); + $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!"); return; # out of eval } } @@ -818,11 +830,14 @@ sub _SendFile($$$$) }; if ($@) { - $@ = "timed out while sending '$Filename' ($self->{rpc}:$Name:$Sent/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "timed out while sending '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } - trace_speed($Sent, now() - $Start); + trace_speed($Pos, now() - $Start); return $Success; }

1 0

Francois Gouget : testbot/TestAgent: Fix the --keepalive check.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: tools Branch: master Commit: d800172f550c5c310e17b823de78c42f2a835b25 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d800172f550c5c310e17b823… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 7 12:34:32 2016 +0200 testbot/TestAgent: Fix the --keepalive check. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ced1165..33fc298 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -245,7 +245,7 @@ if (!defined $Usage) $Usage = 2; } elsif ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or - defined $RunErr or defined $Keepalive)) + defined $RunErr)) { error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; @@ -274,6 +274,11 @@ if (!defined $Usage) error("you must specify the server files to delete\n"); $Usage = 2; } + if (defined $Keepalive and $Cmd !~ /^(?:run|wait)$/) + { + error("--keepalive can only be used with the run or wait commands\n"); + $Usage = 2; + } $Keepalive = 60 if (!defined $Keepalive); $AgentPort = $Port if (defined $Port); if (!defined $AgentPort)

1 0

Hugh McMaster : reg: Exit with an error message if RegQueryInfoKeyW fails.
by Alexandre Julliard 06 Apr '16

06 Apr '16

1 0