November 2015 - Wine-commits

Sebastian Lackner : server: Fix crash when calling SetNamedPipeHandleState on partially closed pipe.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: ace9d329e9c1bae6a4d15d98482a67b802721348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace9d329e9c1bae6a4d15d984… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:24:07 2015 +0100 server: Fix crash when calling SetNamedPipeHandleState on partially closed pipe. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 12 ++++++++++++ server/named_pipe.c | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 842376a..60336f8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1427,6 +1427,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hfile, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); @@ -1464,6 +1467,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hfile, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); @@ -1515,6 +1521,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hpipe, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); @@ -1552,6 +1561,9 @@ static void test_CloseHandle(void) ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); + state = PIPE_READMODE_MESSAGE | PIPE_WAIT; + ret = SetNamedPipeHandleState(hpipe, &state, NULL, NULL); + ok(ret, "SetNamedPipeHandleState failed with %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1c9143f..8d5753a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1046,7 +1046,11 @@ DECL_HANDLER(set_named_pipe_info) client = (struct pipe_client *)get_handle_obj( current->process, req->handle, 0, &pipe_client_ops ); if (!client) return; - server = client->server; + if (!(server = client->server)) + { + release_object( client ); + return; + } } if ((req->flags & ~(NAMED_PIPE_MESSAGE_STREAM_READ | NAMED_PIPE_NONBLOCKING_MODE)) ||

1 0

Alexandre Julliard : winex11: Fix a copy&paste typo in the initial position of a window.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 9f5147e08ff67bd46f9800124c3bc4639e6ce6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5147e08ff67bd46f9800124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 17:16:03 2015 +0900 winex11: Fix a copy&paste typo in the initial position of a window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b763677..836e62c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1501,7 +1501,7 @@ static void create_whole_window( struct x11drv_win_data *data ) else if (cy > 65535) cy = 65535; pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); - data->whole_window = XCreateWindow( data->display, root_window, pos.y, pos.y, + data->whole_window = XCreateWindow( data->display, root_window, pos.x, pos.y, cx, cy, 0, data->vis.depth, InputOutput, data->vis.visual, mask, &attr ); if (!data->whole_window) goto done;

1 0

Dmitry Timoshkov : comctl32/tests: Add a test for system class properties.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: acc1092ea9c3cdde8611c8fc27be6dbdabd8e6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc1092ea9c3cdde8611c8fc2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 23 16:37:28 2015 +0800 comctl32/tests: Add a test for system class properties. This is basically a copy of user32/class.c test. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 9a4b902..5cc6c29 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -357,6 +357,36 @@ static void test_LoadIconWithScaleDown(void) FreeLibrary(hinst); } +static void check_class( const char *name, int must_exist, UINT style, UINT ignore ) +{ + WNDCLASSA wc; + + if (GetClassInfoA( 0, name, &wc )) + { +todo_wine + ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", + name, ~wc.style & style, wc.style, style ); + ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", + name, wc.style & ~style, wc.style, style ); + ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); + } + else + ok( !must_exist, "System class %s does not exist\n", name ); +} + +/* test styles of system classes */ +static void test_builtin_classes(void) +{ + /* check style bits */ + check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW ); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -371,6 +401,7 @@ START_TEST(misc) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + test_builtin_classes(); test_TaskDialogIndirect(); test_LoadIconWithScaleDown();

1 0

