wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Martin Storsjo : msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: a4af0aaf5f3f51bd348014ee56ca6a4a1e385609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4af0aaf5f3f51bd348014ee5… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 2 20:49:17 2017 +0300 msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm. Based on the import libraries in MSVC 2012, 2013 and in the Windows 10 SDK, these functions actually aren't exported on arm - only on x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4af0aaf5f3f51bd34801…

1 0

Jacek Caban : msvcp: Added std::_Raise_handler implementation.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: fa65ab3caa69f0d364e31e43caee2b4640b58b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa65ab3caa69f0d364e31e43c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 3 16:05:30 2017 +0200 msvcp: Added std::_Raise_handler implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/exception.c | 2 ++ dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++++++ 9 files changed, 35 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa65ab3caa69f0d364e31…

1 0

Nikolay Sivov : xmllite/tests: Added a test for output with code page 1200.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: 4b6d8fb0637a95a6c3e5eb01b79af3ee05d75cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6d8fb0637a95a6c3e5eb01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 3 11:00:32 2017 +0300 xmllite/tests: Added a test for output with code page 1200. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 1add717..33c2f8f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -42,6 +42,25 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); } +static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line) +{ + SIZE_T content_size; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = GetHGlobalFromStream(stream, &hglobal); + ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); + + content_size = GlobalSize(hglobal); + ok_(__FILE__, line)(size <= content_size, "Unexpected test output size.\n"); + ptr = GlobalLock(hglobal); + if (size <= content_size) + ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); + + GlobalUnlock(hglobal); +} + static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { int len = strlen(expected), size; @@ -68,6 +87,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l } #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) +#define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) { @@ -377,6 +397,7 @@ static void test_writeroutput(void) static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR utf16_outputW[] = {0xfeff,'<','a'}; IXmlWriterOutput *output; IXmlWriter *writer; IStream *stream; @@ -423,12 +444,32 @@ todo_wine ok(hr == S_OK, "got %08x\n", hr); IUnknown_Release(output); - /* Create output with meaningless code page value. */ + /* Output with codepage 1200. */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + + hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output); + ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "Write failed, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); + + IStream_Release(stream); + + /* Create output with meaningless code page value. */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output);

1 0

Nikolay Sivov : xmllite/writer: Improve handling of the output with invalid encoding.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: 49a57bcabaddc801733d7ebd5163c78b4efd7aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a57bcabaddc801733d7ebd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 3 11:00:31 2017 +0300 xmllite/writer: Improve handling of the output with invalid encoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +- dlls/xmllite/tests/writer.c | 117 +++++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/writer.c | 85 +++++++++++++++++++++++--------- 3 files changed, 181 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a57bcabaddc801733d7…

1 0

