December 2019 - Wine-Devel - list.winehq.org

[PATCH 2/3] d3d8/tests: Add out-of-bounds region tests.

by Henri Verbeet

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 174851. dlls/d3d8/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 310ffc59e46..96ab4596a76 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5441,6 +5441,15 @@ static void add_dirty_rect_test(void) HRESULT hr; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -5784,6 +5793,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture8_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + IDirect3DSurface8_Release(surface_dst2); IDirect3DSurface8_Release(surface_managed1); IDirect3DSurface8_Release(surface_managed0); -- 2.11.0

Dec. 2, 2019

[PATCH 1/3] d3d9/tests: Add out-of-bounds region tests.

by Henri Verbeet

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 174850. dlls/d3d9/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cbfb98bec68..f19bd11607a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19249,6 +19249,15 @@ static void add_dirty_rect_test(void) HWND window; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; DWORD color; window = create_window(); @@ -19595,6 +19604,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture9_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); -- 2.11.0

Dec. 2, 2019

Re: [PATCH v2 2/2] ddraw/tests: Add test for stretching compressed format surfaces.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 2, 2019

Re: [PATCH v2 1/2] wined3d: Support stretching compressed format surfaces in surface_cpu_blt().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 2, 2019

Re: [PATCH vkd3d v3 1/2] vkd3d: Add more features to CheckFeatureSupport().

by Henri Verbeet

On Wed, 27 Nov 2019 at 18:35, Conor McCarthy <cmccarthy(a)codeweavers.com> wrote: > > Some games, e.g. Hitman 2, do not check for success, and if the feature > check is unimplemented they will use uninitialised data for the result. > > Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> > --- > v3: Report FALSE for Native16BitShaderOpsSupported. > Supersedes 174444. > --- > include/vkd3d_d3d12.idl | 141 +++++++++++++++++++ > libs/vkd3d/device.c | 279 +++++++++++++++++++++++++++++++++++++ > libs/vkd3d/vkd3d_private.h | 5 + > 3 files changed, 425 insertions(+) > It's probably best to split this into separate patches for each option, both to keep things reviewable, and for the purpose of bisects. In terms of style, the existing file isn't entirely consistent about it, but we tend to put enums together at the top, and the structures using them together below that. Enum element values should generally by in hexadecimal, since that's how we print them in debug messages.

Dec. 2, 2019

