February 2019 - Wine-Commits

Jacek Caban : ntoskrnl.exe: Implement file object constructor.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 637e01e217bd579ef67b1f61da421769357ae4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=637e01e217bd579ef67b1f61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:57 2019 +0100 ntoskrnl.exe: Implement file object constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++++++++- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a8a433..010f9f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -369,16 +369,26 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } +static void *create_file_object( HANDLE handle ); + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { file_type_name, - NULL, + create_file_object, free_kernel_object }; POBJECT_TYPE IoFileObjectType = &file_type; +static void *create_file_object( HANDLE handle ) +{ + FILE_OBJECT *file; + if (!(file = alloc_kernel_object( IoFileObjectType, sizeof(*file), 0 ))) return NULL; + file->Type = 5; /* MSDN */ + file->Size = sizeof(*file); + return file; +} /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index aae5839..2fbe493 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -664,6 +664,7 @@ static void test_ob_reference(const WCHAR *test_path) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; HANDLE event_handle, file_handle, file_handle2, thread_handle; + FILE_OBJECT *file; void *obj1, *obj2; UNICODE_STRING pathU; IO_STATUS_BLOCK io; @@ -732,6 +733,9 @@ static void test_ob_reference(const WCHAR *test_path) todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); + file = obj1; + ok(file->Type == 5, "Type = %u\n", file->Type); + ObDereferenceObject(obj1); ObDereferenceObject(obj2);

1 0

Zhiyi Zhang : user32/tests: Add more EnumDisplayDevices tests.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 741b673bc997ec7c79866afad42fd746c4244f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741b673bc997ec7c79866afa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:39 2019 +0800 user32/tests: Add more EnumDisplayDevices tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 194 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 174 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=741b673bc997ec7c7986…

1 0

Stefan Riesenberger : opengl32: Add wrapper for wglCreateContext.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 4285c619a07de29df2c51de198c65104678d1c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4285c619a07de29df2c51de1… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Mon Feb 25 18:34:36 2019 +0100 opengl32: Add wrapper for wglCreateContext. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9241005..c6018b0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +static HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -420,6 +420,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) } /*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + +/*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ HGLRC WINAPI wglGetCurrentContext(void) @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); @@ -1212,8 +1220,8 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { - vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; - vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; + vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; + vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; vertex[2] = 0.0; } @@ -1393,7 +1401,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf->gmfCellIncY = (float)gm.gmCellIncY / em_size; TRACE("%fx%f at %f,%f inc %f,%f\n", lpgmf->gmfBlackBoxX, lpgmf->gmfBlackBoxY, - lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); + lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); lpgmf++; }

1 0

Zhiyi Zhang : include: Add EnumDisplayDevices flags.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: aa754f3ae4a2f936c1be03267b435a8df5cd3bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa754f3ae4a2f936c1be0326… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:22 2019 +0800 include: Add EnumDisplayDevices flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 14 +++++++++++++- include/winuser.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 1851654..01d3ff3 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,12 +3318,24 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +#define DISPLAY_DEVICE_REMOVABLE 0x00000020 +#define DISPLAY_DEVICE_ACC_DRIVER 0x00000040 +#define DISPLAY_DEVICE_UNSAFE_MODES_ON 0x00080000 +#define DISPLAY_DEVICE_TS_COMPATIBLE 0x00200000 +#define DISPLAY_DEVICE_RDPUDD 0x01000000 +#define DISPLAY_DEVICE_DISCONNECT 0x02000000 +#define DISPLAY_DEVICE_REMOTE 0x04000000 +#define DISPLAY_DEVICE_MODESPRUNED 0x08000000 + +/* DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { diff --git a/include/winuser.h b/include/winuser.h index 693965a..6300cc9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1082,6 +1082,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used by EnumDisplayDevices */ +#define EDD_GET_DEVICE_INTERFACE_NAME 0x00000001 + #define EDS_RAWMODE 0x00000002 #define EDS_ROTATEDMODE 0x00000004

1 0

Zebediah Figura : setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: bb4a6da373d7fdb4a61743ee0632298f6a2f333f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4a6da373d7fdb4a61743ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 22:26:39 2019 -0600 setupapi: Search for substituted strings in SetupFindNextMatchLine(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0..5cde5eb 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaaf..06c674a 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].data, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret)

1 0