Jacek Caban : rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 2d9e894d285937716a4541c7fab9152fdf0b495f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9e894d285937716a4541c7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 2 15:51:09 2017 +0200 rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 48def49..5735b0f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3382,20 +3382,24 @@ RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) void RPCRT4_ReleaseConnection(RpcConnection *connection) { - LONG ref = InterlockedDecrement(&connection->ref); + LONG ref; - if (!ref && connection->protseq) + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + if (connection->protseq) { - /* protseq stores a list of active connections, but does not own references to them. - * It may need to grab a connection from the list, which could lead to a race if - * connection is being released, but not yet removed from the list. We handle that - * by synchronizing on CS here. */ EnterCriticalSection(&connection->protseq->cs); - ref = connection->ref; + ref = InterlockedDecrement(&connection->ref); if (!ref) list_remove(&connection->protseq_entry); LeaveCriticalSection(&connection->protseq->cs); } + else + { + ref = InterlockedDecrement(&connection->ref); + } TRACE("%p ref=%u\n", connection, ref);

1 0

Vincent Povirk : mscoree: Fix locking in GetRuntimeHost.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: bb256b4f211852ddf5c3ed2c1a2827c39e11cb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb256b4f211852ddf5c3ed2c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 2 11:24:15 2017 -0500 mscoree: Fix locking in GetRuntimeHost. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6edd30f..bf70baa 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -342,6 +342,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * if (This->loaded_runtime) { *result = This->loaded_runtime; + LeaveCriticalSection(&runtime_list_cs); return hr; }

1 0

Henri Verbeet : d3d9/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: d4bd150c23a9839f2596118fcc1bc34172cb0f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bd150c23a9839f2596118fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:37 2017 +0200 d3d9/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 89ea772..50752f8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11538,6 +11538,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + device = create_device(d3d9, window, NULL); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11656,6 +11693,7 @@ START_TEST(device) test_get_render_target_data(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d8/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: d6160213452ec0265f276af10494531b8910f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6160213452ec0265f276af10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:36 2017 +0200 d3d8/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 54f6505..2c0565a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8277,6 +8277,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + device = create_device(d3d8, window, NULL); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8383,6 +8420,7 @@ START_TEST(device) test_miptree_layout(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : wined3d: Use the context information in context_set_pixel_format().
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: f7e37715fa6854c3461d812d44b29c96d928d2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e37715fa6854c3461d812d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:35 2017 +0200 wined3d: Use the context information in context_set_pixel_format(). Instead of passing it around. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8ec251..e084d1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1094,15 +1094,18 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) +static BOOL context_set_pixel_format(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL private = context->hdc_is_private; + int format = context->pixel_format; + HDC dc = context->hdc; int current; - if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) + if (private && context->hdc_has_format) return TRUE; - if (dc == context->hdc && !context->hdc_is_private && WindowFromDC(dc) != context->win_handle) + if (!private && WindowFromDC(dc) != context->win_handle) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1159,7 +1162,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO return TRUE; success: - if (dc == context->hdc && context->hdc_is_private) + if (private) context->hdc_has_format = TRUE; return TRUE; } @@ -1169,7 +1172,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, ctx->hdc_is_private, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1203,7 +1206,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->hdc_is_private = TRUE; ctx->hdc_has_format = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1820,14 +1823,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - BOOL hdc_is_private = FALSE; BOOL auxBuffers = FALSE; HGLRC ctx, share_ctx; DWORD target_usage; - int pixel_format; unsigned int i; DWORD state; - HDC hdc = 0; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1921,12 +1921,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, sizeof(*ret->texture_type)))) goto out; - if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(ret->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((hdc = swapchain_get_backup_dc(swapchain))) - hdc_is_private = TRUE; + if ((ret->hdc = swapchain_get_backup_dc(swapchain))) + ret->hdc_is_private = TRUE; else { ERR("Failed to retrieve a device context.\n"); @@ -1973,16 +1973,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers))) + if (!(ret->pixel_format = context_choose_pixel_format(device, ret->hdc, color_format, ds_format, auxBuffers))) goto out; ret->gl_info = gl_info; + ret->win_handle = swapchain->win_handle; context_enter(ret); - if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) + if (!context_set_pixel_format(ret)) { - ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + ERR("Failed to set pixel format %d on device context %p.\n", ret->pixel_format, ret->hdc); context_release(ret); goto out; } @@ -1990,12 +1991,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, hdc, share_ctx))) + if (!(ctx = context_create_wgl_attribs(gl_info, ret->hdc, share_ctx))) goto out; } else { - if (!(ctx = wglCreateContext(hdc))) + if (!(ctx = wglCreateContext(ret->hdc))) { ERR("Failed to create a WGL context.\n"); context_release(ret); @@ -2043,11 +2044,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->valid = 1; ret->glCtx = ctx; - ret->win_handle = swapchain->win_handle; - ret->hdc = hdc; - ret->hdc_is_private = hdc_is_private; ret->hdc_has_format = TRUE; - ret->pixel_format = pixel_format; ret->needs_set = 1; /* Set up the context defaults */ @@ -2217,7 +2214,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return ret; out: - if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); + if (ret->hdc) + wined3d_release_dc(swapchain->win_handle, ret->hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); HeapFree(GetProcessHeap(), 0, ret->texture_type);

1 0

Henri Verbeet : wined3d: Properly update the context when falling back to the backup window in context_set_gl_context ().
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 3441ba9e039521d38be0d8bdad8eca55393e3a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3441ba9e039521d38be0d8bda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:34 2017 +0200 wined3d: Properly update the context when falling back to the backup window in context_set_gl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f9c95ba..d8ec251 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1178,8 +1178,6 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) if (backup || !wglMakeCurrent(ctx->hdc, ctx->glCtx)) { - HDC dc; - WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; @@ -1196,24 +1194,27 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!(dc = swapchain_get_backup_dc(swapchain))) + if (!(ctx->hdc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - if (!context_set_pixel_format(ctx, dc, TRUE, ctx->pixel_format)) + ctx->hdc_is_private = TRUE; + ctx->hdc_has_format = FALSE; + + if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, dc); + ctx->pixel_format, ctx->hdc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(dc, ctx->glCtx)) + if (!wglMakeCurrent(ctx->hdc, ctx->glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - dc, GetLastError()); + ctx->hdc, GetLastError()); context_set_current(NULL); return FALSE; }

1 0

← Newer
1
...
29
30
31
32
33
34
35
36
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 August 2017