Hugh McMaster : kernel32: Use virtual-key codes in the console StdKeyMap.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 7dcfc00dc327dd0cd56326f6bd7cf4b5a91b5484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcfc00dc327dd0cd56326f6b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 23 20:58:36 2015 +1100 kernel32: Use virtual-key codes in the console StdKeyMap. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index b330869..0f3c2cd 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -787,9 +787,9 @@ static void WCEL_ToggleInsert(WCEL_Context* ctx) #define CTRL(x) ((x) - '@') static const KeyEntry StdKeyMap[] = { - {/*BACK*/0x08, WCEL_DeletePrevChar }, - {/*RETURN*/0x0d, WCEL_Done }, - {/*DEL*/127, WCEL_DeleteCurrChar }, + {/*VK_BACK*/ 0x08, WCEL_DeletePrevChar }, + {/*VK_RETURN*/0x0d, WCEL_Done }, + {/*VK_DELETE*/0x2e, WCEL_DeleteCurrChar }, { 0, NULL } }; @@ -857,7 +857,7 @@ static const KeyEntry EmacsStdKeyMap[] = static const KeyMap EmacsKeyMap[] = { - {0, 1, StdKeyMap}, + {0, 0, StdKeyMap}, {0, 0, EmacsStdKeyMap}, {RIGHT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* right alt */ {LEFT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* left alt */ @@ -891,7 +891,7 @@ static const KeyEntry Win32KeyMapCtrl[] = static const KeyMap Win32KeyMap[] = { - {0, 1, StdKeyMap}, + {0, 0, StdKeyMap}, {0, 0, Win32StdKeyMap}, {RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrl}, {LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrl},

1 0