Stefan Riesenberger : d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1().
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: c795487ab00b763ba7aac73a7ba943d4446b27d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c795487ab00b763ba7aac73a… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:01 2019 +0330 d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1(). Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index e9fad3e..8ee5aa7 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,7 +63,7 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, +static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { IDXGIFactory *factory; @@ -175,6 +175,12 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, + UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) +{ + return d3d10_create_device1(adapter, driver_type, swrast, flags, hw_level, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device) @@ -194,7 +200,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE if (!device) return E_INVALIDARG; - if (FAILED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) + /* Avoid forwarding to D3D10CreateDevice1(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) { WARN("Failed to create a device, returning %#x.\n", hr); *device = NULL;

1 0

Matteo Bruni : d3d8/tests: Fix device tests on Windows 10.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: cf11ddfe416642e1f7e02e15ec168c9626468acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf11ddfe416642e1f7e02e15… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 25 19:00:43 2019 +0100 d3d8/tests: Fix device tests on Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4dbe168..a647369 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3049,8 +3049,9 @@ static void test_wndproc(void) /* Remove the maximized state from the SYSCOMMAND test while we're not * interfering with a device. */ ShowWindow(focus_window, SW_SHOWNORMAL); - filter_messages = focus_window; + /* On Windows 10 style change messages are delivered on device + * creation. */ device_desc.device_window = focus_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -3065,7 +3066,6 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; /* The window is iconic even though no message was sent. */ @@ -3121,6 +3121,7 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + filter_messages = NULL; hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);

1 0

Stefan Riesenberger : d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain().
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 4826b77d71899311a961319a2f8b55ab07a6eed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4826b77d71899311a961319a… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:02 2019 +0330 d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain(). Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed12..bc90ff1 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, +static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { IDXGIFactory *factory; @@ -139,6 +139,12 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver return hr; } +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) +{ + return d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device) @@ -152,8 +158,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device); - hr = D3D10CreateDevice(adapter, driver_type, swrast, flags, sdk_version, device); - if (FAILED(hr)) + /* Avoid forwarding to D3D10CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { WARN("Failed to create a device, returning %#x\n", hr); *device = NULL;

1 0

Huw Davies : server: Add new pipe servers to the end of the servers list.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: e4ca5dbec056c977bffce31bd7901aaec884f199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ca5dbec056c977bffce31b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 11:06:25 2019 +0000 server: Add new pipe servers to the end of the servers list. This ensures instances created first will be connected to first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41670 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5bf27fa..5dc6ace 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3671,6 +3671,43 @@ static void test_namedpipe_session_id(void) CloseHandle(server); } +static void test_multiple_instances(void) +{ + HANDLE server[2], client; + int i; + BOOL ret; + OVERLAPPED ov; + + for (i = 0; i < ARRAY_SIZE(server); i++) + { + server[i] = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_READMODE_BYTE | PIPE_WAIT, 2, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server[i] != INVALID_HANDLE_VALUE, "got invalid handle\n"); + } + + client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + /* Show that this has connected to server[0] not server[1] */ + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[1], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "got %d\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[0], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_PIPE_CONNECTED, "got %d\n", GetLastError()); + + DisconnectNamedPipe(server[1]); + DisconnectNamedPipe(server[0]); + CloseHandle(client); + CloseHandle(server[1]); + CloseHandle(server[0]); +} + START_TEST(pipe) { char **argv; @@ -3736,4 +3773,5 @@ START_TEST(pipe) test_TransactNamedPipe(); test_namedpipe_process_id(); test_namedpipe_session_id(); + test_multiple_instances(); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 101ff63..9e33032 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1162,7 +1162,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe_end.server_pid = get_process_id( current->process ); init_async_queue( &server->listen_q ); - list_add_head( &pipe->servers, &server->entry ); + list_add_tail( &pipe->servers, &server->entry ); if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server );

1 0

Jacek Caban : ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 7fb89b126d700db9b4e518d23844ee175b5e4f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb89b126d700db9b4e518d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:29 2019 +0100 ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e10f511..05291ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -283,6 +283,12 @@ static void dereference_kernel_object( void *obj ) header->type->release( obj ); } +static void ObReferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { @@ -2631,17 +2637,11 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, } driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); - *Object = &driver->driver_obj; + ObReferenceObject( *Object = &driver->driver_obj ); return STATUS_SUCCESS; } -static void ObReferenceObject( void *obj ) -{ - TRACE( "(%p): stub\n", obj ); -} - - /*********************************************************************** * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) */

1 0