Re: [PATCH v2 3/3] ntdll: Use the new WineUsd service to map user shared data.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61208 Your paranoid android. === debian10 (32 bit report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216498995 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499045 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499095 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499145 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499196 === debian10 (32 bit French report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216498987 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499037 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499088 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499138 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499188 === debian10 (32 bit Japanese:Japan report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216498988 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499038 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499088 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499139 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499189 === debian10 (32 bit Chinese:China report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216498982 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499032 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499082 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499133 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216499183 === debian10 (32 bit WoW report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314624 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314674 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314725 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314775 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314825 === debian10 (64 bit WoW report) === ntdll: time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314624 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314674 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314724 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314774 time.c:175: Test failed: NtGetTickCount - TickCountQuad too high, expected < 100 got 216314825

Dec. 2, 2019

Re: [PATCH vkd3d] vkd3d/shader: Print more info about skipped dxbc chunks.

by Conor McCarthy

November 29, 2019 6:46 PM, "Henri Verbeet" <hverbeet(a)gmail.com> wrote: > On Wed, 27 Nov 2019 at 18:48, Conor McCarthy <cmccarthy(a)codeweavers.com> wrote: > > Where do these come from? Should that be "IFCE"? > >From timjones.io/blog/archive/2015/09/02/parsing-direct3d-shader-bytecode Yes, the table has a typo.

Dec. 2, 2019

[PATCH] kernel32/tests: Reorder the WINAPI with the void.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/dummy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c index 14d0d90dea..b8eab8c219 100644 --- a/dlls/kernel32/tests/dummy.c +++ b/dlls/kernel32/tests/dummy.c @@ -14,7 +14,7 @@ BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) return TRUE; } -WINAPI void get_path(char *buffer, int buffer_size) +void WINAPI get_path(char *buffer, int buffer_size) { GetModuleFileNameA(instance, buffer, buffer_size); } -- 2.23.0

Dec. 2, 2019

[PATCH] mapi32: Reorder the WINAPI with the HRESULT.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 55baf9129a..b217035e2c 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1497,7 +1497,7 @@ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) * Inherited method from the IUnknown Interface. * See IUnknown_QueryInterface. */ -static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) { IPropDataImpl *This = impl_from_IPropData(iface); -- 2.23.0

Dec. 2, 2019

Re: [PATCH v2 2/2] ddraw/tests: Add test for stretching compressed format surfaces.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61205 Your paranoid android. === w8adm (32 bit report) === ddraw: ddraw7.c:3140: Test failed: Got unexpected hr 0x887601c2. === w1064v1809 (32 bit report) === ddraw: 1940:ddraw7: unhandled exception c0000005 at 738540F8 === w1064v1809_2scr (32 bit report) === ddraw: 1ad4:ddraw7: unhandled exception c0000005 at 74CB40F8 === w1064v1809_ar (32 bit report) === ddraw: 198c:ddraw7: unhandled exception c0000005 at 726C40F8 === w1064v1809_he (32 bit report) === ddraw: 1ba0:ddraw7: unhandled exception c0000005 at 737C40F8 === w1064v1809_ja (32 bit report) === ddraw: 1934:ddraw7: unhandled exception c0000005 at 709140F8 === w1064v1809_zh_CN (32 bit report) === ddraw: 1b7c:ddraw7: unhandled exception c0000005 at 734240F8

Dec. 2, 2019

[PATCH] uianimation: Remove duplicate WINAPI.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/uianimation/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 492c1b757a..c0c7367e09 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -132,7 +132,7 @@ struct animation_storyboard *impl_from_IUIAnimationStoryboard( IUIAnimationStory return CONTAINING_RECORD( iface, struct animation_storyboard, IUIAnimationStoryboard_iface ); } -static HRESULT WINAPI WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, +static HRESULT WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, REFIID iid, void **obj ) { struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); @@ -352,7 +352,7 @@ struct animation_var *impl_from_IUIAnimationVariable( IUIAnimationVariable *ifac return CONTAINING_RECORD( iface, struct animation_var, IUIAnimationVariable_iface ); } -static HRESULT WINAPI WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, +static HRESULT WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, REFIID iid, void **obj ) { struct animation_var *This = impl_from_IUIAnimationVariable( iface ); @@ -998,7 +998,7 @@ struct tr_library *impl_from_IUIAnimationTransitionLibrary( IUIAnimationTransiti return CONTAINING_RECORD( iface, struct tr_library, IUIAnimationTransitionLibrary_iface ); } -static HRESULT WINAPI WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, +static HRESULT WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, REFIID iid, void **obj ) { struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); -- 2.23.0

Dec. 2, 2019

[PATCH v2 3/3] ntdll: Use the new WineUsd service to map user shared data.

by Rémi Bernon

