October 2011 - Wine-Commits

Marcus Meissner : dsound: Remove dead code from mixer (Coverity).
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 587cd82013c6a2dd80da5ba90efde0eb442bc3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587cd82013c6a2dd80da5ba90… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 19:16:41 2011 +0200 dsound: Remove dead code from mixer (Coverity). --- dlls/dsound/mixer.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8adbdff..b1925d5 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -934,11 +934,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) size2 = 0; FillMemory(device->mix_buffer + mixplaypos, mixplaypos2 - mixplaypos, 0); FillMemory(buf1, size1, nfiller); - if (buf2 && size2) - { - FIXME("%d: There should be no additional buffer here!!\n", __LINE__); - FillMemory(buf2, size2, nfiller); - } } device->playpos = playpos;

1 0

Marcus Meissner : user32: Load PaddedBorderWidth from registry too ( Coverity).
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 118dc1998f04fc5e5b7729f1ce15973c19a02c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118dc1998f04fc5e5b7729f1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 11:32:03 2011 +0200 user32: Load PaddedBorderWidth from registry too (Coverity). --- dlls/user32/sysparams.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3c7da43..6a80687 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -254,6 +254,7 @@ static const WCHAR METRICS_MENUWIDTH_VALNAME[]= {'M','e','n','u','W','i',' static const WCHAR METRICS_MENUHEIGHT_VALNAME[]= {'M','e','n','u','H','e','i','g','h','t',0}; static const WCHAR METRICS_ICONSIZE_VALNAME[]= {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; static const WCHAR METRICS_BORDERWIDTH_VALNAME[]= {'B','o','r','d','e','r','W','i','d','t','h',0}; +static const WCHAR METRICS_PADDEDBORDERWIDTH_VALNAME[]={'P','a','d','d','e','d','B','o','r','d','e','r','W','i','d','t','h',0}; static const WCHAR METRICS_CAPTIONLOGFONT_VALNAME[]= {'C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_SMCAPTIONLOGFONT_VALNAME[]={'S','m','C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_MENULOGFONT_VALNAME[]= {'M','e','n','u','F','o','n','t',0}; @@ -1079,6 +1080,7 @@ static void load_nonclient_metrics(void) ncm.iBorderWidth = get_reg_metric(hkey, METRICS_BORDERWIDTH_VALNAME, 1); ncm.iScrollWidth = get_reg_metric(hkey, METRICS_SCROLLWIDTH_VALNAME, 16); ncm.iScrollHeight = get_reg_metric(hkey, METRICS_SCROLLHEIGHT_VALNAME, 16); + ncm.iPaddedBorderWidth = get_reg_metric(hkey, METRICS_PADDEDBORDERWIDTH_VALNAME, 0); /* size of the normal caption buttons */ ncm.iCaptionHeight = get_reg_metric(hkey, METRICS_CAPTIONHEIGHT_VALNAME, 18);

1 0

Marcus Meissner : wined3d: Fixed sizeof (Coverity).
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: f90d40261057b5f4c9dc4190129df6275e6a0c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90d40261057b5f4c9dc41901… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 23:11:48 2011 +0200 wined3d: Fixed sizeof (Coverity). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 126a991..1678dce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -987,7 +987,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context)); + swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context) { ERR("Failed to create the context array.\n");

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_render_target() const.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: ebbd5ecf7c41a0a9afde070a5e2341a61e439de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbd5ecf7c41a0a9afde070a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:32 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_render_target() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20bf808..c56dfe5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4939,7 +4939,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); } -HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target) { TRACE("device %p, render_target_idx %u, render_target %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e466400..b93bfb2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2238,7 +2238,7 @@ HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *de UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); -HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target); HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value);

1 0

Henri Verbeet : wined3d: Also restore the pixel format in context_restore_gl_context().
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 25b1130b44c2d64effbf259ba174fc5a32d33c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b1130b44c2d64effbf259ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:31 2011 +0200 wined3d: Also restore the pixel format in context_restore_gl_context(). --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ef8b94e..fc66a98 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -724,7 +724,8 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC { if (!SetPixelFormat(dc, format, NULL)) { - ERR("Failed to set pixel format %d on device context %p, last error %#x.\n", + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", format, dc, GetLastError()); return FALSE; } @@ -758,8 +759,16 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC static BOOL context_set_gl_context(struct wined3d_context *ctx) { struct wined3d_swapchain *swapchain = ctx->swapchain; + BOOL backup = FALSE; - if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) + if (!context_set_pixel_format(ctx->gl_info, ctx->hdc, ctx->pixel_format)) + { + WARN("Failed to set pixel format %d on device context %p.\n", + ctx->pixel_format, ctx->hdc); + backup = TRUE; + } + + if (backup || !pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { HDC dc; @@ -804,8 +813,15 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return TRUE; } -static void context_restore_gl_context(HDC dc, HGLRC gl_ctx) +static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx, int pf) { + if (!context_set_pixel_format(gl_info, dc, pf)) + { + ERR("Failed to restore pixel format %d on device context %p.\n", pf, dc); + context_set_current(NULL); + return; + } + if (!pwglMakeCurrent(dc, gl_ctx)) { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", @@ -876,9 +892,11 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HGLRC restore_ctx; HDC restore_dc; unsigned int i; + int restore_pf; restore_ctx = pwglGetCurrentContext(); restore_dc = pwglGetCurrentDC(); + restore_pf = GetPixelFormat(restore_dc); if (context->valid && restore_ctx != context->glCtx) context_set_gl_context(context); @@ -961,7 +979,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (restore_ctx) { - context_restore_gl_context(restore_dc, restore_ctx); + context_restore_gl_context(gl_info, restore_dc, restore_ctx, restore_pf); } else if (pwglGetCurrentContext() && !pwglMakeCurrent(NULL, NULL)) { @@ -1060,7 +1078,7 @@ void context_release(struct wined3d_context *context) if (!--context->level && context->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - context_restore_gl_context(context->restore_dc, context->restore_ctx); + context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx, context->restore_pf); context->restore_ctx = NULL; context->restore_dc = NULL; } @@ -1081,6 +1099,7 @@ static void context_enter(struct wined3d_context *context) current_gl, pwglGetCurrentDC()); context->restore_ctx = current_gl; context->restore_dc = pwglGetCurrentDC(); + context->restore_pf = GetPixelFormat(context->restore_dc); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5ed787..ebe277b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1099,6 +1099,7 @@ struct wined3d_context UINT level; HGLRC restore_ctx; HDC restore_dc; + int restore_pf; HGLRC glCtx; HWND win_handle; HDC hdc;

1 0

Henri Verbeet : wined3d: Don' t try to access the swapchain of a destroyed context in context_set_gl_context ().
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: cdc9aadf5c9144920caefcfe7a0e12915ee0ce38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9aadf5c9144920caefcfe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:30 2011 +0200 wined3d: Don't try to access the swapchain of a destroyed context in context_set_gl_context(). --- dlls/wined3d/context.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3353434..ef8b94e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -768,6 +768,17 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->valid = 0; WARN("Trying fallback to the backup window.\n"); + /* FIXME: If the context is destroyed it's no longer associated with + * a swapchain, so we can't use the swapchain to get a backup dc. To + * make this work windowless contexts would need to be handled by the + * device. */ + if (ctx->destroyed) + { + FIXME("Unable to get backup dc for destroyed context %p.\n", ctx); + context_set_current(NULL); + return FALSE; + } + if (!(dc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL);

1 0

Vitaliy Margolen : dinput: Don't mask buffer overflow error.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: d7db5d539998e3528f6435d76874a77336058075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7db5d539998e3528f6435d76… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:48 2011 -0600 dinput: Don't mask buffer overflow error. --- dlls/dinput/device.c | 2 +- dlls/dinput/mouse.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a9c7b87..75b3cb5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac } *entries = len; - if (This->overflow) + if (This->overflow && This->dinput->dwVersion == 0x0800) ret = DI_BUFFEROVERFLOW; if (!(flags & DIGDD_PEEK)) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 011deb0..4b65e89 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -419,7 +419,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -static HRESULT warp_check( SysMouseImpl* This, BOOL force ) +static void warp_check( SysMouseImpl* This, BOOL force ) { DWORD now = GetCurrentTime(); const DWORD interval = This->clipped ? 500 : 10; @@ -430,7 +430,7 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->last_warped = now; This->need_warp = FALSE; - if (!GetWindowRect(This->base.win, &rect)) return DIERR_GENERIC; + if (!GetWindowRect(This->base.win, &rect)) return; This->mapped_center.x = (rect.left + rect.right) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2; if (!This->clipped) @@ -447,7 +447,6 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } - return DI_OK; } @@ -569,7 +568,8 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - return warp_check( This, FALSE ); + warp_check( This, FALSE ); + return DI_OK; } static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) @@ -588,7 +588,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, HRESULT res; res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (SUCCEEDED(res)) res = warp_check( This, FALSE ); + if (SUCCEEDED(res)) warp_check( This, FALSE ); return res; }

