- wine-devel - winehq.org

[PATCH] winex11: Don't unmap the clip window more than once
by Myah Caron 18 Mar '20

18 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48772 Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/winex11.drv/mouse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f0edd9be6..28c4296784 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -129,6 +129,7 @@ static RECT last_clip_rect; static HWND last_clip_foreground_window; static BOOL last_clip_refused; static RECT clip_rect; +static BOOL clip_window_mapped = FALSE; static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H @@ -426,6 +427,7 @@ static BOOL grab_clipping_window( const RECT *clip ) XMoveResizeWindow( data->display, clip_window, pos.x, pos.y, max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); + clip_window_mapped = TRUE; /* if the rectangle is shrinking we may get a pointer warp */ if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || @@ -464,7 +466,8 @@ void ungrab_clipping_window(void) if (!clip_window) return; TRACE( "no longer clipping\n" ); - XUnmapWindow( display, clip_window ); + if (clip_window_mapped) XUnmapWindow( display, clip_window ); + clip_window_mapped = FALSE; if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); -- 2.25.1

2 1

[PATCH 1/4] ctype.h: Add _to[w]lower_l and _to[w]upper_l declarations.
by Jacek Caban 18 Mar '20

18 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wctype.h | 2 ++ include/msvcrt/ctype.h | 2 ++ 2 files changed, 4 insertions(+)

1 0

[PATCH v11 1/3] jscript: Use the proper variable_obj for bytecodes with named items.
by Gabriel Ivăncescu 18 Mar '20

18 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8914e76..59f3777 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3030,6 +3030,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi }else if(!(flags & (EXEC_GLOBAL | EXEC_EVAL))) { hres = create_dispex(ctx, NULL, NULL, &variable_obj); if(FAILED(hres)) return hres; + }else if(bytecode->named_item) { + variable_obj = jsdisp_addref(bytecode->named_item->script_obj); }else { variable_obj = jsdisp_addref(ctx->global); } -- 2.21.0

2 5

[PATCH v3 1/5] include/winnt: Add more ACTCTX_COMPATIBILITY_ELEMENT_TYPE definitions and fix typo.
by Gabriel Ivăncescu 18 Mar '20

18 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/actctx.c | 2 +- dlls/ntdll/actctx.c | 2 +- include/winnt.h | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 01c6c1e..2d942cd 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2851,7 +2851,7 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect wine_dbgstr_guid(&compat_info.Elements[n].Id), wine_dbgstr_guid(expected_compat[n]), n); - ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS, + ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); } } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index c513419..b88e6de 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2397,7 +2397,7 @@ static void parse_supportedos_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, set_error( xmlbuf ); return; } - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Type = ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS; compat->Id = compat_id; } else diff --git a/include/winnt.h b/include/winnt.h index 50a6213..7a5b8aa 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6294,8 +6294,10 @@ typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION { typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; typedef enum { - ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, - ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_MITIGATION, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_MAXVERSIONTESTED } ACTCTX_COMPATIBILITY_ELEMENT_TYPE; typedef struct _COMPATIBILITY_CONTEXT_ELEMENT { -- 2.21.0

1 4

[PATCH] ntdll/tests: Remove now useless forced 0x500 API versions.
by Serge Gautherie 18 Mar '20

18 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ntdll/tests/exception.c | 4 ---- dlls/ntdll/tests/ntdll_test.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4003b0a..249ba9d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -21,10 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION diff --git a/dlls/ntdll/tests/ntdll_test.h b/dlls/ntdll/tests/ntdll_test.h index a8066c5..d403a74 100644 --- a/dlls/ntdll/tests/ntdll_test.h +++ b/dlls/ntdll/tests/ntdll_test.h @@ -20,10 +20,6 @@ #include <stdarg.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -- 2.10.0.windows.1

2 2

[PATCH 1/5] wined3d: Optimize scanning for changed state in wined3d_stateblock_capture().
by Matteo Bruni 18 Mar '20

18 Mar '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/stateblock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index db0019adbf4..6d747f97311 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -852,9 +852,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamSource; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].stride != state->streams[i].stride || stateblock->stateblock_state.streams[i].offset != state->streams[i].offset @@ -877,9 +877,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamFreq; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].frequency != state->streams[i].frequency || stateblock->stateblock_state.streams[i].flags != state->streams[i].flags) @@ -893,9 +893,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.clipplane; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (memcmp(&stateblock->stateblock_state.clip_planes[i], &state->clip_planes[i], sizeof(state->clip_planes[i]))) { @@ -929,9 +929,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, /* Samplers */ map = stateblock->changed.textures; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); TRACE("Updating texture %u to %p (was %p).\n", i, state->textures[i], stateblock->stateblock_state.textures[i]); -- 2.24.1

2 9

[PATCH v2 4/4] d3d9/tests: Fix a test failure with Win10 WARP.
by Zhiyi Zhang 18 Mar '20

18 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 62146d6932..16f42216cf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9653,6 +9653,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER9 identifier; IDirect3DDevice9 *device; IDirect3D9 *d3d9; HWND window; @@ -9662,6 +9663,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS9 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -9710,6 +9712,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d9, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -9780,7 +9785,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); IDirect3DVolumeTexture9_Release(dst); -- 2.20.1

2 1

[PATCH v2 3/4] d3d8/tests: Fix a test failure with Win10 WARP.
by Zhiyi Zhang 18 Mar '20

18 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index dd1e479cb2..42eee28217 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6497,6 +6497,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device; IDirect3D8 *d3d8; HWND window; @@ -6506,6 +6507,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS8 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -6554,6 +6556,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d8, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6624,7 +6629,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); IDirect3DVolumeTexture8_Release(dst); -- 2.20.1

2 1

[PATCH v2 2/4] d3d9/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 18 Mar '20

18 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 314 ++++++++++++++++++++++++--------------- 1 file changed, 193 insertions(+), 121 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 49280ef869..62146d6932 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12576,8 +12576,44 @@ static void test_stretch_rect(void) DestroyWindow(window); } +#define test_device_caps_adapter_group(a, b, c) _test_device_caps_adapter_group(a, b, c, __LINE__) +static void _test_device_caps_adapter_group(const D3DCAPS9 *caps, unsigned int adapter_idx, + unsigned int adapter_count, int line) +{ + ok_(__FILE__, line)(caps->AdapterOrdinal == adapter_idx, + "Adapter %u: Got unexpected AdapterOrdinal %u.\n", adapter_idx, caps->AdapterOrdinal); + /* Single GPU */ + if (caps->NumberOfAdaptersInGroup == adapter_count) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == 0, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, 0, + caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == caps->AdapterOrdinal, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->AdapterOrdinalInGroup); + ok_(__FILE__, line)(caps->NumberOfAdaptersInGroup == + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + "Adapter %u: Expect NumberOfAdaptersInGroup %u, got %u.\n", adapter_idx, + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + caps->NumberOfAdaptersInGroup); + } + /* Multiple GPUs and each GPU has only one output */ + else if (caps->NumberOfAdaptersInGroup == 1) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == caps->AdapterOrdinal, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == 0, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, 0, + caps->AdapterOrdinalInGroup); + } + /* TODO: Test other multi-GPU setup */ +} + static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -12589,129 +12625,165 @@ static void test_device_caps(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D9_GetDeviceCaps */ + hr = IDirect3D9_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Adapter %u: GetDeviceCaps failed, hr %#x.\n", + adapter_idx, hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("Adapter %u: No Direct3D support, skipping test.\n", adapter_idx); + break; + } + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + + /* Test IDirect3DDevice9_GetDeviceCaps */ + device_desc.adapter_ordinal = adapter_idx; + device = create_device(d3d, window, &device_desc); + if (!device) + { + skip("Adapter %u: Failed to create a D3D device, skipping test.\n", adapter_idx); + break; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Adapter %u: Failed to get caps, hr %#x.\n", adapter_idx, hr); + + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), + "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP + | D3DCAPS2_CANSHARERESOURCE)), + "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD + | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM + | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED + | D3DCAPS3_RESERVED)), + "Adapter %u: Caps3 field has unexpected flags %#x.\n", adapter_idx, caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS + | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA + | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS + | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED + | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), + "Adapter %u: PrimitiveMiscCaps field has unexpected flags %#x.\n", adapter_idx, + caps.PrimitiveMiscCaps); + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), + "Adapter %u: RasterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.RasterCaps); + /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only + * advertised on the reference rasterizer and WARP. */ + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: SrcBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: DestBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 + | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), + "Adapter %u: TextureCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO + | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: TextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: CubeTextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: VolumeTextureFilterCaps field has unexpected flags %#x.\n", + adapter_idx, caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), + "Adapter %u: LineCaps field has unexpected flags %#x.\n", adapter_idx, + caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), + "Adapter %u: StencilCaps field has unexpected flags %#x.\n", adapter_idx, + caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP + | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), + "Adapter %u: VertexProcessingCaps field has unexpected flags %#x.\n", adapter_idx, + caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "Adapter %u: MaxActiveLights field has unexpected value %u.\n", adapter_idx, + caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "Adapter %u: MaxUserClipPlanes field has unexpected value %u.\n", adapter_idx, + caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "Adapter %u: MaxVertexW field has unexpected value %.8e.\n", adapter_idx, + caps.MaxVertexW); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP - | D3DCAPS2_CANSHARERESOURCE)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD - | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM - | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED - | D3DCAPS3_RESERVED)), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS - | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA - | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED - | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) - || broken(!(caps.RasterCaps & ~0x0f736191)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only - * advertised on the reference rasterizer and WARP. */ - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 - | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO - | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP - | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); } -- 2.20.1

3 2

[PATCH v2 1/4] d3d8/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 18 Mar '20

18 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix crashes with GDI renderer. Supersede 181096~181099 dlls/d3d8/tests/device.c | 237 +++++++++++++++++++++++---------------- 1 file changed, 139 insertions(+), 98 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 76e5c7389c..dd1e479cb2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8845,6 +8845,8 @@ static void test_swapchain_multisample_reset(void) static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; @@ -8855,106 +8857,145 @@ static void test_device_caps(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D8_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D8_GetDeviceCaps */ + hr = IDirect3D8_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Adapter %u: GetDeviceCaps failed, hr %#x.\n", + adapter_idx, hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("Adapter %u: No Direct3D support, skipping test.\n", adapter_idx); + break; + } + ok(caps.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, caps.AdapterOrdinal); + + /* Test IDirect3DDevice8_GetDeviceCaps */ + device_desc.adapter_ordinal = adapter_idx; + device = create_device(d3d, window, &device_desc); + if (!device) + { + skip("Adapter %u: Failed to create a D3D device, skipping test.\n", adapter_idx); + break; + } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Adapter %u: Failed to get caps, hr %#x.\n", adapter_idx, hr); + + ok(caps.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, caps.AdapterOrdinal); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), + "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), + "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); + /* Nvidia returns that 0x400 flag, which is probably Vista+ + * D3DCAPS3_DXVAHD from d3d9caps.h */ + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) + || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), + "Adapter %u: Caps3 field has unexpected flags %#x.\n", adapter_idx, caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE)) + || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), + "Adapter %u: PrimitiveMiscCaps field has unexpected flags %#x.\n", adapter_idx, + caps.PrimitiveMiscCaps); + /* AMD includes an unknown 0x2 flag. */ + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) + || broken(!(caps.RasterCaps & ~0x0ff7f19b)), + "Adapter %u: RasterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.RasterCaps); + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "Adapter %u: SrcBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "Adapter %u: DestBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), + "Adapter %u: TextureCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) + || broken(!(caps.TextureFilterCaps & ~0x0703073f)), + "Adapter %u: TextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "Adapter %u: CubeTextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "Adapter %u: VolumeTextureFilterCaps field has unexpected flags %#x.\n", + adapter_idx, caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), + "Adapter %u: LineCaps field has unexpected flags %#x.\n", adapter_idx, + caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), + "Adapter %u: StencilCaps field has unexpected flags %#x.\n", adapter_idx, + caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), + "Adapter %u: VertexProcessingCaps field has unexpected flags %#x.\n", adapter_idx, + caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "Adapter %u: MaxActiveLights field has unexpected value %u.\n", adapter_idx, + caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "Adapter %u: MaxUserClipPlanes field has unexpected value %u.\n", adapter_idx, + caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "Adapter %u: MaxVertexW field has unexpected value %.8e.\n", adapter_idx, + caps.MaxVertexW); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* Nvidia returns that 0x400 flag, which is probably Vista+ - * D3DCAPS3_DXVAHD from d3d9caps.h */ - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) - || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE)) - || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - /* AMD includes an unknown 0x2 flag. */ - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) - || broken(!(caps.RasterCaps & ~0x0ff7f19b)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) - || broken(!(caps.TextureFilterCaps & ~0x0703073f)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d); DestroyWindow(window); } -- 2.20.1

2 1

[PATCH v4 1/3] wined3d: Implement dual source blending.
by Zebediah Figura 18 Mar '20

18 Mar '20

Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++++++---- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..26dde1087a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } @@ -10385,7 +10398,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { string_buffer_sprintf(tmp_name, "color_out%u", i); - GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); + if (state->blend_state && state->blend_state->dual_source) + GL_EXTCALL(glBindFragDataLocationIndexed(program_id, 0, i, tmp_name->buffer)); + else + GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); checkGLcall("glBindFragDataLocation"); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops; -- 2.25.1

3 7

[PATCH] advapi32: Fix 3 comments about pdwReserved and dwFlags.
by Serge Gautherie 18 Mar '20

18 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index c4f6988..7199795 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -612,7 +612,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, * PARAMS * hProv [I] Handle to the CSP whose reference is being incremented. * pdwReserved [IN] Reserved for future use and must be NULL. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE @@ -735,7 +735,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) * hProv [I] Handle of a CSP. * Algid [I] Identifies the hash algorithm to use. * hKey [I] Key for the hash (if required). - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * phHash [O] Address of the future handle to the new hash object. * * RETURNS @@ -970,7 +970,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey) * * PARAMS * hHash [I] Handle to the hash to be copied. - * pdwReserved [I] Reserved for future use and must be zero. + * pdwReserved [I] Reserved for future use and must be NULL. * dwFlags [I] Reserved for future use and must be zero. * phHash [O] Address of the handle to receive the copy. * -- 2.10.0.windows.1

1 0

Re: [PATCH] hidclass.sys: Don't reset the report count when recording a main item.
by Aric Stewart 18 Mar '20

18 Mar '20

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

[PATCH v2 1/3] kernelbase: Implement compatibility mode for GetVersionEx.
by Gabriel Ivăncescu 18 Mar '20

18 Mar '20

Since Windows 8.1, these functions have been deprecated and run in a sort of compatibility mode, reporting Windows 8 unless the application supplies a manifest that specifies compatibility with newer Windows versions explicitly (by listing their GUIDs). Some applications have bad non-forward-compatible checks based on GetVersionEx, and depend on this behavior (they do not supply a manifest). Currently, they break on Wine if we use a Windows 10 prefix for example, since we always report the real version. One example is the game Rock of Ages. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Duplicated the tables and implementation of RtlVerifyVersionInfo to avoid extra internal exports from ntdll. Also used goto instead of many nested ifs. dlls/kernel32/tests/version.c | 2 +- dlls/kernelbase/version.c | 170 +++++++++++++++++++++++++++++++--- 2 files changed, 157 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 1bb3e20..c9e92a9 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -610,7 +610,7 @@ static void test_VerifyVersionInfo(void) if (rtlinfo.dwMajorVersion != 6 || rtlinfo.dwMinorVersion != 2) { - win_skip("GetVersionEx and VerifyVersionInfo are faking values\n"); + skip("GetVersionEx and VerifyVersionInfo are faking values\n"); return; } } diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index cf46e9c..dc8cc61 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -28,6 +28,8 @@ #include <stdio.h> #include <sys/types.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -116,6 +118,132 @@ typedef struct (VS_VERSION_INFO_STRUCT32 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) ) +/*********************************************************************** + * Win8 info, reported if app doesn't provide compat GUID in manifest. + */ +static const RTL_OSVERSIONINFOEXW windows8_version_data = +{ + sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23f0, VER_PLATFORM_WIN32_NT, + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 +}; + + +/*********************************************************************** + * Windows versions that need compatibility GUID specified in manifest + * in order to be reported by the APIs. + */ +static const struct +{ + RTL_OSVERSIONINFOEXW info; + GUID guid; +} version_data[] = +{ + /* Windows 8.1 */ + { + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, + {0x1f676c76,0x80e1,0x4239,{0x95,0xbb,0x83,0xd0,0xf6,0xd0,0xda,0x78}} + }, + /* Windows 10 */ + { + { + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42ee, VER_PLATFORM_WIN32_NT, + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, + {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}} + } +}; + + +/*********************************************************************** + * Holds the current version (including compatibility mode). + * Call init_current_version before using it. + */ +static RTL_OSVERSIONINFOEXW current_version; + + +/****************************************************************************** + * init_current_version + * + * Initialize the current_version variable. + * + * For compatibility, Windows 8.1 and later report Win8 version unless the app + * has a manifest that confirms its compatibility with newer versions of Windows. + * + */ +static BOOL CALLBACK init_current_version_callback(PINIT_ONCE init_once, PVOID parameter, PVOID *context) +{ + /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci; + RTL_OSVERSIONINFOEXW tmp_version; + const RTL_OSVERSIONINFOEXW *ver; + SIZE_T req; + int idx; + + if (!set_ntstatus(RtlGetVersion(&tmp_version))) return FALSE; + ver = &tmp_version; + + for (idx = ARRAY_SIZE(version_data); idx--;) + if ( tmp_version.dwMajorVersion > version_data[idx].info.dwMajorVersion || + (tmp_version.dwMajorVersion == version_data[idx].info.dwMajorVersion && + tmp_version.dwMinorVersion >= version_data[idx].info.dwMinorVersion)) + break; + + if (idx < 0) goto done; + ver = &windows8_version_data; + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, NULL, 0, &req) != STATUS_BUFFER_TOO_SMALL + || !req) + goto done; + + if (!(acci = HeapAlloc(GetProcessHeap(), 0, req))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, acci, req, &req) == STATUS_SUCCESS) + { + do + { + COMPATIBILITY_CONTEXT_ELEMENT *elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); + DWORD i, count = *acci; + + for (i = 0; i < count; i++) + { + if (elements[i].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + IsEqualGUID(&elements[i].Id, &version_data[idx].guid)) + { + ver = &version_data[idx].info; + + if (ver->dwMajorVersion == tmp_version.dwMajorVersion && + ver->dwMinorVersion == tmp_version.dwMinorVersion) + ver = &tmp_version; + + idx = 0; /* break from outer loop */ + break; + } + } + } while(idx--); + } + HeapFree(GetProcessHeap(), 0, acci); + +done: + memcpy(&current_version, ver, sizeof(current_version)); + return TRUE; +} + +static BOOL init_current_version(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + return InitOnceExecuteOnce(&init_once, init_current_version_callback, NULL, NULL); +} + + /********************************************************************** * find_entry_by_id * @@ -1317,8 +1445,6 @@ DWORD WINAPI GetVersion(void) */ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) { - RTL_OSVERSIONINFOEXW infoW; - if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) { @@ -1327,23 +1453,22 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) return FALSE; } - infoW.dwOSVersionInfoSize = sizeof(infoW); - if (!set_ntstatus( RtlGetVersion( &infoW ))) return FALSE; + if (!init_current_version()) return FALSE; - info->dwMajorVersion = infoW.dwMajorVersion; - info->dwMinorVersion = infoW.dwMinorVersion; - info->dwBuildNumber = infoW.dwBuildNumber; - info->dwPlatformId = infoW.dwPlatformId; - WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, + info->dwMajorVersion = current_version.dwMajorVersion; + info->dwMinorVersion = current_version.dwMinorVersion; + info->dwBuildNumber = current_version.dwBuildNumber; + info->dwPlatformId = current_version.dwPlatformId; + WideCharToMultiByte( CP_ACP, 0, current_version.szCSDVersion, -1, info->szCSDVersion, sizeof(info->szCSDVersion), NULL, NULL ); if (info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) { OSVERSIONINFOEXA *vex = (OSVERSIONINFOEXA *)info; - vex->wServicePackMajor = infoW.wServicePackMajor; - vex->wServicePackMinor = infoW.wServicePackMinor; - vex->wSuiteMask = infoW.wSuiteMask; - vex->wProductType = infoW.wProductType; + vex->wServicePackMajor = current_version.wServicePackMajor; + vex->wServicePackMinor = current_version.wServicePackMinor; + vex->wSuiteMask = current_version.wSuiteMask; + vex->wProductType = current_version.wProductType; } return TRUE; } @@ -1360,5 +1485,22 @@ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); return FALSE; } - return set_ntstatus( RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info )); + + if (!init_current_version()) return FALSE; + + info->dwMajorVersion = current_version.dwMajorVersion; + info->dwMinorVersion = current_version.dwMinorVersion; + info->dwBuildNumber = current_version.dwBuildNumber; + info->dwPlatformId = current_version.dwPlatformId; + wcscpy( info->szCSDVersion, current_version.szCSDVersion ); + + if (info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + OSVERSIONINFOEXW *vex = (OSVERSIONINFOEXW *)info; + vex->wServicePackMajor = current_version.wServicePackMajor; + vex->wServicePackMinor = current_version.wServicePackMinor; + vex->wSuiteMask = current_version.wSuiteMask; + vex->wProductType = current_version.wProductType; + } + return TRUE; } -- 2.21.0

3 10

[PATCH 1/5] mfplat: Improve 2D buffer sizes estimation.
by Nikolay Sivov 18 Mar '20

18 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 21 +++++++- dlls/mfplat/mediatype.c | 2 + dlls/mfplat/tests/mfplat.c | 99 ++++++++++++++++++++++++++++++-------- 3 files changed, 102 insertions(+), 20 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 05e1ce5fd6..64ec436a1e 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -546,6 +546,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo { unsigned int bpp, max_length, plane_size; struct memory_buffer *object; + unsigned int row_alignment; GUID subtype; BOOL is_yuv; HRESULT hr; @@ -572,10 +573,28 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (!object) return E_OUTOFMEMORY; - pitch = ALIGN_SIZE(width * bpp, MF_64_BYTE_ALIGNMENT); + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','3'): + case MAKEFOURCC('I','M','C','4'): + case MAKEFOURCC('Y','V','1','2'): + row_alignment = MF_128_BYTE_ALIGNMENT; + break; + default: + row_alignment = MF_64_BYTE_ALIGNMENT; + } + + pitch = ALIGN_SIZE(width * bpp, row_alignment); switch (fourcc) { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + max_length = pitch * height * 2; + plane_size *= 2; + break; case MAKEFOURCC('N','V','1','2'): max_length = pitch * height * 3 / 2; break; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 142ee69cf6..8c4716e5e1 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1799,6 +1799,8 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, + { &MFVideoFormat_UYVY, 2, 0, 0, 1 }, + { &MFVideoFormat_YUY2, 2, 0, 0, 1 }, { &MFVideoFormat_YV12, 1, 0, 0, 1 }, { &MFVideoFormat_A16B16G16R16F, 8, 3, 1, 0 }, }; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c5ed883dfa..4cb5499f7c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3475,6 +3475,14 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_YV12, 2, 1, 3 }, { &MFVideoFormat_YV12, 1, 2, 6, 3 }, { &MFVideoFormat_YV12, 4, 3, 18 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, }; unsigned int i; UINT32 size; @@ -3490,23 +3498,22 @@ static void test_MFCalculateImageSize(void) for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { + const struct image_size_test *ptr = &image_size_tests[i]; + /* Those are supported since Win10. */ - BOOL is_broken = IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A16B16G16R16F) || - IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A2R10G10B10); + BOOL is_broken = IsEqualGUID(ptr->subtype, &MFVideoFormat_A16B16G16R16F) || + IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); - hr = MFCalculateImageSize(image_size_tests[i].subtype, image_size_tests[i].width, - image_size_tests[i].height, &size); + hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); - ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, - image_size_tests[i].size); + ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); if (pMFGetPlaneSize) { - unsigned int plane_size = image_size_tests[i].plane_size ? image_size_tests[i].plane_size : - image_size_tests[i].size; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; - hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, - &size); + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); } @@ -4635,16 +4642,51 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int height; unsigned int fourcc; unsigned int contiguous_length; + int pitch; + unsigned int plane_multiplier; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6 }, - { 4, 2, MAKEFOURCC('N','V','1','2'), 12 }, - { 2, 4, MAKEFOURCC('N','V','1','2'), 12 }, - { 1, 3, MAKEFOURCC('N','V','1','2'), 4 }, - - { 2, 4, D3DFMT_A8R8G8B8, 32 }, - { 1, 4, D3DFMT_A8R8G8B8, 16 }, - { 4, 1, D3DFMT_A8R8G8B8, 16 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64 }, + { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128 }, + { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, + { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + + { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, + { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128 }, + + { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, + { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64 }, + + { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, + { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64 }, + + { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, + { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64 }, + + { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, + { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, + { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; unsigned int max_length, length, length2; BYTE *buffer_start, *data, *data2; @@ -4838,9 +4880,28 @@ static void test_MFCreate2DMediaBuffer(void) ok(length == ptr->contiguous_length, "%d: unexpected contiguous length %u for %u x %u, format %s.\n", i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + hr = IMFMediaBuffer_Lock(buffer, &data, &length2, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + ok(length == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", + i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); ok(hr == S_OK, "Failed to get plane size, hr %#x.\n", hr); - ok(length2 == length, "%d: contiguous length %u does not match plane size %u.\n", i, length, length2); + if (ptr->plane_multiplier) + length2 *= ptr->plane_multiplier; + ok(length2 == length, "%d: contiguous length %u does not match plane size %u, %u x %u, format %s.\n", i, length, + length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + ok(pitch == ptr->pitch, "%d: unexpected pitch %d, expected %d, %u x %u, format %s.\n", i, pitch, ptr->pitch, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); ret = TRUE; hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &ret); -- 2.25.1

1 4

[PATCH 1/1] Fix regression in if condition parsing.
by Bernhard Übelacker 18 Mar '20

18 Mar '20

Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Therefore if conditions got influenced by values of the previous line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 43c4d9efef..8911a597eb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5cad22b7ee..f6c770c9b8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len; -- 2.20.1

1 1

[PATCH v10 1/4] jscript: Get rid of the variable_obj parameter to exec_source.
by Gabriel Ivăncescu 18 Mar '20

18 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 39 +++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 6 ++---- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a627ea..46299cf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2984,8 +2984,9 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *function_instance, jsdisp_t *variable_obj, unsigned argc, jsval_t *argv, jsval_t *r) + IDispatch *this_obj, jsdisp_t *function_instance, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *variable_obj; call_frame_t *frame; unsigned i; HRESULT hres; @@ -2997,6 +2998,18 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + if((flags & EXEC_EVAL) && ctx->call_ctx) + variable_obj = ctx->call_ctx->variable_obj; + else + variable_obj = ctx->global; + jsdisp_addref(variable_obj); + } + else { + hres = create_dispex(ctx, NULL, NULL, &variable_obj); + if(FAILED(hres)) return hres; + } + if(!ctx->ei->enter_notified) { ctx->ei->enter_notified = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); @@ -3010,12 +3023,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = bind_event_target(ctx, function->funcs+i, func_obj); jsdisp_release(func_obj); if(FAILED(hres)) - return hres; + goto fail; } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { @@ -3028,7 +3041,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -3037,7 +3050,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) - return hres; + goto fail; } } } @@ -3057,12 +3070,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(ctx->call_ctx && (flags & EXEC_EVAL)) { hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) - return hres; + goto fail; } frame = heap_alloc_zero(sizeof(*frame)); - if(!frame) - return E_OUTOFMEMORY; + if(!frame) { + hres = E_OUTOFMEMORY; + goto fail; + } frame->function = function; frame->ret = jsval_undefined(); @@ -3074,7 +3089,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(FAILED(hres)) { release_bytecode(frame->bytecode); heap_free(frame); - return hres; + goto fail; } }else if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -3091,7 +3106,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function_instance = jsdisp_addref(function_instance); frame->flags = flags; - frame->variable_obj = jsdisp_addref(variable_obj); + frame->variable_obj = variable_obj; frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; @@ -3107,4 +3122,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } return enter_bytecode(ctx, r); + +fail: + jsdisp_release(variable_obj); + return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fe6b2a0..2a8e405 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -281,7 +281,7 @@ typedef struct _call_frame_t { #define EXEC_EVAL 0x0008 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 007aec0..e1a8c29 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -722,7 +722,7 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun unsigned argc, jsval_t *argv, jsval_t *r) { InterpretedFunction *function = (InterpretedFunction*)func; - jsdisp_t *var_disp, *new_obj = NULL; + jsdisp_t *new_obj = NULL; DWORD exec_flags = 0; HRESULT hres; @@ -745,14 +745,12 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun if(flags & DISPATCH_CONSTRUCT) exec_flags |= EXEC_CONSTRUCTOR; - hres = create_dispex(ctx, NULL, NULL, &var_disp); if(SUCCEEDED(hres)) hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, - &function->function.dispex, var_disp, argc, argv, r); + &function->function.dispex, argc, argv, r); if(new_obj) jsdisp_release(new_obj); - jsdisp_release(var_disp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2a1dcb2..64b910f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -215,7 +215,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame ? frame->scope : NULL, - frame ? frame->this_obj : NULL, NULL, frame ? frame->variable_obj : ctx->global, 0, NULL, r); + frame ? frame->this_obj : NULL, NULL, 0, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index aabad7e..f54c34a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -408,7 +408,7 @@ static void exec_queued_code(JScript *This) LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); - hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, 0, NULL, NULL); leave_script(This->ctx, hres); if(FAILED(hres)) break; @@ -1053,7 +1053,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { jsval_t r; - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult); @@ -1072,7 +1072,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(!pvarResult && !is_started(This->ctx)) { list_add_tail(&This->queued_code, &code->entry); }else { - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, NULL); if(code->is_persistent) list_add_tail(&This->persistent_code, &code->entry); else -- 2.21.0

2 8

[PATCH v2] api-ms-win-core-registry-l2-2-0: Add dll
by Myah Caron 18 Mar '20

18 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- v2: - Add to make_specfiles - Don't update configure Thanks Alex and Zhiyi! --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-registry-l2-2-0.spec | 29 +++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 32 insertions(+) create mode 100644 dlls/api-ms-win-core-registry-l2-2-0/Makefile.in create mode 100644 dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec diff --git a/configure.ac b/configure.ac index f722ac5d04..7096e2fb66 100644 --- a/configure.ac +++ b/configure.ac @@ -2905,6 +2905,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-2-0) diff --git a/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in new file mode 100644 index 0000000000..af9aa28b52 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registry-l2-2-0.dll diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec new file mode 100644 index 0000000000..6d9ae1f404 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -0,0 +1,29 @@ +@ stdcall RegConnectRegistryA(str long ptr) advapi32.RegConnectRegistryA +@ stdcall RegConnectRegistryW(wstr long ptr) advapi32.RegConnectRegistryW +@ stdcall RegCopyTreeA(long str long) advapi32.RegCopyTreeA +@ stdcall RegCreateKeyA(long str ptr) advapi32.RegCreateKeyA +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedA +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedW +@ stdcall RegCreateKeyW(long wstr ptr) advapi32.RegCreateKeyW +@ stdcall RegDeleteKeyA(long str) advapi32.RegDeleteKeyA +@ stub RegDeleteKeyTransactedA +@ stub RegDeleteKeyTransactedW +@ stdcall RegDeleteKeyW(long wstr) advapi32.RegDeleteKeyW +@ stdcall RegDisablePredefinedCache() advapi32.RegDisablePredefinedCache +@ stdcall RegEnumKeyA(long long ptr long) advapi32.RegEnumKeyA +@ stdcall RegEnumKeyW(long long ptr long) advapi32.RegEnumKeyW +@ stdcall RegOpenKeyA(long str ptr) advapi32.RegOpenKeyA +@ stub RegOpenKeyTransactedA +@ stub RegOpenKeyTransactedW +@ stdcall RegOpenKeyW(long wstr ptr) advapi32.RegOpenKeyW +@ stdcall RegOverridePredefKey(long long) advapi32.RegOverridePredefKey +@ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesA +@ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesW +@ stdcall RegQueryValueA(long str ptr ptr) advapi32.RegQueryValueA +@ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW +@ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA +@ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW +@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 7fef3a6821..95b210752c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,6 +119,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", + "api-ms-win-core-registry-l2-2-0", "api-ms-win-core-shutdown-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", -- 2.25.1

1 0

[PATCH] api-ms-win-core-registry-l2-2-0: Add dll
by Myah Caron 18 Mar '20

18 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- This DLL was added in 1511, but removed in 1709. Certain native DLLs still require it. The DLL was missing from my win10 installation, but I implemented it from the functions listed here: https://docs.microsoft.com/en-us/windows/win32/apiindex/umbrella-lib-onecor… --- configure | 26 +++++------------ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-registry-l2-2-0.spec | 29 +++++++++++++++++++ 4 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 dlls/api-ms-win-core-registry-l2-2-0/Makefile.in create mode 100644 dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec diff --git a/configure b/configure index 76cfea1c07..b6414536b9 100755 --- a/configure +++ b/configure @@ -814,7 +814,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1005,6 +1004,7 @@ enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registry_l2_1_0 +enable_api_ms_win_core_registry_l2_2_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 @@ -1942,7 +1942,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2195,15 +2194,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2341,7 +2331,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2494,7 +2484,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6908,7 +6897,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6954,7 +6943,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6978,7 +6967,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -7023,7 +7012,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -7047,7 +7036,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20204,6 +20193,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-2-0 enable_api_ms_win_core_registry_l2_2_0 wine_fn_config_makefile dlls/api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 diff --git a/configure.ac b/configure.ac index f722ac5d04..7096e2fb66 100644 --- a/configure.ac +++ b/configure.ac @@ -2905,6 +2905,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-2-0) diff --git a/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in new file mode 100644 index 0000000000..af9aa28b52 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registry-l2-2-0.dll diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec new file mode 100644 index 0000000000..6d9ae1f404 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -0,0 +1,29 @@ +@ stdcall RegConnectRegistryA(str long ptr) advapi32.RegConnectRegistryA +@ stdcall RegConnectRegistryW(wstr long ptr) advapi32.RegConnectRegistryW +@ stdcall RegCopyTreeA(long str long) advapi32.RegCopyTreeA +@ stdcall RegCreateKeyA(long str ptr) advapi32.RegCreateKeyA +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedA +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedW +@ stdcall RegCreateKeyW(long wstr ptr) advapi32.RegCreateKeyW +@ stdcall RegDeleteKeyA(long str) advapi32.RegDeleteKeyA +@ stub RegDeleteKeyTransactedA +@ stub RegDeleteKeyTransactedW +@ stdcall RegDeleteKeyW(long wstr) advapi32.RegDeleteKeyW +@ stdcall RegDisablePredefinedCache() advapi32.RegDisablePredefinedCache +@ stdcall RegEnumKeyA(long long ptr long) advapi32.RegEnumKeyA +@ stdcall RegEnumKeyW(long long ptr long) advapi32.RegEnumKeyW +@ stdcall RegOpenKeyA(long str ptr) advapi32.RegOpenKeyA +@ stub RegOpenKeyTransactedA +@ stub RegOpenKeyTransactedW +@ stdcall RegOpenKeyW(long wstr ptr) advapi32.RegOpenKeyW +@ stdcall RegOverridePredefKey(long long) advapi32.RegOverridePredefKey +@ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesA +@ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesW +@ stdcall RegQueryValueA(long str ptr ptr) advapi32.RegQueryValueA +@ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW +@ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA +@ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW +@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW -- 2.25.1

3 2

[PATCH v2 2/2] crypt32: Add implementation for CRYPT_STRING_HEX format
by Aaro Altonen 18 Mar '20

18 Mar '20

Add CRYPT_STRING_HEX format implementation for CryptStringToBinaryW() Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48487 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - remove wcstok() and string duplication entirely - properly check wchars (thanks Nikolay) --- dlls/crypt32/base64.c | 76 +++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/base64.c | 80 ++++++++++++++++++------------------- 2 files changed, 116 insertions(+), 40 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 73619421ab..ac2ec54334 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -1036,6 +1036,80 @@ static LONG DecodeAnyW(LPCWSTR pszString, DWORD cchString, return ret; } +static BYTE char_to_byte(WCHAR c) +{ + BYTE lb = c & 0xff; + + /* upper byte is allowed to be 0xff */ + if (c >> 8 != 0xff && c >> 8 != 0x00) + return 0xff; + + if (lb >= '0' && lb <= '9') + return lb - '0'; + if (lb >= 'a' && lb <= 'f') + return lb - 'a' + 10; + if (lb >= 'A' && lb <= 'F') + return lb - 'A' + 10; + + return 0xff; +} + +static LONG DecodeHexToBinaryW(const WCHAR *instr, DWORD slen, + BYTE *out, DWORD *outlen, DWORD *skip, DWORD *flags) +{ + BYTE un, ln; + const WCHAR delim[] = { ' ', '\n', '\r', '\t' }; + const WCHAR *ptr = instr; + LONG ret = ERROR_SUCCESS; + DWORD i = 0, processed = 0; + + if (!outlen) + return ERROR_INVALID_PARAMETER; + + if (skip) + *skip = 0; + + while (i < slen) { + while (strchrW(delim, *ptr) && *ptr) ptr++, i++; + + if (i == slen) + break; + + if (i + 2 > slen) + { + if (!out) + *outlen = 0; + return ERROR_INVALID_DATA; + } + + un = char_to_byte(*ptr); + ln = char_to_byte(*(ptr + 1)); + + if (un == 0xff || ln == 0xff) + { + if (!out) + *outlen = 0; + return ERROR_INVALID_DATA; + } + + if (processed >= *outlen) + { + if (out) + return ERROR_MORE_DATA; + ret = ERROR_MORE_DATA; + } + else if (out) + out[processed] = (un << 4) | ln; + + processed++; + ptr += 2; + i += 2; + } + + *outlen = processed; + return ret; +} + BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) @@ -1081,6 +1155,8 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, decoder = DecodeAnyW; break; case CRYPT_STRING_HEX: + decoder = DecodeHexToBinaryW; + break; case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 845b5b28f3..5a65b516ca 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -816,8 +816,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* length is uneven -> 13 */ @@ -826,8 +826,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid 0x prefix -> 13 */ @@ -836,8 +836,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid characters -> 13 */ @@ -846,8 +846,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* insufficient buffer -> 234 */ @@ -861,9 +861,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); - todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* valid data */ @@ -871,9 +871,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); heap_free(input); /* valid data with white spaces */ @@ -882,9 +882,9 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 7, "Got %u, expected 7\n", data_len); heap_free(input); /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ @@ -893,8 +893,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes @@ -905,7 +905,7 @@ static void testStringToBinaryW(void) input = strdupAtoW("21 3 c ff"); ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); heap_free(input); @@ -918,10 +918,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); - todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* invalid data but length small enough that it's never detected */ @@ -929,9 +929,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("abcdefhhh"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 2, "Got %u, expected 2\n", data_len); heap_free(input); /* invalid data but length small enough that it's never detected, with whitespaces */ @@ -940,33 +940,33 @@ static void testStringToBinaryW(void) input = strdupAtoW("\t\t21 fe f f f"); data_len = 256; ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 1, "Got %u, expected 1\n", data_len); heap_free(input); SetLastError(0xdeadbeef); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(winput1, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); - todo_wine ok(ret || broken(!ret), "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == 122), + ok(ret || broken(!ret), "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == 122), "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 3 || broken(data_len == 0xdeadbeef), "Got %u, expected 3\n", data_len); + ok(data_len == 3 || broken(data_len == 0xdeadbeef), "Got %u, expected 3\n", data_len); SetLastError(0xdeadbeef); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(winput2, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); SetLastError(0xdeadbeef); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(winput3, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == 122), + ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == 122), "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0 || broken(data_len == 0xdeadbeef), "Got %u, expected 0\n", data_len); + ok(data_len == 0 || broken(data_len == 0xdeadbeef), "Got %u, expected 0\n", data_len); /* valid data but parse only the first 6 bytes (12 chars) */ SetLastError(0xdeadbeef); @@ -976,10 +976,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); - todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 6, "Got %u, expected 6\n", data_len); + ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); } -- 2.25.1

1 0

[PATCH v2 1/2] crypt32/tests: Add tests for CryptStringToBinaryW()
by Aaro Altonen 18 Mar '20

18 Mar '20

Add tests for CRYPT_STRING_HEX format Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix one test case to be actually invalid as claimed - Change parameter type for one test - Add test cases where the upper byte of a wchar has invalid data (thanks Nikolay) --- dlls/crypt32/tests/base64.c | 201 ++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 7b9f4c1077..845b5b28f3 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -783,8 +783,209 @@ static void testStringToBinaryA(void) } } +static void testStringToBinaryW(void) +{ + BOOL ret; + DWORD skip_ = 0; + DWORD flags = 0; + DWORD data_len; + WCHAR *input; + BYTE out[256]; + BYTE expected[256]; + const WCHAR *cinput; + WCHAR winput1[] = { 0xff42, 0x0042, 0xff45, 0xff45, 0x0046, 0xff46, 0 }; + WCHAR winput2[] = { 0x4242, 0x4242, 0x4545, 0x4545, 0x4646, 0x4646, 0 }; + WCHAR winput3[] = { 0xfe42, 0xfe42, 0xfe45, 0xfe45, 0xfe46, 0xfe46, 0 }; + + /* invalid parameteres -> 87 */ + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(NULL, 0, 0, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %u, expected 87\n", GetLastError()); + + /* otherwise valid parameters but invalid data_len -> 87 */ + SetLastError(0xdeadbeef); + cinput = L"213c73796d6c696e6b3efffe"; + ret = CryptStringToBinaryW(cinput, 24, CRYPT_STRING_HEX, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %d, expected 87\n", GetLastError()); + + /* uneven amount of data -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* length is uneven -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("1111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid 0x prefix -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("0x213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid characters -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abchhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* insufficient buffer -> 234 */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + expected[0] = 0x21; + expected[1] = 0x3c; + expected[2] = 0x73; + expected[3] = 0x79; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + heap_free(input); + + /* valid data with white spaces */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3c\t\t \r\n 73 796d6c \t69\t"); + data_len = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + heap_free(input); + + /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3 c"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes + * until an invalid sequence is reached */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + input = strdupAtoW("21 3 c ff"); + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + expected[6] = 0x69; expected[7] = 0x6e; expected[8] = 0x6b; + expected[9] = 0x3e; expected[10] = 0xff; expected[11] = 0xfe; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* invalid data but length small enough that it's never detected */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abcdefhhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + heap_free(input); + + /* invalid data but length small enough that it's never detected, with whitespaces */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + input = strdupAtoW("\t\t21 fe f f f"); + data_len = 256; + ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + heap_free(input); + + SetLastError(0xdeadbeef); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(winput1, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + todo_wine ok(ret || broken(!ret), "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == 122), + "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 3 || broken(data_len == 0xdeadbeef), "Got %u, expected 3\n", data_len); + + SetLastError(0xdeadbeef); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(winput2, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + + SetLastError(0xdeadbeef); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(winput3, 6, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == 122), + "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0 || broken(data_len == 0xdeadbeef), "Got %u, expected 0\n", data_len); + + /* valid data but parse only the first 6 bytes (12 chars) */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); + todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); +} + START_TEST(base64) { test_CryptBinaryToString(); testStringToBinaryA(); + testStringToBinaryW(); } -- 2.25.1

1 0

[PATCH] oledb32/tests: Add MSDASQL Enumerator tests
by Alistair Leslie-Hughes 18 Mar '20

18 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/database.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d9811043a8..c2b7e0598d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1049,6 +1049,42 @@ static void test_odbc_provider(void) IDBProperties_Release(props); } +static void test_odbc_enumerator(void) +{ + HRESULT hr; + ISourcesRowset *source; + IRowset *rowset; + + hr = CoCreateInstance( &CLSID_MSDASQL_ENUMERATOR, NULL, CLSCTX_ALL, &IID_ISourcesRowset, (void **)&source); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (hr == S_OK) + { + IAccessor *accessor; + IRowsetInfo *info; + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IRowsetInfo_Release(info); + + IRowset_Release(rowset); + } + + ISourcesRowset_Release(source); +} + START_TEST(database) { OleInitialize(NULL); @@ -1058,6 +1094,7 @@ START_TEST(database) test_initializationstring(); test_dslocator(); test_odbc_provider(); + test_odbc_enumerator(); /* row position */ test_rowposition(); -- 2.25.1

1 0

[PATCH v3 1/3] wined3d: Implement dual source blending.
by Zebediah Figura 18 Mar '20

18 Mar '20

Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..2c2ba33488 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops; -- 2.25.1

3 6

[PATCH v2 1/3] wined3d: Implement dual source blending.
by Zebediah Figura 17 Mar '20

17 Mar '20

"Implement" is somewhat debatable, as it works currently with both Mesa and NVidia blob drivers. However, we're not following the spec. Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..2c2ba33488 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops; -- 2.25.1

2 3

[PATCH 4/7] dbghelp: Move elf_check_alternate implementation to module.c.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 247 +---------------------------------- dlls/dbghelp/image_private.h | 4 + dlls/dbghelp/module.c | 239 +++++++++++++++++++++++++++++++++ 3 files changed, 250 insertions(+), 240 deletions(-)

2 2

[PATCH v2 4/7] dbghelp: Move elf_check_alternate implementation to module.c.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 247 +---------------------------------- dlls/dbghelp/image_private.h | 7 + dlls/dbghelp/module.c | 239 +++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 240 deletions(-)

1 0

[PATCH] jscript: Get rid of the variable_obj parameter to exec_source.
by Jacek Caban 17 Mar '20

17 Mar '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 32 ++++++++++++++++++++++++-------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 11 +++-------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 32 insertions(+), 21 deletions(-)

1 0

[PATCH 1/2] winex11.drv: Remove frame when non-client area is empty.
by Rémi Bernon 17 Mar '20

17 Mar '20

Several applications -Steam, Battle.net for instance- handle the WM_NCCALCSIZE message to override the non-client areas size and make the client area cover the whole window, instead of changing the styles. In winex11.drv, in decorated mode, we adjust the window rect according to the window style to hide the unwanted decorations behind the frame, but when client and window rects are equals, there's nothing to hide and the actual window styles are irrelevant and can safely be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40930 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- There's still going to be some issues for applications that customize the non-client area sizes differently from their styles, but hopefully there's aren't many applications that do that. dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..903b036442b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -286,6 +286,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, if (!decorated_mode) return 0; + if (EqualRect( &data->window_rect, &data->client_rect )) return 0; if (IsRectEmpty( &data->window_rect )) return 0; if (data->shaped) return 0; -- 2.25.0

1 2

[PATCH 1/3] mshtml/tests: Add tests showing how toString has changed in IE9+.
by Jeff Smith 17 Mar '20

17 Mar '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a81253a02..d4aa7f4383 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -351,6 +351,12 @@ tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); (tmp = new Enumerator()).f = Object.prototype.toString; ok(tmp.f() === "[object Object]", "tmp.f() = " + tmp.f()); +tmp = Object.prototype.toString.call(null); +ok(tmp === "[object Object]", "toString.call(null) = " + tmp); +tmp = Object.prototype.toString.call(undefined); +ok(tmp === "[object Object]", "toString.call(undefined) = " + tmp); +tmp = Object.prototype.toString.call(); +ok(tmp === "[object Object]", "toString.call() = " + tmp); function TSTestConstr() {} TSTestConstr.prototype = { toString: function() { return "test"; } }; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7ee8cc1e03..7a5b9d57ea 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -767,6 +767,28 @@ function test_getPrototypeOf() { next_test(); } +function test_toString() { + var tmp; + + (function () { tmp = Object.prototype.toString.call(arguments); })(); + todo_wine. + ok(tmp === "[object Arguments]", "toString.call(arguments) = " + tmp); + tmp = Object.prototype.toString.call(this); + todo_wine. + ok(tmp === "[object Window]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(null); + todo_wine. + ok(tmp === "[object Null]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(undefined); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call(undefined) = " + tmp); + tmp = Object.prototype.toString.call(); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call() = " + tmp); + + next_test(); +} + function test_bind() { var f, r; var o = new Object(), o2 = new Object(); @@ -860,5 +882,6 @@ var tests = [ test_global_properties, test_string_split, test_getPrototypeOf, + test_toString, test_bind ]; -- 2.23.0

3 7

[PATCH] mshtml/tests: Remove file protocol tests from htmllocation.c.
by Jacek Caban 17 Mar '20

17 Mar '20

It's broken on modern IEs anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/htmllocation.c | 12 ------------ 1 file changed, 12 deletions(-)

1 0

[PATCH 5/5] ucrtbase/tests: Link to _o_* functions directly.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)

2 1

[PATCH 3/5] ucrtbase/tests: Use public onexit table declarations.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 88 ++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 51 deletions(-)

2 1

[PATCH] include/dxva: add HEVC and VP8/VP9 structures
by Biswapriyo Nath 17 Mar '20

17 Mar '20

1 0

[PATCH 7/7] dbghelp: Lookup real image paths in image_locate_debug_link.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/module.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[PATCH 6/7] dbghelp: Support PE debug link files.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 5/7] dbghelp: Support GNU debug link and build id in PE files.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/pe_module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 3/7] dbghelp: Move get_dos_file_name to path.c.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 23 ----------------------- dlls/dbghelp/path.c | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 23 deletions(-)

1 0

[PATCH 2/7] dbghelp: Use elf_check_debug_link in elf_locate_build_id_target.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)

1 0

[PATCH 1/7] dbghelp: Check checksum before mapping elf file.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-)

1 0

[PATCH v2 1/5] ucrtbase/tests: Fix clock tests.
by Jacek Caban 17 Mar '20

17 Mar '20

crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] d3d10core/tests: Add a test for dual source blending.
by Zebediah Figura 17 Mar '20

17 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 68 ++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e84b4a47b5..ed0e4f1217 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18287,6 +18287,73 @@ static void test_independent_blend(void) release_test_context(&test_context); } +static void test_dual_source_blend(void) +{ + struct d3d10core_test_context test_context; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + ID3D10PixelShader *ps; + ID3D10Device *device; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1) + { + t0 = float4(0.5, 0.5, 0.0, 1.0); + t1 = float4(0.0, 0.5, 0.5, 0.0); + } +#endif + 0x43425844, 0x87120d01, 0xa0014738, 0x3a32d86c, 0x9d757441, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x000000ac, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, + 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, + 0x00004002, 0x00000000, 0x3f000000, 0x3f000000, 0x00000000, 0x0100003e + }; + + static const float clear_color[] = {0.7f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.BlendEnable[0] = TRUE; + blend_desc.SrcBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.DestBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, clear_color); + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0x80804000, 1), "Got unexpected color 0x%08x.\n", color); + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18407,6 +18474,7 @@ START_TEST(d3d10core) queue_test(test_desktop_window); queue_test(test_color_mask); queue_test(test_independent_blend); + queue_test(test_dual_source_blend); run_queued_tests(); -- 2.25.1

3 5

[PATCH 5/6] d3d8/tests: Fix a test failure on Win10 1809 TestBots.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1fe9864c52..ee72ca5e4c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6624,7 +6624,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || broken(hr == E_FAIL && (i == 6 || i == 7)), /* Win10 1809 TestBots */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); IDirect3DVolumeTexture8_Release(dst); -- 2.20.1

3 2

[PATCH 3/6] d3d8/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 233 +++++++++++++++++++++++---------------- 1 file changed, 135 insertions(+), 98 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 76e5c7389c..1fe9864c52 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8845,6 +8845,8 @@ static void test_swapchain_multisample_reset(void) static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; @@ -8855,106 +8857,141 @@ static void test_device_caps(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D8_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D8_GetDeviceCaps */ + hr = IDirect3D8_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Adapter %u: GetDeviceCaps failed, hr %#x.\n", + adapter_idx, hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("Adapter %u: No Direct3D support, skipping test.\n", adapter_idx); + break; + } + ok(caps.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, caps.AdapterOrdinal); + + /* Test IDirect3DDevice8_GetDeviceCaps */ + device_desc.adapter_ordinal = adapter_idx; + device = create_device(d3d, window, &device_desc); + ok(!!device, "Adapter %u: Failed to create a D3D device.\n", adapter_idx); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Adapter %u: Failed to get caps, hr %#x.\n", adapter_idx, hr); + + ok(caps.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, caps.AdapterOrdinal); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), + "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), + "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); + /* Nvidia returns that 0x400 flag, which is probably Vista+ + * D3DCAPS3_DXVAHD from d3d9caps.h */ + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) + || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), + "Adapter %u: Caps3 field has unexpected flags %#x.\n", adapter_idx, caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE)) + || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), + "Adapter %u: PrimitiveMiscCaps field has unexpected flags %#x.\n", adapter_idx, + caps.PrimitiveMiscCaps); + /* AMD includes an unknown 0x2 flag. */ + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) + || broken(!(caps.RasterCaps & ~0x0ff7f19b)), + "Adapter %u: RasterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.RasterCaps); + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "Adapter %u: SrcBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "Adapter %u: DestBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), + "Adapter %u: TextureCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) + || broken(!(caps.TextureFilterCaps & ~0x0703073f)), + "Adapter %u: TextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "Adapter %u: CubeTextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "Adapter %u: VolumeTextureFilterCaps field has unexpected flags %#x.\n", + adapter_idx, caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), + "Adapter %u: LineCaps field has unexpected flags %#x.\n", adapter_idx, + caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), + "Adapter %u: StencilCaps field has unexpected flags %#x.\n", adapter_idx, + caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), + "Adapter %u: VertexProcessingCaps field has unexpected flags %#x.\n", adapter_idx, + caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "Adapter %u: MaxActiveLights field has unexpected value %u.\n", adapter_idx, + caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "Adapter %u: MaxUserClipPlanes field has unexpected value %u.\n", adapter_idx, + caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "Adapter %u: MaxVertexW field has unexpected value %.8e.\n", adapter_idx, + caps.MaxVertexW); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* Nvidia returns that 0x400 flag, which is probably Vista+ - * D3DCAPS3_DXVAHD from d3d9caps.h */ - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) - || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE)) - || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - /* AMD includes an unknown 0x2 flag. */ - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) - || broken(!(caps.RasterCaps & ~0x0ff7f19b)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) - || broken(!(caps.TextureFilterCaps & ~0x0703073f)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d); DestroyWindow(window); } -- 2.20.1

3 2

[PATCH 2/6] d3d9/tests: Support creating a device with the specified adapter.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d00a26b942..49280ef869 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -42,6 +42,7 @@ struct vec3 struct device_desc { + unsigned int adapter_ordinal; HWND device_window; unsigned int width; unsigned int height; @@ -153,9 +154,11 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; + unsigned int adapter_ordinal; IDirect3DDevice9 *device; DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + adapter_ordinal = D3DADAPTER_DEFAULT; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; @@ -167,6 +170,7 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons if (desc) { + adapter_ordinal = desc->adapter_ordinal; present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; if (desc->flags & CREATE_DEVICE_UNKNOWN_BACKBUFFER_FORMAT) @@ -185,12 +189,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags |= D3DCREATE_FPU_PRESERVE; } - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -200,7 +204,7 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING)) | D3DCREATE_HARDWARE_VERTEXPROCESSING; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -1895,6 +1899,7 @@ static void test_reset(void) i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.width = modes[i].w; device_desc.height = modes[i].h; device_desc.device_window = hwnd; @@ -3429,6 +3434,7 @@ static void test_scissor_size(void) scts[i].backy = registry_mode.dmPelsHeight; } + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = hwnd; device_desc.width = scts[i].backx; device_desc.height = scts[i].backy; @@ -3942,6 +3948,7 @@ static void test_wndproc(void) expect_messages = create_messages; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = d3d_width; device_desc.height = d3d_height; @@ -4382,6 +4389,7 @@ static void test_wndproc_windowed(void) filter_messages = focus_window; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = 640; device_desc.height = 480; @@ -4711,6 +4719,7 @@ static void test_fpu_setup(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 640; device_desc.height = 480; @@ -4845,6 +4854,7 @@ static void test_window_style(void) GetWindowRect(focus_window, &focus_rect); GetWindowRect(device_window, &device_rect); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -5155,6 +5165,7 @@ static void test_mode_change(void) SetRect(&d3d_rect, 0, 0, d3d_width, d3d_height); GetWindowRect(focus_window, &focus_rect); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = d3d_width; device_desc.height = d3d_height; @@ -5210,6 +5221,7 @@ static void test_mode_change(void) /* The mode restore also happens when the device was created at the original screen size. */ + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -5269,6 +5281,7 @@ static void test_device_window_reset(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = NULL; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -5877,6 +5890,7 @@ static void test_occlusion_query(void) window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -6394,6 +6408,7 @@ static void test_vertex_shader_constant(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; @@ -6891,6 +6906,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; @@ -8606,6 +8622,7 @@ static void test_getdc(void) ok(!refcount, "Device has %u references left.\n", refcount); /* Backbuffer created with D3DFMT_UNKNOWN format. */ + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.width = 640; device_desc.height = 480; device_desc.device_window = window; @@ -9321,6 +9338,7 @@ static void test_pinned_buffers(void) for (test = 0; test < ARRAY_SIZE(tests); ++test) { + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 640; device_desc.height = 480; @@ -11276,6 +11294,7 @@ static void test_lost_device(void) window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -12218,6 +12237,7 @@ static void test_lockable_backbuffer(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.width = 640; device_desc.height = 480; device_desc.device_window = window; @@ -12261,6 +12281,7 @@ static void test_clip_planes_limits(void) for (i = 0; i < ARRAY_SIZE(device_flags); ++i) { + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; @@ -12795,6 +12816,7 @@ static void test_resource_access(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 16; device_desc.height = 16; @@ -13370,6 +13392,7 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; -- 2.20.1

3 2

[PATCH 1/6] d3d8/tests: Support creating a device with the specified adapter.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 008395df1a..76e5c7389c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -41,6 +41,7 @@ struct vec3 struct device_desc { + unsigned int adapter_ordinal; HWND device_window; unsigned int width; unsigned int height; @@ -109,9 +110,11 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; + unsigned int adapter_ordinal; IDirect3DDevice8 *device; DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + adapter_ordinal = D3DADAPTER_DEFAULT; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; @@ -123,6 +126,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons if (desc) { + adapter_ordinal = desc->adapter_ordinal; present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; @@ -135,12 +139,12 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons behavior_flags |= D3DCREATE_FPU_PRESERVE; } - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -148,7 +152,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -1390,6 +1394,7 @@ static void test_reset(void) i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.width = modes[i].w; device_desc.height = modes[i].h; device_desc.device_window = window; @@ -2905,6 +2910,7 @@ static void test_wndproc(void) expect_messages = create_messages; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = d3d_width; device_desc.height = d3d_height; @@ -3311,6 +3317,7 @@ static void test_wndproc_windowed(void) filter_messages = focus_window; + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -3543,6 +3550,7 @@ static void test_fpu_setup(void) hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 640; device_desc.height = 480; @@ -3772,6 +3780,7 @@ static void test_window_style(void) SetRect(&fullscreen_rect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); GetWindowRect(focus_window, &focus_rect); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -4074,6 +4083,7 @@ static void test_mode_change(void) SetRect(&d3d_rect, 0, 0, d3d_width, d3d_height); GetWindowRect(focus_window, &focus_rect); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = d3d_width; device_desc.height = d3d_height; @@ -4129,6 +4139,7 @@ static void test_mode_change(void) /* The mode restore also happens when the device was created at the original screen size. */ + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -4188,6 +4199,7 @@ static void test_device_window_reset(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = NULL; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -6222,6 +6234,7 @@ static void test_pinned_buffers(void) for (test = 0; test < ARRAY_SIZE(tests); ++test) { + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 640; device_desc.height = 480; @@ -7823,6 +7836,7 @@ static void test_lost_device(void) ok(!!d3d, "Failed to create a D3D object.\n"); hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -8666,6 +8680,7 @@ static void test_lockable_backbuffer(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.width = 640; device_desc.height = 480; device_desc.device_window = window; @@ -8709,6 +8724,7 @@ static void test_clip_planes_limits(void) for (i = 0; i < ARRAY_SIZE(device_flags); ++i) { + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; @@ -9086,6 +9102,7 @@ static void test_resource_access(void) ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); warp = adapter_is_warp(&identifier); + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 16; device_desc.height = 16; @@ -9734,6 +9751,7 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + desc.adapter_ordinal = D3DADAPTER_DEFAULT; desc.device_window = window; desc.width = 640; desc.height = 480; -- 2.20.1

3 2

[PATCH] d2d1: Make sure arc fill vertex buffer has correct BindFlag.
by Connor McAdams 17 Mar '20

17 Mar '20

Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d2d1/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c3decf6fbd..146f7009da 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1008,6 +1008,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.arc_vertex_count) { buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.arc_vertices; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) -- 2.20.1

2 1

[PATCH 4/4] webservices: Add support for WS_FIELD_NILLABLE_ITEM.
by Hans Leidekker 17 Mar '20

17 Mar '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 61 ++++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 7 ++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4fb9f44733..d66c2e4319 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3050,12 +3050,12 @@ static void test_datetime(void) static void test_repeating_element(void) { - WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}; - WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}; + WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}, data = {4, (BYTE *)"data"}; + WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}, structval = {9, (BYTE *)"structval"}; HRESULT hr; WS_XML_WRITER *writer; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; WS_ITEM_RANGE range; struct test { @@ -3067,6 +3067,15 @@ static void test_repeating_element(void) INT32 *val; ULONG count; } *test2; + struct value + { + INT32 data; + } value; + struct test3 + { + const struct value **val; + ULONG count; + } *test3; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3153,6 +3162,50 @@ static void test_repeating_element(void) check_output( writer, "<test><val>1</val><val>2</val></test>", __LINE__ ); HeapFree( GetProcessHeap(), 0, test2 ); + /* nillable item */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &data; + f2.ns = &ns; + f2.type = WS_INT32_TYPE; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct test3); + s2.alignment = TYPE_ALIGNMENT(struct test3); + s2.typeLocalName = &structval; + s2.typeNs = &ns; + s2.fields = fields2; + s2.fieldCount = 1; + + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.localName = &wrapper; + f.ns = &ns; + f.itemRange = NULL; + f.options = WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM; + + value.data = -1; + test3 = HeapAlloc( GetProcessHeap(), 0, sizeof(*test3) + 2 * sizeof(const struct value *) ); + test3->val = (const struct value **)(test3 + 1); + test3->val[0] = &value; + test3->val[1] = NULL; + test3->count = 2; + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test3, sizeof(test3), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<test><wrapper><val><data>-1</data></val><val a:nil=\"true\" " + "xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></wrapper></test>", __LINE__ ); + HeapFree( GetProcessHeap(), 0, test3 ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 021c961c94..53489786cd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3607,7 +3607,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) { if (options & WS_FIELD_POINTER) { - if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) return WS_WRITE_NILLABLE_POINTER; return WS_WRITE_REQUIRED_POINTER; } @@ -3754,7 +3754,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI ULONG count, size, field_options = desc->options; const char *ptr = buf + offset; - if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) + if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { FIXME( "options 0x%x not supported\n", desc->options ); return E_NOTIMPL; @@ -3771,7 +3771,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI if (is_nil_value( ptr, size )) { if (field_options & WS_FIELD_OPTIONAL) return S_OK; - if (field_options & WS_FIELD_NILLABLE) + if (field_options & (WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { if (field_options & WS_FIELD_POINTER) option = WS_WRITE_NILLABLE_POINTER; else option = WS_WRITE_NILLABLE_VALUE; @@ -3867,6 +3867,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); for (i = 0; i < desc->fieldCount; i++) { -- 2.20.1

1 0

[PATCH 3/4] webservices: Handle WS_XML_TEXT_TYPE_INT32 in text_to_uint64.
by Hans Leidekker 17 Mar '20

17 Mar '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b328bb779e..bf29990923 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5051,6 +5051,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT32: + { + const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; + *val = text_int32->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_INT64: { const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; -- 2.20.1

1 0

[PATCH 2/4] webservices/tests: Use wide character string literals.
by Hans Leidekker 17 Mar '20

17 Mar '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/channel.c | 51 +++------ dlls/webservices/tests/msg.c | 34 +++--- dlls/webservices/tests/proxy.c | 28 ++--- dlls/webservices/tests/reader.c | 57 ++++------ dlls/webservices/tests/url.c | 178 +++++++++++++------------------ dlls/webservices/tests/writer.c | 77 ++++++------- 6 files changed, 172 insertions(+), 253 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 6a45671057..d80f1f64cd 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -115,7 +115,6 @@ static void test_WsCreateChannel(void) static void test_WsOpenChannel(void) { - WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t'}; HRESULT hr; WS_CHANNEL *channel; WS_ENDPOINT_ADDRESS addr; @@ -134,8 +133,8 @@ static void test_WsOpenChannel(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = ARRAY_SIZE( url ); - addr.url.chars = url; + addr.url.length = ARRAY_SIZE( L"http://localhost" ) - 1; + addr.url.chars = (WCHAR *)L"http://localhost"; hr = WsOpenChannel( NULL, &addr, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -159,7 +158,6 @@ static void test_WsOpenChannel(void) static void test_WsResetChannel(void) { - WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t'}; HRESULT hr; WS_CHANNEL *channel; WS_CHANNEL_STATE state; @@ -179,8 +177,8 @@ static void test_WsResetChannel(void) ok( hr == S_OK, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = ARRAY_SIZE( url ); - addr.url.chars = url; + addr.url.length = ARRAY_SIZE( L"http://localhost" ) - 1; + addr.url.chars = (WCHAR *)L"http://localhost"; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -274,12 +272,6 @@ static void test_WsCreateListener(void) static void test_WsOpenListener(void) { - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WCHAR str2[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','2','0','1','7'}; - WCHAR str3[] = - {'n','e','t','.','t','c','p',':','/','/','1','2','7','.','0','.','0','.','1',':','2','0','1','7'}; WS_STRING url; WS_LISTENER *listener; HRESULT hr; @@ -300,9 +292,8 @@ static void test_WsOpenListener(void) hr = WsOpenListener( listener, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - url.length = ARRAY_SIZE( str ); - url.chars = str; + url.length = ARRAY_SIZE( L"net.tcp://+:2017/path" ) - 1; + url.chars = (WCHAR *)L"net.tcp://+:2017/path"; hr = WsOpenListener( NULL, &url, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -320,8 +311,8 @@ static void test_WsOpenListener(void) hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - url.length = ARRAY_SIZE( str2 ); - url.chars = str2; + url.length = ARRAY_SIZE( L"net.tcp://localhost:2017" ) - 1; + url.chars = (WCHAR *)L"net.tcp://localhost:2017"; hr = WsOpenListener( listener, &url, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -333,8 +324,8 @@ static void test_WsOpenListener(void) hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - url.length = ARRAY_SIZE( str3 ); - url.chars = str3; + url.length = ARRAY_SIZE( L"net.tcp://127.0.0.1:2017" ) - 1; + url.chars = (WCHAR *)L"net.tcp://127.0.0.1:2017"; hr = WsOpenListener( listener, &url, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -385,9 +376,7 @@ static void test_WsCreateChannelForListener(void) static void test_WsResetListener(void) { - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WS_STRING url = { ARRAY_SIZE( str ), str }; + WS_STRING url = { ARRAY_SIZE( L"net.tcp://+:2017/path" ) - 1, (WCHAR *)L"net.tcp://+:2017/path" }; WS_LISTENER *listener; WS_LISTENER_STATE state; WS_LISTENER_PROPERTY prop; @@ -433,11 +422,6 @@ static void test_WsResetListener(void) WsFreeListener( listener ); } -static const WCHAR fmt_soap_udp[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; -static const WCHAR fmt_net_tcp[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - struct listener_info { int port; @@ -494,7 +478,7 @@ static void client_message_read_write( const struct listener_info *info ) ok( hr == S_OK, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt_soap_udp, info->port ); + addr.url.length = wsprintfW( buf, L"soap.udp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -635,7 +619,7 @@ static void client_duplex_session( const struct listener_info *info ) ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt_net_tcp, info->port ); + addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -707,7 +691,7 @@ static void server_accept_channel( WS_CHANNEL *channel ) static void client_accept_channel( const struct listener_info *info ) { - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_net_tcp : fmt_soap_udp; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? L"net.tcp://localhost:%u" : L"soap.udp://localhost:%u"; WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; WCHAR buf[64]; WS_LISTENER *listener; @@ -827,7 +811,7 @@ static void client_request_reply( const struct listener_info *info ) ok( hr == S_OK, "got %08x\n", hr ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt_net_tcp, info->port ); + addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -867,7 +851,7 @@ static void client_request_reply( const struct listener_info *info ) static DWORD CALLBACK listener_proc( void *arg ) { struct listener_info *info = arg; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_net_tcp : fmt_soap_udp; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? L"net.tcp://localhost:%u" : L"soap.udp://localhost:%u"; WS_LISTENER *listener; WS_CHANNEL *channel; WCHAR buf[64]; @@ -973,7 +957,6 @@ done: static HRESULT set_firewall( enum firewall_op op ) { - static const WCHAR testW[] = {'w','e','b','s','e','r','v','i','c','e','s','_','t','e','s','t',0}; HRESULT hr, init; INetFwMgr *mgr = NULL; INetFwPolicy *policy = NULL; @@ -1013,7 +996,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( testW ); + name = SysAllocString( L"webservices_test" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 766c2c5acf..ed399db636 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -257,7 +257,6 @@ static void test_WsInitializeMessage(void) static void test_WsAddressMessage(void) { - static WCHAR localhost[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; HRESULT hr; WS_MESSAGE *msg; WS_ENDPOINT_ADDRESS endpoint; @@ -304,8 +303,8 @@ static void test_WsAddressMessage(void) ok( hr == S_OK, "got %08x\n", hr ); memset( &endpoint, 0, sizeof(endpoint) ); - endpoint.url.chars = localhost; - endpoint.url.length = ARRAY_SIZE( localhost ); + endpoint.url.chars = (WCHAR *)L"http://localhost/"; + endpoint.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; hr = WsAddressMessage( msg, &endpoint, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -639,12 +638,11 @@ static void test_WsSetHeader(void) "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "<a:Action s:mustUnderstand=\"1\">action2</a:Action></s:Header>" "<s:Body/></s:Envelope>"; - static const WCHAR action[] = {'a','c','t','i','o','n',0}; static const WS_XML_STRING action2 = {7, (BYTE *)"action2"}; HRESULT hr; WS_MESSAGE *msg; WS_XML_WRITER *writer; - const WCHAR *ptr = action; + const WCHAR *ptr = L"action"; hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -848,8 +846,6 @@ static void test_WsAddCustomHeader(void) "<header2 xmlns=\"ns\">value2</header2></s:Header><s:Body/></s:Envelope>"; static WS_XML_STRING header = {6, (BYTE *)"header"}, ns = {2, (BYTE *)"ns"}; static WS_XML_STRING header2 = {7, (BYTE *)"header2"}; - static WCHAR valueW[] = {'v','a','l','u','e',0}; - static WCHAR value2W[] = {'v','a','l','u','e','2',0}; HRESULT hr; WS_MESSAGE *msg; WS_ELEMENT_DESCRIPTION desc; @@ -891,12 +887,12 @@ static void test_WsAddCustomHeader(void) ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); - test.value = valueW; + test.value = L"value"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); - test.value = value2W; + test.value = L"value2"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); @@ -1243,9 +1239,8 @@ static void test_WsGetHeader(void) "<Action s:mustUnderstand=\"1\" " "xmlns=\"http://schemas.microsoft.com/ws/2005/05/addressing/none\">action</Action>" "</s:Header><s:Body/></s:Envelope>"; - static WCHAR action[] = {'a','c','t','i','o','n',0}; WS_MESSAGE *msg; - WCHAR *ptr; + const WCHAR *ptr; HRESULT hr; hr = WsGetHeader( NULL, 0, 0, 0, NULL, NULL, 0, NULL ); @@ -1275,7 +1270,7 @@ static void test_WsGetHeader(void) hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, NULL, 0, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - ptr = action; + ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); @@ -1291,7 +1286,7 @@ static void test_WsGetHeader(void) hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( ptr != NULL, "ptr not set\n" ); - ok( !memcmp( ptr, action, sizeof(action) ), "wrong data\n" ); + ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); @@ -1300,7 +1295,7 @@ static void test_WsGetHeader(void) hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ptr = action; + ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); if (hr == S_OK) check_output_header( msg, expected2, -1, 0, 0, __LINE__ ); @@ -1309,7 +1304,7 @@ static void test_WsGetHeader(void) hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( ptr != NULL, "ptr not set\n" ); - ok( !memcmp( ptr, action, sizeof(action) ), "wrong data\n" ); + ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); @@ -1318,7 +1313,7 @@ static void test_WsGetHeader(void) hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ptr = action; + ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); if (hr == S_OK) check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); @@ -1327,7 +1322,7 @@ static void test_WsGetHeader(void) hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( ptr != NULL, "ptr not set\n" ); - ok( !memcmp( ptr, action, sizeof(action) ), "wrong data\n" ); + ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); } @@ -1336,7 +1331,6 @@ static void test_WsGetCustomHeader(void) static char expected[] = "<Envelope><Header><Custom xmlns=\"ns\">value</Custom></Header><Body/></Envelope>"; static WS_XML_STRING custom = {6, (BYTE *)"Custom"}, ns = {2, (BYTE *)"ns"}; - static WCHAR valueW[] = {'v','a','l','u','e',0}; WS_ELEMENT_DESCRIPTION desc; WS_STRUCT_DESCRIPTION s; WS_FIELD_DESCRIPTION f, *fields[1]; @@ -1375,7 +1369,7 @@ static void test_WsGetCustomHeader(void) desc.type = WS_STRUCT_TYPE; desc.typeDescription = &s; - test.value = valueW; + test.value = L"value"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, 0, 0, __LINE__ ); @@ -1394,7 +1388,7 @@ static void test_WsGetCustomHeader(void) NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( test.value != NULL, "value not set\n" ); - ok( !memcmp( test.value, valueW, sizeof(valueW) ), "wrong value\n" ); + ok( !memcmp( test.value, L"value", sizeof(L"value") ), "wrong value\n" ); WsFreeMessage( msg ); } diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 07610ac70e..e2c6c87b83 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -146,7 +146,6 @@ static void test_WsCreateServiceProxyFromTemplate(void) static void test_WsOpenServiceProxy(void) { - WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/'}; HRESULT hr; WS_SERVICE_PROXY *proxy; WS_SERVICE_PROXY_STATE state; @@ -164,8 +163,8 @@ static void test_WsOpenServiceProxy(void) ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = ARRAY_SIZE( url ); - addr.url.chars = url; + addr.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; + addr.url.chars = (WCHAR *)L"http://localhost/"; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -187,7 +186,6 @@ static void test_WsOpenServiceProxy(void) static void test_WsResetServiceProxy(void) { - WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/'}; HRESULT hr; WS_SERVICE_PROXY *proxy; WS_ENDPOINT_ADDRESS addr; @@ -206,8 +204,8 @@ static void test_WsResetServiceProxy(void) ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); - addr.url.length = ARRAY_SIZE( url ); - addr.url.chars = url; + addr.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; + addr.url.chars = (WCHAR *)L"http://localhost/"; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -230,8 +228,6 @@ static void test_WsResetServiceProxy(void) static HRESULT create_channel( int port, WS_CHANNEL **ret ) { - static const WCHAR fmt[] = - {'h','t','t','p',':','/','/','1','2','7','.','0','.','0','.','1',':','%','u',0}; WS_CHANNEL_PROPERTY prop[2]; WS_ENVELOPE_VERSION env_version = WS_ENVELOPE_VERSION_SOAP_1_1; WS_ADDRESSING_VERSION addr_version = WS_ADDRESSING_VERSION_TRANSPORT; @@ -253,7 +249,7 @@ static HRESULT create_channel( int port, WS_CHANNEL **ret ) if (hr != S_OK) return hr; memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt, port ); + addr.url.length = wsprintfW( buf, L"http://127.0.0.1:%u", port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); if (hr == S_OK) *ret = channel; @@ -383,8 +379,6 @@ static WS_HTTP_HEADER_MAPPING *response_header_mappings[] = static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) { - static const WCHAR fmt[] = - {'h','t','t','p',':','/','/','1','2','7','.','0','.','0','.','1',':','%','u','/',0}; WS_ENVELOPE_VERSION env_version; WS_ADDRESSING_VERSION addr_version; WS_HTTP_MESSAGE_MAPPING mapping; @@ -421,7 +415,7 @@ static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) if (hr != S_OK) return hr; memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( url, fmt, port ); + addr.url.length = wsprintfW( url, L"http://127.0.0.1:%u", port ); addr.url.chars = url; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); if (hr == S_OK) *ret = proxy; @@ -485,7 +479,6 @@ static HRESULT CALLBACK send_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *sta static HRESULT CALLBACK recv_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *state, WS_ERROR *error ) { static const WS_XML_STRING header = {20, (BYTE *)"MappedResponseHeader"}; - static const WCHAR valueW[] = {'v','a','l','u','e',0}; WCHAR *str; HRESULT hr; @@ -493,13 +486,12 @@ static HRESULT CALLBACK recv_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *sta hr = WsGetMappedHeader( msg, &header, WS_SINGLETON_HEADER, 0, WS_WSZ_TYPE, WS_READ_OPTIONAL_POINTER, heap, &str, sizeof(str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW(str, valueW), "wrong value %s\n", wine_dbgstr_w(str) ); + ok( !wcscmp(str, L"value"), "wrong value %s\n", wine_dbgstr_w(str) ); return S_OK; } static void test_WsCall( int port ) { - static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {'t','e','s','t','2',0}; WS_XML_STRING str = {3, (BYTE *)"str"}; WS_XML_STRING req = {3, (BYTE *)"req"}; WS_XML_STRING resp = {4, (BYTE *)"resp"}; @@ -584,8 +576,8 @@ static void test_WsCall( int port ) ok( hr == E_INVALIDARG, "got %08x\n", hr ); in.val = 1; - str_array[0] = testW; - str_array[1] = test2W; + str_array[0] = L"test"; + str_array[1] = L"test2"; in.str = str_array; in.count = 2; @@ -620,7 +612,7 @@ static void test_WsCall( int port ) hr = WsCall( proxy, &op, args, heap, prop, ARRAY_SIZE(prop), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( out.str, testW ), "wrong data\n" ); + ok( !wcscmp( out.str, L"test" ), "wrong data\n" ); ok( out.count == 2, "got %u\n", out.count ); ok( out.val[0] == 1, "got %u\n", out.val[0] ); ok( out.val[1] == 2, "got %u\n", out.val[1] ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 96eee2cf77..5fb81b5dc8 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1325,10 +1325,8 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { - static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {' ','t','e','s','t',' '}; static const GUID guid = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; - static const WCHAR utf8W[] = {0x2019,0}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -1381,7 +1379,7 @@ static void test_WsReadType(void) WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( val_str != NULL, "pointer not set\n" ); - if (val_str) ok( !lstrcmpW( val_str, testW ), "wrong data\n" ); + if (val_str) ok( !wcscmp( val_str, L"test" ), "wrong data\n" ); val_bool = -1; prepare_type_test( reader, "<t>true</t>", sizeof("<t>true</t>") - 1 ); @@ -1748,7 +1746,7 @@ static void test_WsReadType(void) WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( val_str != NULL, "pointer not set\n" ); - ok( !lstrcmpW( val_str, utf8W ), "got %s\n", wine_dbgstr_w(val_str) ); + ok( !lstrcmpW( val_str, L"\x2019" ), "got %s\n", wine_dbgstr_w(val_str) ); val_str = NULL; prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); @@ -1787,7 +1785,7 @@ static void test_WsReadType(void) WS_READ_REQUIRED_VALUE, heap, &val_string, sizeof(val_string), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( val_string.length == 6, "got %u\n", val_string.length ); - ok( !memcmp( val_string.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + ok( !memcmp( val_string.chars, L" test ", 12 ), "wrong data\n" ); val_string.length = 0xdeadbeef; val_string.chars = (WCHAR *)0xdeadbeef; @@ -1811,7 +1809,7 @@ static void test_WsReadType(void) WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( val_id.uri.length == 6, "got %u\n", val_string.length ); - ok( !memcmp( val_id.uri.chars, test2W, sizeof(test2W) ), "wrong data\n" ); + ok( !memcmp( val_id.uri.chars, L" test ", 12 ), "wrong data\n" ); ok( IsEqualGUID( &val_id.guid, &guid_null ), "wrong guid\n" ); memset( &val_id, 0, sizeof(val_id) ); @@ -1882,7 +1880,6 @@ static void test_WsReadType(void) static void test_WsGetXmlAttribute(void) { - static const WCHAR valueW[] = {'v','a','l','u','e',0}; HRESULT hr; WS_XML_READER *reader; WS_XML_STRING xmlstr; @@ -1919,7 +1916,7 @@ static void test_WsGetXmlAttribute(void) todo_wine ok( str != NULL, "str not set\n" ); todo_wine ok( count == 5, "got %u\n", count ); /* string is not null-terminated */ - if (str) ok( !memcmp( str, valueW, count * sizeof(WCHAR) ), "wrong data\n" ); + if (str) ok( !memcmp( str, L"value", count * sizeof(WCHAR) ), "wrong data\n" ); xmlstr.bytes = (BYTE *)"none"; xmlstr.length = sizeof("none") - 1; @@ -2285,7 +2282,6 @@ static void prepare_struct_type_test( WS_XML_READER *reader, const char *data ) static void test_simple_struct_type(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -2354,7 +2350,7 @@ static void test_simple_struct_type(void) if (test) { ok( test->str != NULL, "str not set\n" ); - if (test->str) ok( !lstrcmpW( test->str, testW ), "wrong data\n" ); + if (test->str) ok( !wcscmp( test->str, L"test" ), "wrong data\n" ); } hr = WsGetReaderNode( reader, &node, NULL ); @@ -2370,7 +2366,7 @@ static void test_simple_struct_type(void) if (test) { ok( test->str != NULL, "str not set\n" ); - if (test->str) ok( !lstrcmpW( test->str, testW ), "wrong data\n" ); + if (test->str) ok( !wcscmp( test->str, L"test" ), "wrong data\n" ); } hr = WsGetReaderNode( reader, &node, NULL ); @@ -2386,7 +2382,7 @@ static void test_simple_struct_type(void) if (test) { ok( test->str != NULL, "str not set\n" ); - if (test->str) ok( !lstrcmpW( test->str, testW ), "wrong data\n" ); + if (test->str) ok( !wcscmp( test->str, L"test" ), "wrong data\n" ); } hr = WsGetReaderNode( reader, &node, NULL ); @@ -2412,7 +2408,7 @@ static void test_simple_struct_type(void) if (test) { ok( test->str != NULL, "str not set\n" ); - if (test->str) ok( !lstrcmpW( test->str, testW ), "wrong data\n" ); + if (test->str) ok( !wcscmp( test->str, L"test" ), "wrong data\n" ); } hr = WsGetReaderNode( reader, &node, NULL ); @@ -2434,7 +2430,7 @@ static void test_simple_struct_type(void) if (test) { ok( test->str != NULL, "str not set\n" ); - if (test->str) ok( !lstrcmpW( test->str, testW ), "wrong data test %p test->str %p\n", test, test->str ); + if (test->str) ok( !wcscmp( test->str, L"test" ), "wrong data test %p test->str %p\n", test, test->str ); } hr = WsGetReaderNode( reader, &node, NULL ); @@ -2903,7 +2899,6 @@ static void test_WsGetNamespaceFromPrefix(void) static void test_text_field_mapping(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -2939,7 +2934,7 @@ static void test_text_field_mapping(void) ok( hr == S_OK, "got %08x\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->str != NULL, "str not set\n" ); - ok( !lstrcmpW( test->str, testW ), "got %s\n", wine_dbgstr_w(test->str) ); + ok( !wcscmp( test->str, L"test" ), "got %s\n", wine_dbgstr_w(test->str) ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -2958,8 +2953,6 @@ static void test_complex_struct_type(void) "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" "<trailing>content</trailing>" "</o:OfficeConfig>"; - static const WCHAR timestampW[] = - {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; HRESULT hr; WS_ERROR *error; WS_ERROR_PROPERTY prop; @@ -3056,7 +3049,7 @@ static void test_complex_struct_type(void) WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); ok( hr == S_OK, "got %08x\n", hr ); ok( test != NULL, "test not set\n" ); - ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + ok( !wcscmp( test->services->generationtime, L"2015-09-03T18:47:54" ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3090,7 +3083,7 @@ static void test_complex_struct_type(void) WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); ok( hr == S_OK, "got %08x\n", hr ); ok( test != NULL, "test not set\n" ); - if (test) ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + if (test) ok( !wcscmp( test->services->generationtime, L"2015-09-03T18:47:54" ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3158,7 +3151,6 @@ static void test_repeating_element(void) "<services>" "<service><name></name></service>" "</services>"; - static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; WS_XML_STRING str_name = {4, (BYTE *)"name"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; WS_XML_STRING str_service = {7, (BYTE *)"service"}; @@ -3308,8 +3300,8 @@ static void test_repeating_element(void) ok( test2 != NULL, "test2 not set\n" ); ok( test2->service != NULL, "service not set\n" ); ok( test2->service_count == 2, "got %u\n", test2->service_count ); - ok( !lstrcmpW( test2->service[0].id, oneW ), "wrong data\n" ); - ok( !lstrcmpW( test2->service[1].id, twoW ), "wrong data\n" ); + ok( !wcscmp( test2->service[0].id, L"1" ), "wrong data\n" ); + ok( !wcscmp( test2->service[1].id, L"2" ), "wrong data\n" ); /* repeating attribute field + text field mapping */ prepare_struct_type_test( reader, data5 ); @@ -3331,10 +3323,10 @@ static void test_repeating_element(void) ok( test3 != NULL, "test3 not set\n" ); ok( test3->service != NULL, "service not set\n" ); ok( test3->service_count == 2, "got %u\n", test3->service_count ); - ok( !lstrcmpW( test3->service[0].name, oneW ), "wrong data\n" ); - ok( !lstrcmpW( test3->service[0].id, oneW ), "wrong data\n" ); - ok( !lstrcmpW( test3->service[1].name, twoW ), "wrong data\n" ); - ok( !lstrcmpW( test3->service[1].id, twoW ), "wrong data\n" ); + ok( !wcscmp( test3->service[0].name, L"1" ), "wrong data\n" ); + ok( !wcscmp( test3->service[0].id, L"1" ), "wrong data\n" ); + ok( !wcscmp( test3->service[1].name, L"2" ), "wrong data\n" ); + ok( !wcscmp( test3->service[1].id, L"2" ), "wrong data\n" ); /* empty text, item range */ prepare_struct_type_test( reader, data6 ); @@ -4330,7 +4322,6 @@ static void test_WsReadBytes(void) static void test_WsReadChars(void) { - static const WCHAR textW[] = {'t','e','x','t'}; HRESULT hr; WS_XML_READER *reader; const WS_XML_NODE *node; @@ -4411,7 +4402,7 @@ static void test_WsReadChars(void) hr = WsReadChars( reader, bufW, 2, &count, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( count == 2, "got %u\n", count ); - ok( !memcmp( bufW, textW, 2 * sizeof(WCHAR) ), "wrong data\n" ); + ok( !memcmp( bufW, L"te", 2 * sizeof(WCHAR) ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -6168,7 +6159,6 @@ static void test_WsReadXmlBuffer(void) static void test_union_type(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING str_s = {1, (BYTE *)"s"}; HRESULT hr; @@ -6243,7 +6233,7 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->choice == CHOICE_A, "got %d\n", test->choice ); - ok( !lstrcmpW(test->value.a, testW), "got %s\n", wine_dbgstr_w(test->value.a) ); + ok( !wcscmp(test->value.a, L"test"), "got %s\n", wine_dbgstr_w(test->value.a) ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); @@ -6386,7 +6376,6 @@ static void test_float(void) static void test_repeating_element_choice(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; @@ -6470,7 +6459,7 @@ static void test_repeating_element_choice(void) ok( test != NULL, "test not set\n" ); ok( test->count == 1, "got %u\n", test->count ); ok( test->items[0].choice == CHOICE_A, "got %d\n", test->items[0].choice ); - ok( !lstrcmpW(test->items[0].value.a, testW), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); + ok( !wcscmp(test->items[0].value.a, L"test"), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); test = NULL; prepare_struct_type_test( reader, "<t><b>123</b></t>" ); @@ -6490,7 +6479,7 @@ static void test_repeating_element_choice(void) ok( test != NULL, "test not set\n" ); ok( test->count == 2, "got %u\n", test->count ); ok( test->items[0].choice == CHOICE_A, "got %d\n", test->items[0].choice ); - ok( !lstrcmpW(test->items[0].value.a, testW), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); + ok( !wcscmp(test->items[0].value.a, L"test"), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); ok( test->items[1].choice == CHOICE_B, "got %d\n", test->items[1].choice ); ok( test->items[1].value.b == 123, "got %u\n", test->items[1].value.b ); diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 2b8dda482e..718f072f19 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -23,58 +23,48 @@ static void test_WsDecodeUrl(void) { - static WCHAR url1[] = {'h','t','t','p',':','/','/','h','o','s','t',0}; - static WCHAR url2[] = {'h','t','t','p','s',':','/','/','h','o','s','t',0}; - static WCHAR url3[] = {'h','t','t','p',':','/','/','h','o','s','t',':','8','0',0}; - static WCHAR url4[] = {'h','t','t','p','s',':','/','/','h','o','s','t',':','8','0',0}; - static WCHAR url5[] = {'h','t','t','p',':','/','/','h','o','s','t','/','p','a','t','h',0}; - static WCHAR url6[] = {'h','t','t','p',':','/','/','h','o','s','t','/','p','a','t','h','?', - 'q','u','e','r','y',0}; - static WCHAR url7[] = {'h','t','t','p',':','/','/','h','o','s','t','/','p','a','t','h','?', - 'q','u','e','r','y','#','f','r','a','g',0}; - static WCHAR url8[] = {'H','T','T','P',':','/','/','h','o','s','t',0}; - static WCHAR url9[] = {'h','t','t','q',':','/','/','h','o','s','t',0}; - static WCHAR url10[] = {'h','t','t','p',':',0}; - static WCHAR url11[] = {'h','t','t','p',0}; - static WCHAR url12[] = {'n','e','t','.','t','c','p',':','/','/','h','o','s','t',0}; - static WCHAR url13[] = {'s','o','a','p','.','u','d','p',':','/','/','h','o','s','t',0}; - static WCHAR url14[] = {'n','e','t','.','p','i','p','e',':','/','/','h','o','s','t',0}; - static WCHAR url15[] = {'h','t','t','p',':','/','h','o','s','t',0}; - static WCHAR url16[] = {'h','t','t','p',':','h','o','s','t',0}; - static WCHAR url17[] = {'h','t','t','p',':','/','/','/','h','o','s','t',0}; - static WCHAR url18[] = {'h','t','t','p',':','/','/','h','o','s','t','/',0}; - static WCHAR url19[] = {'h','t','t','p',':','/','/','h','o','s','t',':','/',0}; - static WCHAR url20[] = {'h','t','t','p',':','/','/','h','o','s','t',':','6','5','5','3','6',0}; - static WCHAR url21[] = {'h','t','t','p',':','/','/','h','o','s','t','?','q','u','e','r','y',0}; - static WCHAR url22[] = {'h','t','t','p',':','/','/','h','o','s','t','#','f','r','a','g',0}; - static WCHAR url23[] = {'h','t','t','p',':','/','/','h','o','s','t','%','2','0','2',0}; - static WCHAR url24[] = {'h','t','t','p',':','/','/','h','o','s','t','/','p','a','t','h', - '%','2','0','2',0}; - static WCHAR url25[] = {'h','t','t','p',':','/','/','h','o','s','t','?','q','u','e','r','y', - '%','2','0','2',0}; - static WCHAR url26[] = {'h','t','t','p',':','/','/','h','o','s','t','#','f','r','a','g', - '%','2','0','2',0}; - static WCHAR url27[] = {'h','t','t','p',':','/','/','h','o','s','t','/','%','c','3','%','a','b','/',0}; - static WCHAR host2[] = {'h','o','s','t',' ','2'}; - static WCHAR path2[] = {'/','p','a','t','h',' ','2'}; - static WCHAR path3[] = {'/',0xeb,'/'}; - static WCHAR query2[] = {'q','u','e','r','y',' ','2'}; - static WCHAR frag2[] = {'f','r','a','g',' ','2'}; + static const WCHAR url1[] = L"http://host"; + static const WCHAR url2[] = L"https://host"; + static const WCHAR url3[] = L"http://host:80"; + static const WCHAR url4[] = L"https://host:80"; + static const WCHAR url5[] = L"http://host/path"; + static const WCHAR url6[] = L"http://host/path?query"; + static const WCHAR url7[] = L"http://host/path?query#frag"; + static const WCHAR url8[] = L"HTTP://host"; + static const WCHAR url9[] = L"httq://host"; + static const WCHAR url10[] = L"http:"; + static const WCHAR url11[] = L"http"; + static const WCHAR url12[] = L"net.tcp://host"; + static const WCHAR url13[] = L"soap.udp://host"; + static const WCHAR url14[] = L"net.pipe://host"; + static const WCHAR url15[] = L"http:/host"; + static const WCHAR url16[] = L"http:host"; + static const WCHAR url17[] = L"http:///host"; + static const WCHAR url18[] = L"http://host/"; + static const WCHAR url19[] = L"http://host:/"; + static const WCHAR url20[] = L"http://host:65536"; + static const WCHAR url21[] = L"http://host?query"; + static const WCHAR url22[] = L"http://host#frag"; + static const WCHAR url23[] = L"http://host%202"; + static const WCHAR url24[] = L"http://host/path%202"; + static const WCHAR url25[] = L"http://host?query%202"; + static const WCHAR url26[] = L"http://host#frag%202"; + static const WCHAR url27[] = L"http://host/%c3%ab/"; static const struct { - WCHAR *str; + const WCHAR *str; HRESULT hr; WS_URL_SCHEME_TYPE scheme; - WCHAR *host; + const WCHAR *host; ULONG host_len; USHORT port; - WCHAR *port_str; + const WCHAR *port_str; ULONG port_len; - WCHAR *path; + const WCHAR *path; ULONG path_len; - WCHAR *query; + const WCHAR *query; ULONG query_len; - WCHAR *fragment; + const WCHAR *fragment; ULONG fragment_len; } tests[] = @@ -85,8 +75,7 @@ static void test_WsDecodeUrl(void) { url4, S_OK, WS_URL_HTTPS_SCHEME_TYPE, url4 + 8, 4, 80, url4 + 13, 2 }, { url5, S_OK, WS_URL_HTTP_SCHEME_TYPE, url5 + 7, 4, 80, NULL, 0, url5 + 11, 5 }, { url6, S_OK, WS_URL_HTTP_SCHEME_TYPE, url5 + 7, 4, 80, NULL, 0, url6 + 11, 5, url6 + 17, 5 }, - { url7, S_OK, WS_URL_HTTP_SCHEME_TYPE, url5 + 7, 4, 80, NULL, 0, url7 + 11, 5, url7 + 17, 5, - url7 + 23, 4 }, + { url7, S_OK, WS_URL_HTTP_SCHEME_TYPE, url5 + 7, 4, 80, NULL, 0, url7 + 11, 5, url7 + 17, 5, url7 + 23, 4 }, { url8, S_OK, WS_URL_HTTP_SCHEME_TYPE, url1 + 7, 4, 80 }, { url9, WS_E_INVALID_FORMAT }, { url10, WS_E_INVALID_FORMAT }, @@ -103,11 +92,11 @@ static void test_WsDecodeUrl(void) { url21, S_OK, WS_URL_HTTP_SCHEME_TYPE, url21 + 7, 4, 80, NULL, 0, NULL, 0, url21 + 12, 5 }, { url22, S_OK, WS_URL_HTTP_SCHEME_TYPE, url22 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, url22 + 12, 4 }, - { url23, S_OK, WS_URL_HTTP_SCHEME_TYPE, host2, 6, 80 }, - { url24, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, path2, 7 }, - { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, query2, 7 }, - { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, frag2, 6 }, - { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, path3, 3 }, + { url23, S_OK, WS_URL_HTTP_SCHEME_TYPE, L"host 2", 6, 80 }, + { url24, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, L"/path 2", 7 }, + { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, L"query 2", 7 }, + { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, L"frag 2", 6 }, + { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, L"/\x00eb/", 3 }, }; WS_HEAP *heap; WS_STRING str; @@ -126,21 +115,19 @@ static void test_WsDecodeUrl(void) hr = WsDecodeUrl( &str, 0, heap, (WS_URL **)&url, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - str.chars = url1; + str.chars = (WCHAR *)url1; str.length = lstrlenW( url1 ); hr = WsDecodeUrl( &str, 0, NULL, (WS_URL **)&url, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { - static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; - str.length = lstrlenW( tests[i].str ); - str.chars = tests[i].str; + str.chars = (WCHAR *)tests[i].str; url = NULL; hr = WsDecodeUrl( &str, 0, heap, (WS_URL **)&url, NULL ); ok( hr == tests[i].hr || - broken(hr == WS_E_INVALID_FORMAT && str.length >= 8 && !memcmp(netpipe, str.chars, 8)), + broken(hr == WS_E_INVALID_FORMAT && str.length >= 8 && !memcmp(L"net.pipe", str.chars, 8)), "%u: got %08x\n", i, hr ); if (hr != S_OK) continue; @@ -193,42 +180,31 @@ static void test_WsDecodeUrl(void) static void test_WsEncodeUrl(void) { - static WCHAR host[] = {'h','o','s','t'}; - static WCHAR host2[] = {'h','o','s','t',' ','2'}; - static WCHAR path[] = {'/','p','a','t','h'}; - static WCHAR path2[] = {'/','p','a','t','h',' ','2'}; - static WCHAR query[] = {'q','u','e','r','y'}; - static WCHAR query2[] = {'q','u','e','r','y',' ','2'}; - static WCHAR frag[] = {'f','r','a','g'}; - static WCHAR frag2[] = {'f','r','a','g',' ','2'}; - static WCHAR port[] = {'8','0','8','0'}; - static WCHAR port2[] = {'6','5','5','3','6'}; - static const WCHAR url1[] = {'h','t','t','p',':','/','/','h','o','s','t'}; - static const WCHAR url2[] = {'h','t','t','p',':','/','/'}; - static const WCHAR url3[] = {'h','t','t','p',':','/','/','/','p','a','t','h'}; - static const WCHAR url4[] = {'h','t','t','p',':','/','/','?','q','u','e','r','y'}; - static const WCHAR url5[] = {'h','t','t','p',':','/','/','#','f','r','a','g'}; - static const WCHAR url6[] = {'h','t','t','p',':','/','/','h','o','s','t',':','8','0','8','0', - '/','p','a','t','h','?','q','u','e','r','y','#','f','r','a','g'}; - static const WCHAR url7[] = {'h','t','t','p',':','/','/',':','8','0','8','0'}; - static const WCHAR url8[] = {'h','t','t','p',':','/','/'}; - static const WCHAR url9[] = {'h','t','t','p',':','/','/','/','p','a','t','h','%','2','0','2'}; - static const WCHAR url10[] = {'h','t','t','p',':','/','/','?','q','u','e','r','y','%','2','0','2'}; - static const WCHAR url11[] = {'h','t','t','p',':','/','/','#','f','r','a','g','%','2','0','2'}; - static const WCHAR url12[] = {'h','t','t','p',':','/','/','h','o','s','t','%','2','0','2'}; + static const WCHAR url1[] = L"http://host"; + static const WCHAR url2[] = L"http://"; + static const WCHAR url3[] = L"http:///path"; + static const WCHAR url4[] = L"http://?query"; + static const WCHAR url5[] = L"http://#frag"; + static const WCHAR url6[] = L"http://host:8080/path?query#frag"; + static const WCHAR url7[] = L"http://:8080"; + static const WCHAR url8[] = L"http://"; + static const WCHAR url9[] = L"http:///path%202"; + static const WCHAR url10[] = L"http://?query%202"; + static const WCHAR url11[] = L"http://#frag%202"; + static const WCHAR url12[] = L"http://host%202"; static const struct { WS_URL_SCHEME_TYPE scheme; - WCHAR *host; + const WCHAR *host; ULONG host_len; USHORT port; - WCHAR *port_str; + const WCHAR *port_str; ULONG port_len; - WCHAR *path; + const WCHAR *path; ULONG path_len; - WCHAR *query; + const WCHAR *query; ULONG query_len; - WCHAR *fragment; + const WCHAR *fragment; ULONG fragment_len; HRESULT hr; ULONG len; @@ -236,22 +212,22 @@ static void test_WsEncodeUrl(void) } tests[] = { - { WS_URL_HTTP_SCHEME_TYPE, host, 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 11, url1 }, + { WS_URL_HTTP_SCHEME_TYPE, L"host", 4, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 11, url1 }, { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 7, url2 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, path, 5, NULL, 0, NULL, 0, S_OK, 12, url3 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, query, 5, NULL, 0, S_OK, 13, url4 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, frag, 4, S_OK, 12, url5 }, - { WS_URL_HTTP_SCHEME_TYPE, host, 4, 0, port, 4, path, 5, query, 5, frag, 4, S_OK, 32, url6 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, L"/path", 5, NULL, 0, NULL, 0, S_OK, 12, url3 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, L"query", 5, NULL, 0, S_OK, 13, url4 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, L"frag", 4, S_OK, 12, url5 }, + { WS_URL_HTTP_SCHEME_TYPE, L"host", 4, 0, L"8080", 4, L"/path", 5, L"query", 5, L"frag", 4, S_OK, 32, url6 }, { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 8080, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 12, url7 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, port, 4, NULL, 0, NULL, 0, NULL, 0, S_OK, 12, url7 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 8080, port, 4, NULL, 0, NULL, 0, NULL, 0, S_OK, 12, url7 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 8181, port, 4, NULL, 0, NULL, 0, NULL, 0, E_INVALIDARG, 0, NULL }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, port2, 5, NULL, 0, NULL, 0, NULL, 0, WS_E_INVALID_FORMAT, 0, NULL }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, L"8080", 4, NULL, 0, NULL, 0, NULL, 0, S_OK, 12, url7 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 8080, L"8080", 4, NULL, 0, NULL, 0, NULL, 0, S_OK, 12, url7 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 8181, L"8080", 4, NULL, 0, NULL, 0, NULL, 0, E_INVALIDARG, 0, NULL }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, L"65536", 5, NULL, 0, NULL, 0, NULL, 0, WS_E_INVALID_FORMAT, 0, NULL }, { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 80, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 7, url8 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, path2, 7, NULL, 0, NULL, 0, S_OK, 16, url9 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, query2, 7, NULL, 0, S_OK, 17, url10 }, - { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, frag2, 6, S_OK, 16, url11 }, - { WS_URL_HTTP_SCHEME_TYPE, host2, 6, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 15, url12 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, L"/path 2", 7, NULL, 0, NULL, 0, S_OK, 16, url9 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, L"query 2", 7, NULL, 0, S_OK, 17, url10 }, + { WS_URL_HTTP_SCHEME_TYPE, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, L"frag 2", 6, S_OK, 16, url11 }, + { WS_URL_HTTP_SCHEME_TYPE, L"host 2", 6, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, S_OK, 15, url12 }, }; WS_HEAP *heap; WS_STRING str; @@ -275,16 +251,16 @@ static void test_WsEncodeUrl(void) { memset( &url, 0, sizeof(url) ); url.url.scheme = tests[i].scheme; - url.host.chars = tests[i].host; + url.host.chars = (WCHAR *)tests[i].host; url.host.length = tests[i].host_len; url.port = tests[i].port; - url.portAsString.chars = tests[i].port_str; + url.portAsString.chars = (WCHAR *)tests[i].port_str; url.portAsString.length = tests[i].port_len; - url.path.chars = tests[i].path; + url.path.chars = (WCHAR *)tests[i].path; url.path.length = tests[i].path_len; - url.query.chars = tests[i].query; + url.query.chars = (WCHAR *)tests[i].query; url.query.length = tests[i].query_len; - url.fragment.chars = tests[i].fragment; + url.fragment.chars = (WCHAR *)tests[i].fragment; url.fragment.length = tests[i].fragment_len; memset( &str, 0, sizeof(str) ); diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 65e672a424..4fb9f44733 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -549,7 +549,6 @@ static void test_WsWriteStartAttribute(void) static void test_WsWriteType(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; @@ -566,7 +565,7 @@ static void test_WsWriteType(void) hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); - val_str = testW; + val_str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); @@ -579,11 +578,11 @@ static void test_WsWriteType(void) /* required value */ hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, - WS_WRITE_REQUIRED_VALUE, NULL, sizeof(testW), NULL ); + WS_WRITE_REQUIRED_VALUE, NULL, sizeof(L"test"), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, - WS_WRITE_REQUIRED_VALUE, testW, sizeof(testW), NULL ); + WS_WRITE_REQUIRED_VALUE, L"test", sizeof(L"test"), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); /* required pointer */ @@ -592,7 +591,7 @@ static void test_WsWriteType(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, - WS_WRITE_REQUIRED_VALUE, testW, sizeof(testW), NULL ); + WS_WRITE_REQUIRED_VALUE, L"test", sizeof(L"test"), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, @@ -613,7 +612,7 @@ static void test_WsWriteType(void) hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - val_str = testW; + val_str = L"test"; hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -633,7 +632,7 @@ static void test_WsWriteType(void) hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - val_str = testW; + val_str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -689,12 +688,11 @@ static void prepare_basic_type_test( WS_XML_WRITER *writer ) static void test_basic_type(void) { - static WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}, xmlstr; GUID guid; - WCHAR *str; + const WCHAR *str; WS_STRING string; WS_BYTES bytes; WS_UNIQUE_ID id; @@ -784,7 +782,7 @@ static void test_basic_type(void) check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); prepare_basic_type_test( writer ); - string.chars = testW; + string.chars = (WCHAR *)L"test"; string.length = 4; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &string, sizeof(string), NULL ); @@ -794,7 +792,7 @@ static void test_basic_type(void) check_output( writer, "<t>test</t>", __LINE__ ); prepare_basic_type_test( writer ); - str = testW; + str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &str, sizeof(str), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -860,7 +858,7 @@ static void test_basic_type(void) prepare_basic_type_test( writer ); id.uri.length = 4; - id.uri.chars = testW; + id.uri.chars = (WCHAR *)L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &id, sizeof(id), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -873,7 +871,6 @@ static void test_basic_type(void) static void test_simple_struct_type(void) { - static const WCHAR valueW[] = {'v','a','l','u','e',0}; HRESULT hr; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s; @@ -905,7 +902,7 @@ static void test_simple_struct_type(void) s.fieldCount = 1; test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); - test->field = valueW; + test->field = L"value"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -977,7 +974,6 @@ static void test_simple_struct_type(void) static void test_WsWriteElement(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s; @@ -1010,7 +1006,7 @@ static void test_WsWriteElement(void) desc.typeDescription = &s; test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); - test->str = testW; + test->str = L"test"; hr = WsWriteElement( NULL, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -1165,7 +1161,6 @@ static void test_WsWriteValue(void) static void test_WsWriteAttribute(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; HRESULT hr; WS_XML_WRITER *writer; WS_STRUCT_DESCRIPTION s; @@ -1198,7 +1193,7 @@ static void test_WsWriteAttribute(void) desc.typeDescription = &s; test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); - test->str = testW; + test->str = L"test"; hr = WsWriteAttribute( NULL, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -1580,8 +1575,6 @@ static void test_complex_struct_type(void) "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"/>" "</o:OfficeConfig>"; - static const WCHAR timestampW[] = - {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; WS_XML_STRING str_officeconfig = {12, (BYTE *)"OfficeConfig"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; WS_XML_STRING str_generationtime = {14, (BYTE *)"GenerationTime"}; @@ -1654,7 +1647,7 @@ static void test_complex_struct_type(void) size = sizeof(struct officeconfig) + sizeof(struct services); test = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); test->services = (struct services *)(test + 1); - test->services->generationtime = timestampW; + test->services->generationtime = L"2015-09-03T18:47:54"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2141,7 +2134,6 @@ static void test_WsCopyNode(void) static void test_text_types(void) { - static const WCHAR utf16W[] = {'u','t','f','1','6'}; WS_XML_STRING prefix = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"u"}; WS_XML_STRING ns = {0, NULL}, ns2 = {2, (BYTE *)"ns"}; WS_XML_WRITER *writer; @@ -2180,8 +2172,8 @@ static void test_text_types(void) HRESULT hr; ULONG i; - val_utf16.bytes = (BYTE *)utf16W; - val_utf16.byteCount = sizeof(utf16W); + val_utf16.bytes = (BYTE *)L"utf16"; + val_utf16.byteCount = 10; val_qname.localName = &localname2; val_qname.ns = &ns; @@ -2432,7 +2424,6 @@ static void test_field_options(void) static void test_WsWriteText(void) { - static const WCHAR testW[] = {'t','e','s','t'}; WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; HRESULT hr; WS_XML_WRITER *writer; @@ -2504,8 +2495,8 @@ static void test_WsWriteText(void) hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - utf16.bytes = (BYTE *)testW; - utf16.byteCount = sizeof(testW); + utf16.bytes = (BYTE *)L"test"; + utf16.byteCount = 8; hr = WsWriteText( writer, &utf16.text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>test", __LINE__ ); @@ -2852,11 +2843,10 @@ static void test_escapes(void) static void test_write_option(void) { - static const WCHAR sW[] = {'s',0}; static const WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; WS_XML_WRITER *writer; int val_int = -1, val_int_zero = 0, *ptr_int = &val_int, *ptr_int_null = NULL; - const WCHAR *ptr_wsz = sW, *ptr_wsz_null = NULL; + const WCHAR *ptr_wsz = L"s", *ptr_wsz_null = NULL; static const WS_XML_STRING val_xmlstr = {1, (BYTE *)"x"}, val_xmlstr_zero = {0, NULL}; const WS_XML_STRING *ptr_xmlstr = &val_xmlstr, *ptr_xmlstr_null = NULL; struct @@ -3060,7 +3050,6 @@ static void test_datetime(void) static void test_repeating_element(void) { - static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}; WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}; HRESULT hr; @@ -3113,8 +3102,8 @@ static void test_repeating_element(void) test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) + 2 * sizeof(const WCHAR *) ); test->val = (const WCHAR **)(test + 1); - test->val[0] = oneW; - test->val[1] = twoW; + test->val[0] = L"1"; + test->val[1] = L"2"; test->count = 2; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); @@ -3317,7 +3306,6 @@ static void test_WsWriteBytes(void) static void test_WsWriteChars(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; - static const WCHAR testW[] = {'t','e','s','t'}; WS_XML_WRITER *writer; HRESULT hr; @@ -3330,19 +3318,19 @@ static void test_WsWriteChars(void) hr = WsWriteChars( writer, NULL, 0, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 0, NULL ); + hr = WsWriteChars( writer, L"test", 0, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); hr = WsWriteChars( writer, NULL, 1, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); hr = set_output( writer ); @@ -3352,10 +3340,10 @@ static void test_WsWriteChars(void) hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteEndElement( writer, NULL ); @@ -3372,10 +3360,10 @@ static void test_WsWriteChars(void) hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteChars( writer, testW, 4, NULL ); + hr = WsWriteChars( writer, L"test", 4, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); @@ -3904,7 +3892,6 @@ static void test_dictionary(void) static void test_union_type(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING str_none = {4, (BYTE *)"none"}, str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; @@ -3974,7 +3961,7 @@ static void test_union_type(void) hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); test.choice = CHOICE_A; - test.value.a = testW; + test.value.a = L"test"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -4069,7 +4056,6 @@ static void prepare_binary_type_test( WS_XML_WRITER *writer, const WS_XML_STRING static void test_text_types_binary(void) { - static WCHAR testW[] = {'t','e','s','t'}; static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}, str_u = {1, (BYTE *)"u"}; static WS_XML_STRING str_ns = {0, NULL}; static const char res[] = @@ -4310,7 +4296,7 @@ static void test_text_types_binary(void) prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); test.type = WS_XML_TEXT_TYPE_UTF16; - test.u.val_utf16.chars = testW; + test.u.val_utf16.chars = (WCHAR *)L"test"; test.u.val_utf16.length = 4; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); @@ -4575,7 +4561,6 @@ static void test_text_types_binary(void) static void test_repeating_element_choice(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; @@ -4647,7 +4632,7 @@ static void test_repeating_element_choice(void) s.typeNs = &str_ns; items[0].choice = CHOICE_A; - items[0].value.a = testW; + items[0].value.a = L"test"; items[1].choice = CHOICE_B; items[1].value.b = 1; test.items = items; -- 2.20.1

1 0

[PATCH 1/4] webservices: Use wide character string literals.
by Hans Leidekker 17 Mar '20

17 Mar '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 7 ++----- dlls/webservices/listener.c | 3 +-- dlls/webservices/msg.c | 25 +++++++--------------- dlls/webservices/url.c | 41 +++++++++++++++---------------------- 4 files changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 10c33dc07d..f2906c8673 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -910,8 +910,6 @@ error: static HRESULT connect_channel_http( struct channel *channel ) { - static const WCHAR agentW[] = - {'M','S','-','W','e','b','S','e','r','v','i','c','e','s','/','1','.','0',0}; HINTERNET ses = NULL, con = NULL; URL_COMPONENTS uc; HRESULT hr; @@ -943,7 +941,7 @@ static HRESULT connect_channel_http( struct channel *channel ) goto done; } - if (!(ses = WinHttpOpen( agentW, 0, NULL, NULL, 0 ))) + if (!(ses = WinHttpOpen( L"MS-WebServices/1.0", 0, NULL, NULL, 0 ))) { hr = HRESULT_FROM_WIN32( GetLastError() ); goto done; @@ -1267,8 +1265,7 @@ static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG l static HRESULT open_http_request( struct channel *channel, HINTERNET *req ) { - static const WCHAR postW[] = {'P','O','S','T',0}; - if ((*req = WinHttpOpenRequest( channel->u.http.connect, postW, channel->u.http.path, + if ((*req = WinHttpOpenRequest( channel->u.http.connect, L"POST", channel->u.http.path, NULL, NULL, NULL, channel->u.http.flags ))) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); } diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 9b32369fd4..d41b64b974 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -286,7 +286,6 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len, int flags ) { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR service[6]; ADDRINFOW hints, *res, *info; HRESULT hr = WS_E_ADDRESS_NOT_AVAILABLE; @@ -296,7 +295,7 @@ HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, hints.ai_family = AF_INET; *addr_len = 0; - swprintf( service, ARRAY_SIZE(service), fmtW, port ); + swprintf( service, ARRAY_SIZE(service), L"%u", port ); if (GetAddrInfoW( host, service, &hints, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6922224a05..d955e173b4 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1901,14 +1901,6 @@ static HRESULT insert_mapped_headers( struct msg *msg, HINTERNET req ) HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { - static const WCHAR contenttypeW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',0}; - static const WCHAR soapxmlW[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','s','o','a','p','+','x','m','l',0}; - static const WCHAR textxmlW[] = - {'t','e','x','t','/','x','m','l',0}; - static const WCHAR charsetW[] = - {'c','h','a','r','s','e','t','=','u','t','f','-','8',0}; struct msg *msg = (struct msg *)handle; HRESULT hr = E_OUTOFMEMORY; WCHAR *header = NULL, *buf; @@ -1925,11 +1917,11 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) switch (msg->version_env) { case WS_ENVELOPE_VERSION_SOAP_1_1: - header = build_http_header( contenttypeW, textxmlW, &len ); + header = build_http_header( L"Content-Type", L"text/xml", &len ); break; case WS_ENVELOPE_VERSION_SOAP_1_2: - header = build_http_header( contenttypeW, soapxmlW, &len ); + header = build_http_header( L"Content-Type", L"application/soap+xml", &len ); break; default: @@ -1942,7 +1934,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) heap_free( header ); hr = E_OUTOFMEMORY; - if (!(header = build_http_header( contenttypeW, charsetW, &len ))) goto done; + if (!(header = build_http_header( L"Content-Type", L"charset=utf-8", &len ))) goto done; if ((hr = insert_http_header( req, header, len, WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON )) != S_OK) goto done; heap_free( header ); @@ -1952,8 +1944,6 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { case WS_ENVELOPE_VERSION_SOAP_1_1: { - static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',0}; - if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; @@ -1964,7 +1954,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) buf[len + 1] = '"'; buf[len + 2] = 0; - header = build_http_header( soapactionW, buf, &len ); + header = build_http_header( L"SOAPAction", buf, &len ); heap_free( buf ); if (!header) goto done; @@ -1973,21 +1963,20 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) } case WS_ENVELOPE_VERSION_SOAP_1_2: { - static const WCHAR actionW[] = {'a','c','t','i','o','n','=','"'}; - ULONG len_action = ARRAY_SIZE( actionW ); + ULONG len_action = ARRAY_SIZE( L"action=\"" ) - 1; if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; hr = E_OUTOFMEMORY; if (!(buf = heap_alloc( (len + len_action + 2) * sizeof(WCHAR) ))) goto done; - memcpy( buf, actionW, len_action * sizeof(WCHAR) ); + memcpy( buf, L"action=\"", len_action * sizeof(WCHAR) ); MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, buf + len_action, len ); len += len_action; buf[len++] = '"'; buf[len] = 0; - header = build_http_header( contenttypeW, buf, &len ); + header = build_http_header( L"Content-Type", buf, &len ); heap_free( buf ); if (!header) goto done; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 6f2ce9d6c9..f2fbda83c1 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -31,27 +31,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); -static const WCHAR http[] = {'h','t','t','p'}; -static const WCHAR https[] = {'h','t','t','p','s'}; -static const WCHAR nettcp[] = {'n','e','t','.','t','c','p'}; -static const WCHAR soapudp[] = {'s','o','a','p','.','u','d','p'}; -static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; - static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == ARRAY_SIZE( http ) && !wcsnicmp( str, http, ARRAY_SIZE( http ))) + if (len == ARRAY_SIZE( L"http" ) - 1 && !wcsnicmp( str, L"http", ARRAY_SIZE( L"http" ) - 1 )) return WS_URL_HTTP_SCHEME_TYPE; - if (len == ARRAY_SIZE( https ) && !wcsnicmp( str, https, ARRAY_SIZE( https ))) + if (len == ARRAY_SIZE( L"https" ) - 1 && !wcsnicmp( str, L"https", ARRAY_SIZE( L"https" ) - 1 )) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == ARRAY_SIZE( nettcp ) && !wcsnicmp( str, nettcp, ARRAY_SIZE( nettcp ))) + if (len == ARRAY_SIZE( L"net.tcp" ) - 1 && !wcsnicmp( str, L"net.tcp", ARRAY_SIZE( L"net.tcp" ) - 1 )) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == ARRAY_SIZE( soapudp ) && !wcsnicmp( str, soapudp, ARRAY_SIZE( soapudp ))) + if (len == ARRAY_SIZE( L"soap.udp" ) - 1 && !wcsnicmp( str, L"soap.udp", ARRAY_SIZE( L"soap.udp" ) - 1 )) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == ARRAY_SIZE( netpipe ) && !wcsnicmp( str, netpipe, ARRAY_SIZE( netpipe ))) + if (len == ARRAY_SIZE( L"net.pipe" ) - 1 && !wcsnicmp( str, L"net.pipe", ARRAY_SIZE( L"net.pipe" ) - 1 )) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u; @@ -278,24 +272,24 @@ static const WCHAR *scheme_str( WS_URL_SCHEME_TYPE scheme, ULONG *len ) switch (scheme) { case WS_URL_HTTP_SCHEME_TYPE: - *len = ARRAY_SIZE( http ); - return http; + *len = ARRAY_SIZE( L"http" ) - 1; + return L"http"; case WS_URL_HTTPS_SCHEME_TYPE: - *len = ARRAY_SIZE( https ); - return https; + *len = ARRAY_SIZE( L"https" ) - 1; + return L"https"; case WS_URL_NETTCP_SCHEME_TYPE: - *len = ARRAY_SIZE( nettcp ); - return nettcp; + *len = ARRAY_SIZE( L"net.tcp" ) - 1; + return L"net.tcp"; case WS_URL_SOAPUDP_SCHEME_TYPE: - *len = ARRAY_SIZE( soapudp ); - return soapudp; + *len = ARRAY_SIZE( L"soap.udp" ) - 1; + return L"soap.udp"; case WS_URL_NETPIPE_SCHEME_TYPE: - *len = ARRAY_SIZE( netpipe ); - return netpipe; + *len = ARRAY_SIZE( L"net.pipe" ) - 1; + return L"net.pipe"; default: ERR( "unhandled scheme %u\n", scheme ); @@ -364,7 +358,7 @@ static HRESULT url_encode_size( const WCHAR *str, ULONG len, const char *except, static ULONG url_encode_byte( unsigned char byte, const char *except, WCHAR *buf ) { - static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; + static const WCHAR hex[] = L"0123456789ABCDEF"; switch (escape_size( byte, except )) { case 3: @@ -426,7 +420,6 @@ static HRESULT url_encode( const WCHAR *str, ULONG len, WCHAR *buf, const char * HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_STRING *ret, WS_ERROR *error ) { - static const WCHAR fmtW[] = {':','%','u',0}; ULONG len = 0, len_scheme, len_enc, ret_size = 0; const WS_HTTP_URL *url = (const WS_HTTP_URL *)base; const WCHAR *scheme; @@ -504,7 +497,7 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S if (port) { WCHAR buf[7]; - len = swprintf( buf, ARRAY_SIZE(buf), fmtW, port ); + len = swprintf( buf, ARRAY_SIZE(buf), L":%u", port ); memcpy( p, buf, len * sizeof(WCHAR) ); p += len; } -- 2.20.1

1 0

[PATCH 1/6] mfplat: Implement ConvertToContiguousBuffer() for multiple buffers.
by Nikolay Sivov 17 Mar '20

17 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 110 ++++++++++++++++++++++++++++++------- dlls/mfplat/tests/mfplat.c | 23 ++++++-- 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 69633134f5..1727ff1e90 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1136,9 +1136,78 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF return hr; } +static unsigned int sample_get_total_length(struct sample *sample) +{ + DWORD total_length = 0, length; + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + { + length = 0; + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) + total_length += length; + } + + return total_length; +} + +static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buffer) +{ + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + return hr; +} + static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { struct sample *sample = impl_from_IMFSample(iface); + unsigned int total_length, i; + IMFMediaBuffer *dest_buffer; HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, buffer); @@ -1147,15 +1216,29 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi if (sample->buffer_count == 0) hr = E_UNEXPECTED; - else if (sample->buffer_count == 1) + else if (sample->buffer_count > 1) { - *buffer = sample->buffers[0]; - IMFMediaBuffer_AddRef(*buffer); + total_length = sample_get_total_length(sample); + if (SUCCEEDED(hr = MFCreateMemoryBuffer(total_length, &dest_buffer))) + { + if (SUCCEEDED(hr = sample_copy_to_buffer(sample, dest_buffer))) + { + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + + sample->buffers[0] = dest_buffer; + IMFMediaBuffer_AddRef(sample->buffers[0]); + + sample->buffer_count = 1; + } + IMFMediaBuffer_Release(dest_buffer); + } } - else + + if (SUCCEEDED(hr)) { - FIXME("Samples with multiple buffers are not supported.\n"); - hr = E_NOTIMPL; + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); } LeaveCriticalSection(&sample->attributes.cs); @@ -1225,21 +1308,6 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) return S_OK; } -static DWORD sample_get_total_length(struct sample *sample) -{ - DWORD total_length = 0, length; - size_t i; - - for (i = 0; i < sample->buffer_count; ++i) - { - length = 0; - if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - total_length += length; - } - - return total_length; -} - static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) { struct sample *sample = impl_from_IMFSample(iface); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index bf63337b60..a2bc7115a5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1778,7 +1778,7 @@ static void test_system_memory_buffer(void) static void test_sample(void) { static const DWORD test_pattern = 0x22222222; - IMFMediaBuffer *buffer, *buffer2; + IMFMediaBuffer *buffer, *buffer2, *buffer3; DWORD count, flags, length; IMFAttributes *attributes; IMFSample *sample; @@ -1998,9 +1998,15 @@ static void test_sample(void) ok(buffer2 == buffer, "Unexpected buffer instance.\n"); IMFMediaBuffer_Release(buffer2); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMemoryBuffer(16, &buffer2); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(sample, buffer2); ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); IMFMediaBuffer_Release(buffer2); @@ -2009,15 +2015,22 @@ static void test_sample(void) ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); ok(count == 2, "Unexpected buffer count %u.\n", count); - hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); -todo_wine + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer3); ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + if (SUCCEEDED(hr)) - IMFMediaBuffer_Release(buffer2); + IMFMediaBuffer_Release(buffer3); hr = IMFSample_GetBufferCount(sample, &count); ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected buffer count %u.\n", count); IMFMediaBuffer_Release(buffer); -- 2.25.1

2 7

[PATCH 1/5] ucrtbase/tests: Fix clock tests.
by Jacek Caban 17 Mar '20

17 Mar '20

crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH 4/5] msvcrt: Use public onexit table declarations in importlib.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/onexit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 2/5] corecrt_startup.h: Add onexit table declarations.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_startup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

1 0

[PATCH v3 5/5] advapi32/tests: Add more cases for CryptReleaseContext().
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index b7234a2..960bd59 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -125,6 +125,56 @@ static void clean_up_environment(void) } } +static void test_CryptReleaseContext(void) +{ + BOOL ret; + HCRYPTPROV prov; + + /* TODO: Add cases for ERROR_BUSY, ERROR_INVALID_HANDLE and NTE_BAD_UID */ + + /* NULL provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + /* Additional refcount */ + + ret = CryptAcquireContextA(&prov, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptContextAddRef(prov, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + /* Nonzero flags, which allow release nonetheless */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == NTE_BAD_FLAGS, "got %u\n", GetLastError()); + + /* Obsolete provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); +} + static void test_acquire_context(void) { BOOL result; @@ -259,11 +309,6 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; - SetLastError(0xdeadbeef); - result = CryptReleaseContext(hProv, 0); - ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -1166,7 +1211,9 @@ START_TEST(crypt) init_function_pointers(); test_rc2_keylen(); + init_environment(); + test_CryptReleaseContext(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); -- 2.10.0.windows.1

1 0

[PATCH v3 4/5] advapi32/tests: Check all CryptReleaseContext() calls.
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9dffc53..b7234a2 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,25 +64,30 @@ static void init_function_pointers(void) static void init_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Ensure that container "wine_test_keyset" does exist */ if (!CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ if (!CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_bad_keyset" does not exist. */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -90,25 +95,32 @@ static void init_environment(void) static void clean_up_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Remove container "wine_test_keyset" */ if (CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ if (CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_bad_keyset" */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -159,8 +171,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GLE); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } /* Try again, witch an empty ("\0") szProvider parameter */ hProv = 0; @@ -173,8 +188,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GetLastError()); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } } static void test_incorrect_api_usage(void) @@ -238,11 +256,13 @@ static void test_incorrect_api_usage(void) if (!result) return; result = CryptReleaseContext(hProv, 0); - ok (result, "%d\n", GetLastError()); + ok(result, "got %u\n", GetLastError()); if (!result) return; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 0); - ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -426,7 +446,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); CryptDestroyKey(key); CryptDestroyHash(hash); - CryptReleaseContext(prov, 0); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); } static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, @@ -938,7 +960,8 @@ static void test_machine_guid(void) ret = CryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), "CryptAcquireContextA failed: %08x\n", GetLastError()); - CryptReleaseContext(hCryptProv, 0); + ret = CryptReleaseContext(hCryptProv, 0); + ok(ret, "got %u\n", GetLastError()); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, @@ -986,10 +1009,11 @@ static void test_rc2_keylen(void) ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); - if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -1033,7 +1057,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } key_blob.key_size = sizeof(key); @@ -1068,7 +1093,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } } -- 2.10.0.windows.1

1 0

[PATCH v2 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..9ede750 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

2 2

[PATCH v3 3/5] advapi32: Fix CryptReleaseContext() LastError on NULL provider.
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f49a497..c4f6988 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -662,7 +662,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -- 2.10.0.windows.1

1 0

[PATCH v3 2/5] advapi32: Let CRYPTPROV.refcount be LONG and atomic.
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 5 ++--- dlls/advapi32/crypt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 14acceb..f49a497 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -636,7 +636,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -672,8 +672,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index afee3e2..a442964 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -63,7 +63,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ -- 2.10.0.windows.1

1 0

[PATCH v3 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie 17 Mar '20

17 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..14acceb 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

1 0

[PATCH 1/4] kernel32/tests: Extended test for GetConsoleProcessList.
by Roman Pišl 17 Mar '20

17 Mar '20

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9698f11779..901dc3aa71 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1040,8 +1040,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -3232,6 +3232,20 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2]; + DWORD pid = GetCurrentProcessId(); + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.20.1

2 4

[PATCH v2 resend] comctl32: Correctly draw disabled toolbar button which contains 32 bpp bitmap with alpha channel.
by Ziqing Hui 17 Mar '20

17 Mar '20

It has been a week since I send this patch and got no reply... so I resend it now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 5 +++++ dlls/comctl32/toolbar.c | 12 ++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 19 insertions(+)

3 3

[PATCH 6/6] d3d9/tests: Fix a test failure on Win10 1809 TestBots.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5adeb51854..603239f922 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9780,7 +9780,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || broken(hr == E_FAIL && (i == 6 || i == 7)), /* Win10 1809 TestBots */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); IDirect3DVolumeTexture9_Release(dst); -- 2.20.1

2 1

[PATCH 4/6] d3d9/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 310 ++++++++++++++++++++++++--------------- 1 file changed, 189 insertions(+), 121 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 49280ef869..5adeb51854 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12576,8 +12576,44 @@ static void test_stretch_rect(void) DestroyWindow(window); } +#define test_device_caps_adapter_group(a, b, c) _test_device_caps_adapter_group(a, b, c, __LINE__) +static void _test_device_caps_adapter_group(const D3DCAPS9 *caps, unsigned int adapter_idx, + unsigned int adapter_count, int line) +{ + ok_(__FILE__, line)(caps->AdapterOrdinal == adapter_idx, + "Adapter %u: Got unexpected AdapterOrdinal %u.\n", adapter_idx, caps->AdapterOrdinal); + /* Single GPU */ + if (caps->NumberOfAdaptersInGroup == adapter_count) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == 0, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, 0, + caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == caps->AdapterOrdinal, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->AdapterOrdinalInGroup); + ok_(__FILE__, line)(caps->NumberOfAdaptersInGroup == + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + "Adapter %u: Expect NumberOfAdaptersInGroup %u, got %u.\n", adapter_idx, + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + caps->NumberOfAdaptersInGroup); + } + /* Multiple GPUs and each GPU has only one output */ + else if (caps->NumberOfAdaptersInGroup == 1) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == caps->AdapterOrdinal, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == 0, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, 0, + caps->AdapterOrdinalInGroup); + } + /* TODO: Test other multi-GPU setup */ +} + static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -12589,129 +12625,161 @@ static void test_device_caps(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D9_GetDeviceCaps */ + hr = IDirect3D9_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Adapter %u: GetDeviceCaps failed, hr %#x.\n", + adapter_idx, hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("Adapter %u: No Direct3D support, skipping test.\n", adapter_idx); + break; + } + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + + /* Test IDirect3DDevice9_GetDeviceCaps */ + device_desc.adapter_ordinal = adapter_idx; + device = create_device(d3d, window, &device_desc); + ok(!!device, "Adapter %u: Failed to create a D3D device.\n", adapter_idx); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Adapter %u: Failed to get caps, hr %#x.\n", adapter_idx, hr); + + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), + "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP + | D3DCAPS2_CANSHARERESOURCE)), + "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD + | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM + | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED + | D3DCAPS3_RESERVED)), + "Adapter %u: Caps3 field has unexpected flags %#x.\n", adapter_idx, caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS + | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA + | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS + | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED + | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), + "Adapter %u: PrimitiveMiscCaps field has unexpected flags %#x.\n", adapter_idx, + caps.PrimitiveMiscCaps); + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), + "Adapter %u: RasterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.RasterCaps); + /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only + * advertised on the reference rasterizer and WARP. */ + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: SrcBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: DestBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 + | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), + "Adapter %u: TextureCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO + | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: TextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: CubeTextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: VolumeTextureFilterCaps field has unexpected flags %#x.\n", + adapter_idx, caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), + "Adapter %u: LineCaps field has unexpected flags %#x.\n", adapter_idx, + caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), + "Adapter %u: StencilCaps field has unexpected flags %#x.\n", adapter_idx, + caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP + | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), + "Adapter %u: VertexProcessingCaps field has unexpected flags %#x.\n", adapter_idx, + caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "Adapter %u: MaxActiveLights field has unexpected value %u.\n", adapter_idx, + caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "Adapter %u: MaxUserClipPlanes field has unexpected value %u.\n", adapter_idx, + caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "Adapter %u: MaxVertexW field has unexpected value %.8e.\n", adapter_idx, + caps.MaxVertexW); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP - | D3DCAPS2_CANSHARERESOURCE)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD - | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM - | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED - | D3DCAPS3_RESERVED)), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS - | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA - | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED - | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) - || broken(!(caps.RasterCaps & ~0x0f736191)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only - * advertised on the reference rasterizer and WARP. */ - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 - | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO - | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP - | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); } -- 2.20.1

1 0

[PATCH resend 1/2] winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Zebediah Figura 17 Mar '20

17 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9d7f85b82d9..2e3fbd29253 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1964,6 +1964,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1976,8 +1977,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n"); -- 2.25.1

1 1

[PATCH] winebus.sys: Use public HID_USAGE_* constants.
by Zebediah Figura 17 Mar '20

17 Mar '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Fix a typo in the process (HID_USAGE_DIGITIZER_Y_TILT is 0x3E, not 0x3F). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 18 +++++++++--------- include/hidusage.h | 33 ++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 24d7961b06..51940ba088 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,8 +139,8 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -149,15 +149,15 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {0,0}, /*ABS_HAT2Y*/ {0,0}, /*ABS_HAT3X*/ {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ {0, 0}, /*ABS_TOOL_WIDTH*/ {0, 0}, {0, 0}, {0, 0}, - {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ + {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) @@ -245,9 +245,9 @@ static const BYTE* what_am_I(struct udev_device *dev) static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; - static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; - static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; - static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_PEN}; + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_PAD}; struct udev_device *parent = dev; diff --git a/include/hidusage.h b/include/hidusage.h index 67d698ed34..c45e2712fc 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -24,6 +24,21 @@ extern "C" { typedef USHORT USAGE, *PUSAGE; +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_CONSUMER_VOLUME ((USAGE) 0xE0) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) +#define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) +#define HID_USAGE_DIGITIZER_Y_TILT ((USAGE) 0x3E) +#define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_JOYSTICK ((USAGE) 0x04) @@ -183,16 +198,11 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) -#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) -#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) -#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) -#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) -#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) -#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) -#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) - #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) #define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) @@ -214,13 +224,6 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) - -#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) -#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) -#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) -#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) - #ifdef __cplusplus } #endif -- 2.25.1

1 0

[PATCH] hidclass.sys: Don't reset the report count when recording a main item.
by Zebediah Figura 17 Mar '20

17 Mar '20

From: Zebediah Figura <zfigura(a)codeweavers.com> The report count is global and should be preserved. This fixes the Logitech Extreme 3D Pro controller when used with hidraw. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 876369ad70..56e4da4ad1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -505,7 +505,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_INPUT: case TAG_MAIN_OUTPUT: case TAG_MAIN_FEATURE: - for (j = 0; caps->ReportCount; j++) + for (j = 0; j < caps->ReportCount; j++) { feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); @@ -520,13 +520,13 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->u.NotRange.Usage = usages[j]; feature->caps = *caps; feature->caps.ReportCount = 1; - caps->ReportCount--; feature->collection = collection; if (j+1 >= usages_top) + { + feature->caps.ReportCount += caps->ReportCount - (j + 1); break; + } } - if (caps->ReportCount) - feature->caps.ReportCount += caps->ReportCount; usages_top = 0; new_caps(caps); break; -- 2.25.1

1 0

[PATCH] dmime: Free more interfaces in IDirectMusicPerformance FreePMsg
by Alistair Leslie-Hughes 16 Mar '20

16 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/performance.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b71637a1..f535fe888f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -535,6 +535,12 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); + if (pPMSG->pTool) + IDirectMusicTool_Release(pPMSG->pTool); + + if (pPMSG->pGraph) + IDirectMusicGraph_Release(pPMSG->pGraph); + if (pPMSG->punkUser) IUnknown_Release(pPMSG->punkUser); -- 2.25.1

2 1

[PATCH] dmime: IDirectMusicGraph GetTool isn't a stub.
by Alistair Leslie-Hughes 16 Mar '20

16 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index eebebef4d1..85eef9c091 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -149,8 +149,8 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - - FIXME("(%p, %d, %p): stub\n", This, dwIndex, ppTool); + + TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) { -- 2.25.1

2 1

[tools] testbot/web: Remove the old job submit page.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The new interface seems to be working well so there is no need for the old one anymore. testbot/lib/WineTestBot/CGI/PageBase.pm | 3 +- testbot/web/OldSubmit.pl | 1043 ----------------------- 2 files changed, 1 insertion(+), 1045 deletions(-) delete mode 100644 testbot/web/OldSubmit.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 25a2fdfb45..613bddde5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -259,8 +259,7 @@ EOF { print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/Submit.pl"), - "'>Submit job</a> (<a href='", MakeSecureURL("/OldSubmit.pl"), - "'>Old UI</a>)</p></li>\n"; + "'>Submit job</a></p></li>\n"; print " <li><p><a href='/Activity.pl'>Activity</a></p></li>\n"; print " <li><p><a href='/Stats.pl'>Statistics</a></p></li>\n"; print " <li class='divider'> </li>\n"; diff --git a/testbot/web/OldSubmit.pl b/testbot/web/OldSubmit.pl deleted file mode 100644 index 06ce27565b..0000000000 --- a/testbot/web/OldSubmit.pl +++ /dev/null @@ -1,1043 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# WineTestBot job submit page -# -# Copyright 2009 Ge van Geldorp -# Copyright 2012-2014, 2017-2018 Francois Gouget -# -# 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 - -use strict; - -package SubmitPage; - -use ObjectModel::CGI::FreeFormPage; -our @ISA = qw(ObjectModel::CGI::FreeFormPage); - -use CGI qw(:standard); -use Fcntl; # For O_XXX -use IO::Handle; -use POSIX qw(:fcntl_h); # For SEEK_XXX -use File::Basename; - -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Branches; -use WineTestBot::Config; -use WineTestBot::Engine::Notify; -use WineTestBot::Jobs; -use WineTestBot::Missions; -use WineTestBot::PatchUtils; -use WineTestBot::Steps; -use WineTestBot::Utils; -use WineTestBot::VMs; - - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - - $self->{Page} = $self->GetParam("Page") || 1; - # Page is a hidden parameter so fix it instead of issuing an error - $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); - $self->{LastPage} = $self->{Page}; - - my @PropertyDescriptors1 = ( - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), - ); - $self->{PropertyDescriptors1} = \@PropertyDescriptors1; - - my @PropertyDescriptors3 = ( - CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, 1, "A", 50), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - ); - $self->{PropertyDescriptors3} = \@PropertyDescriptors3; - - if ($self->{Page} == 2) - { - $self->{ShowAll} = defined($self->GetParam("ShowAll")); - } - - $self->SUPER::_initialize($Request, $RequiredRole, undef); -} - -sub GetTitle($) -{ - #my ($self) = @_; - return "Submit a job"; -} - -sub GetHeaderText($) -{ - my ($self) = @_; - - if ($self->{Page} == 1) - { - return "Specify the patch file that you want to upload and submit " . - "for testing.<br>\n" . - "You can also specify a Windows .exe file, this would normally be " . - "a Wine test executable that you cross-compiled." - } - elsif ($self->{Page} == 2) - { - my $HeaderText = "Select the VMs on which you want to run your test."; - my $VMs = CreateVMs(); - $VMs->AddFilter("Status", ["offline", "maintenance"]); - if (!$VMs->IsEmpty()) - { - $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; - } - return $HeaderText; - } - elsif ($self->{Page} == 4) - { - return "Your job was successfully queued, but the job engine that takes " . - "care of actually running it seems to be unavailable (perhaps it " . - "crashed). Your job will remain queued until the engine is " . - "restarted."; - } - - return ""; -} - -sub GetPropertyDescriptors($) -{ - my ($self) = @_; - - if ($self->{Page} == 1) - { - return $self->{PropertyDescriptors1}; - } - elsif ($self->{Page} == 3) - { - my $IsPatch = ($self->GetParam("FileType") eq "patch"); - $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; - return $self->{PropertyDescriptors3}; - } - - return $self->SUPER::GetPropertyDescriptors(); -} - -sub GenerateFields($) -{ - my ($self) = @_; - - print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; - if ($self->{Page} == 1) - { - print "<div class='ItemProperty'><label>File</label>", - "<div class='ItemValue'>", - "<input type='file' name='File' size='64' maxlength='64' />", - " <span class='Required'>*</span></div></div>\n"; - my $Branches = CreateBranches(); - my $SelectedBranchKey = $self->GetParam("Branch"); - if (! defined($SelectedBranchKey)) - { - $SelectedBranchKey = $Branches->GetDefaultBranch()->GetKey(); - } - if (! $Branches->MultipleBranchesPresent()) - { - print "<div><input type='hidden' name='Branch' value='", - $self->CGI->escapeHTML($SelectedBranchKey), - "'></div>\n"; - } - else - { - print "<div class='ItemProperty'><label>Branch</label>", - "<div class='ItemValue'>", - "<select name='Branch' size='1'>"; - my @SortedKeys = sort { $a cmp $b } @{$Branches->GetKeys()}; - foreach my $Key (@SortedKeys) - { - my $Branch = $Branches->GetItem($Key); - print "<option value='", $self->CGI->escapeHTML($Key), "'"; - if ($Key eq $SelectedBranchKey) - { - print " selected"; - } - print ">", $self->CGI->escapeHTML($Branch->Name), "</option>"; - } - print "</select>", - " <span class='Required'>*</span></div></div>\n"; - } - - $self->{HasRequired} = 1; - } - else - { - if (! defined($self->{FileName})) - { - $self->{FileName} = $self->GetParam("FileName"); - } - if (! defined($self->{FileType})) - { - $self->{FileType} = $self->GetParam("FileType"); - } - if (! defined($self->{TestExecutable})) - { - $self->{TestExecutable} = $self->GetParam("TestExecutable"); - } - if (! defined($self->{CmdLineArg})) - { - $self->{CmdLineArg} = $self->GetParam("CmdLineArg"); - } - print "<div><input type='hidden' name='Remarks' value='", - $self->CGI->escapeHTML($self->GetParam("Remarks")), "'></div>\n"; - print "<div><input type='hidden' name='FileName' value='", - $self->CGI->escapeHTML($self->{FileName}), "'></div>\n"; - print "<div><input type='hidden' name='FileType' value='", - $self->CGI->escapeHTML($self->{FileType}), "'></div>\n"; - print "<div><input type='hidden' name='Branch' value='", - $self->CGI->escapeHTML($self->GetParam("Branch")), "'></div>\n"; - if ($self->{Page} != 3) - { - if (defined($self->{TestExecutable})) - { - print "<div><input type='hidden' name='TestExecutable' value='", - $self->CGI->escapeHTML($self->{TestExecutable}), "'></div>\n"; - } - if (defined($self->{CmdLineArg})) - { - print "<div><input type='hidden' name='CmdLineArg' value='", - $self->CGI->escapeHTML($self->{CmdLineArg}), "'></div>\n"; - } - } - if ($self->{Page} == 2) - { - if ($self->{LastPage} == 3) - { - my $VMs = CreateVMs(); - # VMs that are only visible with ShowAll - $VMs->AddFilter("Role", ["winetest", "extra"]); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if (defined $self->GetParam($FieldName)) - { - $self->{ShowAll} = 1; - last; - } - } - } - if ($self->{ShowAll}) - { - print "<div><input type='hidden' name='ShowAll' value='1'></div>\n"; - } - print "<div class='CollectionBlock'><table>\n"; - print "<thead><tr><th class='Record'></th>\n"; - print "<th class='Record'>VM Name</th>\n"; - print "<th class='Record'>Description</th>\n"; - print "</thead><tbody>\n"; - - my $VMs = CreateVMs(); - if ($self->{FileType} eq "exe64") - { - $VMs->AddFilter("Type", ["win64", "wine"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64", "wine"]); - } - if ($self->{ShowAll}) - { - # All but the retired and deleted ones - $VMs->AddFilter("Role", ["base", "winetest", "extra"]); - } - else - { - $VMs->AddFilter("Role", ["base"]); - } - my $Even = 1; - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - print "<tr class='", ($Even ? "even" : "odd"), - "'><td><input name='$FieldName' type='checkbox'"; - $Even = !$Even; - my ($Checked, $Status) = (1, ""); - if ($VM->Status =~ /^(offline|maintenance)$/) - { - $Status = " [". $VM->Status ."]"; - $Checked = undef; - } - if ($Checked and - ($self->{LastPage} == 1 || $self->GetParam($FieldName))) - { - print " checked='checked'"; - } - print "/></td>\n"; - - print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; - print "<td><details><summary>", - $self->CGI->escapeHTML($VM->Description || $VM->Name), - "$Status</summary>", - $self->CGI->escapeHTML($VM->Details || "No details!"), - "</details></td>"; - print "</tr>\n"; - } - print "</tbody></table>\n"; - print "</div>\n"; - } - else - { - if (defined($self->{NoCmdLineArgWarn})) - { - print "<div><input type='hidden' name='NoCmdLineArgWarn' value='on'>", - "</div>\n"; - } - my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - print "<div><input type='hidden' name='$FieldName' value='on'>", - "</div>\n"; - } - } - } - } - if ($self->{Page} == 4) - { - if ($self->GetParam("JobKey")) - { - $self->{JobKey} = $self->GetParam("JobKey"); - } - print "<div><input type='hidden' name='JobKey' value='", $self->{JobKey}, - "'></div>\n"; - } - - $self->SUPER::GenerateFields(); -} - -sub GenerateActions($) -{ - my ($self) = @_; - - if ($self->{Page} == 2) - { - print <<EOF; -<script type='text/javascript'> - -</script> -EOF - - print "<div class='ItemActions'>\n"; - print "<input type='submit' name='Action' value='", - $self->{ShowAll} ? "Show base VMs" : "Show all VMs", "'/>\n"; - print "</div>\n"; - } - - $self->SUPER::GenerateActions(); -} - -sub GetActions($) -{ - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - if ($self->{Page} == 1) - { - push @$Actions, "Next >"; - } - elsif ($self->{Page} == 2) - { - push @$Actions, "< Prev", "Next >"; - } - elsif ($self->{Page} == 3) - { - push @$Actions, "< Prev", "Submit"; - } - elsif ($self->{Page} == 4) - { - push @$Actions, "OK"; - } - - return $Actions; -} - -sub DisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if ($self->{Page} == 3) - { - my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patch") - { - if ($PropertyName eq "Run64") - { - my $Show64 = !1; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["win64"]); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - $Show64 = 1; - last; - } - } - if (! $Show64) - { - return ""; - } - } - } - else - { - if ($PropertyName eq "TestExecutable" || $PropertyName eq "Run64") - { - return ""; - } - } - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); -} - -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if ($self->{Page} == 3) - { - my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "DebugLevel") - { - return 1; - } - if ($PropertyName eq "Run64") - { - return 1; - } - } - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); -} - -sub GetTmpStagingFullPath($$) -{ - my ($self, $FileName) = @_; - - return undef if (!$FileName); - return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; -} - -sub Validate($) -{ - my ($self) = @_; - - if ($self->{Page} == 2) - { - my $VMSelected = !1; - my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - $VMSelected = 1; - last; - } - } - - if (! $VMSelected) - { - $self->{ErrMessage} = "Select at least one VM"; - return !1; - } - } - elsif ($self->{Page} == 3) - { - if (($self->GetParam("FileType") eq "patch" && - $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - !IsValidFileName($self->GetParam("TestExecutable"))) - { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "Invalid test executable filename"; - return !1; - } - - if ($self->GetParam("NoCmdLineArgWarn")) - { - $self->{NoCmdLineArgWarn} = 1; - } - elsif (! $self->GetParam("CmdLineArg")) - { - $self->{ErrMessage} = "You didn't specify a command line argument. " . - "This is most likely not correct, so please " . - "fix this. If you're sure that you really don't " . - 'want a command line argument, press "Submit" ' . - "again."; - $self->{ErrField} = "CmdLineArg"; - $self->{NoCmdLineArgWarn} = 1; - return !1; - } - } - - return $self->SUPER::Validate(); -} - -sub ValidateAndGetFileName($$) -{ - my ($self, $FieldName) = @_; - - my $FileName = $self->GetParam($FieldName); - if (!$FileName) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "You must provide a file to test"; - return undef; - } - if (!IsValidFileName($FileName)) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "The filename contains invalid characters"; - return undef; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "The filename is too long"; - return undef; - } - return $FileName; -} - -sub DetermineFileType($$) -{ - my ($self, $FileName) = @_; - - if (! sysopen(FH, $FileName, O_RDONLY)) - { - return ("Unable to open $FileName", "unknown", undef, undef); - } - - my $FileType = "unknown"; - my $Buffer; - if (sysread(FH, $Buffer, 0x40)) - { - # Unpack IMAGE_DOS_HEADER - my @Fields = unpack "S30I", $Buffer; - if ($Fields[0] == 0x5a4d) - { - seek FH, $Fields[30], SEEK_SET; - if (sysread(FH, $Buffer, 0x18)) - { - @Fields = unpack "IS2I3S2", $Buffer; - if ($Fields[0] == 0x00004550) - { - if (($Fields[7] & 0x2000) == 0) - { - $FileType = "exe"; - } - else - { - $FileType = "dll"; - } - if ($Fields[1] == 0x014c) - { - $FileType .= "32"; - } - elsif ($Fields[1] == 0x8664) - { - $FileType .= "64"; - } - else - { - $FileType = "unknown"; - } - } - } - } - # zip files start with PK, 0x03, 0x04 - elsif ($Fields[0] == 0x4b50 && $Fields[1] == 0x0403) - { - $FileType = "zip"; - } - } - - close FH; - - my ($ErrMessage, $ExeBase, $TestUnit); - if ($FileType eq "unknown") - { - my $Impacts = GetPatchImpacts($FileName); - if ($Impacts->{TestUnitCount} == 0) - { - $ErrMessage = "Patch doesn't affect tests"; - } - elsif ($Impacts->{TestUnitCount} > 1) - { - $ErrMessage = "Patch contains changes to multiple tests"; - } - else - { - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - if ($TestInfo->{UnitCount}) - { - $FileType = "patch"; - $ExeBase = $TestInfo->{ExeBase}; - $TestUnit = (keys %{$TestInfo->{PatchedUnits}})[0]; - last; - } - } - } - } - elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") - { - # We know what these are but not what to do with them. So reject them early. - $FileType = "unknown"; - } - - return ($ErrMessage, $FileType, $ExeBase, $TestUnit); -} - -sub OnPage1Next($) -{ - my ($self) = @_; - - my $BaseName = $self->ValidateAndGetFileName("File"); - return !1 if (!$BaseName); - - my $Fh = $self->CGI->upload("File"); - if (defined($Fh)) - { - my $StagingFile = $self->GetTmpStagingFullPath($BaseName); - my $OldUMask = umask(002); - if (! open (OUTFILE,">", $StagingFile)) - { - umask($OldUMask); - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to process uploaded file"; - return !1; - } - umask($OldUMask); - my $Buffer; - while (sysread($Fh, $Buffer, 4096)) - { - print OUTFILE $Buffer; - } - close OUTFILE; - - my ($ErrMessage, $FileType, $ExeBase, $TestUnit) = $self->DetermineFileType($StagingFile); - if (defined($ErrMessage)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = $ErrMessage; - return !1; - } - if ($FileType !~ /^(?:exe32|exe64|patch)$/) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unrecognized file type"; - return !1; - } - - $self->{FileName} = $BaseName; - $self->{FileType} = $FileType; - if (defined $ExeBase) - { - $self->{TestExecutable} = "$ExeBase.exe"; - } - if (defined($TestUnit)) - { - $self->{CmdLineArg} = $TestUnit; - } - } - else - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File upload failed"; - return !1; - } - - if (! $self->Validate) - { - return !1; - } - - $self->{Page} = 2; - - return 1; -} - -sub OnPage2Next($) -{ - my ($self) = @_; - - if (! $self->Validate) - { - return !1; - } - - $self->{Page} = 3; - - return 1; -} - -sub OnPage2Prev($) -{ - my ($self) = @_; - - my $FileName = $self->GetParam("FileName"); - if ($FileName) - { - my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); - unlink($StagingFileName) if ($StagingFileName); - } - - $self->{Page} = 1; - - return 1; -} - -sub OnPage3Prev($) -{ - my ($self) = @_; - - $self->{Page} = 2; - - return 1; -} - - -sub SubmitJob($$$) -{ - my ($self, $BaseName, $Staging) = @_; - - # See also Patches::Submit() in lib/WineTestBot/Patches.pm - - # First create a new job - my $Jobs = CreateJobs(); - my $NewJob = $Jobs->Add(); - $NewJob->User($self->GetCurrentSession()->User); - $NewJob->Priority(5); - if ($self->GetParam("Remarks")) - { - $NewJob->Remarks($self->GetParam("Remarks")); - } - else - { - $NewJob->Remarks($self->GetParam("CmdLineArg")); - } - my $Branch = CreateBranches()->GetItem($self->GetParam("Branch")); - if (defined($Branch)) - { - $NewJob->Branch($Branch); - } - my $Steps = $NewJob->Steps; - - # Add steps and tasks for the 32 and 64-bit tests - my $FileType = $self->GetParam("FileType"); - my $Impacts; - $Impacts = GetPatchImpacts($Staging) if ($FileType eq "patch"); - - my $BuildStep; - foreach my $Bits ("32", "64") - { - next if ($Bits eq "32" && $FileType eq "exe64"); - next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType eq "patch" && !defined($self->GetParam("Run64"))); - - my $Tasks; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) - { - if (!$BuildStep and $FileType eq "patch") - { - # This is a patch so add a build step... - $BuildStep = $Steps->Add(); - $BuildStep->FileName($BaseName); - $BuildStep->FileType($FileType); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # ...with a build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - - my $MissionStatement = "exe32"; - $MissionStatement .= ":exe64" if (defined $self->GetParam("Run64")); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (!defined $ErrMessage) - { - $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); - $Task->Missions($MissionStatement); - - # Save the build step so the others can reference it - (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); - } - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - } - - # Then create the test step - my $TestStep = $Steps->Add(); - if ($FileType eq "patch") - { - $TestStep->PreviousNo($BuildStep->No); - my $TestExe = basename($self->GetParam("TestExecutable")); - $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); - $TestStep->FileName($TestExe); - } - else - { - $TestStep->FileName($BaseName); - } - $TestStep->FileType("exe$Bits"); - $TestStep->Type("single"); - $TestStep->DebugLevel($self->GetParam("DebugLevel")); - $TestStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $TestStep->Tasks; - } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($SingleTimeout); - $Task->Missions("exe$Bits"); - $Task->CmdLineArg($self->GetParam("CmdLineArg")); - } - } - - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) - { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; - - $MissionStatement = ($FileType =~ /^(?:exe32|patch)$/) ? "win32" : ""; - if ($FileType eq "exe64" or - ($FileType eq "patch" and defined $self->GetParam("Run64"))) - { - $MissionStatement .= ":wow64"; - } - $MissionStatement =~ s/^://; - - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - $Missions = $Missions->[0]; - $Timeout = $FileType ne "patch" ? - $SingleTimeout : - GetBuildTimeout($Impacts, $Missions) + - GetTestTimeout($Impacts, $Missions); - } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); - $Task->CmdLineArg($self->GetParam("CmdLineArg")) if ($FileType ne "patch"); - } - - # Now save it all (or whatever's left to save) - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - - # Stage the test patch/executable so the job can pick it up - if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) - { - $self->{ErrMessage} = "Could not stage '$BaseName': $!\n"; - return !1; - } - - # Switch Status to staging to indicate we are done setting up the job - $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - - # Notify engine - my $ErrMessage = RescheduleJobs(); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); - return !1; - } - - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; -} - -sub OnSubmit($) -{ - my ($self) = @_; - - return !1 if (!$self->Validate()); - my $BaseName = $self->ValidateAndGetFileName("FileName"); - return !1 if (!$BaseName); - - # Rename the staging file to avoid race conditions if the user clicks on - # Submit multiple times - my $OldStaging = $self->GetTmpStagingFullPath($BaseName); - my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $BaseName); - if (!defined $Staging) - { - $self->{ErrMessage} = "Could not rename '$BaseName': $!"; - return !1; - } - if (!unlink $OldStaging) - { - unlink $Staging; - $self->{ErrMessage} = $!{ENOENT} ? - "$BaseName has already been submitted or has expired" : - "Could not remove the staging '$BaseName' file: $!"; - return !1; - } - - if (!$self->SubmitJob($BaseName, $Staging)) - { - # Restore the file for the next attempt - rename($Staging, $OldStaging); - return !1; - } - return 1; -} - -sub OnShowAllVMs($) -{ - my ($self) = @_; - - $self->{ShowAll} = 1; - - return !1; -} - -sub OnShowBaseVMs($) -{ - my ($self) = @_; - - $self->{ShowAll} = !1; - - return !1; -} - -sub OnOK($) -{ - my ($self) = @_; - - if (defined($self->GetParam("JobKey"))) - { - $self->Redirect("/JobDetails.pl?Key=" . $self->GetParam("JobKey")); # does not return - } - else - { - $self->Redirect("/index.pl"); # does not return - } -} - -sub OnAction($$) -{ - my ($self, $Action) = @_; - - if ($Action eq "Next >") - { - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); - } - elsif ($Action eq "< Prev") - { - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); - } - elsif ($Action eq "Submit") - { - return $self->OnSubmit(); - } - elsif ($Action eq "Show base VMs") - { - return $self->OnShowBaseVMs(); - } - elsif ($Action eq "Show all VMs") - { - return $self->OnShowAllVMs(); - } - elsif ($Action eq "OK") - { - return $self->OnOK(); - } - - return $self->SUPER::OnAction($Action); -} - - -package main; - -my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); -- 2.20.1

1 0

[tools] testbot/PatchUtils: Detect when make_fir needs to be run.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 85df90099b..8a6982c5de 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -148,6 +148,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeFir}) + { + InfoMsg "\nRunning make_fir\n"; + system("cd '$DataDir/$Dir/dlls/dsound/' && set -x && ./make_fir"); + if ($? != 0) + { + LogMsg "make_fir failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index eaa9868942..44b3f97cca 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + { + $Impacts->{MakeFir} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { $Impacts->{MakeErrors} = 1; -- 2.20.1

1 0

[tools] testbot/build: Simplify the --no-rm handling.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 ++++-- testbot/bin/build/WineReconfig.pl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f0ed128d4e..62644e11a9 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,6 +40,8 @@ sub BEGIN $::BuildEnv = 1; } +use File::Path; + use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; @@ -53,13 +55,13 @@ sub BuildNative($) { my ($NoRm) = @_; + rmtree "$DataDir/wine-native" if (!$NoRm); mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); system("cd '$DataDir/wine-native' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); @@ -77,6 +79,7 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate @@ -84,7 +87,6 @@ sub BuildCross($$$) my $CPUCount = GetCPUCount(); my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 835be4609b..ad0d429e1f 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,6 +54,7 @@ sub BuildWine($$$$;$) my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -62,7 +63,6 @@ sub BuildWine($$$$;$) my $CPUCount = GetCPUCount(); $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0) -- 2.20.1

1 0

[tools] testbot/WinePatchesMLSubmit: Add a semi-colon.
by Francois Gouget 16 Mar '20

16 Mar '20

It's at the end of a block and thus optional but all other blocks have one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 4797e986ad..92c769f465 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -65,7 +65,7 @@ if (defined $ErrMessage) { # The Engine will pick up the email later so return success anyway. # But still log the issue so it can be checked out. - LogMsg "$ErrMessage\n" + LogMsg "$ErrMessage\n"; } exit 0; -- 2.20.1

1 0

[PATCH v3] shell32/tests: Avoid ever changing values in the shlexec failure messages.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v3: The derandomisation must be done in the ok*() functions, not before to not break the comparisons. The TestBot now shows the expected results: it still has failures but the TestBot will be able to see that they are not new. dlls/shell32/tests/shlexec.c | 60 ++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525a..3571b64cc9e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -350,6 +350,42 @@ static void dump_child_(const char* file, int line) * ***/ +static void substTmpPath(char* str, const char *path, char rep) +{ + char *p; + + /* Only modify the last component of the path */ + p = strrchr(path, '\\'); + if (p) path = p + 1; + p = strrchr(path, '/'); + if (p) path = p + 1; + + p = strstr(str, path); + while (p) + { + p += 2; /* skip the 'wt' prefix */ + /* and only replace the random part of the filename */ + while (*p && *p != '.') + *p++ = rep; + p = strstr(p, path); + } +} + +static const char* derandomizeString(const char* str) +{ + static char buffer[2][2048]; + static int current_buffer = 0; + + if (!str || strlen(str) >= sizeof(buffer[0])) + return str; + + current_buffer = current_buffer ? 0 : 1; + strcpy(buffer[current_buffer], str); + substTmpPath(buffer[current_buffer], tmpdir, 'D'); + substTmpPath(buffer[current_buffer], child_file, 'C'); + return buffer[current_buffer]; +} + static char shell_call[2048]; static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { @@ -378,12 +414,12 @@ static void okChildString_(const char* file, int line, const char* key, const ch result=getChildString("Child", key); if (!result) { - okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, derandomizeString(expected)); return; } okShell_(file, line)(lstrcmpiA(result, expected) == 0 || broken(lstrcmpiA(result, bad) == 0), - "%s expected '%s', got '%s'\n", key, expected, result); + "%s expected '%s', got '%s'\n", key, derandomizeString(expected), derandomizeString(result)); } #define okChildString(key, expected) okChildString_(__FILE__, __LINE__, (key), (expected), (expected)) #define okChildStringBroken(key, expected, broken) okChildString_(__FILE__, __LINE__, (key), (expected), (broken)) @@ -432,7 +468,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char result=getChildString("Child", key); if (!result) { - okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, derandomizeString(expected)); return; } shortequal = FALSE; @@ -451,7 +487,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char } } okShell_(file,line)(equal || broken(shortequal) /* XP SP1 */, - "%s expected '%s', got '%s'\n", key, expected, result); + "%s expected '%s', got '%s'\n", key, derandomizeString(expected), derandomizeString(result)); } #define okChildPath(key, expected) okChildPath_(__FILE__, __LINE__, (key), (expected)) @@ -507,9 +543,9 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); if (winetest_debug > 1) @@ -591,9 +627,9 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat_param(shell_call, "class", class); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); @@ -832,7 +868,7 @@ static void create_test_verb_dde(const char* classname, const char* verb, sprintf(shell, "%d", rawcmd); strcat_param(assoc_desc, "rawcmd", shell); strcat_param(assoc_desc, "cmdtail", cmdtail); - strcat_param(assoc_desc, "ddeexec", ddeexec); + strcat_param(assoc_desc, "ddeexec", derandomizeString(ddeexec)); strcat_param(assoc_desc, "app", application); strcat_param(assoc_desc, "topic", topic); strcat_param(assoc_desc, "ifexec", ifexec); @@ -2080,7 +2116,7 @@ static void test_find_executable(void) if (rc > 32) rc=33; todo_wine_if(test->todo & 0x10) - ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", filename, rc); + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", derandomizeString(filename), rc); if (rc > 32) { BOOL equal; -- 2.20.1

4 4

[PATCH] mscoree: Use wcstok_s instead of wcstok.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- wcstok may be different on different crts, see 7aa1f6ee1c62b0cf395. dlls/mscoree/corruntimehost.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] ucrtbase/tests: Use more functions directly.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 122 +++++++++++++------------------------ 1 file changed, 44 insertions(+), 78 deletions(-)

1 0

[PATCH 1/2] ucrtbase/tests: Build with -fno-builtin.
by Jacek Caban 16 Mar '20

16 Mar '20

Some of tested functions are handled as builtin compiler functions. We always want to test our actual implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/4] kernelbase: Implement compatibility mode for GetVersionEx.
by Gabriel Ivăncescu 16 Mar '20

16 Mar '20

Since Windows 8.1, these functions have been deprecated and run in a sort of compatibility mode, reporting Windows 8 unless the application supplies a manifest that specifies compatibility with newer Windows versions explicitly (by listing their GUIDs). Some applications have bad non-forward-compatible checks based on GetVersionEx, and depend on this behavior (they do not supply a manifest). Currently, they break on Wine if we use a Windows 10 prefix for example, since we always report the real version. One example is the game Rock of Ages. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm introducing an exported internal ntdll function, since I didn't want to duplicate the table for kernelbase. I don't know if this is the best way, so let me know if I should proceed differently. dlls/kernelbase/version.c | 54 +++++++++++++++++++------ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/version.c | 85 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index cf46e9c..d07c1c9 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); +extern CDECL const RTL_OSVERSIONINFOEXW *__wine_get_compat_win_version(void); + typedef struct { WORD offset; @@ -1317,7 +1319,7 @@ DWORD WINAPI GetVersion(void) */ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) { - RTL_OSVERSIONINFOEXW infoW; + const RTL_OSVERSIONINFOEXW *ver; if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) && info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA)) @@ -1327,23 +1329,26 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) return FALSE; } - infoW.dwOSVersionInfoSize = sizeof(infoW); - if (!set_ntstatus( RtlGetVersion( &infoW ))) return FALSE; + if (!(ver = __wine_get_compat_win_version())) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } - info->dwMajorVersion = infoW.dwMajorVersion; - info->dwMinorVersion = infoW.dwMinorVersion; - info->dwBuildNumber = infoW.dwBuildNumber; - info->dwPlatformId = infoW.dwPlatformId; - WideCharToMultiByte( CP_ACP, 0, infoW.szCSDVersion, -1, + info->dwMajorVersion = ver->dwMajorVersion; + info->dwMinorVersion = ver->dwMinorVersion; + info->dwBuildNumber = ver->dwBuildNumber; + info->dwPlatformId = ver->dwPlatformId; + WideCharToMultiByte( CP_ACP, 0, ver->szCSDVersion, -1, info->szCSDVersion, sizeof(info->szCSDVersion), NULL, NULL ); if (info->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXA)) { OSVERSIONINFOEXA *vex = (OSVERSIONINFOEXA *)info; - vex->wServicePackMajor = infoW.wServicePackMajor; - vex->wServicePackMinor = infoW.wServicePackMinor; - vex->wSuiteMask = infoW.wSuiteMask; - vex->wProductType = infoW.wProductType; + vex->wServicePackMajor = ver->wServicePackMajor; + vex->wServicePackMinor = ver->wServicePackMinor; + vex->wSuiteMask = ver->wSuiteMask; + vex->wProductType = ver->wProductType; } return TRUE; } @@ -1354,11 +1359,34 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info ) */ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info ) { + const RTL_OSVERSIONINFOEXW *ver; + if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) && info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)) { WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize ); return FALSE; } - return set_ntstatus( RtlGetVersion( (RTL_OSVERSIONINFOEXW *)info )); + + if (!(ver = __wine_get_compat_win_version())) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + info->dwMajorVersion = ver->dwMajorVersion; + info->dwMinorVersion = ver->dwMinorVersion; + info->dwBuildNumber = ver->dwBuildNumber; + info->dwPlatformId = ver->dwPlatformId; + wcscpy( info->szCSDVersion, ver->szCSDVersion ); + + if(info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + OSVERSIONINFOEXW *vex = (OSVERSIONINFOEXW *)info; + vex->wServicePackMajor = ver->wServicePackMajor; + vex->wServicePackMinor = ver->wServicePackMinor; + vex->wSuiteMask = ver->wSuiteMask; + vex->wProductType = ver->wProductType; + } + return TRUE; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ea72e3..5f58e4a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1572,6 +1572,7 @@ @ cdecl wine_get_version() NTDLL_wine_get_version @ cdecl wine_get_build_id() NTDLL_wine_get_build_id @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version +@ cdecl __wine_get_compat_win_version() # Codepages @ cdecl __wine_get_unix_codepage() diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 61e48f6..f48f725 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -191,6 +191,13 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }; +/* GUIDs for Windows versions WIN81 and later, needed for compatibility manifest check */ +static const GUID version_compat_guid[NB_WINDOWS_VERSIONS - WIN81] = +{ + {0x1f676c76,0x80e1,0x4239,{0x95,0xbb,0x83,0xd0,0xf6,0xd0,0xda,0x78}}, /* WIN81 */ + {0x8e0f7a12,0xbfb3,0x4fe8,{0xb9,0xa5,0x48,0xfd,0x50,0xa1,0x5a,0x9a}}, /* WIN10 */ +}; + static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = { { {'w','i','n','2','0',0}, WIN20 }, @@ -781,3 +788,81 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } + +/****************************************************************************** + * __wine_get_compat_win_version (NTDLL.@) + * + * Get a pointer to a RTL_OSVERSIONINFOEXW that matches the compatibility mode. + * + * For compatibility, Windows 8.1 and later report Win8 version unless the app + * has a manifest that confirms its compatibility with newer versions of Windows. + * + * RETURNS + * A pointer to a RTL_OSVERSIONINFOEXW containing the version in compatibility + * mode, or NULL if out of memory. + */ +CDECL const RTL_OSVERSIONINFOEXW *__wine_get_compat_win_version(void) +{ + static const RTL_OSVERSIONINFOEXW *compat_ver; + + if (!compat_ver) + { + /*ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*/DWORD *acci; + const RTL_OSVERSIONINFOEXW *ver = current_version; + SIZE_T req; + int idx; + + for (idx = ARRAY_SIZE(version_compat_guid); idx--;) + { + const RTL_OSVERSIONINFOEXW *v = &VersionData[WIN81 + idx]; + + if ( current_version->dwMajorVersion > v->dwMajorVersion || + (current_version->dwMajorVersion == v->dwMajorVersion && + current_version->dwMinorVersion >= v->dwMinorVersion)) + break; + } + + if (idx >= 0) + { + ver = &VersionData[WIN8]; + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, NULL, 0, &req) == STATUS_BUFFER_TOO_SMALL + && req) + { + if (!(acci = RtlAllocateHeap(GetProcessHeap(), 0, req))) + return NULL; + + if (RtlQueryInformationActivationContext(0, NULL, NULL, + CompatibilityInformationInActivationContext, acci, req, &req) == STATUS_SUCCESS) + { + do + { + COMPATIBILITY_CONTEXT_ELEMENT *elements = (COMPATIBILITY_CONTEXT_ELEMENT*)(acci + 1); + DWORD i, count = *acci; + + for (i = 0; i < count; i++) + { + if (elements[i].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + IsEqualGUID(&elements[i].Id, &version_compat_guid[idx])) + { + ver = &VersionData[WIN81 + idx]; + + if (ver->dwMajorVersion == current_version->dwMajorVersion && + ver->dwMinorVersion == current_version->dwMinorVersion) + ver = current_version; + + idx = 0; /* break from outer loop */ + break; + } + } + } while(idx--); + } + RtlFreeHeap(GetProcessHeap(), 0, acci); + } + } + interlocked_cmpxchg_ptr((void**)&compat_ver, (void*)ver, NULL); + } + + return compat_ver; +} -- 2.21.0

3 8

[PATCH v2] quartz: Clear the WS_CHILD style instead of unparenting the window.
by Gabriel Ivăncescu 16 Mar '20

16 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48732 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 4 ++++ dlls/quartz/window.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 01152c2..f8b80dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4380,11 +4380,15 @@ static void test_window_threading(void) else skip("Could not find renderer window.\n"); + SetActiveWindow(parent); expect_parent_message = FALSE; ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); expect_parent_message = TRUE; + hwnd = GetActiveWindow(); + ok(hwnd == parent, "Parent window lost focus, active window %p.\n", hwnd); + hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 0b0df13..4656bad 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -136,14 +136,14 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { - BaseControlWindow *window = impl_from_BaseWindow(This); - if (!This->hWnd) return S_OK; - /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent - * the window first. */ - IVideoWindow_put_Owner(&window->IVideoWindow_iface, 0); + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so clear + * the child style first. Just like Windows, we don't actually unparent + * the window, to prevent extra focus events from being generated since + * it would become top-level for a brief period before being destroyed. */ + SetWindowLongW(This->hWnd, GWL_STYLE, GetWindowLongW(This->hWnd, GWL_STYLE) & ~WS_CHILD); SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; -- 2.21.0

2 1

[PATCH v3 1/4] winegstreamer: Allocate media type format blocks with CoTaskMemAlloc().
by Zebediah Figura 16 Mar '20

16 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6897eeda3f1..5a7f696ef14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = heap_alloc(sizeof(*wfe)); + wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -186,7 +186,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = heap_alloc(sizeof(*vih)); + vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -225,14 +225,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * break; default: FIXME("Unhandled type %s.\n", vinfo.finfo->name); - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } switch (amt->subtype.Data1) { -- 2.25.1

1 3

[PATCH 1/3] winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Zebediah Figura 16 Mar '20

16 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e9548e80e4b..7429b360b3a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1972,6 +1972,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1984,8 +1985,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n"); -- 2.25.1

3 4

[PATCH v2 1/2] winegstreamer: Allocate media type format blocks with CoTaskMemAlloc().
by Zebediah Figura 16 Mar '20

16 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6897eeda3f1..5a7f696ef14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = heap_alloc(sizeof(*wfe)); + wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -186,7 +186,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = heap_alloc(sizeof(*vih)); + vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -225,14 +225,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * break; default: FIXME("Unhandled type %s.\n", vinfo.finfo->name); - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - heap_free(vih); + CoTaskMemFree(vih); return FALSE; } switch (amt->subtype.Data1) { -- 2.25.1

1 1

[PATCH 3/3] wined3d: Validate the filter in wined3d_texture_blt().
by Henri Verbeet 16 Mar '20

16 Mar '20

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 180866. dlls/d3d9/tests/visual.c | 26 +++++++++++++------------- dlls/wined3d/surface.c | 18 ++++-------------- dlls/wined3d/texture.c | 4 ++++ 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a798d975f91..9ceb758c605 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3917,24 +3917,24 @@ static void stretchrect_test(void) {BACKBUFFER, &src_rect, TEX_RT_DST_640_480, &dst_rect_flipy, D3DTEXF_NONE}, /* Test filter. */ {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_PYRAMIDALQUAD, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_GAUSSIANQUAD, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_CONVOLUTIONMONO, FALSE, TRUE}, - {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, 0xbadf, FALSE, TRUE}, + {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_PYRAMIDALQUAD}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_GAUSSIANQUAD}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_CONVOLUTIONMONO}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, 0xbadf}, {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, - {RT_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, + {RT_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, - {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC}, {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_NONE, TRUE}, - {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_ANISOTROPIC}, }; window = create_window(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3745d8dde7f..e965203950e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -165,20 +165,10 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co && (abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left)); - switch (filter) - { - case WINED3D_TEXF_LINEAR: - gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; - break; - - default: - FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); - /* fall through */ - case WINED3D_TEXF_NONE: - case WINED3D_TEXF_POINT: - gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; - break; - } + if (filter == WINED3D_TEXF_LINEAR) + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; + else + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b663a44fbb1..85f09ee3489 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3569,6 +3569,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; + if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT + && filter != WINED3D_TEXF_LINEAR) + return WINED3DERR_INVALIDCALL; + dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) -- 2.20.1

1 0

[PATCH 2/3] d3d9/tests: Add tests for allowed StrecthRect() filters.
by Henri Verbeet 16 Mar '20

16 Mar '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 180865. dlls/d3d9/tests/visual.c | 493 ++++++++++++++++++--------------------- 1 file changed, 222 insertions(+), 271 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2294d434bab..a798d975f91 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3828,16 +3828,32 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) static void stretchrect_test(void) { - IDirect3DSurface9 *surf_tex_rt32, *surf_tex_rt64, *surf_tex_rt_dest64, *surf_tex_rt_dest640_480; - IDirect3DSurface9 *surf_offscreen32, *surf_offscreen64, *surf_offscreen_dest64; + enum surface_type + { + OFFSCREEN_32, + OFFSCREEN_64, + OFFSCREEN_DST_64, + RT_32, + RT_64, + RT_DST_64, + TEX_RT_32, + TEX_RT_64, + TEX_RT_DST_64, + TEX_RT_DST_640_480, + TEX_32, + TEX_64, + TEX_DST_64, + BACKBUFFER, + SURFACE_TYPE_COUNT, + }; + IDirect3DTexture9 *tex_rt32, *tex_rt64, *tex_rt_dest64, *tex_rt_dest640_480; - IDirect3DSurface9 *surf_tex32, *surf_tex64, *surf_tex_dest64; - IDirect3DSurface9 *surf_rt32, *surf_rt64, *surf_rt_dest64; + IDirect3DSurface9 *surfaces[SURFACE_TYPE_COUNT]; IDirect3DTexture9 *tex32, *tex64, *tex_dest64; IDirect3DSurface9 *surf_temp32, *surf_temp64; - IDirect3DSurface9 *backbuffer; IDirect3DDevice9 *device; IDirect3D9 *d3d; + unsigned int i; D3DCOLOR color; ULONG refcount; HWND window; @@ -3852,6 +3868,75 @@ static void stretchrect_test(void) static const RECT dst_rect64 = {0, 0, 64, 64}; static const RECT dst_rect64_flipy = {0, 64, 64, 0}; + static const struct error_condition_test + { + enum surface_type src; + const RECT *src_rect; + enum surface_type dst; + const RECT *dst_rect; + D3DTEXTUREFILTERTYPE filter; + BOOL allowed; + BOOL todo; + } + error_condition_tests[] = + { + {OFFSCREEN_64, &src_rect64_flipy, OFFSCREEN_DST_64, &dst_rect64, D3DTEXF_NONE}, + {OFFSCREEN_64, &src_rect64, OFFSCREEN_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {OFFSCREEN_64, &src_rect64_flipy, TEX_RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {OFFSCREEN_64, &src_rect64, TEX_RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {OFFSCREEN_64, &src_rect64_flipy, RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {OFFSCREEN_64, &src_rect64, RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {OFFSCREEN_64, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {OFFSCREEN_32, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {OFFSCREEN_32, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {TEX_64, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {TEX_64, &src_rect64_flipy, TEX_RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {TEX_64, &src_rect64, TEX_RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {TEX_64, &src_rect64_flipy, RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {TEX_64, &src_rect64, RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {TEX_64, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {TEX_32, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {TEX_32, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {TEX_RT_64, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {TEX_RT_64, &src_rect64_flipy, TEX_RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {TEX_RT_64, &src_rect64, TEX_RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {TEX_RT_64, &src_rect64_flipy, RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {TEX_RT_64, &src_rect64, RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {TEX_RT_64, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {TEX_RT_32, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {TEX_RT_32, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {RT_64, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {RT_64, &src_rect64_flipy, TEX_RT_DST_64, &dst_rect64, D3DTEXF_NONE}, + {RT_64, &src_rect64, TEX_RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {RT_64, &src_rect64_flipy, RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {RT_64, &src_rect64, RT_DST_64, &dst_rect64_flipy, D3DTEXF_NONE}, + {RT_64, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {RT_32, NULL, OFFSCREEN_64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {RT_32, NULL, TEX_DST_64, NULL, D3DTEXF_NONE}, + {BACKBUFFER, &src_rect_flipy, TEX_RT_DST_640_480, &dst_rect, D3DTEXF_NONE}, + {BACKBUFFER, &src_rect, TEX_RT_DST_640_480, &dst_rect_flipy, D3DTEXF_NONE}, + /* Test filter. */ + {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_NONE, TRUE}, + {OFFSCREEN_64, NULL, OFFSCREEN_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, + {OFFSCREEN_32, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_PYRAMIDALQUAD, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_GAUSSIANQUAD, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_CONVOLUTIONMONO, FALSE, TRUE}, + {OFFSCREEN_64, NULL, TEX_RT_DST_64, NULL, 0xbadf, FALSE, TRUE}, + {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, + {TEX_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {RT_64, NULL, RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, + {TEX_RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_NONE, TRUE}, + {RT_64, NULL, TEX_RT_DST_64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_NONE, TRUE}, + {BACKBUFFER, NULL, TEX_RT_DST_640_480, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -3864,165 +3949,132 @@ static void stretchrect_test(void) /* Create our temporary surfaces in system memory. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create offscreen plain surfaces in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surfaces[OFFSCREEN_32], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surfaces[OFFSCREEN_64], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surfaces[OFFSCREEN_DST_64], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target surfaces. */ hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, - D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt32, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surfaces[RT_32], NULL ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, - D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surfaces[RT_64], NULL ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, - D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt_dest64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); - hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surfaces[RT_DST_64], NULL ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surfaces[BACKBUFFER]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target textures. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest640_480, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt32, 0, &surf_tex_rt32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt64, 0, &surf_tex_rt64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surf_tex_rt_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surf_tex_rt_dest640_480); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt32, 0, &surfaces[TEX_RT_32]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt64, 0, &surfaces[TEX_RT_64]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surfaces[TEX_RT_DST_64]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surfaces[TEX_RT_DST_640_480]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create regular textures in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex32, 0, &surf_tex32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex64, 0, &surf_tex64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(tex_dest64, 0, &surf_tex_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex32, 0, &surfaces[TEX_32]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex64, 0, &surfaces[TEX_64]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_dest64, 0, &surfaces[TEX_DST_64]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /********************************************************************** * Tests for when the source parameter is an offscreen plain surface. * **********************************************************************/ /* Fill the offscreen 64x64 surface with green. */ - fill_surface(surf_offscreen64, 0xff00ff00, 0); + fill_surface(surfaces[OFFSCREEN_64], 0xff00ff00, 0); /* offscreenplain ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_offscreen_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], NULL, + surfaces[OFFSCREEN_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_offscreen_dest64, 32, 32); + color = getPixelColorFromSurface(surfaces[OFFSCREEN_DST_64], 32, 32); ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], &src_rect64, + surfaces[OFFSCREEN_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_offscreen_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget texture, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], NULL, + surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], &src_rect64, + surfaces[TEX_RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget surface, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 32, 32); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 32, 32); ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_64], &src_rect64, + surfaces[RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* offscreenplain ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the smaller offscreen surface with red. */ - fill_surface(surf_offscreen32, 0xffff0000, 0); - - /* offscreenplain ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + fill_surface(surfaces[OFFSCREEN_32], 0xffff0000, 0); /* offscreenplain ==> rendertarget texture, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_32], NULL, + surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); /* offscreenplain ==> rendertarget surface, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[OFFSCREEN_32], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* offscreenplain ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /************************************************************* * Tests for when the source parameter is a regular texture. * *************************************************************/ @@ -4030,85 +4082,53 @@ static void stretchrect_test(void) /* Fill the surface of the regular texture with blue. */ /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xff0000ff, 0); - hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surfaces[TEX_64], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_64], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_64], &src_rect64, + surfaces[TEX_RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget surface, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_64], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 32, 32); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 32, 32); ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_64], &src_rect64, + surfaces[RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller regular texture with red. */ /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); - hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surfaces[TEX_32], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_32], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); /* texture ==> rendertarget surface, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_32], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget texture. * ******************************************************************/ @@ -4116,206 +4136,137 @@ static void stretchrect_test(void) /* Fill the surface of the rendertarget texture with white. */ /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xffffffff, 0); - hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surfaces[TEX_RT_64], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_64], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xffffffff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_64], &src_rect64, + surfaces[TEX_RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget surface, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_64], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 32, 32); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 32, 32); ok(color == 0xffffffff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_64], &src_rect64, + surfaces[RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); - hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surfaces[TEX_RT_32], NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_32], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); /* rendertarget texture ==> rendertarget surface, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[TEX_RT_32], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget surface. * ******************************************************************/ /* Fill the surface of the rendertarget surface with black. */ - fill_surface(surf_rt64, 0xff000000, 0); - - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + fill_surface(surfaces[RT_64], 0xff000000, 0); /* rendertarget surface ==> rendertarget texture, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_64], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff000000, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_64], &src_rect64, + surfaces[TEX_RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget surface ==> rendertarget surface, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_64], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 32, 32); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 32, 32); ok(color == 0xff000000, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_64], &src_rect64, + surfaces[RT_DST_64], &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget surface ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ - fill_surface(surf_rt32, 0xffff0000, 0); - - /* rendertarget surface ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + fill_surface(surfaces[RT_32], 0xffff0000, 0); /* rendertarget surface ==> rendertarget texture, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_32], NULL, surfaces[TEX_RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ - hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surfaces[TEX_RT_DST_64], surf_temp64); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); /* rendertarget surface ==> rendertarget surface, scaling. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[RT_32], NULL, surfaces[RT_DST_64], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); + color = getPixelColorFromSurface(surfaces[RT_DST_64], 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget surface ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* backbuffer ==> surface tests (no scaling). */ /* Blit with NULL rectangles. */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, NULL, surf_tex_rt_dest640_480, NULL, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[BACKBUFFER], NULL, + surfaces[TEX_RT_DST_640_480], NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Blit without scaling. */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, - surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); + hr = IDirect3DDevice9_StretchRect(device, surfaces[BACKBUFFER], &src_rect, + surfaces[TEX_RT_DST_640_480], &dst_rect, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect_flipy, - surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, - surf_tex_rt_dest640_480, &dst_rect_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* Test error conditions. */ + for (i = 0; i < ARRAY_SIZE(error_condition_tests); ++i) + { + const struct error_condition_test *test = &error_condition_tests[i]; + + hr = IDirect3DDevice9_StretchRect(device, surfaces[test->src], test->src_rect, + surfaces[test->dst], test->dst_rect, test->filter); + todo_wine_if(test->todo) + ok(hr == test->allowed ? D3D_OK : D3DERR_INVALIDCALL, "Test %u, got unexpected hr %#x.\n", i, hr); + } /* TODO: Test format conversions. */ - IDirect3DSurface9_Release(backbuffer); - IDirect3DSurface9_Release(surf_rt32); - IDirect3DSurface9_Release(surf_rt64); - IDirect3DSurface9_Release(surf_rt_dest64); + for (i = 0; i < ARRAY_SIZE(surfaces); ++i) + { + IDirect3DSurface9_Release(surfaces[i]); + } + IDirect3DSurface9_Release(surf_temp32); IDirect3DSurface9_Release(surf_temp64); - IDirect3DSurface9_Release(surf_offscreen32); - IDirect3DSurface9_Release(surf_offscreen64); - IDirect3DSurface9_Release(surf_offscreen_dest64); - IDirect3DSurface9_Release(surf_tex_rt32); IDirect3DTexture9_Release(tex_rt32); - IDirect3DSurface9_Release(surf_tex_rt64); IDirect3DTexture9_Release(tex_rt64); - IDirect3DSurface9_Release(surf_tex_rt_dest64); IDirect3DTexture9_Release(tex_rt_dest64); - IDirect3DSurface9_Release(surf_tex_rt_dest640_480); IDirect3DTexture9_Release(tex_rt_dest640_480); - IDirect3DSurface9_Release(surf_tex32); IDirect3DTexture9_Release(tex32); - IDirect3DSurface9_Release(surf_tex64); IDirect3DTexture9_Release(tex64); - IDirect3DSurface9_Release(surf_tex_dest64); IDirect3DTexture9_Release(tex_dest64); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.20.1

1 0

[PATCH 1/3] wined3d: Get rid of the vertex sampler offset.
by Henri Verbeet 16 Mar '20

16 Mar '20

From: Matteo Bruni <mbruni(a)codeweavers.com> Do the offsetting in d3d9 instead. Notice that this also fixes vertex sampler handling in wined3d_stateblock_apply(), since it was using the adjusted "stage" to index the sampler_states[] array. (Coverity) Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 180264. dlls/d3d9/device.c | 23 +++++++++++++---------- dlls/wined3d/device.c | 18 +++--------------- dlls/wined3d/stateblock.c | 14 +------------- include/wine/wined3d.h | 5 +---- 4 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1d18a79fe..d7ffe2822f5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2514,8 +2514,8 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st if (!texture) return D3DERR_INVALIDCALL; - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + if (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + stage -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; if (stage >= ARRAY_SIZE(state->textures)) { @@ -2550,20 +2550,20 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); + if (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + stage -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; + wined3d_mutex_lock(); wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); if (!device->recording) { - unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) - ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; - - if (i < D3D9_MAX_TEXTURE_UNITS) + if (stage < D3D9_MAX_TEXTURE_UNITS) { if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) - device->auto_mipmaps |= 1u << i; + device->auto_mipmaps |= 1u << stage; else - device->auto_mipmaps &= ~(1u << i); + device->auto_mipmaps &= ~(1u << stage); } } wined3d_mutex_unlock(); @@ -2656,8 +2656,8 @@ static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, TRACE("iface %p, sampler_idx %u, state %#x, value %p.\n", iface, sampler_idx, state, value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + if (sampler_idx >= D3DVERTEXTEXTURESAMPLER0 && sampler_idx <= D3DVERTEXTEXTURESAMPLER3) + sampler_idx -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; if (sampler_idx >= ARRAY_SIZE(device_state->sampler_states)) { @@ -2681,6 +2681,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev TRACE("iface %p, sampler %u, state %#x, value %#x.\n", iface, sampler, state, value); + if (sampler >= D3DVERTEXTEXTURESAMPLER0 && sampler <= D3DVERTEXTEXTURESAMPLER3) + sampler -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; + wined3d_mutex_lock(); wined3d_stateblock_set_sampler_state(device->update_state, sampler, state, value); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 927c9456ec0..ce891ce2251 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1758,9 +1758,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", device, sampler_idx, debug_d3dsamplerstate(state), value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (value == device->state.sampler_states[sampler_idx][state]) { TRACE("Application is setting the old value over, nothing to do.\n"); @@ -3452,9 +3449,6 @@ static void wined3d_device_set_texture(struct wined3d_device *device, TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - /* Windows accepts overflowing this array... we do not. */ if (stage >= ARRAY_SIZE(device->state.textures)) { @@ -3492,7 +3486,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, BOOL set_blend_state = FALSE, set_rasterizer_state = FALSE; unsigned int i, j, start, idx; struct wined3d_range range; - DWORD map, stage; + uint32_t map; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3732,14 +3726,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { - stage = i; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; map = changed->samplerState[i]; while (map) { j = wined3d_bit_scan(&map); - wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + wined3d_device_set_sampler_state(device, i, j, state->sampler_states[i][j]); } } @@ -3788,10 +3779,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, while (map) { i = wined3d_bit_scan(&map); - stage = i; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - wined3d_device_set_texture(device, stage, state->textures[i]); + wined3d_device_set_texture(device, i, state->textures[i]); } map = changed->clipplane; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 248f413f623..db0019adbf4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1075,7 +1075,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, DWORD stage = stateblock->contained_sampler_states[i].stage; DWORD sampler_state = stateblock->contained_sampler_states[i].state; - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; wined3d_stateblock_set_sampler_state(device_state, stage, sampler_state, state->sampler_states[stage][sampler_state]); } @@ -1127,13 +1126,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, map = stateblock->changed.textures; for (i = 0; map; map >>= 1, ++i) { - DWORD stage = i; - - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (map & 1) - wined3d_stateblock_set_texture(device_state, stage, state->textures[i]); + wined3d_stateblock_set_texture(device_state, i, state->textures[i]); } map = stateblock->changed.clipplane; @@ -1353,9 +1347,6 @@ void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *state TRACE("stateblock %p, sampler_idx %u, state %s, value %#x.\n", stateblock, sampler_idx, debug_d3dsamplerstate(state), value); - if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3) - sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (sampler_idx >= ARRAY_SIZE(stateblock->stateblock_state.sampler_states)) { WARN("Invalid sampler %u.\n", sampler_idx); @@ -1394,9 +1385,6 @@ void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, { TRACE("stateblock %p, stage %u, texture %p.\n", stateblock, stage, texture); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - if (stage >= ARRAY_SIZE(stateblock->stateblock_state.textures)) { WARN("Ignoring invalid stage %u.\n", stage); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0dd09f4a3f6..d6938aeb206 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1035,10 +1035,7 @@ enum wined3d_shader_type /* VTF defines */ #define WINED3DDMAPSAMPLER 0x100 -#define WINED3DVERTEXTEXTURESAMPLER0 (WINED3DDMAPSAMPLER + 1) -#define WINED3DVERTEXTEXTURESAMPLER1 (WINED3DDMAPSAMPLER + 2) -#define WINED3DVERTEXTEXTURESAMPLER2 (WINED3DDMAPSAMPLER + 3) -#define WINED3DVERTEXTEXTURESAMPLER3 (WINED3DDMAPSAMPLER + 4) +#define WINED3D_VERTEX_SAMPLER_OFFSET WINED3D_MAX_FRAGMENT_SAMPLERS #define WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 #define WINED3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080 -- 2.20.1

1 0

[PATCH] quartz: Clear the WS_CHILD style in WM_CLOSE instead of unparenting it before.
by Gabriel Ivăncescu 16 Mar '20

16 Mar '20

We handle it in WM_CLOSE to match Windows more closely, in case the window belongs to a different thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48732 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/quartz/window.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 0b0df13..48466fd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -79,6 +79,14 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM This->Width = LOWORD(lparam); This->Height = HIWORD(lparam); + break; + case WM_CLOSE: + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so clear + * the child style first. Just like Windows, we don't actually unparent + * the window, to prevent extra focus events from being generated since + * it would become top-level for a brief period before being destroyed. */ + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_CHILD); + break; } return DefWindowProcW(hwnd, message, wparam, lparam); @@ -136,15 +144,9 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { - BaseControlWindow *window = impl_from_BaseWindow(This); - if (!This->hWnd) return S_OK; - /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent - * the window first. */ - IVideoWindow_put_Owner(&window->IVideoWindow_iface, 0); - SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; -- 2.21.0

2 3

[PATCH 7/7] dbghelp: Pass module struct to elf_locate_debug_link.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 6/7] dbghelp: Support Windows paths in elf_locate_debug_link.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH 5/7] dbghelp: Move HANDLE-based crc32 helper to dbghelp.c.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 8 ++++---- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 18 +++--------------- dlls/dbghelp/macho_module.c | 16 ++++++++++++++-- 4 files changed, 22 insertions(+), 22 deletions(-)

1 0

[PATCH 4/7] dbghelp: Introduce generic image_unmap_file.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 57 +++++++++++++++++------------------- dlls/dbghelp/image_private.h | 10 +++++++ dlls/dbghelp/macho_module.c | 1 + dlls/dbghelp/pe_module.c | 53 +++++++++++++++++---------------- 4 files changed, 65 insertions(+), 56 deletions(-)

1 0

[PATCH 3/7] dbghelp: Use vtbl to handle different image_file_map types.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 44 +++++++------------- dlls/dbghelp/image_private.h | 79 +++++++----------------------------- dlls/dbghelp/macho_module.c | 41 ++++++++----------- dlls/dbghelp/pe_module.c | 24 +++++++---- 4 files changed, 62 insertions(+), 126 deletions(-)

1 0

[PATCH 2/7] dbghelp: Move alternate file map pointer to generic image_file_map.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 61 ++++++++++++++++++++++++------------ dlls/dbghelp/image_private.h | 27 +++++++++++----- dlls/dbghelp/macho_module.c | 1 + dlls/dbghelp/pe_module.c | 1 + 4 files changed, 63 insertions(+), 27 deletions(-)

1 0

[PATCH 1/7] dbghelp: Use generic image_find_section in elf_check_alternate.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] dxgi/tests: Avoid an ever chaning value in a dxgi failure message.
by Francois Gouget 16 Mar '20

16 Mar '20

The test does not trace any window handle so there is no value to correlate the value in the failure message with. So showing this ever changing value is useless as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e2b5df7b272..16482ae12ee 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5060,8 +5060,8 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { - ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#lx, lparam %#lx.\n", - message, hwnd, wparam, lparam); + ok(!expect_no_messages, "Got unexpected message %#x, wparam %#lx, lparam %#lx.\n", + message, wparam, lparam); if (expect_messages) { -- 2.20.1

4 4

[PATCH 5/5] d3d9: Report d3d9 adapter group information in device caps.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 19 +++++++++-------- dlls/d3d9/device.c | 46 +++++++++++++++++++++++++++++++++------- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 4 ---- include/wine/wined3d.h | 4 ---- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a0daaf42880..7f0901805b0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -52,15 +52,6 @@ extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; -HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; -D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; -void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, - const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; - struct d3d9 { IDirect3D9Ex IDirect3D9Ex_iface; @@ -71,6 +62,16 @@ struct d3d9 BOOL extended; }; +HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; +D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; +void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps, + const struct d3d9 *d3d9, unsigned int adapter_ordinal) DECLSPEC_HIDDEN; + BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4887dff450..393069d6b9e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -360,7 +360,8 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) +void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps, + const struct d3d9 *d3d9, unsigned int adapter_ordinal) { static const DWORD ps_minor_version[] = {0, 4, 0, 0}; static const DWORD vs_minor_version[] = {0, 1, 0, 0}; @@ -370,9 +371,12 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; + struct wined3d_output *wined3d_output, *master_output; + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx, output_count; caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -426,9 +430,6 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d caps->PixelShader1xMaxValue = wined3d_caps->PixelShader1xMaxValue; caps->DevCaps2 = wined3d_caps->DevCaps2; caps->MaxNpatchTessellationLevel = wined3d_caps->MaxNpatchTessellationLevel; - caps->MasterAdapterOrdinal = wined3d_caps->MasterAdapterOrdinal; - caps->AdapterOrdinalInGroup = wined3d_caps->AdapterOrdinalInGroup; - caps->NumberOfAdaptersInGroup = wined3d_caps->NumberOfAdaptersInGroup; caps->DeclTypes = wined3d_caps->DeclTypes; caps->NumSimultaneousRTs = wined3d_caps->NumSimultaneousRTs; caps->StretchRectFilterCaps = wined3d_caps->StretchRectFilterCaps; @@ -520,6 +521,33 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d DWORD major = caps->VertexShaderVersion; caps->VertexShaderVersion = D3DVS_VERSION(major, vs_minor_version[major]); } + + /* Get adapter group information */ + output_idx = adapter_ordinal; + wined3d_output = d3d9->wined3d_outputs[output_idx]; + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); + + master_output = wined3d_adapter_get_output(wined3d_adapter, 0); + for (output_idx = 0; output_idx < d3d9->wined3d_output_count; ++output_idx) + { + if (master_output == d3d9->wined3d_outputs[output_idx]) + { + caps->MasterAdapterOrdinal = output_idx; + break; + } + } + + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + if (wined3d_output == wined3d_adapter_get_output(wined3d_adapter, output_idx)) + { + caps->AdapterOrdinalInGroup = output_idx; + break; + } + } + + caps->NumberOfAdaptersInGroup = caps->AdapterOrdinalInGroup ? 0 : output_count; } static void device_reset_viewport_state(struct d3d9_device *device) @@ -709,7 +737,7 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, device->d3d_parent, device->adapter_ordinal); return hr; } @@ -4592,9 +4620,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct wined3d_swapchain_desc *swapchain_desc; struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; - struct wined3d_caps caps; + struct wined3d_caps wined3d_caps; unsigned int output_idx; unsigned i, count = 1; + D3DCAPS9 caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -4633,7 +4662,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + d3dcaps_from_wined3dcaps(&caps, &wined3d_caps, parent, adapter); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d79b32515fa..3d4e2392719 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -439,7 +439,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, d3d9, adapter); return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cf0d77e821..2fefb20a3e3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1889,7 +1889,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | @@ -2079,9 +2078,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; caps->MaxNpatchTessellationLevel = 0; - caps->MasterAdapterOrdinal = 0; - caps->AdapterOrdinalInGroup = 0; - caps->NumberOfAdaptersInGroup = 1; caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index affeb891e75..c0a03e41f8f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1911,7 +1911,6 @@ struct wined3d_ddraw_caps struct wined3d_caps { enum wined3d_device_type DeviceType; - UINT AdapterOrdinal; DWORD Caps; DWORD Caps2; @@ -1979,9 +1978,6 @@ struct wined3d_caps float MaxNpatchTessellationLevel; - UINT MasterAdapterOrdinal; - UINT AdapterOrdinalInGroup; - UINT NumberOfAdaptersInGroup; DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; -- 2.20.1

2 3

[PATCH 2/5] d3d8/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 224 +++++++++++++++++++++------------------ 1 file changed, 122 insertions(+), 102 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 008395df1a6..367be57d5ec 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -106,7 +106,8 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } -static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) +static IDirect3DDevice8 *create_device_on_adapter(IDirect3D8 *d3d8, unsigned int adapter_idx, + HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; @@ -135,12 +136,12 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons behavior_flags |= D3DCREATE_FPU_PRESERVE; } - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -148,13 +149,18 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; return NULL; } +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) +{ + return create_device_on_adapter(d3d8, D3DADAPTER_DEFAULT, focus_window, desc); +} + static HRESULT reset_device(IDirect3DDevice8 *device, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -8829,6 +8835,7 @@ static void test_swapchain_multisample_reset(void) static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; @@ -8839,106 +8846,119 @@ static void test_device_caps(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D8_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D8_GetDeviceCaps */ + hr = IDirect3D8_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "GetDeviceCaps failed, hr %#x.\n", hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("No Direct3D support, skipping test.\n"); + break; + } + ok(caps.AdapterOrdinal == adapter_idx, "Expect adapter ordinal %u, got %u.\n", adapter_idx, + caps.AdapterOrdinal); + + /* Test IDirect3DDevice8_GetDeviceCaps */ + device = create_device_on_adapter(d3d, adapter_idx, window, NULL); + ok(!!device, "Failed to create a D3D device on adapter %u.\n", adapter_idx); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + ok(caps.AdapterOrdinal == adapter_idx, "Expect adapter ordinal %u, got %u.\n", adapter_idx, + caps.AdapterOrdinal); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), + "Caps2 field has unexpected flags %#x.\n", caps.Caps2); + /* Nvidia returns that 0x400 flag, which is probably Vista+ + * D3DCAPS3_DXVAHD from d3d9caps.h */ + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) + || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), + "Caps3 field has unexpected flags %#x.\n", caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE)) + || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), + "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); + /* AMD includes an unknown 0x2 flag. */ + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) + || broken(!(caps.RasterCaps & ~0x0ff7f19b)), + "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), + "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) + || broken(!(caps.TextureFilterCaps & ~0x0703073f)), + "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), + "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), + "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), + "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* Nvidia returns that 0x400 flag, which is probably Vista+ - * D3DCAPS3_DXVAHD from d3d9caps.h */ - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) - || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE)) - || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - /* AMD includes an unknown 0x2 flag. */ - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) - || broken(!(caps.RasterCaps & ~0x0ff7f19b)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) - || broken(!(caps.TextureFilterCaps & ~0x0703073f)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d); DestroyWindow(window); } -- 2.20.1

2 3

[PATCH 1/4] wined3d: Fix an accidental replacement of STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE).
by Zebediah Figura 16 Mar '20

16 Mar '20

Fixes: 04453496a22d4b9a8f4ff50e48166b4928b937f5 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Thanks to Matteo Bruni for spotting this one. dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e4f174b9f1..0761dd6379 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4471,7 +4471,7 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_BLEND); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not -- 2.25.1

2 7

[PATCH 1/2] ddraw/tests: Re-init for every test_surface_discard iteration.
by Stefan Dösinger 16 Mar '20

16 Mar '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 39 +++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw2.c | 39 +++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 41 ++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw7.c | 41 ++++++++++++++++++++++++--------------- 4 files changed, 98 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 98b83334122..5bfca430086 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4413,23 +4413,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - IDirectDraw_Release(ddraw); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void**)&target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -4475,11 +4483,12 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, never changes the pointer. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface_Release(target); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); } - IDirectDrawSurface_Release(target); - IDirect3DDevice_Release(device); - IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7dfb35d2d3a..b472b3d5883 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4943,23 +4943,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - IDirectDraw2_Release(ddraw); - return; - } - - hr = IDirect3DDevice2_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return; + } + + hr = IDirect3DDevice2_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -5005,11 +5013,12 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, never changes the pointer. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface_Release(target); + IDirect3DDevice2_Release(device); + IDirectDraw2_Release(ddraw); } - IDirectDrawSurface_Release(target); - IDirect3DDevice2_Release(device); - IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e1d5bac18bb..1e6cf4c446a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6565,23 +6565,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); - hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); - hr = IDirect3DDevice3_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -6624,12 +6632,13 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, does not. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface4_Release(target); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + IDirect3DDevice3_Release(device); } - IDirectDrawSurface4_Release(target); - IDirectDraw4_Release(ddraw); - IDirect3D3_Release(d3d); - IDirect3DDevice3_Release(device); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3ad44991863..bdec30621e3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6379,23 +6379,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); - hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); - hr = IDirect3DDevice7_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -6438,12 +6446,13 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, does not. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface7_Release(target); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + IDirect3DDevice7_Release(device); } - IDirectDrawSurface7_Release(target); - IDirectDraw7_Release(ddraw); - IDirect3D7_Release(d3d); - IDirect3DDevice7_Release(device); DestroyWindow(window); } -- 2.24.1

3 4

[PATCH 3/5] d3d8: Report d3d8 adapter ordinal in device caps.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

d3d8 adapters are actually outputs in wined3d. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 8 +++++--- dlls/d3d8/directx.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 488035c7f82..93526411767 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -51,7 +51,8 @@ extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) DECLSPEC_HIDDEN; struct d3d8 { @@ -113,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + unsigned int adapter_ordinal; IDirect3D8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b7c03e4e42..400e1e292ab 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -310,10 +310,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) { caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -689,7 +690,7 @@ static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, device->adapter_ordinal); return hr; } @@ -3678,6 +3679,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; + device->adapter_ordinal = adapter; device->ref = 1; if (!(device->handle_table.entries = heap_alloc_zero(D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)))) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 66e7e622f8f..343073f3515 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -389,7 +389,7 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, adapter); return hr; } -- 2.20.1

2 1

[PATCH 1/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_get_device_caps().
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 9 ++++++++- dlls/ddraw/ddraw.c | 4 ++-- dlls/dxgi/adapter.c | 4 +--- dlls/wined3d/device.c | 3 +-- dlls/wined3d/directx.c | 13 ++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 02b010c22a4..4b7c03e4e42 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3701,7 +3701,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index cbb638f014d..66e7e622f8f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -370,16 +370,23 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS8 *caps) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d8->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1d18a79fe..b4887dff450 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4633,7 +4633,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6c8ca1c3d3d..d79b32515fa 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -418,18 +418,25 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS9 *caps) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; memset(caps, 0, sizeof(*caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d9->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e82f9644e3b..de457511591 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1227,7 +1227,7 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) memset(&wined3d_caps, 0, sizeof(wined3d_caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); + hr = wined3d_get_device_caps(ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -5017,7 +5017,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de return E_FAIL; } - if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, &caps))) + if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d_adapter, device_type, &caps))) { ERR("Failed to get device caps, hr %#x.\n", hr); wined3d_decref(ddraw->wined3d); diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 2bd69954e10..d48d4755d00 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -211,7 +211,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; struct wined3d_caps caps; - struct wined3d *wined3d; HRESULT hr; TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); @@ -230,8 +229,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda adapter_id.device_name_size = 0; wined3d_mutex_lock(); - wined3d = adapter->factory->wined3d; - hr = wined3d_get_device_caps(wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + hr = wined3d_get_device_caps(adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &caps); if (SUCCEEDED(hr)) hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d94b1e2f2da..60a6d9eb1c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3788,8 +3788,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device { TRACE("device %p, caps %p.\n", device, caps); - return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, - device->create_parms.device_type, caps); + return wined3d_get_device_caps(device->adapter, device->create_parms.device_type, caps); } HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f8933801a9..8cf0d77e821 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1874,27 +1874,22 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, return WINED3D_OK; } -HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps) { const struct wined3d_d3d_info *d3d_info; struct wined3d_vertex_caps vertex_caps; - const struct wined3d_adapter *adapter; DWORD ckey_caps, blit_caps, fx_caps; struct fragment_caps fragment_caps; struct shader_caps shader_caps; - TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); + TRACE("adapter %p, device_type %s, caps %p.\n", + adapter, debug_d3ddevicetype(device_type), caps); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter_idx; + caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a25accc2371..c06cca22ee4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,7 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_device_caps(ptr long long ptr) +@ cdecl wined3d_get_device_caps(ptr long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ec097ea5fb..affeb891e75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2276,7 +2276,7 @@ ULONG __cdecl wined3d_decref(struct wined3d *wined3d); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); -HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); -- 2.20.1

2 1

[PATCH] mf: Remove FIXME for zero buffer size, it's used as is.
by Nikolay Sivov 16 Mar '20

16 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e98be7c95f..07cfc4ee8c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2257,9 +2257,6 @@ static HRESULT transform_node_get_sample(struct topo_node *node, DWORD output, I { IMFMediaBuffer *buffer = NULL; - if (!stream_info.cbSize) - FIXME("Unhandled buffer size %u.\n", stream_info.cbSize); - hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer); if (SUCCEEDED(hr)) hr = MFCreateSample(&buffers[output].pSample); -- 2.25.1

1 0

[PATCH 1/5] mfplat: Implement MFCreateMediaBufferFromMediaType() for audio types.
by Nikolay Sivov 16 Mar '20

16 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 62 +++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 70 ++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 ++ 4 files changed, 135 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 590288e344..b1d353a59b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -448,6 +448,68 @@ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BO return create_2d_buffer(width, height, fourcc, buffer); } +static unsigned int buffer_get_aligned_length(unsigned int length, unsigned int alignment) +{ + length = (length + alignment) / alignment; + length *= alignment; + + return length; +} + +HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD alignment, IMFMediaBuffer **buffer) +{ + UINT32 length = 0, block_alignment; + LONGLONG avg_length; + HRESULT hr; + GUID major; + + TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_longlong(duration), min_length, alignment, buffer); + + if (!media_type) + return E_INVALIDARG; + + if (FAILED(hr = IMFMediaType_GetMajorType(media_type, &major))) + return hr; + + if (IsEqualGUID(&major, &MFMediaType_Audio)) + { + block_alignment = 0; + if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + WARN("Block alignment was not specified.\n"); + + if (block_alignment) + { + avg_length = 0; + + if (duration) + { + length = 0; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &length))) + { + /* 100 ns -> 1 s */ + avg_length = length * duration / (10 * 1000 * 1000); + } + } + + alignment = max(16, alignment); + + length = buffer_get_aligned_length(avg_length + 1, alignment); + length = buffer_get_aligned_length(length, block_alignment); + } + else + length = 0; + + length = max(length, min_length); + + return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + } + else + FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); + + return E_NOTIMPL; +} + static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2fb6388a31..9f08d1aff2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -52,6 +52,7 @@ @ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stdcall MFCreateMFByteStreamWrapper(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType +@ stdcall MFCreateMediaBufferFromMediaType(ptr int64 long long ptr) @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) @ stdcall MFCreateMediaType(ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 31194db77f..65e9b66447 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -95,6 +95,8 @@ static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height static HRESULT (WINAPI *pMFGetStrideForBitmapInfoHeader)(DWORD format, DWORD width, LONG *stride); static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD min_alignment, IMFMediaBuffer **buffer); static const WCHAR fileschemeW[] = L"file://"; @@ -665,6 +667,7 @@ static void init_functions(void) X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); + X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); X(MFGetPlaneSize); @@ -4587,6 +4590,72 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } +static void test_MFCreateMediaBufferFromMediaType(void) +{ + static struct audio_buffer_test + { + unsigned int duration; + unsigned int min_length; + unsigned int min_alignment; + unsigned int block_alignment; + unsigned int bytes_per_second; + unsigned int buffer_length; + } audio_tests[] = + { + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + }; + IMFMediaBuffer *buffer; + UINT32 length; + HRESULT hr; + IMFMediaType *media_type; + unsigned int i; + + if (!pMFCreateMediaBufferFromMediaType) + { + win_skip("MFCreateMediaBufferFromMediaType() is not available.\n"); + return; + } + + hr = pMFCreateMediaBufferFromMediaType(NULL, 0, 0, 0, &buffer); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) + { + const struct audio_buffer_test *ptr = &audio_tests[i]; + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, ptr->block_alignment); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, ptr->bytes_per_second); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = pMFCreateMediaBufferFromMediaType(media_type, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) + break; + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(ptr->buffer_length == length, "%d: unexpected buffer length %u, expected %u.\n", i, length, ptr->buffer_length); + + IMFMediaBuffer_Release(buffer); + } + + IMFMediaType_Release(media_type); +} + START_TEST(mfplat) { char **argv; @@ -4640,6 +4709,7 @@ START_TEST(mfplat) test_queue_com(); test_MFGetStrideForBitmapInfoHeader(); test_MFCreate2DMediaBuffer(); + test_MFCreateMediaBufferFromMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 9f4db44d1e..9c22b6bfd8 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -411,6 +411,8 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); +HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD min_alignment, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); -- 2.25.1

1 4

[PATCH] gameux/tests: Avoid an ever changing value in a gamestatistics failure message.
by Francois Gouget 16 Mar '20

16 Mar '20

The whole point of printing the IGameStatisticsMgr::GetGameStatistics() return value was to check whether the pointer had been modified. So provide this information without including an ever changing value in the failure message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gameux/tests/gamestatistics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index d823af1aab2..8d4da4a0f4c 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -181,7 +181,8 @@ static void test_gamestatisticsmgr( void ) gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); - ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); + ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", + (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); /* now, allow them to be created */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); -- 2.20.1

2 1

Re: [PATCH 2/3] shell32/tests: Remove now useless forced 0x0501 API versions.
by Francois Gouget 15 Mar '20

15 Mar '20

On Sat, 14 Mar 2020, Serge Gautherie wrote: > > I did test on WTB: > these failures happen even when removing the comment only, so not my patch! The problem is that these failures contain a temporary path which is unique to each run, as it's meant to. Just for your run we have five different values: w1064v1809 wtEFCE.tmp w1064v1809_2scr wtFA3E.tmp w1064v1809_ja wt1690.tmp w1064v1809_zh_CN wt1A78.tmp w1064v1809 wtEDBB.tmp This makes it impossible for the TestBot to know whether the latest failure matches one from a previous WineTest run so they are all reported as new. To avoid that I sent a patch to omit te temporary directory from the failure messages. > Shouldn't they be flagged as permanent failures? Ideally the test author or anyone working on it would fix the failures. Just saying... -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH v2] shell32/tests: Avoid random values in the shlexec failure messages.
by Francois Gouget 15 Mar '20

15 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: This should catch all troublesome failure messages. dlls/shell32/tests/shlexec.c | 55 ++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525a..1e7fd2140b1 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -350,6 +350,43 @@ static void dump_child_(const char* file, int line) * ***/ +static const char* substTmpPath(const char* str, const char *path, char rep) +{ + static char buffer[1024]; + char *p; + + if (!str || strlen(str) >= sizeof(buffer)) + return str; + + /* Only modify the last component of the path */ + p = strrchr(path, '\\'); + if (p) path = p + 1; + p = strrchr(path, '/'); + if (p) path = p + 1; + + p = strstr(str, path); + if (!p) + return str; + + strcpy(buffer, str); + p = buffer + (p - str); + while (p) + { + p += 2; /* skip the 'wt' prefix */ + /* and only replace the random part of the path */ + while (*p && *p != '.') + *p++ = rep; + p = strstr(p, path); + } + return buffer; +} + +static const char* derandomizeString(const char* str) +{ + str = substTmpPath(str, child_file, 'C'); + return substTmpPath(str, tmpdir, 'D'); +} + static char shell_call[2048]; static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { @@ -507,9 +544,9 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); if (winetest_debug > 1) @@ -591,9 +628,9 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); - strcat_param(shell_call, "params", parameters); - strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "file", derandomizeString(filename)); + strcat_param(shell_call, "params", derandomizeString(parameters)); + strcat_param(shell_call, "dir", derandomizeString(directory)); strcat_param(shell_call, "class", class); strcat(shell_call, ")"); strcat(shell_call, assoc_desc); @@ -832,7 +869,7 @@ static void create_test_verb_dde(const char* classname, const char* verb, sprintf(shell, "%d", rawcmd); strcat_param(assoc_desc, "rawcmd", shell); strcat_param(assoc_desc, "cmdtail", cmdtail); - strcat_param(assoc_desc, "ddeexec", ddeexec); + strcat_param(assoc_desc, "ddeexec", derandomizeString(ddeexec)); strcat_param(assoc_desc, "app", application); strcat_param(assoc_desc, "topic", topic); strcat_param(assoc_desc, "ifexec", ifexec); @@ -1737,7 +1774,7 @@ static void test_filename(void) okChildInt("argcA", 5); todo_wine okChildString("argvA3", "averb"); sprintf(filename, "%s\\test file.sha", tmpdir); - todo_wine okChildPath("argvA4", filename); + todo_wine okChildPath("argvA4", derandomizeString(filename)); } typedef struct @@ -2080,7 +2117,7 @@ static void test_find_executable(void) if (rc > 32) rc=33; todo_wine_if(test->todo & 0x10) - ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", filename, rc); + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%ld\n", derandomizeString(filename), rc); if (rc > 32) { BOOL equal; -- 2.20.1

2 2

[PATCH v2 1/6] kernel32/tests: Add some tests for mounted folders.
by Zebediah Figura 15 Mar '20

15 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix test failures on w2008 and w8adm The goal of these tests is not immediately to guide an implementation of mounted folders (though they could certainly help), but rather to show how other volume-related functions behave around mounted folders. The end goal is to sanely treat Unix mount points other than / as mounted folders on the Z: drive. This allows us to do away with Unix file I/O in GetVolumePathName(), while still returning the correct mount point for any given file. In particular, [1] documents the original purpose of the implementation—that the path returned by GetVolumePathName() be the on the same host partition that the input file is on. Mounted folders respect this invariant, including where symlinks are concerned. To that end, I've also added some documentation regarding symlinks across volumes, which cannot be systematically tested. [1] <https://www.winehq.org/pipermail/wine-patches/2011-October/107470.html> dlls/kernel32/tests/volume.c | 231 +++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b9121a4af4c..25495c9ce1c 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "winioctl.h" #include "ntddstor.h" +#include "winternl.h" #include <stdio.h> #include "ddk/ntddcdvd.h" #include "ddk/mountmgr.h" @@ -59,6 +60,7 @@ static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNameW)(LPWSTR, LPWSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); +static BOOL (WINAPI *pCreateSymbolicLinkA)(const char *, const char *, DWORD); /* ############################### */ @@ -1302,6 +1304,233 @@ static void test_cdrom_ioctl(void) } +static void test_mounted_folder(void) +{ + char name_buffer[200], path[MAX_PATH], volume_name[100], *p; + FILE_NAME_INFORMATION *name = (FILE_NAME_INFORMATION *)name_buffer; + FILE_ATTRIBUTE_TAG_INFO info; + IO_STATUS_BLOCK io; + BOOL ret, got_path; + NTSTATUS status; + HANDLE file; + DWORD size; + + ret = CreateDirectoryA("C:\\winetest_mnt", NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough permissions to create a folder in the C: drive.\n"); + return; + } + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\", volume_name, sizeof(volume_name) ); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetVolumeMountPointA( "C:\\winetest_mnt\\", volume_name ); + if (!ret) + { + skip("Not enough permissions to create a mounted folder.\n"); + RemoveDirectoryA( "C:\\winetest_mnt" ); + return; + } + todo_wine ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok((info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(info.ReparseTag == IO_REPARSE_TAG_MOUNT_POINT, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\winetest_mnt") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\winetest_mnt", wcslen(L"\\winetest_mnt")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok(!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(!info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\", wcslen(L"\\")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt\\windows", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = GetVolumePathNameA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + SetLastError(0xdeadbeef); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetVolumeInformationA( "C:\\winetest_mnt", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\windows", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + SetLastError(0xdeadbeef); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + SetLastError(0xdeadbeef); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\nonexistent\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:/winetest_mnt/../winetest_mnt/.", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:/winetest_mnt/../winetest_mnt/.\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:/winetest_mnt/../winetest_mnt/.\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNamesForVolumeNameA( volume_name, path, sizeof(path), &size ); + ok(ret, "got error %u\n", GetLastError()); + got_path = FALSE; + for (p = path; *p; p += strlen(p) + 1) + { + if (!strcmp( p, "C:\\winetest_mnt\\" )) + got_path = TRUE; + ok(strcmp( p, "C:\\winetest_mnt\\winetest_mnt\\" ), "GetVolumePathNamesForVolumeName() should not recurse\n"); + } + ok(got_path, "mount point was not enumerated\n"); + + /* test interaction with symbolic links */ + + if (pCreateSymbolicLinkA) + { + ret = pCreateSymbolicLinkA( "C:\\winetest_link", "C:\\winetest_mnt\\", SYMBOLIC_LINK_FLAG_DIRECTORY ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + SetLastError(0xdeadbeef); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER + || broken(GetLastError() == ERROR_SUCCESS) /* 2008 */, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_link\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + SetLastError(0xdeadbeef); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetVolumeInformationA( "C:\\winetest_link\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_link\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_link\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following test makes it clear that when we encounter a symlink + * while resolving, we resolve *every* junction in the path, i.e. both + * mount points and symlinks. */ + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\") || !strcmp(path, "C:\\winetest_link\\winetest_mnt\\" /* 2008 */, + "got %s\n", debugstr_a(path)); + + file = CreateFileA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = RemoveDirectoryA( "C:\\winetest_link\\" ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following cannot be automatically tested: + * + * Suppose C: and D: are mount points of different volumes. If C:/a is + * symlinked to D:/b, GetVolumePathName("C:\\a") will return "D:\\" if + * "a" is a directory, but "C:\\" if "a" is a file. + * Moreover, if D: is mounted at C:/mnt, and C:/a is symlinked to + * C:/mnt, GetVolumePathName("C:\\mnt\\b") will still return "D:\\". */ + } + + ret = DeleteVolumeMountPointA( "C:\\winetest_mnt\\" ); + ok(ret, "got error %u\n", GetLastError()); + ret = RemoveDirectoryA( "C:\\winetest_mnt" ); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1317,6 +1546,7 @@ START_TEST(volume) pGetVolumePathNameW = (void *) GetProcAddress(hdll, "GetVolumePathNameW"); pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); + pCreateSymbolicLinkA = (void *) GetProcAddress(hdll, "CreateSymbolicLinkA"); test_query_dos_deviceA(); test_dos_devices(); @@ -1334,4 +1564,5 @@ START_TEST(volume) test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); test_cdrom_ioctl(); + test_mounted_folder(); } -- 2.25.1

2 9

[tools] testbot: Trace the git HEAD after a repository update.
by Francois Gouget 15 Mar '20

15 Mar '20

'git pull' already shows the old and new HEAD (if the repository is not already up-to-date), but this provides the commit id in the same format as ApplyPatch() which makes it available to the TestBot server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8ab24633ae..8a6982c5de 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,8 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && set -x && git pull"); + system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0) { -- 2.20.1

1 0

[tools] testbot/WineTest: Rename DailyWineTest() to WineTestSuite().
by Francois Gouget 15 Mar '20

15 Mar '20

What matters is that it runs the full WineTest suite, not whether it is run daily. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 88f5e3659c..1afe9b8bd7 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,7 @@ sub SetupTest($$) return $BaseName; } -sub DailyWineTest($$$$) +sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; @@ -461,7 +461,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif ($Action eq "winetest") { - exit(1) if (!DailyWineTest($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); + exit(1) if (!WineTestSuite($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); } elsif (@ARGV) { -- 2.20.1

1 0

[PATCH] kernel32/tests: Clean up the argv[0] tests and improve coverage.
by Francois Gouget 15 Mar '20

15 Mar '20

The argv[0] tests mostly care about the value of argvA0 in the child process. So remove most of the extra arguments and use the remaining ones to check other aspects. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c5ff473d307..264f737178f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -910,9 +910,9 @@ static void test_CommandLine(void) ok(!info.dwProcessId, "unexpected dwProcessId %04x\n", info.dwProcessId); ok(!info.dwThreadId, "unexpected dwThreadId %04x\n", info.dwThreadId); - /* the basics */ + /* the basics; not getting confused by the leading and trailing " */ get_file_name(resfile); - sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); + sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* Check that the effective STARTUPINFOA parameters are not modified */ ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); @@ -927,10 +927,9 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); - okChildInt("Arguments", "argcA", 6); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); - okChildString("Arguments", "argvA5", "\""); - okChildString("Arguments", "argvA6", NULL); + okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); DeleteFileA(resfile); @@ -955,10 +954,12 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); - /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ + /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0] + * and " escaping. + */ get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, "./%s process dump \"%s\" \"\"\"\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -969,13 +970,16 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); + okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA0", buffer); + okChildString("Arguments", "argvA4", "\""); + okChildString("Arguments", "argvA5", NULL); release_memory(); DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, ".\\%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + sprintf(buffer, ".\\%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -996,8 +1000,8 @@ static void test_CommandLine(void) *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); /* Use exename to avoid buffer containing things like 'C:' */ - if (p) sprintf(buffer, "..%s/%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); - else sprintf(buffer, "./%s process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", exename, resfile); + if (p) sprintf(buffer, "..%s/%s process dump \"%s\"", p, exename, resfile); + else sprintf(buffer, "./%s process dump \"%s\"", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -1022,7 +1026,7 @@ static void test_CommandLine(void) /* Use exename to avoid buffer containing things like 'C:' */ if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); - sprintf(buffer2, "dummy process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", resfile); + sprintf(buffer2, "dummy process dump \"%s\"", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); -- 2.20.1

1 0

[PATCH] configure: Add an option to enable -Werror.
by Francois Gouget 15 Mar '20

15 Mar '20

--maintainer-mode already enables -Werror but it it incompatible with out-of-tree builds. Calling configure with CFLAGS=-Werror causes it to misdetect some functions like llrint() due to redefinition warnings. And setting CFLAGS when invoking make risks losing compiler options like -g -O2. So add a --enable-werror configure option to allow cleanly using -Werror. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7c3c6d2b670..f722ac5d049 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) +AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnings as errors])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) @@ -373,6 +374,9 @@ else dnl Maintainer mode requires gettext with_gettext=yes with_gettextpo=yes + + dnl Maintainer mode wants -Werror + enable_werror=yes fi test "x$with_gettext" != xno || MSGFMT=false @@ -1092,7 +1096,7 @@ then WINE_TRY_CROSSCFLAGS([-Wl,-delayload,autoconftest.dll], [AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) - if test "x$enable_maintainer_mode" = xyes + if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) fi @@ -2080,8 +2084,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_CFLAGS - dnl Enable -Werror for maintainer mode - if test "x$enable_maintainer_mode" = "xyes" + dnl Enable -Werror + if test "x$enable_werror" = "xyes" then WINE_TRY_CFLAGS([-Werror]) fi -- 2.20.1

1 0

[PATCH] include: Add missing DPACCOUNTDESC to dplay.h
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 2/2] include: Add missing GUIDs in dsound.h
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48750 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] include: Add missing effect related defines and enums in dsound.h
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] shell32/tests: Avoid random values in the shlexec failure messages.
by Francois Gouget 15 Mar '20

15 Mar '20

Trace the temporary directory value on startup since it's no longer visible in the failure messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shlexec.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525a..e884b409493 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -507,7 +507,14 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); + if (strncmp(filename, tmpdir, strlen(tmpdir)) != 0) + strcat_param(shell_call, "file", filename); + else + { + char buffer[MAX_PATH]; + sprintf(buffer, "tmpdir%s", filename + strlen(tmpdir)); + strcat_param(shell_call, "file", buffer); + } strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); @@ -591,7 +598,14 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); + if (strncmp(filename, tmpdir, strlen(tmpdir)) != 0) + strcat_param(shell_call, "file", filename); + else + { + char buffer[MAX_PATH]; + sprintf(buffer, "<tmpdir>%s", filename + strlen(tmpdir)); + strcat_param(shell_call, "file", buffer); + } strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat_param(shell_call, "class", class); @@ -2705,6 +2719,7 @@ static void init_test(void) ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir); + trace("tmpdir=\"%s\"\n", tmpdir); rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); ok(rc != 0, "got %d\n", rc); -- 2.20.1

2 2

[PATCH v2] ntoskrnl.exe: Implement IoOpenDeviceRegistryKey().
by Zebediah Figura 15 Mar '20

15 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix a leak, thanks Zhiyi dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 29 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6b5b127a62..40341d8f0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -423,7 +423,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d53..75310f7b35 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -844,6 +844,35 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla return status; } +/*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCESS_MASK access, HANDLE *key ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + + if ((status = get_device_instance_id( device, device_instance_id ))) + { + ERR("Failed to get device instance ID, error %#x.\n", status); + return status; + } + + set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL ); + + SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ); + + *key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, type, access ); + SetupDiDestroyDeviceInfoList( set ); + if (*key == INVALID_HANDLE_VALUE) + return GetLastError(); + return STATUS_SUCCESS; +} + /*********************************************************************** * PoSetPowerState (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53ea9e17cf..b4325cec6c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1607,6 +1607,7 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); -- 2.25.1

1 0

[PATCH] shell32/tests: Fix some wording issues in shlexec comments.
by Francois Gouget 15 Mar '20

15 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3d1af739f71..132fe49429e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1119,12 +1119,12 @@ static void test_lpFile_parsed(void) return; } - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* if quoted, existing "drawback_file.noassoc" does not prevent finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, @@ -1141,7 +1141,7 @@ static void test_lpFile_parsed(void) todo_wine okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, "failed: rc=%lu\n", rc); - /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + /* nonexistent "drawback_nonexist.noassoc" does not prevent finding "drawback_nonexist.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); -- 2.20.1

2 1

[PATCH 1/3] crypt32/tests: Add tests for CryptStringToBinaryW()
by Aaro Altonen 15 Mar '20

15 Mar '20

Add tests for CRYPT_STRING_HEX format Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/crypt32/tests/base64.c | 175 ++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 7b9f4c1077..8af0c5bae0 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -783,8 +783,183 @@ static void testStringToBinaryA(void) } } +static void testStringToBinaryW(void) +{ + DWORD skip_ = 0; + DWORD flags = 0; + DWORD data_len = 0; + WCHAR *input; + BYTE out[256]; + BYTE expected[256]; + BOOL ret; + + /* invalid parameteres -> 87 */ + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(NULL, 0, 0, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %u, expected 87\n", GetLastError()); + + /* otherwise valid parameters but invalid data_len -> 87 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("213c73796d6c696e6b3efffe"); + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %d, expected 87\n", GetLastError()); + heap_free(input); + + /* uneven amount of data -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* length is uneven -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("1111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid 0x prefix -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("0x213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid characters -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abchhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* insufficient buffer -> 234 */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + expected[0] = 0x21; + expected[1] = 0x3c; + expected[2] = 0x73; + expected[3] = 0x79; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + heap_free(input); + + /* valid data with white spaces */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3c\t\t \r\n 73 796d6c \t69\t"); + data_len = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + heap_free(input); + + /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3 c"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes + * until an invalid sequence is reached */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + input = strdupAtoW("21 3 c ff"); + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + expected[6] = 0x69; expected[7] = 0x6e; expected[8] = 0x6b; + expected[9] = 0x3e; expected[10] = 0xff; expected[11] = 0xfe; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* invalid data but length small enough that it's never detected */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abcdefhhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + heap_free(input); + + /* invalid data but length small enough that it's never detected, with whitespaces */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + input = strdupAtoW("\t\t21 fe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + heap_free(input); + + /* valid data but parse only the first 6 bytes (12 chars) */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); + todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); +} + START_TEST(base64) { test_CryptBinaryToString(); testStringToBinaryA(); + testStringToBinaryW(); } -- 2.25.1

2 1

[PATCH 3/3] crypt32: Add implementation for CRYPT_STRING_HEX format
by Aaro Altonen 15 Mar '20

15 Mar '20

Add CRYPT_STRING_HEX format implementation for CryptStringToBinaryW() Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48487 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/crypt32/base64.c | 91 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/base64.c | 66 +++++++++++++-------------- 2 files changed, 124 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 73619421ab..9856dead03 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -1036,6 +1036,95 @@ static LONG DecodeAnyW(LPCWSTR pszString, DWORD cchString, return ret; } +static BYTE char_to_byte(BYTE byte) +{ + if (byte >= '0' && byte <= '9') + return byte - '0'; + if (byte >= 'a' && byte <='f') + return byte - 'a' + 10; + else if (byte >= 'A' && byte <='F') + return byte - 'A' + 10; + + return 0xff; +} + +static DWORD hex_to_binary(WCHAR *str, BYTE *out, DWORD *outlen, DWORD *processed) +{ + DWORD ret = ERROR_SUCCESS; + + while (*str && *(str + 1)) + { + BYTE un = char_to_byte(*str); + BYTE ln = char_to_byte(*(str + 1)); + + if (un == 0xff || ln == 0xff) + return ERROR_INVALID_DATA; + + if (*processed >= *outlen) + { + if (out) + return ERROR_MORE_DATA; + ret = ERROR_MORE_DATA; + } + else if (out) + out[*processed] = (un << 4) | ln; + + (*processed)++; + str += 2; + } + + return ret; +} + +static LONG DecodeBinaryToHexW(const WCHAR *instr, DWORD slen, + BYTE *out, DWORD *outlen, DWORD *skip, DWORD *flags) +{ + const WCHAR delim[] = { ' ', '\n', '\r', '\t', '\0' }; + WCHAR *duped, *ptr, *tok, *saveptr; + LONG ret = ERROR_SUCCESS; + DWORD processed = 0; + + if (!outlen) + return ERROR_INVALID_PARAMETER; + + duped = ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instr) + 1) * sizeof(WCHAR)); + if (duped) + lstrcpyW(duped, instr); + else + return ERROR_NOT_ENOUGH_MEMORY; + + /* force strtok_sW() to parse at most slen - 1 bytes (including white spaces) */ + duped[slen] = '\0'; + + while ((tok = strtok_sW(ptr, delim, &saveptr))) + { + if (strlenW(tok) % 2) + { + ret = ERROR_INVALID_DATA; + break; + } + + if ((ret = hex_to_binary(tok, out, outlen, &processed))) + { + if (ret == ERROR_INVALID_DATA) + break; + } + + ptr = NULL; + } + + if (ret == ERROR_INVALID_DATA) + { + if (!out) + *outlen = 0; + } + else + *outlen = processed; + + HeapFree(GetProcessHeap(), 0, duped); + return ret; +} + BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) @@ -1081,6 +1170,8 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, decoder = DecodeAnyW; break; case CRYPT_STRING_HEX: + decoder = DecodeBinaryToHexW; + break; case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 8af0c5bae0..b789a0a010 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -813,8 +813,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* length is uneven -> 13 */ @@ -823,8 +823,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid 0x prefix -> 13 */ @@ -833,8 +833,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid characters -> 13 */ @@ -843,8 +843,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* insufficient buffer -> 234 */ @@ -858,9 +858,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); - todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* valid data */ @@ -868,9 +868,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); heap_free(input); /* valid data with white spaces */ @@ -879,9 +879,9 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 7, "Got %u, expected 7\n", data_len); heap_free(input); /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ @@ -890,8 +890,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes @@ -902,7 +902,7 @@ static void testStringToBinaryW(void) input = strdupAtoW("21 3 c ff"); ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); heap_free(input); @@ -915,10 +915,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); - todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* invalid data but length small enough that it's never detected */ @@ -926,9 +926,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("abcdefhhh"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 2, "Got %u, expected 2\n", data_len); heap_free(input); /* invalid data but length small enough that it's never detected, with whitespaces */ @@ -937,9 +937,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("\t\t21 fe"); data_len = 256; ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 1, "Got %u, expected 1\n", data_len); heap_free(input); /* valid data but parse only the first 6 bytes (12 chars) */ @@ -950,10 +950,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); - todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 6, "Got %u, expected 6\n", data_len); + ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); } -- 2.25.1

2 1

[PATCH 2/3] libwine: Create strtok_sW()
by Aaro Altonen 15 Mar '20

15 Mar '20

Implement strtok() utility function for wide char strings that is globally available like strlenW() and lstrcpyW() Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msvcrt/wcs.c | 16 +--------------- include/wine/unicode.h | 1 + libs/port/string.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 17d06eed3c..2ad6ed92bf 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1616,21 +1616,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wc MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **next_token ) { - MSVCRT_wchar_t *ret; - - if (!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; - if (!MSVCRT_CHECK_PMT(next_token != NULL)) return NULL; - if (!MSVCRT_CHECK_PMT(str != NULL || *next_token != NULL)) return NULL; - - if (!str) str = *next_token; - - while (*str && strchrW( delim, *str )) str++; - if (!*str) return NULL; - ret = str++; - while (*str && !strchrW( delim, *str )) str++; - if (*str) *str++ = 0; - *next_token = str; - return ret; + return strtok_sW(str, delim, next_token); } /********************************************************************* diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 8d30e9f447..3ee98c611d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -89,6 +89,7 @@ extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); +extern WCHAR *strtok_sW( WCHAR *str, const WCHAR *delim, WCHAR **saveptr ); WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { diff --git a/libs/port/string.c b/libs/port/string.c index c3388bcc7d..ceb5ab67cf 100644 --- a/libs/port/string.c +++ b/libs/port/string.c @@ -528,3 +528,22 @@ int sprintfW( WCHAR *str, const WCHAR *format, ...) va_end(valist); return retval; } + +WCHAR *strtok_sW(WCHAR *str, const WCHAR *delim, WCHAR **saveptr) +{ + WCHAR *ret; + + if (delim == NULL) return NULL; + if (saveptr == NULL) return NULL; + if (str == NULL && *saveptr == NULL) return NULL; + + if (!str) str = *saveptr; + + while (*str && strchrW( delim, *str )) str++; + if (!*str) return NULL; + ret = str++; + while (*str && !strchrW( delim, *str )) str++; + if (*str) *str++ = 0; + *saveptr = str; + return ret; +} -- 2.25.1

1 0

[PATCH v2 2/3] kernel32: Add stub for GetFirmwareType
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/environ.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 1 + include/winnt.h | 13 ++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 4998af04d9..cba1133f14 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -25,7 +25,7 @@ @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW -@ stub GetFirmwareType +@ stdcall GetFirmwareType(ptr) kernel32.GetFirmwareType @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 93ca37fccf..75da15634c 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -134,3 +134,12 @@ DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareType (KERNEL32.@) + */ +BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE firmware_type) { + FIXME("stub: %p\n", firmware_type); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e285207a7..88fb9616b6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -690,6 +690,7 @@ @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr) @ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) +@ stdcall GetFirmwareType(ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW diff --git a/include/winnt.h b/include/winnt.h index 50a6213ef0..0df06f0f33 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2227,9 +2227,9 @@ typedef struct DWORD Ctr; DWORD ContextFlags; - + DWORD Dar; /* Fault registers for coredump */ - DWORD Dsisr; + DWORD Dsisr; DWORD Trap; /* number of powerpc exception taken */ /* These are selected by CONTEXT_DEBUG_REGISTERS */ @@ -4285,7 +4285,7 @@ typedef struct _ACL { typedef enum _ACL_INFORMATION_CLASS { - AclRevisionInformation = 1, + AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS; @@ -6713,6 +6713,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +typedef enum _FIRMWARE_TYPE { + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; + #ifdef __cplusplus } #endif -- 2.25.1

2 1

[PATCH v2 1/3] kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- v2: Fix offsets (the old patch was built against staging - my bad!) Also includes two other stubs (in patches 2 and 3) that are closely related, needed for a hardware information gathering program dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b8eaa6cdde..8e285207a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

2 1

[PATCH 3/3] kernel32: Add stub for IsNativeVhdBoot
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- dlls/kernel32/environ.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 75da15634c..53d338a75a 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -143,3 +143,13 @@ BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE firmware_type) { SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * IsNativeVhdBoot (KERNEL32.@) + */ +BOOL WINAPI IsNativeVhdBoot(PBOOL native_vhd_boot) { + FIXME("(%p) returning false\n", native_vhd_boot); + + *native_vhd_boot = FALSE; + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 88fb9616b6..3006a924e0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -985,6 +985,7 @@ @ stdcall -import IsDebuggerPresent() @ stub -i386 IsLSCallback # @ stub IsNLSDefinedString +@ stdcall IsNativeVhdBoot(ptr) @ stdcall -import IsNormalizedString(long wstr long) @ stdcall -import IsProcessInJob(long long ptr) @ stdcall -import IsProcessorFeaturePresent(long) -- 2.25.1

1 0

(resend) [PATCH] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=4868 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- Sorry for the resend, I forgot the [PATCH] prefix in the first email --- dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9b0c21085..b93d7a7697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

3 2

kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9b0c21085..b93d7a7697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

2 1

[PATCH 2/2] oledb32/tests: Add ODBC provider tests
by Alistair Leslie-Hughes 15 Mar '20

15 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/database.c | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 83a4767b90..5d67bf9c41 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "oledb.h" #include "oledberr.h" +#include "msdasql.h" #include "wine/test.h" @@ -967,6 +968,87 @@ static void test_dslocator(void) } } +static void test_odbc_provider(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; + + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", + debugstr_guid(&propinfoset->guidPropertySet)); + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "$d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, + propidlist.rgPropertyIDs[i]); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); + } + + IDBProperties_Release(props); +} + START_TEST(database) { OleInitialize(NULL); @@ -975,6 +1057,7 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); test_dslocator(); + test_odbc_provider(); /* row position */ test_rowposition(); -- 2.25.1

1 0

[PATCH 1/2] include: Add msdasql.h
by Alistair Leslie-Hughes 15 Mar '20

15 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msdasql.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 include/msdasql.h diff --git a/include/msdasql.h b/include/msdasql.h new file mode 100644 index 0000000000..a7a5b9e841 --- /dev/null +++ b/include/msdasql.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 _MSDASQL_H_ +#define _MSDASQL_H_ + +DEFINE_GUID(IID_SQLRequestDiagFields, 0x228972f0, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); +DEFINE_GUID(IID_ISQLGetDiagField, 0x228972f1, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); + +DEFINE_GUID(IID_IRowsetChangeExtInfo, 0x0c733a8f, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(CLSID_MSDASQL, 0xc8b522cb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_MSDASQL_ENUMERATOR, 0xc8b522cd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_PROVIDERDATASOURCEINFO, 0x497c60e0, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERROWSET, 0x497c60e1, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERDBINIT, 0x497c60e2, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERSTMTATTR, 0x497c60e3, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERCONNATTR, 0x497c60e4, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); + +#define KAGPROP_QUERYBASEDUPDATES 2 +#define KAGPROP_MARSHALLABLE 3 +#define KAGPROP_POSITIONONNEWROW 4 +#define KAGPROP_IRowsetChangeExtInfo 5 +#define KAGPROP_CURSOR 6 +#define KAGPROP_CONCURRENCY 7 +#define KAGPROP_BLOBSONFOCURSOR 8 +#define KAGPROP_INCLUDENONEXACT 9 +#define KAGPROP_FORCESSFIREHOSEMODE 10 +#define KAGPROP_FORCENOPARAMETERREBIND 11 +#define KAGPROP_FORCENOPREPARE 12 +#define KAGPROP_FORCENOREEXECUTE 13 + +#define KAGPROP_ACCESSIBLEPROCEDURES 2 +#define KAGPROP_ACCESSIBLETABLES 3 +#define KAGPROP_ODBCSQLOPTIEF 4 +#define KAGPROP_OJCAPABILITY 5 +#define KAGPROP_PROCEDURES 6 +#define KAGPROP_DRIVERNAME 7 +#define KAGPROP_DRIVERVER 8 +#define KAGPROP_DRIVERODBCVER 9 +#define KAGPROP_LIKEESCAPECLAUSE 10 +#define KAGPROP_SPECIALCHARACTERS 11 +#define KAGPROP_MAXCOLUMNSINGROUPBY 12 +#define KAGPROP_MAXCOLUMNSININDEX 13 +#define KAGPROP_MAXCOLUMNSINORDERBY 14 +#define KAGPROP_MAXCOLUMNSINSELECT 15 +#define KAGPROP_MAXCOLUMNSINTABLE 16 +#define KAGPROP_NUMERICFUNCTIONS 17 +#define KAGPROP_ODBCSQLCONFORMANCE 18 +#define KAGPROP_OUTERJOINS 19 +#define KAGPROP_STRINGFUNCTIONS 20 +#define KAGPROP_SYSTEMFUNCTIONS 21 +#define KAGPROP_TIMEDATEFUNCTIONS 22 +#define KAGPROP_FILEUSAGE 23 +#define KAGPROP_ACTIVESTATEMENTS 24 + +#define KAGPROP_AUTH_TRUSTEDCONNECTION 2 +#define KAGPROP_AUTH_SERVERINTEGRATED 3 + +#define KAGPROPVAL_CONCUR_ROWVER 0x00000001 +#define KAGPROPVAL_CONCUR_VALUES 0x00000002 +#define KAGPROPVAL_CONCUR_LOCK 0x00000004 +#define KAGPROPVAL_CONCUR_READ_ONLY 0x00000008 + +#endif -- 2.25.1

1 0

[PATCH] ntoskrnl.exe: Implement IoOpenDeviceRegistryKey().
by Zebediah Figura 15 Mar '20

15 Mar '20

Needed by many native PnP drivers, including the FA-124 USB driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 29 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6b5b127a62..40341d8f0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -423,7 +423,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d53..2acc7ade47 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -844,6 +844,35 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla return status; } +/*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCESS_MASK access, HANDLE *key ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + + if ((status = get_device_instance_id( device, device_instance_id ))) + { + ERR("Failed to get device instance ID, error %#x.\n", status); + return status; + } + + set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL ); + + SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ); + + *key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, type, access ); + if (*key == INVALID_HANDLE_VALUE) + return GetLastError(); + SetupDiDestroyDeviceInfoList( set ); + return STATUS_SUCCESS; +} + /*********************************************************************** * PoSetPowerState (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53ea9e17cf..b4325cec6c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1607,6 +1607,7 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); -- 2.25.1

2 1

[PATCH 1/5] kernel32/tests: Add some tests for mounted folders.
by Zebediah Figura 15 Mar '20

15 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The goal of these tests is not immediately to guide an implementation of mounted folders (though they could certainly help), but rather to show how other volume-related functions behave around mounted folders. The end goal is to sanely treat Unix mount points other than / as mounted folders on the Z: drive. This allows us to do away with Unix file I/O in GetVolumePathName(), while still returning the correct mount point for any given file. In particular, [1] documents the original purpose of the implementation—that the path returned by GetVolumePathName() be the on the same host partition that the input file is on. Mounted folders respect this invariant, including where symlinks are concerned. To that end, I've also added some documentation regarding symlinks across volumes, which cannot be systematically tested. [1] <https://www.winehq.org/pipermail/wine-patches/2011-October/107470.html> dlls/kernel32/tests/volume.c | 219 +++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b9121a4af4c..f8fb09d74e4 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "winioctl.h" #include "ntddstor.h" +#include "winternl.h" #include <stdio.h> #include "ddk/ntddcdvd.h" #include "ddk/mountmgr.h" @@ -59,6 +60,7 @@ static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNameW)(LPWSTR, LPWSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); +static BOOL (WINAPI *pCreateSymbolicLinkA)(const char *, const char *, DWORD); /* ############################### */ @@ -1302,6 +1304,221 @@ static void test_cdrom_ioctl(void) } +static void test_mounted_folder(void) +{ + char name_buffer[200], path[MAX_PATH], volume_name[100], *p; + FILE_NAME_INFORMATION *name = (FILE_NAME_INFORMATION *)name_buffer; + FILE_ATTRIBUTE_TAG_INFO info; + IO_STATUS_BLOCK io; + BOOL ret, got_path; + NTSTATUS status; + HANDLE file; + DWORD size; + + ret = CreateDirectoryA("C:\\winetest_mnt", NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough permissions to create a mounted folder.\n"); + return; + } + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\", volume_name, sizeof(volume_name) ); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetVolumeMountPointA( "C:\\winetest_mnt\\", volume_name ); + todo_wine ok(ret, "got error %u\n", GetLastError()); + if (!ret) + { + RemoveDirectoryA( "C:\\winetest_mnt" ); + return; + } + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok((info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(info.ReparseTag == IO_REPARSE_TAG_MOUNT_POINT, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\winetest_mnt") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\winetest_mnt", wcslen(L"\\winetest_mnt")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok(!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(!info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\", wcslen(L"\\")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt\\windows", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = GetVolumePathNameA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\windows", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\nonexistent\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:/winetest_mnt/../winetest_mnt/.", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:/winetest_mnt/../winetest_mnt/.\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:/winetest_mnt/../winetest_mnt/.\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNamesForVolumeNameA( volume_name, path, sizeof(path), &size ); + ok(ret, "got error %u\n", GetLastError()); + got_path = FALSE; + for (p = path; *p; p += strlen(p) + 1) + { + if (!strcmp( p, "C:\\winetest_mnt\\" )) + got_path = TRUE; + ok(strcmp( p, "C:\\winetest_mnt\\winetest_mnt\\" ), "GetVolumePathNamesForVolumeName() should not recurse\n"); + } + ok(got_path, "mount point was not enumerated\n"); + + /* test interaction with symbolic links */ + + if (pCreateSymbolicLinkA) + { + ret = pCreateSymbolicLinkA( "C:\\winetest_link", "C:\\winetest_mnt\\", SYMBOLIC_LINK_FLAG_DIRECTORY ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_link\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_link\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_link\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_link\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following test makes it clear that when we encounter a symlink + * while resolving, we resolve *every* junction in the path, i.e. both + * mount points and symlinks. */ + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", debugstr_a(path)); + + file = CreateFileA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = RemoveDirectoryA( "C:\\winetest_link\\" ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following cannot be automatically tested: + * + * Suppose C: and D: are mount points of different volumes. If C:/a is + * symlinked to D:/b, GetVolumePathName("C:\\a") will return "D:\\" if + * "a" is a directory, but "C:\\" if "a" is a file. + * Moreover, if D: is mounted at C:/mnt, and C:/a is symlinked to + * C:/mnt, GetVolumePathName("C:\\mnt\\b") will still return "D:\\". */ + } + + ret = DeleteVolumeMountPointA( "C:\\winetest_mnt\\" ); + ok(ret, "got error %u\n", GetLastError()); + ret = RemoveDirectoryA( "C:\\winetest_mnt" ); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1317,6 +1534,7 @@ START_TEST(volume) pGetVolumePathNameW = (void *) GetProcAddress(hdll, "GetVolumePathNameW"); pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); + pCreateSymbolicLinkA = (void *) GetProcAddress(hdll, "CreateSymbolicLinkA"); test_query_dos_deviceA(); test_dos_devices(); @@ -1334,4 +1552,5 @@ START_TEST(volume) test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); test_cdrom_ioctl(); + test_mounted_folder(); } -- 2.25.1

3 7

[PATCH] psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG.
by Serge Gautherie 15 Mar '20

15 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0df247e..0ea1b1f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -39,7 +39,7 @@ #include "wine/test.h" static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); -- 2.10.0.windows.1

1 0

[PATCH v2] wineconsole: Don't allow resizing while computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 5 +++++ programs/wineconsole/winecon_user.h | 1 + 2 files changed, 6 insertions(+) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..05bb924518 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -216,6 +216,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) RECT r; int dx, dy; + PRIVATE(data)->computing_pos = TRUE; + /* compute window size from desired client size */ r.left = r.top = 0; r.right = data->curcfg.win_width * data->curcfg.cell_width; @@ -256,6 +258,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); + + PRIVATE(data)->computing_pos = FALSE; } /****************************************************************** @@ -1328,6 +1332,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM WCUSER_SetMenuDetails(data, GetSystemMenu(data->hWnd, FALSE)); break; case WM_SIZE: + if (PRIVATE(data)->computing_pos) break; WINECON_ResizeWithContainer(data, LOWORD(lParam) / data->curcfg.cell_width, HIWORD(lParam) / data->curcfg.cell_height); break; diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index bd026ef771..cc63a4fd96 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -38,6 +38,7 @@ struct inner_data_user { BOOL has_selection; /* an area is being selected (selectPt[12] are edges of the rect) */ COORD selectPt1; /* start (and end) point of a mouse selection */ COORD selectPt2; + BOOL computing_pos; /* barrier to avoid resizing while computing positions */ }; #define PRIVATE(data) ((struct inner_data_user*)((data)->private)) -- 2.20.1

2 1

[PATCH] wineconsole: Don't allow resizing while computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 5 +++++ programs/wineconsole/winecon_user.h | 1 + 2 files changed, 6 insertions(+) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..05bb924518 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -216,6 +216,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) RECT r; int dx, dy; + PRIVATE(data)->computing_pos = TRUE; + /* compute window size from desired client size */ r.left = r.top = 0; r.right = data->curcfg.win_width * data->curcfg.cell_width; @@ -256,6 +258,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); + + PRIVATE(data)->computing_pos = FALSE; } /****************************************************************** @@ -1328,6 +1332,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM WCUSER_SetMenuDetails(data, GetSystemMenu(data->hWnd, FALSE)); break; case WM_SIZE: + if (PRIVATE(data)->computing_pos) break; WINECON_ResizeWithContainer(data, LOWORD(lParam) / data->curcfg.cell_width, HIWORD(lParam) / data->curcfg.cell_height); break; diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index bd026ef771..fbc7d144c2 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -38,6 +38,7 @@ struct inner_data_user { BOOL has_selection; /* an area is being selected (selectPt[12] are edges of the rect) */ COORD selectPt1; /* start (and end) point of a mouse selection */ COORD selectPt2; + BOOL computing_pos; /* barrier to avoid resizing while computing positions */ }; #define PRIVATE(data) ((struct inner_data_user*)((data)->private)) -- 2.20.1

2 1

[RFC PATCH 1/2] winevulkan: Generate and install JSON manifest and registry entry used by official Vulkan loader.
by Brendan Shanks 14 Mar '20

14 Mar '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This patch has make_vulkan generate a 'loader/winevulkan.json.in' manifest file, it gets processed to 'loader/winevulkan.json', then installed by wine.inf to c:\windows\system32. - winevulkan.json doesn't need any pre-processing, but '.in' was the only way I found to have it built/installed. Is there a better way? - Is 'loader' the best place to generate the file? I feel like 'dlls/winevulkan' would be preferable, but that puts the file in a different place relative to wine.inf when running from the build tree or installed. configure.ac | 1 + dlls/winevulkan/make_vulkan | 13 +++++++++++++ loader/Makefile.in | 3 ++- loader/wine.inf.in | 32 ++++++++++++++++++++++---------- loader/winevulkan.json.in | 7 +++++++ 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 loader/winevulkan.json.in diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..5135a60a62 100644 --- a/configure.ac +++ b/configure.ac @@ -4099,6 +4099,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/winevulkan.json \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..66543dceaf 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -71,6 +71,7 @@ WINE_VK_VERSION = (1, 1) WINE_VULKAN_H = "../../include/wine/vulkan.h" WINE_VULKAN_DRIVER_H = "../../include/wine/vulkan_driver.h" WINE_VULKAN_LOADER_SPEC = "../vulkan-1/vulkan-1.spec" +WINE_VULKAN_JSON = "../../loader/winevulkan.json.in" WINE_VULKAN_SPEC = "winevulkan.spec" WINE_VULKAN_THUNKS_C = "vulkan_thunks.c" WINE_VULKAN_THUNKS_H = "vulkan_thunks.h" @@ -3000,6 +3001,15 @@ def download_vk_xml(filename): if not os.path.isfile(filename): urllib.request.urlretrieve(url, filename) +def generate_vulkan_json(f): + f.write("{\n") + f.write(" \"file_format_version\": \"1.0.0\",\n") + f.write(" \"ICD\": {\n") + f.write(" \"library_path\": \"winevulkan.dll\",\n") + f.write(" \"api_version\": \"{0}\"\n".format(VK_XML_VERSION)) + f.write(" }\n") + f.write("}\n") + def main(): parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity") @@ -3031,6 +3041,9 @@ def main(): with open(WINE_VULKAN_THUNKS_C, "w") as f: generator.generate_thunks_c(f, "wine_") + with open(WINE_VULKAN_JSON, "w") as f: + generate_vulkan_json(f) + with open(WINE_VULKAN_SPEC, "w") as f: generator.generate_vulkan_spec(f) diff --git a/loader/Makefile.in b/loader/Makefile.in index f9b2fa9293..f3638fa4e0 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,7 +10,8 @@ SOURCES = \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ winebus.inf.in \ - winehid.inf.in + winehid.inf.in \ + winevulkan.json.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 8267ef34dc..3ae4273671 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -48,13 +48,14 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.NT] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -73,14 +74,15 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -100,14 +102,15 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [DefaultInstall.ntarm64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles +CopyFiles=InfFiles,NlsFiles,VulkanFiles AddReg=\ Classes,\ ContentIndex,\ @@ -127,12 +130,13 @@ AddReg=\ Tapi,\ Timezones,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 -CopyFiles=NlsFiles +CopyFiles=NlsFiles,VulkanFiles AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ @@ -142,7 +146,8 @@ AddReg=\ Misc,\ Tapi,\ VersionInfo.ntamd64,\ - LicenseInformation + LicenseInformation,\ + Vulkan [Wow64Install.ntarm64] WineFakeDlls=FakeDllsWin32 @@ -3888,6 +3893,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[Vulkan] +HKLM,Software\Khronos\Vulkan\Drivers,"%11%\winevulkan.json",0x10001,0 + [InfFiles] winebus.inf winehid.inf @@ -3965,9 +3973,13 @@ normnfd.nls normnfkc.nls normnfkd.nls +[VulkanFiles] +winevulkan.json + [WineSourceDirs] NlsFiles=nls [DestinationDirs] InfFiles = 17 NlsFiles = 11 +VulkanFiles = 11 diff --git a/loader/winevulkan.json.in b/loader/winevulkan.json.in new file mode 100644 index 0000000000..be1b278ddb --- /dev/null +++ b/loader/winevulkan.json.in @@ -0,0 +1,7 @@ +{ + "file_format_version": "1.0.0", + "ICD": { + "library_path": "winevulkan.dll", + "api_version": "1.1.130" + } +} -- 2.24.1

4 5

[PATCH 2/3] shell32/tests: Remove now useless forced 0x0501 API versions.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/tests/shlexec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54..1455b46 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -30,11 +30,6 @@ * we could check */ -/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ -#define NTDDI_WINXPSP1 0x05010100 -#define NTDDI_VERSION NTDDI_WINXPSP1 -#define _WIN32_WINNT 0x0501 - #include <stdio.h> #include <assert.h> -- 2.10.0.windows.1

2 3

[PATCH] wineqtdecoder: Fix compilation.
by Zebediah Figura 14 Mar '20

14 Mar '20

Partially written by Alistair Leslie-Hughes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtvdecoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index eaaf30acdb..41b29786cc 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -128,8 +128,6 @@ #include "qtprivate.h" #include "wineqtdecoder_classes.h" -extern CLSID CLSID_QTVDecoder; - WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl @@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl struct strmbase_filter filter; CRITICAL_SECTION stream_cs; + AM_MEDIA_TYPE mt; + struct strmbase_source source; IUnknown *seeking; @@ -266,7 +266,7 @@ error: This->decodeHR = hr; } -static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample) +static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; @@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface, return S_OK; } -static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface, +static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); @@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter); + QTVDecoderImpl* This = impl_from_strmbase_filter(iface); if (This->decompressionSession) ICMDecompressionSessionRelease(This->decompressionSession); @@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { QTVDecoderImpl *object; HRESULT hr; + ISeekingPassThru *passthrough; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Release(passthrough); TRACE("Created video decoder %p.\n", object); - *out = &object->tf.filter.IUnknown_inner; + *out = &object->filter.IUnknown_inner; return S_OK; } -- 2.25.1

1 0

[PATCH] wineconsole: Don't activate window when computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48740 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 212c65cee4..de3f4ae98c 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -253,7 +253,7 @@ static void WCUSER_ComputePositions(struct inner_data* data) } SetWindowPos(data->hWnd, 0, 0, 0, r.right - r.left + dx, r.bottom - r.top + dy, - SWP_NOMOVE|SWP_NOZORDER); + SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); } -- 2.20.1

1 0

[PATCH 3/3] include: Remove comment about now old NTDDI_VERSION.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- include/mssip.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/mssip.h b/include/mssip.h index c14f02d..ee225f1 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -157,7 +157,6 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszIsFunctionNameFmt2; - /* NTDDI_VERSION >= NTDDI_WIN8 */ WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h> -- 2.10.0.windows.1

1 0

[PATCH 1/3] rpcrt4/tests: Remove now useless forced 0x0500 API versions.
by Serge Gautherie 14 Mar '20

14 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/tests/ndr_marshall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4a4c6a..b206c37 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0500 -#define NTDDI_WIN2K 0x05000000 -#define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ #define COBJMACROS #include <stdarg.h> -- 2.10.0.windows.1

1 0

Wine staging 5.4 release
by Alistair Leslie-Hughes 14 Mar '20

14 Mar '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.4 (855 patches are applied to wine vanilla) We would recommand to use the FAudio 20.02 or greater to ensure the best results. * Drakensang Demo requires 20.02 to run. * BlazBlue: Calamity Trigger missing interface is fixed but will require the next version of FAudio 20.04 to avoid a crash. * Bully Scholarship is reported to need the Large Address Aware patch to work. (not a staging patch) Upstreamed (Either directly from staging or fixed with a similar patch). * server: Fix crash when a device driver segfaults during an open file request. * d3dx9_36: Implement ID3DXFontImpl_DrawText. * d3dx9_36: Fix horizontal centering in ID3DXFont_DrawText. * d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText. * d3dx9_36: ID3DXFont_DrawText calc_rect can be null. * ntdll: Export RtlGetNativeSystemInformation() function. Added: * [48596] tasklist: Add basic functionality. * [38615] xactengine: DSA: Drakensang Demo fails on IXACTEngine::Initialize * [31476] xactengine: Support Bully Scholarship Edition requires xactengine 3.1 interface. * [48684] xactengine: BlazBlue: Calamity Trigger requires xactengine 3.3 interface. * [41045] xactengine: Captain Morgane requires xactengine 3.4 interface. * [41030] xactengine: Pac-Man Museum requires xactengine 3.7 interface. * [48389] ntdll: Detroit: Become Human has poor performance (use of unaligned futexes for condition variables on Linux) Updated: * ntdll-RtlIpv4StringToAddress * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ucrtbase/tests: Use more functions directly.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 122 +++++++++++++------------------------ 1 file changed, 44 insertions(+), 78 deletions(-)

3 3

[PATCH v2 1/5] d3dcompiler/tests: Add some tests for d3d9 constant tables.
by Matteo Bruni 13 Mar '20

13 Mar '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Initialize ps_code to avoid the usual warning with default CFLAGS. Also fix a test failure with struct fields DefaultValue. dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 113 ++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 7f391833f39..b16f6e34548 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,6 +730,118 @@ static void test_array_dimensions(void) release_test_context(&test_context); } +static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, + const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) +{ + ok(!strcmp(desc->Name, expect->Name), "%s: got Name %s.\n", prefix, debugstr_a(desc->Name)); + ok(desc->RegisterSet == expect->RegisterSet, "%s: got RegisterSet %#x.\n", prefix, desc->RegisterSet); + ok(desc->RegisterCount == expect->RegisterCount, "%s: got RegisterCount %u.\n", prefix, desc->RegisterCount); + ok(desc->Class == expect->Class, "%s: got Class %#x.\n", prefix, desc->Class); + ok(desc->Type == expect->Type, "%s: got Type %#x.\n", prefix, desc->Type); + ok(desc->Rows == expect->Rows, "%s: got Rows %u.\n", prefix, desc->Rows); + ok(desc->Columns == expect->Columns, "%s: got Columns %u.\n", prefix, desc->Columns); + ok(desc->Elements == expect->Elements, "%s: got Elements %u.\n", prefix, desc->Elements); + ok(desc->StructMembers == expect->StructMembers, "%s: got StructMembers %u.\n", prefix, desc->StructMembers); + ok(desc->Bytes == expect->Bytes, "%s: got Bytes %u.\n", prefix, desc->Bytes); + ok(!!desc->DefaultValue == nonzero_defaultvalue, "%s: got DefaultValue %p.\n", prefix, desc->DefaultValue); +} + +static void test_constant_table(void) +{ + static const char *source = + "uniform float4 a;\n" + "uniform float b;\n" + "uniform float unused;\n" + "uniform float3x1 c;\n" + "uniform row_major float3x1 d;\n" + "uniform uint e;\n" + "uniform struct\n" + "{\n" + " float2x2 a;\n" + " float b;\n" + " float c;\n" + "} f;\n" + "uniform float g[5];\n" + "float4 main(uniform float4 h) : COLOR\n" + "{\n" + " return a + b + c._31 + d._31 + f.c + g[e] + h;\n" + "}"; + + D3DXCONSTANTTABLE_DESC table_desc; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + D3DXHANDLE handle, field; + D3DXCONSTANT_DESC desc; + unsigned int i, j; + HRESULT hr; + UINT count; + + static const D3DXCONSTANT_DESC expect_constants[] = + { + {"$h", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"a", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, + {"f", D3DXRS_FLOAT4, 0, 4, D3DXPC_STRUCT, D3DXPT_VOID, 1, 6, 1, 3, 24}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + }; + + static const D3DXCONSTANT_DESC expect_fields[] = + { + {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + }; + + todo_wine ps_code = compile_shader(source, "ps_2_0"); + if (!ps_code) + return; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + + hr = ID3DXConstantTable_GetDesc(constants, &table_desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(table_desc.Constants == 8, "Got %u constants.\n", table_desc.Constants); + + for (i = 0; i < table_desc.Constants; ++i) + { + char prefix[30]; + + handle = ID3DXConstantTable_GetConstant(constants, NULL, i); + ok(!!handle, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u", i); + check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); + + if (!strcmp(desc.Name, "f")) + { + for (j = 0; j < ARRAY_SIZE(expect_fields); ++j) + { + field = ID3DXConstantTable_GetConstant(constants, handle, j); + ok(!!field, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u, %u", i, j); + check_constant_desc(prefix, &desc, &expect_fields[j], !!j); + } + } + } + + ID3DXConstantTable_Release(constants); + ID3D10Blob_Release(ps_code); +} + static void test_fail(void) { static const char *tests[] = @@ -874,5 +986,6 @@ START_TEST(hlsl_d3d9) test_comma(); test_return(); test_array_dimensions(); + test_constant_table(); test_fail(); } -- 2.24.1

1 4

[PATCH 5/5] ucrtbase/tests: Link to _o_* functions directly.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)

2 1

[resend PATCH 1/2] d3d9/tests: Add tests for allowed filters for StrecthRect().
by Paul Gofman 13 Mar '20

13 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 301 ++++++++++++++++----------------------- 1 file changed, 121 insertions(+), 180 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2294d434ba..4fe11ed161 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3828,16 +3828,17 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) static void stretchrect_test(void) { - IDirect3DSurface9 *surf_tex_rt32, *surf_tex_rt64, *surf_tex_rt_dest64, *surf_tex_rt_dest640_480; - IDirect3DSurface9 *surf_offscreen32, *surf_offscreen64, *surf_offscreen_dest64; + static IDirect3DSurface9 *surf_tex_rt32, *surf_tex_rt64, *surf_tex_rt_dest64, *surf_tex_rt_dest640_480; + static IDirect3DSurface9 *surf_offscreen32, *surf_offscreen64, *surf_offscreen_dest64; IDirect3DTexture9 *tex_rt32, *tex_rt64, *tex_rt_dest64, *tex_rt_dest640_480; - IDirect3DSurface9 *surf_tex32, *surf_tex64, *surf_tex_dest64; - IDirect3DSurface9 *surf_rt32, *surf_rt64, *surf_rt_dest64; + static IDirect3DSurface9 *surf_tex32, *surf_tex64, *surf_tex_dest64; + static IDirect3DSurface9 *surf_rt32, *surf_rt64, *surf_rt_dest64; IDirect3DTexture9 *tex32, *tex64, *tex_dest64; IDirect3DSurface9 *surf_temp32, *surf_temp64; - IDirect3DSurface9 *backbuffer; + static IDirect3DSurface9 *backbuffer; IDirect3DDevice9 *device; IDirect3D9 *d3d; + unsigned int i; D3DCOLOR color; ULONG refcount; HWND window; @@ -3852,6 +3853,75 @@ static void stretchrect_test(void) static const RECT dst_rect64 = {0, 0, 64, 64}; static const RECT dst_rect64_flipy = {0, 64, 64, 0}; + static const struct error_condition_test + { + IDirect3DSurface9 **src; + const RECT *src_rect; + IDirect3DSurface9 **dst; + const RECT *dst_rect; + D3DTEXTUREFILTERTYPE filter; + BOOL allowed; + BOOL todo; + } + error_condition_tests[] = + { + {&surf_offscreen64, &src_rect64_flipy, &surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_offscreen_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_offscreen32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex_rt64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex_rt64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex_rt64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex_rt32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex_rt32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_rt64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_rt64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_rt32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_rt32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&backbuffer, &src_rect_flipy, &surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE}, + {&backbuffer, &src_rect, &surf_tex_rt_dest640_480, &dst_rect_flipy, D3DTEXF_NONE}, + /* Test filter. */ + {&surf_offscreen64, NULL, &surf_offscreen_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_offscreen64, NULL, &surf_offscreen_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_PYRAMIDALQUAD, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_GAUSSIANQUAD, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_CONVOLUTIONMONO, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, 0xbadf, FALSE, TRUE}, + {&surf_tex64, NULL, &surf_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_tex64, NULL, &surf_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_rt64, NULL, &surf_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_tex_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_tex_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&backbuffer, NULL, &surf_tex_rt_dest640_480, NULL, D3DTEXF_NONE, TRUE}, + {&backbuffer, NULL, &surf_tex_rt_dest640_480, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -3864,70 +3934,70 @@ static void stretchrect_test(void) /* Create our temporary surfaces in system memory. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create offscreen plain surfaces in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target surfaces. */ hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt32, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt_dest64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target textures. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest640_480, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt32, 0, &surf_tex_rt32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt64, 0, &surf_tex_rt64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surf_tex_rt_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surf_tex_rt_dest640_480); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create regular textures in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex32, 0, &surf_tex32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex64, 0, &surf_tex64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_dest64, 0, &surf_tex_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /********************************************************************** * Tests for when the source parameter is an offscreen plain surface. * @@ -3945,35 +4015,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_offscreen_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -3984,32 +4038,16 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* offscreenplain ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the smaller offscreen surface with red. */ fill_surface(surf_offscreen32, 0xffff0000, 0); - /* offscreenplain ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* offscreenplain ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4019,10 +4057,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* offscreenplain ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /************************************************************* * Tests for when the source parameter is a regular texture. * *************************************************************/ @@ -4031,32 +4065,20 @@ static void stretchrect_test(void) /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xff0000ff, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4067,35 +4089,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller regular texture with red. */ /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4105,10 +4111,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget texture. * ******************************************************************/ @@ -4117,32 +4119,20 @@ static void stretchrect_test(void) /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xffffffff, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xffffffff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4153,35 +4143,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4191,10 +4165,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget surface. * ******************************************************************/ @@ -4202,30 +4172,18 @@ static void stretchrect_test(void) /* Fill the surface of the rendertarget surface with black. */ fill_surface(surf_rt64, 0xff000000, 0); - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* rendertarget surface ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff000000, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget surface ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4236,32 +4194,16 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget surface ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ fill_surface(surf_rt32, 0xffff0000, 0); - /* rendertarget surface ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* rendertarget surface ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4271,10 +4213,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget surface ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* backbuffer ==> surface tests (no scaling). */ /* Blit with NULL rectangles. */ hr = IDirect3DDevice9_StretchRect(device, backbuffer, NULL, surf_tex_rt_dest640_480, NULL, D3DTEXF_NONE); @@ -4283,14 +4221,17 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect_flipy, - surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, - surf_tex_rt_dest640_480, &dst_rect_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* Test error conditions. */ + for (i = 0; i < ARRAY_SIZE(error_condition_tests); ++i) + { + const struct error_condition_test *test = &error_condition_tests[i]; + + hr = IDirect3DDevice9_StretchRect(device, *test->src, test->src_rect, *test->dst, + test->dst_rect, test->filter); + todo_wine_if(test->todo) + ok(hr == test->allowed ? D3D_OK : D3DERR_INVALIDCALL, "Test %u, got unexpected hr %#x.\n", i, hr); + } /* TODO: Test format conversions. */ -- 2.24.1

1 1

[PATCH 4/5] msvcrt: Use public onexit table declarations in importlib.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/onexit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 3/5] ucrtbase/tests: Use public onexit table declarations.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 88 ++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 51 deletions(-)

1 0

[PATCH 2/5] corecrt_startup.h: Add onexit table declarations.
by Jacek Caban 13 Mar '20

13 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_startup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

1 0

[PATCH 1/2] d3d9/tests: Add tests for allowed filters for StrecthRect().
by Paul Gofman 13 Mar '20

13 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 301 ++++++++++++++++----------------------- 1 file changed, 121 insertions(+), 180 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0e71e23018..3eb29d0e92 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3828,16 +3828,17 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) static void stretchrect_test(void) { - IDirect3DSurface9 *surf_tex_rt32, *surf_tex_rt64, *surf_tex_rt_dest64, *surf_tex_rt_dest640_480; - IDirect3DSurface9 *surf_offscreen32, *surf_offscreen64, *surf_offscreen_dest64; + static IDirect3DSurface9 *surf_tex_rt32, *surf_tex_rt64, *surf_tex_rt_dest64, *surf_tex_rt_dest640_480; + static IDirect3DSurface9 *surf_offscreen32, *surf_offscreen64, *surf_offscreen_dest64; IDirect3DTexture9 *tex_rt32, *tex_rt64, *tex_rt_dest64, *tex_rt_dest640_480; - IDirect3DSurface9 *surf_tex32, *surf_tex64, *surf_tex_dest64; - IDirect3DSurface9 *surf_rt32, *surf_rt64, *surf_rt_dest64; + static IDirect3DSurface9 *surf_tex32, *surf_tex64, *surf_tex_dest64; + static IDirect3DSurface9 *surf_rt32, *surf_rt64, *surf_rt_dest64; IDirect3DTexture9 *tex32, *tex64, *tex_dest64; IDirect3DSurface9 *surf_temp32, *surf_temp64; - IDirect3DSurface9 *backbuffer; + static IDirect3DSurface9 *backbuffer; IDirect3DDevice9 *device; IDirect3D9 *d3d; + unsigned int i; D3DCOLOR color; ULONG refcount; HWND window; @@ -3852,6 +3853,75 @@ static void stretchrect_test(void) static const RECT dst_rect64 = {0, 0, 64, 64}; static const RECT dst_rect64_flipy = {0, 64, 64, 0}; + static const struct error_condition_test + { + IDirect3DSurface9 **src; + const RECT *src_rect; + IDirect3DSurface9 **dst; + const RECT *dst_rect; + D3DTEXTUREFILTERTYPE filter; + BOOL allowed; + BOOL todo; + } + error_condition_tests[] = + { + {&surf_offscreen64, &src_rect64_flipy, &surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_offscreen_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE,}, + {&surf_offscreen64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE,}, + {&surf_offscreen64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_offscreen32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex_rt64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex_rt64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_tex_rt64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_tex_rt64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_tex_rt32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_tex_rt32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_rt64, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_rt64, &src_rect64_flipy, &surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64, &surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64_flipy, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, &src_rect64, &surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE}, + {&surf_rt64, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&surf_rt32, NULL, &surf_offscreen64, NULL, D3DTEXF_NONE, FALSE, TRUE}, + {&surf_rt32, NULL, &surf_tex_dest64, NULL, D3DTEXF_NONE}, + {&backbuffer, &src_rect_flipy, &surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE}, + {&backbuffer, &src_rect, &surf_tex_rt_dest640_480, &dst_rect_flipy, D3DTEXF_NONE}, + /* Test filter. */ + {&surf_offscreen64, NULL, &surf_offscreen_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_offscreen64, NULL, &surf_offscreen_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_offscreen32, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_PYRAMIDALQUAD, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_GAUSSIANQUAD, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_CONVOLUTIONMONO, FALSE, TRUE}, + {&surf_offscreen64, NULL, &surf_tex_rt_dest64, NULL, 0xbadf, FALSE, TRUE}, + {&surf_tex64, NULL, &surf_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_tex64, NULL, &surf_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_rt64, NULL, &surf_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_tex_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_tex_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&surf_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_NONE, TRUE}, + {&surf_rt64, NULL, &surf_tex_rt_dest64, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + {&backbuffer, NULL, &surf_tex_rt_dest640_480, NULL, D3DTEXF_NONE, TRUE}, + {&backbuffer, NULL, &surf_tex_rt_dest640_480, NULL, D3DTEXF_ANISOTROPIC, FALSE, TRUE}, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -3864,70 +3934,70 @@ static void stretchrect_test(void) /* Create our temporary surfaces in system memory. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf_temp64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create offscreen plain surfaces in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen32, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf_offscreen_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target surfaces. */ hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt32, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &surf_rt_dest64, NULL ); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create render target textures. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_rt_dest640_480, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt32, 0, &surf_tex_rt32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt64, 0, &surf_tex_rt64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surf_tex_rt_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surf_tex_rt_dest640_480); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Create regular textures in D3DPOOL_DEFAULT. */ hr = IDirect3DDevice9_CreateTexture(device, 32, 32, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex32, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex_dest64, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex32, 0, &surf_tex32); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex64, 0, &surf_tex64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_dest64, 0, &surf_tex_dest64); - ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /********************************************************************** * Tests for when the source parameter is an offscreen plain surface. * @@ -3945,35 +4015,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_offscreen_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_offscreen_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* offscreenplain ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -3984,32 +4038,16 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* offscreenplain ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the smaller offscreen surface with red. */ fill_surface(surf_offscreen32, 0xffff0000, 0); - /* offscreenplain ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* offscreenplain ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4019,10 +4057,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* offscreenplain ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_offscreen32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /************************************************************* * Tests for when the source parameter is a regular texture. * *************************************************************/ @@ -4031,32 +4065,20 @@ static void stretchrect_test(void) /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xff0000ff, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff0000ff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4067,35 +4089,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller regular texture with red. */ /* Can't fill the surf_tex directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* texture ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4105,10 +4111,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget texture. * ******************************************************************/ @@ -4117,32 +4119,20 @@ static void stretchrect_test(void) /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp64, 0xffffffff, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp64, NULL, surf_tex_rt64, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xffffffff, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4153,35 +4143,19 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget texture ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ /* Can't fill the surf_tex_rt directly because it's created in D3DPOOL_DEFAULT. */ fill_surface(surf_temp32, 0xffff0000, 0); hr = IDirect3DDevice9_UpdateSurface(device, surf_temp32, NULL, surf_tex_rt32, NULL); - ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); - - /* rendertarget texture ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* rendertarget texture ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4191,10 +4165,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget texture ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_tex_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /****************************************************************** * Tests for when the source parameter is a rendertarget surface. * ******************************************************************/ @@ -4202,30 +4172,18 @@ static void stretchrect_test(void) /* Fill the surface of the rendertarget surface with black. */ fill_surface(surf_rt64, 0xff000000, 0); - /* rendertarget texture ==> offscreenplain, same size. */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* rendertarget surface ==> rendertarget texture, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 32, 32); ok(color == 0xff000000, "Got unexpected color 0x%08x.\n", color); /* Blit without scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_tex_rt_dest64, &dst_rect64, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_tex_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* rendertarget surface ==> rendertarget surface, same size. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_rt_dest64, NULL, D3DTEXF_NONE); @@ -4236,32 +4194,16 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, surf_rt_dest64, &dst_rect64, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64_flipy, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, &src_rect64, - surf_rt_dest64, &dst_rect64_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - - /* rendertarget surface ==> texture, same size (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt64, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* Fill the surface of the smaller rendertarget texture with red. */ fill_surface(surf_rt32, 0xffff0000, 0); - /* rendertarget surface ==> offscreenplain, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_offscreen64, NULL, D3DTEXF_NONE); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* rendertarget surface ==> rendertarget texture, scaling. */ hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_rt_dest64, NULL, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* We can't lock rendertarget textures, so copy to our temp surface first. */ hr = IDirect3DDevice9_GetRenderTargetData(device, surf_tex_rt_dest64, surf_temp64); - ok(SUCCEEDED(hr), "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(surf_temp64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); @@ -4271,10 +4213,6 @@ static void stretchrect_test(void) color = getPixelColorFromSurface(surf_rt_dest64, 48, 48); ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); - /* rendertarget surface ==> texture, scaling (should fail). */ - hr = IDirect3DDevice9_StretchRect(device, surf_rt32, NULL, surf_tex_dest64, NULL, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* backbuffer ==> surface tests (no scaling). */ /* Blit with NULL rectangles. */ hr = IDirect3DDevice9_StretchRect(device, backbuffer, NULL, surf_tex_rt_dest640_480, NULL, D3DTEXF_NONE); @@ -4283,14 +4221,17 @@ static void stretchrect_test(void) hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through src_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect_flipy, - surf_tex_rt_dest640_480, &dst_rect, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - /* Flipping in y-direction through dst_rect, no scaling (not allowed). */ - hr = IDirect3DDevice9_StretchRect(device, backbuffer, &src_rect, - surf_tex_rt_dest640_480, &dst_rect_flipy, D3DTEXF_NONE); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* Test error conditions. */ + for (i = 0; i < ARRAY_SIZE(error_condition_tests); ++i) + { + const struct error_condition_test *test = &error_condition_tests[i]; + + hr = IDirect3DDevice9_StretchRect(device, *test->src, test->src_rect, *test->dst, + test->dst_rect, test->filter); + todo_wine_if(test->todo) + ok(hr == test->allowed ? D3D_OK : D3DERR_INVALIDCALL, "Test %u, got unexpected hr %#x.\n", i, hr); + } /* TODO: Test format conversions. */ -- 2.24.1

2 2

[PATCH 1/9] mfplat: Implement MFCreateMediaBufferFromMediaType() for audio types.
by Nikolay Sivov 13 Mar '20

13 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 62 ++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 68 ++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 ++ 4 files changed, 133 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 590288e344..b1d353a59b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -448,6 +448,68 @@ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BO return create_2d_buffer(width, height, fourcc, buffer); } +static unsigned int buffer_get_aligned_length(unsigned int length, unsigned int alignment) +{ + length = (length + alignment) / alignment; + length *= alignment; + + return length; +} + +HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD alignment, IMFMediaBuffer **buffer) +{ + UINT32 length = 0, block_alignment; + LONGLONG avg_length; + HRESULT hr; + GUID major; + + TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_longlong(duration), min_length, alignment, buffer); + + if (!media_type) + return E_INVALIDARG; + + if (FAILED(hr = IMFMediaType_GetMajorType(media_type, &major))) + return hr; + + if (IsEqualGUID(&major, &MFMediaType_Audio)) + { + block_alignment = 0; + if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + WARN("Block alignment was not specified.\n"); + + if (block_alignment) + { + avg_length = 0; + + if (duration) + { + length = 0; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &length))) + { + /* 100 ns -> 1 s */ + avg_length = length * duration / (10 * 1000 * 1000); + } + } + + alignment = max(16, alignment); + + length = buffer_get_aligned_length(avg_length + 1, alignment); + length = buffer_get_aligned_length(length, block_alignment); + } + else + length = 0; + + length = max(length, min_length); + + return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + } + else + FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); + + return E_NOTIMPL; +} + static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2fb6388a31..9f08d1aff2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -52,6 +52,7 @@ @ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stdcall MFCreateMFByteStreamWrapper(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType +@ stdcall MFCreateMediaBufferFromMediaType(ptr int64 long long ptr) @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) @ stdcall MFCreateMediaType(ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 31194db77f..7134c62a79 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -95,6 +95,8 @@ static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height static HRESULT (WINAPI *pMFGetStrideForBitmapInfoHeader)(DWORD format, DWORD width, LONG *stride); static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD min_alignment, IMFMediaBuffer **buffer); static const WCHAR fileschemeW[] = L"file://"; @@ -665,6 +667,7 @@ static void init_functions(void) X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); + X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); X(MFGetPlaneSize); @@ -4587,6 +4590,70 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } +static void test_MFCreateMediaBufferFromMediaType(void) +{ + static struct audio_buffer_test + { + unsigned int duration; + unsigned int min_length; + unsigned int min_alignment; + unsigned int block_alignment; + unsigned int bytes_per_second; + unsigned int buffer_length; + } audio_tests[] = + { + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + }; + IMFMediaBuffer *buffer; + UINT32 length; + HRESULT hr; + IMFMediaType *media_type; + unsigned int i; + + if (!pMFCreateMediaBufferFromMediaType) + { + win_skip("MFCreateMediaBufferFromMediaType() is not available.\n"); + return; + } + + hr = pMFCreateMediaBufferFromMediaType(NULL, 0, 0, 0, &buffer); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) + { + const struct audio_buffer_test *ptr = &audio_tests[i]; + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, ptr->block_alignment); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, ptr->bytes_per_second); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = pMFCreateMediaBufferFromMediaType(media_type, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(ptr->buffer_length == length, "%d: unexpected buffer length %u, expected %u.\n", i, length, ptr->buffer_length); + + IMFMediaBuffer_Release(buffer); + } + + IMFMediaType_Release(media_type); +} + START_TEST(mfplat) { char **argv; @@ -4640,6 +4707,7 @@ START_TEST(mfplat) test_queue_com(); test_MFGetStrideForBitmapInfoHeader(); test_MFCreate2DMediaBuffer(); + test_MFCreateMediaBufferFromMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 9f4db44d1e..9c22b6bfd8 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -411,6 +411,8 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); +HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, + DWORD min_alignment, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); -- 2.25.1

2 9

[PATCH 4/5] d3d9/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 13 Mar '20

13 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 299 +++++++++++++++++++++++---------------- 1 file changed, 174 insertions(+), 125 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d00a26b942c..64802bb15db 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -150,7 +150,8 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc) +static IDirect3DDevice9 *create_device_on_adapter(IDirect3D9 *d3d9, unsigned int adapter_idx, + HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; @@ -185,12 +186,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags |= D3DCREATE_FPU_PRESERVE; } - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -200,13 +201,18 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING)) | D3DCREATE_HARDWARE_VERTEXPROCESSING; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; return NULL; } +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc) +{ + return create_device_on_adapter(d3d9, D3DADAPTER_DEFAULT, focus_window, desc); +} + static HRESULT reset_device(IDirect3DDevice9 *device, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -12555,8 +12561,41 @@ static void test_stretch_rect(void) DestroyWindow(window); } +#define test_device_caps_adapter_group(a, b, c) _test_device_caps_adapter_group(a, b, c, __LINE__) +static void _test_device_caps_adapter_group(const D3DCAPS9 *caps, unsigned int adapter_idx, + unsigned int adapter_count, int line) +{ + ok_(__FILE__, line)(caps->AdapterOrdinal == adapter_idx, "Expect AdapterOrdinal %u, got %u.\n", + adapter_idx, caps->AdapterOrdinal); + /* Single GPU */ + if (caps->NumberOfAdaptersInGroup == adapter_count) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == 0, + "Expect MasterAdapterOrdinal %u, got %u.\n", 0, caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == caps->AdapterOrdinal, + "Expect AdapterOrdinalInGroup %u, got %u.\n", caps->AdapterOrdinal, + caps->AdapterOrdinalInGroup); + ok_(__FILE__, line)(caps->NumberOfAdaptersInGroup == + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + "Expect NumberOfAdaptersInGroup %u, got %u.\n", + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + caps->NumberOfAdaptersInGroup); + } + /* Multiple GPUs and each GPU has only one output */ + else if (caps->NumberOfAdaptersInGroup == 1) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == caps->AdapterOrdinal, + "Expect MasterAdapterOrdinal %u, got %u.\n", caps->AdapterOrdinal, + caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == 0, + "Expect AdapterOrdinalInGroup %u, got %u.\n", 0, caps->AdapterOrdinalInGroup); + } + /* TODO: Test other multi-GPU setup */ +} + static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -12568,129 +12607,139 @@ static void test_device_caps(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D9_GetDeviceCaps */ + hr = IDirect3D9_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "GetDeviceCaps failed, hr %#x.\n", hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("No Direct3D support, skipping test.\n"); + break; + } + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + + /* Test IDirect3DDevice9_GetDeviceCaps */ + device = create_device_on_adapter(d3d, adapter_idx, window, NULL); + ok(!!device, "Failed to create a D3D device on adapter %u.\n", adapter_idx); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP + | D3DCAPS2_CANSHARERESOURCE)), + "Caps2 field has unexpected flags %#x.\n", caps.Caps2); + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD + | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM + | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED + | D3DCAPS3_RESERVED)), + "Caps3 field has unexpected flags %#x.\n", caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS + | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA + | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS + | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED + | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), + "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), + "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); + /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only + * advertised on the reference rasterizer and WARP. */ + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 + | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), + "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO + | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), + "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), + "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP + | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), + "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP - | D3DCAPS2_CANSHARERESOURCE)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD - | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM - | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED - | D3DCAPS3_RESERVED)), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS - | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA - | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED - | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) - || broken(!(caps.RasterCaps & ~0x0f736191)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only - * advertised on the reference rasterizer and WARP. */ - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 - | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO - | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP - | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); } -- 2.20.1

2 1

[tools] testbot/LogUtils: Optimise the _GetLineKey() line cleanup.
by Francois Gouget 13 Mar '20

13 Mar '20

Most line cleanups are mutually exclusive so stop trying after the first successful attempt. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bf933a007d..57229bc40d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1048,15 +1048,15 @@ sub _GetLineKey($) return undef if (!defined $Line); # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled - $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; - # and the process id - $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/; + or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ + # or the process id in Wine's exc_filter() lines + or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ # The exact amount of data printed does not change the error - $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; + or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here. -- 2.20.1

1 0

[tools] testbot/PatchUtils: Detect when make_unicode needs to be run.
by Francois Gouget 13 Mar '20

13 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index cc61e31d7a..c4250781e3 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -157,6 +157,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeUnicode}) + { + InfoMsg "\nRunning make_unicode\n"; + system("cd '$DataDir/$Dir/' && set -x && ./tools/make_unicode"); + if ($? != 0) + { + LogMsg "make_unicode failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f55dc4bdfe..eaa9868942 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -341,6 +341,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; -- 2.20.1

1 0

[PATCH v2 1/2] wined3d: Implement independent blend.
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/state.c | 22 ++-- dlls/d3d11/tests/d3d11.c | 7 +- dlls/wined3d/adapter_gl.c | 7 + dlls/wined3d/device.c | 21 +-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 214 ++++++++++++++++++++++++------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 19 ++- 10 files changed, 220 insertions(+), 80 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6b19379900..0aa998c6a6 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18276,8 +18276,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - todo_wine_if (i & 1) - ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3bd10dd547..85ee67e272 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -350,10 +350,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); } - /* glEnableIndexedEXT(GL_BLEND, ...) */ - if (tmp_desc.IndependentBlendEnable) - FIXME("Per-rendertarget blend not implemented.\n"); - wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) { @@ -389,13 +385,17 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC } wined3d_desc.alpha_to_coverage = desc->AlphaToCoverageEnable; - wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; - wined3d_desc.src = desc->RenderTarget[0].SrcBlend; - wined3d_desc.dst = desc->RenderTarget[0].DestBlend; - wined3d_desc.op = desc->RenderTarget[0].BlendOp; - wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; - wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha; - wined3d_desc.op_alpha = desc->RenderTarget[0].BlendOpAlpha; + wined3d_desc.independent = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; + wined3d_desc.rt[i].src = desc->RenderTarget[i].SrcBlend; + wined3d_desc.rt[i].dst = desc->RenderTarget[i].DestBlend; + wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; + wined3d_desc.rt[i].src_alpha = desc->RenderTarget[i].SrcBlendAlpha; + wined3d_desc.rt[i].dst_alpha = desc->RenderTarget[i].DestBlendAlpha; + wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; + } /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 22c7b0d4fb..60c6e92cd9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29919,7 +29919,7 @@ static void test_independent_blend(void) D3D11_BLEND_ZERO, D3D11_BLEND_ONE, D3D11_BLEND_OP_ADD, D3D11_COLOR_WRITE_ENABLE_ALL}, {TRUE, D3D11_BLEND_INV_SRC_ALPHA, D3D11_BLEND_INV_BLEND_FACTOR, D3D11_BLEND_OP_SUBTRACT, D3D11_BLEND_ONE, D3D11_BLEND_ONE, D3D11_BLEND_OP_REV_SUBTRACT, D3D11_COLOR_WRITE_ENABLE_ALL}, - {FALSE}, + {FALSE, 0, 0, 0, 0, 0, 0, D3D11_COLOR_WRITE_ENABLE_ALL}, {TRUE, D3D11_BLEND_DEST_COLOR, D3D11_BLEND_SRC_COLOR, D3D11_BLEND_OP_ADD, D3D11_BLEND_INV_SRC_ALPHA, D3D11_BLEND_INV_DEST_ALPHA, D3D11_BLEND_OP_SUBTRACT, D3D11_COLOR_WRITE_ENABLE_ALL}, @@ -29927,7 +29927,7 @@ static void test_independent_blend(void) }; static const DWORD expected_colors[] = - {0x66426e1c, 0xb34c3319, 0xa6214a05, 0x66333319, 0xb34c4829, 0x4d19000a, 0xb333801a, 0x081f3305}; + {0x66426e1c, 0xb34c3319, 0xa6214a05, 0x66333319, 0xb34c4829, 0x4d19000a, 0x664c3319, 0x081f3305}; static const float clear_color[] = {0.1f, 0.5f, 0.2f, 0.7f}; static const float blend_factor[] = {0.8f, 0.4f, 0.6f, 0.2f}; @@ -29967,8 +29967,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - todo_wine_if (i) - ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); } diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c04656173d..1860dd4bd0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -74,6 +74,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, + {"GL_ARB_draw_buffers_blend", ARB_DRAW_BUFFERS_BLEND }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_indirect", ARB_DRAW_INDIRECT }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, @@ -1310,6 +1311,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] + && gl_info->supported[ARB_DRAW_BUFFERS_BLEND] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { if (shader_model >= 5 @@ -2679,8 +2681,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendEquationi) /* OpenGL 4.0 */ USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glBlendEquationSeparatei) /* OpenGL 4.0 */ + USE_GL_FUNC(glBlendFunci) /* OpenGL 4.0 */ USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendFuncSeparatei) /* OpenGL 4.0 */ USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ @@ -3370,6 +3376,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, + {ARB_DRAW_BUFFERS_BLEND, MAKEDWORD_VERSION(4, 0)}, {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_SAMPLE_SHADING, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d94b1e2f2d..889aac0506 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3657,23 +3657,24 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, memset(&desc, 0, sizeof(desc)); desc.alpha_to_coverage = state->alpha_to_coverage; + desc.independent = FALSE; if (state->rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC) desc.alpha_to_coverage = TRUE; - desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; - desc.src = state->rs[WINED3D_RS_SRCBLEND]; - desc.dst = state->rs[WINED3D_RS_DESTBLEND]; - desc.op = state->rs[WINED3D_RS_BLENDOP]; + desc.rt[0].enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; + desc.rt[0].src = state->rs[WINED3D_RS_SRCBLEND]; + desc.rt[0].dst = state->rs[WINED3D_RS_DESTBLEND]; + desc.rt[0].op = state->rs[WINED3D_RS_BLENDOP]; if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { - desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; - desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; - desc.op_alpha = state->rs[WINED3D_RS_BLENDOPALPHA]; + desc.rt[0].src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + desc.rt[0].dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; + desc.rt[0].op_alpha = state->rs[WINED3D_RS_BLENDOPALPHA]; } else { - desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; - desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; - desc.op_alpha = state->rs[WINED3D_RS_BLENDOP]; + desc.rt[0].src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + desc.rt[0].dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; + desc.rt[0].op_alpha = state->rs[WINED3D_RS_BLENDOP]; } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 13e55cff8a..d9ef1a96e2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3909,7 +3909,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 static unsigned int warned = 0; args->srgb_correction = 1; - if (state->blend_state && state->blend_state->desc.enable && !warned++) + if (state->blend_state && state->blend_state->desc.rt[0].enable && !warned++) WARN("Blending into a sRGB render target with no GL_ARB_framebuffer_sRGB " "support, expect rendering artifacts.\n"); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 19f47f834e..ad3ce37501 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -426,17 +426,17 @@ static void blendop(const struct wined3d_state *state, const struct wined3d_gl_i } /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ - if (b->desc.op_alpha && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) + if (b->desc.rt[0].op_alpha && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) { WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparate.\n"); return; } - blend_equation = gl_blend_op(gl_info, b->desc.op); - blend_equation_alpha = gl_blend_op(gl_info, b->desc.op_alpha); + blend_equation = gl_blend_op(gl_info, b->desc.rt[0].op); + blend_equation_alpha = gl_blend_op(gl_info, b->desc.rt[0].op_alpha); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); - if (b->desc.op != b->desc.op_alpha) + if (b->desc.rt[0].op != b->desc.rt[0].op_alpha) { GL_EXTCALL(glBlendEquationSeparate(blend_equation, blend_equation_alpha)); checkGLcall("glBlendEquationSeparate"); @@ -525,43 +525,78 @@ static void gl_blend_from_d3d(GLenum *src_blend, GLenum *dst_blend, } } -static void state_blend(struct wined3d_context *context, const struct wined3d_state *state) +static void state_blend_factor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); +} + +static void state_blend_factor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_color *factor = &state->blend_factor; + + TRACE("Setting blend factor to %s.\n", debug_color(factor)); + + GL_EXTCALL(glBlendColor(factor->r, factor->g, factor->b, factor->a)); + checkGLcall("glBlendColor"); +} + +static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined3d_state *state, UINT index) +{ + const struct wined3d_blend_state *b = state->blend_state; + + if (!state->fb->render_targets[index]) + return FALSE; + + if (!b->desc.rt[index].enable) + return FALSE; + + /* Disable blending in all cases even without pixel shaders. + * With blending on we could face a big performance penalty. + * The d3d9 visual test confirms the behavior. */ + if (context->render_offscreen + && !(state->fb->render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + return FALSE; + + return TRUE; +} + +static void blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; GLenum src_blend, dst_blend; - unsigned int rt_fmt_flags; - BOOL enable_blend; - enable_blend = state->fb->render_targets[0] && b && b->desc.enable; - if (enable_blend) + if (gl_info->supported[ARB_MULTISAMPLE]) { - rt_format = state->fb->render_targets[0]->format; - rt_fmt_flags = state->fb->render_targets[0]->format_flags; - - /* Disable blending in all cases even without pixelshaders. - * With blending on we could face a big performance penalty. - * The d3d9 visual test confirms the behavior. */ - if (context->render_offscreen && !(rt_fmt_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - enable_blend = FALSE; + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); } - if (!enable_blend) + if (b && b->desc.independent) + WARN("Independent blend is not supported by this GL implementation.\n"); + + if (!b || !is_blend_enabled(context, state, 0)) { gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); + checkGLcall("glDisable GL_BLEND"); return; } gl_info->gl_ops.gl.p_glEnable(GL_BLEND); - checkGLcall("glEnable(GL_BLEND)"); + checkGLcall("glEnable GL_BLEND"); + + rt_format = state->fb->render_targets[0]->format; - gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); blendop(state, gl_info); - if (b->desc.src != b->desc.src_alpha || b->desc.dst != b->desc.dst_alpha) + if (b->desc.rt[0].src != b->desc.rt[0].src_alpha || b->desc.rt[0].dst != b->desc.rt[0].dst_alpha) { GLenum src_blend_alpha, dst_blend_alpha; @@ -572,7 +607,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, b->desc.dst_alpha, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); @@ -590,37 +625,128 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } -static void state_blend_factor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); -} - -static void state_blend_factor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blend_db2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_color *factor = &state->blend_factor; + GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; + const struct wined3d_blend_state *b = state->blend_state; + const struct wined3d_format *rt_format; + unsigned int i; - TRACE("Setting blend factor to %s.\n", debug_color(factor)); + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); - GL_EXTCALL(glBlendColor(factor->r, factor->g, factor->b, factor->a)); - checkGLcall("glBlendColor"); + if (!b) + { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + checkGLcall("glDisable GL_BLEND"); + return; + } + + if (!b->desc.independent) + { + blend(context, state, state_id); + return; + } + + rt_format = state->fb->render_targets[0]->format; + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); + + GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); + checkGLcall("glBlendFuncSeparate"); + + GL_EXTCALL(glBlendEquationSeparate(gl_blend_op(gl_info, b->desc.rt[0].op), + gl_blend_op(gl_info, b->desc.rt[0].op_alpha))); + checkGLcall("glBlendEquationSeparate"); + + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) + { + if (!is_blend_enabled(context, state, i)) + { + GL_EXTCALL(glDisablei(GL_BLEND, i)); + checkGLcall("glDisablei GL_BLEND"); + continue; + } + + GL_EXTCALL(glEnablei(GL_BLEND, i)); + checkGLcall("glEnablei GL_BLEND"); + + if (b->desc.rt[i].src != b->desc.rt[0].src + || b->desc.rt[i].dst != b->desc.rt[0].dst + || b->desc.rt[i].op != b->desc.rt[0].op + || b->desc.rt[i].src_alpha != b->desc.rt[0].src_alpha + || b->desc.rt[i].dst_alpha != b->desc.rt[0].dst_alpha + || b->desc.rt[i].op_alpha != b->desc.rt[0].op_alpha) + WARN("Independent blend equations and blend functions are not supported by this GL implementation.\n"); + } + + /* Colorkey fixup for stage 0 alphaop depends on blend state, so it may need + * updating. */ + if (state->render_states[WINED3D_RS_COLORKEYENABLE]) + context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } -static void blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blend_dbb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + unsigned int i; - if (gl_info->supported[ARB_MULTISAMPLE]) + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + + if (!b) { - if (b && b->desc.alpha_to_coverage) - gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); - else - gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); - checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + checkGLcall("glDisable GL_BLEND"); + return; + } + + if (!b->desc.independent) + { + blend(context, state, state_id); + return; + } + + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) + { + GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; + const struct wined3d_format *rt_format; + + if (!is_blend_enabled(context, state, i)) + { + GL_EXTCALL(glDisablei(GL_BLEND, i)); + checkGLcall("glDisablei GL_BLEND"); + continue; + } + + GL_EXTCALL(glEnablei(GL_BLEND, i)); + checkGLcall("glEnablei GL_BLEND"); + + rt_format = state->fb->render_targets[i]->format; + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[i].src, b->desc.rt[i].dst, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, + b->desc.rt[i].src_alpha, b->desc.rt[i].dst_alpha, rt_format); + + GL_EXTCALL(glBlendFuncSeparatei(i, src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); + checkGLcall("glBlendFuncSeparatei"); + + GL_EXTCALL(glBlendEquationSeparatei(i, gl_blend_op(gl_info, b->desc.rt[i].op), + gl_blend_op(gl_info, b->desc.rt[i].op_alpha))); + checkGLcall("glBlendEquationSeparatei"); } - state_blend(context, state); + /* Colorkey fixup for stage 0 alphaop depends on blend state, so it may need + * updating. */ + if (state->render_states[WINED3D_RS_COLORKEYENABLE]) + context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } void state_alpha_test(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3225,7 +3351,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st } else if (op == WINED3D_TOP_SELECT_ARG1 && arg1 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { arg2 = WINED3DTA_TEXTURE; op = WINED3D_TOP_MODULATE; @@ -3234,7 +3360,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st } else if (op == WINED3D_TOP_SELECT_ARG2 && arg2 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { arg1 = WINED3DTA_TEXTURE; op = WINED3D_TOP_MODULATE; @@ -4499,6 +4625,8 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, + { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, + { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82a4e2ca0d..54866da533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6134,7 +6134,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { aarg2 = WINED3DTA_TEXTURE; aop = WINED3D_TOP_MODULATE; @@ -6143,7 +6143,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { aarg1 = WINED3DTA_TEXTURE; aop = WINED3D_TOP_MODULATE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2cb25a3776..6b1c99e6da 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -57,6 +57,7 @@ enum wined3d_gl_extension ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, + ARB_DRAW_BUFFERS_BLEND, ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INDIRECT, ARB_DRAW_INSTANCED, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ec097ea5f..16800a8e40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1605,6 +1605,7 @@ enum wined3d_shader_type #define WINED3D_MAX_CONSTS_I 16 #define WINED3D_MAX_VS_CONSTS_F 256 #define WINED3D_MAX_PS_CONSTS_F 224 +#define WINED3D_MAX_RENDER_TARGETS 8 struct wined3d_display_mode { @@ -2029,13 +2030,17 @@ struct wined3d_buffer_desc struct wined3d_blend_state_desc { BOOL alpha_to_coverage; - BOOL enable; - enum wined3d_blend src; - enum wined3d_blend dst; - enum wined3d_blend_op op; - enum wined3d_blend src_alpha; - enum wined3d_blend dst_alpha; - enum wined3d_blend_op op_alpha; + BOOL independent; + struct + { + BOOL enable; + enum wined3d_blend src; + enum wined3d_blend dst; + enum wined3d_blend_op op; + enum wined3d_blend src_alpha; + enum wined3d_blend dst_alpha; + enum wined3d_blend_op op_alpha; + } rt[WINED3D_MAX_RENDER_TARGETS]; }; struct wined3d_rasterizer_state_desc -- 2.25.1

4 6

[RFC PATCH] winevulkan: Fill in device LUID from corresponding DXGI adapter.
by Brendan Shanks 13 Mar '20

13 Mar '20

--- Red Dead Redemption 2 relies on the deviceLUID returned by vkGetPhysicalDeviceProperties2() matching up with the LUID reported by other Windows APIs. This patch uses DXGI to enumerate adapters, and uses the LUID of the D3D adapter matching the UUID provided through Vulkan. The patch works, but I could see problems arising in case EnumAdapters() was backed by Vulkan and called vkGetPhysicalDeviceProperties2() itself. Would it be preferable to cache the UUID/LUID pairs in wine_vk_init()? Or should DXGI not be used at all, in favor of reading these out of the registry (with changes needed to wined3d)? dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/make_vulkan | 2 + dlls/winevulkan/vulkan.c | 89 +++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 10 +--- dlls/winevulkan/vulkan_thunks.h | 4 ++ 5 files changed, 98 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index e0bca6fad7..c112581e1e 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 +IMPORTS = dxgi user32 gdi32 C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..1879d640e0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -165,6 +165,8 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : False, "thunk" : False, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : False, "private_thunk" : True}, # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef8..2ef39ada79 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -19,10 +19,16 @@ #include <stdarg.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "initguid.h" +#include "dxgi.h" +#include "wine/wined3d.h" +#include "wine/winedxgi.h" + #include "vulkan_private.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -1261,6 +1267,89 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } +static BOOL get_luid_for_device_uuid(const UUID *uuid, LUID *luid) +{ + UINT i = 0; + BOOL found = FALSE; + IDXGIFactory *factory = NULL; + IDXGIAdapter *adapter = NULL; + + if (FAILED(CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) return FALSE; + + while (!found && IDXGIFactory_EnumAdapters(factory, i, &adapter) != DXGI_ERROR_NOT_FOUND) + { + IWineDXGIAdapter *wine_adapter = NULL; + if (SUCCEEDED(IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) + { + struct wine_dxgi_adapter_info adapter_info; + if (SUCCEEDED(IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info))) + { + if (IsEqualGUID(uuid, &adapter_info.device_uuid)) + { + *luid = adapter_info.luid; + found = TRUE; + } + } + + IWineDXGIAdapter_Release(wine_adapter); + } + + IDXGIAdapter_Release(adapter); + i++; + } + + if (factory) IDXGIFactory_Release(factory); + return found; +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties2 *properties) +{ + VkPhysicalDeviceIDProperties *idprops; + + TRACE("%p, %p\n", physical_device, properties); + thunk_vkGetPhysicalDeviceProperties2(physical_device, properties); + + if ((idprops = wine_vk_find_struct(properties, PHYSICAL_DEVICE_ID_PROPERTIES))) + { + UUID *deviceUUID = (UUID *)idprops->deviceUUID; + LUID *luid = (LUID *)idprops->deviceLUID; + if (get_luid_for_device_uuid(deviceUUID, luid)) + { + idprops->deviceNodeMask = 1; + idprops->deviceLUIDValid = VK_TRUE; + } + else + { + WARN("Failed to find corresponding adapter LUID for device UUID %s.\n", debugstr_guid(deviceUUID)); + } + } +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties2 *properties) +{ + VkPhysicalDeviceIDProperties *idprops; + + TRACE("%p, %p\n", physical_device, properties); + thunk_vkGetPhysicalDeviceProperties2KHR(physical_device, properties); + + if ((idprops = wine_vk_find_struct(properties, PHYSICAL_DEVICE_ID_PROPERTIES))) + { + UUID *deviceUUID = (UUID *)idprops->deviceUUID; + LUID *luid = (LUID *)idprops->deviceLUID; + if (get_luid_for_device_uuid(deviceUUID, luid)) + { + idprops->deviceNodeMask = 1; + idprops->deviceLUIDValid = VK_TRUE; + } + else + { + WARN("Failed to find corresponding adapter LUID for device UUID %s.\n", debugstr_guid(deviceUUID)); + } + } +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fecf9ab502..89878f189a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4268,34 +4268,28 @@ void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, #endif } -void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, pProperties); #endif } -static void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, pProperties); #endif } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 01c1efb277..9896112176 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -64,11 +64,15 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); /* Private thunks */ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.24.1

6 11

[PATCH v2] wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE).
by Dmitry Timoshkov 13 Mar '20

13 Mar '20

v2: Support ANSI credentials. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wldap32/bind.c | 134 +++++++++++++++++++++++++++++---- dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.h | 32 ++++++++ include/config.h.in | 3 + 6 files changed, 202 insertions(+), 44 deletions(-) diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..7c2d803ef5 100644 --- a/configure.ac +++ b/configure.ac @@ -483,6 +483,7 @@ AC_CHECK_HEADERS(\ port.h \ pthread.h \ pwd.h \ + sasl/sasl.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 27fb286f50..0ce8a89006 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -25,10 +25,14 @@ #ifdef HAVE_LDAP_H #include <ldap.h> #endif +#ifdef HAVE_SASL_SASL_H +#include <sasl/sasl.h> +#endif #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "rpc.h" #include "winldap_private.h" #include "wldap32.h" @@ -156,20 +160,70 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) if (!dnW) goto exit; } if (cred) { - credW = strAtoW( cred ); - if (!credW) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + else + credW = (WCHAR *)cred /* SEC_WINNT_AUTH_IDENTITY_A */; } ret = ldap_bind_sW( ld, dnW, credW, method ); exit: strfreeW( dnW ); - strfreeW( credW ); + if (credW != (WCHAR *)cred) strfreeW( credW ); #endif return ret; } +#ifdef HAVE_SASL_SASL_H + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + SEC_WINNT_AUTH_IDENTITY_A *id = defaults; + sasl_interact_t *sasl = interact; + + TRACE( "%p,%08x,%p,%p\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + TRACE("sasl->id = %04lx\n", sasl->id); + + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->Domain; + sasl->len = id->DomainLength; + } + else if (sasl->id == SASL_CB_USER) + { + sasl->result = id->User; + sasl->len = id->UserLength; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->Password; + sasl->len = id->PasswordLength; + } + + sasl++; + } + + return LDAP_SUCCESS; +} + +#else + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + FIXME( "%p,%08x,%p,%p: stub\n", ld, flags, defaults, interact ); + return LDAP_SUCCESS; +} + +#endif /* HAVE_SASL_SASL_H */ + /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * @@ -197,21 +251,71 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; - if (dn) { - dnU = strWtoU( dn ); - if (!dnU) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + if (dn) + { + dnU = strWtoU( dn ); + if (!dnU) goto exit; + } + if (cred) + { + credU = strWtoU( cred ); + if (!credU) goto exit; + + pwd.bv_len = strlen( credU ); + pwd.bv_val = credU; + } + + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); } - if (cred) { - credU = strWtoU( cred ); - if (!credU) goto exit; - - pwd.bv_len = strlen( credU ); - pwd.bv_val = credU; + else if (method == WLDAP32_LDAP_AUTH_NEGOTIATE) + { + SEC_WINNT_AUTH_IDENTITY_A idU; + SEC_WINNT_AUTH_IDENTITY_W idW; + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)cred; + + memset( &idU, 0, sizeof(idU) ); + + if (id) + { + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + idW.Domain = (unsigned short *)strnAtoW( (char *)id->Domain, id->DomainLength, &idW.DomainLength ); + idW.User = (unsigned short *)strnAtoW( (char *)id->User, id->UserLength, &idW.UserLength ); + idW.Password = (unsigned short *)strnAtoW( (char *)id->Password, id->PasswordLength, &idW.PasswordLength ); + + id = &idW; + } + + idU.Domain = (unsigned char *)strnWtoU( id->Domain, id->DomainLength, &idU.DomainLength ); + idU.User = (unsigned char *)strnWtoU( id->User, id->UserLength, &idU.UserLength ); + idU.Password = (unsigned char *)strnWtoU( id->Password, id->PasswordLength, &idU.PasswordLength ); + } + + ret = map_error( ldap_sasl_interactive_bind_s( ld, + NULL /* server will ignore DN anyway */, + NULL /* query supportedSASLMechanisms */, + NULL, NULL, LDAP_SASL_QUIET, sasl_interact, &idU )); + + if (id && (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI)) + { + strfreeW( (WCHAR *)idW.Domain ); + strfreeW( (WCHAR *)idW.User ); + strfreeW( (WCHAR *)idW.Password ); + } + + strfreeU( (char *)idU.Domain ); + strfreeU( (char *)idU.User ); + strfreeU( (char *)idU.Password ); + } + else + { + FIXME( "method %#x not supported\n", method ); + return WLDAP32_LDAP_PARAM_ERROR; } - - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 74223029b7..df257dafec 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -101,6 +101,8 @@ typedef struct berelement #define WLDAP32_LDAP_OPT_SECURITY_CONTEXT 0x99 #define WLDAP32_LDAP_OPT_ROOTDSE_CACHE 0x9a +#define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 + typedef struct ldap { struct diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 1d4052002a..c329a5b76b 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -93,6 +93,38 @@ static inline LPWSTR strUtoW( char *str ) return ret; } +static inline LPWSTR strnAtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) +{ + LPWSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, inlen, NULL, 0 ); + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + *outlen = len; + } + } + return ret; +} + +static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) +{ + LPSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( len ))) + { + WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + *outlen = len; + } + } + return ret; +} + static inline void strfreeA( LPSTR str ) { heap_free( str ); diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..e48e398ca8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -776,6 +776,9 @@ /* Define to 1 if you have the `roundf' function. */ #undef HAVE_ROUNDF +/* Define to 1 if you have the <sasl/sasl.h> header file. */ +#undef HAVE_SASL_SASL_H + /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -- 2.20.1

1 0

[PATCH 1/2] wined3d: Implement independent blend.
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/state.c | 22 ++-- dlls/d3d11/tests/d3d11.c | 7 +- dlls/wined3d/adapter_gl.c | 7 + dlls/wined3d/device.c | 21 +-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 214 ++++++++++++++++++++++++------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 19 ++- 10 files changed, 220 insertions(+), 80 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6b19379900..0aa998c6a6 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18276,8 +18276,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - todo_wine_if (i & 1) - ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3bd10dd547..85ee67e272 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -350,10 +350,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); } - /* glEnableIndexedEXT(GL_BLEND, ...) */ - if (tmp_desc.IndependentBlendEnable) - FIXME("Per-rendertarget blend not implemented.\n"); - wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) { @@ -389,13 +385,17 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC } wined3d_desc.alpha_to_coverage = desc->AlphaToCoverageEnable; - wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; - wined3d_desc.src = desc->RenderTarget[0].SrcBlend; - wined3d_desc.dst = desc->RenderTarget[0].DestBlend; - wined3d_desc.op = desc->RenderTarget[0].BlendOp; - wined3d_desc.src_alpha = desc->RenderTarget[0].SrcBlendAlpha; - wined3d_desc.dst_alpha = desc->RenderTarget[0].DestBlendAlpha; - wined3d_desc.op_alpha = desc->RenderTarget[0].BlendOpAlpha; + wined3d_desc.independent = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; + wined3d_desc.rt[i].src = desc->RenderTarget[i].SrcBlend; + wined3d_desc.rt[i].dst = desc->RenderTarget[i].DestBlend; + wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; + wined3d_desc.rt[i].src_alpha = desc->RenderTarget[i].SrcBlendAlpha; + wined3d_desc.rt[i].dst_alpha = desc->RenderTarget[i].DestBlendAlpha; + wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; + } /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 22c7b0d4fb..60c6e92cd9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29919,7 +29919,7 @@ static void test_independent_blend(void) D3D11_BLEND_ZERO, D3D11_BLEND_ONE, D3D11_BLEND_OP_ADD, D3D11_COLOR_WRITE_ENABLE_ALL}, {TRUE, D3D11_BLEND_INV_SRC_ALPHA, D3D11_BLEND_INV_BLEND_FACTOR, D3D11_BLEND_OP_SUBTRACT, D3D11_BLEND_ONE, D3D11_BLEND_ONE, D3D11_BLEND_OP_REV_SUBTRACT, D3D11_COLOR_WRITE_ENABLE_ALL}, - {FALSE}, + {FALSE, 0, 0, 0, 0, 0, 0, D3D11_COLOR_WRITE_ENABLE_ALL}, {TRUE, D3D11_BLEND_DEST_COLOR, D3D11_BLEND_SRC_COLOR, D3D11_BLEND_OP_ADD, D3D11_BLEND_INV_SRC_ALPHA, D3D11_BLEND_INV_DEST_ALPHA, D3D11_BLEND_OP_SUBTRACT, D3D11_COLOR_WRITE_ENABLE_ALL}, @@ -29927,7 +29927,7 @@ static void test_independent_blend(void) }; static const DWORD expected_colors[] = - {0x66426e1c, 0xb34c3319, 0xa6214a05, 0x66333319, 0xb34c4829, 0x4d19000a, 0xb333801a, 0x081f3305}; + {0x66426e1c, 0xb34c3319, 0xa6214a05, 0x66333319, 0xb34c4829, 0x4d19000a, 0x664c3319, 0x081f3305}; static const float clear_color[] = {0.1f, 0.5f, 0.2f, 0.7f}; static const float blend_factor[] = {0.8f, 0.4f, 0.6f, 0.2f}; @@ -29967,8 +29967,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - todo_wine_if (i) - ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); } diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c04656173d..1860dd4bd0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -74,6 +74,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, + {"GL_ARB_draw_buffers_blend", ARB_DRAW_BUFFERS_BLEND }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_indirect", ARB_DRAW_INDIRECT }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, @@ -1310,6 +1311,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] + && gl_info->supported[ARB_DRAW_BUFFERS_BLEND] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { if (shader_model >= 5 @@ -2679,8 +2681,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendEquationi) /* OpenGL 4.0 */ USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glBlendEquationSeparatei) /* OpenGL 4.0 */ + USE_GL_FUNC(glBlendFunci) /* OpenGL 4.0 */ USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ + USE_GL_FUNC(glBlendFuncSeparatei) /* OpenGL 4.0 */ USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ @@ -3370,6 +3376,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, + {ARB_DRAW_BUFFERS_BLEND, MAKEDWORD_VERSION(4, 0)}, {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_SAMPLE_SHADING, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d94b1e2f2d..889aac0506 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3657,23 +3657,24 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, memset(&desc, 0, sizeof(desc)); desc.alpha_to_coverage = state->alpha_to_coverage; + desc.independent = FALSE; if (state->rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC) desc.alpha_to_coverage = TRUE; - desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; - desc.src = state->rs[WINED3D_RS_SRCBLEND]; - desc.dst = state->rs[WINED3D_RS_DESTBLEND]; - desc.op = state->rs[WINED3D_RS_BLENDOP]; + desc.rt[0].enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; + desc.rt[0].src = state->rs[WINED3D_RS_SRCBLEND]; + desc.rt[0].dst = state->rs[WINED3D_RS_DESTBLEND]; + desc.rt[0].op = state->rs[WINED3D_RS_BLENDOP]; if (state->rs[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { - desc.src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; - desc.dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; - desc.op_alpha = state->rs[WINED3D_RS_BLENDOPALPHA]; + desc.rt[0].src_alpha = state->rs[WINED3D_RS_SRCBLENDALPHA]; + desc.rt[0].dst_alpha = state->rs[WINED3D_RS_DESTBLENDALPHA]; + desc.rt[0].op_alpha = state->rs[WINED3D_RS_BLENDOPALPHA]; } else { - desc.src_alpha = state->rs[WINED3D_RS_SRCBLEND]; - desc.dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; - desc.op_alpha = state->rs[WINED3D_RS_BLENDOP]; + desc.rt[0].src_alpha = state->rs[WINED3D_RS_SRCBLEND]; + desc.rt[0].dst_alpha = state->rs[WINED3D_RS_DESTBLEND]; + desc.rt[0].op_alpha = state->rs[WINED3D_RS_BLENDOP]; } if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 13e55cff8a..d9ef1a96e2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3909,7 +3909,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 static unsigned int warned = 0; args->srgb_correction = 1; - if (state->blend_state && state->blend_state->desc.enable && !warned++) + if (state->blend_state && state->blend_state->desc.rt[0].enable && !warned++) WARN("Blending into a sRGB render target with no GL_ARB_framebuffer_sRGB " "support, expect rendering artifacts.\n"); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 19f47f834e..ad3ce37501 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -426,17 +426,17 @@ static void blendop(const struct wined3d_state *state, const struct wined3d_gl_i } /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ - if (b->desc.op_alpha && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) + if (b->desc.rt[0].op_alpha && !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE]) { WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparate.\n"); return; } - blend_equation = gl_blend_op(gl_info, b->desc.op); - blend_equation_alpha = gl_blend_op(gl_info, b->desc.op_alpha); + blend_equation = gl_blend_op(gl_info, b->desc.rt[0].op); + blend_equation_alpha = gl_blend_op(gl_info, b->desc.rt[0].op_alpha); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); - if (b->desc.op != b->desc.op_alpha) + if (b->desc.rt[0].op != b->desc.rt[0].op_alpha) { GL_EXTCALL(glBlendEquationSeparate(blend_equation, blend_equation_alpha)); checkGLcall("glBlendEquationSeparate"); @@ -525,43 +525,78 @@ static void gl_blend_from_d3d(GLenum *src_blend, GLenum *dst_blend, } } -static void state_blend(struct wined3d_context *context, const struct wined3d_state *state) +static void state_blend_factor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); +} + +static void state_blend_factor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_color *factor = &state->blend_factor; + + TRACE("Setting blend factor to %s.\n", debug_color(factor)); + + GL_EXTCALL(glBlendColor(factor->r, factor->g, factor->b, factor->a)); + checkGLcall("glBlendColor"); +} + +static BOOL is_blend_enabled(struct wined3d_context *context, const struct wined3d_state *state, UINT index) +{ + const struct wined3d_blend_state *b = state->blend_state; + + if (!state->fb->render_targets[index]) + return FALSE; + + if (!b->desc.rt[index].enable) + return FALSE; + + /* Disable blending in all cases even without pixel shaders. + * With blending on we could face a big performance penalty. + * The d3d9 visual test confirms the behavior. */ + if (context->render_offscreen + && !(state->fb->render_targets[index]->format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + return FALSE; + + return TRUE; +} + +static void blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; GLenum src_blend, dst_blend; - unsigned int rt_fmt_flags; - BOOL enable_blend; - enable_blend = state->fb->render_targets[0] && b && b->desc.enable; - if (enable_blend) + if (gl_info->supported[ARB_MULTISAMPLE]) { - rt_format = state->fb->render_targets[0]->format; - rt_fmt_flags = state->fb->render_targets[0]->format_flags; - - /* Disable blending in all cases even without pixelshaders. - * With blending on we could face a big performance penalty. - * The d3d9 visual test confirms the behavior. */ - if (context->render_offscreen && !(rt_fmt_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - enable_blend = FALSE; + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); } - if (!enable_blend) + if (b && b->desc.independent) + WARN("Independent blend is not supported by this GL implementation.\n"); + + if (!b || !is_blend_enabled(context, state, 0)) { gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); + checkGLcall("glDisable GL_BLEND"); return; } gl_info->gl_ops.gl.p_glEnable(GL_BLEND); - checkGLcall("glEnable(GL_BLEND)"); + checkGLcall("glEnable GL_BLEND"); + + rt_format = state->fb->render_targets[0]->format; - gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); blendop(state, gl_info); - if (b->desc.src != b->desc.src_alpha || b->desc.dst != b->desc.dst_alpha) + if (b->desc.rt[0].src != b->desc.rt[0].src_alpha || b->desc.rt[0].dst != b->desc.rt[0].dst_alpha) { GLenum src_blend_alpha, dst_blend_alpha; @@ -572,7 +607,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.src_alpha, b->desc.dst_alpha, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); @@ -590,37 +625,128 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } -static void state_blend_factor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); -} - -static void state_blend_factor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blend_db2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_color *factor = &state->blend_factor; + GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; + const struct wined3d_blend_state *b = state->blend_state; + const struct wined3d_format *rt_format; + unsigned int i; - TRACE("Setting blend factor to %s.\n", debug_color(factor)); + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); - GL_EXTCALL(glBlendColor(factor->r, factor->g, factor->b, factor->a)); - checkGLcall("glBlendColor"); + if (!b) + { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + checkGLcall("glDisable GL_BLEND"); + return; + } + + if (!b->desc.independent) + { + blend(context, state, state_id); + return; + } + + rt_format = state->fb->render_targets[0]->format; + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[0].src, b->desc.rt[0].dst, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, b->desc.rt[0].src_alpha, b->desc.rt[0].dst_alpha, rt_format); + + GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); + checkGLcall("glBlendFuncSeparate"); + + GL_EXTCALL(glBlendEquationSeparate(gl_blend_op(gl_info, b->desc.rt[0].op), + gl_blend_op(gl_info, b->desc.rt[0].op_alpha))); + checkGLcall("glBlendEquationSeparate"); + + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) + { + if (!is_blend_enabled(context, state, i)) + { + GL_EXTCALL(glDisablei(GL_BLEND, i)); + checkGLcall("glDisablei GL_BLEND"); + continue; + } + + GL_EXTCALL(glEnablei(GL_BLEND, i)); + checkGLcall("glEnablei GL_BLEND"); + + if (b->desc.rt[i].src != b->desc.rt[0].src + || b->desc.rt[i].dst != b->desc.rt[0].dst + || b->desc.rt[i].op != b->desc.rt[0].op + || b->desc.rt[i].src_alpha != b->desc.rt[0].src_alpha + || b->desc.rt[i].dst_alpha != b->desc.rt[0].dst_alpha + || b->desc.rt[i].op_alpha != b->desc.rt[0].op_alpha) + WARN("Independent blend equations and blend functions are not supported by this GL implementation.\n"); + } + + /* Colorkey fixup for stage 0 alphaop depends on blend state, so it may need + * updating. */ + if (state->render_states[WINED3D_RS_COLORKEYENABLE]) + context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } -static void blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void blend_dbb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + unsigned int i; - if (gl_info->supported[ARB_MULTISAMPLE]) + if (b && b->desc.alpha_to_coverage) + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + + if (!b) { - if (b && b->desc.alpha_to_coverage) - gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); - else - gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); - checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + checkGLcall("glDisable GL_BLEND"); + return; + } + + if (!b->desc.independent) + { + blend(context, state, state_id); + return; + } + + for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) + { + GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; + const struct wined3d_format *rt_format; + + if (!is_blend_enabled(context, state, i)) + { + GL_EXTCALL(glDisablei(GL_BLEND, i)); + checkGLcall("glDisablei GL_BLEND"); + continue; + } + + GL_EXTCALL(glEnablei(GL_BLEND, i)); + checkGLcall("glEnablei GL_BLEND"); + + rt_format = state->fb->render_targets[i]->format; + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.rt[i].src, b->desc.rt[i].dst, rt_format); + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, + b->desc.rt[i].src_alpha, b->desc.rt[i].dst_alpha, rt_format); + + GL_EXTCALL(glBlendFuncSeparatei(i, src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); + checkGLcall("glBlendFuncSeparatei"); + + GL_EXTCALL(glBlendEquationSeparatei(i, gl_blend_op(gl_info, b->desc.rt[i].op), + gl_blend_op(gl_info, b->desc.rt[i].op_alpha))); + checkGLcall("glBlendEquationSeparatei"); } - state_blend(context, state); + /* Colorkey fixup for stage 0 alphaop depends on blend state, so it may need + * updating. */ + if (state->render_states[WINED3D_RS_COLORKEYENABLE]) + context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } void state_alpha_test(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3225,7 +3351,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st } else if (op == WINED3D_TOP_SELECT_ARG1 && arg1 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { arg2 = WINED3DTA_TEXTURE; op = WINED3D_TOP_MODULATE; @@ -3234,7 +3360,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st } else if (op == WINED3D_TOP_SELECT_ARG2 && arg2 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { arg1 = WINED3DTA_TEXTURE; op = WINED3D_TOP_MODULATE; @@ -4499,6 +4625,8 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, + { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, + { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82a4e2ca0d..54866da533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6134,7 +6134,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { aarg2 = WINED3DTA_TEXTURE; aop = WINED3D_TOP_MODULATE; @@ -6143,7 +6143,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) { - if (state->blend_state && state->blend_state->desc.enable) + if (state->blend_state && state->blend_state->desc.rt[0].enable) { aarg1 = WINED3DTA_TEXTURE; aop = WINED3D_TOP_MODULATE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2cb25a3776..6b1c99e6da 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -57,6 +57,7 @@ enum wined3d_gl_extension ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, + ARB_DRAW_BUFFERS_BLEND, ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INDIRECT, ARB_DRAW_INSTANCED, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ec097ea5f..16800a8e40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1605,6 +1605,7 @@ enum wined3d_shader_type #define WINED3D_MAX_CONSTS_I 16 #define WINED3D_MAX_VS_CONSTS_F 256 #define WINED3D_MAX_PS_CONSTS_F 224 +#define WINED3D_MAX_RENDER_TARGETS 8 struct wined3d_display_mode { @@ -2029,13 +2030,17 @@ struct wined3d_buffer_desc struct wined3d_blend_state_desc { BOOL alpha_to_coverage; - BOOL enable; - enum wined3d_blend src; - enum wined3d_blend dst; - enum wined3d_blend_op op; - enum wined3d_blend src_alpha; - enum wined3d_blend dst_alpha; - enum wined3d_blend_op op_alpha; + BOOL independent; + struct + { + BOOL enable; + enum wined3d_blend src; + enum wined3d_blend dst; + enum wined3d_blend_op op; + enum wined3d_blend src_alpha; + enum wined3d_blend dst_alpha; + enum wined3d_blend_op op_alpha; + } rt[WINED3D_MAX_RENDER_TARGETS]; }; struct wined3d_rasterizer_state_desc -- 2.25.1

3 4

[PATCH v2 4/4] activeds: Implement ADsGetObject.
by Dmitry Timoshkov 13 Mar '20

13 Mar '20

v2: If secure open object fails fallback to simple bind as per MSDN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 10 +++++++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..6a825f0913 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT hr; + + hr = ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); + if (hr != S_OK) + hr = ADsOpenObject(path, NULL, NULL, 0, riid, obj); + return hr; } /***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e0e562e8bf..28e41e4d95 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads); + hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

1 0

[PATCH 3/4] activeds: ADsOpenObject should return E_FAIL by default.
by Dmitry Timoshkov 13 Mar '20

13 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 6f8c00aa89..e0e562e8bf 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

1 0

[PATCH v3 2/4] adsldp: Bind to an LDAP server after connection.
by Dmitry Timoshkov 13 Mar '20

13 Mar '20

v2: Fix test failures. v3: actually fail on ADS_SECURE_AUTHENTICATION. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 29 ++++++++++-- dlls/adsldp/adsldp_private.h | 24 ++++++++++ dlls/adsldp/ldap.c | 91 ++++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/ldap.c | 31 +++++++++--- 5 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 dlls/adsldp/adsldp_private.h create mode 100644 dlls/adsldp/ldap.c diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index e9c87e68f1..3e5a5e310e 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -5,7 +5,8 @@ DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - adsldp.c + adsldp.c \ + ldap.c IDL_SRCS = \ adsldp.idl diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 30bd1672f6..bc4e9780b0 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -36,6 +36,8 @@ #include "lmapibuf.h" #include "winldap.h" +#include "adsldp_private.h" + #include "wine/heap.h" #include "wine/debug.h" @@ -700,7 +702,7 @@ static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) } static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, - LONG reserved, IDispatch **obj) + LONG flags, IDispatch **obj) { BSTR host, object; ULONG port; @@ -709,7 +711,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr; @@ -760,7 +762,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B err = ldap_set_optionW(ld, LDAP_OPT_PROTOCOL_VERSION, &version); if (err != LDAP_SUCCESS) { - hr = HRESULT_FROM_WIN32(err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); ldap_unbind(ld); goto fail; } @@ -768,10 +770,29 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B err = ldap_connect(ld, NULL); if (err != LDAP_SUCCESS) { - hr = HRESULT_FROM_WIN32(err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + ldap_unbind(ld); + goto fail; + } + + if (flags & ADS_SECURE_AUTHENTICATION) + { + FIXME("ADS_SECURE_AUTHENTICATION is not supported\n"); + hr = ERROR_DS_AUTH_METHOD_NOT_SUPPORTED; ldap_unbind(ld); goto fail; } + else + { + err = ldap_simple_bind_sW(ld, user, password); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_simple_bind_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + ldap_unbind(ld); + goto fail; + } + } } hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h new file mode 100644 index 0000000000..8748d0496d --- /dev/null +++ b/dlls/adsldp/adsldp_private.h @@ -0,0 +1,24 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * 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 _ADSLDP_PRIVATE_H +#define _ADSLDP_PRIVATE_H + +DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/adsldp/ldap.c b/dlls/adsldp/ldap.c new file mode 100644 index 0000000000..c23f46267e --- /dev/null +++ b/dlls/adsldp/ldap.c @@ -0,0 +1,91 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winldap.h" + +DWORD map_ldap_error(DWORD err) +{ + switch (err) + { + case LDAP_SUCCESS: return ERROR_SUCCESS; + case LDAP_OPERATIONS_ERROR: return ERROR_DS_OPERATIONS_ERROR; + case LDAP_PROTOCOL_ERROR: return ERROR_DS_PROTOCOL_ERROR; + case LDAP_TIMELIMIT_EXCEEDED: return ERROR_DS_TIMELIMIT_EXCEEDED; + case LDAP_SIZELIMIT_EXCEEDED: return ERROR_DS_SIZELIMIT_EXCEEDED; + case LDAP_COMPARE_FALSE: return ERROR_DS_COMPARE_FALSE; + case LDAP_COMPARE_TRUE: return ERROR_DS_COMPARE_TRUE; + case LDAP_AUTH_METHOD_NOT_SUPPORTED: return ERROR_DS_AUTH_METHOD_NOT_SUPPORTED; + case LDAP_STRONG_AUTH_REQUIRED: return ERROR_DS_STRONG_AUTH_REQUIRED; + case LDAP_REFERRAL_V2: return ERROR_DS_REFERRAL; + case LDAP_REFERRAL: return ERROR_DS_REFERRAL; + case LDAP_ADMIN_LIMIT_EXCEEDED: return ERROR_DS_ADMIN_LIMIT_EXCEEDED; + case LDAP_UNAVAILABLE_CRIT_EXTENSION: return ERROR_DS_UNAVAILABLE_CRIT_EXTENSION; + case LDAP_CONFIDENTIALITY_REQUIRED: return ERROR_DS_CONFIDENTIALITY_REQUIRED; + case LDAP_NO_SUCH_ATTRIBUTE: return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + case LDAP_UNDEFINED_TYPE: return ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED; + case LDAP_INAPPROPRIATE_MATCHING: return ERROR_DS_INAPPROPRIATE_MATCHING; + case LDAP_CONSTRAINT_VIOLATION: return ERROR_DS_CONSTRAINT_VIOLATION; + case LDAP_ATTRIBUTE_OR_VALUE_EXISTS: return ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS; + case LDAP_INVALID_SYNTAX: return ERROR_DS_INVALID_ATTRIBUTE_SYNTAX; + case LDAP_NO_SUCH_OBJECT: return ERROR_DS_NO_SUCH_OBJECT; + case LDAP_ALIAS_PROBLEM: return ERROR_DS_ALIAS_PROBLEM; + case LDAP_INVALID_DN_SYNTAX: return ERROR_DS_INVALID_DN_SYNTAX; + case LDAP_IS_LEAF: return ERROR_DS_IS_LEAF; + case LDAP_ALIAS_DEREF_PROBLEM: return ERROR_DS_ALIAS_DEREF_PROBLEM; + case LDAP_INAPPROPRIATE_AUTH: return ERROR_DS_INAPPROPRIATE_AUTH; + case LDAP_INVALID_CREDENTIALS: return ERROR_DS_SEC_DESC_INVALID; + case LDAP_INSUFFICIENT_RIGHTS: return ERROR_DS_INSUFF_ACCESS_RIGHTS; + case LDAP_BUSY: return ERROR_DS_BUSY; + case LDAP_UNAVAILABLE: return ERROR_DS_UNAVAILABLE; + case LDAP_UNWILLING_TO_PERFORM: return ERROR_DS_UNWILLING_TO_PERFORM; + case LDAP_LOOP_DETECT: return ERROR_DS_LOOP_DETECT; + case LDAP_SORT_CONTROL_MISSING: return ERROR_DS_SORT_CONTROL_MISSING; + case LDAP_OFFSET_RANGE_ERROR: return ERROR_DS_OFFSET_RANGE_ERROR; + case LDAP_NAMING_VIOLATION: return ERROR_DS_NAMING_VIOLATION; + case LDAP_OBJECT_CLASS_VIOLATION: return ERROR_DS_OBJ_CLASS_VIOLATION; + case LDAP_NOT_ALLOWED_ON_NONLEAF: return ERROR_DS_CANT_ON_NON_LEAF; + case LDAP_NOT_ALLOWED_ON_RDN: return ERROR_DS_CANT_ON_RDN; + case LDAP_ALREADY_EXISTS: return ERROR_ALREADY_EXISTS; + case LDAP_NO_OBJECT_CLASS_MODS: return ERROR_DS_CANT_MOD_OBJ_CLASS; + case LDAP_RESULTS_TOO_LARGE: return ERROR_DS_OBJECT_RESULTS_TOO_LARGE; + case LDAP_AFFECTS_MULTIPLE_DSAS: return ERROR_DS_AFFECTS_MULTIPLE_DSAS; + case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; + case LDAP_LOCAL_ERROR: return ERROR_DS_LOCAL_ERROR; + case LDAP_ENCODING_ERROR: return ERROR_DS_ENCODING_ERROR; + case LDAP_DECODING_ERROR: return ERROR_DS_DECODING_ERROR; + case LDAP_TIMEOUT: return ERROR_TIMEOUT; + case LDAP_AUTH_UNKNOWN: return ERROR_DS_AUTH_UNKNOWN; + case LDAP_FILTER_ERROR: return ERROR_DS_FILTER_UNKNOWN; + case LDAP_USER_CANCELLED: return ERROR_CANCELLED; + case LDAP_PARAM_ERROR: return ERROR_DS_PARAM_ERROR; + case LDAP_NO_MEMORY: return ERROR_NOT_ENOUGH_MEMORY; + case LDAP_CONNECT_ERROR: return ERROR_CONNECTION_UNAVAIL; + case LDAP_NOT_SUPPORTED: return ERROR_DS_NOT_SUPPORTED; + case LDAP_CONTROL_NOT_FOUND: return ERROR_DS_CONTROL_NOT_FOUND; + case LDAP_NO_RESULTS_RETURNED: return ERROR_DS_NO_RESULTS_RETURNED; + case LDAP_MORE_RESULTS_TO_RETURN: return ERROR_MORE_DATA; + case LDAP_CLIENT_LOOP: return ERROR_DS_CLIENT_LOOP; + case LDAP_REFERRAL_LIMIT_EXCEEDED: return ERROR_DS_REFERRAL_LIMIT_EXCEEDED; + default: return err; + } +} diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 0ecba26817..6f8c00aa89 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -40,6 +40,8 @@ static const struct { const WCHAR *path; HRESULT hr, hr_ads_open, hr_ads_get; + const WCHAR *user, *password; + LONG flags; } test[] = { { L"invalid", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, @@ -55,6 +57,9 @@ static const struct { L"LDAP://ldap.forumsys.com/rootDSE", S_OK }, { L"LDAP://ldap.forumsys.com/rootDSE/", E_ADS_BAD_PATHNAME }, { L"LDAP://ldap.forumsys.com/rootDSE/invalid", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, NULL, NULL, 0 }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, L"CN=read-only-admin,DC=example,DC=com", L"password", 0 }, + /*{ L"LDAP://invalid", __HRESULT_FROM_WIN32(ERROR_DS_INVALID_DN_SYNTAX) }, takes way too much time */ }; @@ -65,7 +70,8 @@ static void test_LDAP(void) IADs *ads; IADsOpenDSObject *ads_open; IDispatch *disp; - BSTR path; + BSTR path, user, password; + int i; hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); ok(hr == S_OK, "got %#x\n", hr); @@ -80,14 +86,25 @@ static void test_LDAP(void) hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); ok(hr == S_OK, "got %#x\n", hr); - IADsOpenDSObject_Release(ads_open); - path = SysAllocString(L"LDAP:"); - hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); - SysFreeString(path); - ok(hr == S_OK, "got %#x\n", hr); - IDispatch_Release(disp); + for (i = 0; i < ARRAY_SIZE(test); i++) + { + path = SysAllocString(test[i].path); + user = test[i].user ? SysAllocString(test[i].user) : NULL; + password = test[i].password ? SysAllocString(test[i].password) : NULL; + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, user, password, test[i].flags, &disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + + SysFreeString(path); + SysFreeString(user); + SysFreeString(password); + } + + + IADsOpenDSObject_Release(ads_open); IUnknown_Release(unk); } -- 2.20.1

1 0

[PATCH 1/4] adsldp: If secure open object fails fallback to simple bind.
by Dmitry Timoshkov 13 Mar '20

13 Mar '20

This matches ADsGetObject() behaviour described in MSDN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index acebf717aa..30bd1672f6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -111,6 +111,8 @@ static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx * if (hr != S_OK) return hr; hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + if (hr != S_OK) + hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, 0, &disp); if (hr == S_OK) { hr = CreatePointerMoniker((IUnknown *)disp, mk); -- 2.20.1

1 0

[PATCH 1/5] d3dcompiler/tests: Add some tests for uniform tables.
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 112 ++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 7f391833f39..0e50084fb91 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,6 +730,117 @@ static void test_array_dimensions(void) release_test_context(&test_context); } +static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect) +{ + ok(!strcmp(desc->Name, expect->Name), "%s: got Name %s.\n", prefix, debugstr_a(desc->Name)); + ok(desc->RegisterSet == expect->RegisterSet, "%s: got RegisterSet %#x.\n", prefix, desc->RegisterSet); + ok(desc->RegisterCount == expect->RegisterCount, "%s: got RegisterCount %u.\n", prefix, desc->RegisterCount); + ok(desc->Class == expect->Class, "%s: got Class %#x.\n", prefix, desc->Class); + ok(desc->Type == expect->Type, "%s: got Type %#x.\n", prefix, desc->Type); + ok(desc->Rows == expect->Rows, "%s: got Rows %u.\n", prefix, desc->Rows); + ok(desc->Columns == expect->Columns, "%s: got Columns %u.\n", prefix, desc->Columns); + ok(desc->Elements == expect->Elements, "%s: got Elements %u.\n", prefix, desc->Elements); + ok(desc->StructMembers == expect->StructMembers, "%s: got StructMembers %u.\n", prefix, desc->StructMembers); + ok(desc->Bytes == expect->Bytes, "%s: got Bytes %u.\n", prefix, desc->Bytes); + ok(!desc->DefaultValue, "%s: got DefaultValue %p.\n", prefix, desc->DefaultValue); +} + +static void test_constant_table(void) +{ + static const char *source = + "uniform float4 a;\n" + "uniform float b;\n" + "uniform float unused;\n" + "uniform float3x1 c;\n" + "uniform row_major float3x1 d;\n" + "uniform uint e;\n" + "uniform struct\n" + "{\n" + " float2x2 a;\n" + " float b;\n" + " float c;\n" + "} f;\n" + "uniform float g[5];\n" + "float4 main(uniform float4 h) : COLOR\n" + "{\n" + " return a + b + c._31 + d._31 + f.c + g[e] + h;\n" + "}"; + + D3DXCONSTANTTABLE_DESC table_desc; + ID3DXConstantTable *constants; + D3DXHANDLE handle, field; + D3DXCONSTANT_DESC desc; + ID3D10Blob *ps_code; + unsigned int i, j; + HRESULT hr; + UINT count; + + static const D3DXCONSTANT_DESC expect_constants[] = + { + {"$h", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"a", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, + {"f", D3DXRS_FLOAT4, 0, 4, D3DXPC_STRUCT, D3DXPT_VOID, 1, 6, 1, 3, 24}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + }; + + static const D3DXCONSTANT_DESC expect_fields[] = + { + {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + }; + + todo_wine ps_code = compile_shader(source, "ps_2_0"); + if (!ps_code) + return; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + + hr = ID3DXConstantTable_GetDesc(constants, &table_desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(table_desc.Constants == 8, "Got %u constants.\n", table_desc.Constants); + + for (i = 0; i < table_desc.Constants; ++i) + { + char prefix[30]; + + handle = ID3DXConstantTable_GetConstant(constants, NULL, i); + ok(!!handle, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u", i); + check_constant_desc(prefix, &desc, &expect_constants[i]); + + if (!strcmp(desc.Name, "f")) + { + for (j = 0; j < ARRAY_SIZE(expect_fields); ++j) + { + field = ID3DXConstantTable_GetConstant(constants, handle, j); + ok(!!field, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u, %u", i, j); + check_constant_desc(prefix, &desc, &expect_fields[j]); + } + } + } + + ID3DXConstantTable_Release(constants); + ID3D10Blob_Release(ps_code); +} + static void test_fail(void) { static const char *tests[] = @@ -874,5 +985,6 @@ START_TEST(hlsl_d3d9) test_comma(); test_return(); test_array_dimensions(); + test_constant_table(); test_fail(); } -- 2.25.1

2 9

[PATCH 1/7] quartz/tests: Add a test for aggregation on the seeking passthrough object.
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/passthrough.c | 133 ++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 dlls/quartz/tests/passthrough.c diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index fe1a45e8ec5..46b3728ab82 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ filtermapper.c \ memallocator.c \ mpegsplit.c \ + passthrough.c \ systemclock.c \ videorenderer.c \ vmr7.c \ diff --git a/dlls/quartz/tests/passthrough.c b/dlls/quartz/tests/passthrough.c new file mode 100644 index 00000000000..6042bc7f5ab --- /dev/null +++ b/dlls/quartz/tests/passthrough.c @@ -0,0 +1,133 @@ +/* + * Seeking passthrough unit tests + * + * Copyright 2020 Zebediah Figura 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_ISeekingPassThru) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + ISeekingPassThru *passthrough, *passthrough2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + passthrough = (ISeekingPassThru *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_SeekingPassThru, &test_outer, CLSCTX_INPROC_SERVER, + &IID_ISeekingPassThru, (void **)&passthrough); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!passthrough, "Got interface %p.\n", passthrough); + + hr = CoCreateInstance(&CLSID_SeekingPassThru, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_ISeekingPassThru, (void **)&passthrough); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ISeekingPassThru_QueryInterface(passthrough, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = ISeekingPassThru_QueryInterface(passthrough, &IID_ISeekingPassThru, (void **)&passthrough2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(passthrough2 == (ISeekingPassThru *)0xdeadbeef, "Got unexpected ISeekingPassThru %p.\n", passthrough2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = ISeekingPassThru_QueryInterface(passthrough, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + ISeekingPassThru_Release(passthrough); + ref = IUnknown_Release(unk); + todo_wine ok(!ref, "Got unexpected refcount %d.\n", ref); + todo_wine ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + +START_TEST(passthrough) +{ + CoInitialize(NULL); + + test_aggregation(); + + CoUninitialize(); +} -- 2.25.1

2 9

[PATCH] kernel32: Reimplement ReplaceFile() on top of MoveFileEx().
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Some manual testing (which I didn't think was interesting enough to add) shows that native does indeed move the target out of the way if it already exists. The temporary file name doesn't match the pattern used here, but this seemed easier. dlls/kernel32/file.c | 140 +++++++++++-------------------------------- 1 file changed, 35 insertions(+), 105 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b2979f96222..2a2ace5dd81 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -423,11 +423,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa LPVOID lpExclude, LPVOID lpReserved) { UNICODE_STRING nt_replaced_name, nt_replacement_name; - ANSI_STRING unix_replaced_name, unix_replacement_name, unix_backup_name; - HANDLE hReplaced = NULL, hReplacement = NULL, hBackup = NULL; - DWORD error = ERROR_SUCCESS; - UINT replaced_flags; - BOOL ret = FALSE; + HANDLE hReplacement = NULL; NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; @@ -447,10 +443,6 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa return FALSE; } - unix_replaced_name.Buffer = NULL; - unix_replacement_name.Buffer = NULL; - unix_backup_name.Buffer = NULL; - attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -461,39 +453,21 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa /* Open the "replaced" file for reading */ if (!(RtlDosPathNameToNtPathName_U(lpReplacedFileName, &nt_replaced_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replaced_name, &unix_replaced_name, replaced_flags, FALSE); - RtlFreeUnicodeString(&nt_replaced_name); - if (status != STATUS_SUCCESS) - { - if (status == STATUS_OBJECT_NAME_NOT_FOUND) - error = ERROR_FILE_NOT_FOUND; - else - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* Replacement should fail if replaced is READ_ONLY */ - status = NtQueryInformationFile(hReplaced, &io, &info, sizeof(info), FileBasicInformation); + status = NtQueryAttributesFile(&attr, &info); + RtlFreeUnicodeString(&nt_replaced_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); if (info.FileAttributes & FILE_ATTRIBUTE_READONLY) { - error = ERROR_ACCESS_DENIED; - goto fail; + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; } /* @@ -502,65 +476,41 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa */ if (!(RtlDosPathNameToNtPathName_U(lpReplacementFileName, &nt_replacement_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } attr.ObjectName = &nt_replacement_name; status = NtOpenFile(&hReplacement, GENERIC_READ|GENERIC_WRITE|DELETE|WRITE_DAC|SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replacement_name, &unix_replacement_name, FILE_OPEN, FALSE); RtlFreeUnicodeString(&nt_replacement_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); + NtClose( hReplacement ); /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { - UNICODE_STRING nt_backup_name; - FILE_BASIC_INFORMATION replaced_info; - - /* Obtain the file attributes from the "replaced" file */ - status = NtQueryInformationFile(hReplaced, &io, &replaced_info, - sizeof(replaced_info), - FileBasicInformation); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } - - if (!(RtlDosPathNameToNtPathName_U(lpBackupFileName, &nt_backup_name, NULL, NULL))) - { - error = ERROR_PATH_NOT_FOUND; - goto fail; - } - attr.ObjectName = &nt_backup_name; - /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, - &attr, &io, NULL, replaced_info.FileAttributes, - FILE_SHARE_WRITE, FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, - NULL, 0); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_backup_name, &unix_backup_name, FILE_OPEN_IF, FALSE); - RtlFreeUnicodeString(&nt_backup_name); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + if (!MoveFileExW( lpReplacedFileName, lpBackupFileName, MOVEFILE_REPLACE_EXISTING )) + return FALSE; + } + else + { + /* ReplaceFile() can replace an open target. To do this, we need to move + * it out of the way first. */ + static const WCHAR prefixW[] = {'r','f',0}; + WCHAR temp_path[MAX_PATH], temp_file[MAX_PATH]; + + if (!GetTempPathW( ARRAY_SIZE(temp_path), temp_path ) + || !GetTempFileNameW( temp_path, prefixW, 0, temp_file ) + || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING )) + return FALSE; - /* If an existing backup exists then copy over it */ - if (rename(unix_replaced_name.Buffer, unix_backup_name.Buffer) == -1) + if (!DeleteFileW( temp_file )) { - error = ERROR_UNABLE_TO_REMOVE_REPLACED; /* is this correct? */ - goto fail; + SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); + return FALSE; } } @@ -568,37 +518,17 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa * Now that the backup has been performed (if requested), copy the replacement * into place */ - if (rename(unix_replacement_name.Buffer, unix_replaced_name.Buffer) == -1) + if (!MoveFileExW( lpReplacementFileName, lpReplacedFileName, 0 )) { - if (errno == EACCES) - { - /* Inappropriate permissions on "replaced", rename will fail */ - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* on failure we need to indicate whether a backup was made */ if (!lpBackupFileName) - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); else - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT_2; - goto fail; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 ); + return FALSE; } - /* Success! */ - ret = TRUE; - - /* Perform resource cleanup */ -fail: - if (hBackup) CloseHandle(hBackup); - if (hReplaced) CloseHandle(hReplaced); - if (hReplacement) CloseHandle(hReplacement); - RtlFreeAnsiString(&unix_backup_name); - RtlFreeAnsiString(&unix_replacement_name); - RtlFreeAnsiString(&unix_replaced_name); - - /* If there was an error, set the error code */ - if(!ret) - SetLastError(error); - return ret; + + return TRUE; } -- 2.25.1

2 1

[PATCH] wineqtdecoder: Dont define CLSID_QTSplitter twice.
by Alistair Leslie-Hughes 13 Mar '20

13 Mar '20

../../../wine/dlls/wineqtdecoder/qtsplitter.c:130:14: error: redeclaration of 'CLSID_QTSplitter' with a different type: 'CLSID' (aka 'struct _GUID') vs 'const GUID' (aka 'const struct _GUID') extern CLSID CLSID_QTSplitter; ^ ./wineqtdecoder_classes.h:50:13: note: previous declaration is here Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 6973620809..f52971f3f7 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -127,7 +127,6 @@ #include "wineqtdecoder_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(qtsplitter); -extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { struct strmbase_source pin; -- 2.17.1

1 0

[PATCH] dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm.
by Nikolay Sivov 12 Mar '20

12 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a418081d49..de8ac2ea3c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -680,21 +680,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB22 */ case b_IN: - if (i > 0) - { - switch (break_class[i-1]) - { - case b_AL: - case b_HL: - case b_EX: - case b_ID: - case b_EB: - case b_EM: - case b_IN: - case b_NU: - set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - } - } + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; } -- 2.25.1

1 0

[PATCH v9 1/4] jscript: Get rid of the variable_obj parameter to exec_source.
by Gabriel Ivăncescu 12 Mar '20

12 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 39 +++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 6 ++---- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a627ea..a78a42b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2984,8 +2984,9 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *function_instance, jsdisp_t *variable_obj, unsigned argc, jsval_t *argv, jsval_t *r) + IDispatch *this_obj, jsdisp_t *function_instance, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *variable_obj; call_frame_t *frame; unsigned i; HRESULT hres; @@ -2997,6 +2998,18 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + if(ctx->call_ctx) + variable_obj = ctx->call_ctx->variable_obj; + else + variable_obj = ctx->global; + jsdisp_addref(variable_obj); + } + else { + hres = create_dispex(ctx, NULL, NULL, &variable_obj); + if(FAILED(hres)) return hres; + } + if(!ctx->ei->enter_notified) { ctx->ei->enter_notified = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); @@ -3010,12 +3023,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = bind_event_target(ctx, function->funcs+i, func_obj); jsdisp_release(func_obj); if(FAILED(hres)) - return hres; + goto fail; } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { @@ -3028,7 +3041,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -3037,7 +3050,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) - return hres; + goto fail; } } } @@ -3057,12 +3070,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(ctx->call_ctx && (flags & EXEC_EVAL)) { hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) - return hres; + goto fail; } frame = heap_alloc_zero(sizeof(*frame)); - if(!frame) - return E_OUTOFMEMORY; + if(!frame) { + hres = E_OUTOFMEMORY; + goto fail; + } frame->function = function; frame->ret = jsval_undefined(); @@ -3074,7 +3089,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(FAILED(hres)) { release_bytecode(frame->bytecode); heap_free(frame); - return hres; + goto fail; } }else if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -3091,7 +3106,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function_instance = jsdisp_addref(function_instance); frame->flags = flags; - frame->variable_obj = jsdisp_addref(variable_obj); + frame->variable_obj = variable_obj; frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; @@ -3107,4 +3122,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } return enter_bytecode(ctx, r); + +fail: + jsdisp_release(variable_obj); + return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fe6b2a0..2a8e405 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -281,7 +281,7 @@ typedef struct _call_frame_t { #define EXEC_EVAL 0x0008 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 007aec0..e1a8c29 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -722,7 +722,7 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun unsigned argc, jsval_t *argv, jsval_t *r) { InterpretedFunction *function = (InterpretedFunction*)func; - jsdisp_t *var_disp, *new_obj = NULL; + jsdisp_t *new_obj = NULL; DWORD exec_flags = 0; HRESULT hres; @@ -745,14 +745,12 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun if(flags & DISPATCH_CONSTRUCT) exec_flags |= EXEC_CONSTRUCTOR; - hres = create_dispex(ctx, NULL, NULL, &var_disp); if(SUCCEEDED(hres)) hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, - &function->function.dispex, var_disp, argc, argv, r); + &function->function.dispex, argc, argv, r); if(new_obj) jsdisp_release(new_obj); - jsdisp_release(var_disp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2a1dcb2..64b910f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -215,7 +215,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame ? frame->scope : NULL, - frame ? frame->this_obj : NULL, NULL, frame ? frame->variable_obj : ctx->global, 0, NULL, r); + frame ? frame->this_obj : NULL, NULL, 0, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index aabad7e..f54c34a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -408,7 +408,7 @@ static void exec_queued_code(JScript *This) LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); - hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, 0, NULL, NULL); leave_script(This->ctx, hres); if(FAILED(hres)) break; @@ -1053,7 +1053,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { jsval_t r; - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult); @@ -1072,7 +1072,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(!pvarResult && !is_started(This->ctx)) { list_add_tail(&This->queued_code, &code->entry); }else { - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, NULL); if(code->is_persistent) list_add_tail(&This->persistent_code, &code->entry); else -- 2.21.0

2 5

[PATCH 1/3] mfplat: Add MFGetStrideForBitmapInfoHeader().
by Nikolay Sivov 12 Mar '20

12 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 120 +++++++++++++++++++++++++++++-------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 73 +++++++++++++++++++++- include/mfapi.h | 1 + 4 files changed, 166 insertions(+), 30 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 8378e24196..c3e3133b8f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mfplat_private.h" +#include "d3d9types.h" #include "initguid.h" #include "ks.h" @@ -1763,6 +1764,8 @@ struct uncompressed_video_format { const GUID *subtype; unsigned int bytes_per_pixel; + unsigned int alignment; + BOOL bottom_up; }; static int __cdecl uncompressed_video_format_compare(const void *a, const void *b) @@ -1772,33 +1775,57 @@ static int __cdecl uncompressed_video_format_compare(const void *a, const void * return memcmp(guid, format->subtype, sizeof(*guid)); } -static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned int height, unsigned int *size) +static const struct uncompressed_video_format video_formats[] = +{ + { &MFVideoFormat_RGB24, 3, 3, 1 }, + { &MFVideoFormat_ARGB32, 4, 3, 1 }, + { &MFVideoFormat_RGB32, 4, 3, 1 }, + { &MFVideoFormat_RGB565, 2, 3, 1 }, + { &MFVideoFormat_RGB555, 2, 3, 1 }, + { &MFVideoFormat_A2R10G10B10, 4, 3, 1 }, + { &MFVideoFormat_RGB8, 1, 3, 1 }, + { &MFVideoFormat_L8, 1, 3, 1 }, + { &MFVideoFormat_NV12, 1, 0, 0 }, + { &MFVideoFormat_D16, 2, 3, 0 }, + { &MFVideoFormat_L16, 2, 3, 0 }, + { &MFVideoFormat_A16B16G16R16F, 8, 3, 1 }, +}; + +static struct uncompressed_video_format *mf_get_video_format(const GUID *subtype) +{ + return bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), + uncompressed_video_format_compare); +} + +static unsigned int mf_get_stride_for_format(const struct uncompressed_video_format *format, unsigned int width) +{ + return (width * format->bytes_per_pixel + format->alignment) & ~format->alignment; +} + +/*********************************************************************** + * MFGetStrideForBitmapInfoHeader (mfplat.@) + */ +HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *stride) { - static const struct uncompressed_video_format video_formats[] = - { - { &MFVideoFormat_RGB24, 3 }, - { &MFVideoFormat_ARGB32, 4 }, - { &MFVideoFormat_RGB32, 4 }, - { &MFVideoFormat_RGB565, 2 }, - { &MFVideoFormat_RGB555, 2 }, - { &MFVideoFormat_A2R10G10B10, 4 }, - { &MFVideoFormat_RGB8, 1 }, - { &MFVideoFormat_A16B16G16R16F, 8 }, - }; struct uncompressed_video_format *format; + GUID subtype; - format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), - uncompressed_video_format_compare); - if (format) - { - *size = ((width * format->bytes_per_pixel + 3) & ~3) * height; - } - else + TRACE("%#x, %u, %p.\n", fourcc, width, stride); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = fourcc; + + if (!(format = mf_get_video_format(&subtype))) { - *size = 0; + *stride = 0; + return MF_E_INVALIDMEDIATYPE; } - return format ? S_OK : E_INVALIDARG; + *stride = mf_get_stride_for_format(format, width); + if (format->bottom_up) + *stride *= -1; + + return S_OK; } /*********************************************************************** @@ -1806,24 +1833,65 @@ static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned i */ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) { + struct uncompressed_video_format *format; + unsigned int stride; + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); - return mf_get_image_size(subtype, width, height, size); + if (!(format = mf_get_video_format(subtype))) + { + *size = 0; + return E_INVALIDARG; + } + + switch (subtype->Data1) + { + case MAKEFOURCC('N','V','1','2'): + /* 2 x 2 block, interleaving UV for half the height */ + *size = ((width + 1) & ~1) * height * 3 / 2; + break; + case D3DFMT_L8: + case D3DFMT_L16: + case D3DFMT_D16: + *size = width * format->bytes_per_pixel * height; + break; + default: + stride = mf_get_stride_for_format(format, width); + *size = stride * height; + } + + return S_OK; } /*********************************************************************** * MFGetPlaneSize (mfplat.@) */ -HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size) +HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *size) { + struct uncompressed_video_format *format; + unsigned int stride; GUID subtype; - TRACE("%#x, %u, %u, %p.\n", format, width, height, size); + TRACE("%#x, %u, %u, %p.\n", fourcc, width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - subtype.Data1 = format; + subtype.Data1 = fourcc; + + if (!(format = mf_get_video_format(&subtype))) + return MF_E_INVALIDMEDIATYPE; + + stride = mf_get_stride_for_format(format, width); - return mf_get_image_size(&subtype, width, height, size); + switch (fourcc) + { + case MAKEFOURCC('N','V','1','2'): + *size = stride * height * 3 / 2; + break; + default: + *size = stride * height; + } + + return S_OK; } /*********************************************************************** diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1e11a1fc2a..338e8f8eff 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -101,7 +101,7 @@ @ stdcall MFGetPluginControl(ptr) @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName -@ stub MFGetStrideForBitmapInfoHeader +@ stdcall MFGetStrideForBitmapInfoHeader(long long ptr) @ stdcall MFGetSystemTime() @ stdcall MFGetTimerPeriodicity(ptr) @ stub MFGetUncompressedVideoFormat diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 97108e1478..0fd55c6fa1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -92,6 +92,7 @@ static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_typ static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height, DWORD *size); +static HRESULT (WINAPI *pMFGetStrideForBitmapInfoHeader)(DWORD format, DWORD width, LONG *stride); static const WCHAR fileschemeW[] = L"file://"; @@ -664,6 +665,7 @@ static void init_functions(void) X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); X(MFGetPlaneSize); + X(MFGetStrideForBitmapInfoHeader); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); @@ -3376,6 +3378,7 @@ static void test_MFCalculateImageSize(void) UINT32 width; UINT32 height; UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ } image_size_tests[] = { @@ -3395,6 +3398,13 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12, 12 }, }; unsigned int i; UINT32 size; @@ -3418,15 +3428,17 @@ static void test_MFCalculateImageSize(void) image_size_tests[i].height, &size); ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, - image_size_tests[i].size); + image_size_tests[i].size); if (pMFGetPlaneSize) { + unsigned int plane_size = image_size_tests[i].plane_size ? image_size_tests[i].plane_size : + image_size_tests[i].size; + hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); - ok(size == image_size_tests[i].size, "%u: unexpected plane size %u, expected %u.\n", i, size, - image_size_tests[i].size); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); } } } @@ -4473,6 +4485,60 @@ static void test_queue_com_state(const char *name) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_MFGetStrideForBitmapInfoHeader(void) +{ + static const struct stride_test + { + const GUID *subtype; + unsigned int width; + LONG stride; + } + stride_tests[] = + { + { &MFVideoFormat_RGB8, 3, -4 }, + { &MFVideoFormat_RGB8, 1, -4 }, + { &MFVideoFormat_RGB555, 3, -8 }, + { &MFVideoFormat_RGB555, 1, -4 }, + { &MFVideoFormat_RGB565, 3, -8 }, + { &MFVideoFormat_RGB565, 1, -4 }, + { &MFVideoFormat_RGB24, 3, -12 }, + { &MFVideoFormat_RGB24, 1, -4 }, + { &MFVideoFormat_RGB32, 3, -12 }, + { &MFVideoFormat_RGB32, 1, -4 }, + { &MFVideoFormat_ARGB32, 3, -12 }, + { &MFVideoFormat_ARGB32, 1, -4 }, + { &MFVideoFormat_A2R10G10B10, 3, -12 }, + { &MFVideoFormat_A2R10G10B10, 1, -4 }, + { &MFVideoFormat_A16B16G16R16F, 3, -24 }, + { &MFVideoFormat_A16B16G16R16F, 1, -8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 1 }, + { &MFVideoFormat_NV12, 2, 2 }, + { &MFVideoFormat_NV12, 3, 3 }, + }; + unsigned int i; + LONG stride; + HRESULT hr; + + if (!pMFGetStrideForBitmapInfoHeader) + { + win_skip("MFGetStrideForBitmapInfoHeader() is not available.\n"); + return; + } + + hr = pMFGetStrideForBitmapInfoHeader(MAKEFOURCC('H','2','6','4'), 1, &stride); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(stride_tests); ++i) + { + hr = pMFGetStrideForBitmapInfoHeader(stride_tests[i].subtype->Data1, stride_tests[i].width, &stride); + ok(hr == S_OK, "%u: failed to get stride, hr %#x.\n", i, hr); + ok(stride == stride_tests[i].stride, "%u: format %s, unexpected stride %d, expected %d.\n", i, + wine_dbgstr_an((char *)&stride_tests[i].subtype->Data1, 4), stride, stride_tests[i].stride); + } +} + START_TEST(mfplat) { char **argv; @@ -4524,6 +4590,7 @@ START_TEST(mfplat) test_MFCreateTransformActivate(); test_MFTRegisterLocal(); test_queue_com(); + test_MFGetStrideForBitmapInfoHeader(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 38577cfe62..1f01dbe0c8 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -421,6 +421,7 @@ void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllo void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size); +HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride); HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, -- 2.25.1

2 4

[PATCH 5/5] ucrtbase/tests: Directly use ucrtbase functions in scanf.c.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/scanf.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)

2 1

[PATCH 4/5] ucrtbase/tests: Directly use ucrtbase functions in printf.c.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 120 ++++++++++++----------------------- 1 file changed, 42 insertions(+), 78 deletions(-)

2 1

[PATCH 3/5] ucrtbase/tests: Directly use __stdio_common_* functions.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 37 +++++++----------------------------- 1 file changed, 7 insertions(+), 30 deletions(-)

2 1

[PATCH 2/5] ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-)

2 1

[PATCH 1/5] ucrtbase/tests: Link to ucrtbase.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Changes are needed because tests were previously using errno from msvcrt, which doesn't make much sense. testbot will fail to build this, because make clean in test directory is needed. dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/string.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)

2 1

[PATCH] user32: Always initialize module in load_desktop_driver.
by Jefferson Carpenter 12 Mar '20

12 Mar '20

Sets module in all code paths. Has the effect that module being initialized is a post-condition of load_desktop_driver. Will fix this bug: https://bugs.winehq.org/show_bug.cgi?id=48742 thanks, Jefferson Carpenter

1 1

[PATCH] dbghelp: Use Windows API to map ELF files.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 168 +++++++++++++++++++---------------- dlls/dbghelp/image_private.h | 2 +- 2 files changed, 94 insertions(+), 76 deletions(-)

1 0

[PATCH v2 5/5] advapi32/tests: Add more cases for CryptReleaseContext().
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 8d05396..5780f92 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -125,6 +125,56 @@ static void clean_up_environment(void) } } +static void test_CryptReleaseContext(void) +{ + BOOL ret; + HCRYPTPROV prov; + + /* TODO: Add cases for ERROR_BUSY, ERROR_INVALID_HANDLE and NTE_BAD_UID */ + + /* NULL provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + /* Additional refcount */ + + ret = CryptAcquireContextA(&prov, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptContextAddRef(prov, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + /* Nonzero flags, which allow release nonetheless */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == NTE_BAD_FLAGS, "got %u\n", GetLastError()); + + /* Obsolete provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); +} + static void test_acquire_context(void) { BOOL result; @@ -259,11 +309,6 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; - SetLastError(0xdeadbeef); - result = CryptReleaseContext(hProv, 0); - ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -1166,7 +1211,9 @@ START_TEST(crypt) init_function_pointers(); test_rc2_keylen(); + init_environment(); + test_CryptReleaseContext(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); -- 2.10.0.windows.1

1 0

[PATCH 2/5] advapi32: CRYPTPROV.refcount is a UINT, so >= 0, in CryptReleaseContext().
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9ede750..e94ee34 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -673,7 +673,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) } pProv->refcount--; - if (pProv->refcount <= 0) + if (pProv->refcount == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; -- 2.10.0.windows.1

2 2

[PATCH v2 4/5] advapi32/tests: Check all CryptReleaseContext() calls.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9dffc53..8d05396 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,25 +64,30 @@ static void init_function_pointers(void) static void init_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Ensure that container "wine_test_keyset" does exist */ if (!CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ if (!CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_bad_keyset" does not exist. */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -90,25 +95,32 @@ static void init_environment(void) static void clean_up_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Remove container "wine_test_keyset" */ if (CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ if (CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_bad_keyset" */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -159,8 +171,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GLE); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } /* Try again, witch an empty ("\0") szProvider parameter */ hProv = 0; @@ -173,8 +188,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GetLastError()); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } } static void test_incorrect_api_usage(void) @@ -238,11 +256,13 @@ static void test_incorrect_api_usage(void) if (!result) return; result = CryptReleaseContext(hProv, 0); - ok (result, "%d\n", GetLastError()); + ok(result, "got %u\n", GetLastError()); if (!result) return; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 0); - ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -426,7 +446,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); CryptDestroyKey(key); CryptDestroyHash(hash); - CryptReleaseContext(prov, 0); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); } static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, @@ -938,7 +960,8 @@ static void test_machine_guid(void) ret = CryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), "CryptAcquireContextA failed: %08x\n", GetLastError()); - CryptReleaseContext(hCryptProv, 0); + ret = CryptReleaseContext(hCryptProv, 0); + ok(ret, "got %u\n", GetLastError()); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, @@ -986,10 +1009,11 @@ static void test_rc2_keylen(void) ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); - if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -1033,7 +1057,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } key_blob.key_size = sizeof(key); @@ -1068,7 +1093,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } } -- 2.10.0.windows.1

1 0

[PATCH v2 3/5] advapi32: Fix CryptReleaseContext() LastError on NULL provider.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 5aecf01..de8cdac 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -662,7 +662,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -- 2.10.0.windows.1

1 0

[PATCH v2 2/5] advapi32: Let CRYPTPROV.refcount be LONG and atomic.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 5 ++--- dlls/advapi32/crypt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9ede750..5aecf01 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -636,7 +636,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -672,8 +672,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index afee3e2..32e8d2b 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -63,7 +63,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ -- 2.10.0.windows.1

1 0

[PATCH 5/5] advapi32/tests: Add more cases for CryptReleaseContext().
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 8d05396..5780f92 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -125,6 +125,56 @@ static void clean_up_environment(void) } } +static void test_CryptReleaseContext(void) +{ + BOOL ret; + HCRYPTPROV prov; + + /* TODO: Add cases for ERROR_BUSY, ERROR_INVALID_HANDLE and NTE_BAD_UID */ + + /* NULL provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + /* Additional refcount */ + + ret = CryptAcquireContextA(&prov, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptContextAddRef(prov, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + /* Nonzero flags, which allow release nonetheless */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == NTE_BAD_FLAGS, "got %u\n", GetLastError()); + + /* Obsolete provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); +} + static void test_acquire_context(void) { BOOL result; @@ -259,11 +309,6 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; - SetLastError(0xdeadbeef); - result = CryptReleaseContext(hProv, 0); - ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -1166,7 +1211,9 @@ START_TEST(crypt) init_function_pointers(); test_rc2_keylen(); + init_environment(); + test_CryptReleaseContext(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); -- 2.10.0.windows.1

1 0

[PATCH 4/5] advapi32/tests: Check all CryptReleaseContext() calls.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9dffc53..8d05396 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,25 +64,30 @@ static void init_function_pointers(void) static void init_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Ensure that container "wine_test_keyset" does exist */ if (!CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ if (!CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_bad_keyset" does not exist. */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -90,25 +95,32 @@ static void init_environment(void) static void clean_up_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Remove container "wine_test_keyset" */ if (CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ if (CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_bad_keyset" */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -159,8 +171,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GLE); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } /* Try again, witch an empty ("\0") szProvider parameter */ hProv = 0; @@ -173,8 +188,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GetLastError()); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } } static void test_incorrect_api_usage(void) @@ -238,11 +256,13 @@ static void test_incorrect_api_usage(void) if (!result) return; result = CryptReleaseContext(hProv, 0); - ok (result, "%d\n", GetLastError()); + ok(result, "got %u\n", GetLastError()); if (!result) return; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 0); - ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -426,7 +446,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); CryptDestroyKey(key); CryptDestroyHash(hash); - CryptReleaseContext(prov, 0); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); } static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, @@ -938,7 +960,8 @@ static void test_machine_guid(void) ret = CryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), "CryptAcquireContextA failed: %08x\n", GetLastError()); - CryptReleaseContext(hCryptProv, 0); + ret = CryptReleaseContext(hCryptProv, 0); + ok(ret, "got %u\n", GetLastError()); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, @@ -986,10 +1009,11 @@ static void test_rc2_keylen(void) ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); - if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -1033,7 +1057,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } key_blob.key_size = sizeof(key); @@ -1068,7 +1093,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } } -- 2.10.0.windows.1

1 0

[PATCH 3/5] advapi32: Fix CryptReleaseContext() LastError on NULL provider.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 5aecf01..de8cdac 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -662,7 +662,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -- 2.10.0.windows.1

1 0

[PATCH 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..9ede750 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

1 0

[PATCH v2 1/3] adsldp: Bind to an LDAP server after connection.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

v2: Fix test failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 20 ++++++++++++++++++-- dlls/adsldp/tests/ldap.c | 31 ++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index acebf717aa..a27251bcf4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -698,7 +698,7 @@ static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) } static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, - LONG reserved, IDispatch **obj) + LONG flags, IDispatch **obj) { BSTR host, object; ULONG port; @@ -707,7 +707,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr; @@ -770,6 +770,22 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B ldap_unbind(ld); goto fail; } + + if (flags & ADS_SECURE_AUTHENTICATION) + { + FIXME("ADS_SECURE_AUTHENTICATION is not supported\n"); + } + else + { + err = ldap_simple_bind_sW(ld, user, password); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_simple_bind_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + } } hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 0ecba26817..6f8c00aa89 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -40,6 +40,8 @@ static const struct { const WCHAR *path; HRESULT hr, hr_ads_open, hr_ads_get; + const WCHAR *user, *password; + LONG flags; } test[] = { { L"invalid", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, @@ -55,6 +57,9 @@ static const struct { L"LDAP://ldap.forumsys.com/rootDSE", S_OK }, { L"LDAP://ldap.forumsys.com/rootDSE/", E_ADS_BAD_PATHNAME }, { L"LDAP://ldap.forumsys.com/rootDSE/invalid", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, NULL, NULL, 0 }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, L"CN=read-only-admin,DC=example,DC=com", L"password", 0 }, + /*{ L"LDAP://invalid", __HRESULT_FROM_WIN32(ERROR_DS_INVALID_DN_SYNTAX) }, takes way too much time */ }; @@ -65,7 +70,8 @@ static void test_LDAP(void) IADs *ads; IADsOpenDSObject *ads_open; IDispatch *disp; - BSTR path; + BSTR path, user, password; + int i; hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); ok(hr == S_OK, "got %#x\n", hr); @@ -80,14 +86,25 @@ static void test_LDAP(void) hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); ok(hr == S_OK, "got %#x\n", hr); - IADsOpenDSObject_Release(ads_open); - path = SysAllocString(L"LDAP:"); - hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); - SysFreeString(path); - ok(hr == S_OK, "got %#x\n", hr); - IDispatch_Release(disp); + for (i = 0; i < ARRAY_SIZE(test); i++) + { + path = SysAllocString(test[i].path); + user = test[i].user ? SysAllocString(test[i].user) : NULL; + password = test[i].password ? SysAllocString(test[i].password) : NULL; + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, user, password, test[i].flags, &disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + + SysFreeString(path); + SysFreeString(user); + SysFreeString(password); + } + + + IADsOpenDSObject_Release(ads_open); IUnknown_Release(unk); } -- 2.20.1

2 1

[PATCH 3/3] activeds: Implement ADsGetObject.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 5 ++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..b5b082073e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + return ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); } /***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e0e562e8bf..28e41e4d95 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads); + hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

1 0

[PATCH 2/3] activeds: ADsOpenObject should return E_FAIL by default.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 6f8c00aa89..e0e562e8bf 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

1 0

[PATCH resend] server: Try to retrieve the unix name on handles created from file descriptors.
by Gabriel Ivăncescu 12 Mar '20

12 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46070 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It also fixes the game Unity of Command II (same bug). server/fd.c | 39 +++++++++++++++++++++++++++++++++++++++ server/file.c | 1 + server/file.h | 2 ++ 3 files changed, 42 insertions(+) diff --git a/server/fd.c b/server/fd.c index 5d80e21..2530287 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1922,6 +1922,45 @@ struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, s return NULL; } +void set_unix_name_of_fd( struct fd *fd, const struct stat *fd_st ) +{ +#ifdef __linux__ + static const char procfs_fmt[] = "/proc/self/fd/%d"; + + char path[PATH_MAX], procfs_path[sizeof(procfs_fmt) - 2 /* %d */ + 11]; + struct stat path_st; + ssize_t len; + + sprintf( procfs_path, procfs_fmt, fd->unix_fd ); + len = readlink( procfs_path, path, sizeof(path) ); + if (len == -1 || len >= sizeof(path) ) + return; + path[len] = '\0'; + + /* Make sure it's an absolute path, has at least one hardlink, and the same inode */ + if (path[0] != '/' || stat( path, &path_st ) || path_st.st_nlink < 1 || + path_st.st_dev != fd_st->st_dev || path_st.st_ino != fd_st->st_ino) + return; + + if (!(fd->unix_name = mem_alloc( len + 1 ))) + return; + memcpy( fd->unix_name, path, len + 1 ); + +#elif defined(F_GETPATH) + char path[PATH_MAX]; + size_t size; + + if (fcntl( fd->unix_fd, F_GETPATH, path ) == -1 || path[0] != '/') + return; + + size = strlen(path) + 1; + if (!(fd->unix_name = mem_alloc( size ))) + return; + memcpy( fd->unix_name, path, size ); + +#endif +} + /* retrieve the object that is using an fd */ void *get_fd_user( struct fd *fd ) { diff --git a/server/file.c b/server/file.c index 71b8448..1db6c7c 100644 --- a/server/file.c +++ b/server/file.c @@ -145,6 +145,7 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari release_object( file ); return NULL; } + set_unix_name_of_fd( file->fd, &st ); allow_fd_caching( file->fd ); return file; } diff --git a/server/file.h b/server/file.h index 4341ad3..5c6054b 100644 --- a/server/file.h +++ b/server/file.h @@ -22,6 +22,7 @@ #define __WINE_SERVER_FILE_H #include <sys/types.h> +#include <sys/stat.h> #include "object.h" @@ -82,6 +83,7 @@ extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t unsigned int access, unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user, unsigned int options ); +extern void set_unix_name_of_fd( struct fd *fd, const struct stat *fd_st ); extern struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, unsigned int options ); extern struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsigned int sharing ); -- 2.21.0

1 0

[PATCH v8 1/3] jscript: Lookup and ref the named item's dispatch first, during interpretion.
by Gabriel Ivăncescu 12 Mar '20

12 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b96895..044e32c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -669,6 +669,15 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } } + + if(ctx->call_ctx->bytecode->named_item) { + jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + hres = jsdisp_get_id(script_obj, identifier, 0, &id); + if(SUCCEEDED(hres)) { + exprval_set_disp_ref(ret, to_disp(script_obj), id); + return S_OK; + } + } } hres = jsdisp_get_id(ctx->global, identifier, 0, &id); @@ -1254,13 +1263,17 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return hres; if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + jsdisp_t *script_obj = ctx->global; DISPID id; - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(ctx->call_ctx->bytecode->named_item) + script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + + hres = jsdisp_get_id(script_obj, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { @@ -2995,6 +3008,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_named_item_script_obj(ctx, bytecode->named_item); if(FAILED(hres)) return hres; } + if(variable_obj == ctx->global) + variable_obj = bytecode->named_item->script_obj; } if(!ctx->ei->enter_notified) { -- 2.21.0

2 6

[PATCH 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..9ede750 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

1 1

[PATCH 1/6] d3d10: Implement scalar effect variable set methods.
by Matteo Bruni 12 Mar '20

12 Mar '20

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d10/effect.c | 190 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 178 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ee9bf7a35c..a760999a2f0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4212,8 +4212,155 @@ static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_ d3d10_effect_constant_buffer_GetTextureBuffer, }; + +static BOOL get_value_as_bool(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) +{ + switch (src_type) + { + case D3D10_SVT_FLOAT: + case D3D10_SVT_INT: + case D3D10_SVT_BOOL: + if (*(DWORD *)src_data) + return -1; + break; + + default: + break; + } + + return 0; +} + +static int get_value_as_int(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) +{ + switch (src_type) + { + case D3D10_SVT_FLOAT: + return (int)(*(float *)src_data); + + case D3D10_SVT_INT: + return *(int *)src_data; + + case D3D10_SVT_BOOL: + return get_value_as_bool(src_data, src_type); + + default: + return 0; + } +} + +static float get_value_as_float(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) +{ + switch (src_type) + { + case D3D10_SVT_FLOAT: + return *(float *)src_data; + + case D3D10_SVT_INT: + return (float)(*(int *)src_data); + + case D3D10_SVT_BOOL: + return (float)get_value_as_bool(src_data, src_type); + + default: + return 0.0f; + } +} + +static void get_vector_as_type(BYTE *dst_data, D3D_SHADER_VARIABLE_TYPE dst_type, + BYTE *src_data, D3D_SHADER_VARIABLE_TYPE src_type, unsigned int count) +{ + DWORD *src_data_dword = (DWORD *)src_data; + DWORD *dst_data_dword = (DWORD *)dst_data; + unsigned int i; + + for (i = 0; i < count; ++i, ++dst_data_dword, ++src_data_dword) + { + if (dst_type == src_type) + *dst_data_dword = *src_data_dword; + else + { + switch (dst_type) + { + case D3D10_SVT_FLOAT: + *(float *)dst_data_dword = get_value_as_float(src_data_dword, src_type); + break; + + case D3D10_SVT_INT: + *(int *)dst_data_dword = get_value_as_int(src_data_dword, src_type); + break; + + case D3D10_SVT_BOOL: + *(BOOL *)dst_data_dword = get_value_as_bool(src_data_dword, src_type); + break; + + default: + *dst_data_dword = 0; + break; + } + } + } +} + +static void write_variable_to_buffer(struct d3d10_effect_variable *variable, void *src, + D3D_SHADER_VARIABLE_TYPE src_type) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + D3D_SHADER_VARIABLE_TYPE dst_type = variable->type->basetype; + + get_vector_as_type(dst, dst_type, src, src_type, variable->type->column_count); + + variable->buffer->u.buffer.changed = TRUE; +} + +static void write_variable_array_to_buffer(struct d3d10_effect_variable *variable, void *src, + D3D_SHADER_VARIABLE_TYPE src_type, unsigned int offset, unsigned int count) +{ + BYTE *dst = variable->buffer->u.buffer.local_buffer + variable->buffer_offset; + D3D_SHADER_VARIABLE_TYPE dst_type = variable->type->basetype; + unsigned int element_size, i; + BYTE *cur_element = src; + + if (!variable->type->element_count) + { + write_variable_to_buffer(variable, src, src_type); + return; + } + + if (offset >= variable->type->element_count) + { + WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + return; + } + + if (count > variable->type->element_count - offset) + { + WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + offset, count, variable->type->element_count); + count = variable->type->element_count - offset; + } + + element_size = variable->type->elementtype->size_packed; + dst += variable->type->stride * offset; + + for (i = 0; i < count; ++i) + { + get_vector_as_type(dst, dst_type, cur_element, src_type, variable->type->column_count); + + cur_element += element_size; + dst += variable->type->stride; + } + + variable->buffer->u.buffer.changed = TRUE; +} + /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface) { TRACE("iface %p\n", iface); @@ -4370,9 +4517,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloat(ID3D10EffectScalarVariable *iface, float value) { - FIXME("iface %p, value %.8e stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %.8e.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_FLOAT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface, @@ -4383,12 +4533,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10Eff return E_NOTIMPL; } +/* Tests show that offset is ignored for scalar variables. */ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloatArray(ID3D10EffectScalarVariable *iface, float *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_FLOAT, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D10EffectScalarVariable *iface, @@ -4402,9 +4556,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, int value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %d.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_INT); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface, @@ -4418,9 +4575,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10Effec static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, int *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_INT, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10EffectScalarVariable *iface, @@ -4434,9 +4594,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, BOOL value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, value %d.\n", iface, value); + write_variable_to_buffer(effect_var, &value, D3D10_SVT_BOOL); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface, @@ -4450,9 +4613,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10Effe static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, BOOL *values, UINT offset, UINT count) { - FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, count); + struct d3d10_effect_variable *effect_var = impl_from_ID3D10EffectScalarVariable(iface); - return E_NOTIMPL; + TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, count); + write_variable_array_to_buffer(effect_var, values, D3D10_SVT_BOOL, 0, count); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBoolArray(ID3D10EffectScalarVariable *iface, -- 2.24.1

1 5

[PATCH 3/3] activeds: Implement ADsGetObject.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 5 ++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..b5b082073e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + return ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); } /***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index d703874956..a5f1bff432 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads); + hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

2 1

[PATCH 2/3] activeds: ADsOpenObject should return E_FAIL by default.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index f31bfb7a36..d703874956 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password); -- 2.20.1

2 1

[PATCH 1/3] adsldp: Bind to an LDAP server after connection.
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 20 ++++++++++++++++++-- dlls/adsldp/tests/ldap.c | 31 ++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index acebf717aa..8e5c5c479b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -698,7 +698,7 @@ static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) } static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, - LONG reserved, IDispatch **obj) + LONG flags, IDispatch **obj) { BSTR host, object; ULONG port; @@ -707,7 +707,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr; @@ -770,6 +770,22 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B ldap_unbind(ld); goto fail; } + + if ((flags & ADS_SECURE_AUTHENTICATION) && user && password) + { + FIXME("ADS_SECURE_AUTHENTICATION is not supported\n"); + } + else + { + err = ldap_simple_bind_sW(ld, user, password); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_simple_bind_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + } } hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 0ecba26817..f31bfb7a36 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -40,6 +40,8 @@ static const struct { const WCHAR *path; HRESULT hr, hr_ads_open, hr_ads_get; + const WCHAR *user, *password; + LONG flags; } test[] = { { L"invalid", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, @@ -55,6 +57,9 @@ static const struct { L"LDAP://ldap.forumsys.com/rootDSE", S_OK }, { L"LDAP://ldap.forumsys.com/rootDSE/", E_ADS_BAD_PATHNAME }, { L"LDAP://ldap.forumsys.com/rootDSE/invalid", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, NULL, NULL, ADS_SECURE_AUTHENTICATION }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK, S_OK, S_OK, L"CN=read-only-admin,DC=example,DC=com", L"password", 0 }, + /*{ L"LDAP://invalid", __HRESULT_FROM_WIN32(ERROR_DS_INVALID_DN_SYNTAX) }, takes way too much time */ }; @@ -65,7 +70,8 @@ static void test_LDAP(void) IADs *ads; IADsOpenDSObject *ads_open; IDispatch *disp; - BSTR path; + BSTR path, user, password; + int i; hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); ok(hr == S_OK, "got %#x\n", hr); @@ -80,14 +86,25 @@ static void test_LDAP(void) hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); ok(hr == S_OK, "got %#x\n", hr); - IADsOpenDSObject_Release(ads_open); - path = SysAllocString(L"LDAP:"); - hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); - SysFreeString(path); - ok(hr == S_OK, "got %#x\n", hr); - IDispatch_Release(disp); + for (i = 0; i < ARRAY_SIZE(test); i++) + { + path = SysAllocString(test[i].path); + user = test[i].user ? SysAllocString(test[i].user) : NULL; + password = test[i].password ? SysAllocString(test[i].password) : NULL; + hr = IADsOpenDSObject_OpenDSObject(ads_open, path, user, password, test[i].flags, &disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + + SysFreeString(path); + SysFreeString(user); + SysFreeString(password); + } + + + IADsOpenDSObject_Release(ads_open); IUnknown_Release(unk); } -- 2.20.1

2 1

[PATCH] wininet: Add stub for INTERNET_OPTION_IGNORE_OFFLINE.
by Roman Pišl 12 Mar '20

12 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48739 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/wininet/internet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aaa8b2a569..cdafbfa139 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2955,6 +2955,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; + case INTERNET_OPTION_IGNORE_OFFLINE: + FIXME("Option INTERNET_OPTION_IGNORE_OFFLINE: STUB\n"); + break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: case INTERNET_OPTION_DATA_SEND_TIMEOUT: -- 2.20.1

1 0

[PATCH] wldap32: Add support for ldap_bind_s(LDAP_AUTH_NEGOTIATE).
by Dmitry Timoshkov 12 Mar '20

12 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wldap32/bind.c | 121 +++++++++++++++++++++++++++++---- dlls/wldap32/winldap_private.h | 2 + dlls/wldap32/wldap32.h | 16 +++++ include/config.h.in | 3 + 5 files changed, 128 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 7c3c6d2b67..7c2d803ef5 100644 --- a/configure.ac +++ b/configure.ac @@ -483,6 +483,7 @@ AC_CHECK_HEADERS(\ port.h \ pthread.h \ pwd.h \ + sasl/sasl.h \ sched.h \ scsi/scsi.h \ scsi/scsi_ioctl.h \ diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 27fb286f50..76d76323b2 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -25,10 +25,14 @@ #ifdef HAVE_LDAP_H #include <ldap.h> #endif +#ifdef HAVE_SASL_SASL_H +#include <sasl/sasl.h> +#endif #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "rpc.h" #include "winldap_private.h" #include "wldap32.h" @@ -156,20 +160,68 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) if (!dnW) goto exit; } if (cred) { - credW = strAtoW( cred ); - if (!credW) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + else + credW = (WCHAR *)cred /* SEC_WINNT_AUTH_IDENTITY_A */; } ret = ldap_bind_sW( ld, dnW, credW, method ); exit: strfreeW( dnW ); - strfreeW( credW ); + if (credW != (WCHAR *)cred) strfreeW( credW ); #endif return ret; } +#ifdef HAVE_SASL_SASL_H + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id = defaults; + sasl_interact_t *sasl = interact; + + TRACE( "%p,%08x,%p,%p\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->Domain; + sasl->len = id->DomainLength; + } + else if (sasl->id == SASL_CB_AUTHNAME) + { + sasl->result = id->User; + sasl->len = id->UserLength; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->Password; + sasl->len = id->PasswordLength; + } + + sasl++; + } + + return LDAP_SUCCESS; +} + +#else + +static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) +{ + FIXME( "%p,%08x,%p,%p: stub\n", ld, flags, defaults, interact ); + return LDAP_SUCCESS; +} + +#endif /* HAVE_SASL_SASL_H */ + /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * @@ -197,21 +249,60 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; - if (dn) { - dnU = strWtoU( dn ); - if (!dnU) goto exit; + if (method == LDAP_AUTH_SIMPLE) + { + if (dn) + { + dnU = strWtoU( dn ); + if (!dnU) goto exit; + } + if (cred) + { + credU = strWtoU( cred ); + if (!credU) goto exit; + + pwd.bv_len = strlen( credU ); + pwd.bv_val = credU; + } + + ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); } - if (cred) { - credU = strWtoU( cred ); - if (!credU) goto exit; - - pwd.bv_len = strlen( credU ); - pwd.bv_val = credU; + else if (method == WLDAP32_LDAP_AUTH_NEGOTIATE) + { + SEC_WINNT_AUTH_IDENTITY_A idU; + + memset( &idU, 0, sizeof(idU) ); + + if (cred) + { + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)cred; + + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + FIXME( "ANSI credentials not supported\n" ); + return WLDAP32_LDAP_PARAM_ERROR; + } + + idU.Domain = (unsigned char *)strnWtoU( id->Domain, id->DomainLength, &idU.DomainLength ); + idU.User = (unsigned char *)strnWtoU( id->User, id->UserLength, &idU.UserLength ); + idU.Password = (unsigned char *)strnWtoU( id->Password, id->PasswordLength, &idU.PasswordLength ); + } + + ret = map_error( ldap_sasl_interactive_bind_s( ld, + NULL /* server will ignore DN anyway */, + NULL /* query supportedSASLMechanisms */, + NULL, NULL, LDAP_SASL_QUIET, sasl_interact, &idU )); + + strfreeU( (char *)idU.Domain ); + strfreeU( (char *)idU.User ); + strfreeU( (char *)idU.Password ); + } + else + { + FIXME( "method %#x not supported\n", method ); + return WLDAP32_LDAP_PARAM_ERROR; } - - ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL )); exit: strfreeU( dnU ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 74223029b7..df257dafec 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -101,6 +101,8 @@ typedef struct berelement #define WLDAP32_LDAP_OPT_SECURITY_CONTEXT 0x99 #define WLDAP32_LDAP_OPT_ROOTDSE_CACHE 0x9a +#define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 + typedef struct ldap { struct diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 1d4052002a..080765896c 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -93,6 +93,22 @@ static inline LPWSTR strUtoW( char *str ) return ret; } +static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) +{ + LPSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( len ))) + { + WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + *outlen = len; + } + } + return ret; +} + static inline void strfreeA( LPSTR str ) { heap_free( str ); diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..e48e398ca8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -776,6 +776,9 @@ /* Define to 1 if you have the `roundf' function. */ #undef HAVE_ROUNDF +/* Define to 1 if you have the <sasl/sasl.h> header file. */ +#undef HAVE_SASL_SASL_H + /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -- 2.20.1

1 0

[PATCH] d2d1: Support GUID_WICPixelFormat32bppPRGBA.
by Zebediah Figura 12 Mar '20

12 Mar '20

Needed by Visio 2016. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 2 ++ dlls/d2d1/tests/d2d1.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index bc958e50a11..7ed57052b98 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -527,6 +527,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW format_lookup[] = { {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, }; @@ -579,6 +580,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW switch (bitmap_desc.pixelFormat.format) { case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R8G8B8A8_UNORM: bpp = 4; break; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0ed51c7f805..5a648b27f03 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8271,6 +8271,77 @@ static void test_dpi(void) DestroyWindow(window); } +static void test_wic_bitmap_format(void) +{ + IWICImagingFactory *wic_factory; + IDXGISwapChain *swapchain; + D2D1_PIXEL_FORMAT format; + IWICBitmap *wic_bitmap; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Bitmap *bitmap; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + const WICPixelFormatGUID *wic; + D2D1_PIXEL_FORMAT d2d; + } + tests[] = + { + {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(hr == S_OK, "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(hr == S_OK, "Failed to create WIC imaging factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + tests[i].wic, WICBitmapCacheOnDemand, &wic_bitmap); + ok(hr == S_OK, "%s: Failed to create WIC bitmap, hr %#x.\n", debugstr_guid(tests[i].wic), hr); + + hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap); + ok(hr == S_OK, "%s: Failed to create bitmap from WIC source, hr %#x.\n", debugstr_guid(tests[i].wic), hr); + + format = ID2D1Bitmap_GetPixelFormat(bitmap); + ok(format.format == tests[i].d2d.format, "%s: Got unexpected DXGI format %#x.\n", + debugstr_guid(tests[i].wic), format.format); + ok(format.alphaMode == tests[i].d2d.alphaMode, "%s: Got unexpected alpha mode %#x.\n", + debugstr_guid(tests[i].wic), format.alphaMode); + + ID2D1Bitmap_Release(bitmap); + IWICBitmap_Release(wic_bitmap); + } + + IWICImagingFactory_Release(wic_factory); + CoUninitialize(); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -8319,6 +8390,7 @@ START_TEST(d2d1) queue_test(test_command_list); queue_test(test_max_bitmap_size); queue_test(test_dpi); + queue_test(test_wic_bitmap_format); run_queued_tests(); } -- 2.25.1

2 1

[PATCH 1/5] wined3d: Move the destination blend state to wined3d_blend_state.
by Zebediah Figura 12 Mar '20

12 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 1 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 7 ++----- include/wine/wined3d.h | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e09527d5a7..2a764897a9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -740,7 +740,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, d->DestBlend); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1cc579c86a..4d5bd8d94e 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -391,6 +391,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.alpha_to_coverage = desc->AlphaToCoverageEnable; wined3d_desc.enable = desc->RenderTarget[0].BlendEnable; wined3d_desc.src = desc->RenderTarget[0].SrcBlend; + wined3d_desc.dst = desc->RenderTarget[0].DestBlend; /* We cannot fail after creating a wined3d_blend_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54efdb05a7..d7175284cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3583,6 +3583,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_BLENDFACTOR: case WINED3D_RS_ALPHABLENDENABLE: case WINED3D_RS_SRCBLEND: + case WINED3D_RS_DESTBLEND: set_blend_state = TRUE; break; @@ -3655,6 +3656,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.alpha_to_coverage = TRUE; desc.enable = state->rs[WINED3D_RS_ALPHABLENDENABLE]; desc.src = state->rs[WINED3D_RS_SRCBLEND]; + desc.dst = state->rs[WINED3D_RS_DESTBLEND]; if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index aa85193bdd..8de2945bf5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -557,8 +557,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st gl_info->gl_ops.gl.p_glEnable(GL_BLEND); checkGLcall("glEnable(GL_BLEND)"); - gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, - state->render_states[WINED3D_RS_DESTBLEND], rt_format); + gl_blend_from_d3d(&src_blend, &dst_blend, b->desc.src, b->desc.dst, rt_format); /* Re-apply BLENDOP(ALPHA) because of a possible SEPARATEALPHABLENDENABLE change */ if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_BLENDOP))) @@ -4503,7 +4502,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_DESTBLEND), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SEPARATEALPHABLENDENABLE), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLENDALPHA), { STATE_BLEND, NULL }, WINED3D_GL_EXT_NONE }, @@ -5417,8 +5415,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 1, 1}, { 3, 3}, { 8, 8}, - { 17, 19}, - { 21, 22}, + { 17, 22}, { 27, 27}, { 42, 45}, { 47, 47}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 923f184d96..4473da13dd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2031,6 +2031,7 @@ struct wined3d_blend_state_desc BOOL alpha_to_coverage; BOOL enable; enum wined3d_blend src; + enum wined3d_blend dst; }; struct wined3d_rasterizer_state_desc -- 2.25.1

3 11

[PATCH 3/3] wined3d: Use EXT_framebuffer_multisample_blit_scaled for scaled resolves.
by Henri Verbeet 12 Mar '20

12 Mar '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 3 +++ dlls/wined3d/surface.c | 16 ++++++++++++---- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3ad64754ec6..c04656173da 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -179,6 +179,8 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_fog_coord", EXT_FOG_COORD }, {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, + {"GL_EXT_framebuffer_multisample_blit_scaled", + EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED}, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, {"GL_EXT_memory_object", EXT_MEMORY_OBJECT }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, @@ -5157,6 +5159,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); + d3d_info->scaled_resolve = !!gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED]; d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c687e639462..b7dd54cb61f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -150,6 +150,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; unsigned int restore_idx; + BOOL scaled_resolve; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -160,10 +161,14 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); + scaled_resolve = wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) + && (abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) + || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left)); + switch (filter) { case WINED3D_TEXF_LINEAR: - gl_filter = GL_LINEAR; + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_NICEST_EXT : GL_LINEAR; break; default: @@ -171,7 +176,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co /* fall through */ case WINED3D_TEXF_NONE: case WINED3D_TEXF_POINT: - gl_filter = GL_NEAREST; + gl_filter = scaled_resolve ? GL_SCALED_RESOLVE_FASTEST_EXT : GL_NEAREST; break; } @@ -2606,8 +2611,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); + if (src_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE - && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + && ((scale && !context->d3d_info->scaled_resolve) + || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) src_location = WINED3D_LOCATION_RB_RESOLVED; else src_location = src_texture->resource.draw_binding; @@ -2620,10 +2628,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ else dst_location = dst_texture->resource.draw_binding; - context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, src_texture, src_sub_resource_idx, src_location, &src_rect, dst_texture, dst_sub_resource_idx, dst_location, &dst_rect, colour_key, filter); + context_release(context); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, valid_locations); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3372b4b6be3..2cb25a37761 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -160,6 +160,7 @@ enum wined3d_gl_extension EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, + EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED, EXT_FRAMEBUFFER_OBJECT, EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4034ed28f0f..9240b0e455e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -224,6 +224,7 @@ struct wined3d_d3d_info uint32_t srgb_write_control : 1; uint32_t clip_control : 1; uint32_t full_ffp_varyings : 1; + uint32_t scaled_resolve : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; -- 2.20.1

1 0

[PATCH 2/3] wined3d: Handle scale with multisampled blit destination in texture2d_blt().
by Henri Verbeet 12 Mar '20

12 Mar '20

From: Paul Gofman <gofmanp(a)gmail.com> If either source or destination is multisampled scaled FBO blit results in GL_INVALID_OPERATION. Fixes black screen in 'BlazBlue Calamity Trigger'. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 88 +++++++++++++++++++++++++++++----------- dlls/wined3d/surface.c | 9 ++-- 2 files changed, 71 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cb84ef6f284..2294d434bab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4332,7 +4332,7 @@ static void test_multisample_stretch_rect(void) D3DTEXF_POINT, D3DTEXF_LINEAR, }; - IDirect3DSurface9 *rt, *ms_rt, *rt_r5g6b5; + IDirect3DSurface9 *rt, *ms_rt, *ms_rt2, *rt_r5g6b5; struct surface_readback rb; IDirect3DDevice9 *device; DWORD quality_levels; @@ -4367,27 +4367,30 @@ static void test_multisample_stretch_rect(void) hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); - ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt, NULL); - ok(hr == S_OK, "Failed to create render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, quality_levels - 1, FALSE, &ms_rt2, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, ms_rt); - ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); - ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); - ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(filters); ++i) { hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, filters[i]); - ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); color = getPixelColor(device, 64, 64); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); } /* Scaling */ @@ -4395,29 +4398,67 @@ static void test_multisample_stretch_rect(void) for (i = 0; i < ARRAY_SIZE(filters); ++i) { hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt2, NULL, D3DTEXF_NONE); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, &rect, filters[i]); - ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0xffffffff, "Test %u, got unexpected color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0xffffffff, "Test %u, got unexpected color 0x%08x.\n", i, color); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); get_rt_readback(rt, &rb); color = get_readback_color(&rb, 32, 32); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); color = get_readback_color(&rb, 64, 64); - ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); color = get_readback_color(&rb, 96, 96); - ok(color == 0xffffffff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); release_surface_readback(&rb); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0f, 0); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt, &rect, filters[i]); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, rt, NULL, filters[i]); - ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 32, 32); + ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 64, 64); + ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color); + color = get_readback_color(&rb, 96, 96); + ok(color == 0xffffff00, "Test %u, got unexpected color 0x%08x.\n", i, color); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, rt, NULL, ms_rt, NULL, D3DTEXF_NONE); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, &rect, ms_rt2, NULL, filters[i]); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9_StretchRect(device, ms_rt2, &rect, rt, NULL, filters[i]); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); get_rt_readback(rt, &rb); color = get_readback_color(&rb, 32, 32); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); color = get_readback_color(&rb, 64, 64); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); color = get_readback_color(&rb, 96, 96); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); release_surface_readback(&rb); } @@ -4433,18 +4474,19 @@ static void test_multisample_stretch_rect(void) for (i = 0; i < ARRAY_SIZE(filters); ++i) { hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt_r5g6b5, NULL, filters[i]); - ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_StretchRect(device, rt_r5g6b5, NULL, rt, NULL, filters[i]); - ok(hr == S_OK, "Test %u: Failed to stretch rect, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr); color = getPixelColor(device, 64, 64); - ok(color == 0x00ff00ff, "Test %u: Got color 0x%08x.\n", i, color); + ok(color == 0x00ff00ff, "Test %u, got unexpected color 0x%08x.\n", i, color); } IDirect3DSurface9_Release(rt_r5g6b5); done: + IDirect3DSurface9_Release(ms_rt2); IDirect3DSurface9_Release(ms_rt); IDirect3DSurface9_Release(rt); refcount = IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 79cca197332..c687e639462 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2612,10 +2612,13 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ else src_location = src_texture->resource.draw_binding; - if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) - dst_location = dst_texture->resource.draw_binding; - else + if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) dst_location = dst_texture->resource.map_binding; + else if (dst_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE + && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + dst_location = WINED3D_LOCATION_RB_RESOLVED; + else + dst_location = dst_texture->resource.draw_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, -- 2.20.1

1 0

[PATCH 1/3] wined3d: Manage source texture resolve in texture2d_blt() for colour blits.
by Henri Verbeet 12 Mar '20

12 Mar '20

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d8dc379c1a3..79cca197332 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,13 +175,6 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co break; } - /* Resolve the source surface first if needed. */ - if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) - && (src_texture->resource.format->id != dst_texture->resource.format->id - || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) - || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) - src_location = WINED3D_LOCATION_RB_RESOLVED; - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with @@ -2392,7 +2385,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ struct wined3d_device *device = dst_texture->resource.device; struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; - DWORD dst_location, valid_locations; + DWORD src_location, dst_location, valid_locations; DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; @@ -2613,6 +2606,12 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; + if (src_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE + && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else + src_location = src_texture->resource.draw_binding; + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; else @@ -2620,7 +2619,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, - src_texture, src_sub_resource_idx, src_texture->resource.draw_binding, &src_rect, + src_texture, src_sub_resource_idx, src_location, &src_rect, dst_texture, dst_sub_resource_idx, dst_location, &dst_rect, colour_key, filter); context_release(context); -- 2.20.1

1 0

[PATCH 5/5] advapi32/tests: Add more cases for CryptReleaseContext().
by Serge Gautherie 12 Mar '20

12 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 8d05396..5780f92 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -125,6 +125,56 @@ static void clean_up_environment(void) } } +static void test_CryptReleaseContext(void) +{ + BOOL ret; + HCRYPTPROV prov; + + /* TODO: Add cases for ERROR_BUSY, ERROR_INVALID_HANDLE and NTE_BAD_UID */ + + /* NULL provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + /* Additional refcount */ + + ret = CryptAcquireContextA(&prov, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptContextAddRef(prov, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + /* Nonzero flags, which allow release nonetheless */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == NTE_BAD_FLAGS, "got %u\n", GetLastError()); + + /* Obsolete provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); +} + static void test_acquire_context(void) { BOOL result; @@ -259,11 +309,6 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; - SetLastError(0xdeadbeef); - result = CryptReleaseContext(hProv, 0); - ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -1166,7 +1211,9 @@ START_TEST(crypt) init_function_pointers(); test_rc2_keylen(); + init_environment(); + test_CryptReleaseContext(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); -- 2.10.0.windows.1

1 0

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-devel