If the device cannot be opened, then the service may not be started yet, or the current process is the service itself. In which case, we can ignore the error and continue as before without timestamp updates. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: When submitting the patch on testbot, the service was not started and the test failed. It may be the same there and I think the wine.inf update requires a server restart to be accounted for. I'm not sure how to force the new service to start right away. dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 2 ++ dlls/ntdll/tests/time.c | 1 - dlls/ntdll/thread.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ac146941236..e4e2de86a42 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -195,6 +195,7 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; +extern void user_shared_data_init(void); /* completion */ extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 204370a1b77..58d23e3e27e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1471,6 +1471,8 @@ void server_init_process_done(void) } SERVER_END_REQ; + user_shared_data_init(); + assert( !status ); signal_start_process( entry, suspend ); } diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index be6859fe3e1..3c5fbbb857d 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -172,7 +172,6 @@ static void test_NtGetTickCount(void) { diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; diff = pNtGetTickCount() - diff; - todo_wine ok(diff < 100, "NtGetTickCount - TickCountQuad too high, expected < 100 got %d\n", diff); Sleep(50); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 621aaddfe34..f52cc2599b1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -46,10 +46,12 @@ #include "wine/server.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wine/usd.h" #include "ddk/wdm.h" #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); +WINE_DECLARE_DEBUG_CHANNEL(wineusd); #ifndef PTHREAD_STACK_MIN #define PTHREAD_STACK_MIN 16384 @@ -212,6 +214,38 @@ static void set_process_name( int argc, char *argv[] ) #endif /* HAVE_PRCTL */ } +void user_shared_data_init(void) +{ + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','W','i','n','e','U','s','d',0}; + struct _KUSER_SHARED_DATA data = *user_shared_data; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE device; + void *addr = user_shared_data; + SIZE_T size = 0; + + RtlInitUnicodeString( &string, device_nameW ); + attr.ObjectName = &string; + if ((status = NtCreateFile( &device, 0, &attr, &io, NULL, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ))) + { + WARN_(wineusd)( "Failed to open user shared data device, status: %x.\n", status ); + return; + } + + NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + + if ((status = NtDeviceIoControlFile( device, NULL, NULL, NULL, &io, + IOCTL_WINEUSD_INITIALIZE, + &data, sizeof(data), NULL, 0 ))) + { + MESSAGE( "wine: failed to map the shared user data: %08x\n", status ); + exit(1); + } +} /*********************************************************************** * thread_init -- 2.24.0

Dec. 2, 2019

[PATCH v2 2/3] wineusd.sys: Add new service to update user shared data continuously.

by Rémi Bernon

This service is started at boot, and hopefully before any process that might rely on the timestamp update. If the service is not yet started, then the opening the device will fail and the process should continue and use its private user shared data instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 1 + dlls/wineusd.sys/Makefile.in | 6 + dlls/wineusd.sys/wineusd.sys.spec | 1 + dlls/wineusd.sys/wineusd_main.c | 274 ++++++++++++++++++++++++++++++ include/wine/usd.h | 27 +++ loader/wine.inf.in | 12 ++ 6 files changed, 321 insertions(+) create mode 100644 dlls/wineusd.sys/Makefile.in create mode 100644 dlls/wineusd.sys/wineusd.sys.spec create mode 100644 dlls/wineusd.sys/wineusd_main.c create mode 100644 include/wine/usd.h diff --git a/configure.ac b/configure.ac index 64721e96449..b1463d69823 100644 --- a/configure.ac +++ b/configure.ac @@ -3793,6 +3793,7 @@ WINE_CONFIG_MAKEFILE(dlls/wineps.drv) WINE_CONFIG_MAKEFILE(dlls/wineps16.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winepulse.drv) WINE_CONFIG_MAKEFILE(dlls/wineqtdecoder) +WINE_CONFIG_MAKEFILE(dlls/wineusd.sys) WINE_CONFIG_MAKEFILE(dlls/winevulkan) WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) diff --git a/dlls/wineusd.sys/Makefile.in b/dlls/wineusd.sys/Makefile.in new file mode 100644 index 00000000000..0792860c09b --- /dev/null +++ b/dlls/wineusd.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wineusd.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin + +C_SRCS = \ + wineusd_main.c diff --git a/dlls/wineusd.sys/wineusd.sys.spec b/dlls/wineusd.sys/wineusd.sys.spec new file mode 100644 index 00000000000..76421d7e35b --- /dev/null +++ b/dlls/wineusd.sys/wineusd.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/dlls/wineusd.sys/wineusd_main.c b/dlls/wineusd.sys/wineusd_main.c new file mode 100644 index 00000000000..f4f1132e24c --- /dev/null +++ b/dlls/wineusd.sys/wineusd_main.c @@ -0,0 +1,274 @@ +/* + * User shared data update service + * + * Copyright 2019 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/usd.h" +#include "wine/list.h" + +static DEVICE_OBJECT *device_obj; + +WINE_DEFAULT_DEBUG_CHANNEL(wineusd); + +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + +DECLARE_CRITICAL_SECTION(wineusd_cs); + +static struct list wineusd_entries = LIST_INIT(wineusd_entries); +static HANDLE wineusd_thread, wineusd_thread_stop; + +struct wineusd_entry +{ + struct list link; + CLIENT_ID cid; + HANDLE process; + HANDLE section; + void *page; +}; + +static DWORD WINAPI wineusd_thread_proc(void *arg) +{ + struct wineusd_entry *entry; + ULARGE_INTEGER interrupt; + ULARGE_INTEGER tick; + LARGE_INTEGER now; + + TRACE("Started user shared data thread.\n"); + + while (WaitForSingleObject(wineusd_thread_stop, 16) == WAIT_TIMEOUT) + { + EnterCriticalSection(&wineusd_cs); + + NtQuerySystemTime(&now); + RtlQueryUnbiasedInterruptTime(&interrupt.QuadPart); + + tick = interrupt; + tick.QuadPart /= 10000; + + LIST_FOR_EACH_ENTRY(entry, &wineusd_entries, struct wineusd_entry, link) + { + KSHARED_USER_DATA *usd = entry->page; + + usd->SystemTime.High2Time = now.u.HighPart; + usd->SystemTime.LowPart = now.u.LowPart; + usd->SystemTime.High1Time = now.u.HighPart; + + usd->InterruptTime.High2Time = interrupt.HighPart; + usd->InterruptTime.LowPart = interrupt.LowPart; + usd->InterruptTime.High1Time = interrupt.HighPart; + + usd->TickCount.High2Time = tick.HighPart; + usd->TickCount.LowPart = tick.LowPart; + usd->TickCount.High1Time = tick.HighPart; + usd->TickCountLowDeprecated = tick.LowPart; + usd->TickCountMultiplier = 1 << 24; + } + + LeaveCriticalSection(&wineusd_cs); + } + + TRACE("Stopped user shared data thread.\n"); + + return 0; +} + +static NTSTATUS wineusd_initialize(struct wineusd_entry *entry, IRP *irp) +{ + const KSHARED_USER_DATA *init = irp->AssociatedIrp.SystemBuffer; + void *user_shared_data_address = (void *)0x7ffe0000; + NTSTATUS status = STATUS_SUCCESS; + LARGE_INTEGER section_size; + SIZE_T view_size; + + entry->cid.UniqueProcess = PsGetCurrentProcessId(); + entry->cid.UniqueThread = (HANDLE)0; + if ((status = NtOpenProcess(&entry->process, PROCESS_VM_OPERATION, NULL, &entry->cid))) + { + ERR("Failed to open target process, status: %x.\n", status); + return status; + } + + section_size.HighPart = 0; + section_size.LowPart = 0x10000; + if ((status = NtCreateSection(&entry->section, SECTION_ALL_ACCESS, NULL, &section_size, + PAGE_READWRITE, SEC_COMMIT, NULL))) + { + ERR("Failed to create section, status: %x.\n", status); + return status; + } + + view_size = 0; + if ((status = NtMapViewOfSection(entry->section, NtCurrentProcess(), &entry->page, 0, 0, 0, + &view_size, ViewShare, 0, PAGE_READWRITE))) + { + ERR("Failed to map section to driver memory, status: %x.\n", status); + return status; + } + memcpy(entry->page, init, sizeof(*init)); + + view_size = 0; + if ((status = NtMapViewOfSection(entry->section, entry->process, &user_shared_data_address, 0, 0, 0, + &view_size, ViewShare, 0, PAGE_READONLY))) + { + ERR("Failed to map user shared data to target process, status: %x.\n", status); + return status; + } + + EnterCriticalSection(&wineusd_cs); + list_add_head(&wineusd_entries, &entry->link); + LeaveCriticalSection(&wineusd_cs); + + TRACE("Initialized user shared data for process %04x.\n", HandleToULong(PsGetCurrentProcessId())); + + return STATUS_SUCCESS; +} + +static void wineusd_close(struct wineusd_entry *entry) +{ + void *user_shared_data_address = (void *)0x7ffe0000; + + TRACE("Closing user shared data for process %04x.\n", HandleToULong(entry->cid.UniqueProcess)); + + EnterCriticalSection(&wineusd_cs); + list_remove(&entry->link); + LeaveCriticalSection(&wineusd_cs); + + NtUnmapViewOfSection(entry->process, user_shared_data_address); + NtUnmapViewOfSection(NtCurrentProcess(), entry->page); + + NtClose(entry->section); + NtClose(entry->process); + heap_free(entry); +} + +static NTSTATUS WINAPI wineusd_dispatch_create(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct wineusd_entry *entry; + NTSTATUS status; + + status = STATUS_NO_MEMORY; + if (!(entry = heap_alloc_zero(sizeof(*entry)))) + { + ERR("Failed to allocate memory.\n"); + goto done; + } + stack->FileObject->FsContext = entry; + + list_init(&entry->link); + entry->process = INVALID_HANDLE_VALUE; + entry->section = INVALID_HANDLE_VALUE; + entry->page = NULL; + + TRACE("Created user shared data for process %04x.\n", HandleToULong(PsGetCurrentProcessId())); + +done: + irp->IoStatus.Status = status; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return status; +} + +static NTSTATUS WINAPI wineusd_dispatch_close(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct wineusd_entry *entry = stack->FileObject->FsContext; + + if (entry) wineusd_close(entry); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI wineusd_dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct wineusd_entry *entry = stack->FileObject->FsContext; + NTSTATUS ret; + + switch (stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_WINEUSD_INITIALIZE: + ret = wineusd_initialize(entry, irp); + break; + default: + FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + ret = STATUS_NOT_IMPLEMENTED; + break; + } + + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + +static void WINAPI wineusd_unload(DRIVER_OBJECT *driver) +{ + struct wineusd_entry *entry, *cursor; + + SetEvent(wineusd_thread_stop); + WaitForSingleObject(wineusd_thread, INFINITE); + CloseHandle(wineusd_thread); + CloseHandle(wineusd_thread_stop); + + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &wineusd_entries, struct wineusd_entry, link) + wineusd_close(entry); + + IoDeleteDevice(device_obj); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','W','i','n','e','U','s','d',0}; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + NTSTATUS ret; + + TRACE("Driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + RtlInitUnicodeString(&string, device_nameW); + if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + { + ERR("Failed to create user shared data device, status %#x.\n", ret); + return ret; + } + + driver->MajorFunction[IRP_MJ_CREATE] = wineusd_dispatch_create; + driver->MajorFunction[IRP_MJ_CLOSE] = wineusd_dispatch_close; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = wineusd_dispatch_ioctl; + driver->DriverUnload = wineusd_unload; + + wineusd_thread_stop = CreateEventW(NULL, FALSE, FALSE, NULL); + wineusd_thread = CreateThread(NULL, 0, wineusd_thread_proc, NULL, 0, NULL); + + return STATUS_SUCCESS; +} diff --git a/include/wine/usd.h b/include/wine/usd.h new file mode 100644 index 00000000000..e92efa5e29e --- /dev/null +++ b/include/wine/usd.h @@ -0,0 +1,27 @@ +/* + * Copyright 2019 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_USD_H +#define __WINE_WINE_USD_H + +#include <windef.h> +#include <winioctl.h> + +#define IOCTL_WINEUSD_INITIALIZE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#endif /* __WINE_WINE_USD_H */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0f6e0a3917..4c95c4e7fe2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -161,6 +161,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineUsd,0,WineUsdService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -178,6 +179,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineUsd,0,WineUsdService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -195,6 +197,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineUsd,0,WineUsdService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -213,6 +216,7 @@ AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService +AddService=WineUsd,0,WineUsdService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -3641,6 +3645,14 @@ ServiceType=32 StartType=3 ErrorControl=1 +[WineUsdService] +Description="User shared data update service" +DisplayName="Wine User Shared Data" +ServiceBinary="%12%\WineUsd.sys" +ServiceType=1 +StartType=0 +ErrorControl=1 + [WinmgmtService] Description="Provides access to Windows Management Instrumentation" DisplayName="Windows Management Instrumentation Service" -- 2.24.0

