wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Paul Gofman : wined3d: Add a setting to turn off aggressive optimization on NVIDIA.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 32b6ccb9c17b0d4c1d9acd6cbb91b28e7cbd97de URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b6ccb9c17b0d4c1d9acd6c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 26 22:57:03 2019 +0330 wined3d: Add a setting to turn off aggressive optimization on NVIDIA. NVIDIA drivers perform too aggressive optimization involving change of computation order (aka 'fastmath') by default. The setting helps to workaround bugs like https://bugs.winehq.org/show_bug.cgi?id=35207. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 660005f..4613d78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2416,6 +2416,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont unsigned int i; DWORD map; + if (wined3d_settings.strict_shader_math) + shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); + prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b64d2c..fb70b94 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ + FALSE, /* No strict shader math by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -312,6 +313,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } + if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3f3847..f2b9b5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -398,6 +398,7 @@ struct wined3d_settings unsigned int multisample_textures; unsigned int sample_count; BOOL check_float_constants; + unsigned int strict_shader_math; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds;

1 0

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

26 Feb '19

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

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

26 Feb '19

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

Stefan Riesenberger : d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: e728156d2c31aa82ed3aab9629a03a8a6f8ca5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e728156d2c31aa82ed3aab96… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:00 2019 +0330 d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain(). 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/d3d11/d3d11_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 9c89820..b0a32ac 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -136,7 +136,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return S_OK; } -HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, +static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { @@ -278,6 +278,14 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return (device_out || immediate_context) ? S_OK : S_FALSE; } +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) +{ + return d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, device_out, obtained_feature_level, immediate_context); +} + HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, @@ -299,8 +307,10 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T if (device_out) *device_out = NULL; - if (FAILED(hr = D3D11CreateDevice(adapter, driver_type, swrast, flags, feature_levels, levels, sdk_version, - &device, obtained_feature_level, immediate_context))) + /* Avoid forwarding to D3D11CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, &device, obtained_feature_level, immediate_context))) { WARN("Failed to create a device, returning %#x.\n", hr); return hr;

1 0

Stefan Riesenberger : opengl32: Add wrapper for wglCreateContext.
by Alexandre Julliard 26 Feb '19

26 Feb '19

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

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

26 Feb '19

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

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

26 Feb '19

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

Nikolay Sivov : mf/tests: Fix typos in test messages.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 22b304fd1d83f8d7f3cd3da8188856f2a2a45e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b304fd1d83f8d7f3cd3da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 16:06:28 2019 +0300 mf/tests: Fix typos in test messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c56428d..ba11a27 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -297,7 +297,7 @@ static void test_topology(void) IMFCollection_Release(collection); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr); if (SUCCEEDED(hr)) { ok(!!collection, "Unexpected object pointer.\n"); @@ -313,7 +313,7 @@ static void test_topology(void) IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr); ok(!!collection, "Unexpected object pointer.\n"); hr = IMFCollection_GetElementCount(collection, &size); ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr);

1 0

Jacek Caban : ntoskrnl.exe: Implement file object constructor.
by Alexandre Julliard 26 Feb '19

26 Feb '19

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

Jacek Caban : ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 855314449be7f7bfb22b7b049e4c0fab212dd3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=855314449be7f7bfb22b7b04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:51 2019 +0100 ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject. NULL checks are meant to prevent regressions in applications trying to reference NULL objects returned from stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 66ad3e3..1a8a433 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -275,24 +275,43 @@ void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) return header + 1; } -/* FIXME: Use ObReferenceObject instead. */ -static void reference_kernel_object( void *obj ) -{ - struct object_header *header = (struct object_header*)obj - 1; - InterlockedIncrement( &header->ref ); -} -/* FIXME: Use ObDereferenceObject instead. */ -static void dereference_kernel_object( void *obj ) +/*********************************************************************** + * ObDereferenceObject (NTOSKRNL.EXE.@) + */ +void WINAPI ObDereferenceObject( void *obj ) { struct object_header *header = (struct object_header*)obj - 1; - if (!InterlockedDecrement( &header->ref ) && header->type->release) - header->type->release( obj ); + LONG ref; + + if (!obj) + { + FIXME("NULL obj\n"); + return; + } + + ref = InterlockedDecrement( &header->ref ); + TRACE( "(%p) ref=%u\n", obj, ref ); + if (!ref) + { + if (header->type->release) header->type->release( obj ); + else FIXME( "no destructor\n" ); + } } static void ObReferenceObject( void *obj ) { - TRACE( "(%p): stub\n", obj ); + struct object_header *header = (struct object_header*)obj - 1; + LONG ref; + + if (!obj) + { + FIXME("NULL obj\n"); + return; + } + + ref = InterlockedIncrement( &header->ref ); + TRACE( "(%p) ref=%u\n", obj, ref ); } static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) @@ -345,7 +364,7 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } status = kernel_object_from_handle( handle, type, ptr ); - if (!status) reference_kernel_object( *ptr ); + if (!status) ObReferenceObject( *ptr ); return status; } @@ -387,7 +406,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, if (irp->Flags & IRP_CLOSE_OPERATION) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); irp->Tail.Overlay.OriginalFileObject = NULL; } @@ -430,7 +449,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); return STATUS_NO_MEMORY; } @@ -475,7 +494,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); return STATUS_NO_MEMORY; } @@ -1251,7 +1270,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - dereference_kernel_object( driver ); + ObDereferenceObject( driver ); return status; } @@ -1280,7 +1299,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) wine_rb_remove_key( &wine_drivers, &driver_object->DriverName ); LeaveCriticalSection( &drivers_cs ); - dereference_kernel_object( driver_object ); + ObDereferenceObject( driver_object ); } @@ -1368,7 +1387,7 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; NtClose( device->Reserved ); - dereference_kernel_object( device ); + ObDereferenceObject( device ); } } @@ -2705,15 +2724,6 @@ NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, /*********************************************************************** - * ObDereferenceObject (NTOSKRNL.EXE.@) - */ -void WINAPI ObDereferenceObject( void *obj ) -{ - TRACE( "(%p): stub\n", obj ); -} - - -/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
68
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 February 2019