1 0

Vitaliy Margolen : dinput: Fix buffer size in test.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: e93998002728b58cbf1097c515fd09cc1d22cd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93998002728b58cbf1097c51… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:43 2011 -0600 dinput: Fix buffer size in test. --- dlls/dinput/tests/device.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 2e4e4f8..7171bb8 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -127,7 +127,7 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); dp.dwData = 20; @@ -135,15 +135,17 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); hr = IDirectInputDevice_Unacquire(device);

1 0

Marcus Meissner : winhttp: Fixed sizeof calls (Coverity).
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 8648c1314011afd6300f97f9671af6797a205a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8648c1314011afd6300f97f96… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 22:55:32 2011 +0200 winhttp: Fixed sizeof calls (Coverity). --- dlls/winhttp/tests/winhttp.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 24478ad..01b74e3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -659,7 +659,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, sizeof(reverse ? test_flag_coalesce_reverse : test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); + ok(memcmp(buffer, reverse ? test_flag_coalesce_reverse : test_flag_coalesce, + reverse ? sizeof(test_flag_coalesce_reverse) : sizeof(test_flag_coalesce)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, @@ -683,7 +684,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, sizeof(reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_comma_reverse : test_flag_coalesce_comma, + reverse ? sizeof(test_flag_coalesce_comma_reverse) : sizeof(test_flag_coalesce_comma)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); @@ -709,7 +711,8 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); - ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, sizeof(reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon)) == 0, + ok(memcmp(buffer, reverse ? test_flag_coalesce_semicolon_reverse : test_flag_coalesce_semicolon, + reverse ? sizeof(test_flag_coalesce_semicolon_reverse) : sizeof(test_flag_coalesce_semicolon)) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer);

1 0

Henri Verbeet : wined3d: Don't bother updating the context' s window in context_destroy_gl_resources().
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: dfea2ab6f49bf986482c9784c4788b86323132f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfea2ab6f49bf986482c9784c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 16 21:55:29 2011 +0200 wined3d: Don't bother updating the context's window in context_destroy_gl_resources(). context_update_window() accesses the swapchain, which may not exist if this is a destroyed context, and we don't do anything that needs displaying here anyway. --- dlls/wined3d/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d15176..3353434 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -869,7 +869,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) restore_ctx = pwglGetCurrentContext(); restore_dc = pwglGetCurrentDC(); - context_update_window(context); if (context->valid && restore_ctx != context->glCtx) context_set_gl_context(context); else restore_ctx = NULL;

1 0