Dec. 2, 2019

[PATCH v2 1/3] ntdll/tests: Test updating TickCount in user_shared_data.

by Rémi Bernon

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d..be6859fe3e1 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static ULONG (WINAPI *pNtGetTickCount)(void); static const int MonthLengths[2][12] = { @@ -153,12 +156,35 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static void test_NtGetTickCount(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + LONG diff; + int i; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount is not available\n"); + return; + } + + for (i = 0; i < 5; ++i) + { + diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; + diff = pNtGetTickCount() - diff; + todo_wine + ok(diff < 100, "NtGetTickCount - TickCountQuad too high, expected < 100 got %d\n", diff); + Sleep(50); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount"); pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = @@ -169,5 +195,6 @@ START_TEST(time) else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_NtGetTickCount(); test_RtlQueryTimeZoneInformation(); } -- 2.24.0

Dec. 2, 2019

[PATCH v2 0/3] Update USER_SHARED_DATA timestamps continuously.

by Rémi Bernon

This is an alternate solution to avoid creating shared memory and thread in the server. A new service is introduced and started as early as possible. It will setup read-only shared memory for other processes when they request it through an ioctl, initializing the pages with the provided data, and then update the timestamps there on a regular basis. If the service is not yet started - which can happen for the initial processes and other services, then the process uses the current user shared data implementation, where no timestamp update is done. Andrew Wesie (1): ntdll/tests: Test updating TickCount in user_shared_data. Rémi Bernon (2): wineusd.sys: Add new service to update user shared data continuously. ntdll: Use the new WineUsd service to map user shared data. configure.ac | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 2 + dlls/ntdll/tests/time.c | 26 +++ dlls/ntdll/thread.c | 34 ++++ dlls/wineusd.sys/Makefile.in | 6 + dlls/wineusd.sys/wineusd.sys.spec | 1 + dlls/wineusd.sys/wineusd_main.c | 274 ++++++++++++++++++++++++++++++ include/wine/usd.h | 27 +++ loader/wine.inf.in | 12 ++ 10 files changed, 384 insertions(+) create mode 100644 dlls/wineusd.sys/Makefile.in create mode 100644 dlls/wineusd.sys/wineusd.sys.spec create mode 100644 dlls/wineusd.sys/wineusd_main.c create mode 100644 include/wine/usd.h -- 2.24.0

