November 2018 - Wine-devel - list.winehq.org

[PATCH resend 1/2] comctl32/listbox: Fix InitStorage heap extension
by Gabriel Ivăncescu 05 Nov '18

05 Nov '18

Only increase the item array if we actually have to. Previously, sending for example just 1 to nb_items repeatedly would always increase the array by LB_ARRAY_GRANULARITY, even if there was plenty of space. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Assume LB_ARRAY_GRANULARITY is a power of 2 and note it in the comments. This simplifies the code (and it's already the case anyway). dlls/comctl32/listbox.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..5c171ab 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity; must be a power of 2 */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -673,16 +673,18 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, n * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapAlloc(GetProcessHeap(), 0, n * sizeof(*item)); } if (!item) -- 2.19.1

2 3

[PATCH] ntdll: Add WinSqmIncrementDWORD stub.
by Andrey Gusev 05 Nov '18

05 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45828 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/misc.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f2c0e1494d..bb75d9cc70 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -341,6 +341,14 @@ NTSTATUS WINAPI WinSqmEndSession(HANDLE session) return STATUS_NOT_IMPLEMENTED; } +/********************************************************************* + * WinSqmIncrementDWORD (NTDLL.@) + */ +void WINAPI WinSqmIncrementDWORD(DWORD unk1, DWORD unk2, DWORD unk3) +{ + FIXME("(%d, %d, %d): stub\n", unk1, unk2, unk3); +} + /********************************************************************* * WinSqmIsOptedIn (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87b5d7078f..3486a78fe3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,6 +1039,7 @@ @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmEndSession(long) +@ stdcall WinSqmIncrementDWORD(long long long) @ stdcall WinSqmIsOptedIn() @ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long) -- 2.17.2

1 0

[PATCH 1/2] dwrite/tests: Add a test for text format with unknown font family name.
by Nikolay Sivov 05 Nov '18

05 Nov '18

From: Lucian Poston <lucianposton(a)pm.me> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 188 ++++++++++++++++++++++--------------- 1 file changed, 111 insertions(+), 77 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77a0ea51b..e6ed3c13c4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2677,83 +2677,6 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteFactory_Release(factory); } -static void test_fallback(void) -{ - static const WCHAR strW[] = {'a','b','c','d',0}; - IDWriteFontFallback *fallback, *fallback2; - IDWriteTextLayout2 *layout2; - IDWriteTextFormat1 *format1; - IDWriteTextFormat *format; - IDWriteTextLayout *layout; - IDWriteFactory2 *factory2; - IDWriteFactory *factory; - HRESULT hr; - - factory = create_factory(); - - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteTextFormat_Release(format); - - hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); - IDWriteTextLayout_Release(layout); - - if (hr != S_OK) { - win_skip("GetFontFallback() is not supported.\n"); - IDWriteFactory_Release(factory); - return; - } - - if (0) /* crashes on native */ - hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = NULL; - hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback != NULL, "got %p\n", fallback); - - hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == fallback, "got %p\n", fallback2); - - hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == NULL, "got %p\n", fallback2); - - IDWriteFontFallback_Release(fallback); - IDWriteTextFormat1_Release(format1); - IDWriteTextLayout2_Release(layout2); - IDWriteFactory_Release(factory); -} - static void test_DetermineMinWidth(void) { struct minwidth_test { @@ -4939,6 +4862,117 @@ todo_wine { ok(ref == 0, "Factory is not released, ref %u.\n", ref); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback, *fallback2; + DWRITE_CLUSTER_METRICS clusters[4]; + DWRITE_TEXT_METRICS metrics; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + UINT32 count, i; + FLOAT width; + HRESULT hr; + + factory = create_factory(); + + /* Font does not exist in system collection. */ + hr = IDWriteFactory_CreateTextFormat(factory, g_blahfontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine { + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 4, "Unexpected count %u.\n", count); +} + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); +todo_wine { + ok(metrics.width > 0.0 && metrics.width == width, "Unexpected width %.2f, expected %.2f.\n", metrics.width, width); + ok(metrics.height > 0.0, "Unexpected height %.2f.\n", metrics.height); + ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); +} + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Existing font. */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + IDWriteFactory_Release(factory); + return; + } + + if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = NULL; + hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback != NULL, "got %p\n", fallback); + + hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == fallback, "got %p\n", fallback2); + + hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == NULL, "got %p\n", fallback2); + + IDWriteFontFallback_Release(fallback); + IDWriteTextFormat1_Release(format1); + IDWriteTextLayout2_Release(layout2); + IDWriteFactory_Release(factory); +} + + static void test_SetTypography(void) { static const WCHAR strW[] = {'a','f','i','b',0}; -- 2.19.1

1 1

[PATCH v2] api-ms-win-core-processthreads-l1-1-3: Add dll.
by Andrey Gusev 05 Nov '18

05 Nov '18

v2: Sort functions alphabetically. Spotted by Gijs Vermeulen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46086 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-3.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec diff --git a/configure b/configure index 5bf21e4ef7..9787693013 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 +enable_api_ms_win_core_processthreads_l1_1_3 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 @@ -19084,6 +19085,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-processenvironment-l1-2-0 enable_ap wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-3 enable_api_ms_win_core_processthreads_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-processtopology-obsolete-l1-1-0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 878fa4c0fd..39a2310c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -2935,6 +2935,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in new file mode 100644 index 0000000000..520db5c2f8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-3.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec new file mode 100644 index 0000000000..3b57e1c898 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -0,0 +1,10 @@ +@ stub GetProcessDefaultCpuSets +@ stub GetProcessInformation +@ stub GetSystemCpuSetInformation +@ stub GetThreadDescription +@ stub GetThreadSelectedCpuSets +@ stub SetProcessDefaultCpuSets +@ stub SetProcessInformation +@ stub SetThreadDescription +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stub SetThreadSelectedCpuSets diff --git a/tools/make_specfiles b/tools/make_specfiles index 545d436308..aa5aad6076 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -302,6 +302,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-processthreads-l1-1-3", ], [ "kernel32", -- 2.17.2

1 0

[PATCH 5/5] wined3d: Get rid of WINED3DUSAGE_RENDERTARGET.
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 2 -- dlls/ddraw/surface.c | 1 - dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/resource.c | 3 +-- dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c7c682ba6c8..2a1a8c699e5 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -450,8 +450,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_SHADER_RESOURCE) wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & D3D11_BIND_RENDER_TARGET) - wined3d_usage |= WINED3DUSAGE_RENDERTARGET; if (bind_flags & D3D11_BIND_DEPTH_STENCIL) wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5ce1d85b3ed..6bb92d5d399 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6181,7 +6181,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) { - wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; } } diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 26f248800fa..9b57b46d1c7 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -190,8 +190,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac surface_desc.usage = 0; if (surface_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) surface_desc.usage |= WINED3DUSAGE_TEXTURE; - if (surface_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a03465f8077..a79e9247267 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,13 +1541,11 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_RENDERTARGET) - bind_flags |= WINED3D_BIND_RENDER_TARGET; if (usage & WINED3DUSAGE_DEPTHSTENCIL) bind_flags |= WINED3D_BIND_DEPTH_STENCIL; if (usage & WINED3DUSAGE_TEXTURE) bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~(WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); switch (resource_type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ff584567975..58caccc7305 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_RENDERTARGET - | WINED3DUSAGE_DEPTHSTENCIL + static const DWORD handled = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ab1594f063..36e7b2e8318 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -921,8 +921,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; - if (texture_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - texture_desc.usage |= WINED3DUSAGE_RENDERTARGET; if (texture_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) texture_desc.usage |= WINED3DUSAGE_TEXTURE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 73e8cf25f78..a7b1b10f9ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4511,7 +4511,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3575f7e02ca..fd907578c2d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_RENDERTARGET 0x00000001 #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 @@ -928,7 +927,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bff +#define WINED3DUSAGE_MASK 0x10007bfa #define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000 -- 2.11.0

1 0

[PATCH 4/5] d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e5135496453..1e7c0ea0f45 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } - if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + if ((desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_SHADER_RESOURCE)) == WINED3D_BIND_SHADER_RESOURCE) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } - if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n"); -- 2.11.0