Hugh McMaster : kernel32: Interpret Shift-Backspace as Backspace when using the Win32 keymap in wineconsole.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: bbe3c9cfbde5ba61a6e9b19394e6b189747a8be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe3c9cfbde5ba61a6e9b1939… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 23 20:58:37 2015 +1100 kernel32: Interpret Shift-Backspace as Backspace when using the Win32 keymap in wineconsole. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 0f3c2cd..1774739 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -892,6 +892,7 @@ static const KeyEntry Win32KeyMapCtrl[] = static const KeyMap Win32KeyMap[] = { {0, 0, StdKeyMap}, + {SHIFT_PRESSED, 0, StdKeyMap}, {0, 0, Win32StdKeyMap}, {RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrl}, {LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrl},

1 0

Hugh McMaster : kernel32: Remove un-needed VK_DEL entries from the console keymap.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: b1b05e62e9901284d0cca579498441a9821d4b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b05e62e9901284d0cca5794… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 23 20:58:38 2015 +1100 kernel32: Remove un-needed VK_DEL entries from the console keymap. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 1774739..db17508 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -850,7 +850,6 @@ static const KeyEntry EmacsStdKeyMap[] = {/*VK_HOME*/ 0x24, WCEL_MoveToBeg }, {/*VK_RIGHT*/0x27, WCEL_MoveRight }, {/*VK_LEFT*/ 0x25, WCEL_MoveLeft }, - {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, { 0, NULL } }; @@ -874,7 +873,6 @@ static const KeyEntry Win32StdKeyMap[] = {/*VK_END*/ 0x23, WCEL_MoveToEnd }, {/*VK_UP*/ 0x26, WCEL_MoveToPrevHist }, {/*VK_DOWN*/ 0x28, WCEL_MoveToNextHist }, - {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, {/*VK_F8*/ 0x77, WCEL_FindPrevInHist }, { 0, NULL }

1 0

Nikolay Sivov : wldap32: Properly implement ldap_encode_sort_control[A, W] (Coverity).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: d4d3bacac44334772863057dba792ab75d0bf7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d3bacac44334772863057db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 12:56:39 2015 +0300 wldap32: Properly implement ldap_encode_sort_control[A, W] (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/wldap32/wldap32.h | 13 +++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index b0c9102..b9d7b3b 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -274,15 +274,37 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, return ret; } +static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst ) +{ + dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len ); + if (dst->bv_val) + { + memcpy( dst->bv_val, src->bv_val, src->bv_len ); + dst->bv_len = src->bv_len; + } + else + dst->bv_len = 0; +} + /*********************************************************************** * ldap_encode_sort_controlA (WLDAP32.@) * * See ldap_encode_sort_controlW. */ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys, - PLDAPControlA control, BOOLEAN critical ) + PLDAPControlA ret, BOOLEAN critical ) { - return ldap_create_sort_controlA( ld, sortkeys, critical, &control ); + LDAPControlA *control; + ULONG result; + + if ((result = ldap_create_sort_controlA( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupU(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeA( control ); + } + return result; } /*********************************************************************** @@ -308,9 +330,19 @@ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys * ldap_create_sort_control instead. */ ULONG CDECL ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys, - PLDAPControlW control, BOOLEAN critical ) + PLDAPControlW ret, BOOLEAN critical ) { - return ldap_create_sort_controlW( ld, sortkeys, critical, &control ); + LDAPControlW *control; + ULONG result; + + if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupW(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeW( control ); + } + return result; } /*********************************************************************** diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 00a85a3..55852a6 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; ULONG map_error( int ) DECLSPEC_HIDDEN; @@ -37,6 +39,17 @@ static inline char *strdupU( const char *src ) return dst; } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); + if (dst) + strcpyW( dst, src ); + return dst; +} + static inline LPWSTR strAtoW( LPCSTR str ) { LPWSTR ret = NULL;

1 0

Jacek Caban : mshtml/tests: Fixed tests on win10.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: a2c6a2beb68cae239d72e012aa8d4af113b8aaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c6a2beb68cae239d72e012a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 12:18:22 2015 +0100 mshtml/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 89834ac..87f17d6 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3566,7 +3566,7 @@ static HRESULT WINAPI DocObjectService_IsErrorUrl( LPCWSTR lpszUrl, BOOL *pfIsError) { - CHECK_EXPECT(IsErrorUrl); + CHECK_EXPECT2(IsErrorUrl); *pfIsError = FALSE; return S_OK; }

1 0

Stefan Dösinger : wined3d: Support loading renderbuffers in surface_load_location.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 61ad9284d0a6c140380669ca4ff4286856e620bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ad9284d0a6c140380669ca4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:58 2015 +0100 wined3d: Support loading renderbuffers in surface_load_location. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0a7112c..6a93de4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4084,16 +4084,23 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static void surface_multisample_resolve(struct wined3d_surface *surface, struct wined3d_context *context) +static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, + DWORD dst_location) { - RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + const RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + DWORD src_location; - if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) - ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", - surface); + if (surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE) + src_location = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (surface->locations & WINED3D_LOCATION_RB_RESOLVED) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else if (surface->locations & WINED3D_LOCATION_TEXTURE_SRGB) + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else /* surface_blt_fbo will load the source location if necessary. */ + src_location = WINED3D_LOCATION_TEXTURE_RGB; surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, - surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); + surface, src_location, &rect, surface, dst_location, &rect); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -4161,7 +4168,8 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; case WINED3D_LOCATION_RB_RESOLVED: - surface_multisample_resolve(surface, context); + case WINED3D_LOCATION_RB_MULTISAMPLE: + surface_load_renderbuffer(surface, context, location); break; case WINED3D_LOCATION_TEXTURE_RGB:

1 0

Stefan Dösinger : wined3d: Discard depth stencils on unload.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 369956a6fd140fa2176764bc036f1aee69184010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369956a6fd140fa2176764bc0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:59 2015 +0100 wined3d: Discard depth stencils on unload. Doing so is equivalent of setting WINED3D_LOCATION_DISCARDED when creating new depth stencil surfaces. It will only happen on the implicit depth stencil. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6a93de4..a8f7179 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1149,10 +1149,18 @@ static void surface_unload(struct wined3d_resource *resource) * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_prepare_system_memory(surface); - memset(surface->resource.heap_memory, 0, surface->resource.size); - surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); - surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM); + if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL) + { + surface_validate_location(surface, WINED3D_LOCATION_DISCARDED); + surface_invalidate_location(surface, ~WINED3D_LOCATION_DISCARDED); + } + else + { + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); + surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); + surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM); + } /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be

1 0