Dec. 2, 2019

[PATCH v2 2/2] ddraw/tests: Add test for stretching compressed format surfaces.

by Paul Gofman

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - no changes. dlls/ddraw/tests/ddraw7.c | 220 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c3d575d31a..96a895630d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16901,6 +16901,225 @@ static void test_surface_format_conversion_alpha(void) DestroyWindow(window); } +static void test_compressed_surface_stretch(void) +{ + static const struct + { + unsigned int src_width, src_height; + unsigned int dst_width, dst_height; + unsigned int src_x, src_y; + unsigned int dst_x, dst_y; + BOOL todo_src, todo_dst; + } + test_sizes[] = + { + {4, 4, 8, 8}, + {8, 8, 4, 4}, + {4, 4, 2, 2, 0, 0, 0, 0, FALSE, TRUE}, + {4, 4, 6, 6, 0, 0, 0, 0, FALSE, TRUE}, + {4, 4, 8, 8, 2, 2, 2, 2, TRUE, TRUE}, + }; + + static const struct + { + DWORD src_caps, dst_caps; + } + test_caps[] = + { +#if 0 + /* Broken on Windows. */ + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY}, +#endif + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY}, + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY}, + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY}, + }; + + static struct + { + DDPIXELFORMAT fmt; + const char *name; + DWORD support_flag; + } + test_formats[] = + { + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} + }, + "R5G5B5A1", + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT1", SUPPORT_DXT1, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT3", SUPPORT_DXT3, + }, + }; + + unsigned int i, j, k, l, x, y, pitch; + DDSURFACEDESC2 rb_surface_desc, src_surface_desc, dst_surface_desc, lock; + IDirectDrawSurface7 *src_surf, *dst_surf, *rb_surf; + IDirect3DDevice7 *device; + RECT src_rect, dst_rect; + DWORD supported_fmts; + unsigned short *data; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + BOOL passed; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_EnumTextureFormats(device, test_block_formats_creation_cb, + &supported_fmts); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&src_surface_desc, 0, sizeof(src_surface_desc)); + src_surface_desc.dwSize = sizeof(src_surface_desc); + src_surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + dst_surface_desc = src_surface_desc; + + memset(&rb_surface_desc, 0, sizeof(rb_surface_desc)); + rb_surface_desc.dwSize = sizeof(rb_surface_desc); + rb_surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + U4(rb_surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(rb_surface_desc).ddpfPixelFormat); + U4(rb_surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; + U1(U4(rb_surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(rb_surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(rb_surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(rb_surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; + U5(U4(rb_surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0x00008000; + rb_surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + + for (i = 0; i < ARRAY_SIZE(test_caps); ++i) + { + src_surface_desc.ddsCaps.dwCaps = test_caps[i].src_caps; + dst_surface_desc.ddsCaps.dwCaps = test_caps[i].dst_caps; + + for (j = 0; j < ARRAY_SIZE(test_sizes); ++j) + { + SetRect(&src_rect, test_sizes[j].src_x, test_sizes[j].src_y, + test_sizes[j].src_width, test_sizes[j].src_height); + SetRect(&dst_rect, test_sizes[j].dst_x, test_sizes[j].dst_y, + test_sizes[j].dst_width, test_sizes[j].dst_height); + + src_surface_desc.dwWidth = test_sizes[j].src_width; + src_surface_desc.dwHeight = test_sizes[j].src_height; + + dst_surface_desc.dwWidth = (test_sizes[j].dst_width + 3) & ~3; + dst_surface_desc.dwHeight = (test_sizes[j].dst_height + 3) & ~3; + + rb_surface_desc.dwWidth = max(src_surface_desc.dwWidth, dst_surface_desc.dwWidth); + rb_surface_desc.dwHeight = max(src_surface_desc.dwHeight, dst_surface_desc.dwHeight); + + hr = IDirectDraw7_CreateSurface(ddraw, &rb_surface_desc, &rb_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u), got unexpected hr %#x.\n", i, j, hr); + + for (k = 0; k < ARRAY_SIZE(test_formats); ++k) + { + U4(src_surface_desc).ddpfPixelFormat = test_formats[k].fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &src_surface_desc, &src_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + U5(fx).dwFillColor = 0x801f; + hr = IDirectDrawSurface7_Blt(rb_surf, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(src_surf, &src_rect, rb_surf, &src_rect, DDBLT_WAIT, NULL); + + todo_wine_if(test_formats[k].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_src) + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + if (FAILED(hr)) + { + IDirectDrawSurface7_Release(src_surf); + continue; + } + + for (l = 0; l < ARRAY_SIZE(test_formats); ++l) + { + if (~supported_fmts & test_formats[l].support_flag) + { + skip("%s format is not supported, skipping test %u.\n", test_formats[l].name, i); + continue; + } + + U4(dst_surface_desc).ddpfPixelFormat = test_formats[l].fmt; + + hr = IDirectDraw7_CreateSurface(ddraw, &dst_surface_desc, &dst_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(dst_surf, &dst_rect, src_surf, &src_rect, DDBLT_WAIT, NULL); + todo_wine_if(test_formats[l].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_dst) + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + if (FAILED(hr)) + { + IDirectDrawSurface7_Release(dst_surf); + continue; + } + + U5(fx).dwFillColor = 0xffffffff; + hr = IDirectDrawSurface7_Blt(rb_surf, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(rb_surf, &dst_rect, dst_surf, &dst_rect, DDBLT_WAIT, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + hr = IDirectDrawSurface7_Lock(rb_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + + passed = TRUE; + for (y = dst_rect.top; y < dst_rect.bottom && passed; ++y) + { + data = (unsigned short *)((BYTE *)lock.lpSurface + y * pitch); + + for (x = dst_rect.left; x < dst_rect.right && passed; ++x) + { + passed = data[x] == 0x801f; + ok(passed, "Test (%u, %u, %u, %u), x %u, y %u, " + "got unexpected colour 0x%04x.\n", i, j, k, l, x, y, data[x]); + } + } + hr = IDirectDrawSurface7_Unlock(rb_surf, NULL); + IDirectDrawSurface7_Release(dst_surf); + } + IDirectDrawSurface7_Release(src_surf); + } + IDirectDrawSurface7_Release(rb_surf); + } + } + + IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17050,4 +17269,5 @@ START_TEST(ddraw7) test_caps(); test_d32_support(); test_surface_format_conversion_alpha(); + test_compressed_surface_stretch(); } -- 2.23.0

Dec. 2, 2019

[PATCH v2 1/2] wined3d: Support stretching compressed format surfaces in surface_cpu_blt().

by Paul Gofman

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - check for success before uploading. dlls/wined3d/surface.c | 82 +++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c8d9eaf1c..9acfeea57c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1653,6 +1653,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int unsigned int texture_level; HRESULT hr = WINED3D_OK; BOOL same_sub_resource; + BOOL upload = FALSE; DWORD map_binding; const BYTE *sbase; const BYTE *sbuf; @@ -1673,6 +1674,11 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int if (wined3d_format_is_typeless(dst_format) && dst_format->id == src_format->typeless_id) dst_format = src_format; + src_height = src_box->bottom - src_box->top; + src_width = src_box->right - src_box->left; + dst_height = dst_box->bottom - dst_box->top; + dst_width = dst_box->right - dst_box->left; + dst_range.offset = 0; dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) @@ -1694,6 +1700,15 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int else { same_sub_resource = FALSE; + upload = dst_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + && (dst_width != src_width || dst_height != src_height); + + if (upload) + { + dst_format = src_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + ? wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, 0) : src_format; + } + if (!(flags & WINED3D_BLT_RAW) && dst_format->id != src_format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) @@ -1717,25 +1732,31 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_map.data = wined3d_context_map_bo_address(context, &src_data, src_texture->sub_resources[src_sub_resource_idx].size, 0, WINED3D_MAP_READ); - map_binding = dst_texture->resource.map_binding; - texture_level = dst_sub_resource_idx % dst_texture->level_count; - if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) - ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); - wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); - dst_map.data = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + if (upload) + { + wined3d_format_calculate_pitch(dst_format, 1, dst_box->right, dst_box->bottom, + &dst_map.row_pitch, &dst_map.slice_pitch); + dst_map.data = heap_alloc(dst_map.slice_pitch); + } + else + { + map_binding = dst_texture->resource.map_binding; + texture_level = dst_sub_resource_idx % dst_texture->level_count; + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + dst_map.data = wined3d_context_map_bo_address(context, &dst_data, + dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + } } src_fmt_flags = src_format->flags[src_texture->resource.gl_type]; dst_fmt_flags = dst_format->flags[dst_texture->resource.gl_type]; flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; - src_height = src_box->bottom - src_box->top; - src_width = src_box->right - src_box->left; - dst_height = dst_box->bottom - dst_box->top; - dst_width = dst_box->right - dst_box->left; row_byte_count = dst_width * bpp; sbase = (BYTE *)src_map.data @@ -1756,13 +1777,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - if (src_height != dst_height || src_width != dst_width) - { - WARN("Stretching not supported on compressed surfaces.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dst_width, dst_height, src_format, flags, fx); @@ -2103,7 +2117,33 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + if (upload && hr == WINED3D_OK) + { + struct wined3d_bo_address data; + + data.buffer_object = 0; + data.addr = dst_map.data; + + texture_level = dst_sub_resource_idx % dst_texture->level_count; + + wined3d_texture_prepare_location(dst_texture, texture_level, context, WINED3D_LOCATION_TEXTURE_RGB); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), dst_format, + dst_box, dst_map.row_pitch, dst_map.slice_pitch, dst_texture, texture_level, + WINED3D_LOCATION_TEXTURE_RGB, dst_box->left, dst_box->top, 0); + + wined3d_texture_validate_location(dst_texture, texture_level, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, texture_level, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + if (upload) + { + heap_free(dst_map.data); + } + else + { + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + } + if (!same_sub_resource) wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) -- 2.23.0

Dec. 2, 2019

[PATCH] kernelbase/tests: Fix a typo in ok() message.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index abe586b0a2..93303bafc3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -797,7 +797,7 @@ static void test_PathCchAddBackslashEx(void) } else { - ok(ptrW == NULL, "%u: unexpecred end pointer.\n", i); + ok(ptrW == NULL, "%u: unexpected end pointer.\n", i); ok(remaining == 0, "%u: unexpected remaining buffer length.\n", i); } } -- 2.23.0