1 0

[PATCH 3/5] d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f5a4352ce..e5135496453 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1668,13 +1668,13 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (dst->texture && !(dst_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) { WARN("Destination is a regular texture.\n"); goto done; } - if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (src_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { if (device->in_scene) { -- 2.11.0

1 0

[PATCH 2/5] d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 27b32faa445..b05df7e2914 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); wined3d_mutex_unlock(); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_h = wined3d_desc.height; wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface); wined3d_mutex_unlock(); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5515b27b069..1af76f235c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4461,9 +4461,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (view && !(view->resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (view && !(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { - WARN("View resource %p doesn't have render target usage.\n", view->resource); + WARN("View resource %p doesn't have render target bind flags.\n", view->resource); return WINED3DERR_INVALIDCALL; } -- 2.11.0

1 0

[PATCH] kernel32/tests: Add more directory change notification tests.
by Dmitry Timoshkov 05 Nov '18

05 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/change.c | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index f4abad48c5..3c8084de64 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -254,11 +254,12 @@ static void test_FindFirstChangeNotification(void) static void test_ffcn(void) { DWORD filter; - HANDLE handle; + HANDLE handle, file; LONG r; - WCHAR path[MAX_PATH], subdir[MAX_PATH]; + WCHAR path[MAX_PATH], subdir[MAX_PATH], filename[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + static const WCHAR szZoo[] = { '\\','z','o','o',0 }; SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); @@ -275,6 +276,9 @@ static void test_ffcn(void) lstrcpyW( subdir, path ); lstrcatW( subdir, szHoo ); + lstrcpyW( filename, path ); + lstrcatW( filename, szZoo ); + RemoveDirectoryW( subdir ); RemoveDirectoryW( path ); @@ -290,6 +294,38 @@ static void test_ffcn(void) r = WaitForSingleObject( handle, 0 ); ok( r == STATUS_TIMEOUT, "should time out\n"); + file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + CloseHandle(file); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = DeleteFileW( filename ); + ok( r == TRUE, "failed to remove file\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n"); -- 2.17.1

2 1