November 2015 - Wine-Commits

Thomas Faber : d3dxof: Avoid undefined behavior in parse_object_parts.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 73eff6652ac9671522a07155a97104f36ca7f8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eff6652ac9671522a07155a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Nov 22 21:37:20 2015 +0100 d3dxof: Avoid undefined behavior in parse_object_parts. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 769e815..54566b0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1349,7 +1349,8 @@ _exit: return FALSE; } - buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects]; + pxo->root->nb_subobjects++; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++;

1 0

Jacek Caban : mshtml/tests: Fixed tests on win10.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

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

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

Nov. 23, 2015

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

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

Nov. 23, 2015

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: Remove un-needed VK_DEL entries from the console keymap.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

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 Nov. 23, 2015

Nov. 23, 2015

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

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

Nov. 23, 2015

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

Stefan Dösinger : d3d9/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 04b41ade76427a117a6baebd312f964452c0f518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b41ade76427a117a6baebd3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:01:00 2015 +0100 d3d9/tests: Multisampled render targets are zeroed on creation. 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/d3d9/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b328b94..7ab751c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20391,6 +20391,75 @@ static void test_uninitialized_varyings(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + IDirect3DSurface9 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &multi, NULL); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, multi, NULL, back, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; x++) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface9_Release(multi); + IDirect3DSurface9_Release(back); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -20511,4 +20580,5 @@ START_TEST(visual) test_depthbias(); test_flip(); test_uninitialized_varyings(); + test_multisample_init(); }

1 0

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

Nov. 23, 2015

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

Sebastian Lackner : kernel32/tests: Add tests for calling WriteFile on pipe when other end is closed.
by Alexandre Julliard Nov. 23, 2015

Nov. 23, 2015

Module: wine Branch: master Commit: 78948b24b72aeb6c5b33e2630ccb817097829251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78948b24b72aeb6c5b33e2630… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 23 07:23:04 2015 +0100 kernel32/tests: Add tests for calling WriteFile on pipe when other end is closed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4f1b238..1095279 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1430,6 +1430,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hfile); hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1459,6 +1464,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hfile); /* repeat test with hpipe <-> hfile swapped */ @@ -1502,6 +1512,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hpipe); hpipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, @@ -1531,6 +1546,11 @@ static void test_CloseHandle(void) ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + CloseHandle(hpipe); }

1 0