Dec. 2, 2019

[PATCH] ieframe/tests: Fix a typo in ok() message.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index db47fdf616..a99c68ac5e 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -283,7 +283,7 @@ static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL ex hres = IWebBrowser2_get_Busy(wb, &busy); if(expect_busy != BUSY_FAIL) { ok_(__FILE__,line)(hres == S_OK, "get_ReadyState failed: %08x\n", hres); - ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, exoected %x for ready state %d\n", + ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, expected %x for ready state %d\n", busy, expect_busy, state); }else { todo_wine -- 2.23.0

Dec. 2, 2019

[PATCH] sapiaut.idl: Fix a typo.

by Andrey Gusev

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 4ae4ebe231..99932e49cb 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1784,7 +1784,7 @@ interface ISpeechRecoGrammar : IDispatch HRESULT CmdLoadFromObject([in]const BSTR classid, [in] const BSTR grammarname, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromResource)] - HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT yype, [in] SpeechLanguageId language, + HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT type, [in] SpeechLanguageId language, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromMemory)] -- 2.23.0

Dec. 2, 2019

Re: [PATCH 1/2] wined3d: Support stretching compressed format surfaces in surface_cpu_blt().

by Henri Verbeet

On Fri, 29 Nov 2019 at 17:58, Paul Gofman <gofmanp(a)gmail.com> wrote: > release: > - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); > + if (upload) > + { > + struct wined3d_bo_address data; > + > + data.buffer_object = 0; > + data.addr = dst_map.data; > + > + texture_level = dst_sub_resource_idx % dst_texture->level_count; > + > + wined3d_texture_prepare_location(dst_texture, texture_level, context, WINED3D_LOCATION_TEXTURE_RGB); > + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), dst_format, > + dst_box, dst_map.row_pitch, dst_map.slice_pitch, dst_texture, texture_level, > + WINED3D_LOCATION_TEXTURE_RGB, dst_box->left, dst_box->top, 0); > + > + wined3d_texture_validate_location(dst_texture, texture_level, WINED3D_LOCATION_TEXTURE_RGB); > + wined3d_texture_invalidate_location(dst_texture, texture_level, ~WINED3D_LOCATION_TEXTURE_RGB); > + > + heap_free(dst_map.data); > + } > + else > + { > + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); > + } > + > It probably works out in practice because we only jump to "release:" from error paths when "upload" is FALSE, but it doesn't seem right to depend on that. I.e., we should probably explicitly check for success before uploading here.

Dec. 2, 2019

Re: [PATCH v3 2/2] wined3d: Introduce wined3d_stateblock_get_state().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 2, 2019

Re: [PATCH v3 1/2] wined3d: Move the wined3d_light_state structure to the wined3d_stateblock structure.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 2, 2019

Re: [PATCH v2 6/6] wined3d: Store the blend factor in the stateblock as a render state.

by Henri Verbeet

On Thu, 28 Nov 2019 at 09:24, Zebediah Figura <z.figura12(a)gmail.com> wrote: > @@ -1921,11 +1904,6 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d > > init_default_sampler_states(state->sampler_states); > > - state->blend_factor.r = 1.0f; > - state->blend_factor.g = 1.0f; > - state->blend_factor.b = 1.0f; > - state->blend_factor.a = 1.0f; > - This one should stay, right?

Dec. 2, 2019

Re: [PATCH] wined3d: Add Intel HD 615 PCI id and device description.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 2, 2019