- wine-devel - winehq.org

[PATCH] dmband: Stop corruption of output string
by Alistair Leslie-Hughes 29 Nov '19

29 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/dmutils.c | 2 +- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmloader/debug.c | 4 ++-- dlls/dmscript/dmscript_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..5d38d06d1d 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -141,7 +141,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return "(NULL)"; } diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..1580e215bb 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -472,7 +472,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..af76404b57 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -503,7 +503,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -519,7 +519,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..4055ea6a93 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -502,7 +502,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - return wine_dbg_sprintf("%s", buffer); + return wine_dbg_printf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } -- 2.17.1

2 2

[PATCH 2/2] d3dcompiler/tests: Fix parameter desc test on d3d10.
by Matteo Bruni 29 Nov '19

29 Nov '19

From: Sven Baars <sven.wine(a)gmail.com> Stream is not a member of D3D10_SIGNATURE_PARAMETER_DESC. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes patch 174732. dlls/d3dcompiler_43/tests/reflection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d61..c451a81f49d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -740,8 +740,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) -- 2.21.0

3 3

vkd3d: DXIL2SPIRV progress update
by Hans-Kristian Arntzen 29 Nov '19

29 Nov '19

Hi. I've gotten a lot further on DXIL, and I've worked on translating PHI better and some actual codegen. It's getting quite workable now and a fair amount of opcodes are translated, but it's a long road ahead. Reasonably interesting code can be converted now, e.g.: https://gist.github.com/HansKristian-Work/df272ad97dc879514fdd494798b5296d. Once things come together I'll try to get this working in vkd3d. Cheers, Hans-Kristian

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 29 Nov '19

29 Nov '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

1 0

[PATCH 0/4] Update USER_SHARED_DATA timestamps more often.
by Rémi Bernon 29 Nov '19

29 Nov '19

This is a rewrite of the ntdll-User_Shared_Data staging patch series, with a simpler approach that still solves the issue. Although it is less correct in term of timestamp update than the original series, it should also have less impact and may be more acceptable. We already update the timestamps from time to time in ntoskrnl before accessing the memory, and this adds another update after each sleep. I checked that it allows the games reported in [2] to start, and some others that also required the original patch series: * Overwatch (with some additional staging patches) * World of Warcraft (with some additional staging patches) * Star Wars: The Old Republic * Batman: Arkham Knight * Just Cause 3 [1] https://www.winehq.org/pipermail/wine-devel/2012-March/094788.html [2] https://bugs.winehq.org/show_bug.cgi?id=29168 Andrew Wesie (1): ntdll/tests: Test updating TickCount in user_shared_data. Rémi Bernon (3): ntdll: Add user_shared_data_update internal timestamp update function. ntdll: Update user_shared_data InterruptTime fields when updating time. ntdll: Update user_shared_data timestamps after NtDelayExecution. dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/sync.c | 16 ++++++++++------ dlls/ntdll/tests/time.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/thread.c | 37 +++++++++++++++++++++++++++++-------- 4 files changed, 66 insertions(+), 14 deletions(-) -- 2.24.0

3 11

[PATCH 1/2] d3dx9: Implement D3DXCreateFragmentLinker[Ex]().
by Matteo Bruni 29 Nov '19

29 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 209 +++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 49 ++++++++ 2 files changed, 250 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea7..d7adc18ff6f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,220 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker +{ + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; + + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&linker->ref); + + TRACE("%p increasing refcount to %u.\n", linker, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&linker->ref); + + TRACE("%p decreasing refcount to %u.\n", linker, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(linker->device); + heap_free(linker); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p.\n", linker, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(linker->device); + *device = linker->device; + TRACE("Returning device %p.\n", *device); + + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); + + return E_NOTIMPL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + FIXME("iface %p, index %u: stub.\n", iface, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, + const char *name) +{ + FIXME("iface %p, name %s: stub.\n", iface, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *desc) +{ + FIXME("iface %p, name %p, desc %p: stub.\n", iface, name, desc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + FIXME("iface %p, fragments %p: stub.\n", iface, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + FIXME("iface %p, buffer %p: stub.\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + FIXME("iface %p, name %p, buffer %p: stub.\n", iface, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, ID3DXBuffer **buffer, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, buffer %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, buffer, errors); - if (linker) - *linker = NULL; + return E_NOTIMPL; +} +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); + + return E_NOTIMPL; +} - if (linker) - *linker = NULL; +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); return E_NOTIMPL; } +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, + ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc4119..e2925faad69 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,54 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + ID3DXFragmentLinker *linker; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create a D3D object.\n"); + DestroyWindow(window); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create a D3D device, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + hr = D3DXCreateFragmentLinkerEx(device, 1024, 0, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3D9_Release(d3d); + ok(!refcount, "The D3D object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6637,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); } -- 2.21.0

1 0

[v2 PATCH 1/3] dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Nikolay Sivov 29 Nov '19

29 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 138 +++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 28 ++++++++ 2 files changed, 110 insertions(+), 56 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9b22b15b4..306f431d65 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -177,15 +177,16 @@ struct dwrite_glyphrunanalysis { UINT32 max_glyph_bitmap_size; }; -struct dwrite_colorglyphenum { - IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; - LONG ref; +struct dwrite_colorglyphenum +{ + IDWriteColorGlyphRunEnumerator1 IDWriteColorGlyphRunEnumerator1_iface; + LONG refcount; FLOAT origin_x; /* original run origin */ FLOAT origin_y; IDWriteFontFace4 *fontface; /* for convenience */ - DWRITE_COLOR_GLYPH_RUN colorrun; /* returned with GetCurrentRun() */ + DWRITE_COLOR_GLYPH_RUN1 colorrun; /* returned with GetCurrentRun() */ DWRITE_GLYPH_RUN run; /* base run */ UINT32 palette; /* palette index to get layer color from */ FLOAT *advances; /* original or measured advances for base glyphs */ @@ -309,9 +310,9 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } -static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator1(IDWriteColorGlyphRunEnumerator1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator1_iface); } static inline struct dwrite_fontlist *impl_from_IDWriteFontList2(IDWriteFontList2 *iface) @@ -5623,18 +5624,17 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit return S_OK; } -/* IDWriteColorGlyphRunEnumerator */ -static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +/* IDWriteColorGlyphRunEnumerator1 */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator1 *iface, REFIID riid, void **ppv) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator1) || + IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IDWriteColorGlyphRunEnumerator_AddRef(iface); + IDWriteColorGlyphRunEnumerator1_AddRef(iface); return S_OK; } @@ -5644,35 +5644,38 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return E_NOINTERFACE; } -static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedIncrement(&glyphenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedDecrement(&glyphenum->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - heap_free(This->advances); - heap_free(This->color_advances); - heap_free(This->offsets); - heap_free(This->color_offsets); - heap_free(This->glyphindices); - heap_free(This->glyphs); - if (This->colr.context) - IDWriteFontFace4_ReleaseFontTable(This->fontface, This->colr.context); - IDWriteFontFace4_Release(This->fontface); - heap_free(This); + if (!refcount) + { + heap_free(glyphenum->advances); + heap_free(glyphenum->color_advances); + heap_free(glyphenum->offsets); + heap_free(glyphenum->color_offsets); + heap_free(glyphenum->glyphindices); + heap_free(glyphenum->glyphs); + if (glyphenum->colr.context) + IDWriteFontFace4_ReleaseFontTable(glyphenum->fontface, glyphenum->colr.context); + IDWriteFontFace4_Release(glyphenum->fontface); + heap_free(glyphenum); } - return ref; + return refcount; } static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UINT32 g) @@ -5690,7 +5693,7 @@ static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UIN static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphenum) { - DWRITE_COLOR_GLYPH_RUN *colorrun = &glyphenum->colorrun; + DWRITE_COLOR_GLYPH_RUN1 *colorrun = &glyphenum->colorrun; FLOAT advance_adj = 0.0f; BOOL got_palette_index; UINT32 g; @@ -5776,48 +5779,69 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen return colorrun->glyphRun.glyphCount > 0; } -static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator1 *iface, BOOL *has_run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); - TRACE("(%p)->(%p)\n", This, has_run); + TRACE("%p, %p.\n", iface, has_run); *has_run = FALSE; - This->colorrun.glyphRun.glyphCount = 0; - while (This->current_layer < This->max_layer_num) { - if (colorglyphenum_build_color_run(This)) + glyphenum->colorrun.glyphRun.glyphCount = 0; + while (glyphenum->current_layer < glyphenum->max_layer_num) + { + if (colorglyphenum_build_color_run(glyphenum)) break; else - This->current_layer++; + glyphenum->current_layer++; } - *has_run = This->colorrun.glyphRun.glyphCount > 0; + *has_run = glyphenum->colorrun.glyphRun.glyphCount > 0; return S_OK; } -static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +static HRESULT colorglyphenum_get_current_run(const struct dwrite_colorglyphenum *glyphenum, + DWRITE_COLOR_GLYPH_RUN1 const **run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%p)\n", This, run); - - if (This->colorrun.glyphRun.glyphCount == 0) { + if (glyphenum->colorrun.glyphRun.glyphCount == 0) + { *run = NULL; return E_NOT_VALID_STATE; } - *run = &This->colorrun; + *run = &glyphenum->colorrun; return S_OK; } -static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, (DWRITE_COLOR_GLYPH_RUN1 const **)run); +} + +static HRESULT WINAPI colorglyphenum1_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN1 const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, run); +} + +static const IDWriteColorGlyphRunEnumerator1Vtbl colorglyphenumvtbl = +{ colorglyphenum_QueryInterface, colorglyphenum_AddRef, colorglyphenum_Release, colorglyphenum_MoveNext, - colorglyphenum_GetCurrentRun + colorglyphenum_GetCurrentRun, + colorglyphenum1_GetCurrentRun, }; HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_RUN *run, @@ -5842,8 +5866,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R if (!colorglyphenum) return E_OUTOFMEMORY; - colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; - colorglyphenum->ref = 1; + colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->refcount = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; colorglyphenum->fontface = &fontface->IDWriteFontFace4_iface; @@ -5876,7 +5900,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R /* It's acceptable to have a subset of glyphs mapped to color layers, for regular runs client is supposed to proceed normally, like if font had no color info at all. */ if (!has_colored_glyph) { - IDWriteColorGlyphRunEnumerator_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator_iface); + IDWriteColorGlyphRunEnumerator1_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface); return DWRITE_E_NOCOLOR; } @@ -5895,6 +5919,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; colorglyphenum->colorrun.glyphRunDescription = NULL; /* FIXME */ + colorglyphenum->colorrun.measuringMode = measuring_mode; + colorglyphenum->colorrun.glyphImageFormat = DWRITE_GLYPH_IMAGE_FORMATS_NONE; /* FIXME */ if (run->glyphAdvances) memcpy(colorglyphenum->advances, run->glyphAdvances, run->glyphCount * sizeof(FLOAT)); @@ -5905,7 +5931,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R run->fontEmSize, 1.0f, transform, run->glyphIndices[i], run->isSideways); } - *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + *ret = (IDWriteColorGlyphRunEnumerator *)&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c2f9dc0b1f..3cd41efc91 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7350,7 +7350,9 @@ static void test_GetPaletteEntries(void) static void test_TranslateColorGlyphRun(void) { + IDWriteColorGlyphRunEnumerator1 *layers1; IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN1 *colorrun1; const DWRITE_COLOR_GLYPH_RUN *colorrun; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; @@ -7416,6 +7418,13 @@ static void test_TranslateColorGlyphRun(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); + hr = IDWriteColorGlyphRunEnumerator_QueryInterface(layers, &IID_IDWriteColorGlyphRunEnumerator1, (void **)&layers1); + if (FAILED(hr)) + { + layers1 = NULL; + win_skip("IDWriteColorGlyphRunEnumerator1 is not supported.\n"); + } + for (;;) { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); @@ -7431,13 +7440,32 @@ static void test_TranslateColorGlyphRun(void) ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); + + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Failed to get color runt, hr %#x.\n", hr); + ok(colorrun1->glyphRun.fontFace != NULL, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "Unexpected font size %f.\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u\n", colorrun1->glyphRun.glyphCount); + ok(colorrun1->glyphRun.glyphIndices != NULL, "Unexpected indices array.\n"); + ok(colorrun1->glyphRun.glyphAdvances != NULL, "Unexpected advances array.\n"); + } } /* iterated all way through */ hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == E_NOT_VALID_STATE, "Unexpected hr %#x.\n", hr); + } + IDWriteColorGlyphRunEnumerator_Release(layers); + if (layers1) + IDWriteColorGlyphRunEnumerator1_Release(layers1); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.24.0

1 2

[PATCH 1/2] dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Nikolay Sivov 29 Nov '19

29 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 138 +++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 30 +++++++++ 2 files changed, 112 insertions(+), 56 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9b22b15b4..306f431d65 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -177,15 +177,16 @@ struct dwrite_glyphrunanalysis { UINT32 max_glyph_bitmap_size; }; -struct dwrite_colorglyphenum { - IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; - LONG ref; +struct dwrite_colorglyphenum +{ + IDWriteColorGlyphRunEnumerator1 IDWriteColorGlyphRunEnumerator1_iface; + LONG refcount; FLOAT origin_x; /* original run origin */ FLOAT origin_y; IDWriteFontFace4 *fontface; /* for convenience */ - DWRITE_COLOR_GLYPH_RUN colorrun; /* returned with GetCurrentRun() */ + DWRITE_COLOR_GLYPH_RUN1 colorrun; /* returned with GetCurrentRun() */ DWRITE_GLYPH_RUN run; /* base run */ UINT32 palette; /* palette index to get layer color from */ FLOAT *advances; /* original or measured advances for base glyphs */ @@ -309,9 +310,9 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } -static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator1(IDWriteColorGlyphRunEnumerator1 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator1_iface); } static inline struct dwrite_fontlist *impl_from_IDWriteFontList2(IDWriteFontList2 *iface) @@ -5623,18 +5624,17 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit return S_OK; } -/* IDWriteColorGlyphRunEnumerator */ -static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +/* IDWriteColorGlyphRunEnumerator1 */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator1 *iface, REFIID riid, void **ppv) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator1) || + IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IDWriteColorGlyphRunEnumerator_AddRef(iface); + IDWriteColorGlyphRunEnumerator1_AddRef(iface); return S_OK; } @@ -5644,35 +5644,38 @@ static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerat return E_NOINTERFACE; } -static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedIncrement(&glyphenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; } -static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator1 *iface) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + ULONG refcount = InterlockedDecrement(&glyphenum->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) { - heap_free(This->advances); - heap_free(This->color_advances); - heap_free(This->offsets); - heap_free(This->color_offsets); - heap_free(This->glyphindices); - heap_free(This->glyphs); - if (This->colr.context) - IDWriteFontFace4_ReleaseFontTable(This->fontface, This->colr.context); - IDWriteFontFace4_Release(This->fontface); - heap_free(This); + if (!refcount) + { + heap_free(glyphenum->advances); + heap_free(glyphenum->color_advances); + heap_free(glyphenum->offsets); + heap_free(glyphenum->color_offsets); + heap_free(glyphenum->glyphindices); + heap_free(glyphenum->glyphs); + if (glyphenum->colr.context) + IDWriteFontFace4_ReleaseFontTable(glyphenum->fontface, glyphenum->colr.context); + IDWriteFontFace4_Release(glyphenum->fontface); + heap_free(glyphenum); } - return ref; + return refcount; } static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UINT32 g) @@ -5690,7 +5693,7 @@ static FLOAT get_glyph_origin(const struct dwrite_colorglyphenum *glyphenum, UIN static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphenum) { - DWRITE_COLOR_GLYPH_RUN *colorrun = &glyphenum->colorrun; + DWRITE_COLOR_GLYPH_RUN1 *colorrun = &glyphenum->colorrun; FLOAT advance_adj = 0.0f; BOOL got_palette_index; UINT32 g; @@ -5776,48 +5779,69 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen return colorrun->glyphRun.glyphCount > 0; } -static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator1 *iface, BOOL *has_run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); - TRACE("(%p)->(%p)\n", This, has_run); + TRACE("%p, %p.\n", iface, has_run); *has_run = FALSE; - This->colorrun.glyphRun.glyphCount = 0; - while (This->current_layer < This->max_layer_num) { - if (colorglyphenum_build_color_run(This)) + glyphenum->colorrun.glyphRun.glyphCount = 0; + while (glyphenum->current_layer < glyphenum->max_layer_num) + { + if (colorglyphenum_build_color_run(glyphenum)) break; else - This->current_layer++; + glyphenum->current_layer++; } - *has_run = This->colorrun.glyphRun.glyphCount > 0; + *has_run = glyphenum->colorrun.glyphRun.glyphCount > 0; return S_OK; } -static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +static HRESULT colorglyphenum_get_current_run(const struct dwrite_colorglyphenum *glyphenum, + DWRITE_COLOR_GLYPH_RUN1 const **run) { - struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); - - TRACE("(%p)->(%p)\n", This, run); - - if (This->colorrun.glyphRun.glyphCount == 0) { + if (glyphenum->colorrun.glyphRun.glyphCount == 0) + { *run = NULL; return E_NOT_VALID_STATE; } - *run = &This->colorrun; + *run = &glyphenum->colorrun; return S_OK; } -static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, (DWRITE_COLOR_GLYPH_RUN1 const **)run); +} + +static HRESULT WINAPI colorglyphenum1_GetCurrentRun(IDWriteColorGlyphRunEnumerator1 *iface, + DWRITE_COLOR_GLYPH_RUN1 const **run) +{ + struct dwrite_colorglyphenum *glyphenum = impl_from_IDWriteColorGlyphRunEnumerator1(iface); + + TRACE("%p, %p.\n", iface, run); + + return colorglyphenum_get_current_run(glyphenum, run); +} + +static const IDWriteColorGlyphRunEnumerator1Vtbl colorglyphenumvtbl = +{ colorglyphenum_QueryInterface, colorglyphenum_AddRef, colorglyphenum_Release, colorglyphenum_MoveNext, - colorglyphenum_GetCurrentRun + colorglyphenum_GetCurrentRun, + colorglyphenum1_GetCurrentRun, }; HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_RUN *run, @@ -5842,8 +5866,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R if (!colorglyphenum) return E_OUTOFMEMORY; - colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; - colorglyphenum->ref = 1; + colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->refcount = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; colorglyphenum->fontface = &fontface->IDWriteFontFace4_iface; @@ -5876,7 +5900,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R /* It's acceptable to have a subset of glyphs mapped to color layers, for regular runs client is supposed to proceed normally, like if font had no color info at all. */ if (!has_colored_glyph) { - IDWriteColorGlyphRunEnumerator_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator_iface); + IDWriteColorGlyphRunEnumerator1_Release(&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface); return DWRITE_E_NOCOLOR; } @@ -5895,6 +5919,8 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; colorglyphenum->colorrun.glyphRunDescription = NULL; /* FIXME */ + colorglyphenum->colorrun.measuringMode = measuring_mode; + colorglyphenum->colorrun.glyphImageFormat = DWRITE_GLYPH_IMAGE_FORMATS_NONE; /* FIXME */ if (run->glyphAdvances) memcpy(colorglyphenum->advances, run->glyphAdvances, run->glyphCount * sizeof(FLOAT)); @@ -5905,7 +5931,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R run->fontEmSize, 1.0f, transform, run->glyphIndices[i], run->isSideways); } - *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + *ret = (IDWriteColorGlyphRunEnumerator *)&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c2f9dc0b1f..67947e3e1f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7350,7 +7350,9 @@ static void test_GetPaletteEntries(void) static void test_TranslateColorGlyphRun(void) { + IDWriteColorGlyphRunEnumerator1 *layers1; IDWriteColorGlyphRunEnumerator *layers; + const DWRITE_COLOR_GLYPH_RUN1 *colorrun1; const DWRITE_COLOR_GLYPH_RUN *colorrun; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; @@ -7416,6 +7418,13 @@ static void test_TranslateColorGlyphRun(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); + hr = IDWriteColorGlyphRunEnumerator_QueryInterface(layers, &IID_IDWriteColorGlyphRunEnumerator1, (void **)&layers1); + if (FAILED(hr)) + { + layers1 = NULL; + win_skip("IDWriteColorGlyphRunEnumerator1 is not supported.\n"); + } + for (;;) { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); @@ -7431,13 +7440,34 @@ static void test_TranslateColorGlyphRun(void) ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); + + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Failed to get color runt, hr %#x.\n", hr); + ok(colorrun1->glyphRun.fontFace != NULL, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "Unexpected font size %f.\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u\n", colorrun1->glyphRun.glyphCount); + ok(colorrun1->glyphRun.glyphIndices != NULL, "Unexpected indices array.\n"); + ok(colorrun1->glyphRun.glyphAdvances != NULL, "Unexpected advances array.\n"); + ok(colorrun1->measuringMode == DWRITE_MEASURING_MODE_NATURAL, "Unexpected measuring mode %d.\n", + colorrun1->measuringMode); + } } /* iterated all way through */ hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); + if (layers1) + { + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == E_NOT_VALID_STATE, "Unexpected hr %#x.\n", hr); + } + IDWriteColorGlyphRunEnumerator_Release(layers); + if (layers1) + IDWriteColorGlyphRunEnumerator1_Release(layers1); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.24.0

2 2

[PATCH] d3d9/tests: Fix a typo in a field name of the visual test.
by Francois Gouget 29 Nov '19

29 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Yes. The field is actually never used directly: all that matters is that the structure has the right layout and its content will be used by d3d. dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f063d21fb0..cbfb98bec68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26311,7 +26311,7 @@ static void test_sample_attached_rendertarget(void) static const struct { - struct vec3 posistion; + struct vec3 position; struct vec2 texcoord; } quad[] = -- 2.20.1

2 1

[PATCH] ntoskrnl.exe: Remove a superfluous condition.
by Zebediah Figura 29 Nov '19

29 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 365ddc069f..647d427ee5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1251,7 +1251,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG lock->Common.Removed = TRUE; - if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock); -- 2.24.0

1 0

[PATCH] kernelbase: Implement GetOverlappedResultEx().
by Zebediah Figura 29 Nov '19

29 Nov '19

Mentioned in https://bugs.winehq.org/show_bug.cgi?id=38830. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/pipe.c | 54 +++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 23 ++++++++++++-- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 82e10850a8..172be2a6e2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -760,6 +760,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) +@ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFullName(long ptr ptr) @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index d8d5726f1a..20f3450c6d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetOverlappedResultEx)(HANDLE,OVERLAPPED *,DWORD *,DWORD,BOOL); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -4065,6 +4066,57 @@ static void test_nowait(DWORD pipe_type) ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); } +static void test_GetOverlappedResultEx(void) +{ + HANDLE client, server; + OVERLAPPED ovl; + char buffer[8000]; + DWORD ret_size; + BOOL ret; + + if (!pGetOverlappedResultEx) + { + win_skip("GetOverlappedResultEx() is not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + overlapped_write_async(client, buffer, sizeof(buffer), &ovl); + + user_apc_ran = FALSE; + QueueUserAPC(user_apc, GetCurrentThread(), 0); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %u\n", GetLastError()); + ok(user_apc_ran, "APC should have run\n"); + + CloseHandle(ovl.hEvent); + + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4080,6 +4132,7 @@ START_TEST(pipe) pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); + pGetOverlappedResultEx = (void *)GetProcAddress(hmod, "GetOverlappedResultEx"); argc = winetest_get_mainargs(&argv); @@ -4134,4 +4187,5 @@ START_TEST(pipe) test_wait_pipe(); test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); + test_GetOverlappedResultEx(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aa2ebfcc69..8e601c7cb2 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2002,21 +2002,38 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResult( HANDLE file, LPOVERLAPPED overlapped, LPDWORD result, BOOL wait ) +{ + return GetOverlappedResultEx( file, overlapped, result, wait ? INFINITE : 0, FALSE ); +} + + +/*********************************************************************** + * GetOverlappedResultEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *overlapped, + DWORD *result, DWORD timeout, BOOL alertable ) { NTSTATUS status; + DWORD ret; - TRACE( "(%p %p %p %x)\n", file, overlapped, result, wait ); + TRACE( "(%p %p %p %u %d)\n", file, overlapped, result, timeout, alertable ); status = overlapped->Internal; if (status == STATUS_PENDING) { - if (!wait) + if (!timeout) { SetLastError( ERROR_IO_INCOMPLETE ); return FALSE; } - if (WaitForSingleObject( overlapped->hEvent ? overlapped->hEvent : file, INFINITE ) == WAIT_FAILED) + ret = WaitForSingleObjectEx( overlapped->hEvent ? overlapped->hEvent : file, timeout, alertable ); + if (ret == WAIT_FAILED) return FALSE; + else if (ret) + { + SetLastError(ret); + return FALSE; + } status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 14ee402089..ed5d1f73f8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -584,7 +584,7 @@ # @ stub GetOsManufacturingMode # @ stub GetOsSafeBootMode @ stdcall GetOverlappedResult(long ptr ptr long) -# @ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) # @ stub GetPackageApplicationContext # @ stub GetPackageApplicationIds # @ stub GetPackageApplicationProperty diff --git a/include/winbase.h b/include/winbase.h index 8b30c5a69a..2d01dcb606 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2215,6 +2215,7 @@ WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL); +WINBASEAPI BOOL WINAPI GetOverlappedResultEx(HANDLE,OVERLAPPED*,DWORD*,DWORD,BOOL); WINBASEAPI DWORD WINAPI GetPriorityClass(HANDLE); WINADVAPI BOOL WINAPI GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD); WINBASEAPI UINT WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR); -- 2.24.0

2 1

[PATCH 1/4] quartz/systemclock: Support COM aggregation.
by Zebediah Figura 28 Nov '19

28 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 121 +++++++++++++++++++++----------- dlls/quartz/tests/systemclock.c | 108 +++++++++++++++++++++++++++- 2 files changed, 186 insertions(+), 43 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 652008cd01..77e569d437 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -38,7 +38,9 @@ struct advise_sink struct system_clock { IReferenceClock IReferenceClock_iface; - LONG ref; + IUnknown IUnknown_inner; + IUnknown *outer_unk; + LONG refcount; BOOL thread_created; HANDLE thread, notify_event, stop_event; @@ -48,6 +50,72 @@ struct system_clock struct list sinks; }; +static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct system_clock, IUnknown_inner); +} + +static HRESULT WINAPI system_clock_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else if (IsEqualGUID(iid, &IID_IReferenceClock)) + *out = &clock->IReferenceClock_iface; + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI system_clock_inner_AddRef(IUnknown *iface) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&clock->refcount); + + TRACE("%p increasing refcount to %u.\n", clock, refcount); + + return refcount; +} + +static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) +{ + struct system_clock *clock = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&clock->refcount); + + TRACE("%p decreasing refcount to %u.\n", clock, refcount); + + if (!refcount) + { + if (clock->thread) + { + SetEvent(clock->stop_event); + WaitForSingleObject(clock->thread, INFINITE); + CloseHandle(clock->thread); + CloseHandle(clock->notify_event); + CloseHandle(clock->stop_event); + } + clock->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&clock->cs); + heap_free(clock); + } + return refcount; +} + +static const IUnknownVtbl system_clock_inner_vtbl = +{ + system_clock_inner_QueryInterface, + system_clock_inner_AddRef, + system_clock_inner_Release, +}; + static inline struct system_clock *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct system_clock, IReferenceClock_iface); @@ -112,52 +180,19 @@ static void notify_thread(struct system_clock *clock) static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) { struct system_clock *clock = impl_from_IReferenceClock(iface); - TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); - - if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) - { - IReferenceClock_AddRef(iface); - *out = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; + return IUnknown_QueryInterface(clock->outer_unk, iid, out); } static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) { struct system_clock *clock = impl_from_IReferenceClock(iface); - ULONG refcount = InterlockedIncrement(&clock->ref); - - TRACE("%p increasing refcount to %u.\n", clock, refcount); - - return refcount; + return IUnknown_AddRef(clock->outer_unk); } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) { struct system_clock *clock = impl_from_IReferenceClock(iface); - ULONG refcount = InterlockedDecrement(&clock->ref); - - TRACE("%p decreasing refcount to %u.\n", clock, refcount); - - if (!refcount) - { - if (clock->thread) - { - SetEvent(clock->stop_event); - WaitForSingleObject(clock->thread, INFINITE); - CloseHandle(clock->thread); - CloseHandle(clock->notify_event); - CloseHandle(clock->stop_event); - } - clock->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&clock->cs); - heap_free(clock); - } - return refcount; + return IUnknown_Release(clock->outer_unk); } static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) @@ -281,7 +316,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR return S_FALSE; } -static const IReferenceClockVtbl SystemClock_Vtbl = +static const IReferenceClockVtbl SystemClock_vtbl = { SystemClockImpl_QueryInterface, SystemClockImpl_AddRef, @@ -304,10 +339,16 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) return E_OUTOFMEMORY; } - object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; + object->IReferenceClock_iface.lpVtbl = &SystemClock_vtbl; + object->IUnknown_inner.lpVtbl = &system_clock_inner_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; + object->refcount = 1; list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - return SystemClockImpl_QueryInterface(&object->IReferenceClock_iface, &IID_IReferenceClock, out); + TRACE("Created system clock %p.\n", object); + *out = &object->IUnknown_inner; + + return S_OK; } diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index fa1ab6856b..08faa1ef73 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -26,11 +26,18 @@ static ULONGLONG (WINAPI *pGetTickCount64)(void); static IReferenceClock *create_system_clock(void) { - IReferenceClock *filter = NULL; + IReferenceClock *clock = NULL; HRESULT hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, - &IID_IReferenceClock, (void **)&filter); + &IID_IReferenceClock, (void **)&clock); ok(hr == S_OK, "Got hr %#x.\n", hr); - return filter; + return clock; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -62,6 +69,100 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +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_IReferenceClock) + || 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) +{ + IReferenceClock *clock, *clock2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + clock = (IReferenceClock *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_SystemClock, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IReferenceClock, (void **)&clock); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!clock, "Got interface %p.\n", clock); + + hr = CoCreateInstance(&CLSID_SystemClock, &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_IReferenceClock, (void **)&clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IReferenceClock_QueryInterface(clock, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IReferenceClock_QueryInterface(clock, &IID_IReferenceClock, (void **)&clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == (IReferenceClock *)0xdeadbeef, "Got unexpected IReferenceClock %p.\n", clock2); + + 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 = IReferenceClock_QueryInterface(clock, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IReferenceClock_Release(clock); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + static void test_get_time(void) { IReferenceClock *clock = create_system_clock(); @@ -185,6 +286,7 @@ START_TEST(systemclock) pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); test_interfaces(); + test_aggregation(); test_get_time(); test_advise(); -- 2.24.0

1 3

[PATCH] dmloader: Support DMUS_OBJ_MEMORY cache lookups
by Alistair Leslie-Hughes 28 Nov '19

28 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 42209def94..9048c02dfc 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -191,8 +191,18 @@ static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_ if (desc->dwValidData & DMUS_OBJ_STREAM) FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); - if (desc->dwValidData & DMUS_OBJ_MEMORY) - FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + if (desc->dwValidData & DMUS_OBJ_MEMORY) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_MEMORY && + desc->llMemLength == existing->Desc.llMemLength && + (desc->pbMemData == existing->Desc.pbMemData || + !memcmp(desc->pbMemData, existing->Desc.pbMemData, desc->llMemLength)) ) { + TRACE("Found by DMUS_OBJ_MEMORY (%d)\n", + desc->pbMemData == existing->Desc.pbMemData); + return existing; + } + } + } if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { -- 2.24.0

2 1

[PATCH v2] dmime: Trace pbMemData/llMemLength on the same line.
by Michael Stefaniuc 28 Nov '19

28 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Removed trailing whitespace dlls/dmband/dmutils.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dswave/dswave_main.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..a1dc7e28a5 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -137,7 +137,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); @@ -525,7 +525,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); } else { diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..3428a58b91 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -468,7 +468,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 7b3bcec079..cd955fd8a5 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -455,7 +455,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..10ba0bce93 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -491,7 +491,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..55bc11b29a 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -498,7 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index fd3abe5209..70b810a8df 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -509,7 +509,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 295cd84b82..0951cb9e95 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -468,7 +468,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index bb554deaa4..4f3a73d9e9 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -437,7 +437,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); -- 2.20.1

1 0

[PATCH] msvcrt: Make strlwr/strupr write to the string only if necessary.
by Ambrož Bizjak 28 Nov '19

28 Nov '19

Hi, This patch fixes a crash in IL-2 Sturmovik: Battle of Stanlingrad (with some other tweaks the game runs well). Without this, the game crashes when starting a mission: Unhandled exception: page fault on write access to 0x1408b81bc in 64-bit code (0x00007f783f3ad8e4). ... Backtrace: =>0 0x00007f783f3ad8e4 MSVCRT__strlwr_s_l+0x64() in ucrtbase (0x000000004a77ccf0) 1 0x00007f783f3ad96f MSVCRT__strlwr+0x1e(str="idle") [Z:\build\wine-4.16\dlls\ucrtbase\..\msvcrt\string.c:111] in ucrtbase (0x000000004a77cd30) 2 0x000000014045a782 EntryPoint+0xffbf1fd1() in il-2 (0x000000004a77cee0) 0x00007f783f3ad8e4 MSVCRT__strlwr_s_l+0x64 in ucrtbase: movb %al,0xffffffffffffffff(%rbx) Based on this backtrace, my hypothesis was that the game is calling strlwr on a read-only string that is already lower-case. I have then changed strlwr to not assign characters to the string when the value is unchanged, which fixed the crash. To me this is sufficient evidence to confirm the hypothesis.

3 2

[PATCH 1/2] ucrtbase: Correct behavior of strftime format %c.
by Jeff Smith 28 Nov '19

28 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/time.c | 28 +++++++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..d8043f459d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1234,13 +1234,27 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, switch(*format) { case 'c': - if(!strftime_format(str, &ret, max, mstm, time_data, - alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date))) - return 0; - if(ret < max) - str[ret++] = ' '; - if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) - return 0; +#if _MSVCR_VER>=140 + if(time_data == MSVCRT_locale->locinfo->lc_time_curr && !alternate) + { + static const WCHAR datetime_format[] = + { '%','a',' ','%','b',' ','%','e',' ','%','T',' ','%','Y',0 }; + tmp = strftime_impl(str+ret, max-ret, datetime_format, mstm, time_data, loc); + if(!tmp) + return 0; + ret += tmp; + } + else +#endif + { + if(!strftime_format(str, &ret, max, mstm, time_data, + alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date))) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } break; case 'x': if(!strftime_format(str, &ret, max, mstm, time_data, diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..5ff1d1e44e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -999,8 +999,8 @@ static void test_strftime(void) {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, - {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, -- 2.23.0

3 3

[PATCH] msvcrt: Fix the spelling of a couple of TRACE() messages.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/except_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 73a0d6a2b66..e2515c77784 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -371,7 +371,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } @@ -590,7 +590,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } -- 2.20.1

2 1

[PATCH] msvcp120/tests: Tweak two ok() messages and fix their spelling.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d484cdd7ed7..9c3f22a3674 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1444,7 +1444,7 @@ static void test_tr2_sys__Copy_file(void) ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), - "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); + "test_tr2_sys__Copy_file(): test %d failed, mismatched file sizes\n", i+1); } ret = p_tr2_sys__Copy_file_wchar(testW, testW2, TRUE); ok(ret == ERROR_SUCCESS, "test_tr2_sys__Copy_file_wchar() expect ERROR_SUCCESS, got %d\n", ret); @@ -1886,7 +1886,7 @@ static void test_tr2_sys__Link(void) ok(errno == 0xdeadbeef, "tr2_sys__Link(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].existing_path) == p_tr2_sys__File_size(tests[i].new_path), - "tr2_sys__Link(): test %d failed, two files' size are not equal\n", i+1); + "tr2_sys__Link(): test %d failed, mismatched file sizes\n", i+1); } ok(DeleteFileA("f1"), "expect f1 to exist\n"); -- 2.20.1

2 1

[PATCH] riched20/tests: Fix a function name in an ok() message.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/riched20/tests/txtsrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index dd290e3fb2f..eea01b7833b 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -992,7 +992,7 @@ static void test_TxGetScroll(void) return; ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); -- 2.20.1

3 2

[PATCH] ole32: Fix a spelling error in a function parameter name.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/storage32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa3872dad07..515880ec36b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9637,7 +9637,7 @@ typedef struct * * Memory allocated for pData must be freed by the caller */ -static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStrem1) +static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStream1) { DWORD dwSize; HRESULT hRes = S_OK; @@ -9698,7 +9698,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM } } } - if(bStrem1) + if(bStream1) { dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength)); if(dwSize != sizeof(pData->dwOleObjFileNameLength)) @@ -9752,7 +9752,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM if(hRes == S_OK) /* I don't know what this 8 byte information is. We have to figure out */ { - if(!bStrem1) /* if it is a second OLE stream data */ + if(!bStream1) /* if it is a second OLE stream data */ { pData->dwDataLength -= 8; dwSize = pOleStream->lpstbl->Get(pOleStream, pData->strUnknown, sizeof(pData->strUnknown)); -- 2.20.1

2 1

[PATCH] wmp/tests: Fix the spelling of an unused parameter name.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index db466bf6d45..aaeb2aa82d9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -124,7 +124,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL; -- 2.20.1

2 1

[PATCH v3] gdi32/tests: MoveToEx() does not return the old point.
by Francois Gouget 28 Nov '19

28 Nov '19

This behavior goes back to at least Windows XP. But Wine depends on MoveToEx() returning the old point and changing Wine does not seem necessary. So expect the documented behavior and mark the current Windows behavior as broken. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v3: Accept the documented behavior. Wine no longer needs a todo. Better document the Windows behavior. dlls/gdi32/painting.c | 3 +++ dlls/gdi32/tests/metafile.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 81937b8bbb4..f0aee5b8d8c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -257,6 +257,9 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) /*********************************************************************** * MoveToEx (GDI32.@) + * + * Wine returns the previous position in pt as per the documentation. + * However note that no Windows version does since at least XP. */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c03..84fefb305f4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2259,16 +2259,16 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + oldpoint.x = oldpoint.y = 11235; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + /* We want Wine to return the old position as per the documentation. + * But Windows since at least XP does not. + */ + ok((oldpoint.x == 2 && oldpoint.y == 2) || + broken(oldpoint.x == 11235 && oldpoint.y == 11235), + "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n", + oldpoint.x, oldpoint.y); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); -- 2.20.1

2 3

[PATCH v4] gdi32/tests: MoveToEx() does not return the old point.
by Francois Gouget 28 Nov '19

28 Nov '19

This behavior goes back to at least Windows XP. But Wine depends on MoveToEx() returning the old point and changing Wine does not seem necessary. So expect the documented behavior and mark the current Windows behavior as broken. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v4: Windows most likely returns the previous position on non metafile DCs so drop the MoveToEx() comment. dlls/gdi32/tests/metafile.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c03..84fefb305f4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2259,16 +2259,16 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + oldpoint.x = oldpoint.y = 11235; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + /* We want Wine to return the old position as per the documentation. + * But Windows since at least XP does not. + */ + ok((oldpoint.x == 2 && oldpoint.y == 2) || + broken(oldpoint.x == 11235 && oldpoint.y == 11235), + "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n", + oldpoint.x, oldpoint.y); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); -- 2.20.1

1 0

[PATCH] vbscript/tests: Fix the name of a vbscript variable in the run test.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I'm a bit surprised that this is not causing more trouble. But it also does not really look like this was an intentional typo designed to test error handling. dlls/vbscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5fc23707e39..ab32a4213b0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2206,7 +2206,7 @@ static void test_callbacks(void) L" on error resume next\n" L" err.raise 2\n" L" call test.globalCallback(new CallbackClass)\n" - L" call ok(err.number = 2, \"err.number = \" & err.numner)\n" + L" call ok(err.number = 2, \"err.number = \" & err.number)\n" L"end function\n", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); -- 2.20.1

2 1

[PATCH] dxerr8: Fix the spelling of some error messages.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- These error messages are also pretty inconsistent wrt whether the first letter should be upper-case and whether they should have a full stop. Is that intentional? It's tempting to say it would be nice fixing those before they are translated but it looks like they are not translated either :-( dlls/dxerr8/errors.dat | 4 ++-- dlls/dxerr8/errors.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxerr8/errors.dat b/dlls/dxerr8/errors.dat index dd73561282f..4ab288ccd46 100644 --- a/dlls/dxerr8/errors.dat +++ b/dlls/dxerr8/errors.dat @@ -202,7 +202,7 @@ DDERR_INVALIDPIXELFORMAT pixel format was invalid as specified DDERR_INVALIDRECT Rectangle provided was invalid. DDERR_LOCKEDSURFACES Operation could not be carried out because one or more surfaces are locked DDERR_NO3D There is no 3D present. -DDERR_NOALPHAHW Operation could not be carried out because there is no alpha accleration hardware present or available. +DDERR_NOALPHAHW Operation could not be carried out because there is no alpha acceleration hardware present or available. DDERR_NOSTEREOHARDWARE Operation could not be carried out because there is no stereo hardware present or available. DDERR_NOSURFACELEFT Operation could not be carried out because there is no hardware present which supports stereo surfaces DDERR_NOCLIPLIST no clip list available @@ -268,7 +268,7 @@ DDERR_NOBLTHW No blter. DDERR_NODDROPSHW No DirectDraw ROP hardware. DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination. -DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation. +DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destination. DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive. DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable. diff --git a/dlls/dxerr8/errors.h b/dlls/dxerr8/errors.h index c46fda8b46d..4f2711315fb 100644 --- a/dlls/dxerr8/errors.h +++ b/dlls/dxerr8/errors.h @@ -613,8 +613,8 @@ static const WCHAR name204W[] = { 'D','D','E','R','R','_','N','O','3','D',0 }; static const CHAR description204A[] = "There is no 3D present."; static const WCHAR description204W[] = { 'T','h','e','r','e',' ','i','s',' ','n','o',' ','3','D',' ','p','r','e','s','e','n','t','.',0 }; static const WCHAR name205W[] = { 'D','D','E','R','R','_','N','O','A','L','P','H','A','H','W',0 }; -static const CHAR description205A[] = "Operation could not be carried out because there is no alpha accleration hardware present or available."; -static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; +static const CHAR description205A[] = "Operation could not be carried out because there is no alpha acceleration hardware present or available."; +static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','e','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; static const WCHAR name206W[] = { 'D','D','E','R','R','_','N','O','S','T','E','R','E','O','H','A','R','D','W','A','R','E',0 }; static const CHAR description206A[] = "Operation could not be carried out because there is no stereo hardware present or available."; static const WCHAR description206W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','s','t','e','r','e','o',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; @@ -809,10 +809,10 @@ static const CHAR description269A[] = "returned when GetOverlayPosition is calle static const WCHAR description269W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 }; static const WCHAR name270W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 }; static const CHAR description270A[] = "returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination."; -static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 }; +static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name271W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 }; static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destination."; -static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; +static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name272W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 }; static const CHAR description272A[] = "returned when an overlay member is called for a non-overlay surface"; static const WCHAR description272W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 }; -- 2.20.1

1 0

[PATCH] wbemprox: Fix the spelling of the free_associations() function name.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d4b169cdb..1f8afb46fe8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2600,7 +2600,7 @@ struct association WCHAR *ref2; }; -static void free_assocations( struct association *assoc, UINT count ) +static void free_associations( struct association *assoc, UINT count ) { UINT i; if (!assoc) return; @@ -2652,7 +2652,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2668,12 +2668,12 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } @@ -2953,7 +2953,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2969,12 +2969,12 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } -- 2.20.1

2 1

[PATCH] ole32: Fix the name of PropertyStorage_WriteWStringToStream().
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/stg_prop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 708147e51dc..505467cad5a 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1738,7 +1738,7 @@ static void PropertyStorage_MakePropertyIdOffset(DWORD propid, DWORD dwOffset, offsetof(PROPERTYIDOFFSET, dwOffset), dwOffset); } -static inline HRESULT PropertStorage_WriteWStringToStream(IStream *stm, +static inline HRESULT PropertyStorage_WriteWStringToStream(IStream *stm, LPCWSTR str, DWORD len, DWORD *written) { #ifdef WORDS_BIGENDIAN @@ -1788,7 +1788,7 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, if (FAILED(c->hr)) goto end; c->bytesWritten += sizeof(DWORD); - c->hr = PropertStorage_WriteWStringToStream(This->stm, key, keyLen, + c->hr = PropertyStorage_WriteWStringToStream(This->stm, key, keyLen, &count); if (FAILED(c->hr)) goto end; -- 2.20.1

1 0

[PATCH] input: Fix the spelling of a parameter name in a function prototype.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/interactioncontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/interactioncontext.h b/include/interactioncontext.h index a3a5f345984..c0892855fd7 100644 --- a/include/interactioncontext.h +++ b/include/interactioncontext.h @@ -184,7 +184,7 @@ HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration); HRESULT WINAPI GetPropertyInteractionContext(HINTERACTIONCONTEXT context, - INTERACTION_CONTEXT_PROPERTY proerty, UINT32 *value); + INTERACTION_CONTEXT_PROPERTY property, UINT32 *value); HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT context, INTERACTION_CONTEXT_PROPERTY property, UINT32 value); -- 2.20.1

1 0

[PATCH] rsaenh: A spelling fix in a comment.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/rsaenh/mpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 3fbca42a8ca..77c3fcaf748 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1009,7 +1009,7 @@ mp_add_d (mp_int * a, mp_digit b, mp_int * c) /* trim unused digits * * This is used to ensure that leading zero digits are - * trimed and the leading "used" digit will be non-zero + * trimmed and the leading "used" digit will be non-zero * Typically very fast. Also fixes the sign if there * are no more leading digits */ -- 2.20.1

1 0

[PATCH] d3dx9_36: Fix the spelling of a TRACE() message.
by Francois Gouget 28 Nov '19

28 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0bf8e3c38d..88168df1e1a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4254,7 +4254,7 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block); struct d3dx_recorded_parameter *record; - TRACE("iface %p, paramater_block %p.\n", iface, parameter_block); + TRACE("iface %p, parameter_block %p.\n", iface, parameter_block); if (!block || !block->offset) return D3DERR_INVALIDCALL; -- 2.20.1

1 0

[PATCH v2] ntdll: Fix tick count calculation on Mac.
by Chip Davis 28 Nov '19

28 Nov '19

Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Squash all three changes into one patch. configure.ac | 1 + dlls/kernel32/time.c | 4 ++++ dlls/ntdll/time.c | 4 ++++ server/request.c | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 817a8305186..716230aa7a2 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -78,6 +78,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..4e3d5583c7b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/server/request.c b/server/request.c index d2adb08a183..5610d392cf9 100644 --- a/server/request.c +++ b/server/request.c @@ -529,6 +529,10 @@ unsigned int get_tick_count(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; -- 2.21.0

3 2

[PATCH resend] d3dcompiler/tests: Don't test Stream on d3d10 since it is not a member of D3D10_SIGNATURE_PARAMETER_DESC.
by Sven Baars 28 Nov '19

28 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- Resent this patch now the testbot has updated. dlls/d3dcompiler_43/tests/reflection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d6..dc854ea47d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -740,8 +740,10 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); +#if D3D_COMPILER_VERSION ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", i, desc.Stream, pdesc->Stream); +#endif } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) -- 2.24.0

1 0

[PATCH v2] gdi32/tests: MoveToEx() does not return the old point.
by Francois Gouget 28 Nov '19

28 Nov '19

This behavior goes back to at least Windows XP. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Added the todo_wine since it does not match the Windows behavior. An alternative would be to mark the Windows behavior as broken. There's a good argument to be made about it since it does not match the documentation. But then the documentation is known to often be wrong and Windows' behavior has not wavered since Windows XP so it's not like this behavior is a bug that will be fixed. This is why I opted for documenting the Windows behavior and showing that Wine diverges. dlls/gdi32/tests/metafile.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6adafa37b82..3d0e45e10a6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2262,16 +2262,15 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + oldpoint.x = oldpoint.y = 11235; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + /* Windows 9x and older may have returned oldpoint as per the + * documentation. But Windows >= XP does not. + */ + todo_wine ok(broken(oldpoint.x == 11235 && oldpoint.y == 11235), + "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n", + oldpoint.x, oldpoint.y); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); -- 2.20.1

2 3

[PATCH] gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc.
by Francois Gouget 28 Nov '19

28 Nov '19

Windows 10 1507 still deleted it but 1607 no longer does. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Even calling GetObjectType() after calling DeleteMetaFile() still returns OBJ_METADC so I don't know when Windows actually destroys the metafile hdc. Maybe it does destroy it but GetObjectType() does not notice until the corresponding memory area is reused for something else? >From time to time there is a run with only two failures which I think gives credit to the above theory: https://test.winehq.org/data/aa3d01e65019fb2f135f74cf26cfa1661ca09325/index… In any case this behavior seems broken so I'm marking it as such in the test. dlls/gdi32/tests/metafile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f1978f7bdfd..6adafa37b82 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2082,7 +2082,9 @@ static void test_mf_Blank(void) ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hMetafile); ok(type == OBJ_METAFILE, "CloseMetaFile created object with type %d\n", type); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) @@ -2249,6 +2251,7 @@ static void test_mf_Graphics(void) HDC hdcMetafile; HMETAFILE hMetafile; POINT oldpoint; + INT type; BOOL ret; hdcMetafile = CreateMetaFileA(NULL); @@ -2275,7 +2278,9 @@ static void test_mf_Graphics(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2296,6 +2301,7 @@ static void test_mf_PatternBrush(void) LOGBRUSH *orig_lb; HBRUSH hBrush; BOOL ret; + INT type; orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); @@ -2316,7 +2322,9 @@ static void test_mf_PatternBrush(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_PATTERN_BRUSH_BITS, sizeof(MF_PATTERN_BRUSH_BITS), "mf_Pattern_Brush") != 0) -- 2.20.1

2 4

[v2 PATCH] comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.
by Nikolay Sivov 28 Nov '19

28 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed notification name in the comment dlls/comctl32/tests/toolbar.c | 4 ++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 41807258f4..3688394d71 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -159,6 +159,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) break; case TBN_GETINFOTIPA: + case TBN_GETINFOTIPW: { NMTBGETINFOTIPA *tbgit = (NMTBGETINFOTIPA*)lParam; @@ -2029,6 +2030,9 @@ static void test_tooltip(void) g_ResetDispTextPtr = TRUE; SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); + /* Same for TBN_GETINFOTIPW */ + SendMessageA(hToolbar, TB_SETUNICODEFORMAT, TRUE, 0); + SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); g_ResetDispTextPtr = FALSE; DestroyWindow(hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ceab5328bc..c302e6c111 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6149,7 +6149,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TBN_GETINFOTIPW - got string %s\n", debugstr_w(tbgit.pszText)); - len = lstrlenW(tbgit.pszText); + len = tbgit.pszText ? lstrlenW(tbgit.pszText) : 0; if (len > ARRAY_SIZE(lpnmtdi->szText) - 1) { /* need to allocate temporary buffer in infoPtr as there -- 2.24.0

1 0

[PATCH] comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.
by Nikolay Sivov 28 Nov '19

28 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 4 ++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 41807258f4..df8a36f6fa 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -159,6 +159,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) break; case TBN_GETINFOTIPA: + case TBN_GETINFOTIPW: { NMTBGETINFOTIPA *tbgit = (NMTBGETINFOTIPA*)lParam; @@ -2029,6 +2030,9 @@ static void test_tooltip(void) g_ResetDispTextPtr = TRUE; SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); + /* Same for TBN_GETDISPINFOW */ + SendMessageA(hToolbar, TB_SETUNICODEFORMAT, TRUE, 0); + SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); g_ResetDispTextPtr = FALSE; DestroyWindow(hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ceab5328bc..c302e6c111 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6149,7 +6149,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TBN_GETINFOTIPW - got string %s\n", debugstr_w(tbgit.pszText)); - len = lstrlenW(tbgit.pszText); + len = tbgit.pszText ? lstrlenW(tbgit.pszText) : 0; if (len > ARRAY_SIZE(lpnmtdi->szText) - 1) { /* need to allocate temporary buffer in infoPtr as there -- 2.24.0

1 0

[PATCH] explorerframe: Return success from ThumbBarSetImageList().
by Nikolay Sivov 28 Nov '19

28 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/taskbarlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 10ad84b639..44b8a8ab91 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -216,7 +216,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarSetImageList(ITaskbarList4 { FIXME("iface %p, hwnd %p, himl %p stub!\n", iface, hwnd, himl); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetOverlayIcon(ITaskbarList4 *iface, -- 2.24.0

1 0

[PATCH 1/4] comctl32/combo: Remove unnecessary argument from button painting helper.
by Nikolay Sivov 28 Nov '19

28 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/combo.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 1fa5f5ef21..827da37c0c 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -545,10 +545,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * * Paint combo button (normal, pressed, and disabled states). */ -static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) +static void CBPaintButton(HEADCOMBO *lphc, HDC hdc) { UINT buttonState = DFCS_SCROLLCOMBOBOX; + if (IsRectEmpty(&lphc->buttonRect)) + return; + if( lphc->wState & CBF_NOREDRAW ) return; @@ -559,7 +562,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) if (CB_DISABLED(lphc)) buttonState |= DFCS_INACTIVE; - DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); + DrawFrameControl(hdc, &lphc->buttonRect, DFC_SCROLL, buttonState); } /*********************************************************************** @@ -815,8 +818,7 @@ static LRESULT COMBO_Paint(HEADCOMBO *lphc, HDC hdc) */ CBPaintBorder(lphc->self, lphc, hdc); - if (!IsRectEmpty(&lphc->buttonRect)) - CBPaintButton(lphc, hdc, lphc->buttonRect); + CBPaintButton(lphc, hdc); /* paint the edit control padding area */ if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) -- 2.24.0

1 3

[PATCH 1/5] wined3d: Introduce wined3d_stateblock_get_state().
by Zebediah Figura 28 Nov '19

28 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 5 +++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 66 --------------------------------- include/wine/wined3d.h | 67 ++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1c3704c10a5..1196eb2a7f7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1699,6 +1699,11 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta return S_OK; } +const struct wined3d_stateblock_state * CDECL wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock) +{ + return &stateblock->stateblock_state; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fed5ce1b128..bec84b5979c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_capture(ptr ptr) @ cdecl wined3d_stateblock_create(ptr ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) +@ cdecl wined3d_stateblock_get_state(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ae7dab858e..4bc2ee19113 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -272,14 +272,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup } /* Device caps */ -#define WINED3D_MAX_STREAMS 16 -#define WINED3D_MAX_TEXTURES 8 -#define WINED3D_MAX_FRAGMENT_SAMPLERS 16 -#define WINED3D_MAX_VERTEX_SAMPLERS 4 -#define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) -#define WINED3D_MAX_ACTIVE_LIGHTS 8 #define WINED3D_MAX_SOFTWARE_ACTIVE_LIGHTS 32 -#define WINED3D_MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 @@ -699,10 +692,6 @@ enum wined3d_shader_conditional_op #define MAX_REG_INPUT 32 #define MAX_REG_OUTPUT 32 #define WINED3D_MAX_CBS 15 -#define WINED3D_MAX_CONSTS_B 16 -#define WINED3D_MAX_CONSTS_I 16 -#define WINED3D_MAX_VS_CONSTS_F 256 -#define WINED3D_MAX_PS_CONSTS_F 224 /* FIXME: This needs to go up to 2048 for * Shader model 3 according to msdn (and for software shaders) */ @@ -1504,8 +1493,6 @@ static inline void wined3d_colour_srgb_from_linear(struct wined3d_color *colour_ colour_srgb->a = colour->a; } -#define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ - void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; @@ -3121,25 +3108,6 @@ struct wined3d_stream_output UINT offset; }; -struct wined3d_stream_state -{ - struct wined3d_buffer *buffer; - UINT offset; - UINT stride; - UINT frequency; - UINT flags; -}; - -#define LIGHTMAP_SIZE 43 -#define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) - -struct wined3d_light_state -{ - /* Light hashmap. Collisions are handled using linked lists. */ - struct list light_map[LIGHTMAP_SIZE]; - const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS]; -}; - #define WINED3D_STATE_NO_REF 0x00000001 #define WINED3D_STATE_INIT_DEFAULT 0x00000002 @@ -3216,40 +3184,6 @@ struct wined3d_dummy_textures * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 -struct wined3d_stateblock_state -{ - struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; - struct wined3d_buffer *index_buffer; - enum wined3d_format_id index_format; - int base_vertex_index; - - struct wined3d_shader *vs; - struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; - struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; - BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; - - struct wined3d_shader *ps; - struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; - struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; - BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; - - DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; - struct wined3d_color blend_factor; - - struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; - DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - - struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; - struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; - struct wined3d_material material; - struct wined3d_viewport viewport; - RECT scissor_rect; - - struct wined3d_light_state light_state; -}; - struct wined3d_device { LONG ref; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index eba14e9a022..c5ada12d66f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -668,6 +668,7 @@ enum wined3d_transform_state }; #define WINED3D_TS_WORLD_MATRIX(index) (enum wined3d_transform_state)(index + 256) +#define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ enum wined3d_basis_type { @@ -1588,6 +1589,18 @@ enum wined3d_shader_type #define WINED3D_REGISTER_WINDOW_NO_ALT_ENTER 0x00000002u #define WINED3D_REGISTER_WINDOW_NO_PRINT_SCREEN 0x00000004u +#define WINED3D_MAX_STREAMS 16 +#define WINED3D_MAX_TEXTURES 8 +#define WINED3D_MAX_FRAGMENT_SAMPLERS 16 +#define WINED3D_MAX_VERTEX_SAMPLERS 4 +#define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) +#define WINED3D_MAX_CLIP_DISTANCES 8 +#define WINED3D_MAX_ACTIVE_LIGHTS 8 +#define WINED3D_MAX_CONSTS_B 16 +#define WINED3D_MAX_CONSTS_I 16 +#define WINED3D_MAX_VS_CONSTS_F 256 +#define WINED3D_MAX_PS_CONSTS_F 224 + struct wined3d_display_mode { UINT width; @@ -2111,6 +2124,59 @@ struct wined3d_output_desc HMONITOR monitor; }; +struct wined3d_stream_state +{ + struct wined3d_buffer *buffer; + UINT offset; + UINT stride; + UINT frequency; + UINT flags; +}; + +#define LIGHTMAP_SIZE 43 +#define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) + +struct wined3d_light_state +{ + /* Light hashmap. Collisions are handled using linked lists. */ + struct list light_map[LIGHTMAP_SIZE]; + const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS]; +}; + +struct wined3d_stateblock_state +{ + struct wined3d_vertex_declaration *vertex_declaration; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; + struct wined3d_buffer *index_buffer; + enum wined3d_format_id index_format; + int base_vertex_index; + + struct wined3d_shader *vs; + struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; + struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; + BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; + + struct wined3d_shader *ps; + struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; + struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; + BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; + + DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; + struct wined3d_color blend_factor; + + struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; + DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + + struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; + struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; + struct wined3d_material material; + struct wined3d_viewport viewport; + RECT scissor_rect; + + struct wined3d_light_state light_state; +}; + struct wined3d_parent_ops { void (__stdcall *wined3d_object_destroyed)(void *parent); @@ -2666,6 +2732,7 @@ void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, const struct wined3d_stateblock *device_state, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); +const struct wined3d_stateblock_state * __cdecl wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); -- 2.23.0

2 6

[PATCH v2] d3dx9: Implement D3DXCreateFragmentLinker/Ex
by Alistair Leslie-Hughes 28 Nov '19

28 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/shader.c | 232 +++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 100 +++++++++++++++ 2 files changed, 324 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea..8284d50ec1 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,243 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker +{ + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; + + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&fragment->ref); + + TRACE("%p increasing refcount to %u.\n", fragment, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&fragment->ref); + + TRACE("%p decreasing refcount to %u.\n", fragment, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(fragment->device); + heap_free(fragment); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p.\n", fragment, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(fragment->device); + + *device = fragment->device; + + TRACE("Returning device %p.\n", *device); - if (linker) - *linker = NULL; + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + FIXME("iface %p: stub.\n", fragment); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, index %u: stub.\n", fragment, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, + const char *name) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, name %s: stub.\n", fragment, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *frag_desc) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, name %p, frag_desc %p: stub.\n", fragment, name, frag_desc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, fragments %p: stub.\n", fragment, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, buffer %p: stub.\n", fragment, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, name %p, buffer %p: stub.\n", fragment, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, ID3DXBuffer **buffer, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, profile %s, flags 0x%x, fragmenthandles %p,fragments %u, buffer %p, errors %p: stub.\n", + fragment, debugstr_a(profile), flags, fragmenthandles, fragments, buffer, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, profile %s, flags 0x%x, fragmenthandles %p,fragments %u, shader %p, errors %p: stub.\n", + fragment, debugstr_a(profile), flags, fragmenthandles, fragments, shader, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); + + FIXME("iface %p, profile %s, flags 0x%x, fragmenthandles %p,fragments %u, shader %p, errors %p: stub.\n", + fragment, debugstr_a(profile), flags, fragmenthandles, fragments, shader, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + struct d3dx9_fragment_linker *fragment = impl_from_ID3DXFragmentLinker(iface); - if (linker) - *linker = NULL; + FIXME("iface %p): stub.\n", fragment); return E_NOTIMPL; } +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc411..7fb8de7e65 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,104 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + ULONG count; + ID3DXFragmentLinker *linker; + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(linker != NULL, "D3DXCreateFragmentLinker() failed, got NULL\n"); + linker->lpVtbl->Release(linker); + + count = IDirect3DDevice9_Release(device); + ok(!count, "The Direct3D device reference count was %u, should be 0\n", count); + + count = IDirect3D9_Release(d3d); + ok(!count, "The Direct3D object reference count was %u, should be 0\n", count); + + if (wnd) DestroyWindow(wnd); +} + +static void test_fragment_linkerex(void) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + ULONG count; + ID3DXFragmentLinker *linker; + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateFragmentLinkerEx(device, 1024, 0, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(linker != NULL, "D3DXCreateFragmentLinkerEx() failed, got NULL\n"); + linker->lpVtbl->Release(linker); + + count = IDirect3DDevice9_Release(device); + ok(!count, "The Direct3D device reference count was %u, should be 0\n", count); + + count = IDirect3D9_Release(d3d); + ok(!count, "The Direct3D object reference count was %u, should be 0\n", count); + + if (wnd) DestroyWindow(wnd); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6687,6 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); + test_fragment_linkerex(); } -- 2.17.1

1 0

[PATCH] dmime: Trace pbMemData/llMemLength on the same line.
by Alistair Leslie-Hughes 28 Nov '19

28 Nov '19

Maybe these functions should be a new wine/dmwine.h header? Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmband/dmutils.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dswave/dswave_main.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..a1dc7e28a5 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -137,7 +137,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); @@ -525,7 +525,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); } else { diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..3428a58b91 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -468,7 +468,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 7b3bcec079..cd955fd8a5 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -455,7 +455,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..10ba0bce93 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -491,7 +491,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..e7a0cd13a1 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -498,7 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index fd3abe5209..70b810a8df 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -509,7 +509,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 295cd84b82..0951cb9e95 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -468,7 +468,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index bb554deaa4..4f3a73d9e9 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -437,7 +437,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); -- 2.17.1

1 0

[PATCH 1/5] quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream().
by Zebediah Figura 28 Nov '19

28 Nov '19

IPin::EndOfStream() is called from a streaming thread. The streaming thread should never take the filter lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 2 -- dlls/strmbase/renderer.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fca1a710de..71851f6b4a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -236,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) break; This->in_loop = 1; - LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); - EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index dbb677e9ad..98d27cc83a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -88,13 +88,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) TRACE("iface %p.\n", iface); EnterCriticalSection(&pFilter->csRenderLock); - EnterCriticalSection(&pFilter->filter.csFilter); pFilter->eos = TRUE; if (pFilter->pFuncsTable->pfnEndOfStream) hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); else hr = BaseRendererImpl_EndOfStream(pFilter); - LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; } -- 2.24.0

1 4

[PATCH] d3dcompiler/tests: Don't test Stream on d3d10 since it is not a member of D3D10_SIGNATURE_PARAMETER_DESC.
by Sven Baars 27 Nov '19

27 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/d3dcompiler_43/tests/reflection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d6..dc854ea47d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -740,8 +740,10 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); +#if D3D_COMPILER_VERSION ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", i, desc.Stream, pdesc->Stream); +#endif } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) -- 2.24.0

2 4

[PATCH] d3dx9: Implement D3DXCreateFragmentLinker/Ex
by Alistair Leslie-Hughes 27 Nov '19

27 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/shader.c | 231 +++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 50 ++++++++ 2 files changed, 273 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea..b5b345880b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,242 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; - if (linker) - *linker = NULL; + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&This->ref); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&This->ref); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(This->device); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p\n", This, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(This->device); + + *device = This->device; + + TRACE("Returning device %p\n", *device); + + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%u): stub\n", This, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, const char *name) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%s): stub\n", This, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *frag_desc) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); - if (linker) - *linker = NULL; + FIXME("(%p)->(%p, %p): stub\n", This, name, frag_desc); return E_NOTIMPL; } +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%p): stub\n", This, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%p): stub\n", This, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, ID3DXBuffer **buffer, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%s, 0x%x, %p, %u, %p, %p): stub\n", This, debugstr_a(profile), flags, fragmenthandles, + fragments, buffer, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%s, 0x%x, %p, %u, %p, %p): stub\n", This, debugstr_a(profile), flags, fragmenthandles, + fragments, shader, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(%s, 0x%x, %p, %u, %p, %p): stub\n", This, debugstr_a(profile), flags, fragmenthandles, + fragments, shader, errors); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *This = impl_from_ID3DXFragmentLinker(iface); + + FIXME("(%p)->(): stub\n", This); + + return E_NOTIMPL; +} + +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc411..acd361a01e 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,54 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + ULONG count; + ID3DXFragmentLinker *linker; + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + linker->lpVtbl->Release(linker); + + count = IDirect3DDevice9_Release(device); + ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); + + count = IDirect3D9_Release(d3d); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); + + if (wnd) DestroyWindow(wnd); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6637,6 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); + test_fragment_linker(); } -- 2.17.1

2 2

[PATCH 2/2] dmime: At least trace the DMUS_FOURCC_TRACK_EXTRAS_CHUNK
by Michael Stefaniuc 27 Nov '19

27 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c9d33af31..5284ac5fec 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -624,6 +624,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, IPersistStream *ps = NULL; IStream *clone; DMUS_IO_TRACK_HEADER thdr; + DMUS_IO_TRACK_EXTRAS_HEADER txhdr; HRESULT hr; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -654,8 +655,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, chunk.type == thdr.fccType)) break; - if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK) + if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && + SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); + TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + } } if (hr != S_OK) return hr == S_FALSE ? DMUS_E_TRACK_NOT_FOUND : hr; -- 2.20.1

1 0

[PATCH 1/2] dmime: Print the track groups consistently in hexadecimal
by Michael Stefaniuc 27 Nov '19

27 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index e3acafe979..3c9d33af31 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %d,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -637,7 +637,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %d\n", thdr.dwGroup); + TRACE("\tdwGroup: %#x\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); -- 2.20.1

1 0

[PATCH] winex11.drv: Prefer Xinerama handler over XRandr10.
by Derek Lesho 27 Nov '19

27 Nov '19

This fixes a regression on XWayland introduced by 914b551's removal of the raised Xinerama priority when query_screens failed. Ideally, we'd like XWayland to fix their issues with XRandr and Xinerama, but this helps out users until then. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5616857347..6bbf1b67ee 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1096,6 +1096,7 @@ void X11DRV_XRandR_Init(void) int event_base, error_base, minor, ret; static int major; Bool ok; + INT priority = 200; if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ @@ -1121,13 +1122,17 @@ void X11DRV_XRandR_Init(void) if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) #endif + { + /* lower priority below Xinerama if we need to resort to xrandr10 */ + priority = 50; xrandr10_init_modes(); + } #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) { handler.name = "XRandR 1.4"; - handler.priority = 200; + handler.priority = priority; handler.get_gpus = xrandr14_get_gpus; handler.get_adapters = xrandr14_get_adapters; handler.get_monitors = xrandr14_get_monitors; -- 2.24.0

2 2

[PATCH 1/2] kernelbase: Autoset GeoID on process launch.
by João Diogo Ferreira 27 Nov '19

27 Nov '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 174002, 173827 --- dlls/kernelbase/locale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 512c3aeeb1..2e40fc166d 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -108,6 +108,7 @@ void init_locale(void) { LCID lcid = GetUserDefaultLCID(); WCHAR bufferW[80]; + GEOID geoid = GEOID_NOT_AVAILABLE; DWORD count, i; HKEY hkey; @@ -147,6 +148,11 @@ void init_locale(void) (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); } + GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IGEOID | LOCALE_RETURN_NUMBER, + (WCHAR *)&geoid, sizeof(geoid)/sizeof(WCHAR) ); + + SetUserGeoID(geoid); + if (!RegCreateKeyExW( nls_key, L"Codepage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { -- 2.24.0

2 3

[PATCH v2 1/2] include: add definitions for ShellLinkDataBlocks in shlobj.h
by Vijay Kiran Kamuju 27 Nov '19

27 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/shlobj.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6cbd..9a7741a19378 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1397,7 +1397,13 @@ typedef enum { SLDF_FORCE_NO_LINKTRACK = 0x00040000, SLDF_ENABLE_TARGET_METADATA = 0x00080000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SLDF_VALID = 0x003ff7ff, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1407,6 +1413,35 @@ typedef struct tagDATABLOCKHEADER DWORD dwSignature; } DATABLOCK_HEADER, *LPDATABLOCK_HEADER, *LPDBLIST; +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + typedef struct { DATABLOCK_HEADER dbh; CHAR szDarwinID[MAX_PATH]; -- 2.21.0

1 1

[PATCH 1/2] include: add definitions for ShellLinkDataBlocks in shlobj.h
by Vijay Kiran Kamuju 27 Nov '19

27 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/shlobj.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6cbd..9a7741a19378 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1397,7 +1397,13 @@ typedef enum { SLDF_FORCE_NO_LINKTRACK = 0x00040000, SLDF_ENABLE_TARGET_METADATA = 0x00080000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SLDF_VALID = 0x003ff7ff, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1407,6 +1413,35 @@ typedef struct tagDATABLOCKHEADER DWORD dwSignature; } DATABLOCK_HEADER, *LPDATABLOCK_HEADER, *LPDBLIST; +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + typedef struct { DATABLOCK_HEADER dbh; CHAR szDarwinID[MAX_PATH]; -- 2.21.0

2 2

[PATCH] comctl32/tests: Fix combobox height after SetItemHeight, SetWindowPos.
by Thales 27 Nov '19

27 Nov '19

4 6

[PATCH] ntdll: Fix implicit declaration of mach_port_deallocate.
by Gijs Vermeulen 27 Nov '19

27 Nov '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/ntdll/nt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 589fb68d7a..cdc893b6a2 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -79,6 +79,7 @@ #include "ddk/wdm.h" #ifdef __APPLE__ +#include <mach/mach.h> #include <mach/mach_init.h> #include <mach/mach_host.h> #include <mach/vm_map.h> -- 2.24.0

2 2

[PATCH 4/4 v2] ucrtbase: Consolidate strftime code for formats %g %G %V.
by Piotr Caban 27 Nov '19

27 Nov '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-)

1 0

[PATCH 3/4 v2] ucrtbase: Add support for strftime format %V.
by Piotr Caban 27 Nov '19

27 Nov '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 13 +++++++++ dlls/ucrtbase/tests/misc.c | 57 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4 v2] ucrtbase: Use correct type for year with strftime format %g.
by Piotr Caban 27 Nov '19

27 Nov '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 16 ++++++++++------ dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4 v2] ucrtbase: Expand tests for strftime format %g.
by Piotr Caban 27 Nov '19

27 Nov '19

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - no functional changes (only style) dlls/ucrtbase/tests/misc.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)

1 0

[PATCH] ddraw/tests: Fix a typo in comment.
by Andrey Gusev 27 Nov '19

27 Nov '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 71d805d554..c3d575d31a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14649,7 +14649,7 @@ static void test_depth_readback(void) * * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. * - * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * Geforce 9 GPUs return broken data for D16 that resembles the expected data in * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return * 0x00ffffff. * -- 2.23.0

2 1

[PATCH vkd3d v3 1/2] vkd3d: Remove alignment validation from GetResourceAllocationInfo().
by Conor McCarthy 27 Nov '19

27 Nov '19

The right place for alignment validation is d3d12_resource_validate_desc(). The mod alignment test, which returns a size of ~0 on failure, is incorrect on systems where Vulkan requires alignments of 0x20000 or more, and breaks Hitman 2, which uses the returned value unchecked and allocates heaps of 0xffffffff bytes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes 174431. --- libs/vkd3d/device.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 31d793f..e3bb2aa 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2899,10 +2899,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour UINT count, const D3D12_RESOURCE_DESC *resource_descs) { struct d3d12_device *device = impl_from_ID3D12Device(iface); - const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; uint64_t requested_alignment; - uint64_t estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2926,9 +2924,6 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } - requested_alignment = desc->Alignment - ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { info->SizeInBytes = desc->Width; @@ -2942,27 +2937,9 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } + requested_alignment = desc->Alignment + ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; info->Alignment = max(info->Alignment, requested_alignment); - - if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - { - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) - { - WARN("Invalid format %#x.\n", desc->Format); - goto invalid; - } - - estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; - if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); - } - } - - if (desc->Alignment % info->Alignment) - { - WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", - desc->Alignment, info->Alignment); - goto invalid; } info->SizeInBytes = align(info->SizeInBytes, info->Alignment); -- 2.24.0

2 3

[PATCH vkd3d v2 1/3] vkd3d: Validate texture resource alignments.
by Conor McCarthy 27 Nov '19

27 Nov '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Remove unnecessary struct d3d12_device *device. --- libs/vkd3d/device.c | 4 +-- libs/vkd3d/resource.c | 56 +++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 59859ad..31d793f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2920,7 +2920,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour desc = &resource_descs[0]; - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); goto invalid; @@ -3226,7 +3226,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f5cdf4a..6e8c98e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1001,7 +1001,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); - assert(d3d12_resource_validate_desc(desc) == S_OK); + assert(d3d12_resource_validate_desc(desc, device) == S_OK); if (!desc->MipLevels) { @@ -1591,8 +1591,45 @@ static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags) FIXME("Ignoring D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER.\n"); } -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) +static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC *desc, + const struct vkd3d_format *format) { + uint64_t estimated_size; + + if (!desc->Alignment) + return true; + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + && (desc->SampleDesc.Count == 1 || desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid resource alignment %#"PRIx64".\n", desc->Alignment); + return false; + } + + if (desc->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + /* Windows uses the slice size to determine small alignment eligibility. DepthOrArraySize is ignored. */ + estimated_size = desc->Width * desc->Height * format->byte_count * format->block_byte_count + / (format->block_width * format->block_height); + if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid resource alignment %#"PRIx64" (required %#x).\n", + desc->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + return false; + } + } + + /* The size check for MSAA textures with D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT is probably + * not important. The 4MB requirement is no longer universal and Vulkan has no such requirement. */ + + return true; +} + +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) +{ + const struct vkd3d_format *format; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -1618,10 +1655,17 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) WARN("1D texture with a height of %u.\n", desc->Height); return E_INVALIDARG; } - break; - + /* Fall through. */ case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + { + WARN("Invalid format %#x.\n", desc->Format); + return E_INVALIDARG; + } + + if (!d3d12_resource_validate_texture_alignment(desc, format)) + return E_INVALIDARG; break; default: @@ -1631,8 +1675,6 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) d3d12_validate_resource_flags(desc->Flags); - /* FIXME: Validate alignment for textures. */ - return S_OK; } @@ -1703,7 +1745,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; - if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; switch (desc->Dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df8d1a1..9ff6bba 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -435,7 +435,7 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour } bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, -- 2.24.0

2 5

[PATCH] crypt32: Fix a typo in comment.
by Andrey Gusev 27 Nov '19

27 Nov '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/crypt32/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ea96248bd7..f591a5e72e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -922,7 +922,7 @@ typedef struct _CSignedMsgData } CSignedMsgData; /* Constructs the signer handles for the signerIndex'th signer of msg_data. - * Assumes signerIndex is a valid idnex, and that msg_data's info has already + * Assumes signerIndex is a valid index, and that msg_data's info has already * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data, -- 2.23.0

1 0

[PATCH] sapiaut.idl: Fix a typo.
by Andrey Gusev 27 Nov '19

27 Nov '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 8f2b1f9a10..4ae4ebe231 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1956,7 +1956,7 @@ interface ISpeechRecognizer : IDispatch HRESULT State([out,retval] SpeechRecognizerState *state); [propget, id(DISPID_SRStatus)] - HRESULT Status([out,retval] ISpeechRecognizerStatus **satus); + HRESULT Status([out,retval] ISpeechRecognizerStatus **status); [propputref, id(DISPID_SRProfile)] HRESULT Profile([in,defaultvalue(0)] ISpeechObjectToken *profile); -- 2.23.0

1 0

[PATCH 1/6] d3d9: Fix a copy-paste error.
by Zebediah Figura 27 Nov '19

27 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0657cc2f766..58bdd7458c2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2403,7 +2403,7 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) if (device->recording) { wined3d_mutex_unlock(); - WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } -- 2.23.0

3 12

[PATCH vkd3d 1/3] vkd3d: Validate texture resource alignments.
by Conor McCarthy 27 Nov '19

27 Nov '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 4 +-- libs/vkd3d/resource.c | 56 +++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 59859ad..31d793f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2920,7 +2920,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour desc = &resource_descs[0]; - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); goto invalid; @@ -3226,7 +3226,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (FAILED(d3d12_resource_validate_desc(desc))) + if (FAILED(d3d12_resource_validate_desc(desc, device))) { WARN("Invalid resource desc.\n"); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f5cdf4a..6e8c98e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1001,7 +1001,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); - assert(d3d12_resource_validate_desc(desc) == S_OK); + assert(d3d12_resource_validate_desc(desc, device) == S_OK); if (!desc->MipLevels) { @@ -1591,8 +1591,45 @@ static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags) FIXME("Ignoring D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER.\n"); } -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) +static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC *desc, + struct d3d12_device *device, const struct vkd3d_format *format) { + uint64_t estimated_size; + + if (!desc->Alignment) + return true; + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + && (desc->SampleDesc.Count == 1 || desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid resource alignment %#"PRIx64".\n", desc->Alignment); + return false; + } + + if (desc->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + /* Windows uses the slice size to determine small alignment eligibility. DepthOrArraySize is ignored. */ + estimated_size = desc->Width * desc->Height * format->byte_count * format->block_byte_count + / (format->block_width * format->block_height); + if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid resource alignment %#"PRIx64" (required %#x).\n", + desc->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + return false; + } + } + + /* The size check for MSAA textures with D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT is probably + * not important. The 4MB requirement is no longer universal and Vulkan has no such requirement. */ + + return true; +} + +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) +{ + const struct vkd3d_format *format; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -1618,10 +1655,17 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) WARN("1D texture with a height of %u.\n", desc->Height); return E_INVALIDARG; } - break; - + /* Fall through. */ case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + { + WARN("Invalid format %#x.\n", desc->Format); + return E_INVALIDARG; + } + + if (!d3d12_resource_validate_texture_alignment(desc, device, format)) + return E_INVALIDARG; break; default: @@ -1631,8 +1675,6 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) d3d12_validate_resource_flags(desc->Flags); - /* FIXME: Validate alignment for textures. */ - return S_OK; } @@ -1703,7 +1745,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; - if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; switch (desc->Dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df8d1a1..9ff6bba 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -435,7 +435,7 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour } bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, -- 2.24.0

1 2

[PATCH v2 1/3] ddraw: Fix conversion of v1 viewport from v2 in d3d_viewport_GetViewport().
by Paul Gofman 27 Nov '19

27 Nov '19

Spotted in https://bugs.winehq.org/show_bug.cgi?id=19471. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - remove todo_wine from now successful tests in d3d.c. dlls/ddraw/tests/d3d.c | 26 +++++----- dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++------------ dlls/ddraw/viewport.c | 13 ++--- 3 files changed, 94 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 64f68fde56..e606010a9c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -991,21 +991,21 @@ static void ViewportTest(void) ret_vp1_data.dwSize = sizeof(vp1_data); hr = IDirect3DViewport2_GetViewport(Viewport2, &ret_vp1_data); - ok(hr == D3D_OK, "IDirect3DViewport2_GetViewport returned %08x\n", hr); - - ok(ret_vp1_data.dwX == vp2_data.dwX, "dwX is %u, expected %u\n", ret_vp1_data.dwX, vp2_data.dwX); - ok(ret_vp1_data.dwY == vp2_data.dwY, "dwY is %u, expected %u\n", ret_vp1_data.dwY, vp2_data.dwY); - ok(ret_vp1_data.dwWidth == vp2_data.dwWidth, "dwWidth is %u, expected %u\n", ret_vp1_data.dwWidth, vp2_data.dwWidth); - ok(ret_vp1_data.dwHeight == vp2_data.dwHeight, "dwHeight is %u, expected %u\n", ret_vp1_data.dwHeight, vp2_data.dwHeight); - ok(ret_vp1_data.dvMaxX == vp1_data.dvMaxX, "dvMaxX is %f, expected %f\n", ret_vp1_data.dvMaxX, vp1_data.dvMaxX); - ok(ret_vp1_data.dvMaxY == vp1_data.dvMaxY, "dvMaxY is %f, expected %f\n", ret_vp1_data.dvMaxY, vp1_data.dvMaxY); - todo_wine ok(ret_vp1_data.dvScaleX == infinity, "dvScaleX is %f, expected %f\n", ret_vp1_data.dvScaleX, infinity); - todo_wine ok(ret_vp1_data.dvScaleY == infinity, "dvScaleY is %f, expected %f\n", ret_vp1_data.dvScaleY, infinity); - todo_wine ok(ret_vp1_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0\n", ret_vp1_data.dvMinZ); - todo_wine ok(ret_vp1_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0\n", ret_vp1_data.dvMaxZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(ret_vp1_data.dwX == vp2_data.dwX, "dwX is %u, expected %u.\n", ret_vp1_data.dwX, vp2_data.dwX); + ok(ret_vp1_data.dwY == vp2_data.dwY, "dwY is %u, expected %u.\n", ret_vp1_data.dwY, vp2_data.dwY); + ok(ret_vp1_data.dwWidth == vp2_data.dwWidth, "dwWidth is %u, expected %u.\n", ret_vp1_data.dwWidth, vp2_data.dwWidth); + ok(ret_vp1_data.dwHeight == vp2_data.dwHeight, "dwHeight is %u, expected %u.\n", ret_vp1_data.dwHeight, vp2_data.dwHeight); + ok(ret_vp1_data.dvMaxX == vp1_data.dvMaxX, "dvMaxX is %f, expected %f.\n", ret_vp1_data.dvMaxX, vp1_data.dvMaxX); + ok(ret_vp1_data.dvMaxY == vp1_data.dvMaxY, "dvMaxY is %f, expected %f.\n", ret_vp1_data.dvMaxY, vp1_data.dvMaxY); + ok(ret_vp1_data.dvScaleX == infinity, "dvScaleX is %f, expected %f.\n", ret_vp1_data.dvScaleX, infinity); + ok(ret_vp1_data.dvScaleY == infinity, "dvScaleY is %f, expected %f.\n", ret_vp1_data.dvScaleY, infinity); + ok(ret_vp1_data.dvMinZ == 0.0, "dvMinZ is %f, expected 0.0.\n", ret_vp1_data.dvMinZ); + ok(ret_vp1_data.dvMaxZ == 1.0, "dvMaxZ is %f, expected 1.0.\n", ret_vp1_data.dvMaxZ); hr = IDirect3DViewport2_SetViewport2(Viewport2, &vp2_data); - ok(hr == D3D_OK, "IDirect3DViewport2_SetViewport2 returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&ret_vp2_data, 0xff, sizeof(ret_vp2_data)); ret_vp2_data.dwSize = sizeof(vp2_data); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e61d67d723..114f4b5ed6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1591,19 +1591,19 @@ static ULONG get_refcount(IUnknown *test_iface) static void test_viewport_object(void) { - IDirectDraw4 *ddraw; - IDirect3D3 *d3d; - HRESULT hr, old_d3d_ref; - ULONG ref; - D3DVIEWPORT vp; - D3DVIEWPORT2 vp2; - IDirect3DViewport *viewport; - IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3, *another_vp, *test_vp; IDirectDrawGammaControl *gamma; + IDirect3DViewport2 *viewport2; + IDirect3DViewport *viewport; + IDirect3DDevice3 *device; + HRESULT hr, old_d3d_ref; + IDirectDraw4 *ddraw; IUnknown *unknown; + D3DVIEWPORT2 vp2; + IDirect3D3 *d3d; + D3DVIEWPORT vp; HWND window; - IDirect3DDevice3 *device; + ULONG ref; union { D3DVIEWPORT2 vp2; @@ -1619,13 +1619,13 @@ static void test_viewport_object(void) return; } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); old_d3d_ref = get_refcount((IUnknown *) d3d); hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); @@ -1654,11 +1654,11 @@ static void test_viewport_object(void) gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!gamma, "Interface not set to NULL by failed QI call: %p\n", gamma); + ok(!gamma, "Interface not set to NULL by failed QI call: %p.\n", gamma); /* NULL iid: Segfaults */ hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport, (void **)&viewport); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1667,7 +1667,7 @@ static void test_viewport_object(void) viewport = NULL; hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport3, (void **)&viewport2); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1675,7 +1675,7 @@ static void test_viewport_object(void) IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); - ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount(unknown); @@ -1688,7 +1688,7 @@ static void test_viewport_object(void) ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_CreateViewport(d3d, &another_vp, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); /* Setting a viewport not in the viewport list fails */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); @@ -1696,21 +1696,21 @@ static void test_viewport_object(void) /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice3_AddViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice3_AddViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 2, "Got unexpected refcount %u.\n", ref); test_vp = (IDirect3DViewport3 *) 0xbaadc0de; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p\n", test_vp); + ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p.\n", test_vp); hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) device); @@ -1718,8 +1718,8 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); ref = get_refcount((IUnknown *) viewport3); ok(ref == 4, "Got unexpected refcount %u.\n", ref); if (test_vp) @@ -1729,17 +1729,17 @@ static void test_viewport_object(void) /* Cannot set the viewport to NULL */ hr = IDirect3DDevice3_SetCurrentViewport(device, NULL); - ok(hr == DDERR_INVALIDPARAMS, "Failed to set viewport to NULL, hr %#x.\n", hr); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); if (test_vp) IDirect3DViewport3_Release(test_vp); /* SetCurrentViewport properly releases the old viewport's reference */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1748,7 +1748,7 @@ static void test_viewport_object(void) /* Unlike device2::DeleteViewport, device3::DeleteViewport releases the * reference held by SetCurrentViewport */ hr = IDirect3DDevice3_DeleteViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 1, "Got unexpected refcount %u.\n", ref); @@ -1756,11 +1756,11 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(!test_vp, "Got unexpected viewport %p\n", test_vp); + ok(!test_vp, "Got unexpected viewport %p.\n", test_vp); /* Setting a different viewport doesn't have any surprises now */ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1790,10 +1790,52 @@ static void test_viewport_object(void) vp.dwSize = sizeof(vp); hr = IDirect3DViewport3_SetViewport(viewport3, &vp); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); vp2.dwSize = sizeof(vp2); hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + vp2.dwSize = sizeof(vp2); + vp2.dwX = 160; + vp2.dwY = 120; + vp2.dwWidth = 640 - vp2.dwX; + vp2.dwHeight = 480 - vp2.dwY; + vp2.dvClipX = 2.0f; + vp2.dvClipY = -1.75f; + vp2.dvClipWidth = 2.5f; + vp2.dvClipHeight = -1.5f; + vp2.dvMinZ = 0.5f; + vp2.dvMaxZ = 2.0f; + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == 4.5f && vp.dvMaxY == -1.75f && vp.dvScaleX == 192.0f + && vp.dvScaleY == -240.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + + vp2.dvClipX = -1.5f; + vp2.dvClipY = 1.75f; + vp2.dvClipWidth = -1.5f; + vp2.dvClipHeight = 2.0f; + vp2.dvMinZ = 2.0f; + vp2.dvMaxZ = 0.5f; + + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == -3.0f && vp.dvMaxY == 1.75f && vp.dvScaleX == -320.0f + && vp.dvScaleY == 180.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); /* Destroying the device removes the viewport and releases the reference */ IDirect3DDevice3_Release(device); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5fc7a4b2be..ceb5582524 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -350,12 +350,13 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE vp1.dwY = viewport->viewports.vp2.dwY; vp1.dwWidth = viewport->viewports.vp2.dwWidth; vp1.dwHeight = viewport->viewports.vp2.dwHeight; - vp1.dvMaxX = 0.0f; - vp1.dvMaxY = 0.0f; - vp1.dvScaleX = 0.0f; - vp1.dvScaleY = 0.0f; - vp1.dvMinZ = viewport->viewports.vp2.dvMinZ; - vp1.dvMaxZ = viewport->viewports.vp2.dvMaxZ; + + vp1.dvScaleX = vp1.dwWidth / viewport->viewports.vp2.dvClipWidth; + vp1.dvScaleY = vp1.dwHeight / viewport->viewports.vp2.dvClipHeight; + vp1.dvMaxX = viewport->viewports.vp2.dvClipWidth + viewport->viewports.vp2.dvClipX; + vp1.dvMaxY = viewport->viewports.vp2.dvClipY; + vp1.dvMinZ = 0.0f; + vp1.dvMaxZ = 1.0f; memcpy(vp, &vp1, size); } -- 2.23.0

3 7

[PATCH] d3dcompiler/tests: Fix a copy-paste error.
by Sven Baars 27 Nov '19

27 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/d3dcompiler_43/tests/reflection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 810eac8936..f8c97230d6 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -434,7 +434,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -459,7 +459,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -741,7 +741,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -772,7 +772,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1009,7 +1009,7 @@ static void test_reflection_desc_ps_output(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count); -- 2.17.1

2 1

[PATCH 1/3] comctl32/combo: Simplify rectangles sizing helper.
by Nikolay Sivov 27 Nov '19

27 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/combo.c | 163 ++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 599817aed4..57fddefc93 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -307,111 +307,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); - - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -472,7 +431,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1472,11 +1431,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1504,11 +1459,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1537,11 +1488,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2049,7 +1996,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH: -- 2.24.0

1 2

[PATCH v3] vkd3d: Add test case for SM 5.1 register spaces.
by Hans-Kristian Arntzen 27 Nov '19

27 Nov '19

Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- tests/d3d12.c | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e8a6261..85b0454 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32356,6 +32356,385 @@ static void test_bufinfo_instruction(void) destroy_test_context(&context); } +static void test_register_space_sm51(void) +{ + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_ROOT_PARAMETER root_parameters[2]; + + ID3D12Resource *input_buffers[8]; + ID3D12Resource* input_buffer_counter; + ID3D12Resource *textures[2]; + + struct resource_readback rb; + + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + unsigned int i, descriptor_size; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + unsigned int counter_value; + + static const DWORD cs_code[] = + { +#if 0 + cbuffer CBuf : register(b1, space1) + { + float4 cbuffer_data; + }; + + Buffer<float4> Buf : register(t1, space2); + ByteAddressBuffer AddrBuf : register(t1, space3); + StructuredBuffer<float4> StructuredBuf : register(t1, space4); + RWBuffer<float4> RWBuf : register(u1, space5); + RWByteAddressBuffer RWAddrBuf : register(u1, space6); + RWStructuredBuffer<float4> RWStructuredBuf : register(u1, space7); + RWStructuredBuffer<float4> RWStructuredBufResult : register(u1, space8); + + Texture2D<float4> Tex : register(t1, space9); + RWTexture2D<float> RWTex : register(u1, space10); + SamplerState Samp : register(s1, space11); + + [numthreads(1, 1, 1)] + void main() + { + float4 res = 1.0.xxxx; + + res *= cbuffer_data; + res *= Buf[0]; + res *= asfloat(AddrBuf.Load4(0)); + res *= StructuredBuf[0]; + res *= RWBuf[0]; + res *= asfloat(RWAddrBuf.Load4(0)); + res *= RWStructuredBuf[0]; + + res *= Tex.SampleLevel(Samp, float2(0.5, 0.5), 0.0).xxxx; + res *= RWTex[int2(0, 0)].xxxx; + + RWStructuredBuf.IncrementCounter(); + RWStructuredBufResult[0] = res; + } +#endif + 0x43425844, 0x70f33bd3, 0x11527a3b, 0x08c5298b, 0x28a1f88e, 0x00000001, 0x00000434, 0x00000004, + 0x00000030, 0x00000040, 0x00000050, 0x00000424, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000003cc, 0x00050051, 0x000000f3, + 0x0100086a, 0x07000059, 0x00308e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0x00000001, 0x0000000b, 0x07000858, 0x00307e46, + 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000002, 0x060000a1, 0x00307e46, 0x00000001, + 0x00000001, 0x00000001, 0x00000003, 0x070000a2, 0x00307e46, 0x00000002, 0x00000001, 0x00000001, + 0x00000010, 0x00000004, 0x07001858, 0x00307e46, 0x00000003, 0x00000001, 0x00000001, 0x00005555, + 0x00000009, 0x0700089c, 0x0031ee46, 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000005, + 0x0600009d, 0x0031ee46, 0x00000001, 0x00000001, 0x00000001, 0x00000006, 0x0780009e, 0x0031ee46, + 0x00000002, 0x00000001, 0x00000001, 0x00000010, 0x00000007, 0x0700009e, 0x0031ee46, 0x00000003, + 0x00000001, 0x00000001, 0x00000010, 0x00000008, 0x0700189c, 0x0031ee46, 0x00000004, 0x00000001, + 0x00000001, 0x00005555, 0x0000000a, 0x02000068, 0x00000002, 0x0400009b, 0x00000001, 0x00000001, + 0x00000001, 0x0b00002d, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00207e46, 0x00000000, 0x00000001, 0x09000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00308e46, 0x00000000, 0x00000001, 0x00000000, 0x080000a5, 0x001000f2, 0x00000001, + 0x00004001, 0x00000000, 0x00207e46, 0x00000001, 0x00000001, 0x07000038, 0x001000f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a0000a7, 0x001000f2, 0x00000001, 0x00004001, + 0x00000000, 0x00004001, 0x00000000, 0x00207e46, 0x00000002, 0x00000001, 0x07000038, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0b0000a3, 0x001000f2, 0x00000001, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0021ee46, 0x00000000, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x080000a5, + 0x001000f2, 0x00000001, 0x00004001, 0x00000000, 0x0021ee46, 0x00000001, 0x00000001, 0x07000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a0000a7, 0x001000f2, + 0x00000001, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x0021ee46, 0x00000002, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x10000048, + 0x00100012, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00207e46, + 0x00000003, 0x00000001, 0x00206000, 0x00000000, 0x00000001, 0x00004001, 0x00000000, 0x07000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100006, 0x00000001, 0x0b0000a3, 0x00100012, + 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0021ee46, 0x00000004, + 0x00000001, 0x07000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100006, 0x00000001, + 0x060000b2, 0x00100012, 0x00000001, 0x0021e000, 0x00000002, 0x00000001, 0x0a0000a8, 0x0021e0f2, + 0x00000003, 0x00000001, 0x00004001, 0x00000000, 0x00004001, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e, 0x30494653, 0x00000008, 0x00000800, 0x00000000, + }; + + static const D3D12_DESCRIPTOR_RANGE_TYPE range_types[] = { + /* CBV<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_CBV, + /* Buffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* ByteAddressBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* StructuredBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* RWBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWByteAddressBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWStructuredBuffer<> with atomic counter */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* RWStructuredBuffer<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* Texture<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_SRV, + /* RWTexture<> */ + D3D12_DESCRIPTOR_RANGE_TYPE_UAV, + /* SamplerState */ + D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, + }; + + static const float buffer_data[ARRAY_SIZE(range_types) - 1][D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT / sizeof(float)] = { + { 2.0f, 2.0f, 2.0f, 2.0f }, + { 3.0f, 3.0f, 3.0f, 3.0f }, + { 4.0f, 4.0f, 4.0f, 4.0f }, + { 5.0f, 5.0f, 5.0f, 5.0f }, + { 6.0f, 6.0f, 6.0f, 6.0f }, + { 7.0f, 7.0f, 7.0f, 7.0f }, + { 8.0f, 8.0f, 8.0f, 8.0f }, + { 9.0f, 9.0f, 9.0f, 9.0f }, + { 10.0f, 10.0f, 10.0f, 10.0f }, + { 11.0f, 11.0f, 11.0f, 11.0f }, + }; + + static const uint8_t zero_data[D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT] = { 0 }; + + D3D12_DESCRIPTOR_RANGE descriptor_range[ARRAY_SIZE(range_types)]; + + if (!init_compute_test_context(&context)) + return; + command_list = context.list; + queue = context.queue; + + root_signature_desc.NumParameters = 2; + root_signature_desc.Flags = 0; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.pParameters = root_parameters; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[0].DescriptorTable.NumDescriptorRanges = ARRAY_SIZE(range_types) - 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0]; + + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[ARRAY_SIZE(range_types) - 1]; + + memset(descriptor_range, 0, sizeof(descriptor_range)); + + for (i = 0; i < ARRAY_SIZE(range_types); i++) + { + descriptor_range[i].NumDescriptors = 1; + descriptor_range[i].BaseShaderRegister = 1; + descriptor_range[i].RegisterSpace = i + 1; + descriptor_range[i].OffsetInDescriptorsFromTableStart = (i != ARRAY_SIZE(range_types) - 1) ? i : 0; + descriptor_range[i].RangeType = range_types[i]; + } + + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_compute_pipeline_state(context.device, + context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, ARRAY_SIZE(range_types) - 1); + sampler_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); + + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP; + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(sampler_heap); + ID3D12Device_CreateSampler(context.device, &sampler_desc, cpu_handle); + + descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(context.device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + /* CBV<> */ + input_buffers[0] = create_default_buffer(context.device, sizeof(buffer_data[0]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* Buffer<> */ + input_buffers[1] = create_default_buffer(context.device, sizeof(buffer_data[1]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* ByteAddressBuffer<> */ + input_buffers[2] = create_default_buffer(context.device, sizeof(buffer_data[2]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* StructuredBuffer<> */ + input_buffers[3] = create_default_buffer(context.device, sizeof(buffer_data[3]), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWBuffer<> */ + input_buffers[4] = create_default_buffer(context.device, sizeof(buffer_data[4]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWByteAddressBuffer<> */ + input_buffers[5] = create_default_buffer(context.device, sizeof(buffer_data[5]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + /* RWStructuredBuffer<> with counter */ + input_buffers[6] = create_default_buffer(context.device, sizeof(buffer_data[6]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + input_buffer_counter = create_default_buffer(context.device, sizeof(buffer_data[6]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + /* RWStructuredBuffer<> without counter */ + input_buffers[7] = create_default_buffer(context.device, sizeof(buffer_data[7]), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + textures[0] = create_default_texture2d(context.device, 1, 1, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + textures[1] = create_default_texture2d(context.device, 1, 1, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + + /* CBV<> */ + cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(input_buffers[0]); + cbv_desc.SizeInBytes = sizeof(buffer_data[0]); + ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* Buffer<> */ + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + srv_desc.Buffer.StructureByteStride = 0; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[1], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* ByteAddressBuffer<> */ + srv_desc.Format = DXGI_FORMAT_R32_TYPELESS; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 4; + srv_desc.Buffer.StructureByteStride = 0; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[2], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* StructuredBuffer<> */ + srv_desc.Format = DXGI_FORMAT_UNKNOWN; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + srv_desc.Buffer.StructureByteStride = 16; + ID3D12Device_CreateShaderResourceView(context.device, input_buffers[3], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWBuffer<> */ + uav_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.StructureByteStride = 0; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[4], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWByteAddressBuffer<> */ + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW; + uav_desc.Buffer.StructureByteStride = 0; + uav_desc.Buffer.NumElements = 4; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[5], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWStructuredBuffer<> with counter */ + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.StructureByteStride = 16; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[6], input_buffer_counter, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWStructuredBuffer<> without counter */ + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.StructureByteStride = 16; + uav_desc.Buffer.NumElements = 1; + uav_desc.Buffer.CounterOffsetInBytes = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, input_buffers[7], NULL, &uav_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* Texture */ + srv_desc.Format = DXGI_FORMAT_R32_FLOAT; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.PlaneSlice = 0; + srv_desc.Texture2D.ResourceMinLODClamp = 0; + ID3D12Device_CreateShaderResourceView(context.device, textures[0], &srv_desc, cpu_handle); + cpu_handle.ptr += descriptor_size; + + /* RWTexture */ + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D; + uav_desc.Format = DXGI_FORMAT_R32_FLOAT; + uav_desc.Texture2D.MipSlice = 0; + uav_desc.Texture2D.PlaneSlice = 0; + ID3D12Device_CreateUnorderedAccessView(context.device, textures[1], NULL, &uav_desc, cpu_handle); + + for (i = 0; i < 8; i++) + { + upload_buffer_data(input_buffers[i], 0, sizeof(buffer_data[i]), buffer_data[i], queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffers[i], D3D12_RESOURCE_STATE_COPY_DEST, + i < 4 ? D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE : D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + for (i = 0; i < 2; i++) + { + D3D12_SUBRESOURCE_DATA sub; + sub.pData = buffer_data[8 + i]; + sub.RowPitch = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT / 4; + sub.SlicePitch = 0; + upload_texture_data(textures[i], &sub, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, textures[i], D3D12_RESOURCE_STATE_COPY_DEST, + i == 0 ? D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE : D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + } + + upload_buffer_data(input_buffer_counter, 0, sizeof(zero_data), zero_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffer_counter, D3D12_RESOURCE_STATE_COPY_DEST, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + get_buffer_readback_with_command_list(input_buffers[7], DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < 4; i++) + { + /* Start value of 9 is for the StructuredBuffer we write to. */ + float reference = 2 * 3 * 4 * 5 * 6 * 7 * 8 * 10 * 11; + ok(get_readback_float(&rb, i, 0) == reference, "Readback value is: %f\n", get_readback_float(&rb, i, 0)); + } + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + counter_value = read_uav_counter(&context, input_buffer_counter, 0); + ok(counter_value == 1, "Atomic counter is %u.\n", counter_value); + + for (i = 0; i < 8; i++) + ID3D12Resource_Release(input_buffers[i]); + for (i = 0; i < 2; i++) + ID3D12Resource_Release(textures[i]); + ID3D12Resource_Release(input_buffer_counter); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { pfn_D3D12CreateDevice = get_d3d12_pfn(D3D12CreateDevice); @@ -32521,4 +32900,5 @@ START_TEST(d3d12) run_test(test_early_depth_stencil_tests); run_test(test_conditional_rendering); run_test(test_bufinfo_instruction); + run_test(test_register_space_sm51); } -- 2.24.0

3 3

[PATCH resend 1/3] ntdll: Fix tick count calculation on Mac.
by Chip Davis 27 Nov '19

27 Nov '19

Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/time.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..4e3d5583c7b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; -- 2.21.0

4 8

[PATCH 1/4] user32/combo: Remove unnecessary argument from button painting helper.
by Nikolay Sivov 27 Nov '19

27 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/combo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 40ff0ef521..52d2f7190d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -574,10 +574,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * * Paint combo button (normal, pressed, and disabled states). */ -static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) +static void CBPaintButton(HEADCOMBO *lphc, HDC hdc) { UINT buttonState = DFCS_SCROLLCOMBOBOX; + if (IsRectEmpty(&lphc->buttonRect)) + return; + if( lphc->wState & CBF_NOREDRAW ) return; @@ -588,7 +591,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) if (CB_DISABLED(lphc)) buttonState |= DFCS_INACTIVE; - DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); + DrawFrameControl(hdc, &lphc->buttonRect, DFC_SCROLL, buttonState); } /*********************************************************************** @@ -816,11 +819,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) * In non 3.1 look, there is a sunken border on the combobox */ CBPaintBorder(lphc->self, lphc, hDC); - - if( !IsRectEmpty(&lphc->buttonRect) ) - { - CBPaintButton(lphc, hDC, lphc->buttonRect); - } + CBPaintButton(lphc, hDC); /* paint the edit control padding area */ if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) -- 2.24.0

1 3

[PATCH] include: Add more date formatting flags.
by Zhiyi Zhang 27 Nov '19

27 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..c7c2cfb240 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -411,6 +411,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define DATE_YEARMONTH 0x08 /* Year/month format */ #define DATE_LTRREADING 0x10 /* Add LTR reading marks */ #define DATE_RTLREADING 0x20 /* Add RTL reading marks */ +#define DATE_AUTOLAYOUT 0x40 /* Add LTR or RTL reading marks automatically */ +#define DATE_MONTHDAY 0x80 /* Month/day format */ #define TIME_FORCE24HOURFORMAT 0x08 /* Always use 24 hour clock */ #define TIME_NOTIMEMARKER 0x04 /* show no AM/PM */ -- 2.24.0

1 0

[PATCH] ntdll: Fix tick count calculation on Mac.
by Chip Davis 27 Nov '19

27 Nov '19

Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/time.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..4e3d5583c7b 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; -- 2.21.0

2 2

[PATCH v3] comctl32: Improve LISTVIEW_Update?Scroll() a bit.
by Serge Gautherie 27 Nov '19

27 Nov '19

--- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are? --- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..0684d34 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage <= infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage <= infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH v2 1/5] wined3d: Export wined3d_stateblock_init_contained_states().
by Zebediah Figura 27 Nov '19

27 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87db701d157..5983281f932 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_decref(device->recording); device->recording = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 898a4bc93d4..dc714914ec3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -283,7 +283,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); } -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; unsigned int i, j; @@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, break; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_capture(stateblock); /* According to the tests, stream offset is not updated in the captured state if diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ea04c85d385..29bcd759264 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6d25aa6d88..8ebf377b114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3974,8 +3974,6 @@ struct wined3d_stateblock unsigned int num_contained_sampler_states; }; -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; - void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fac9eef5be2..37e012b979d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, -- 2.23.0

4 12

[PATCH] comctl32: Improve LISTVIEW_Update?Scroll() a bit. --- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are?
by Serge Gautherie 27 Nov '19

27 Nov '19

--- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..0684d34 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage <= infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage <= infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH] comctl32: Improve LISTVIEW_Update?Scroll() a bit. --- Adding '> 0' to 'if (infoPtr->nItemWidth)' is correct, isn't it? Are the two (different) comments correct as they are?
by Serge Gautherie 27 Nov '19

27 Nov '19

--- dlls/comctl32/listview.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index acf6f31..45d584b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2033,12 +2033,14 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) INT nPerCol = LISTVIEW_GetCountPerColumn(infoPtr); horzInfo.nMax = (infoPtr->nItemCount + nPerCol - 1) / nPerCol; - /* scroll by at least one column per page */ - if(horzInfo.nPage < infoPtr->nItemWidth) - horzInfo.nPage = infoPtr->nItemWidth; - - if (infoPtr->nItemWidth) - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth > 0) + { + /* scroll by at least one column per page */ + if (horzInfo.nPage < infoPtr->nItemWidth) + horzInfo.nPage = 1; + else + horzInfo.nPage /= infoPtr->nItemWidth; + } } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2097,13 +2099,15 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->uView == LV_VIEW_DETAILS) { vertInfo.nMax = infoPtr->nItemCount; - - /* scroll by at least one page */ - if(vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + { + /* scroll by at least one page */ + if (vertInfo.nPage < infoPtr->nItemHeight) + vertInfo.nPage = 1; + else + vertInfo.nPage /= infoPtr->nItemHeight; + } } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { -- 2.10.0.windows.1

1 0

[PATCH 2/2] dmime/tests: Add some IDirectMusicSegment_GetTrack() tests
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3fb0e8afd8..f561eb391e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -524,6 +524,86 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *name, DWORD group) +{ + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&track); + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + hr = IDirectMusicSegment8_InsertTrack(seg, track, group); + if (group) + ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + else + ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + IDirectMusicTrack_Release(track); +} + +#define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) + +static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, + DWORD index) +{ + IDirectMusicTrack *track; + IPersistStream *ps; + CLSID class; + HRESULT hr; + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (!expect) { + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + return; + } + + ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + group, index, name, wine_dbgstr_guid(&class)); + + IPersistStream_Release(ps); + IDirectMusicTrack_Release(track); +} + +#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) + +static void test_track_identify(void) +{ + IDirectMusicSegment8 *seg; + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x0); /* failure */ + add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ + add_track(seg, ParamControlTrack, 0x3); /* idx 1 group 1, idx 0 group 2 */ + add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ + add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ + add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_track(seg, LyricsTrack, 0x1, 0); + expect_track(seg, ParamControlTrack, 0x1, 1); + expect_track(seg, SeqTrack, 0x1, 2); + expect_track(seg, TempoTrack, 0x1, 3); + _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ + expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ + expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ + expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + + IDirectMusicSegment8_Release(seg); +} + static void test_track(void) { IDirectMusicTrack *dmt; @@ -956,6 +1036,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_track_identify(); test_track(); test_parsedescriptor(); -- 2.20.1

1 0

[PATCH 1/2] dmime: The group for a track in a segment cannot be zero
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This one should be good for regressions... dlls/dmime/segment.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c0d4ac567..e3acafe979 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 *iface, - IDirectMusicTrack *pTrack, DWORD dwGroupBits) + IDirectMusicTrack *pTrack, DWORD group) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); DWORD i = 0; @@ -243,7 +243,10 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, group); + + if (!group) + return E_INVALIDARG; LIST_FOR_EACH (pEntry, &This->Tracks) { i++; @@ -259,7 +262,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - pNewSegTrack->dwGroupBits = dwGroupBits; + pNewSegTrack->dwGroupBits = group; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); IDirectMusicTrack_AddRef(pTrack); -- 2.20.1

1 0

[PATCH 1/5] qcap/avico: Call IMemInputPin::Receive() directly.
by Zebediah Figura 26 Nov '19

26 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e81a6b0c4..f0f60ae439 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -415,6 +415,7 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMediaSample *pSample) { AVICompressor *This = impl_from_strmbase_pin(&base->pin); + IMemInputPin *meminput = This->source.pMemInputPin; VIDEOINFOHEADER *src_videoinfo; REFERENCE_TIME start, stop; IMediaSample *out_sample; @@ -429,6 +430,12 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia TRACE("(%p)->(%p)\n", base, pSample); + if (!meminput) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + if(!This->hic) { FIXME("Driver not loaded\n"); return E_UNEXPECTED; @@ -490,7 +497,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); + hres = IMemInputPin_Receive(meminput, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres); -- 2.24.0

1 4

[PATCH] kernel32/tests: Georgian and Hindi now get a thread codepage of CP_UTF8.
by Francois Gouget 26 Nov '19

26 Nov '19

As returned by a call to GetCPInfoExA(CP_THREAD_ACP...) in Windows 10 >=1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The new behavior seems ok to me so I marked the old one as broken and added a todo_wine. I can reverse this if the old behavior seems better. dlls/kernel32/tests/codepage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29e..bb6c09a26d5 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1151,9 +1151,9 @@ static void test_threadcp(void) if (lcids[i].threadcp) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); - else - ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", - cpi.CodePage, lcids[i].lcid, acp); + else todo_wine + ok(broken(cpi.CodePage == acp) || cpi.CodePage == CP_UTF8, "wrong codepage %u for lcid %04x, should be CP_UTF8\n", + cpi.CodePage, lcids[i].lcid); /* WideCharToMultiByte - CP_THREAD_ACP */ num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); -- 2.20.1

2 1

[PATCH 4/4] dmstyle: Implement IDirectMusicStyle8_EnumMotif()
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Fixes one of the infinite loops in PlayMotif.exe from DXSDK 8.1b. dlls/dmstyle/style.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3bce9bba2..5ebe6589d4 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -158,12 +158,37 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, - WCHAR *pwszName) +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, + WCHAR *name) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + const struct style_motif *motif = NULL; + const struct list *cursor; + unsigned int i = 0; + + TRACE("(%p, %u, %p)\n", This, index, name); + + if (!name) + return E_POINTER; + + /* index is zero based */ + LIST_FOR_EACH(cursor, &This->motifs) { + if (i == index) { + motif = LIST_ENTRY(cursor, struct style_motif, entry); + break; + } + i++; + } + if (!motif) + return S_FALSE; + + if (motif->desc.dwValidData & DMUS_OBJ_NAME) + lstrcpynW(name, motif->desc.wszName, DMUS_MAX_NAME); + else + name[0] = 0; + + TRACE("returning name: %s\n", debugstr_w(name)); + return S_OK; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, -- 2.20.1

1 0

[PATCH 3/4] dmstyle: Free lists when IDirectMusicStyleImpl is destroyed
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 7c835afe27..b3bce9bba2 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -108,7 +108,25 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct style_band *band, *band2; + struct style_motif *motif, *motif2; + struct style_partref_item *item, *item2; + + LIST_FOR_EACH_ENTRY_SAFE(band, band2, &This->bands, struct style_band, entry) { + list_remove(&band->entry); + if (band->pBand) + IDirectMusicBand_Release(band->pBand); + heap_free(band); + } + LIST_FOR_EACH_ENTRY_SAFE(motif, motif2, &This->motifs, struct style_motif, entry) { + list_remove(&motif->entry); + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &motif->Items, struct style_partref_item, entry) { + list_remove(&item->entry); + heap_free(item); + } + heap_free(motif); + } + heap_free(This); DMSTYLE_UnlockModule(); } -- 2.20.1

1 0

[PATCH 2/4] dmstyle: Move 3 structs where they are used and get rid of typedefs
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/dmstyle_private.h | 23 ------------------- dlls/dmstyle/style.c | 41 +++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7d18e9c4ba..2956dad151 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -55,29 +55,6 @@ extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPE /***************************************************************************** * Auxiliary definitions */ -typedef struct _DMUS_PRIVATE_STYLE_BAND { - struct list entry; /* for listing elements */ - IDirectMusicBand* pBand; -} DMUS_PRIVATE_STYLE_BAND, *LPDMUS_PRIVATE_STYLE_BAND; - -typedef struct _DMUS_PRIVATE_STYLE_PARTREF_ITEM { - struct list entry; /* for listing elements */ - DMUS_OBJECTDESC desc; - DMUS_IO_PARTREF part_ref; -} DMUS_PRIVATE_STYLE_PARTREF_ITEM, *LPDMUS_PRIVATE_STYLE_PARTREF_ITEM; - -typedef struct _DMUS_PRIVATE_STYLE_MOTIF { - struct list entry; /* for listing elements */ - DWORD dwRhythm; - DMUS_IO_PATTERN pattern; - DMUS_OBJECTDESC desc; - /** optional for motifs */ - DMUS_IO_MOTIFSETTINGS settings; - IDirectMusicBand* pBand; - - struct list Items; -} DMUS_PRIVATE_STYLE_MOTIF, *LPDMUS_PRIVATE_STYLE_MOTIF; - typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct list entry; /* for listing elements */ DWORD dwTimeStamp; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 0884733894..7c835afe27 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -20,10 +20,33 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +struct style_band { + struct list entry; + IDirectMusicBand *pBand; +}; + +struct style_partref_item { + struct list entry; + DMUS_OBJECTDESC desc; + DMUS_IO_PARTREF part_ref; +}; + +struct style_motif { + struct list entry; + DWORD dwRhythm; + DMUS_IO_PATTERN pattern; + DMUS_OBJECTDESC desc; + /** optional for motifs */ + DMUS_IO_MOTIFSETTINGS settings; + IDirectMusicBand *pBand; + struct list Items; +}; + /***************************************************************************** * IDirectMusicStyleImpl implementation */ @@ -283,14 +306,13 @@ static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) } static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, - DMUS_PRIVATE_STYLE_MOTIF *pNewMotif) + struct style_motif *pNewMotif) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - - LPDMUS_PRIVATE_STYLE_PARTREF_ITEM pNewItem = NULL; + struct style_partref_item *pNewItem = NULL; if (pChunk->fccID != DMUS_FOURCC_PARTREF_LIST) { @@ -308,7 +330,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, switch (Chunk.fccID) { case DMUS_FOURCC_PARTREF_CHUNK: { TRACE_(dmfile)(": PartRef chunk\n"); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_PARTREF_ITEM)); + pNewItem = heap_alloc_zero(sizeof(*pNewItem)); if (!pNewItem) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -514,9 +536,8 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - IDirectMusicBand* pBand = NULL; - LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif = NULL; + struct style_motif *pNewMotif = NULL; if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); @@ -534,7 +555,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU case DMUS_FOURCC_PATTERN_CHUNK: { TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ - pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); + pNewMotif = heap_alloc_zero(sizeof(*pNewMotif)); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -715,7 +736,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { LPSTREAM pClonedStream = NULL; - LPDMUS_PRIVATE_STYLE_BAND pNewBand; + struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); @@ -731,8 +752,8 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK return hr; } IStream_Release (pClonedStream); - - pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_BAND)); + + pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { ERR(": no more memory\n"); return E_OUTOFMEMORY; -- 2.20.1

1 0

[PATCH 1/4] dmstyle: Avoid capitalized field names in IDirectMusicStyle8Impl
by Michael Stefaniuc 26 Nov '19

26 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 4e84a3edc3..0884733894 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -32,8 +32,8 @@ typedef struct IDirectMusicStyle8Impl { struct dmobject dmobj; LONG ref; DMUS_IO_STYLE style; - struct list Motifs; - struct list Bands; + struct list motifs; + struct list bands; } IDirectMusicStyle8Impl; static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) @@ -539,7 +539,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU ERR(": no more memory\n"); return E_OUTOFMEMORY; } - list_add_tail (&This->Motifs, &pNewMotif->entry); + list_add_tail(&This->motifs, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */ @@ -739,7 +739,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK } pNewBand->pBand = pBand; IDirectMusicBand_AddRef(pBand); - list_add_tail (&This->Bands, &pNewBand->entry); + list_add_tail(&This->bands, &pNewBand->entry); IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ @@ -893,8 +893,8 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) dmobject_init(&obj->dmobj, &CLSID_DirectMusicStyle, (IUnknown *)&obj->IDirectMusicStyle8_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init (&obj->Bands); - list_init (&obj->Motifs); + list_init(&obj->bands); + list_init(&obj->motifs); DMSTYLE_LockModule(); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); -- 2.20.1

1 0

[PATCH v2 1/4] ucrtbase: Expand tests for strftime format %g.
by Jeff Smith 26 Nov '19

26 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 6314662eac..9b43d73559 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -927,7 +927,7 @@ static void test_strftime(void) const char *format; const char *ret; struct tm tm; - BOOL todo; + BOOL todo_value; BOOL todo_handler; } tests[] = { {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }}, @@ -974,26 +974,33 @@ static void test_strftime(void) {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, - {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE}, + {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }, TRUE, TRUE}, + {"%g", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%g", "70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%g", "16", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%g", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, + {"%g", "00", { 0, 0, 0, 1, 0, 8099, 3, 364, 0 }}, + {"%g", "", { 0, 0, 0, 1, 0, 8100, 0, 0, 0 }, TRUE, TRUE}, + {"%g", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE, TRUE}, {"%G", "1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%G", "2016", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, - {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, - {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE}, - {"%V", "53", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE, TRUE}, + {"%V", "53", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, {"%y", "", { 0, 0, 0, 0, 0, -1901, 0, 0, 0 }}, {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, - {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, - {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, - {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, - {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, - {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, - {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, + {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE, TRUE}, {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, @@ -1091,7 +1098,7 @@ static void test_strftime(void) for (i=0; i<ARRAY_SIZE(tests); i++) { - todo_wine_if(tests[i].todo || tests[i].todo_handler) { + todo_wine_if(tests[i].todo_handler) { if (!tests[i].ret[0]) SET_EXPECT(global_invalid_parameter_handler); ret = p_strftime(buf, sizeof(buf), tests[i].format, &tests[i].tm); @@ -1099,7 +1106,7 @@ static void test_strftime(void) CHECK_CALLED(global_invalid_parameter_handler); } - todo_wine_if(tests[i].todo) { + todo_wine_if(tests[i].todo_value) { ok(ret == strlen(tests[i].ret), "%d) ret = %d\n", i, ret); ok(!strcmp(buf, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", i, buf, tests[i].ret); -- 2.23.0

1 3

[PATCH 1/2] shell32: Implement PathResolve.
by Gijs Vermeulen 26 Nov '19

26 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48082 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/shell32/shellpath.c | 69 ++++++++++++++++++++++++++++++++++------ include/shlobj.h | 3 +- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d9d65cbaed..7491ffbc48 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -684,27 +684,78 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) +BOOL WINAPI PathFindOnPathExA(LPSTR,LPCSTR *,DWORD); +BOOL WINAPI PathFindOnPathExW(LPWSTR,LPCWSTR *,DWORD); +BOOL WINAPI PathFileExistsDefExtA(LPSTR,DWORD); +BOOL WINAPI PathFileExistsDefExtW(LPWSTR,DWORD); + +static BOOL PathResolveA(char *path, const char **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecA(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsA(path)) + { + if (PathFindOnPathExA(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtA(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameA(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameA(path, MAX_PATH, path, NULL); + + return TRUE; } -static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) +static BOOL PathResolveW(WCHAR *path, const WCHAR **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecW(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsW(path)) + { + if (PathFindOnPathExW(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtW(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameW(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameW(path, MAX_PATH, path, NULL); + + return TRUE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) +BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags) { if (SHELL_OsIsUnicode()) - return PathResolveW(path, (LPCWSTR*)paths, flags); + return PathResolveW(path, (const WCHAR **)paths, flags); else - return PathResolveA(path, (LPCSTR*)paths, flags); + return PathResolveA(path, (const char **)paths, flags); } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6c..f61dfa7d66 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1717,10 +1717,9 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); /* PathResolve flags */ #define PRF_VERIFYEXISTS 0x01 -#define PRF_EXECUTABLE 0x02 #define PRF_TRYPROGRAMEXTENSIONS 0x03 #define PRF_FIRSTDIRDEF 0x04 -#define PRF_DONTFINDLINK 0x08 +#define PRF_DONTFINDLNK 0x08 #define PRF_REQUIREABSOLUTE 0x10 VOID WINAPI PathGetShortPath(LPWSTR pszPath); -- 2.24.0

3 3

[PATCH 1/4] ucrtbase: Expand tests for strftime format %g.
by Jeff Smith 26 Nov '19

26 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 6314662eac..8c9fc1acb0 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -929,6 +929,7 @@ static void test_strftime(void) struct tm tm; BOOL todo; BOOL todo_handler; + const char *broken; } tests[] = { {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }}, {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, @@ -977,9 +978,21 @@ static void test_strftime(void) {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE}, + {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }, TRUE}, + {"%g", "", { 0, 0, 0, 1, 0, -1900, 0, 0, 0 }, TRUE, FALSE, "0/" }, + {"%g", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%g", "70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%g", "16", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%g", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, + {"%g", "00", { 0, 0, 0, 1, 0, 8099, 3, 364, 0 }}, + {"%g", "", { 0, 0, 0, 1, 0, 8100, 0, 0, 0 }, TRUE}, + {"%g", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE}, {"%G", "1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, + {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%G", "2016", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE}, @@ -988,10 +1001,6 @@ static void test_strftime(void) {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, - {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, - {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, - {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, - {"%G", "1972", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%c", "Thu Jan 1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, @@ -1092,16 +1101,20 @@ static void test_strftime(void) for (i=0; i<ARRAY_SIZE(tests); i++) { todo_wine_if(tests[i].todo || tests[i].todo_handler) { - if (!tests[i].ret[0]) + if (!tests[i].ret[0] || (tests[i].broken && !tests[i].broken[0])) SET_EXPECT(global_invalid_parameter_handler); ret = p_strftime(buf, sizeof(buf), tests[i].format, &tests[i].tm); - if (!tests[i].ret[0]) + if (!tests[i].ret[0] && !tests[i].broken) CHECK_CALLED(global_invalid_parameter_handler); } todo_wine_if(tests[i].todo) { - ok(ret == strlen(tests[i].ret), "%d) ret = %d\n", i, ret); - ok(!strcmp(buf, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + ok(ret == strlen(tests[i].ret) || + broken(tests[i].broken && ret == strlen(tests[i].broken)), + "%d) ret = %d\n", i, ret); + ok(!strcmp(buf, tests[i].ret) || + broken(tests[i].broken && !strcmp(buf, tests[i].broken)), + "%d) buf = \"%s\", expected \"%s\"\n", i, buf, tests[i].ret); } } -- 2.23.0

3 6

[PATCH] msvcrt: Avoid compiler warning.
by Gijs Vermeulen 26 Nov '19

26 Nov '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/msvcrt/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 0d5b64a4aa..592b049107 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return ret; } +#if _MSVCR_VER>=140 static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL is_dst) { MSVCRT_long tz = MSVCRT___timezone + (is_dst ? MSVCRT__dstbias : 0); @@ -1188,6 +1189,7 @@ static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return FALSE; return strftime_int(str, pos, max, tz/60%60, 2, 0, 59); } +#endif static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, const STRFTIME_CHAR *format, const struct MSVCRT_tm *mstm, -- 2.24.0

3 2

[PATCH v6] vkd3d: Support using vkd3d-utils path when testing on Windows.
by Hans-Kristian Arntzen 26 Nov '19

26 Nov '19

When testing vkd3d on Windows, we were only able to use the native D3D12 path. Add an ifdef to configure this. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- configure.ac | 7 +++++++ tests/d3d12_crosstest.h | 12 +++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 355aaab..4b3bb76 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,9 @@ AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, [enable_demos=no]) +AC_ARG_ENABLE([force-utils-wrapper], + AS_HELP_STRING([--enable-force-utils-wrapper], [Target vkd3d-utils when targeting Windows (default: disabled)]),, + [enable_force_utils_wrapper=no]) AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, [enable_tests=yes]) @@ -113,6 +116,9 @@ AS_IF([test "x$with_xcb" != "xno"], HAVE_XCB=yes], [HAVE_XCB=no])]) +AS_IF([test "x$enable_force_utils_wrapper" = "xyes"], + [AC_DEFINE([VKD3D_FORCE_UTILS_WRAPPER], [1], [Define to 1 to force usage of vkd3d-utils in d3d12 tests on Windows.])]) + dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) @@ -147,6 +153,7 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} + Forcing vkd3d-utils wrapper for tests: ${enable_force_utils_wrapper} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 7b59471..1c9b3b2 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_D3D12_CROSSTEST_H #define __VKD3D_D3D12_CROSSTEST_H +#include "config.h" + /* Hack for MinGW-w64 headers. * * We want to use WIDL C inline wrappers because some methods @@ -52,17 +54,17 @@ typedef int HRESULT; #include <math.h> #include <time.h> -#ifdef _WIN32 +#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER) # include "vkd3d_dxgi1_4.h" #else -# include <pthread.h> +# include "vkd3d_threads.h" # include "vkd3d.h" # include "vkd3d_utils.h" #endif #include "d3d12_test_utils.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER) static inline HANDLE create_event(void) { return CreateEventA(NULL, FALSE, FALSE, NULL); @@ -124,7 +126,7 @@ struct test_thread_data void *user_data; }; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER) static inline DWORD WINAPI test_thread_main(void *untyped_data) { struct test_thread_data *data = untyped_data; @@ -242,7 +244,7 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm static bool use_warp_device; static unsigned int use_adapter_idx; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(VKD3D_FORCE_UTILS_WRAPPER) static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) { IUnknown *adapter; -- 2.24.0

3 2

[PATCH v5 1/5] vkd3d: Add simple pthread wrapper for MSVC.
by Hans-Kristian Arntzen 26 Nov '19

26 Nov '19

Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- include/private/vkd3d_threads.h | 167 ++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 2 +- libs/vkd3d/utils.c | 8 +- libs/vkd3d/vkd3d_private.h | 17 ++-- 4 files changed, 179 insertions(+), 15 deletions(-) create mode 100644 include/private/vkd3d_threads.h diff --git a/include/private/vkd3d_threads.h b/include/private/vkd3d_threads.h new file mode 100644 index 0000000..736bf6e --- /dev/null +++ b/include/private/vkd3d_threads.h @@ -0,0 +1,167 @@ +/* + * Copyright 2019 Hans-Kristian Arntzen for Valve + * + * 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 __VKD3D_THREADS_H +#define __VKD3D_THREADS_H + +#include "config.h" +#include "vkd3d_memory.h" + +#if defined(HAVE_PTHREAD_H) +#include <pthread.h> + +#elif defined(_WIN32) /* HAVE_PTHREAD_H */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +/* pthread_t is passed by value in some functions, + * which implies we need pthread_t to be a pointer type here. */ +struct pthread +{ + HANDLE thread; + DWORD id; + void * (*routine)(void *); + void *arg; +}; +typedef struct pthread *pthread_t; + +/* pthread_mutex_t is not copyable, so embed CS inline. */ +typedef struct pthread_mutex +{ + CRITICAL_SECTION lock; +} pthread_mutex_t; + +/* pthread_cond_t is not copyable, so embed CV inline. */ +typedef struct pthread_cond +{ + CONDITION_VARIABLE cond; +} pthread_cond_t; + +static DWORD WINAPI win32_thread_wrapper_routine(void *arg) +{ + pthread_t thread = arg; + thread->routine(thread->arg); + return 0; +} + +static inline int pthread_create(pthread_t *out_thread, void *attr, void * (*thread_fun)(void *), void *arg) +{ + pthread_t thread = vkd3d_calloc(1, sizeof(*thread)); + if (!thread) + return -1; + + (void)attr; + thread->routine = thread_fun; + thread->arg = arg; + thread->thread = CreateThread(NULL, 0, win32_thread_wrapper_routine, thread, 0, &thread->id); + if (!thread->thread) + { + vkd3d_free(thread); + return -1; + } + *out_thread = thread; + return 0; +} + +static inline int pthread_join(pthread_t thread, void **ret) +{ + (void)ret; + int success = WaitForSingleObject(thread->thread, INFINITE) == WAIT_OBJECT_0; + if (success) + { + CloseHandle(thread->thread); + vkd3d_free(thread); + } + return success ? 0 : -1; +} + +static inline int pthread_mutex_init(pthread_mutex_t *lock, void *attr) +{ + (void)attr; + InitializeCriticalSection(&lock->lock); + return 0; +} + +static inline int pthread_mutex_lock(pthread_mutex_t *lock) +{ + EnterCriticalSection(&lock->lock); + return 0; +} + +static inline int pthread_mutex_unlock(pthread_mutex_t *lock) +{ + LeaveCriticalSection(&lock->lock); + return 0; +} + +static inline int pthread_mutex_destroy(pthread_mutex_t *lock) +{ + DeleteCriticalSection(&lock->lock); + return 0; +} + +static inline int pthread_cond_init(pthread_cond_t *cond, void *attr) +{ + (void)attr; + InitializeConditionVariable(&cond->cond); + return 0; +} + +static inline int pthread_cond_destroy(pthread_cond_t *cond) +{ + (void)cond; + return 0; +} + +static inline int pthread_cond_signal(pthread_cond_t *cond) +{ + WakeConditionVariable(&cond->cond); + return 0; +} + +static inline int pthread_cond_broadcast(pthread_cond_t *cond) +{ + WakeAllConditionVariable(&cond->cond); + return 0; +} + +static inline int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *lock) +{ + BOOL ret = SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE); + return ret ? 0 : -1; +} + +#else /* HAVE_PTHREAD_H */ +#error "Threads are not supported. Cannot build." +#endif /* HAVE_PTHREAD_H */ + +static inline void vkd3d_set_thread_name(const char *name) +{ +#if defined(_MSC_VER) + (void)name; +#elif defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#else + (void)name; +#endif +} + +#endif /* __VKD3D_THREADS_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0624318..cc8e282 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -453,7 +453,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; - char application_name[PATH_MAX]; + char application_name[VKD3D_PATH_MAX]; uint32_t extension_count; const char **extensions; VkInstance vk_instance; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index cf0448d..64eb845 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -830,7 +830,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, #if HAVE_DECL_PROGRAM_INVOCATION_NAME -bool vkd3d_get_program_name(char program_name[PATH_MAX]) +bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX]) { char *name, *p, *real_path = NULL; @@ -856,15 +856,15 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) name = program_invocation_name; } - strncpy(program_name, name, PATH_MAX); - program_name[PATH_MAX - 1] = '\0'; + strncpy(program_name, name, VKD3D_PATH_MAX); + program_name[VKD3D_PATH_MAX - 1] = '\0'; free(real_path); return true; } #else -bool vkd3d_get_program_name(char program_name[PATH_MAX]) +bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX]) { *program_name = '\0'; return false; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 84b5ff2..76ce709 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -31,11 +31,11 @@ #include "vkd3d.h" #include "vkd3d_shader.h" +#include "vkd3d_threads.h" #include <assert.h> #include <inttypes.h> #include <limits.h> -#include <pthread.h> #include <stdbool.h> #define VK_CALL(f) (vk_procs->f) @@ -1271,16 +1271,13 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; -bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; - -static inline void vkd3d_set_thread_name(const char *name) -{ -#if defined(HAVE_PTHREAD_SETNAME_NP_2) - pthread_setname_np(pthread_self(), name); -#elif defined(HAVE_PTHREAD_SETNAME_NP_1) - pthread_setname_np(name); +#ifdef _WIN32 +/* This value isn't really used for anything useful on Windows, just need some kind of value. */ +#define VKD3D_PATH_MAX _MAX_PATH +#else +#define VKD3D_PATH_MAX PATH_MAX #endif -} +bool vkd3d_get_program_name(char program_name[VKD3D_PATH_MAX]) DECLSPEC_HIDDEN; VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; -- 2.24.0

2 15

[PATCH v2 1/2] vkd3d: Deal correctly with SM 5.1 register spaces.
by Hans-Kristian Arntzen 26 Nov '19

26 Nov '19

Resource index is found in idx[0] in SM 5.0, but idx[1] when using SM 5.1, and register space is encoded reparately. An rb_tree keeps track of the internal resource index idx[0] and can map that to space/binding as required when emitting SPIR-V. For this to work, we must also make UAV counters register space aware. In earlier implementation, UAV counter mask was assumed to correlate 1:1 with register_index, which breaks on SM 5.1. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- include/vkd3d_shader.h | 22 +++ libs/vkd3d-shader/dxbc.c | 29 ++++ libs/vkd3d-shader/spirv.c | 193 ++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 5 + libs/vkd3d/command.c | 32 ++-- libs/vkd3d/state.c | 50 ++++-- libs/vkd3d/vkd3d_private.h | 1 + 7 files changed, 290 insertions(+), 42 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6b4d3f5..e07d420 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -35,6 +35,7 @@ enum vkd3d_shader_structure_type VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, + VKD3D_SHADER_STRUCTURE_TYPE_EFFECTIVE_UAV_COUNTER_BINDING_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -138,6 +139,7 @@ struct vkd3d_shader_parameter struct vkd3d_shader_resource_binding { enum vkd3d_shader_descriptor_type type; + unsigned int register_space; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; unsigned int flags; /* vkd3d_shader_binding_flags */ @@ -159,8 +161,10 @@ struct vkd3d_shader_combined_resource_sampler struct vkd3d_shader_uav_counter_binding { + unsigned int register_space; unsigned int register_index; /* u# */ enum vkd3d_shader_visibility shader_visibility; + unsigned int counter_index; struct vkd3d_shader_descriptor_binding binding; unsigned int offset; @@ -168,6 +172,7 @@ struct vkd3d_shader_uav_counter_binding struct vkd3d_shader_push_constant_buffer { + unsigned int register_space; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; @@ -215,6 +220,17 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/* Extends vkd3d_shader_interface_info. */ +struct vkd3d_shader_effective_uav_counter_binding_info +{ + enum vkd3d_shader_structure_type type; + const void *next; + + unsigned int *uav_register_spaces; + unsigned int *uav_register_bindings; + unsigned int uav_counter_count; +}; + enum vkd3d_shader_target { VKD3D_SHADER_TARGET_NONE, @@ -536,6 +552,12 @@ struct vkd3d_versioned_root_signature_desc /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 +struct vkd3d_shader_scan_info_binding +{ + unsigned int register_space; + unsigned int register_idx; +}; + struct vkd3d_shader_scan_info { enum vkd3d_shader_structure_type type; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 98c51e4..b3f53ab 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -624,6 +624,10 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.semantic.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.semantic.register_index = ins->declaration.semantic.reg.reg.idx[1].offset; + else + ins->declaration.semantic.register_index = ins->declaration.semantic.reg.reg.idx[0].offset; } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, @@ -647,9 +651,12 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction return; } + ins->declaration.cb.register_index = ins->declaration.cb.src.reg.idx[1].offset; ins->declaration.cb.size = *tokens++; shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.register_space); } + else + ins->declaration.cb.register_index = ins->declaration.cb.src.reg.idx[0].offset; } static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, @@ -663,6 +670,10 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, FIXME("Unhandled sampler mode %#x.\n", ins->flags); shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_SAMPLER, &ins->declaration.sampler.src); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.sampler.register_index = ins->declaration.sampler.src.reg.idx[1].offset; + else + ins->declaration.sampler.register_index = ins->declaration.sampler.src.reg.idx[0].offset; } static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, @@ -863,6 +874,10 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.raw_resource.dst); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.raw_resource.register_index = ins->declaration.raw_resource.dst.reg.idx[1].offset; + else + ins->declaration.raw_resource.register_index = ins->declaration.raw_resource.dst.reg.idx[0].offset; } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, @@ -874,9 +889,14 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens; + tokens++; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.structured_resource.register_index = ins->declaration.structured_resource.reg.reg.idx[1].offset; + else + ins->declaration.structured_resource.register_index = ins->declaration.structured_resource.reg.reg.idx[0].offset; } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -909,9 +929,14 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; + tokens++; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.structured_resource.register_index = ins->declaration.structured_resource.reg.reg.idx[1].offset; + else + ins->declaration.structured_resource.register_index = ins->declaration.structured_resource.reg.reg.idx[0].offset; } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, @@ -922,6 +947,10 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.dst); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); + if (shader_is_sm_5_1(priv)) + ins->declaration.raw_resource.register_index = ins->declaration.dst.reg.idx[1].offset; + else + ins->declaration.raw_resource.register_index = ins->declaration.dst.reg.idx[0].offset; } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a949e4a..f6e96bd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1890,6 +1890,20 @@ struct vkd3d_symbol } info; }; +struct vkd3d_sm51_symbol_key +{ + enum vkd3d_shader_descriptor_type descriptor_type; + unsigned int idx; +}; + +struct vkd3d_sm51_symbol +{ + struct rb_entry entry; + struct vkd3d_sm51_symbol_key key; + unsigned int register_space; + unsigned int resource_idx; +}; + static int vkd3d_symbol_compare(const void *key, const struct rb_entry *entry) { const struct vkd3d_symbol *a = key; @@ -1900,6 +1914,13 @@ static int vkd3d_symbol_compare(const void *key, const struct rb_entry *entry) return memcmp(&a->key, &b->key, sizeof(a->key)); } +static int vkd3d_sm51_symbol_compare(const void *key, const struct rb_entry *entry) +{ + const struct vkd3d_sm51_symbol_key *a = key; + const struct vkd3d_sm51_symbol *b = RB_ENTRY_VALUE(entry, const struct vkd3d_sm51_symbol, entry); + return memcmp(a, &b->key, sizeof(*a)); +} + static void vkd3d_symbol_free(struct rb_entry *entry, void *context) { struct vkd3d_symbol *s = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); @@ -1907,6 +1928,13 @@ static void vkd3d_symbol_free(struct rb_entry *entry, void *context) vkd3d_free(s); } +static void vkd3d_sm51_symbol_free(struct rb_entry *entry, void *context) +{ + struct vkd3d_sm51_symbol *s = RB_ENTRY_VALUE(entry, struct vkd3d_sm51_symbol, entry); + + vkd3d_free(s); +} + static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, const struct vkd3d_shader_register *reg) { @@ -2052,6 +2080,7 @@ struct vkd3d_hull_shader_variables struct vkd3d_dxbc_compiler { + struct vkd3d_shader_version shader_version; struct vkd3d_spirv_builder spirv_builder; uint32_t options; @@ -2062,6 +2091,8 @@ struct vkd3d_dxbc_compiler struct vkd3d_hull_shader_variables hs; uint32_t sample_positions_id; + struct rb_tree sm51_resource_table; + enum vkd3d_shader_type shader_type; unsigned int branch_id; @@ -2107,6 +2138,11 @@ struct vkd3d_dxbc_compiler size_t spec_constants_size; }; +static bool shader_is_sm_5_1(const struct vkd3d_dxbc_compiler *compiler) +{ + return (compiler->shader_version.major * 100 + compiler->shader_version.minor) >= 501; +} + static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) { return phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE; @@ -2131,6 +2167,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); + compiler->shader_version = *shader_version; + max_element_count = max(output_signature->element_count, patch_constant_signature->element_count); if (!(compiler->output_info = vkd3d_calloc(max_element_count, sizeof(*compiler->output_info)))) { @@ -2142,6 +2180,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->options = compiler_options; rb_init(&compiler->symbol_table, vkd3d_symbol_compare); + rb_init(&compiler->sm51_resource_table, vkd3d_sm51_symbol_compare); compiler->shader_type = shader_version->type; @@ -2227,9 +2266,10 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( - const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) + const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_constant_buffer *cb) { - unsigned int reg_idx = reg->idx[0].offset; + unsigned int reg_idx = cb->register_index; + unsigned int reg_space = cb->register_space; unsigned int i; for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) @@ -2239,7 +2279,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->pc.shader_visibility)) continue; - if (current->pc.register_index == reg_idx) + if (current->pc.register_index == reg_idx && current->pc.register_space == reg_space) return current; } @@ -2274,6 +2314,49 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com return false; } +static bool vkd3d_get_binding_info_for_register( + struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg, + unsigned int *reg_space, unsigned int *reg_binding) +{ + const struct vkd3d_sm51_symbol *symbol; + struct vkd3d_sm51_symbol_key key; + const struct rb_entry *entry; + + if (shader_is_sm_5_1(compiler)) + { + key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; + if (reg->type == VKD3DSPR_CONSTBUFFER) + key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; + else if (reg->type == VKD3DSPR_RESOURCE) + key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + else if (reg->type == VKD3DSPR_UAV) + key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else if (reg->type == VKD3DSPR_SAMPLER) + key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; + else + FIXME("Unhandled register type %#x.\n", reg->type); + + key.idx = reg->idx[0].offset; + entry = rb_get(&compiler->sm51_resource_table, &key); + if (entry) + { + symbol = RB_ENTRY_VALUE(entry, const struct vkd3d_sm51_symbol, entry); + *reg_space = symbol->register_space; + *reg_binding = symbol->resource_idx; + return true; + } + else + return false; + } + else + { + *reg_space = 0; + *reg_binding = reg->idx[0].offset; + return true; + } +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) @@ -2282,8 +2365,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; - unsigned int reg_idx = reg->idx[0].offset; unsigned int i; + unsigned int reg_space; + unsigned int reg_idx; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; if (reg->type == VKD3DSPR_CONSTBUFFER) @@ -2300,6 +2384,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + if (!vkd3d_get_binding_info_for_register(compiler, reg, &reg_space, &reg_idx)) + { + ERR("Failed to find binding for resource type %#x.\n", reg->type); + } + if (is_uav_counter) { assert(descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV); @@ -2313,8 +2402,19 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (current->offset) FIXME("Atomic counter offsets are not supported yet.\n"); - if (current->register_index == reg_idx) + /* Do not use space/binding, but just the plain index here, since that's how the UAV counter mask is exposed. */ + if (current->register_index == reg->idx[0].offset) + { + /* Let pipeline know what the actual space/bindings for the counter are. */ + const struct vkd3d_shader_effective_uav_counter_binding_info *binding_info = + vkd3d_find_struct(shader_interface->next, EFFECTIVE_UAV_COUNTER_BINDING_INFO); + if (binding_info && current->register_index < binding_info->uav_counter_count) + { + binding_info->uav_register_spaces[current->register_index] = reg_space; + binding_info->uav_register_bindings[current->register_index] = reg_idx; + } return current->binding; + } } if (shader_interface->uav_counter_count) FIXME("Could not find descriptor binding for UAV counter %u.\n", reg_idx); @@ -2331,7 +2431,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; - if (current->type == descriptor_type && current->register_index == reg_idx) + if (current->type == descriptor_type && current->register_index == reg_idx && current->register_space == reg_space) return current->binding; } if (shader_interface->binding_count) @@ -2825,7 +2925,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { assert(!reg->idx[0].rel_addr); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, + &reg->idx[shader_is_sm_5_1(compiler) ? 2 : 1]); } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) { @@ -2835,6 +2936,11 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } + else if (reg->type == VKD3DSPR_SAMPLER) + { + /* SM 5.1 will have an index here referring to something which we throw away. */ + index_count = 0; + } else if (register_info->is_aggregate) { struct vkd3d_shader_register_index reg_idx = reg->idx[0]; @@ -4957,10 +5063,19 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC)); - if (cb->register_space) - FIXME("Unhandled register space %u.\n", cb->register_space); + if (shader_is_sm_5_1(compiler)) + { + struct vkd3d_sm51_symbol *sym; + sym = vkd3d_calloc(1, sizeof(*sym)); + sym->key.idx = reg->idx[0].offset; + sym->key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; + sym->register_space = instruction->declaration.sampler.register_space; + sym->resource_idx = instruction->declaration.sampler.register_index; + if (rb_put(&compiler->sm51_resource_table, &sym->key, &sym->entry) == -1) + vkd3d_free(sym); + } - if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, reg))) + if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, cb))) { /* Push constant buffers are handled in * vkd3d_dxbc_compiler_emit_push_constant_buffers(). @@ -5042,8 +5157,17 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; - if (instruction->declaration.sampler.register_space) - FIXME("Unhandled register space %u.\n", instruction->declaration.sampler.register_space); + if (shader_is_sm_5_1(compiler)) + { + struct vkd3d_sm51_symbol *sym; + sym = vkd3d_calloc(1, sizeof(*sym)); + sym->key.idx = reg->idx[0].offset; + sym->key.descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; + sym->register_space = instruction->declaration.sampler.register_space; + sym->resource_idx = instruction->declaration.sampler.register_index; + if (rb_put(&compiler->sm51_resource_table, &sym->key, &sym->entry) == -1) + vkd3d_free(sym); + } if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) return; @@ -5054,7 +5178,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com ptr_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false); + var_id, reg,VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -5264,8 +5388,18 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; - if (semantic->register_space) - FIXME("Unhandled register space %u.\n", semantic->register_space); + if (shader_is_sm_5_1(compiler)) + { + struct vkd3d_sm51_symbol *sym; + sym = vkd3d_calloc(1, sizeof(*sym)); + sym->key.idx = semantic->reg.reg.idx[0].offset; + sym->key.descriptor_type = semantic->reg.reg.type == VKD3DSPR_UAV ? VKD3D_SHADER_DESCRIPTOR_TYPE_UAV : VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + sym->register_space = semantic->register_space; + sym->resource_idx = semantic->register_index; + if (rb_put(&compiler->sm51_resource_table, &sym->key, &sym->entry) == -1) + vkd3d_free(sym); + } + if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -5278,8 +5412,18 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler { const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); + if (shader_is_sm_5_1(compiler)) + { + struct vkd3d_sm51_symbol *sym; + sym = vkd3d_calloc(1, sizeof(*sym)); + sym->key.idx = resource->dst.reg.idx[0].offset; + sym->key.descriptor_type = resource->dst.reg.type == VKD3DSPR_UAV ? VKD3D_SHADER_DESCRIPTOR_TYPE_UAV : VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + sym->register_space = resource->register_space; + sym->resource_idx = resource->register_index; + if (rb_put(&compiler->sm51_resource_table, &sym->key, &sym->entry) == -1) + vkd3d_free(sym); + } + if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -5294,8 +5438,18 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c const struct vkd3d_shader_register *reg = &resource->reg.reg; unsigned int stride = resource->byte_stride; - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); + if (shader_is_sm_5_1(compiler)) + { + struct vkd3d_sm51_symbol *sym; + sym = vkd3d_calloc(1, sizeof(*sym)); + sym->key.idx = resource->reg.reg.idx[0].offset; + sym->key.descriptor_type = resource->reg.reg.type == VKD3DSPR_UAV ? VKD3D_SHADER_DESCRIPTOR_TYPE_UAV : VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + sym->register_space = resource->register_space; + sym->resource_idx = resource->register_index; + if (rb_put(&compiler->sm51_resource_table, &sym->key, &sym->entry) == -1) + vkd3d_free(sym); + } + if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -8709,6 +8863,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) vkd3d_spirv_builder_free(&compiler->spirv_builder); rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); + rb_destroy(&compiler->sm51_resource_table, vkd3d_sm51_symbol_free, NULL); vkd3d_free(compiler->shader_phases); vkd3d_free(compiler->spec_constants); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 940cb76..1c052a0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -615,6 +615,7 @@ struct vkd3d_shader_semantic enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg; unsigned int register_space; + unsigned int register_index; }; enum vkd3d_shader_input_sysval_semantic @@ -662,6 +663,7 @@ struct vkd3d_shader_register_semantic struct vkd3d_shader_sampler { struct vkd3d_shader_src_param src; + unsigned int register_index; unsigned int register_space; }; @@ -669,6 +671,7 @@ struct vkd3d_shader_constant_buffer { struct vkd3d_shader_src_param src; unsigned int size; + unsigned int register_index; unsigned int register_space; }; @@ -676,12 +679,14 @@ struct vkd3d_shader_structured_resource { struct vkd3d_shader_dst_param reg; unsigned int byte_stride; + unsigned int register_index; unsigned int register_space; }; struct vkd3d_shader_raw_resource { struct vkd3d_shader_dst_param dst; + unsigned int register_index; unsigned int register_space; }; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 297054b..4aad3e7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2654,7 +2654,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; + unsigned int i, j, k, descriptor_count; struct d3d12_desc *descriptor; descriptor_table = root_signature_get_descriptor_table(root_signature, index); @@ -2677,14 +2677,26 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int register_idx = range->base_register_idx + j; /* Track UAV counters. */ - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + if (list->state->uav_counter_mask != 0 && range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + const struct vkd3d_shader_uav_counter_binding *counter_bindings = list->state->uav_counters; + for (k = 0; k < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; k++) + { + if ((list->state->uav_counter_mask & (1u << k))) + { + if (counter_bindings->register_space == range->register_space && + counter_bindings->register_index == register_idx) + { + VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + if (bindings->vk_uav_counter_views[k] != vk_counter_view) + bindings->uav_counter_dirty_mask |= 1u << k; + bindings->vk_uav_counter_views[k] = vk_counter_view; + break; + } + counter_bindings++; + } + } } if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, @@ -2840,7 +2852,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - assert(vk_uav_counter_views[uav_counter->register_index]); + assert(vk_uav_counter_views[uav_counter->counter_index]); vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_writes[i].pNext = NULL; @@ -2851,7 +2863,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->counter_index]; } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a321fa4..1a18e8a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -308,12 +308,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB = vk_descriptor_type_from_d3d12_range_type(descriptor_range->RangeType, is_buffer); binding_desc->descriptorCount = 1; - if (descriptor_range->RegisterSpace) - { - FIXME("Unhandled register space %u.\n", descriptor_range->RegisterSpace); - return false; - } - binding_desc->stageFlags = stage_flags_from_visibility(shader_visibility); binding_desc->pImmutableSamplers = NULL; @@ -509,6 +503,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat ? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility); root_constant->offset = offset; + root_signature->root_constants[j].register_space = p->u.Constants.RegisterSpace; root_signature->root_constants[j].register_index = p->u.Constants.ShaderRegister; root_signature->root_constants[j].shader_visibility = vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility); @@ -532,7 +527,7 @@ struct vkd3d_descriptor_set_context }; static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int register_idx, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -540,6 +535,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * = &root_signature->descriptor_mapping[context->descriptor_index++]; mapping->type = descriptor_type; + mapping->register_space = register_space; mapping->register_index = register_idx; mapping->shader_visibility = shader_visibility; mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; @@ -548,7 +544,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int base_register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int base_register_idx, unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -565,10 +561,10 @@ static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signat { if (duplicate_descriptors) d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, - base_register_idx + i, true, shader_visibility, context); + register_space, base_register_idx + i, true, shader_visibility, context); d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, - base_register_idx + i, is_buffer_descriptor, shader_visibility, context); + register_space, base_register_idx + i, is_buffer_descriptor, shader_visibility, context); } return first_binding; } @@ -624,7 +620,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo vk_binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_range_type(range->RangeType), - range->BaseShaderRegister, range->NumDescriptors, false, true, + range->RegisterSpace, range->BaseShaderRegister, range->NumDescriptors, false, true, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); /* Unroll descriptor range. */ @@ -657,6 +653,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo table->ranges[j].binding = vk_binding; table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); table->ranges[j].base_register_idx = range->BaseShaderRegister; + table->ranges[j].register_space = range->RegisterSpace; } } @@ -690,7 +687,7 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_root_parameter_type(p->ParameterType), - p->u.Descriptor.ShaderRegister, 1, true, false, + p->u.Descriptor.RegisterSpace, p->u.Descriptor.ShaderRegister, 1, true, false, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); cur_binding->descriptorType = vk_descriptor_type_from_d3d12_root_parameter(p->ParameterType); cur_binding->descriptorCount = 1; @@ -727,7 +724,7 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa return hr; cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->RegisterSpace, s->ShaderRegister, 1, false, false, vkd3d_shader_visibility_from_d3d12(s->ShaderVisibility), context); cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; cur_binding->descriptorCount = 1; @@ -1419,7 +1416,14 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (!(shader_info->uav_counter_mask & (1u << i))) continue; + /* UAV counters will lookup Vulkan bindings based on the mask index directly. + * We currently don't know the actual space/binding for this UAV, + * but register_space/register_index are fixed up later after compilation is finished. */ + state->uav_counters[j].register_space = 0; state->uav_counters[j].register_index = i; + + state->uav_counters[j].counter_index = i; + state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; state->uav_counters[j].binding.set = context.set_index; state->uav_counters[j].binding.binding = context.descriptor_binding; @@ -1476,6 +1480,10 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st VkResult vr; HRESULT hr; int ret; + unsigned int i, j; + unsigned int uav_counter_spaces[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS] = { 0 }; + unsigned int uav_counter_bindings[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS] = { 0 }; + struct vkd3d_shader_effective_uav_counter_binding_info uav_binding_info = { VKD3D_SHADER_STRUCTURE_TYPE_EFFECTIVE_UAV_COUNTER_BINDING_INFO }; state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl; state->refcount = 1; @@ -1519,6 +1527,11 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + shader_interface.next = &uav_binding_info; + uav_binding_info.uav_register_spaces = uav_counter_spaces; + uav_binding_info.uav_register_bindings = uav_counter_bindings; + uav_binding_info.uav_counter_count = VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; + pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; pipeline_info.pNext = NULL; pipeline_info.flags = 0; @@ -1562,6 +1575,17 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } + /* Map back to actual space/bindings for the UAV counter now that we know. */ + for (i = 0, j = 0; i < VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; i++) + { + if (state->uav_counter_mask & (1u << i)) + { + state->uav_counters[j].register_space = uav_counter_spaces[i]; + state->uav_counters[j].register_index = uav_counter_bindings[i]; + j++; + } + } + state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; d3d12_device_add_ref(state->device = device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76ce709..56d130e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -642,6 +642,7 @@ struct d3d12_root_descriptor_table_range uint32_t descriptor_magic; unsigned int base_register_idx; + unsigned int register_space; }; struct d3d12_root_descriptor_table -- 2.24.0

2 3

[PATCH] comctl32: allocate the right wstr size for the TVN_GETDISPINFOW reply
by Damjan Jovanovic 26 Nov '19

26 Nov '19

The code doesn't multiply the strlenW() by sizeof(WCHAR), allocating a buffer that is half the needed size, and resulting in a guaranteed buffer overflow and heap corruption when lstrcpyW() later copies the string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25264 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/2] ddraw: Fix conversion of v1 viewport from v2 in d3d_viewport_GetViewport().
by Paul Gofman 26 Nov '19

26 Nov '19

Spotted in https://bugs.winehq.org/show_bug.cgi?id=19471. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/tests/ddraw4.c | 84 +++++++++++++++++++++++++++++---------- dlls/ddraw/viewport.c | 13 +++--- 2 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e61d67d723..ffa510a8b3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1619,13 +1619,13 @@ static void test_viewport_object(void) return; } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); old_d3d_ref = get_refcount((IUnknown *) d3d); hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 1, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)d3d); @@ -1654,11 +1654,11 @@ static void test_viewport_object(void) gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!gamma, "Interface not set to NULL by failed QI call: %p\n", gamma); + ok(!gamma, "Interface not set to NULL by failed QI call: %p.\n", gamma); /* NULL iid: Segfaults */ hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport, (void **)&viewport); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1667,7 +1667,7 @@ static void test_viewport_object(void) viewport = NULL; hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IDirect3DViewport3, (void **)&viewport2); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *)viewport3); @@ -1675,7 +1675,7 @@ static void test_viewport_object(void) IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); - ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount(unknown); @@ -1688,7 +1688,7 @@ static void test_viewport_object(void) ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_CreateViewport(d3d, &another_vp, NULL); - ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Setting a viewport not in the viewport list fails */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); @@ -1696,21 +1696,21 @@ static void test_viewport_object(void) /* AddViewport(NULL): Segfault */ hr = IDirect3DDevice3_AddViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); hr = IDirect3DDevice3_AddViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 2, "Got unexpected refcount %u.\n", ref); test_vp = (IDirect3DViewport3 *) 0xbaadc0de; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p\n", test_vp); + ok(test_vp == (IDirect3DViewport3 *) 0xbaadc0de, "Got unexpected pointer %p.\n", test_vp); hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) device); @@ -1719,7 +1719,7 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); ref = get_refcount((IUnknown *) viewport3); ok(ref == 4, "Got unexpected refcount %u.\n", ref); if (test_vp) @@ -1729,17 +1729,17 @@ static void test_viewport_object(void) /* Cannot set the viewport to NULL */ hr = IDirect3DDevice3_SetCurrentViewport(device, NULL); - ok(hr == DDERR_INVALIDPARAMS, "Failed to set viewport to NULL, hr %#x.\n", hr); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(test_vp == viewport3, "Got unexpected viewport %p\n", test_vp); + ok(test_vp == viewport3, "Got unexpected viewport %p.\n", test_vp); if (test_vp) IDirect3DViewport3_Release(test_vp); /* SetCurrentViewport properly releases the old viewport's reference */ hr = IDirect3DDevice3_SetCurrentViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 2, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1748,7 +1748,7 @@ static void test_viewport_object(void) /* Unlike device2::DeleteViewport, device3::DeleteViewport releases the * reference held by SetCurrentViewport */ hr = IDirect3DDevice3_DeleteViewport(device, another_vp); - ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) another_vp); ok(ref == 1, "Got unexpected refcount %u.\n", ref); @@ -1756,11 +1756,11 @@ static void test_viewport_object(void) test_vp = NULL; hr = IDirect3DDevice3_GetCurrentViewport(device, &test_vp); ok(hr == D3DERR_NOCURRENTVIEWPORT, "Got unexpected hr %#x.\n", hr); - ok(!test_vp, "Got unexpected viewport %p\n", test_vp); + ok(!test_vp, "Got unexpected viewport %p.\n", test_vp); /* Setting a different viewport doesn't have any surprises now */ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ref = get_refcount((IUnknown *) viewport3); ok(ref == 3, "Got unexpected refcount %u.\n", ref); ref = get_refcount((IUnknown *) another_vp); @@ -1790,10 +1790,52 @@ static void test_viewport_object(void) vp.dwSize = sizeof(vp); hr = IDirect3DViewport3_SetViewport(viewport3, &vp); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); vp2.dwSize = sizeof(vp2); hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); - ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + vp2.dwSize = sizeof(vp2); + vp2.dwX = 160; + vp2.dwY = 120; + vp2.dwWidth = 640 - vp2.dwX; + vp2.dwHeight = 480 - vp2.dwY; + vp2.dvClipX = 2.0f; + vp2.dvClipY = -1.75f; + vp2.dvClipWidth = 2.5f; + vp2.dvClipHeight = -1.5f; + vp2.dvMinZ = 0.5f; + vp2.dvMaxZ = 2.0f; + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == 4.5f && vp.dvMaxY == -1.75f && vp.dvScaleX == 192.0f + && vp.dvScaleY == -240.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); + + vp2.dvClipX = -1.5f; + vp2.dvClipY = 1.75f; + vp2.dvClipWidth = -1.5f; + vp2.dvClipHeight = 2.0f; + vp2.dvMinZ = 2.0f; + vp2.dvMaxZ = 0.5f; + + hr = IDirect3DViewport3_SetViewport2(viewport3, &vp2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vp, 0xff, sizeof(vp)); + vp.dwSize = sizeof(vp); + hr = IDirect3DViewport3_GetViewport(viewport3, &vp); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(vp.dvMaxX == -3.0f && vp.dvMaxY == 1.75f && vp.dvScaleX == -320.0f + && vp.dvScaleY == 180.0f && vp.dvMinZ == 0.0f && vp.dvMaxZ == 1.0f, + "Got unexpected values %g, %g, %g, %g, %g, %g.\n", + vp.dvMaxX, vp.dvMaxY, vp.dvScaleX, vp.dvScaleY, vp.dvMinZ, vp.dvMaxZ); /* Destroying the device removes the viewport and releases the reference */ IDirect3DDevice3_Release(device); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5fc7a4b2be..ceb5582524 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -350,12 +350,13 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE vp1.dwY = viewport->viewports.vp2.dwY; vp1.dwWidth = viewport->viewports.vp2.dwWidth; vp1.dwHeight = viewport->viewports.vp2.dwHeight; - vp1.dvMaxX = 0.0f; - vp1.dvMaxY = 0.0f; - vp1.dvScaleX = 0.0f; - vp1.dvScaleY = 0.0f; - vp1.dvMinZ = viewport->viewports.vp2.dvMinZ; - vp1.dvMaxZ = viewport->viewports.vp2.dvMaxZ; + + vp1.dvScaleX = vp1.dwWidth / viewport->viewports.vp2.dvClipWidth; + vp1.dvScaleY = vp1.dwHeight / viewport->viewports.vp2.dvClipHeight; + vp1.dvMaxX = viewport->viewports.vp2.dvClipWidth + viewport->viewports.vp2.dvClipX; + vp1.dvMaxY = viewport->viewports.vp2.dvClipY; + vp1.dvMinZ = 0.0f; + vp1.dvMaxZ = 1.0f; memcpy(vp, &vp1, size); } -- 2.23.0

2 3

[PATCH] ntdll: Fix build.
by Chip Davis 26 Nov '19

26 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/nt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b684d7683b4..610bf4ccaaa 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -37,6 +37,7 @@ # include <mach/machine.h> #endif #ifdef HAVE_IOKIT_IOKITLIB_H +# include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> # include <IOKit/pwr_mgt/IOPM.h> # include <IOKit/pwr_mgt/IOPMLib.h> -- 2.21.0

1 0

[PATCH 1/5] wined3d: Export wined3d_stateblock_init_contained_states().
by Zebediah Figura 26 Nov '19

26 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87db701d157..5983281f932 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_decref(device->recording); device->recording = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 898a4bc93d4..dc714914ec3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -283,7 +283,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); } -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; unsigned int i, j; @@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, break; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_capture(stateblock); /* According to the tests, stream offset is not updated in the captured state if diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ea04c85d385..29bcd759264 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6d25aa6d88..8ebf377b114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3974,8 +3974,6 @@ struct wined3d_stateblock unsigned int num_contained_sampler_states; }; -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; - void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fac9eef5be2..37e012b979d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, -- 2.23.0

3 7

[PATCH vkd3d 1/2] vkd3d: Add more features to CheckFeatureSupport().
by Conor McCarthy 26 Nov '19

26 Nov '19

Some games, e.g. Hitman 2, do not check for success, and if the feature check is unimplemented they will use uninitialised data as the result. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 141 ++++++++++++++++++ libs/vkd3d/device.c | 276 +++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 5 + 3 files changed, 422 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8246424..3747c8e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1608,6 +1608,141 @@ typedef struct D3D12_FEATURE_DATA_SHADER_MODEL D3D_SHADER_MODEL HighestShaderModel; } D3D12_FEATURE_DATA_SHADER_MODEL; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS1 +{ + BOOL WaveOps; + UINT WaveLaneCountMin; + UINT WaveLaneCountMax; + UINT TotalLaneCount; + BOOL ExpandedComputeResourceStates; + BOOL Int64ShaderOps; +} D3D12_FEATURE_DATA_D3D12_OPTIONS1; + +typedef enum D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER +{ + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED = 0, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_1 = 1, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_2 = 2, +} D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS2 +{ + BOOL DepthBoundsTestSupported; + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER ProgrammableSamplePositionsTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS2; + +typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS +{ + D3D12_SHADER_CACHE_SUPPORT_NONE = 0x0, + D3D12_SHADER_CACHE_SUPPORT_SINGLE_PSO = 0x1, + D3D12_SHADER_CACHE_SUPPORT_LIBRARY = 0x2, + D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x4, + D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, +} D3D12_SHADER_CACHE_SUPPORT_FLAGS; + +typedef struct D3D12_FEATURE_DATA_SHADER_CACHE +{ + D3D12_SHADER_CACHE_SUPPORT_FLAGS SupportFlags; +} D3D12_FEATURE_DATA_SHADER_CACHE; + +typedef struct D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY +{ + D3D12_COMMAND_LIST_TYPE CommandListType; + UINT Priority; + BOOL PriorityForTypeIsSupported; +} D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY; + +typedef struct D3D12_FEATURE_DATA_ARCHITECTURE1 +{ + UINT NodeIndex; + BOOL TileBasedRenderer; + BOOL UMA; + BOOL CacheCoherentUMA; + BOOL IsolatedMMU; +} D3D12_FEATURE_DATA_ARCHITECTURE1; + +typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS +{ + D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE = 0x0, + D3D12_COMMAND_LIST_SUPPORT_FLAG_DIRECT = 0x1, + D3D12_COMMAND_LIST_SUPPORT_FLAG_BUNDLE = 0x2, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COMPUTE = 0x4, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COPY = 0x8, +} D3D12_COMMAND_LIST_SUPPORT_FLAGS; + +typedef enum D3D12_VIEW_INSTANCING_TIER +{ + D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED = 0, + D3D12_VIEW_INSTANCING_TIER_1 = 1, + D3D12_VIEW_INSTANCING_TIER_2 = 2, + D3D12_VIEW_INSTANCING_TIER_3 = 3, +} D3D12_VIEW_INSTANCING_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS3 +{ + BOOL CopyQueueTimestampQueriesSupported; + BOOL CastingFullyTypedFormatSupported; + D3D12_COMMAND_LIST_SUPPORT_FLAGS WriteBufferImmediateSupportFlags; + D3D12_VIEW_INSTANCING_TIER ViewInstancingTier; + BOOL BarycentricsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS3; + +typedef struct D3D12_FEATURE_DATA_EXISTING_HEAPS +{ + BOOL Supported; +} D3D12_FEATURE_DATA_EXISTING_HEAPS; + +typedef enum D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER +{ + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0 = 0, + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_1 = 1, +} D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS4 +{ + BOOL MSAA64KBAlignedTextureSupported; + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER SharedResourceCompatibilityTier; + BOOL Native16BitShaderOpsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS4; + +typedef enum D3D12_HEAP_SERIALIZATION_TIER +{ + D3D12_HEAP_SERIALIZATION_TIER_0 = 0, + D3D12_HEAP_SERIALIZATION_TIER_10 = 10, +} D3D12_HEAP_SERIALIZATION_TIER; + +typedef struct D3D12_FEATURE_DATA_SERIALIZATION +{ + UINT NodeIndex; + D3D12_HEAP_SERIALIZATION_TIER HeapSerializationTier; +} D3D12_FEATURE_DATA_SERIALIZATION; + +typedef struct D3D12_FEATURE_DATA_CROSS_NODE +{ + D3D12_CROSS_NODE_SHARING_TIER SharingTier; + BOOL AtomicShaderInstructions; +} D3D12_FEATURE_DATA_CROSS_NODE; + +typedef enum D3D12_RENDER_PASS_TIER +{ + D3D12_RENDER_PASS_TIER_0 = 0, + D3D12_RENDER_PASS_TIER_1 = 1, + D3D12_RENDER_PASS_TIER_2 = 2, +} D3D12_RENDER_PASS_TIER; + +typedef enum D3D12_RAYTRACING_TIER +{ + D3D12_RAYTRACING_TIER_NOT_SUPPORTED = 0, + D3D12_RAYTRACING_TIER_1_0 = 10, +} D3D12_RAYTRACING_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS5 +{ + BOOL SRVOnlyTiledResourceTier3; + D3D12_RENDER_PASS_TIER RenderPassesTier; + D3D12_RAYTRACING_TIER RaytracingTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS5; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1624,6 +1759,12 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS2 = 18, D3D12_FEATURE_SHADER_CACHE = 19, D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, + D3D12_FEATURE_D3D12_OPTIONS3 = 21, + D3D12_FEATURE_EXISTING_HEAPS = 22, + D3D12_FEATURE_D3D12_OPTIONS4 = 23, + D3D12_FEATURE_SERIALIZATION = 24, + D3D12_FEATURE_CROSS_NODE = 25, + D3D12_FEATURE_D3D12_OPTIONS5 = 27, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7ff567d..0404b76 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1336,6 +1336,33 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE; device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; + device->feature_options1.WaveOps = FALSE; + device->feature_options1.WaveLaneCountMin = 0; + device->feature_options1.WaveLaneCountMax = 0; + device->feature_options1.TotalLaneCount = 0; + device->feature_options1.ExpandedComputeResourceStates = TRUE; + device->feature_options1.Int64ShaderOps = features->shaderInt64; + + /* Depth bounds test is enabled in D3D12_DEPTH_STENCIL_DESC1, which is not supported. */ + device->feature_options2.DepthBoundsTestSupported = FALSE; + /* d3d12_command_list_SetSamplePositions() is not implemented. */ + device->feature_options2.ProgrammableSamplePositionsTier = D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED; + + device->feature_options3.CopyQueueTimestampQueriesSupported = FALSE; + device->feature_options3.CastingFullyTypedFormatSupported = FALSE; + device->feature_options3.WriteBufferImmediateSupportFlags = D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE; + device->feature_options3.ViewInstancingTier = D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED; + device->feature_options3.BarycentricsSupported = FALSE; + + /* Alignment support can be tested later. */ + device->feature_options4.MSAA64KBAlignedTextureSupported = FALSE; + device->feature_options4.SharedResourceCompatibilityTier = D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0; + device->feature_options4.Native16BitShaderOpsSupported = features->shaderInt16; + + device->feature_options5.SRVOnlyTiledResourceTier3 = FALSE; + device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; + device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -1590,6 +1617,8 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, else goto out_destroy_queues; + device->feature_options3.CopyQueueTimestampQueriesSupported = !!device->copy_queue->timestamp_bits; + return S_OK; out_destroy_queues: @@ -2433,6 +2462,27 @@ bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) return true; } +static bool d3d12_is_64k_msaa_supported(struct d3d12_device *device) +{ + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_RESOURCE_DESC resource_desc; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1024; + resource_desc.Height = 1024; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + /* FIXME: in some cases Vulkan requires 0x20000 or more for non-MSAA resources which must have + * 0x10000 in their description, so we might resonably return true here for 0x20000 or 0x40000. */ + return SUCCEEDED(vkd3d_get_image_allocation_info(device, &resource_desc, &info)) + && info.Alignment <= 0x10000; +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -2683,6 +2733,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS1: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS1 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options1; + + TRACE("Wave ops %#x.\n", data->WaveOps); + TRACE("Min wave lane count %#x.\n", data->WaveLaneCountMin); + TRACE("Max wave lane count %#x.\n", data->WaveLaneCountMax); + TRACE("Total lane count %#x.\n", data->TotalLaneCount); + TRACE("Expanded compute resource states %#x.\n", data->ExpandedComputeResourceStates); + TRACE("Int64 shader ops %#x.\n", data->Int64ShaderOps); + return S_OK; + } + case D3D12_FEATURE_ROOT_SIGNATURE: { D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; @@ -2700,6 +2771,219 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ARCHITECTURE1: + { + D3D12_FEATURE_DATA_ARCHITECTURE1 *data = feature_data; + bool coherent; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + WARN("Assuming device does not support tile based rendering.\n"); + data->TileBasedRenderer = FALSE; + + data->UMA = d3d12_device_is_uma(device, &coherent); + data->CacheCoherentUMA = data->UMA ? coherent : FALSE; + + WARN("Assuming device does not have an isolated memory management unit.\n"); + data->IsolatedMMU = FALSE; + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x, isolated MMU %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA, data->IsolatedMMU); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS2: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS2 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options2; + + TRACE("Depth bounds test %#x.\n", data->DepthBoundsTestSupported); + TRACE("Programmable sample positions tier %#x.\n", data->ProgrammableSamplePositionsTier); + return S_OK; + } + + case D3D12_FEATURE_SHADER_CACHE: + { + D3D12_FEATURE_DATA_SHADER_CACHE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + /* FIXME: The D3D12 documentation states that D3D12_SHADER_CACHE_SUPPORT_SINGLE_PSO is + * always supported, but the CachedPSO field of D3D12_GRAPHICS_PIPELINE_STATE_DESC is + * ignored and GetCachedBlob() is a stub. */ + data->SupportFlags = D3D12_SHADER_CACHE_SUPPORT_NONE; + + TRACE("Shader cache support %#x.\n", data->SupportFlags); + return S_OK; + } + + case D3D12_FEATURE_COMMAND_QUEUE_PRIORITY: + { + D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + switch (data->CommandListType) + { + case D3D12_COMMAND_LIST_TYPE_DIRECT: + case D3D12_COMMAND_LIST_TYPE_COMPUTE: + case D3D12_COMMAND_LIST_TYPE_COPY: + data->PriorityForTypeIsSupported = FALSE; + TRACE("Command list type %#x, priority %u, supported %#x.\n", + data->CommandListType, data->Priority, data->PriorityForTypeIsSupported); + return S_OK; + + default: + FIXME("Unhandled command list type %#x.\n", data->CommandListType); + return E_INVALIDARG; + } + } + + case D3D12_FEATURE_D3D12_OPTIONS3: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS3 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options3; + + TRACE("Copy queue timestamp queries %#x.\n", data->CopyQueueTimestampQueriesSupported); + TRACE("Casting fully typed format %#x.\n", data->CastingFullyTypedFormatSupported); + TRACE("Write buffer immediate %#x.\n", data->WriteBufferImmediateSupportFlags); + TRACE("View instancing tier %#x.\n", data->ViewInstancingTier); + TRACE("Barycentrics %#x.\n", data->BarycentricsSupported); + return S_OK; + } + + case D3D12_FEATURE_EXISTING_HEAPS: + { + D3D12_FEATURE_DATA_EXISTING_HEAPS *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->Supported = FALSE; + + TRACE("Existing heaps %#x.\n", data->Supported); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS4: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS4 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options4; + data->MSAA64KBAlignedTextureSupported = d3d12_is_64k_msaa_supported(device); + + TRACE("64KB aligned MSAA textures %#x.\n", data->MSAA64KBAlignedTextureSupported); + TRACE("Shared resource compatibility tier %#x.\n", data->SharedResourceCompatibilityTier); + TRACE("Native 16-bit shader ops %#x.\n", data->Native16BitShaderOpsSupported); + return S_OK; + } + + case D3D12_FEATURE_SERIALIZATION: + { + D3D12_FEATURE_DATA_SERIALIZATION *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + data->HeapSerializationTier = D3D12_HEAP_SERIALIZATION_TIER_0; + + TRACE("Heap serialization tier %#x.\n", data->HeapSerializationTier); + return S_OK; + } + + case D3D12_FEATURE_CROSS_NODE: + { + D3D12_FEATURE_DATA_CROSS_NODE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->SharingTier = D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED; + data->AtomicShaderInstructions = FALSE; + + TRACE("Cross node sharing tier %#x.\n", data->SharingTier); + TRACE("Cross node shader atomics %#x.\n", data->AtomicShaderInstructions); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS5: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS5 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options5; + + TRACE("SRV tiled resource tier 3 only %#x.\n", data->SRVOnlyTiledResourceTier3); + TRACE("Render pass tier %#x.\n", data->RenderPassesTier); + TRACE("Ray tracing tier %#x.\n", data->RaytracingTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9edf96e..7ba1db4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1086,6 +1086,11 @@ struct d3d12_device PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; + D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; + D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; + D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; + D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4; + D3D12_FEATURE_DATA_D3D12_OPTIONS5 feature_options5; struct vkd3d_vulkan_info vk_info; -- 2.24.0

2 3

[PATCH vkd3d v2 1/2] vkd3d: Return success for all valid D3D12 alignments.
by Conor McCarthy 26 Nov '19

26 Nov '19

Windows checks for one of its valid default alignment sizes. The size test should not include DepthOrArraySize, should use the correct size for compressed textures, and the returned alignment should not be tested against the requested one. The current implementation returns ~0 in SizeInBytes for standard D3D12 alignments on some hardware and driver combinations, e.g. AMD RX 580 / RADV. Some games use this value unchecked; for example Hitman 2 will allocate heaps of size 0xffffffff and run out of vram. This patch also fixes RX 580 alignment test failures. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes 173581. --- libs/vkd3d/device.c | 50 ++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a025e68..7ff567d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2938,7 +2938,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (FAILED(d3d12_resource_validate_desc(desc))) { WARN("Invalid resource desc.\n"); - goto invalid; + goto fail; } requested_alignment = desc->Alignment @@ -2946,6 +2946,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { + if (requested_alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + goto invalid; info->SizeInBytes = desc->Width; info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; } @@ -2954,32 +2956,43 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (FAILED(vkd3d_get_image_allocation_info(device, desc, info))) { WARN("Failed to get allocation info for texture.\n"); - goto invalid; + goto fail; } + /* Validate the alignment in the resource description. Also allow the Vulkan alignment in case the caller + * specifies it in future calls. We *could* enforce D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, + * but it may prove better to allow 64KB (which D3D12 accepts on newer hardware anyway), and return + * whatever Vulkan requires. */ + if (requested_alignment != info->Alignment + && requested_alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && requested_alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + && (desc->SampleDesc.Count == 1 || requested_alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT)) + goto invalid; + info->Alignment = max(info->Alignment, requested_alignment); - if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + || requested_alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); - goto invalid; + goto fail; } - estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; + /* Windows uses the slice size to determine small alignment eligibility. DepthOrArraySize is ignored. */ + estimated_size = vkd3d_format_is_compressed(format) + ? desc->Width * desc->Height * format->block_byte_count / (format->block_width * format->block_height) + : desc->Width * desc->Height * format->byte_count; if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + if (requested_alignment == D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT) + goto invalid; info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + } } } - if (desc->Alignment % info->Alignment) - { - WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", - desc->Alignment, info->Alignment); - goto invalid; - } - info->SizeInBytes = align(info->SizeInBytes, info->Alignment); TRACE("Size %#"PRIx64", alignment %#"PRIx64".\n", info->SizeInBytes, info->Alignment); @@ -2987,13 +3000,16 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour return info; invalid: + WARN("Invalid resource alignment %#"PRIx64" (required %#x).\n", + requested_alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + +fail: info->SizeInBytes = ~(uint64_t)0; - /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ - if (desc->SampleDesc.Count != 1) - info->Alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; - else - info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + /* Theoretically we should return D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT if + * (desc->SampleDesc.Count != 1 && !device->feature_options4.MSAA64KBAlignedTextureSupported) + * but Vulkan has no such requirement and it may prove unnecessary. */ + info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; TRACE("Alignment %#"PRIx64".\n", info->Alignment); -- 2.24.0

2 4

[PATCH 1/3] mfplat: Do not make a copy when returning GUID attributes (Valgrind).
by Nikolay Sivov 26 Nov '19

26 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 48e64adeef..6336b1b347 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1349,14 +1349,23 @@ HRESULT attributes_GetDouble(struct attributes *attributes, REFGUID key, double HRESULT attributes_GetGUID(struct attributes *attributes, REFGUID key, GUID *value) { - PROPVARIANT attrval; - HRESULT hr; + struct attribute *attribute; + HRESULT hr = S_OK; - PropVariantInit(&attrval); - attrval.vt = VT_CLSID; - hr = attributes_get_item(attributes, key, &attrval); - if (SUCCEEDED(hr)) - *value = *attrval.u.puuid; + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_GUID) + *value = *attribute->value.u.puuid; + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); return hr; } -- 2.24.0

2 3

[PATCH 1/3] user32/combo: Simplify rectangles sizing helper.
by Nikolay Sivov 26 Nov '19

26 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/combo.c | 163 +++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4ddccd6c95..07d53f7341 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -319,111 +319,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); - - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -479,7 +438,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1530,11 +1489,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); } @@ -1562,11 +1517,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1595,11 +1546,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2100,7 +2047,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH: -- 2.24.0

2 3

[PATCH v3] gdi32/tests: Reserve sufficient room for DIB data.
by Jeff Smith 26 Nov '19

26 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48054 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8fe160546c..8f0f6601b3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -913,7 +913,7 @@ static void test_dibsections(void) static void test_dib_formats(void) { BITMAPINFO *bi; - char data[256]; + char data[2048]; /* 2 x 2 pixels, max 64 bits-per-pixel, max 64 planes */ void *bits; int planes, bpp, compr, format; HBITMAP hdib, hbmp; -- 2.23.0

3 3

[v2 PATCH 1/2] ntdll: Implement thread description as information class.
by Nikolay Sivov 26 Nov '19

26 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/thread.c | 52 ++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 15 ++++++---- server/protocol.def | 12 +++++--- server/request.h | 1 + server/thread.c | 37 ++++++++++++++++++++++++ server/thread.h | 2 ++ server/trace.c | 3 ++ 7 files changed, 112 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 621aaddfe3..6079a6c195 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1115,6 +1115,36 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, *(BOOL*)data = FALSE; if (ret_len) *ret_len = sizeof(BOOL); return STATUS_SUCCESS; + case ThreadDescription: + { + THREAD_DESCRIPTION_INFORMATION *info = data; + data_size_t len, desc_len = 0; + WCHAR *ptr; + + len = length >= sizeof(*info) ? length - sizeof(*info) : 0; + ptr = info ? (WCHAR *)(info + 1) : NULL; + + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + if (ptr) wine_server_set_reply( req, ptr, len ); + status = wine_server_call( req ); + desc_len = reply->desc_len; + } + SERVER_END_REQ; + + if (!info) + status = STATUS_BUFFER_TOO_SMALL; + else if (status == STATUS_SUCCESS) + { + info->Length = desc_len << 16 | desc_len; + info->Description = ptr; + } + + if (ret_len && (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL)) + *ret_len = sizeof(*info) + desc_len; + } + return status; case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1270,6 +1300,28 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; } return status; + case ThreadDescription: + { + const THREAD_DESCRIPTION_INFORMATION *info = data; + data_size_t desc_len; + + if (length != sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; + if (!info) return STATUS_ACCESS_VIOLATION; + + desc_len = info->Length & 0xffff; + if (info->Length >> 16 != desc_len) return STATUS_INVALID_PARAMETER; + if (info->Length && !info->Description) return STATUS_ACCESS_VIOLATION; + + SERVER_START_REQ( set_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->mask = SET_THREAD_INFO_DESCRIPTION; + wine_server_add_data( req, info->Description, desc_len ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + return status; case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0712170c80..108701b2bc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1006,7 +1006,8 @@ struct get_thread_info_reply int exit_code; int priority; int last; - char __pad_52[4]; + data_size_t desc_len; + /* VARARG(desc,unicode_str); */ }; @@ -1034,16 +1035,18 @@ struct set_thread_info_request affinity_t affinity; client_ptr_t entry_point; obj_handle_t token; + /* VARARG(desc,unicode_str); */ char __pad_44[4]; }; struct set_thread_info_reply { struct reply_header __header; }; -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 -#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_DESCRIPTION 0x10 @@ -6697,6 +6700,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 591 +#define SERVER_PROTOCOL_VERSION 592 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c5c15ea1d7..566bc83bb2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -944,6 +944,8 @@ struct rawinput_device int exit_code; /* thread exit code */ int priority; /* thread priority level */ int last; /* last thread in process */ + data_size_t desc_len; /* description length in bytes */ + VARARG(desc,unicode_str); /* description string */ @END @@ -964,11 +966,13 @@ struct rawinput_device affinity_t affinity; /* affinity mask */ client_ptr_t entry_point; /* thread entry point */ obj_handle_t token; /* impersonation token */ + VARARG(desc,unicode_str); /* description string */ @END -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 -#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_DESCRIPTION 0x10 /* Retrieve information about a module */ diff --git a/server/request.h b/server/request.h index f0d2003cd7..de7720ae68 100644 --- a/server/request.h +++ b/server/request.h @@ -849,6 +849,7 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 44 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, desc_len) == 52 ); C_ASSERT( sizeof(struct get_thread_info_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index e753c8d0dd..1c16b4e467 100644 --- a/server/thread.c +++ b/server/thread.c @@ -51,6 +51,7 @@ #include "request.h" #include "user.h" #include "security.h" +#include "unicode.h" #ifdef __i386__ @@ -201,6 +202,8 @@ static inline void init_thread_structure( struct thread *thread ) thread->suspend = 0; thread->desktop_users = 0; thread->token = NULL; + thread->desc = NULL; + thread->desc_len = 0; thread->creation_time = current_time; thread->exit_time = 0; @@ -336,6 +339,7 @@ static void cleanup_thread( struct thread *thread ) thread->inflight[i].client = thread->inflight[i].server = -1; } } + free( thread->desc ); thread->req_data = NULL; thread->reply_data = NULL; thread->request_fd = NULL; @@ -344,6 +348,8 @@ static void cleanup_thread( struct thread *thread ) thread->context = NULL; thread->suspend_context = NULL; thread->desktop = 0; + thread->desc = NULL; + thread->desc_len = 0; } /* destroy a thread when its refcount is 0 */ @@ -551,6 +557,28 @@ static void set_thread_info( struct thread *thread, security_set_thread_token( thread, req->token ); if (req->mask & SET_THREAD_INFO_ENTRYPOINT) thread->entry_point = req->entry_point; + if (req->mask & SET_THREAD_INFO_DESCRIPTION) + { + WCHAR *desc = NULL; + data_size_t desc_len = get_req_data_size(); + + if (desc_len) + { + if ((desc = mem_alloc( desc_len ))) + { + memcpy( desc, get_req_data(), desc_len ); + free( thread->desc ); + thread->desc = desc; + thread->desc_len = desc_len; + } + } + else + { + free( thread->desc ); + thread->desc = NULL; + thread->desc_len = 0; + } + } } /* stop a thread (at the Unix level) */ @@ -1436,6 +1464,15 @@ DECL_HANDLER(get_thread_info) reply->priority = thread->priority; reply->affinity = thread->affinity; reply->last = thread->process->running_threads == 1; + reply->desc_len = thread->desc_len; + + if (thread->desc && get_reply_max_size()) + { + if (thread->desc_len <= get_reply_max_size()) + set_reply_data( thread->desc, thread->desc_len ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + } release_object( thread ); } diff --git a/server/thread.h b/server/thread.h index e10120dcf6..66e35603d3 100644 --- a/server/thread.h +++ b/server/thread.h @@ -88,6 +88,8 @@ struct thread timeout_t exit_time; /* Thread exit time */ struct token *token; /* security token associated with this thread */ struct list kernel_object; /* list of kernel object pointers */ + data_size_t desc_len; /* thread description length in bytes */ + WCHAR *desc; /* thread description string */ }; struct thread_snapshot diff --git a/server/trace.c b/server/trace.c index 11df768755..d44f67a021 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1423,6 +1423,8 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", last=%d", req->last ); + fprintf( stderr, ", desc_len=%u", req->desc_len ); + dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_get_thread_times_request( const struct get_thread_times_request *req ) @@ -1444,6 +1446,7 @@ static void dump_set_thread_info_request( const struct set_thread_info_request * dump_uint64( ", affinity=", &req->affinity ); dump_uint64( ", entry_point=", &req->entry_point ); fprintf( stderr, ", token=%04x", req->token ); + dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_get_dll_info_request( const struct get_dll_info_request *req ) -- 2.24.0

2 2

[PATCH] kernel32: Remove dead code.
by Mathew Hodson 26 Nov '19

26 Nov '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/file.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index c3be67c..17f06f2 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -803,9 +803,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->data_len = io.Information; if (!has_wildcard) { - if (has_wildcard) /* release unused buffer space */ - HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, - info, offsetof( FIND_FIRST_INFO, data[info->data_len] )); info->data_size = 0; /* we read everything */ } -- 2.7.4

2 1

[PATCH] start.exe: STARTUPINFOW needs the STARTF_USESHOWWINDOW flag
by Damjan Jovanovic 26 Nov '19

26 Nov '19

Fixes a regression introduced by 42fa293d48be89ce06b1aab264c5c0d8cc1b4f53 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48170 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/5] quartz/avidec: Call IMemInputPin::Receive() directly.
by Zebediah Figura 26 Nov '19

26 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 7352a28db8..63c5aefcc5 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -184,7 +184,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) IMediaSample_SetMediaTime(pOutSample, NULL, NULL); LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); -- 2.24.0

2 5

[PATCH] comctl32/tests: Check combobox height after SetItemHeight SetWindowPos.
by Thales 25 Nov '19

25 Nov '19

1 0

[PATCH 3/3 v2] dmloader: Rewrite IDirectMusicLoader8 ReleaseObject using find_cache_object
by Michael Stefaniuc 25 Nov '19

25 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: whitespace dlls/dmloader/loader.c | 87 +++++++++++++----------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index c8d04927fd..42209def94 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -685,70 +685,35 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if return DMUS_E_LOADER_OBJECTNOTFOUND; } -static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - struct cache_entry *pObjectEntry; - HRESULT result = S_FALSE; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; - TRACE("(%p, %p)\n", This, pObject); - - if(!pObject) return E_POINTER; + TRACE("(%p, %p)\n", This, object); - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* iterate through the list of objects we know about; check only those with DMUS_OBJ_LOADED */ - TRACE(": looking for the object in cache\n"); - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if (TRACE_ON(dmloader)) - dump_DMUS_OBJECTDESC(&pObjectEntry->Desc); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - result = S_OK; - break; - } - } - if (result == S_OK) { - /*TRACE(": releasing:\n%s - bInvalidDefaultDLS = %i\n - pObject = %p\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); */ - IDirectMusicObject_Release (pObjectEntry->pObject); - pObjectEntry->pObject = NULL; - pObjectEntry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; - } - return result; + if (!object) + return E_POINTER; + + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor(object, &desc); + + TRACE("Looking for the object in cache\n"); + entry = find_cache_object(This, &desc); + if (entry) { + dump_DMUS_OBJECTDESC(&entry->Desc); + + if (entry->pObject && entry->Desc.dwValidData & DMUS_OBJ_LOADED) { + IDirectMusicObject_Release(entry->pObject); + entry->pObject = NULL; + entry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class) -- 2.20.1

1 0

[PATCH 2/3 v2] dmloader: Rewrite IDirectMusicLoader8 CacheObject using find_cache_object
by Michael Stefaniuc 25 Nov '19

25 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: whitespace / drop a comment dlls/dmloader/loader.c | 101 +++++++++++------------------------------ 1 file changed, 26 insertions(+), 75 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 56d241dd1e..c8d04927fd 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -655,83 +655,34 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * } while (1); } -static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; - struct cache_entry *pObjectEntry; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; - TRACE("(%p, %p)\n", This, pObject); - - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* now iterate through the list and check if we have an alias (without object), corresponding - to the descriptor of the input object */ - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - } - - /* if we found such alias, then set everything */ - if (result == S_OK) { - pObjectEntry->Desc.dwValidData &= DMUS_OBJ_LOADED; - pObjectEntry->pObject = pObject; - IDirectMusicObject_AddRef (pObjectEntry->pObject); - } - - return result; + TRACE("(%p, %p)\n", This, object); + + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor(object, &desc); + + /* Iterate through the list and check if we have an alias (without object), corresponding + to the descriptor of the input object */ + entry = find_cache_object(This, &desc); + if (entry) { + if ((entry->Desc.dwValidData & DMUS_OBJ_LOADED) && entry->pObject) { + TRACE("Object already laoded.\n"); + return S_FALSE; + } + + entry->Desc.dwValidData |= DMUS_OBJ_LOADED; + entry->pObject = object; + IDirectMusicObject_AddRef(entry->pObject); + return S_OK; + } + + return DMUS_E_LOADER_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) -- 2.20.1

1 0

[PATCH 1/3 v2] dmloader: Rewrite cache object lookup.
by Michael Stefaniuc 25 Nov '19

25 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: whitespace / indentation dlls/dmloader/loader.c | 174 +++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 69a438765d..56d241dd1e 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -163,6 +163,85 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) return ref; } +static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_OBJECTDESC *desc) +{ + struct cache_entry *existing; + + /* + * The Object is looked for the the following order. + * 1. DMUS_OBJ_OBJECT + * 2. DMUS_OBJ_STREAM + * 3. DMUS_OBJ_MEMORY + * 4. DMUS_OBJ_FILENAME and DMUS_OBJ_FULLPATH + * 5. DMUS_OBJ_NAME and DMUS_OBJ_CATEGORY + * 6. DMUS_OBJ_NAME + * 7. DMUS_OBJ_FILENAME + */ + + if (desc->dwValidData & DMUS_OBJ_OBJECT) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_OBJECT && + IsEqualGUID(&desc->guidObject, &existing->Desc.guidObject) ) { + TRACE("Found by DMUS_OBJ_OBJECT\n"); + return existing; + } + } + } + + if (desc->dwValidData & DMUS_OBJ_STREAM) + FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); + + if (desc->dwValidData & DMUS_OBJ_MEMORY) + FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + + if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH) && + !wcsncmp(desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH\n"); + return existing; + } + } + } + + if ((desc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY) && + !wcsncmp(desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME) && + !wcsncmp(desc->wszCategory, existing->Desc.wszCategory, DMUS_MAX_CATEGORY)) { + TRACE("Found by DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME && + !wcsncmp(desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME)) { + TRACE("Found by DMUS_OBJ_NAME\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (((existing->Desc.dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) && + !wcsncmp(desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME\n"); + return existing; + } + } + } + + return NULL; +} + static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDESC *pDesc, REFIID riid, void **ppv) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); @@ -187,80 +266,27 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac *ppv = NULL; return DMUS_E_LOADER_NOCLASSID; } - - /* OK, first we iterate through the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile) - or set via SetObject; */ - TRACE(": looking if we have object in the cache or if it can be found via alias\n"); - LIST_FOR_EACH_ENTRY(pExistingEntry, &This->cache, struct cache_entry, entry) { - if ((pDesc->dwValidData & DMUS_OBJ_OBJECT) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&pDesc->guidObject, &pExistingEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - /* I suppose such stuff can happen only when GUID for object is given (GUID_DefaultGMCollection) */ - if (pExistingEntry->bInvalidDefaultDLS) { - TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); - return DMUS_E_LOADER_NOFILENAME; - } - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - break; - } - else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (pDesc->wszCategory, pExistingEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_NAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_FILENAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - } - + + /* Iterate through the list of objects we know about; these are either loaded + * (GetObject, LoadObjectFromFile) or set via SetObject; */ + TRACE(": looking if we have object in the cache or if it can be found via alias\n"); + pExistingEntry = find_cache_object(This, pDesc); + if (pExistingEntry) { + + if (pExistingEntry->bInvalidDefaultDLS) { + TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); + return DMUS_E_LOADER_NOFILENAME; + } + + if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { + TRACE(": already loaded\n"); + return IDirectMusicObject_QueryInterface(pExistingEntry->pObject, riid, ppv); + } + + TRACE(": not loaded yet\n"); + pObjectEntry = pExistingEntry; + } + /* basically, if we found alias, we use its descriptor to load... else we use info we were given */ if (pObjectEntry) { -- 2.20.1

1 0

[luto@kernel.org: [oss-security] Lots of bugs in 32-bit x86 Linux entry code]
by Marcus Meissner 25 Nov '19

25 Nov '19

Hi, if distributors decide to disable x86 (32bit) kernel support this might hurt wine. For SUSE this is fresh and I will see that we keep it. Not sure if Wine still uses VM86 mode either. Ciao, Marcus

2 1

[PATCH 1/3] ntdll/tests: Add relationship tests for NtQuerySystemInformationEx.
by Anastasios Simeonidis 25 Nov '19

25 Nov '19

Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr> --- dlls/ntdll/tests/info.c | 166 +++++++++++++++++++++++++++++++++++----- 1 file changed, 146 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 30ed6e5ef9..caa123e982 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -738,8 +738,9 @@ static void test_query_logicalproc(void) static void test_query_logicalprocex(void) { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex2; - DWORD relationship, len2, len; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa, + *infoex_cache, *infoex_package, *infoex_group, *ex; + DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union; NTSTATUS status; BOOL ret; @@ -747,40 +748,69 @@ static void test_query_logicalprocex(void) return; len = 0; - relationship = RelationProcessorCore; + relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); ok(len > 0, "got %u\n", len); - len = 0; - relationship = RelationAll; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); + len_core = 0; + relationship = RelationProcessorCore; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_core); ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); - ok(len > 0, "got %u\n", len); + ok(len_core > 0, "got %u\n", len_core); + + len_numa = 0; + relationship = RelationNumaNode; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_numa); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len_numa > 0, "got %u\n", len_numa); + + len_cache = 0; + relationship = RelationCache; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_cache); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len_cache > 0, "got %u\n", len_cache); + + len_package = 0; + relationship = RelationProcessorPackage; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_package); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len_package > 0, "got %u\n", len_package); + + len_group = 0; + relationship = RelationGroup; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_group); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len_group > 0, "got %u\n", len_group); - len2 = 0; - ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len2); + len_public = 0; + ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len_public); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); - ok(len == len2, "got %u, expected %u\n", len2, len); + ok(len == len_public, "got %u, expected %u\n", len_public, len); - if (len && len == len2) { + if (len && len == len_public) { int j, i; infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - infoex2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - + infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public); + infoex_core = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_core); + infoex_numa = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_numa); + infoex_cache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_cache); + infoex_package = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_package); + infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group); + + relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ret = pGetLogicalProcessorInformationEx(RelationAll, infoex2, &len2); + ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public); ok(ret, "got %d, error %d\n", ret, GetLastError()); - ok(!memcmp(infoex, infoex2, len), "returned info data mismatch\n"); + ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n"); + /* Test for RelationAll. */ for(i = 0; status == STATUS_SUCCESS && i < len; ){ - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *ex = (void*)(((char *)infoex) + i); + ex = (void*)(((char *)infoex) + i); - ok(ex->Relationship >= RelationProcessorCore && ex->Relationship <= RelationGroup, - "Got invalid relationship value: 0x%x\n", ex->Relationship); if (!ex->Size) { ok(0, "got infoex[%u].Size=0\n", i); @@ -791,7 +821,7 @@ static void test_query_logicalprocex(void) switch(ex->Relationship){ case RelationProcessorCore: case RelationProcessorPackage: - trace("infoex[%u].Relationship: 0x%x (Core == 0x0 or Package == 0x3)\n", i, ex->Relationship); + trace("infoex[%u].Relationship: 0x%x (%s)\n", i, ex->Relationship, ex->Relationship == RelationProcessorCore ? "Core" : "Package"); trace("infoex[%u].Processor.Flags: 0x%x\n", i, ex->Processor.Flags); trace("infoex[%u].Processor.EfficiencyClass: 0x%x\n", i, ex->Processor.EfficiencyClass); trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount); @@ -827,14 +857,110 @@ static void test_query_logicalprocex(void) } break; default: + ok(0, "Got invalid relationship value: 0x%x\n", ex->Relationship); break; } i += ex->Size; } + /* Test Relationship filtering. */ + + relationship = RelationProcessorCore; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + for(i = 0; status == STATUS_SUCCESS && i < len_core;) { + ex = (void*)(((char*)infoex_core) + i); + if (ex->Size == 0) { + ok(0, "Got infoex_core[%u].Size=0\n", i); + break; + } + if (ex->Relationship != RelationProcessorCore) { + ok(0, "Expected 0x%x, got 0x%x\n", RelationProcessorCore, ex->Relationship); + break; + } + i += ex->Size; + } + + relationship = RelationNumaNode; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + for(i = 0; status == STATUS_SUCCESS && i < len_numa;) { + ex = (void*)(((char*)infoex_numa) + i); + if (ex->Size == 0) { + ok(0, "Got infoex_numa[%u].Size=0\n", i); + break; + } + if (ex->Relationship != RelationNumaNode) { + ok(0, "Expected 0x%x, got 0x%x\n", RelationNumaNode, ex->Relationship); + break; + } + i += ex->Size; + } + + relationship = RelationCache; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + for(i = 0; status == STATUS_SUCCESS && i < len_cache;) { + ex = (void*)(((char*)infoex_cache) + i); + if (ex->Size == 0) { + ok(0, "Got infoex_cache[%u].Size=0\n", i); + break; + } + if (ex->Relationship != RelationCache) { + ok(0, "Expected 0x%x, got 0x%x\n", RelationCache, ex->Relationship); + break; + } + i += ex->Size; + } + + relationship = RelationProcessorPackage; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + for(i = 0; status == STATUS_SUCCESS && i < len_package;) { + ex = (void*)(((char*)infoex_package) + i); + if (ex->Size == 0) { + ok(0, "Got infoex_package[%u].Size=0\n", i); + break; + } + if (ex->Relationship != RelationProcessorPackage) { + ok(0, "Expected 0x%x, got 0x%x\n", RelationProcessorPackage, ex->Relationship); + break; + } + i += ex->Size; + } + + relationship = RelationGroup; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + for(i = 0; status == STATUS_SUCCESS && i < len_group;) { + ex = (void*)(((char *)infoex_group) + i); + if (ex->Size == 0) { + ok(0, "Got infoex_group[%u].Size=0\n", i); + break; + } + if (ex->Relationship != RelationGroup) { + ok(0, "Expected 0x%x, got 0x%x\n", RelationGroup, ex->Relationship); + break; + } + i += ex->Size; + } + + len_union = len_core + len_numa + len_cache + len_package + len_group; + ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union); + HeapFree(GetProcessHeap(), 0, infoex); - HeapFree(GetProcessHeap(), 0, infoex2); + HeapFree(GetProcessHeap(), 0, infoex_public); + HeapFree(GetProcessHeap(), 0, infoex_core); + HeapFree(GetProcessHeap(), 0, infoex_numa); + HeapFree(GetProcessHeap(), 0, infoex_cache); + HeapFree(GetProcessHeap(), 0, infoex_package); + HeapFree(GetProcessHeap(), 0, infoex_group); } } -- 2.24.0

2 4

[PATCH v2] ddraw: Track the viewport and scissor rect in the primary stateblock.
by Zebediah Figura 25 Nov '19

25 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ad1fdb7f57..ffa029321c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6961,6 +6961,17 @@ enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device return WINED3D_ZB_TRUE; } +static void ddraw_reset_viewport_state(struct ddraw *ddraw) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(ddraw->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(ddraw->state, &vp); + wined3d_device_get_scissor_rects(ddraw->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); +} + static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { @@ -7039,6 +7050,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); } + ddraw_reset_viewport_state(ddraw); return D3D_OK; } -- 2.23.0

2 1

[PATCH v2 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Remove redundant key creation code. dlls/kernel32/Makefile.in | 1 - dlls/kernel32/oldconfig.c | 407 ----------------------------------- dlls/kernel32/process.c | 1 - dlls/mountmgr.sys/dbus.c | 185 +++++++++++++++- dlls/mountmgr.sys/device.c | 153 ++++++++++++- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 15 +- dlls/mountmgr.sys/mountmgr.h | 36 +++- 8 files changed, 384 insertions(+), 416 deletions(-) delete mode 100644 dlls/kernel32/oldconfig.c diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 48c6c8a8ce4..22cfb11eb1a 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ lzexpand.c \ module.c \ nameprep.c \ - oldconfig.c \ path.c \ powermgnt.c \ process.c \ diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c deleted file mode 100644 index dcce1aa6a23..00000000000 --- a/dlls/kernel32/oldconfig.c +++ /dev/null @@ -1,407 +0,0 @@ -/* - * Support for converting from old configuration format - * - * Copyright 2005 Alexandre Julliard - * - * 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 - * - * NOTES - * This file should be removed after a suitable transition period. - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <sys/types.h> -#include <stdlib.h> -#include <stdio.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#include <fcntl.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif -#ifdef HAVE_LINUX_HDREG_H -# include <linux/hdreg.h> -#endif - -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "ntddscsi.h" -#include "wine/library.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "kernel_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(reg); - -static NTSTATUS create_key( HANDLE root, const char *name, HANDLE *key, DWORD *disp ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - NTSTATUS status; - - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, name )) return STATUS_NO_MEMORY; - status = NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, disp ); - if (status) ERR("Cannot create %s registry key\n", name ); - RtlFreeUnicodeString( &nameW ); - return status; -} - -/****************************************************************** - * create_scsi_entry - * - * Initializes registry to contain scsi info about the cdrom in NT. - * All devices (even not real scsi ones) have this info in NT. - * NOTE: programs usually read these registry entries after sending the - * IOCTL_SCSI_GET_ADDRESS ioctl to the cdrom - */ -static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uDriveType, - LPSTR lpDriveName, LPSTR lpUnixDeviceName ) -{ - static UCHAR uCdromNumber = 0; - static UCHAR uTapeNumber = 0; - - UNICODE_STRING nameW; - WCHAR dataW[50]; - DWORD sizeW; - char buffer[40]; - DWORD value; - const char *data; - HANDLE scsiKey; - HANDLE portKey; - HANDLE busKey; - HANDLE targetKey; - HANDLE lunKey; - DWORD disp; - - if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; - NtClose( scsiKey ); - - /* Ensure there is Scsi key */ - if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; - - snprintf(buffer,sizeof(buffer),"Scsi Port %d",scsi_addr->PortNumber); - if (create_key( scsiKey, buffer, &portKey, &disp )) return; - - RtlCreateUnicodeStringFromAsciiz( &nameW, "Driver" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriver, strlen(lpDriver)+1); - NtSetValueKey( portKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - value = 10; - RtlCreateUnicodeStringFromAsciiz( &nameW, "FirstBusTimeScanInMs" ); - NtSetValueKey( portKey,&nameW, 0, REG_DWORD, &value, sizeof(DWORD) ); - RtlFreeUnicodeString( &nameW ); - - value = 0; - if (strcmp(lpDriver, "atapi") == 0) - { -#ifdef HDIO_GET_DMA - int fd, dma; - - fd = open(lpUnixDeviceName, O_RDONLY|O_NONBLOCK); - if (fd != -1) - { - if (ioctl(fd, HDIO_GET_DMA, &dma) != -1) value = dma; - close(fd); - } -#endif - RtlCreateUnicodeStringFromAsciiz( &nameW, "DMAEnabled" ); - NtSetValueKey( portKey,&nameW, 0, REG_DWORD, &value, sizeof(DWORD) ); - RtlFreeUnicodeString( &nameW ); - } - - snprintf(buffer, sizeof(buffer),"Scsi Bus %d", scsi_addr->PathId); - if (create_key( portKey, buffer, &busKey, &disp )) return; - - /* FIXME: get real controller Id for SCSI */ - if (create_key( busKey, buffer, &targetKey, &disp )) return; - NtClose( targetKey ); - - snprintf(buffer, sizeof(buffer),"Target Id %d", scsi_addr->TargetId); - if (create_key( busKey, buffer, &targetKey, &disp )) return; - - snprintf(buffer, sizeof(buffer),"Logical Unit Id %d", scsi_addr->Lun); - if (create_key( targetKey, buffer, &lunKey, &disp )) return; - - switch (uDriveType) - { - case DRIVE_NO_ROOT_DIR: - default: - data = "OtherPeripheral"; break; - case DRIVE_FIXED: - data = "DiskPeripheral"; break; - case DRIVE_REMOVABLE: - data = "TapePeripheral"; - snprintf(buffer, sizeof(buffer), "Tape%d", uTapeNumber++); - break; - case DRIVE_CDROM: - data = "CdRomPeripheral"; - snprintf(buffer, sizeof(buffer), "Cdrom%d", uCdromNumber++); - break; - } - RtlCreateUnicodeStringFromAsciiz( &nameW, "Type" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, data, strlen(data)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - RtlCreateUnicodeStringFromAsciiz( &nameW, "Identifier" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriveName, strlen(lpDriveName)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - if (uDriveType == DRIVE_CDROM || uDriveType == DRIVE_REMOVABLE) - { - RtlCreateUnicodeStringFromAsciiz( &nameW, "DeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, buffer, strlen(buffer)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - } - - RtlCreateUnicodeStringFromAsciiz( &nameW, "UnixDeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpUnixDeviceName, strlen(lpUnixDeviceName)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - NtClose( lunKey ); - NtClose( targetKey ); - NtClose( busKey ); - NtClose( portKey ); - NtClose( scsiKey ); -} - -struct LinuxProcScsiDevice -{ - int host; - int channel; - int target; - int lun; - char vendor[9]; - char model[17]; - char rev[5]; - char type[33]; - int ansirev; -}; - -/* - * we need to declare white spaces explicitly via %*1[ ], - * as there are very dainbread CD-ROM devices out there - * which have their manufacturer name blanked out via spaces, - * which confuses fscanf's parsing (skips all blank spaces) - */ -static int SCSI_getprocentry( FILE * procfile, struct LinuxProcScsiDevice * dev ) -{ - int result; - - result = fscanf( procfile, - "Host:%*1[ ]scsi%d%*1[ ]Channel:%*1[ ]%d%*1[ ]Id:%*1[ ]%d%*1[ ]Lun:%*1[ ]%d\n", - &dev->host, - &dev->channel, - &dev->target, - &dev->lun ); - if( result == EOF ) - { - /* "end of entries" return, so no TRACE() here */ - return EOF; - } - if( result != 4 ) - { - ERR("bus id line scan count error (fscanf returns %d, expected 4)\n", result); - return 0; - } - result = fscanf( procfile, - " Vendor:%*1[ ]%8c%*1[ ]Model:%*1[ ]%16c%*1[ ]Rev:%*1[ ]%4c\n", - dev->vendor, - dev->model, - dev->rev ); - if( result != 3 ) - { - ERR("model line scan count error (fscanf returns %d, expected 3)\n", result); - return 0; - } - - result = fscanf( procfile, - " Type:%*3[ ]%32c%*1[ ]ANSI SCSI%*1[ ]revision:%*1[ ]%x\n", - dev->type, - &dev->ansirev ); - if( result != 2 ) - { - ERR("SCSI type line scan count error (fscanf returns %d, expected 2)\n", result); - return 0; - } - /* Since we fscanf with %XXc instead of %s.. put a NULL at end */ - dev->vendor[8] = 0; - dev->model[16] = 0; - dev->rev[4] = 0; - dev->type[32] = 0; - - return 1; -} - - -/* create the hardware registry branch */ -static void create_hardware_branch(void) -{ - /* The following mostly will work on Linux, but should not cause - * problems on other systems. */ - static const char procname_ide_media[] = "/proc/ide/%s/media"; - static const char procname_ide_model[] = "/proc/ide/%s/model"; - static const char procname_scsi[] = "/proc/scsi/scsi"; - DIR *idedir; - struct dirent *dent = NULL; - FILE *procfile = NULL; - char cStr[40], cDevModel[40], cUnixDeviceName[40], read1[10] = "\0", read2[10] = "\0"; - SCSI_ADDRESS scsi_addr; - UINT nType; - struct LinuxProcScsiDevice dev; - int result = 0, nSgNumber = 0; - UCHAR uFirstSCSIPort = 0; - - /* Enumerate all ide devices first */ - idedir = opendir("/proc/ide"); - if (idedir) - { - while ((dent = readdir(idedir))) - { - if (strncmp(dent->d_name, "hd", 2) == 0) - { - if (snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name) >= sizeof(cStr)) - continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { - ERR("Could not open %s\n", cStr); - continue; - } else { - fgets(cStr, sizeof(cStr), procfile); - fclose(procfile); - nType = DRIVE_UNKNOWN; - if (_strnicmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; - if (_strnicmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; - - if (nType == DRIVE_UNKNOWN) continue; - } - - if (snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name) >= sizeof(cStr)) - continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { - ERR("Could not open %s\n", cStr); - switch (nType) - { - case DRIVE_FIXED: strcpy(cDevModel, "Wine harddisk"); break; - case DRIVE_CDROM: strcpy(cDevModel, "Wine CDROM"); break; - } - } else { - fgets(cDevModel, sizeof(cDevModel), procfile); - fclose(procfile); - cDevModel[strlen(cDevModel) - 1] = 0; - } - - if (snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name) >= sizeof(cUnixDeviceName)) - continue; - scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; - scsi_addr.PathId = 0; - scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2; - scsi_addr.Lun = 0; - if (scsi_addr.PortNumber + 1 > uFirstSCSIPort) - uFirstSCSIPort = scsi_addr.PortNumber + 1; - - create_scsi_entry(&scsi_addr, "atapi", nType, cDevModel, cUnixDeviceName); - } - } - closedir(idedir); - } - - /* Now goes SCSI */ - procfile = fopen(procname_scsi, "r"); - if (!procfile) - { - TRACE("Could not open %s\n", procname_scsi); - return; - } - fgets(cStr, 40, procfile); - sscanf(cStr, "Attached %9s %9s", read1, read2); - - if (strcmp(read1, "devices:") != 0) - { - WARN("Incorrect %s format\n", procname_scsi); - fclose( procfile ); - return; - } - if (strcmp(read2, "none") == 0) - { - TRACE("No SCSI devices found in %s.\n", procname_scsi); - fclose( procfile ); - return; - } - - /* Read info for one device */ - while ((result = SCSI_getprocentry(procfile, &dev)) > 0) - { - scsi_addr.PortNumber = dev.host; - scsi_addr.PathId = dev.channel; - scsi_addr.TargetId = dev.target; - scsi_addr.Lun = dev.lun; - - scsi_addr.PortNumber += uFirstSCSIPort; - if (strncmp(dev.type, "Direct-Access", 13) == 0) nType = DRIVE_FIXED; - else if (strncmp(dev.type, "Sequential-Access", 17) == 0) nType = DRIVE_REMOVABLE; - else if (strncmp(dev.type, "CD-ROM", 6) == 0) nType = DRIVE_CDROM; - else if (strncmp(dev.type, "Processor", 9) == 0) nType = DRIVE_NO_ROOT_DIR; - else if (strncmp(dev.type, "Scanner", 7) == 0) nType = DRIVE_NO_ROOT_DIR; - else if (strncmp(dev.type, "Printer", 7) == 0) nType = DRIVE_NO_ROOT_DIR; - else continue; - - strcpy(cDevModel, dev.vendor); - strcat(cDevModel, dev.model); - strcat(cDevModel, dev.rev); - sprintf(cUnixDeviceName, "/dev/sg%d", nSgNumber++); - /* FIXME: get real driver name */ - create_scsi_entry(&scsi_addr, "WINE SCSI", nType, cDevModel, cUnixDeviceName); - } - if( result != EOF ) - WARN("Incorrect %s format\n", procname_scsi); - fclose( procfile ); -} - - -/*********************************************************************** - * convert_old_config - */ -void convert_old_config(void) -{ - HANDLE key; - DWORD disp; - - /* create some hardware keys (FIXME: should not be done here) */ - if (create_key( 0, "\\Registry\\Machine\\HARDWARE", &key, &disp )) return; - NtClose( key ); - if (disp != REG_OPENED_EXISTING_KEY) create_hardware_branch(); -} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f68193c93dd..09c6bab3ce8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -214,7 +214,6 @@ void * CDECL __wine_kernel_init(void) RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); - convert_old_config(); set_library_argv( __wine_main_wargv ); if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 4ccfb2a79ca..c6d5d0b7af4 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -101,6 +101,7 @@ static DBusConnection *connection; DO_FUNC(libhal_ctx_set_device_removed); \ DO_FUNC(libhal_ctx_shutdown); \ DO_FUNC(libhal_device_get_property_bool); \ + DO_FUNC(libhal_device_get_property_int); \ DO_FUNC(libhal_device_get_property_string); \ DO_FUNC(libhal_device_add_property_watch); \ DO_FUNC(libhal_device_remove_property_watch); \ @@ -318,7 +319,7 @@ static void udisks_new_device( const char *udi ) if (device) { - if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); } @@ -484,7 +485,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess } if (device) { - if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); } } @@ -582,6 +583,178 @@ static DBusHandlerResult udisks_filter( DBusConnection *ctx, DBusMessage *msg, v #ifdef SONAME_LIBHAL +static BOOL hal_get_ide_parameters( LibHalContext *ctx, const char *udi, SCSI_ADDRESS *scsi_addr, UCHAR *devtype, char *ident, size_t ident_size ) +{ + DBusError error; + char *parent = NULL; + char *type = NULL; + char *model = NULL; + int host, chan; + BOOL ret = FALSE; + + p_dbus_error_init( &error ); + + if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) + goto done; + if ((host = p_libhal_device_get_property_int( ctx, parent, "ide.host", &error )) < 0) + goto done; + if ((chan = p_libhal_device_get_property_int( ctx, parent, "ide.channel", &error )) < 0) + goto done; + + ret = TRUE; + + if (devtype) + { + if (!(type = p_libhal_device_get_property_string( ctx, udi, "storage.drive_type", &error ))) + *devtype = SCSI_UNKNOWN_PERIPHERAL; + else if (!strcmp( type, "disk" ) || !strcmp( type, "floppy" )) + *devtype = SCSI_DISK_PERIPHERAL; + else if (!strcmp( type, "tape" )) + *devtype = SCSI_TAPE_PERIPHERAL; + else if (!strcmp( type, "cdrom" )) + *devtype = SCSI_CDROM_PERIPHERAL; + else if (!strcmp( type, "raid" )) + *devtype = SCSI_ARRAY_PERIPHERAL; + else + *devtype = SCSI_UNKNOWN_PERIPHERAL; + } + + if (ident) + { + if (!(model = p_libhal_device_get_property_string( ctx, udi, "storage.model", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + else + lstrcpynA( ident, model, ident_size ); + } + + scsi_addr->PortNumber = host; + scsi_addr->PathId = 0; + scsi_addr->TargetId = chan; + scsi_addr->Lun = 0; + +done: + if (model) p_libhal_free_string( model ); + if (type) p_libhal_free_string( type ); + if (parent) p_libhal_free_string( parent ); + p_dbus_error_free( &error ); + return ret; +} + +static BOOL hal_get_scsi_parameters( LibHalContext *ctx, const char *udi, SCSI_ADDRESS *scsi_addr, UCHAR *devtype, char *ident, size_t ident_size ) +{ + DBusError error; + char *type = NULL; + char *vendor = NULL; + char *model = NULL; + int host, bus, target, lun; + BOOL ret = FALSE; + + p_dbus_error_init( &error ); + + if ((host = p_libhal_device_get_property_int( ctx, udi, "scsi.host", &error )) < 0) + goto done; + if ((bus = p_libhal_device_get_property_int( ctx, udi, "scsi.bus", &error )) < 0) + goto done; + if ((target = p_libhal_device_get_property_int( ctx, udi, "scsi.target", &error )) < 0) + goto done; + if ((lun = p_libhal_device_get_property_int( ctx, udi, "scsi.lun", &error )) < 0) + goto done; + + ret = TRUE; + scsi_addr->PortNumber = host; + scsi_addr->PathId = bus; + scsi_addr->TargetId = target; + scsi_addr->Lun = lun; + + if (ident) + { + if (!(vendor = p_libhal_device_get_property_string( ctx, udi, "scsi.vendor", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + if (!(model = p_libhal_device_get_property_string( ctx, udi, "scsi.model", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + snprintf( ident, ident_size, "%-8s%-16s", vendor ? vendor : "WINE", model ? model : "SCSI" ); + } + + if (devtype) + { + if (!(type = p_libhal_device_get_property_string( ctx, udi, "scsi.type", &error ))) + { + *devtype = SCSI_UNKNOWN_PERIPHERAL; + goto done; + } + if (!strcmp( type, "disk" )) + *devtype = SCSI_DISK_PERIPHERAL; + else if (!strcmp( type, "tape" )) + *devtype = SCSI_TAPE_PERIPHERAL; + else if (!strcmp( type, "printer" )) + *devtype = SCSI_PRINTER_PERIPHERAL; + else if (!strcmp( type, "processor" )) + *devtype = SCSI_PROCESSOR_PERIPHERAL; + else if (!strcmp( type, "cdrom" )) + *devtype = SCSI_CDROM_PERIPHERAL; + else if (!strcmp( type, "scanner" )) + *devtype = SCSI_SCANNER_PERIPHERAL; + else if (!strcmp( type, "medium_changer" )) + *devtype = SCSI_MEDIUM_CHANGER_PERIPHERAL; + else if (!strcmp( type, "comm" )) + *devtype = SCSI_COMMS_PERIPHERAL; + else if (!strcmp( type, "raid" )) + *devtype = SCSI_ARRAY_PERIPHERAL; + else + *devtype = SCSI_UNKNOWN_PERIPHERAL; + } + +done: + if (type) p_libhal_free_string( type ); + if (vendor) p_libhal_free_string( vendor ); + if (model) p_libhal_free_string( model ); + p_dbus_error_free( &error ); + return ret; +} + +static void hal_new_ide_device( LibHalContext *ctx, const char *udi ) +{ + SCSI_ADDRESS scsi_addr; + UCHAR devtype; + char ident[40]; + + if (!hal_get_ide_parameters( ctx, udi, &scsi_addr, &devtype, ident, sizeof(ident) )) return; + create_scsi_entry( &scsi_addr, 255, devtype == SCSI_CDROM_PERIPHERAL ? "atapi" : "WINE SCSI", devtype, ident, NULL ); +} + +static void hal_set_device_name( LibHalContext *ctx, const char *udi, const UNICODE_STRING *devname ) +{ + DBusError error; + SCSI_ADDRESS scsi_addr; + char *parent = NULL; + + p_dbus_error_init( &error ); + + if (!hal_get_ide_parameters( ctx, udi, &scsi_addr, NULL, NULL, 0 )) + { + if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) + goto done; + if (!hal_get_scsi_parameters( ctx, parent, &scsi_addr, NULL, NULL, 0 )) + goto done; + } + set_scsi_device_name( &scsi_addr, devname ); + +done: + if (parent) p_libhal_free_string( parent ); + p_dbus_error_free( &error ); +} + +static void hal_new_scsi_device( LibHalContext *ctx, const char *udi ) +{ + SCSI_ADDRESS scsi_addr; + UCHAR devtype; + char ident[40]; + + if (!hal_get_scsi_parameters( ctx, udi, &scsi_addr, &devtype, ident, sizeof(ident) )) return; + /* FIXME: get real controller Id for SCSI */ + create_scsi_entry( &scsi_addr, 255, "WINE SCSI", devtype, ident, NULL ); +} + /* HAL callback for new device */ static void hal_new_device( LibHalContext *ctx, const char *udi ) { @@ -596,6 +769,9 @@ static void hal_new_device( LibHalContext *ctx, const char *udi ) p_dbus_error_init( &error ); + hal_new_scsi_device( ctx, udi ); + hal_new_ide_device( ctx, udi ); + if (!(device = p_libhal_device_get_property_string( ctx, udi, "block.device", &error ))) goto done; @@ -619,7 +795,10 @@ static void hal_new_device( LibHalContext *ctx, const char *udi ) if (p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) { - add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + UNICODE_STRING devname; + + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, &devname ); + hal_set_device_name( ctx, parent, &devname ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index e77f8904040..3369a929224 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -25,7 +25,11 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <fcntl.h> #include <sys/time.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #define NONAMELESSUNION @@ -60,6 +64,12 @@ static const WCHAR drives_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','s',0}; static const WCHAR ports_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','P','o','r','t','s',0}; +static const WCHAR scsi_keyW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P','\\','S','c','s','i',0}; +static const WCHAR scsi_port_keyW[] = {'S','c','s','i',' ','P','o','r','t',' ','%','d',0}; +static const WCHAR scsi_bus_keyW[] = {'S','c','s','i',' ','B','u','s',' ','%','d',0}; +static const WCHAR target_id_keyW[] = {'T','a','r','g','e','t',' ','I','d',' ','%','d',0}; +static const WCHAR lun_keyW[] = {'L','o','g','i','c','a','l',' ','U','n','i','t',' ','I','d',' ','%','d',0}; +static const WCHAR devnameW[] = {'D','e','v','i','c','e','N','a','m','e',0}; struct disk_device { @@ -686,6 +696,144 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, path ); } +/* open the "Logical Unit" key for a given SCSI address */ +static HKEY get_scsi_device_lun_key( SCSI_ADDRESS *scsi_addr ) +{ + WCHAR dataW[50]; + HKEY scsi_key, port_key, bus_key, target_key, lun_key; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return NULL; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return NULL; + RegCloseKey( scsi_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return NULL; + RegCloseKey( port_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return NULL; + RegCloseKey( bus_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return NULL; + RegCloseKey( target_key ); + + return lun_key; +} + +/* fill in the "Logical Unit" key for a given SCSI address */ +void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *driver, UINT type, const char *model, const UNICODE_STRING *dev ) +{ + static UCHAR tape_no = 0; + static const WCHAR tapeW[] = {'T','a','p','e','%','d',0}; + static const WCHAR init_id_keyW[] = {'I','n','i','t','i','a','t','o','r',' ','I','d',' ','%','d',0}; + static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; + static const WCHAR bus_time_scanW[] = {'F','i','r','s','t','B','u','s','T','i','m','e','S','c','a','n','I','n','M','s',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR identW[] = {'I','d','e','n','t','i','f','i','e','r',0}; + + WCHAR dataW[50]; + DWORD sizeW; + DWORD value; + const char *data; + HKEY scsi_key; + HKEY port_key; + HKEY bus_key; + HKEY target_key; + HKEY lun_key; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return; + RegCloseKey( scsi_key ); + + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, driver, strlen(driver)+1); + RegSetValueExW( port_key, driverW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + value = 10; + RegSetValueExW( port_key, bus_time_scanW, 0, REG_DWORD, (const BYTE *)&value, sizeof(value)); + + value = 0; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return; + RegCloseKey( port_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), init_id_keyW, init_id ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; + RegCloseKey( target_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; + RegCloseKey( bus_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return; + RegCloseKey( target_key ); + + switch (type) + { + case SCSI_DISK_PERIPHERAL: data = "DiskPeripheral"; break; + case SCSI_TAPE_PERIPHERAL: data = "TapePeripheral"; break; + case SCSI_PRINTER_PERIPHERAL: data = "PrinterPeripheral"; break; + case SCSI_WORM_PERIPHERAL: data = "WormPeripheral"; break; + case SCSI_CDROM_PERIPHERAL: data = "CdRomPeripheral"; break; + case SCSI_SCANNER_PERIPHERAL: data = "ScannerPeripheral"; break; + case SCSI_OPTICAL_DISK_PERIPHERAL: data = "OpticalDiskPeripheral"; break; + case SCSI_MEDIUM_CHANGER_PERIPHERAL: data = "MediumChangerPeripheral"; break; + case SCSI_COMMS_PERIPHERAL: data = "CommunicationsPeripheral"; break; + case SCSI_ASC_GRAPHICS_PERIPHERAL: + case SCSI_ASC_GRAPHICS2_PERIPHERAL: data = "ASCPrePressGraphicsPeripheral"; break; + case SCSI_ARRAY_PERIPHERAL: data = "ArrayPeripheral"; break; + case SCSI_ENCLOSURE_PERIPHERAL: data = "EnclosurePeripheral"; break; + case SCSI_REDUCED_DISK_PERIPHERAL: data = "RBCPeripheral"; break; + case SCSI_CARD_READER_PERIPHERAL: data = "CardReaderPeripheral"; break; + case SCSI_BRIDGE_PERIPHERAL: data = "BridgePeripheral"; break; + case SCSI_OBJECT_STORAGE_PERIPHERAL: /* Object-based storage devices */ + case SCSI_DRIVE_CONTROLLER_PERIPHERAL: /* Automation/drive controllers */ + case SCSI_REDUCED_CDROM_PERIPHERAL: /* Reduced-commands MM devices */ + case SCSI_PROCESSOR_PERIPHERAL: /* Processor devices (considered to be "Other" by Windows) */ + default: data = "OtherPeripheral"; break; + } + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, data, strlen(data)+1); + RegSetValueExW( lun_key, typeW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, model, strlen(model)+1); + RegSetValueExW( lun_key, identW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + + if (dev) + { + WCHAR *buffer = memchrW( dev->Buffer+1, '\\', dev->Length )+1; + ULONG length = dev->Length - (buffer - dev->Buffer)*sizeof(WCHAR); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)buffer, length ); + } + else if (type == SCSI_TAPE_PERIPHERAL) + { + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), tapeW, tape_no++ ); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)dataW, strlenW( dataW ) ); + } + + RegCloseKey( lun_key ); +} + +/* set the "DeviceName" for a given SCSI address */ +void set_scsi_device_name( SCSI_ADDRESS *scsi_addr, const UNICODE_STRING *dev ) +{ + HKEY lun_key; + WCHAR *buffer; + ULONG length; + + lun_key = get_scsi_device_lun_key( scsi_addr ); + buffer = memchrW( dev->Buffer+1, '\\', dev->Length )+1; + length = dev->Length - (buffer - dev->Buffer)*sizeof(WCHAR); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)buffer, length ); + + RegCloseKey( lun_key ); +} + + /* create a new disk volume */ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) @@ -736,7 +884,8 @@ NTSTATUS remove_volume( const char *udi ) /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ) + const char *mount_point, enum device_type type, const GUID *guid, + UNICODE_STRING *devname ) { char *path, *p; HKEY hkey; @@ -812,6 +961,8 @@ found: if (udi) notify = drive->drive; + if (devname) *devname = volume->device->name; + done: if (volume) release_volume( volume ); LeaveCriticalSection( &device_section ); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 7f04c5f1e06..91d2f851e86 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -89,7 +89,7 @@ static void appeared_callback( DADiskRef disk, void *context ) device, mount_point, wine_dbgstr_guid(guid_ptr) ); if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr, NULL ); else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index bc2b776a92f..610e28a3420 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -268,7 +268,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) case DRIVE_RAMDISK: type = DEVICE_RAMDISK; break; case DRIVE_FIXED: type = DEVICE_HARDDISK_VOL; break; } - return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL ); + return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL, NULL ); } else { @@ -461,6 +461,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; + static const WCHAR devicemapW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P',0}; + static const WCHAR scsiW[] = {'S','c','s','i',0}; #ifdef _WIN64 static const WCHAR qualified_ports_keyW[] = {'\\','R','E','G','I','S','T','R','Y','\\', @@ -475,6 +477,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; + HKEY devicemap_key; NTSTATUS status; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -494,6 +497,16 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCreateKeyExW( HKEY_LOCAL_MACHINE, mounted_devicesW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &mount_key, NULL ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, devicemapW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) + { + HKEY scsi_key; + if (!RegCreateKeyExW( devicemap_key, scsiW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &scsi_key, NULL )) + RegCloseKey( scsi_key ); + RegCloseKey( devicemap_key ); + } + RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 95386a44f84..b7fb7d86586 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -27,6 +27,7 @@ #include "winternl.h" #include "winioctl.h" #include "ntddstor.h" +#include "ntddscsi.h" #include "ntddcdrm.h" #include "ddk/wdm.h" #define WINE_MOUNTMGR_EXTENSIONS @@ -53,13 +54,46 @@ extern NTSTATUS add_volume( const char *udi, const char *device, const char *mou enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; + const char *mount_point, enum device_type type, const GUID *guid, + UNICODE_STRING *devname ) DECLSPEC_HIDDEN; extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; +/* SCSI entry functions */ + +enum scsi_device_type +{ + SCSI_DISK_PERIPHERAL = 0x00, + SCSI_TAPE_PERIPHERAL = 0x01, + SCSI_PRINTER_PERIPHERAL = 0x02, + SCSI_PROCESSOR_PERIPHERAL = 0x03, + SCSI_WORM_PERIPHERAL = 0x04, + SCSI_CDROM_PERIPHERAL = 0x05, + SCSI_SCANNER_PERIPHERAL = 0x06, + SCSI_OPTICAL_DISK_PERIPHERAL = 0x07, + SCSI_MEDIUM_CHANGER_PERIPHERAL = 0x08, + SCSI_COMMS_PERIPHERAL = 0x09, + SCSI_ASC_GRAPHICS_PERIPHERAL = 0x0A, + SCSI_ASC_GRAPHICS2_PERIPHERAL = 0x0B, + SCSI_ARRAY_PERIPHERAL = 0x0C, + SCSI_ENCLOSURE_PERIPHERAL = 0x0D, + SCSI_REDUCED_DISK_PERIPHERAL = 0x0E, + SCSI_CARD_READER_PERIPHERAL = 0x0F, + SCSI_BRIDGE_PERIPHERAL = 0x10, + SCSI_OBJECT_STORAGE_PERIPHERAL = 0x11, + SCSI_DRIVE_CONTROLLER_PERIPHERAL = 0x12, + SCSI_REDUCED_CDROM_PERIPHERAL = 0x15, + SCSI_UNKNOWN_PERIPHERAL = ~0 +}; + +extern void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, + const char *driver, UINT type, const char *drive, + const UNICODE_STRING *devname ) DECLSPEC_HIDDEN; +extern void set_scsi_device_name( SCSI_ADDRESS *scsi_addr, const UNICODE_STRING *devname ) DECLSPEC_HIDDEN; + /* mount point functions */ struct mount_point; -- 2.21.0

2 3

[PATCH 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/oldconfig.c | 407 ----------------------------------- dlls/kernel32/process.c | 1 - dlls/mountmgr.sys/dbus.c | 185 +++++++++++++++- dlls/mountmgr.sys/device.c | 153 ++++++++++++- dlls/mountmgr.sys/diskarb.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 23 +- dlls/mountmgr.sys/mountmgr.h | 36 +++- 8 files changed, 392 insertions(+), 416 deletions(-) delete mode 100644 dlls/kernel32/oldconfig.c diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 48c6c8a8ce4..22cfb11eb1a 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ lzexpand.c \ module.c \ nameprep.c \ - oldconfig.c \ path.c \ powermgnt.c \ process.c \ diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c deleted file mode 100644 index dcce1aa6a23..00000000000 --- a/dlls/kernel32/oldconfig.c +++ /dev/null @@ -1,407 +0,0 @@ -/* - * Support for converting from old configuration format - * - * Copyright 2005 Alexandre Julliard - * - * 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 - * - * NOTES - * This file should be removed after a suitable transition period. - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <sys/types.h> -#include <stdlib.h> -#include <stdio.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#include <fcntl.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif -#ifdef HAVE_LINUX_HDREG_H -# include <linux/hdreg.h> -#endif - -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "ntddscsi.h" -#include "wine/library.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "kernel_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(reg); - -static NTSTATUS create_key( HANDLE root, const char *name, HANDLE *key, DWORD *disp ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - NTSTATUS status; - - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (!RtlCreateUnicodeStringFromAsciiz( &nameW, name )) return STATUS_NO_MEMORY; - status = NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, disp ); - if (status) ERR("Cannot create %s registry key\n", name ); - RtlFreeUnicodeString( &nameW ); - return status; -} - -/****************************************************************** - * create_scsi_entry - * - * Initializes registry to contain scsi info about the cdrom in NT. - * All devices (even not real scsi ones) have this info in NT. - * NOTE: programs usually read these registry entries after sending the - * IOCTL_SCSI_GET_ADDRESS ioctl to the cdrom - */ -static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uDriveType, - LPSTR lpDriveName, LPSTR lpUnixDeviceName ) -{ - static UCHAR uCdromNumber = 0; - static UCHAR uTapeNumber = 0; - - UNICODE_STRING nameW; - WCHAR dataW[50]; - DWORD sizeW; - char buffer[40]; - DWORD value; - const char *data; - HANDLE scsiKey; - HANDLE portKey; - HANDLE busKey; - HANDLE targetKey; - HANDLE lunKey; - DWORD disp; - - if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP", &scsiKey, &disp )) return; - NtClose( scsiKey ); - - /* Ensure there is Scsi key */ - if (create_key( 0, "\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\Scsi", &scsiKey, &disp )) return; - - snprintf(buffer,sizeof(buffer),"Scsi Port %d",scsi_addr->PortNumber); - if (create_key( scsiKey, buffer, &portKey, &disp )) return; - - RtlCreateUnicodeStringFromAsciiz( &nameW, "Driver" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriver, strlen(lpDriver)+1); - NtSetValueKey( portKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - value = 10; - RtlCreateUnicodeStringFromAsciiz( &nameW, "FirstBusTimeScanInMs" ); - NtSetValueKey( portKey,&nameW, 0, REG_DWORD, &value, sizeof(DWORD) ); - RtlFreeUnicodeString( &nameW ); - - value = 0; - if (strcmp(lpDriver, "atapi") == 0) - { -#ifdef HDIO_GET_DMA - int fd, dma; - - fd = open(lpUnixDeviceName, O_RDONLY|O_NONBLOCK); - if (fd != -1) - { - if (ioctl(fd, HDIO_GET_DMA, &dma) != -1) value = dma; - close(fd); - } -#endif - RtlCreateUnicodeStringFromAsciiz( &nameW, "DMAEnabled" ); - NtSetValueKey( portKey,&nameW, 0, REG_DWORD, &value, sizeof(DWORD) ); - RtlFreeUnicodeString( &nameW ); - } - - snprintf(buffer, sizeof(buffer),"Scsi Bus %d", scsi_addr->PathId); - if (create_key( portKey, buffer, &busKey, &disp )) return; - - /* FIXME: get real controller Id for SCSI */ - if (create_key( busKey, buffer, &targetKey, &disp )) return; - NtClose( targetKey ); - - snprintf(buffer, sizeof(buffer),"Target Id %d", scsi_addr->TargetId); - if (create_key( busKey, buffer, &targetKey, &disp )) return; - - snprintf(buffer, sizeof(buffer),"Logical Unit Id %d", scsi_addr->Lun); - if (create_key( targetKey, buffer, &lunKey, &disp )) return; - - switch (uDriveType) - { - case DRIVE_NO_ROOT_DIR: - default: - data = "OtherPeripheral"; break; - case DRIVE_FIXED: - data = "DiskPeripheral"; break; - case DRIVE_REMOVABLE: - data = "TapePeripheral"; - snprintf(buffer, sizeof(buffer), "Tape%d", uTapeNumber++); - break; - case DRIVE_CDROM: - data = "CdRomPeripheral"; - snprintf(buffer, sizeof(buffer), "Cdrom%d", uCdromNumber++); - break; - } - RtlCreateUnicodeStringFromAsciiz( &nameW, "Type" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, data, strlen(data)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - RtlCreateUnicodeStringFromAsciiz( &nameW, "Identifier" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriveName, strlen(lpDriveName)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - if (uDriveType == DRIVE_CDROM || uDriveType == DRIVE_REMOVABLE) - { - RtlCreateUnicodeStringFromAsciiz( &nameW, "DeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, buffer, strlen(buffer)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - } - - RtlCreateUnicodeStringFromAsciiz( &nameW, "UnixDeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpUnixDeviceName, strlen(lpUnixDeviceName)+1); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, dataW, sizeW ); - RtlFreeUnicodeString( &nameW ); - - NtClose( lunKey ); - NtClose( targetKey ); - NtClose( busKey ); - NtClose( portKey ); - NtClose( scsiKey ); -} - -struct LinuxProcScsiDevice -{ - int host; - int channel; - int target; - int lun; - char vendor[9]; - char model[17]; - char rev[5]; - char type[33]; - int ansirev; -}; - -/* - * we need to declare white spaces explicitly via %*1[ ], - * as there are very dainbread CD-ROM devices out there - * which have their manufacturer name blanked out via spaces, - * which confuses fscanf's parsing (skips all blank spaces) - */ -static int SCSI_getprocentry( FILE * procfile, struct LinuxProcScsiDevice * dev ) -{ - int result; - - result = fscanf( procfile, - "Host:%*1[ ]scsi%d%*1[ ]Channel:%*1[ ]%d%*1[ ]Id:%*1[ ]%d%*1[ ]Lun:%*1[ ]%d\n", - &dev->host, - &dev->channel, - &dev->target, - &dev->lun ); - if( result == EOF ) - { - /* "end of entries" return, so no TRACE() here */ - return EOF; - } - if( result != 4 ) - { - ERR("bus id line scan count error (fscanf returns %d, expected 4)\n", result); - return 0; - } - result = fscanf( procfile, - " Vendor:%*1[ ]%8c%*1[ ]Model:%*1[ ]%16c%*1[ ]Rev:%*1[ ]%4c\n", - dev->vendor, - dev->model, - dev->rev ); - if( result != 3 ) - { - ERR("model line scan count error (fscanf returns %d, expected 3)\n", result); - return 0; - } - - result = fscanf( procfile, - " Type:%*3[ ]%32c%*1[ ]ANSI SCSI%*1[ ]revision:%*1[ ]%x\n", - dev->type, - &dev->ansirev ); - if( result != 2 ) - { - ERR("SCSI type line scan count error (fscanf returns %d, expected 2)\n", result); - return 0; - } - /* Since we fscanf with %XXc instead of %s.. put a NULL at end */ - dev->vendor[8] = 0; - dev->model[16] = 0; - dev->rev[4] = 0; - dev->type[32] = 0; - - return 1; -} - - -/* create the hardware registry branch */ -static void create_hardware_branch(void) -{ - /* The following mostly will work on Linux, but should not cause - * problems on other systems. */ - static const char procname_ide_media[] = "/proc/ide/%s/media"; - static const char procname_ide_model[] = "/proc/ide/%s/model"; - static const char procname_scsi[] = "/proc/scsi/scsi"; - DIR *idedir; - struct dirent *dent = NULL; - FILE *procfile = NULL; - char cStr[40], cDevModel[40], cUnixDeviceName[40], read1[10] = "\0", read2[10] = "\0"; - SCSI_ADDRESS scsi_addr; - UINT nType; - struct LinuxProcScsiDevice dev; - int result = 0, nSgNumber = 0; - UCHAR uFirstSCSIPort = 0; - - /* Enumerate all ide devices first */ - idedir = opendir("/proc/ide"); - if (idedir) - { - while ((dent = readdir(idedir))) - { - if (strncmp(dent->d_name, "hd", 2) == 0) - { - if (snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name) >= sizeof(cStr)) - continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { - ERR("Could not open %s\n", cStr); - continue; - } else { - fgets(cStr, sizeof(cStr), procfile); - fclose(procfile); - nType = DRIVE_UNKNOWN; - if (_strnicmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; - if (_strnicmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; - - if (nType == DRIVE_UNKNOWN) continue; - } - - if (snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name) >= sizeof(cStr)) - continue; - procfile = fopen(cStr, "r"); - if (!procfile) - { - ERR("Could not open %s\n", cStr); - switch (nType) - { - case DRIVE_FIXED: strcpy(cDevModel, "Wine harddisk"); break; - case DRIVE_CDROM: strcpy(cDevModel, "Wine CDROM"); break; - } - } else { - fgets(cDevModel, sizeof(cDevModel), procfile); - fclose(procfile); - cDevModel[strlen(cDevModel) - 1] = 0; - } - - if (snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name) >= sizeof(cUnixDeviceName)) - continue; - scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; - scsi_addr.PathId = 0; - scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2; - scsi_addr.Lun = 0; - if (scsi_addr.PortNumber + 1 > uFirstSCSIPort) - uFirstSCSIPort = scsi_addr.PortNumber + 1; - - create_scsi_entry(&scsi_addr, "atapi", nType, cDevModel, cUnixDeviceName); - } - } - closedir(idedir); - } - - /* Now goes SCSI */ - procfile = fopen(procname_scsi, "r"); - if (!procfile) - { - TRACE("Could not open %s\n", procname_scsi); - return; - } - fgets(cStr, 40, procfile); - sscanf(cStr, "Attached %9s %9s", read1, read2); - - if (strcmp(read1, "devices:") != 0) - { - WARN("Incorrect %s format\n", procname_scsi); - fclose( procfile ); - return; - } - if (strcmp(read2, "none") == 0) - { - TRACE("No SCSI devices found in %s.\n", procname_scsi); - fclose( procfile ); - return; - } - - /* Read info for one device */ - while ((result = SCSI_getprocentry(procfile, &dev)) > 0) - { - scsi_addr.PortNumber = dev.host; - scsi_addr.PathId = dev.channel; - scsi_addr.TargetId = dev.target; - scsi_addr.Lun = dev.lun; - - scsi_addr.PortNumber += uFirstSCSIPort; - if (strncmp(dev.type, "Direct-Access", 13) == 0) nType = DRIVE_FIXED; - else if (strncmp(dev.type, "Sequential-Access", 17) == 0) nType = DRIVE_REMOVABLE; - else if (strncmp(dev.type, "CD-ROM", 6) == 0) nType = DRIVE_CDROM; - else if (strncmp(dev.type, "Processor", 9) == 0) nType = DRIVE_NO_ROOT_DIR; - else if (strncmp(dev.type, "Scanner", 7) == 0) nType = DRIVE_NO_ROOT_DIR; - else if (strncmp(dev.type, "Printer", 7) == 0) nType = DRIVE_NO_ROOT_DIR; - else continue; - - strcpy(cDevModel, dev.vendor); - strcat(cDevModel, dev.model); - strcat(cDevModel, dev.rev); - sprintf(cUnixDeviceName, "/dev/sg%d", nSgNumber++); - /* FIXME: get real driver name */ - create_scsi_entry(&scsi_addr, "WINE SCSI", nType, cDevModel, cUnixDeviceName); - } - if( result != EOF ) - WARN("Incorrect %s format\n", procname_scsi); - fclose( procfile ); -} - - -/*********************************************************************** - * convert_old_config - */ -void convert_old_config(void) -{ - HANDLE key; - DWORD disp; - - /* create some hardware keys (FIXME: should not be done here) */ - if (create_key( 0, "\\Registry\\Machine\\HARDWARE", &key, &disp )) return; - NtClose( key ); - if (disp != REG_OPENED_EXISTING_KEY) create_hardware_branch(); -} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f68193c93dd..09c6bab3ce8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -214,7 +214,6 @@ void * CDECL __wine_kernel_init(void) RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); LOCALE_Init(); - convert_old_config(); set_library_argv( __wine_main_wargv ); if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 4ccfb2a79ca..c6d5d0b7af4 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -101,6 +101,7 @@ static DBusConnection *connection; DO_FUNC(libhal_ctx_set_device_removed); \ DO_FUNC(libhal_ctx_shutdown); \ DO_FUNC(libhal_device_get_property_bool); \ + DO_FUNC(libhal_device_get_property_int); \ DO_FUNC(libhal_device_get_property_string); \ DO_FUNC(libhal_device_add_property_watch); \ DO_FUNC(libhal_device_remove_property_watch); \ @@ -318,7 +319,7 @@ static void udisks_new_device( const char *udi ) if (device) { - if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); } @@ -484,7 +485,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess } if (device) { - if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); } } @@ -582,6 +583,178 @@ static DBusHandlerResult udisks_filter( DBusConnection *ctx, DBusMessage *msg, v #ifdef SONAME_LIBHAL +static BOOL hal_get_ide_parameters( LibHalContext *ctx, const char *udi, SCSI_ADDRESS *scsi_addr, UCHAR *devtype, char *ident, size_t ident_size ) +{ + DBusError error; + char *parent = NULL; + char *type = NULL; + char *model = NULL; + int host, chan; + BOOL ret = FALSE; + + p_dbus_error_init( &error ); + + if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) + goto done; + if ((host = p_libhal_device_get_property_int( ctx, parent, "ide.host", &error )) < 0) + goto done; + if ((chan = p_libhal_device_get_property_int( ctx, parent, "ide.channel", &error )) < 0) + goto done; + + ret = TRUE; + + if (devtype) + { + if (!(type = p_libhal_device_get_property_string( ctx, udi, "storage.drive_type", &error ))) + *devtype = SCSI_UNKNOWN_PERIPHERAL; + else if (!strcmp( type, "disk" ) || !strcmp( type, "floppy" )) + *devtype = SCSI_DISK_PERIPHERAL; + else if (!strcmp( type, "tape" )) + *devtype = SCSI_TAPE_PERIPHERAL; + else if (!strcmp( type, "cdrom" )) + *devtype = SCSI_CDROM_PERIPHERAL; + else if (!strcmp( type, "raid" )) + *devtype = SCSI_ARRAY_PERIPHERAL; + else + *devtype = SCSI_UNKNOWN_PERIPHERAL; + } + + if (ident) + { + if (!(model = p_libhal_device_get_property_string( ctx, udi, "storage.model", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + else + lstrcpynA( ident, model, ident_size ); + } + + scsi_addr->PortNumber = host; + scsi_addr->PathId = 0; + scsi_addr->TargetId = chan; + scsi_addr->Lun = 0; + +done: + if (model) p_libhal_free_string( model ); + if (type) p_libhal_free_string( type ); + if (parent) p_libhal_free_string( parent ); + p_dbus_error_free( &error ); + return ret; +} + +static BOOL hal_get_scsi_parameters( LibHalContext *ctx, const char *udi, SCSI_ADDRESS *scsi_addr, UCHAR *devtype, char *ident, size_t ident_size ) +{ + DBusError error; + char *type = NULL; + char *vendor = NULL; + char *model = NULL; + int host, bus, target, lun; + BOOL ret = FALSE; + + p_dbus_error_init( &error ); + + if ((host = p_libhal_device_get_property_int( ctx, udi, "scsi.host", &error )) < 0) + goto done; + if ((bus = p_libhal_device_get_property_int( ctx, udi, "scsi.bus", &error )) < 0) + goto done; + if ((target = p_libhal_device_get_property_int( ctx, udi, "scsi.target", &error )) < 0) + goto done; + if ((lun = p_libhal_device_get_property_int( ctx, udi, "scsi.lun", &error )) < 0) + goto done; + + ret = TRUE; + scsi_addr->PortNumber = host; + scsi_addr->PathId = bus; + scsi_addr->TargetId = target; + scsi_addr->Lun = lun; + + if (ident) + { + if (!(vendor = p_libhal_device_get_property_string( ctx, udi, "scsi.vendor", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + if (!(model = p_libhal_device_get_property_string( ctx, udi, "scsi.model", &error ))) + p_dbus_error_free( &error ); /* ignore error */ + snprintf( ident, ident_size, "%-8s%-16s", vendor ? vendor : "WINE", model ? model : "SCSI" ); + } + + if (devtype) + { + if (!(type = p_libhal_device_get_property_string( ctx, udi, "scsi.type", &error ))) + { + *devtype = SCSI_UNKNOWN_PERIPHERAL; + goto done; + } + if (!strcmp( type, "disk" )) + *devtype = SCSI_DISK_PERIPHERAL; + else if (!strcmp( type, "tape" )) + *devtype = SCSI_TAPE_PERIPHERAL; + else if (!strcmp( type, "printer" )) + *devtype = SCSI_PRINTER_PERIPHERAL; + else if (!strcmp( type, "processor" )) + *devtype = SCSI_PROCESSOR_PERIPHERAL; + else if (!strcmp( type, "cdrom" )) + *devtype = SCSI_CDROM_PERIPHERAL; + else if (!strcmp( type, "scanner" )) + *devtype = SCSI_SCANNER_PERIPHERAL; + else if (!strcmp( type, "medium_changer" )) + *devtype = SCSI_MEDIUM_CHANGER_PERIPHERAL; + else if (!strcmp( type, "comm" )) + *devtype = SCSI_COMMS_PERIPHERAL; + else if (!strcmp( type, "raid" )) + *devtype = SCSI_ARRAY_PERIPHERAL; + else + *devtype = SCSI_UNKNOWN_PERIPHERAL; + } + +done: + if (type) p_libhal_free_string( type ); + if (vendor) p_libhal_free_string( vendor ); + if (model) p_libhal_free_string( model ); + p_dbus_error_free( &error ); + return ret; +} + +static void hal_new_ide_device( LibHalContext *ctx, const char *udi ) +{ + SCSI_ADDRESS scsi_addr; + UCHAR devtype; + char ident[40]; + + if (!hal_get_ide_parameters( ctx, udi, &scsi_addr, &devtype, ident, sizeof(ident) )) return; + create_scsi_entry( &scsi_addr, 255, devtype == SCSI_CDROM_PERIPHERAL ? "atapi" : "WINE SCSI", devtype, ident, NULL ); +} + +static void hal_set_device_name( LibHalContext *ctx, const char *udi, const UNICODE_STRING *devname ) +{ + DBusError error; + SCSI_ADDRESS scsi_addr; + char *parent = NULL; + + p_dbus_error_init( &error ); + + if (!hal_get_ide_parameters( ctx, udi, &scsi_addr, NULL, NULL, 0 )) + { + if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) + goto done; + if (!hal_get_scsi_parameters( ctx, parent, &scsi_addr, NULL, NULL, 0 )) + goto done; + } + set_scsi_device_name( &scsi_addr, devname ); + +done: + if (parent) p_libhal_free_string( parent ); + p_dbus_error_free( &error ); +} + +static void hal_new_scsi_device( LibHalContext *ctx, const char *udi ) +{ + SCSI_ADDRESS scsi_addr; + UCHAR devtype; + char ident[40]; + + if (!hal_get_scsi_parameters( ctx, udi, &scsi_addr, &devtype, ident, sizeof(ident) )) return; + /* FIXME: get real controller Id for SCSI */ + create_scsi_entry( &scsi_addr, 255, "WINE SCSI", devtype, ident, NULL ); +} + /* HAL callback for new device */ static void hal_new_device( LibHalContext *ctx, const char *udi ) { @@ -596,6 +769,9 @@ static void hal_new_device( LibHalContext *ctx, const char *udi ) p_dbus_error_init( &error ); + hal_new_scsi_device( ctx, udi ); + hal_new_ide_device( ctx, udi ); + if (!(device = p_libhal_device_get_property_string( ctx, udi, "block.device", &error ))) goto done; @@ -619,7 +795,10 @@ static void hal_new_device( LibHalContext *ctx, const char *udi ) if (p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) { - add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + UNICODE_STRING devname; + + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, &devname ); + hal_set_device_name( ctx, parent, &devname ); /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index e77f8904040..3369a929224 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -25,7 +25,11 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <fcntl.h> #include <sys/time.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #define NONAMELESSUNION @@ -60,6 +64,12 @@ static const WCHAR drives_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','s',0}; static const WCHAR ports_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','P','o','r','t','s',0}; +static const WCHAR scsi_keyW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P','\\','S','c','s','i',0}; +static const WCHAR scsi_port_keyW[] = {'S','c','s','i',' ','P','o','r','t',' ','%','d',0}; +static const WCHAR scsi_bus_keyW[] = {'S','c','s','i',' ','B','u','s',' ','%','d',0}; +static const WCHAR target_id_keyW[] = {'T','a','r','g','e','t',' ','I','d',' ','%','d',0}; +static const WCHAR lun_keyW[] = {'L','o','g','i','c','a','l',' ','U','n','i','t',' ','I','d',' ','%','d',0}; +static const WCHAR devnameW[] = {'D','e','v','i','c','e','N','a','m','e',0}; struct disk_device { @@ -686,6 +696,144 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, path ); } +/* open the "Logical Unit" key for a given SCSI address */ +static HKEY get_scsi_device_lun_key( SCSI_ADDRESS *scsi_addr ) +{ + WCHAR dataW[50]; + HKEY scsi_key, port_key, bus_key, target_key, lun_key; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return NULL; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return NULL; + RegCloseKey( scsi_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return NULL; + RegCloseKey( port_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return NULL; + RegCloseKey( bus_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return NULL; + RegCloseKey( target_key ); + + return lun_key; +} + +/* fill in the "Logical Unit" key for a given SCSI address */ +void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *driver, UINT type, const char *model, const UNICODE_STRING *dev ) +{ + static UCHAR tape_no = 0; + static const WCHAR tapeW[] = {'T','a','p','e','%','d',0}; + static const WCHAR init_id_keyW[] = {'I','n','i','t','i','a','t','o','r',' ','I','d',' ','%','d',0}; + static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; + static const WCHAR bus_time_scanW[] = {'F','i','r','s','t','B','u','s','T','i','m','e','S','c','a','n','I','n','M','s',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR identW[] = {'I','d','e','n','t','i','f','i','e','r',0}; + + WCHAR dataW[50]; + DWORD sizeW; + DWORD value; + const char *data; + HKEY scsi_key; + HKEY port_key; + HKEY bus_key; + HKEY target_key; + HKEY lun_key; + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return; + RegCloseKey( scsi_key ); + + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, driver, strlen(driver)+1); + RegSetValueExW( port_key, driverW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + value = 10; + RegSetValueExW( port_key, bus_time_scanW, 0, REG_DWORD, (const BYTE *)&value, sizeof(value)); + + value = 0; + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return; + RegCloseKey( port_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), init_id_keyW, init_id ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; + RegCloseKey( target_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; + RegCloseKey( bus_key ); + + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return; + RegCloseKey( target_key ); + + switch (type) + { + case SCSI_DISK_PERIPHERAL: data = "DiskPeripheral"; break; + case SCSI_TAPE_PERIPHERAL: data = "TapePeripheral"; break; + case SCSI_PRINTER_PERIPHERAL: data = "PrinterPeripheral"; break; + case SCSI_WORM_PERIPHERAL: data = "WormPeripheral"; break; + case SCSI_CDROM_PERIPHERAL: data = "CdRomPeripheral"; break; + case SCSI_SCANNER_PERIPHERAL: data = "ScannerPeripheral"; break; + case SCSI_OPTICAL_DISK_PERIPHERAL: data = "OpticalDiskPeripheral"; break; + case SCSI_MEDIUM_CHANGER_PERIPHERAL: data = "MediumChangerPeripheral"; break; + case SCSI_COMMS_PERIPHERAL: data = "CommunicationsPeripheral"; break; + case SCSI_ASC_GRAPHICS_PERIPHERAL: + case SCSI_ASC_GRAPHICS2_PERIPHERAL: data = "ASCPrePressGraphicsPeripheral"; break; + case SCSI_ARRAY_PERIPHERAL: data = "ArrayPeripheral"; break; + case SCSI_ENCLOSURE_PERIPHERAL: data = "EnclosurePeripheral"; break; + case SCSI_REDUCED_DISK_PERIPHERAL: data = "RBCPeripheral"; break; + case SCSI_CARD_READER_PERIPHERAL: data = "CardReaderPeripheral"; break; + case SCSI_BRIDGE_PERIPHERAL: data = "BridgePeripheral"; break; + case SCSI_OBJECT_STORAGE_PERIPHERAL: /* Object-based storage devices */ + case SCSI_DRIVE_CONTROLLER_PERIPHERAL: /* Automation/drive controllers */ + case SCSI_REDUCED_CDROM_PERIPHERAL: /* Reduced-commands MM devices */ + case SCSI_PROCESSOR_PERIPHERAL: /* Processor devices (considered to be "Other" by Windows) */ + default: data = "OtherPeripheral"; break; + } + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, data, strlen(data)+1); + RegSetValueExW( lun_key, typeW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, model, strlen(model)+1); + RegSetValueExW( lun_key, identW, 0, REG_SZ, (const BYTE *)dataW, sizeW ); + + if (dev) + { + WCHAR *buffer = memchrW( dev->Buffer+1, '\\', dev->Length )+1; + ULONG length = dev->Length - (buffer - dev->Buffer)*sizeof(WCHAR); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)buffer, length ); + } + else if (type == SCSI_TAPE_PERIPHERAL) + { + snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), tapeW, tape_no++ ); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)dataW, strlenW( dataW ) ); + } + + RegCloseKey( lun_key ); +} + +/* set the "DeviceName" for a given SCSI address */ +void set_scsi_device_name( SCSI_ADDRESS *scsi_addr, const UNICODE_STRING *dev ) +{ + HKEY lun_key; + WCHAR *buffer; + ULONG length; + + lun_key = get_scsi_device_lun_key( scsi_addr ); + buffer = memchrW( dev->Buffer+1, '\\', dev->Length )+1; + length = dev->Length - (buffer - dev->Buffer)*sizeof(WCHAR); + RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)buffer, length ); + + RegCloseKey( lun_key ); +} + + /* create a new disk volume */ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) @@ -736,7 +884,8 @@ NTSTATUS remove_volume( const char *udi ) /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ) + const char *mount_point, enum device_type type, const GUID *guid, + UNICODE_STRING *devname ) { char *path, *p; HKEY hkey; @@ -812,6 +961,8 @@ found: if (udi) notify = drive->drive; + if (devname) *devname = volume->device->name; + done: if (volume) release_volume( volume ); LeaveCriticalSection( &device_section ); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 7f04c5f1e06..91d2f851e86 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -89,7 +89,7 @@ static void appeared_callback( DADiskRef disk, void *context ) device, mount_point, wine_dbgstr_guid(guid_ptr) ); if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) - add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + add_dos_device( -1, device, device, mount_point, type, guid_ptr, NULL ); else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index bc2b776a92f..3b90be77660 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -268,7 +268,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) case DRIVE_RAMDISK: type = DEVICE_RAMDISK; break; case DRIVE_FIXED: type = DEVICE_HARDDISK_VOL; break; } - return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL ); + return add_dos_device( letter - 'a', NULL, device, mount_point, type, NULL, NULL ); } else { @@ -461,6 +461,10 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; + static const WCHAR devicemapW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P',0}; + static const WCHAR parallelW[] = {'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; + static const WCHAR serialW[] = {'S','E','R','I','A','L','C','O','M','M',0}; + static const WCHAR scsiW[] = {'S','c','s','i',0}; #ifdef _WIN64 static const WCHAR qualified_ports_keyW[] = {'\\','R','E','G','I','S','T','R','Y','\\', @@ -475,6 +479,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; + HKEY devicemap_key; NTSTATUS status; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -494,6 +499,22 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCreateKeyExW( HKEY_LOCAL_MACHINE, mounted_devicesW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &mount_key, NULL ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, devicemapW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) + { + HKEY hkey; + if (!RegCreateKeyExW( devicemap_key, parallelW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + if (!RegCreateKeyExW( devicemap_key, serialW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + if (!RegCreateKeyExW( devicemap_key, scsiW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + RegCloseKey( hkey ); + RegCloseKey( devicemap_key ); + } + RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 95386a44f84..b7fb7d86586 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -27,6 +27,7 @@ #include "winternl.h" #include "winioctl.h" #include "ntddstor.h" +#include "ntddscsi.h" #include "ntddcdrm.h" #include "ddk/wdm.h" #define WINE_MOUNTMGR_EXTENSIONS @@ -53,13 +54,46 @@ extern NTSTATUS add_volume( const char *udi, const char *device, const char *mou enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; + const char *mount_point, enum device_type type, const GUID *guid, + UNICODE_STRING *devname ) DECLSPEC_HIDDEN; extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI serial_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI parallel_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; +/* SCSI entry functions */ + +enum scsi_device_type +{ + SCSI_DISK_PERIPHERAL = 0x00, + SCSI_TAPE_PERIPHERAL = 0x01, + SCSI_PRINTER_PERIPHERAL = 0x02, + SCSI_PROCESSOR_PERIPHERAL = 0x03, + SCSI_WORM_PERIPHERAL = 0x04, + SCSI_CDROM_PERIPHERAL = 0x05, + SCSI_SCANNER_PERIPHERAL = 0x06, + SCSI_OPTICAL_DISK_PERIPHERAL = 0x07, + SCSI_MEDIUM_CHANGER_PERIPHERAL = 0x08, + SCSI_COMMS_PERIPHERAL = 0x09, + SCSI_ASC_GRAPHICS_PERIPHERAL = 0x0A, + SCSI_ASC_GRAPHICS2_PERIPHERAL = 0x0B, + SCSI_ARRAY_PERIPHERAL = 0x0C, + SCSI_ENCLOSURE_PERIPHERAL = 0x0D, + SCSI_REDUCED_DISK_PERIPHERAL = 0x0E, + SCSI_CARD_READER_PERIPHERAL = 0x0F, + SCSI_BRIDGE_PERIPHERAL = 0x10, + SCSI_OBJECT_STORAGE_PERIPHERAL = 0x11, + SCSI_DRIVE_CONTROLLER_PERIPHERAL = 0x12, + SCSI_REDUCED_CDROM_PERIPHERAL = 0x15, + SCSI_UNKNOWN_PERIPHERAL = ~0 +}; + +extern void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, + const char *driver, UINT type, const char *drive, + const UNICODE_STRING *devname ) DECLSPEC_HIDDEN; +extern void set_scsi_device_name( SCSI_ADDRESS *scsi_addr, const UNICODE_STRING *devname ) DECLSPEC_HIDDEN; + /* mount point functions */ struct mount_point; -- 2.21.0

3 5

[PATCH v3 0/2] Add emulation for UMIP instructions
by Brendan Shanks 25 Nov '19

25 Nov '19

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous patch: all code is now integrated into the signal_*.c files, and fixed a warning in the 32-bit code. Brendan Shanks (2): ntdll: Add emulation for UMIP instructions. ntdll/tests: Add tests for UMIP instructions. dlls/ntdll/signal_i386.c | 362 +++++++++++++++++++++++++++++++- dlls/ntdll/signal_x86_64.c | 395 ++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 375 +++++++++++++++++++++++++++++++++ 3 files changed, 1116 insertions(+), 16 deletions(-) -- 2.23.0

3 4

[PATCH 1/2] dlls/d3d12: Fix D3D12SerializeVersionedRootSignature.
by Hans-Kristian Arntzen 25 Nov '19

25 Nov '19

Use the proper versioned serializer from vkd3d. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- dlls/d3d12/d3d12_main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index bd680d8254..9f0fa12ee8 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -420,9 +420,5 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S { TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); - if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) - return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob); - - FIXME("Unsupported version %#x.\n", desc->Version); - return E_NOTIMPL; + return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); } -- 2.23.0

5 21

[PATCH] gdi32/tests: Reserve sufficient room for DIB data.
by Jeff Smith 25 Nov '19

25 Nov '19

Factor out the magic values needed to derive the maximum image data buffer length. If the values need to be changed in the future, the derived value will be automatically recalculated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48054 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 46 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8fe160546c..130ef3ca3a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -910,10 +910,18 @@ static void test_dibsections(void) ReleaseDC(0, hdc); } +#define DATA_WIDTH 2 +#define DATA_HEIGHT 2 +#define MAX_PLANES 64 +#define MAX_BPP 64 +#define DATA_STRIDE_LENGTH (((DATA_WIDTH * MAX_BPP + 31) / 32) * 4) +#define DATA_PLANE_LENGTH (DATA_STRIDE_LENGTH * DATA_HEIGHT) +#define DATA_LENGTH (DATA_PLANE_LENGTH * MAX_PLANES) + static void test_dib_formats(void) { BITMAPINFO *bi; - char data[256]; + char data[DATA_LENGTH]; void *bits; int planes, bpp, compr, format; HBITMAP hdib, hbmp; @@ -928,9 +936,9 @@ static void test_dib_formats(void) memset( data, 0xaa, sizeof(data) ); - for (bpp = 0; bpp <= 64; bpp++) + for (bpp = 0; bpp <= MAX_BPP; bpp++) { - for (planes = 0; planes <= 64; planes++) + for (planes = 0; planes <= MAX_PLANES; planes++) { for (compr = 0; compr < 8; compr++) { @@ -949,8 +957,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -969,8 +977,8 @@ static void test_dib_formats(void) if (!planes) expect_ok = FALSE; memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1027,8 +1035,8 @@ static void test_dib_formats(void) bpp, bi->bmiHeader.biBitCount ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1067,8 +1075,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biBitCount = 16; bi->bmiHeader.biCompression = BI_BITFIELDS; @@ -1120,8 +1128,8 @@ static void test_dib_formats(void) ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( ret, "SetDIBits failed with bad bitfields\n" ); - bi->bmiHeader.biWidth = -2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = -DATA_HEIGHT; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1144,7 +1152,7 @@ static void test_dib_formats(void) ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with negative width\n" ); bi->bmiHeader.biWidth = 0; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1167,7 +1175,7 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 2, NULL, bi, DIB_RGB_COLORS); ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with zero width\n" ); - bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; bi->bmiHeader.biHeight = 0; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; @@ -1193,8 +1201,8 @@ static void test_dib_formats(void) /* some functions accept DIB_PAL_COLORS+1, but not beyond */ - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+1, &bits, NULL, 0); @@ -1217,8 +1225,8 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+1); ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+1\n" ); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+2, &bits, NULL, 0); -- 2.23.0

2 2

[PATCH v3] ntoskrnl.exe: Add tests for METHOD_NEITHER ioctl behavior.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Send just the tests. Attempt to fix a broken test. v3: Remove broken test. I have no idea what Windows is doing here. dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 13 +++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a0f63ade791..6827b74a3c9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1855,6 +1855,34 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG return ZwUnloadDriver(&name); } +static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->UserBuffer; + + if (!buffer) + { + irp->IoStatus.Status = STATUS_ACCESS_VIOLATION; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_ACCESS_VIOLATION; + } + + if (length < sizeof(teststr)) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + memcpy(buffer, teststr, sizeof(teststr)); + + /* This is deliberate; some broken drivers do this */ + *info = 0; + irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -1916,6 +1944,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) IoDetachDevice(lower_device); status = STATUS_SUCCESS; break; + case IOCTL_WINETEST_MISMATCHED_STATUS: + return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 313d554a37b..aa9de674e2f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -33,6 +33,7 @@ #define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 76bcf0d0ce6..2535ed903e7 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -208,6 +208,18 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } +static void test_mismatched_status_ioctl(void) +{ + DWORD written; + char buf[32]; + BOOL res; + + res = DeviceIoControl(device, IOCTL_WINETEST_MISMATCHED_STATUS, NULL, 0, buf, + sizeof(buf), &written, NULL); + todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + todo_wine ok(!strcmp(buf, teststr), "got '%s'\n", buf); +} + static void test_overlapped(void) { OVERLAPPED overlapped, overlapped2, *o; @@ -514,6 +526,7 @@ START_TEST(ntoskrnl) ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); + test_mismatched_status_ioctl(); main_test(); test_overlapped(); test_load_driver(service2); -- 2.21.0

1 0

[PATCH] ntdll: Fix tick count calculation on Linux and Mac.
by Chip Davis 25 Nov '19

25 Nov '19

Based on a patch by Andrew Eikum. Linux's CLOCK_MONOTONIC(_RAW) and macOS's mach_absolute_time all stop counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount does not stop counting. Linux's CLOCK_BOOTTIME matches Windows's behavior, as does macOS's mach_continuous_time. BSD's CLOCK_MONOTONIC already counts asleep time. To avoid issues with skew and performance, this patch falls back to mach_absolute_time on macOS if mach_continuous_time is unavailable. Note that mach_continuous_time was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/time.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index 754dbe8b36e..2a049909a65 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,6 +2206,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b879..92415d50b04 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,9 +111,17 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; +#ifdef CLOCK_BOOTTIME + if (!clock_gettime( CLOCK_BOOTTIME, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -- 2.21.0

2 2

[PATCH 1/2] include: Only define __msvcrt_long to int for LP64.
by Chip Davis 25 Nov '19

25 Nov '19

This is the only place that's needed. Everywhere else can use 'long'. This avoids a bunch of warnings from Clang about common standard library functions having the wrong prototypes. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- include/msvcrt/corecrt.h | 5 +++++ include/msvcrt/math.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index c88d3e0570d..10e60d564c3 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -142,8 +142,13 @@ #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED /* we need 32-bit longs even on 64-bit */ +#ifdef __LP64__ typedef int __msvcrt_long; typedef unsigned int __msvcrt_ulong; +#else +typedef long __msvcrt_long; +typedef unsigned long __msvcrt_ulong; +#endif #endif #ifndef _INTPTR_T_DEFINED diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 76601de853a..68b6922458f 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -96,10 +96,10 @@ float __cdecl rintf(float); float __cdecl roundf(float); float __cdecl truncf(float); -long __cdecl lrint(double); -long __cdecl lrintf(float); -long __cdecl lround(double); -long __cdecl lroundf(float); +__msvcrt_long __cdecl lrint(double); +__msvcrt_long __cdecl lrintf(float); +__msvcrt_long __cdecl lround(double); +__msvcrt_long __cdecl lroundf(float); double __cdecl _copysign (double, double); double __cdecl _chgsign (double); -- 2.21.0

2 4

[PATCH] msvcrt: Call invalid parameter handler for out-of-range integer.
by Jeff Smith 25 Nov '19

25 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/time.c | 3 +-- dlls/ucrtbase/tests/misc.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 84e725747f..0d5b64a4aa 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -996,9 +996,8 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_s #endif MSVCRT_size_t len; - if(src<l || src>h) { + if(!MSVCRT_CHECK_PMT(src>=l && src<=h)) { *str = 0; - *MSVCRT__errno() = MSVCRT_EINVAL; return FALSE; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 93a78a5de7..6314662eac 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -937,10 +937,10 @@ static void test_strftime(void) {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, @@ -948,10 +948,10 @@ static void test_strftime(void) {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }}, {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, -- 2.23.0

2 1

[PATCH v4 01/10] vbscript: Move the global lists to the script dispatch object.
by Gabriel Ivăncescu 25 Nov '19

25 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 15 +++++---- dlls/vbscript/interp.c | 39 +++++++++++----------- dlls/vbscript/vbdisp.c | 34 +++++++++++++------ dlls/vbscript/vbscript.c | 70 +++++++++++++--------------------------- dlls/vbscript/vbscript.h | 41 ++++++++++++----------- 5 files changed, 97 insertions(+), 102 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index bc00209..9ddfacf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1758,21 +1758,22 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { + ScriptDisp *obj = script->script_obj; class_desc_t *class; vbscode_t *code; unsigned i; - for(i = 0; i < script->global_vars_cnt; i++) { - if(!wcsicmp(script->global_vars[i]->name, identifier)) + for(i = 0; i < obj->global_vars_cnt; i++) { + if(!wcsicmp(obj->global_vars[i]->name, identifier)) return TRUE; } - for(i = 0; i < script->global_funcs_cnt; i++) { - if(!wcsicmp(script->global_funcs[i]->name, identifier)) + for(i = 0; i < obj->global_funcs_cnt; i++) { + if(!wcsicmp(obj->global_funcs[i]->name, identifier)) return TRUE; } - for(class = script->classes; class; class = class->next) { + for(class = obj->classes; class; class = class->next) { if(!wcsicmp(class->name, identifier)) return TRUE; } @@ -1977,8 +1978,8 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->procs; - script->procs = desc; + desc->next = script->script_obj->procs; + script->script_obj->procs = desc; *ret = desc; return S_OK; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d15a1b5..66ad206 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,7 +94,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } -static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +static BOOL lookup_global_vars(ScriptDisp *script, const WCHAR *name, ref_t *ref) { dynamic_var_t **vars = script->global_vars; size_t i, cnt = script->global_vars_cnt; @@ -112,6 +112,7 @@ static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *r static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { + ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; IDispatch *disp; unsigned i; @@ -175,11 +176,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_global_vars(ctx->script, name, ref)) + if(lookup_global_vars(script_obj, name, ref)) return S_OK; - for(i = 0; i < ctx->script->global_funcs_cnt; i++) { - function_t *func = ctx->script->global_funcs[i]; + for(i = 0; i < script_obj->global_funcs_cnt; i++) { + function_t *func = script_obj->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; @@ -221,12 +222,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT **out_var) { + ScriptDisp *script_obj = ctx->script->script_obj; dynamic_var_t *new_var; heap_pool_t *heap; WCHAR *str; unsigned size; - heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; + heap = ctx->func->type == FUNC_GLOBAL ? &script_obj->heap : &ctx->heap; new_var = heap_pool_alloc(heap, sizeof(*new_var)); if(!new_var) @@ -243,19 +245,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - size_t cnt = ctx->script->global_vars_cnt + 1; - if(cnt > ctx->script->global_vars_size) { + size_t cnt = script_obj->global_vars_cnt + 1; + if(cnt > script_obj->global_vars_size) { dynamic_var_t **new_vars; - if(ctx->script->global_vars) - new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + if(script_obj->global_vars) + new_vars = heap_realloc(script_obj->global_vars, cnt * 2 * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); if(!new_vars) return E_OUTOFMEMORY; - ctx->script->global_vars = new_vars; - ctx->script->global_vars_size = cnt * 2; + script_obj->global_vars = new_vars; + script_obj->global_vars_size = cnt * 2; } - ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; + script_obj->global_vars[script_obj->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; @@ -1113,7 +1115,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } - for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { + for(class_desc = ctx->script->script_obj->classes; class_desc; class_desc = class_desc->next) { if(!wcsicmp(class_desc->name, arg)) break; } @@ -1133,6 +1135,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_dim(exec_ctx_t *ctx) { + ScriptDisp *script_obj = ctx->script->script_obj; const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; const array_desc_t *array_desc; @@ -1146,13 +1149,13 @@ static HRESULT interp_dim(exec_ctx_t *ctx) if(ctx->func->type == FUNC_GLOBAL) { unsigned i; - for(i = 0; i < ctx->script->global_vars_cnt; i++) { - if(!wcsicmp(ctx->script->global_vars[i]->name, ident)) + for(i = 0; i < script_obj->global_vars_cnt; i++) { + if(!wcsicmp(script_obj->global_vars[i]->name, ident)) break; } - assert(i < ctx->script->global_vars_cnt); - v = &ctx->script->global_vars[i]->v; - array_ref = &ctx->script->global_vars[i]->array; + assert(i < script_obj->global_vars_cnt); + v = &script_obj->global_vars[i]->v; + array_ref = &script_obj->global_vars[i]->array; }else { ref_t ref; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5e5d2c..60a7965 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -817,11 +817,26 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref); + unsigned i; TRACE("(%p) ref=%d\n", This, ref); if(!ref) { assert(!This->ctx); + + while (This->procs) + { + class_desc_t *class_desc = This->procs; + This->procs = class_desc->next; + heap_free(class_desc); + } + + for (i = 0; i < This->global_vars_cnt; i++) + release_dynamic_var(This->global_vars[i]); + + heap_pool_free(&This->heap); + heap_free(This->global_vars); + heap_free(This->global_funcs); heap_free(This); } @@ -899,15 +914,15 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(i = 0; i < This->ctx->global_vars_cnt; i++) { - if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) { + for(i = 0; i < This->global_vars_cnt; i++) { + if(!wcsicmp(This->global_vars[i]->name, bstrName)) { *pid = i + 1; return S_OK; } } - for(i = 0; i < This->ctx->global_funcs_cnt; i++) { - if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) { + for(i = 0; i < This->global_funcs_cnt; i++) { + if(!wcsicmp(This->global_funcs[i]->name, bstrName)) { *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } @@ -928,14 +943,14 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; - if (id > This->ctx->global_funcs_cnt) + if (id > This->global_funcs_cnt) return DISP_E_MEMBERNOTFOUND; switch (wFlags) { case DISPATCH_METHOD: case DISPATCH_METHOD | DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + hres = exec_script(This->ctx, TRUE, This->global_funcs[id - 1], NULL, pdp, pvarRes); break; default: FIXME("Unsupported flags %x\n", wFlags); @@ -945,16 +960,16 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } - if (id > This->ctx->global_vars_cnt) + if (id > This->global_vars_cnt) return DISP_E_MEMBERNOTFOUND; - if (This->ctx->global_vars[id - 1]->is_const) + if (This->global_vars[id - 1]->is_const) { FIXME("const not supported\n"); return E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); + return invoke_variant_prop(This->ctx, &This->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -1028,6 +1043,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl; script_disp->ref = 1; script_disp->ctx = ctx; + heap_pool_init(&script_disp->heap); *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 803a54a..f789036 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -82,41 +82,42 @@ static inline BOOL is_started(VBScript *This) static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { + ScriptDisp *obj = ctx->script_obj; function_t *func_iter, **new_funcs; dynamic_var_t *var, **new_vars; size_t cnt, i; - cnt = ctx->global_vars_cnt + code->main_code.var_cnt; - if (cnt > ctx->global_vars_size) + cnt = obj->global_vars_cnt + code->main_code.var_cnt; + if (cnt > obj->global_vars_size) { - if (ctx->global_vars) - new_vars = heap_realloc(ctx->global_vars, cnt * sizeof(*new_vars)); + if (obj->global_vars) + new_vars = heap_realloc(obj->global_vars, cnt * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * sizeof(*new_vars)); if (!new_vars) return E_OUTOFMEMORY; - ctx->global_vars = new_vars; - ctx->global_vars_size = cnt; + obj->global_vars = new_vars; + obj->global_vars_size = cnt; } - cnt = ctx->global_funcs_cnt; + cnt = obj->global_funcs_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) cnt++; - if (cnt > ctx->global_funcs_size) + if (cnt > obj->global_funcs_size) { - if (ctx->global_funcs) - new_funcs = heap_realloc(ctx->global_funcs, cnt * sizeof(*new_funcs)); + if (obj->global_funcs) + new_funcs = heap_realloc(obj->global_funcs, cnt * sizeof(*new_funcs)); else new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); if (!new_funcs) return E_OUTOFMEMORY; - ctx->global_funcs = new_funcs; - ctx->global_funcs_size = cnt; + obj->global_funcs = new_funcs; + obj->global_funcs_size = cnt; } for (i = 0; i < code->main_code.var_cnt; i++) { - if (!(var = heap_pool_alloc(&ctx->heap, sizeof(*var)))) + if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var)))) return E_OUTOFMEMORY; var->name = code->main_code.vars[i].name; @@ -124,24 +125,24 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res var->is_const = FALSE; var->array = NULL; - ctx->global_vars[ctx->global_vars_cnt + i] = var; + obj->global_vars[obj->global_vars_cnt + i] = var; } - ctx->global_vars_cnt += code->main_code.var_cnt; + obj->global_vars_cnt += code->main_code.var_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) { - for (i = 0; i < ctx->global_funcs_cnt; i++) + for (i = 0; i < obj->global_funcs_cnt; i++) { - if (!wcsicmp(ctx->global_funcs[i]->name, func_iter->name)) + if (!wcsicmp(obj->global_funcs[i]->name, func_iter->name)) { /* global function already exists, replace it */ - ctx->global_funcs[i] = func_iter; + obj->global_funcs[i] = func_iter; break; } } - if (i == ctx->global_funcs_cnt) - ctx->global_funcs[ctx->global_funcs_cnt++] = func_iter; + if (i == obj->global_funcs_cnt) + obj->global_funcs[obj->global_funcs_cnt++] = func_iter; } if (code->classes) @@ -156,8 +157,8 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res class = class->next; } - class->next = ctx->classes; - ctx->classes = code->classes; + class->next = obj->classes; + obj->classes = code->classes; code->last_class = class; } @@ -210,24 +211,10 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { vbscode_t *code, *code_next; - class_desc_t *class_desc; - unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - for(i = 0; i < ctx->global_vars_cnt; i++) - release_dynamic_var(ctx->global_vars[i]); - - heap_free(ctx->global_vars); - heap_free(ctx->global_funcs); - ctx->global_vars = NULL; - ctx->global_vars_cnt = 0; - ctx->global_vars_size = 0; - ctx->global_funcs = NULL; - ctx->global_funcs_cnt = 0; - ctx->global_funcs_size = 0; - LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry) { if(code->is_persistent) @@ -249,13 +236,6 @@ static void release_script(script_ctx_t *ctx) heap_free(iter); } - while(ctx->procs) { - class_desc = ctx->procs; - ctx->procs = class_desc->next; - - heap_free(class_desc); - } - if(ctx->host_global) { IDispatch_Release(ctx->host_global); ctx->host_global = NULL; @@ -278,9 +258,6 @@ static void release_script(script_ctx_t *ctx) script_obj->ctx = NULL; IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - - heap_pool_free(&ctx->heap); - heap_pool_init(&ctx->heap); } static void release_code_list(script_ctx_t *ctx) @@ -1054,7 +1031,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU } ctx->safeopt = INTERFACE_USES_DISPEX; - heap_pool_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1cc36fd..f4e7bc7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -120,11 +120,31 @@ struct _vbdisp_t { VARIANT props[1]; }; +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; + BOOL is_const; + SAFEARRAY *array; +} dynamic_var_t; + typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + + class_desc_t *classes; + class_desc_t *procs; + script_ctx_t *ctx; + heap_pool_t heap; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t; @@ -158,14 +178,6 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) return dp->rgvarg + dp->cArgs-i-1; } -typedef struct _dynamic_var_t { - struct _dynamic_var_t *next; - VARIANT v; - const WCHAR *name; - BOOL is_const; - SAFEARRAY *array; -} dynamic_var_t; - struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -182,19 +194,6 @@ struct _script_ctx_t { EXCEPINFO ei; - dynamic_var_t **global_vars; - size_t global_vars_cnt; - size_t global_vars_size; - - function_t **global_funcs; - size_t global_funcs_cnt; - size_t global_funcs_size; - - class_desc_t *classes; - class_desc_t *procs; - - heap_pool_t heap; - struct list objects; struct list code_list; struct list named_items; -- 2.21.0

1 9

[PATCH vkd3d 7/7] vkd3d: Return valid node masks in external resource heap properties.
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Hitman 2 calls GetHeapProperties() for each swapchain buffer and checks if the creation node mask is 1. If not then it fails to store the resource pointers for later rendering. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 174171. libs/vkd3d/resource.c | 2 ++ tests/vkd3d_api.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 89733ce..f5cdf4a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1522,6 +1522,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource { memset(heap_properties, 0, sizeof(*heap_properties)); heap_properties->Type = D3D12_HEAP_TYPE_DEFAULT; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; } if (flags) *flags = D3D12_HEAP_FLAG_NONE; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 135782d..d4fe79a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -907,8 +907,8 @@ static void test_external_resource_map(void) "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); - todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); - todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device); -- 2.11.0

1 0

[PATCH vkd3d 6/7] vkd3d: Add tests for external resource heap properties.
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 174172. tests/vkd3d_api.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index a9a7fc1..135782d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -854,7 +854,9 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, static void test_external_resource_map(void) { struct vkd3d_image_resource_create_info resource_create_info; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_FLAGS heap_flags; ID3D12Resource *vk_resource; VkDeviceMemory vk_memory; ID3D12Device *device; @@ -898,6 +900,16 @@ static void test_external_resource_map(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + hr = ID3D12Resource_GetHeapProperties(vk_resource, &heap_properties, &heap_flags); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type %#x.\n", heap_properties.Type); + ok(heap_properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, + "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); + ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, + "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); + todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device); vkDestroyImage(vk_device, vk_image, NULL); -- 2.11.0

1 0

[PATCH vkd3d 5/7] vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint().
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> There is no bit-compatible UINT format, so we'll use DXGI_FORMAT_R32_UINT. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 173344. libs/vkd3d/command.c | 19 ++++++++++++++++++- tests/d3d12.c | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e3810e2..75af27d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4979,6 +4979,22 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, } } +static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12_device *device, + DXGI_FORMAT dxgi_format, VkClearColorValue *colour) +{ + switch (dxgi_format) + { + case DXGI_FORMAT_R11G11B10_FLOAT: + colour->uint32[0] = (colour->uint32[0] & 0x7ff) + | ((colour->uint32[1] & 0x7ff) << 11) + | ((colour->uint32[2] & 0x3ff) << 22); + return vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + + default: + return NULL; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -5000,7 +5016,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (view->format->type != VKD3D_FORMAT_TYPE_UINT) { - if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format))) + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) + && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, &colour))) { ERR("Unhandled format %#x.\n", view->format->dxgi_format); return; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d549e2..52de007 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4839,11 +4839,11 @@ static void test_clear_unordered_access_view_buffer(void) {0x100, 0, 0, 0}, 0, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0, 0, 0, 0}, 0, false, true}, + {0, 0, 0, 0}, 0}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true}, + {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true}, + {0x7ff, 0, 0x3ff, 0}, 0xffc007ff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, @@ -5011,7 +5011,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, - {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true}, -- 2.11.0

1 0

[PATCH vkd3d 4/7] vkd3d: Re-implement d3d12_command_list_ClearUnorderedAccessViewUint().
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Addresses the following limitations of the previous implementation: - Only R32_{UINT,TYPELESS} were supported for buffers. - Clearing an image UAV did not behave correctly for images with non-UINT formats. - Due to the use of transfer operations, extra memory barriers were needed. If necessary, this will create a temporary view with a bit-compatible UINT format for the resource in order to perform a bit-exact clear. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 173346, 173347 and 173324. libs/vkd3d/command.c | 116 ++++++++++++++++----------------------------- libs/vkd3d/resource.c | 20 ++------ libs/vkd3d/utils.c | 31 ++++++++++++ libs/vkd3d/vkd3d_private.h | 19 ++++++++ tests/d3d12.c | 22 ++++----- 5 files changed, 104 insertions(+), 104 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ade51ba..e3810e2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4984,96 +4984,60 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); - const struct vkd3d_vk_device_procs *vk_procs; - const struct vkd3d_vulkan_info *vk_info; - const struct d3d12_desc *cpu_descriptor; + struct d3d12_device *device = list->device; + struct vkd3d_view *view, *uint_view = NULL; + struct vkd3d_texture_view_desc view_desc; + const struct vkd3d_format *uint_format; struct d3d12_resource *resource_impl; - VkBufferMemoryBarrier buffer_barrier; - VkImageMemoryBarrier image_barrier; - VkPipelineStageFlags stage_mask; - VkImageSubresourceRange range; - VkClearColorValue color; + VkClearColorValue colour; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); - vk_procs = &list->device->vk_procs; - vk_info = &list->device->vk_info; - resource_impl = unsafe_impl_from_ID3D12Resource(resource); + view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view; + memcpy(colour.uint32, values, sizeof(colour.uint32)); - d3d12_command_list_track_resource_usage(list, resource_impl); - - if (rect_count) - { - FIXME("Clear rects not supported.\n"); - return; - } - - d3d12_command_list_end_current_render_pass(list); - - cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); - - if (d3d12_resource_is_buffer(resource_impl)) + if (view->format->type != VKD3D_FORMAT_TYPE_UINT) { - if (cpu_descriptor->u.view->format->vk_format != VK_FORMAT_R32_UINT) + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format))) { - FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); + ERR("Unhandled format %#x.\n", view->format->dxgi_format); return; } - VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, - cpu_descriptor->u.view->info.buffer.offset, cpu_descriptor->u.view->info.buffer.size, values[0])); - - buffer_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - buffer_barrier.pNext = NULL; - buffer_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - buffer_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - buffer_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - buffer_barrier.buffer = resource_impl->u.vk_buffer; - buffer_barrier.offset = cpu_descriptor->u.view->info.buffer.offset; - buffer_barrier.size = cpu_descriptor->u.view->info.buffer.size; - - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, - resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); - - VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, - VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, - 0, NULL, 1, &buffer_barrier, 0, NULL)); + if (d3d12_resource_is_buffer(resource_impl)) + { + if (!vkd3d_create_buffer_view(device, resource_impl->u.vk_buffer, uint_format, + view->info.buffer.offset, view->info.buffer.size, &uint_view)) + { + ERR("Failed to create buffer view.\n"); + return; + } + } + else + { + memset(&view_desc, 0, sizeof(view_desc)); + view_desc.view_type = view->info.texture.vk_view_type; + view_desc.format = uint_format; + view_desc.miplevel_idx = view->info.texture.miplevel_idx; + view_desc.miplevel_count = 1; + view_desc.layer_idx = view->info.texture.layer_idx; + view_desc.layer_count = view->info.texture.layer_count; + + if (!vkd3d_create_texture_view(device, resource_impl->u.vk_image, &view_desc, &uint_view)) + { + ERR("Failed to create image view.\n"); + return; + } + } + view = uint_view; } - else - { - color.uint32[0] = values[0]; - color.uint32[1] = values[1]; - color.uint32[2] = values[2]; - color.uint32[3] = values[3]; - - range.aspectMask = cpu_descriptor->u.view->format->vk_aspect_mask; - range.baseMipLevel = cpu_descriptor->u.view->info.texture.miplevel_idx; - range.levelCount = 1; - range.baseArrayLayer = cpu_descriptor->u.view->info.texture.layer_idx; - range.layerCount = cpu_descriptor->u.view->info.texture.layer_count; - - VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, - resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); - - image_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - image_barrier.pNext = NULL; - image_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - image_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; - image_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; - image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - image_barrier.image = resource_impl->u.vk_image; - image_barrier.subresourceRange = range; - - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, - resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); - VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, - VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, - 0, NULL, 0, NULL, 1, &image_barrier)); - } + d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); + + if (uint_view) + vkd3d_view_decref(uint_view, device); } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7d22ba4..89733ce 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2150,8 +2150,7 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return vr == VK_SUCCESS; } -static bool vkd3d_create_buffer_view(struct d3d12_device *device, - VkBuffer vk_buffer, const struct vkd3d_format *format, +bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -2350,18 +2349,6 @@ static void vk_component_mapping_compose(VkComponentMapping *dst, const VkCompon dst->a = swizzle_vk_component(&a, a.a, b->a); } -struct vkd3d_texture_view_desc -{ - VkImageViewType view_type; - const struct vkd3d_format *format; - unsigned int miplevel_idx; - unsigned int miplevel_count; - unsigned int layer_idx; - unsigned int layer_count; - VkComponentMapping components; - bool allowed_swizzle; -}; - static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, struct d3d12_resource *resource, DXGI_FORMAT view_format) { @@ -2409,9 +2396,8 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } -static bool vkd3d_create_texture_view(struct d3d12_device *device, - VkImage vk_image, const struct vkd3d_texture_view_desc *desc, - struct vkd3d_view **view) +bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index cf0448d..7abfd42 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -451,6 +451,37 @@ const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, return NULL; } +const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format) +{ + DXGI_FORMAT typeless_format = DXGI_FORMAT_UNKNOWN; + const struct vkd3d_format *vkd3d_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vkd3d_format_compatibility_info); ++i) + { + if (vkd3d_format_compatibility_info[i].format == dxgi_format) + { + typeless_format = vkd3d_format_compatibility_info[i].typeless_format; + break; + } + } + + if (!typeless_format) + return NULL; + + for (i = 0; i < ARRAY_SIZE(vkd3d_format_compatibility_info); ++i) + { + if (vkd3d_format_compatibility_info[i].typeless_format != typeless_format) + continue; + + vkd3d_format = vkd3d_get_format(device, vkd3d_format_compatibility_info[i].format, false); + if (vkd3d_format->type == VKD3D_FORMAT_TYPE_UINT) + return vkd3d_format; + } + + return NULL; +} + void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 933c7c4..df8d1a1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -497,6 +497,23 @@ struct vkd3d_view void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; +struct vkd3d_texture_view_desc +{ + VkImageViewType view_type; + const struct vkd3d_format *format; + unsigned int miplevel_idx; + unsigned int miplevel_count; + unsigned int layer_idx; + unsigned int layer_count; + VkComponentMapping components; + bool allowed_swizzle; +}; + +bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, + VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) DECLSPEC_HIDDEN; +bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) DECLSPEC_HIDDEN; + struct d3d12_desc { uint32_t magic; @@ -1225,6 +1242,8 @@ void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *sr const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; +const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; HRESULT vkd3d_init_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; void vkd3d_cleanup_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; diff --git a/tests/d3d12.c b/tests/d3d12.c index 3b5264f..5d549e2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4808,19 +4808,19 @@ static void test_clear_unordered_access_view_buffer(void) {11, 0, 0, 0}, 11}, {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0, 0, 0, 0}, 0, false, true}, + {0, 0, 0, 0}, 0}, {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {1, 0, 0, 0}, 1, false, true}, + {1, 0, 0, 0}, 1}, {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f800000 /* 1.0f */, 0, 0, 0}, 0x3f800000 /* 1.0f */, true}, {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, + {0x1234, 0xabcd, 0, 0}, 0xabcd1234}, {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x10000, 0, 0, 0}, 0, false, true}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, + {0x1234, 0xabcd, 0, 0}, 0xabcd1234}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, @@ -4829,12 +4829,12 @@ static void test_clear_unordered_access_view_buffer(void) {0xbf800000 /* -1.0f */, 0 /* 0.0f */, 0x3f000000 /* 1.0f */, 0x3f000000 /* 1.0f */}, 0, true}, {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, + {0x1234, 0xabcd, 0, 0}, 0xabcd1234}, {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true}, {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x11, 0x22, 0x33, 0x44}, 0x44332211, false, true}, + {0x11, 0x22, 0x33, 0x44}, 0x44332211}, {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x100, 0, 0, 0}, 0, false, true}, @@ -4995,22 +4995,22 @@ static void test_clear_unordered_access_view_image(void) {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, - {1, 0, 0, 0}, 1, false, true}, + {1, 0, 0, 0}, 1}, {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test multiple clear rects. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}}, - {1, 0, 0, 0}, 1, false, true}, + {1, 0, 0, 0}, 1}, {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test uint clears with formats. */ {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001}, {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {0x12345, 0, 0, 0}, 0x00002345, false, true}, - {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true}, - {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true}, + {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001}, + {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, - {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, true}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, -- 2.11.0

1 0

[PATCH vkd3d 3/7] vkd3d: Set VK_IMAGE_MUTABLE_FORMAT_BIT for UAV images with non-UINT formats.
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Needed to support ClearUnorderedAccessViewUint() for all formats. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 173343. libs/vkd3d/resource.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8615464..7d22ba4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -864,13 +864,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.pNext = NULL; image_info.flags = 0; - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) + if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) + { + /* Format compatibility rules are more relaxed for UAVs. */ + if (format->type != VKD3D_FORMAT_TYPE_UINT) + image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } + else if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) { image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; - /* Format compatibility rules are more relaxed for UAVs. */ - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) - && (compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) + if ((compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) { format_list.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR; format_list.pNext = NULL; -- 2.11.0

1 0

[PATCH vkd3d 2/7] vkd3d: Implement d3d12_command_list_ClearUnorderedAccessViewFloat().
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 173323 and 173350. Makefile.am | 1 + libs/vkd3d/command.c | 184 ++++++++++++++++++++- libs/vkd3d/device.c | 6 + libs/vkd3d/state.c | 222 +++++++++++++++++++++++--- libs/vkd3d/vkd3d_private.h | 38 +++++ libs/vkd3d/vkd3d_shaders.h | 388 +++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 48 +++--- 7 files changed, 836 insertions(+), 51 deletions(-) create mode 100644 libs/vkd3d/vkd3d_shaders.h diff --git a/Makefile.am b/Makefile.am index 2b0e8f3..00a5f58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d.map \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ + libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 297054b..ade51ba 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4803,6 +4803,182 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra &clear_value, rect_count, rects); } +struct vkd3d_uav_clear_pipeline +{ + VkDescriptorSetLayout vk_set_layout; + VkPipelineLayout vk_pipeline_layout; + VkPipeline vk_pipeline; + VkExtent3D group_size; +}; + +static void vkd3d_uav_clear_state_get_buffer_pipeline(const struct vkd3d_uav_clear_state *state, + enum vkd3d_format_type format_type, struct vkd3d_uav_clear_pipeline *info) +{ + const struct vkd3d_uav_clear_pipelines *pipelines; + + pipelines = format_type == VKD3D_FORMAT_TYPE_UINT ? &state->pipelines_uint : &state->pipelines_float; + info->vk_set_layout = state->vk_set_layout_buffer; + info->vk_pipeline_layout = state->vk_pipeline_layout_buffer; + info->vk_pipeline = pipelines->buffer; + info->group_size = (VkExtent3D){128, 1, 1}; +} + +static void vkd3d_uav_clear_state_get_image_pipeline(const struct vkd3d_uav_clear_state *state, + VkImageViewType image_view_type, enum vkd3d_format_type format_type, struct vkd3d_uav_clear_pipeline *info) +{ + const struct vkd3d_uav_clear_pipelines *pipelines; + + pipelines = format_type == VKD3D_FORMAT_TYPE_UINT ? &state->pipelines_uint : &state->pipelines_float; + info->vk_set_layout = state->vk_set_layout_image; + info->vk_pipeline_layout = state->vk_pipeline_layout_image; + + switch (image_view_type) + { + case VK_IMAGE_VIEW_TYPE_1D: + info->vk_pipeline = pipelines->image_1d; + info->group_size = (VkExtent3D){64, 1, 1}; + break; + + case VK_IMAGE_VIEW_TYPE_1D_ARRAY: + info->vk_pipeline = pipelines->image_1d_array; + info->group_size = (VkExtent3D){64, 1, 1}; + break; + + case VK_IMAGE_VIEW_TYPE_2D: + info->vk_pipeline = pipelines->image_2d; + info->group_size = (VkExtent3D){8, 8, 1}; + break; + + case VK_IMAGE_VIEW_TYPE_2D_ARRAY: + info->vk_pipeline = pipelines->image_2d_array; + info->group_size = (VkExtent3D){8, 8, 1}; + break; + + case VK_IMAGE_VIEW_TYPE_3D: + info->vk_pipeline = pipelines->image_3d; + info->group_size = (VkExtent3D){8, 8, 1}; + break; + + default: + ERR("Unhandled view type %#x.\n", image_view_type); + info->vk_pipeline = VK_NULL_HANDLE; + info->group_size = (VkExtent3D){0, 0, 0}; + break; + } +} + +static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, + struct d3d12_resource *resource, struct vkd3d_view *view, const VkClearColorValue *clear_colour, + unsigned int rect_count, const D3D12_RECT *rects) +{ + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + unsigned int i, miplevel_idx, layer_count; + struct vkd3d_uav_clear_pipeline pipeline; + struct vkd3d_uav_clear_args clear_args; + VkDescriptorImageInfo image_info; + D3D12_RECT full_rect, curr_rect; + VkWriteDescriptorSet write_set; + + d3d12_command_list_track_resource_usage(list, resource); + d3d12_command_list_end_current_render_pass(list); + + d3d12_command_list_invalidate_current_pipeline(list); + d3d12_command_list_invalidate_bindings(list, list->state); + d3d12_command_list_invalidate_root_parameters(list, VK_PIPELINE_BIND_POINT_COMPUTE); + + if (!d3d12_command_allocator_add_view(list->allocator, view)) + WARN("Failed to add view.\n"); + + clear_args.colour = *clear_colour; + + write_set.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + write_set.pNext = NULL; + write_set.dstBinding = 0; + write_set.dstArrayElement = 0; + write_set.descriptorCount = 1; + + if (d3d12_resource_is_buffer(resource)) + { + write_set.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + write_set.pImageInfo = NULL; + write_set.pBufferInfo = NULL; + write_set.pTexelBufferView = &view->u.vk_buffer_view; + + miplevel_idx = 0; + layer_count = 1; + vkd3d_uav_clear_state_get_buffer_pipeline(&list->device->uav_clear_state, + view->format->type, &pipeline); + } + else + { + image_info.sampler = VK_NULL_HANDLE; + image_info.imageView = view->u.vk_image_view; + image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; + + write_set.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + write_set.pImageInfo = &image_info; + write_set.pBufferInfo = NULL; + write_set.pTexelBufferView = NULL; + + miplevel_idx = view->info.texture.miplevel_idx; + layer_count = view->info.texture.vk_view_type == VK_IMAGE_VIEW_TYPE_3D + ? d3d12_resource_desc_get_depth(&resource->desc, miplevel_idx) + : view->info.texture.layer_count; + vkd3d_uav_clear_state_get_image_pipeline(&list->device->uav_clear_state, + view->info.texture.vk_view_type, view->format->type, &pipeline); + } + + if (!(write_set.dstSet = d3d12_command_allocator_allocate_descriptor_set( + list->allocator, pipeline.vk_set_layout))) + { + ERR("Failed to allocate descriptor set.\n"); + return; + } + + VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &write_set, 0, NULL)); + + full_rect.left = 0; + full_rect.right = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); + full_rect.top = 0; + full_rect.bottom = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + + if (!rect_count) + { + rects = &full_rect; + rect_count = 1; + } + + VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline.vk_pipeline)); + + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, + pipeline.vk_pipeline_layout, 0, 1, &write_set.dstSet, 0, NULL)); + + for (i = 0; i < rect_count; ++i) + { + /* Clamp to the actual resource region and skip empty rectangles. */ + curr_rect.left = max(rects[i].left, full_rect.left); + curr_rect.top = max(rects[i].top, full_rect.top); + curr_rect.right = min(rects[i].right, full_rect.right); + curr_rect.bottom = min(rects[i].bottom, full_rect.bottom); + + if (curr_rect.left >= curr_rect.right || curr_rect.top >= curr_rect.bottom) + continue; + + clear_args.offset.x = curr_rect.left; + clear_args.offset.y = curr_rect.top; + clear_args.extent.width = curr_rect.right - curr_rect.left; + clear_args.extent.height = curr_rect.bottom - curr_rect.top; + + VK_CALL(vkCmdPushConstants(list->vk_command_buffer, pipeline.vk_pipeline_layout, + VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(clear_args), &clear_args)); + + VK_CALL(vkCmdDispatch(list->vk_command_buffer, + vkd3d_compute_workgroup_count(clear_args.extent.width, pipeline.group_size.width), + vkd3d_compute_workgroup_count(clear_args.extent.height, pipeline.group_size.height), + vkd3d_compute_workgroup_count(layer_count, pipeline.group_size.depth))); + } +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -4906,13 +5082,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *resource_impl; + VkClearColorValue colour; + struct vkd3d_view *view; - FIXME("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p stub!\n", + TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); + view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view; + memcpy(colour.float32, values, sizeof(colour.float32)); - d3d12_command_list_track_resource_usage(list, resource_impl); + d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); } static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0624318..59859ad 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2154,6 +2154,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_private_store_destroy(&device->private_store); vkd3d_cleanup_format_info(device); + vkd3d_uav_clear_state_cleanup(&device->uav_clear_state, device); vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); @@ -3447,6 +3448,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) goto out_cleanup_format_info; + if (FAILED(hr = vkd3d_uav_clear_state_init(&device->uav_clear_state, device))) + goto out_destroy_null_resources; + vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); @@ -3458,6 +3462,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return S_OK; +out_destroy_null_resources: + vkd3d_destroy_null_resources(&device->null_resources, device); out_cleanup_format_info: vkd3d_cleanup_format_info(device); out_stop_fence_worker: diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a321fa4..e1f7da9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -18,6 +18,7 @@ */ #include "vkd3d_private.h" +#include "vkd3d_shaders.h" /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) @@ -1384,6 +1385,37 @@ static HRESULT create_shader_stage(struct d3d12_device *device, return S_OK; } +static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, + VkPipelineLayout vk_pipeline_layout, VkPipeline *vk_pipeline) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkComputePipelineCreateInfo pipeline_info; + VkResult vr; + HRESULT hr; + + pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; + pipeline_info.pNext = NULL; + pipeline_info.flags = 0; + if (FAILED(hr = create_shader_stage(device, &pipeline_info.stage, + VK_SHADER_STAGE_COMPUTE_BIT, code, shader_interface, NULL))) + return hr; + pipeline_info.layout = vk_pipeline_layout; + pipeline_info.basePipelineHandle = VK_NULL_HANDLE; + pipeline_info.basePipelineIndex = -1; + + vr = VK_CALL(vkCreateComputePipelines(device->vk_device, + VK_NULL_HANDLE, 1, &pipeline_info, NULL, vk_pipeline)); + VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); + if (vr < 0) + { + WARN("Failed to create Vulkan compute pipeline, hr %#x.", hr); + return hresult_from_vk_result(vr); + } + + return S_OK; +} + static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipeline_state *state, struct d3d12_device *device, const struct d3d12_root_signature *root_signature, const struct vkd3d_shader_scan_info *shader_info) @@ -1470,10 +1502,9 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - VkComputePipelineCreateInfo pipeline_info; struct vkd3d_shader_scan_info shader_info; + VkPipelineLayout vk_pipeline_layout; struct vkd3d_shader_code dxbc; - VkResult vr; HRESULT hr; int ret; @@ -1519,36 +1550,18 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); - pipeline_info.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; - pipeline_info.pNext = NULL; - pipeline_info.flags = 0; - if (FAILED(hr = create_shader_stage(device, &pipeline_info.stage, - VK_SHADER_STAGE_COMPUTE_BIT, &desc->CS, &shader_interface, NULL))) - { - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - vkd3d_free(state->uav_counters); - return hr; - } - pipeline_info.layout = state->vk_pipeline_layout + vk_pipeline_layout = state->vk_pipeline_layout ? state->vk_pipeline_layout : root_signature->vk_pipeline_layout; - pipeline_info.basePipelineHandle = VK_NULL_HANDLE; - pipeline_info.basePipelineIndex = -1; - - vr = VK_CALL(vkCreateComputePipelines(device->vk_device, VK_NULL_HANDLE, - 1, &pipeline_info, NULL, &state->u.compute.vk_pipeline)); - VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); - if (vr) + if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->CS, &shader_interface, + vk_pipeline_layout, &state->u.compute.vk_pipeline))) { - WARN("Failed to create Vulkan compute pipeline, vr %d.\n", vr); + WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); if (state->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); if (state->vk_pipeline_layout) VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); vkd3d_free(state->uav_counters); - return hresult_from_vk_result(vr); + return hr; } if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) @@ -2802,3 +2815,162 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ERR("Could not get the pipeline compiled by other thread from the cache.\n"); return vk_pipeline; } + +static void vkd3d_uav_clear_pipelines_cleanup(struct vkd3d_uav_clear_pipelines *pipelines, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->image_3d, NULL)); + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->image_2d_array, NULL)); + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->image_2d, NULL)); + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->image_1d_array, NULL)); + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->image_1d, NULL)); + VK_CALL(vkDestroyPipeline(device->vk_device, pipelines->buffer, NULL)); +} + +void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + vkd3d_uav_clear_pipelines_cleanup(&state->pipelines_uint, device); + vkd3d_uav_clear_pipelines_cleanup(&state->pipelines_float, device); + + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout_image, NULL)); + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout_buffer, NULL)); + + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout_image, NULL)); + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout_buffer, NULL)); +} + +HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) +{ + struct vkd3d_shader_push_constant_buffer push_constant; + struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_resource_binding binding; + VkDescriptorSetLayoutBinding set_binding; + VkPushConstantRange push_constant_range; + unsigned int i; + HRESULT hr; + + const struct + { + VkDescriptorSetLayout *set_layout; + VkPipelineLayout *pipeline_layout; + VkDescriptorType descriptor_type; + } + set_layouts[] = + { + {&state->vk_set_layout_buffer, &state->vk_pipeline_layout_buffer, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER}, + {&state->vk_set_layout_image, &state->vk_pipeline_layout_image, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}, + }; + + const struct + { + VkPipeline *pipeline; + VkPipelineLayout *pipeline_layout; + D3D12_SHADER_BYTECODE code; + } + pipelines[] = + { +#define SHADER_CODE(name) {name, sizeof(name)} + {&state->pipelines_float.buffer, &state->vk_pipeline_layout_buffer, + SHADER_CODE(cs_uav_clear_buffer_float_code)}, + {&state->pipelines_float.image_1d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_1d_float_code)}, + {&state->pipelines_float.image_1d_array, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_1d_array_float_code)}, + {&state->pipelines_float.image_2d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_2d_float_code)}, + {&state->pipelines_float.image_2d_array, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_2d_array_float_code)}, + {&state->pipelines_float.image_3d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_3d_float_code)}, + + {&state->pipelines_uint.buffer, &state->vk_pipeline_layout_buffer, + SHADER_CODE(cs_uav_clear_buffer_uint_code)}, + {&state->pipelines_uint.image_1d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_1d_uint_code)}, + {&state->pipelines_uint.image_1d_array, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_1d_array_uint_code)}, + {&state->pipelines_uint.image_2d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_2d_uint_code)}, + {&state->pipelines_uint.image_2d_array, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_2d_array_uint_code)}, + {&state->pipelines_uint.image_3d, &state->vk_pipeline_layout_image, + SHADER_CODE(cs_uav_clear_3d_uint_code)}, +#undef SHADER_CODE + }; + + memset(state, 0, sizeof(*state)); + + set_binding.binding = 0; + set_binding.descriptorCount = 1; + set_binding.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT; + set_binding.pImmutableSamplers = NULL; + + binding.type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + binding.register_index = 0; + binding.shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; + binding.binding.set = 0; + binding.binding.binding = 0; + + push_constant_range.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT; + push_constant_range.offset = 0; + push_constant_range.size = sizeof(struct vkd3d_uav_clear_args); + + push_constant.register_index = 0; + push_constant.shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; + push_constant.offset = 0; + push_constant.size = sizeof(struct vkd3d_uav_clear_args); + + for (i = 0; i < ARRAY_SIZE(set_layouts); ++i) + { + set_binding.descriptorType = set_layouts[i].descriptor_type; + + if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, &set_binding, set_layouts[i].set_layout))) + { + ERR("Failed to create descriptor set layout %u, hr %#x.", i, hr); + goto fail; + } + + if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, + 1, &push_constant_range, set_layouts[i].pipeline_layout))) + { + ERR("Failed to create pipeline layout %u, hr %#x.", i, hr); + goto fail; + } + } + + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.next = NULL; + shader_interface.bindings = &binding; + shader_interface.binding_count = 1; + shader_interface.push_constant_buffers = &push_constant; + shader_interface.push_constant_buffer_count = 1; + shader_interface.combined_samplers = NULL; + shader_interface.combined_sampler_count = 0; + shader_interface.uav_counters = NULL; + shader_interface.uav_counter_count = 0; + + for (i = 0; i < ARRAY_SIZE(pipelines); ++i) + { + if (pipelines[i].pipeline_layout == &state->vk_pipeline_layout_buffer) + binding.flags = VKD3D_SHADER_BINDING_FLAG_BUFFER; + else + binding.flags = VKD3D_SHADER_BINDING_FLAG_IMAGE; + + if (FAILED(hr = vkd3d_create_compute_pipeline(device, &pipelines[i].code, &shader_interface, + *pipelines[i].pipeline_layout, pipelines[i].pipeline))) + { + ERR("Failed to create compute pipeline %u, hr %#x.", i, hr); + goto fail; + } + } + + return S_OK; + +fail: + vkd3d_uav_clear_state_cleanup(state, device); + return hr; +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c6bfe96..933c7c4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1059,6 +1059,38 @@ struct vkd3d_format_compatibility_list VkFormat vk_formats[VKD3D_MAX_COMPATIBLE_FORMAT_COUNT]; }; +struct vkd3d_uav_clear_args +{ + VkClearColorValue colour; + VkOffset2D offset; + VkExtent2D extent; +}; + +struct vkd3d_uav_clear_pipelines +{ + VkPipeline buffer; + VkPipeline image_1d; + VkPipeline image_1d_array; + VkPipeline image_2d; + VkPipeline image_2d_array; + VkPipeline image_3d; +}; + +struct vkd3d_uav_clear_state +{ + VkDescriptorSetLayout vk_set_layout_buffer; + VkDescriptorSetLayout vk_set_layout_image; + + VkPipelineLayout vk_pipeline_layout_buffer; + VkPipelineLayout vk_pipeline_layout_image; + + struct vkd3d_uav_clear_pipelines pipelines_float; + struct vkd3d_uav_clear_pipelines pipelines_uint; +}; + +HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; + /* ID3D12Device */ struct d3d12_device { @@ -1104,6 +1136,7 @@ struct d3d12_device unsigned int format_compatibility_list_count; const struct vkd3d_format_compatibility_list *format_compatibility_lists; struct vkd3d_null_resources null_resources; + struct vkd3d_uav_clear_state uav_clear_state; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, @@ -1237,6 +1270,11 @@ static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D1 return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; } +static inline unsigned int vkd3d_compute_workgroup_count(unsigned int thread_count, unsigned int workgroup_size) +{ + return (thread_count + workgroup_size - 1) / workgroup_size; +} + VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/vkd3d_shaders.h b/libs/vkd3d/vkd3d_shaders.h new file mode 100644 index 0000000..b2a90cd --- /dev/null +++ b/libs/vkd3d/vkd3d_shaders.h @@ -0,0 +1,388 @@ +/* + * Copyright 2019 Philip Rebohle + * + * 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 __VKD3D_SHADERS_H +#define __VKD3D_SHADERS_H + +static const uint32_t cs_uav_clear_buffer_float_code[] = +{ +#if 0 + RWBuffer<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(128, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[u_info.dst_offset.x + thread_id.x] = u_info.clear_value; + } +#endif + 0x43425844, 0xe114ba61, 0xff6a0d0b, 0x7b25c8f4, 0xfcf7cf22, 0x00000001, 0x0000010c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000b8, 0x00050050, 0x0000002e, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, 0x00000080, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_buffer_uint_code[] = +{ +#if 0 + RWBuffer<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(128, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[u_info.dst_offset.x + thread_id.x] = u_info.clear_value; + } +#endif + 0x43425844, 0x3afd0cfd, 0x5145c166, 0x5b9f76b8, 0xa73775cd, 0x00000001, 0x0000010c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000b8, 0x00050050, 0x0000002e, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400089c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, 0x00000080, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_1d_array_float_code[] = +{ +#if 0 + RWTexture1DArray<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(64, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[int2(u_info.dst_offset.x + thread_id.x, thread_id.y)] = u_info.clear_value; + } +#endif + 0x43425844, 0x3d73bc2d, 0x2b635f3d, 0x6bf98e92, 0xbe0aa5d9, 0x00000001, 0x0000011c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000c8, 0x00050050, 0x00000032, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400389c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020032, 0x02000068, 0x00000001, 0x0400009b, 0x00000040, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x04000036, 0x001000e2, 0x00000000, 0x00020556, 0x080000a4, 0x0011e0f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_1d_array_uint_code[] = +{ +#if 0 + RWTexture1DArray<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(64, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[int2(u_info.dst_offset.x + thread_id.x, thread_id.y)] = u_info.clear_value; + } +#endif + 0x43425844, 0x2f0ca457, 0x72068b34, 0xd9dadc2b, 0xd3178c3e, 0x00000001, 0x0000011c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000c8, 0x00050050, 0x00000032, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400389c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020032, 0x02000068, 0x00000001, 0x0400009b, 0x00000040, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x04000036, 0x001000e2, 0x00000000, 0x00020556, 0x080000a4, 0x0011e0f2, 0x00000000, + 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_1d_float_code[] = +{ +#if 0 + RWTexture1D<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(64, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[u_info.dst_offset.x + thread_id.x] = u_info.clear_value; + } +#endif + 0x43425844, 0x05266503, 0x4b97006f, 0x01a5cc63, 0xe617d0a1, 0x00000001, 0x0000010c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000b8, 0x00050050, 0x0000002e, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400109c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, 0x00000040, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_1d_uint_code[] = +{ +#if 0 + RWTexture1D<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(64, 1, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (thread_id.x < u_info.dst_extent.x) + dst[u_info.dst_offset.x + thread_id.x] = u_info.clear_value; + } +#endif + 0x43425844, 0x19d5c8f2, 0x3ca4ac24, 0x9e258499, 0xf0463fd6, 0x00000001, 0x0000010c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000b8, 0x00050050, 0x0000002e, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400109c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, 0x00000040, 0x00000001, 0x00000001, + 0x07000022, 0x00100012, 0x00000000, 0x0002000a, 0x0020802a, 0x00000000, 0x00000001, 0x0304001f, + 0x0010000a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0002000a, 0x0020800a, 0x00000000, + 0x00000001, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_2d_array_float_code[] = +{ +#if 0 + RWTexture2DArray<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[int3(u_info.dst_offset.xy + thread_id.xy, thread_id.z)] = u_info.clear_value; + } +#endif + 0x43425844, 0x924d2d2c, 0xb9166376, 0x99f83871, 0x8ef65025, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000e4, 0x00050050, 0x00000039, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400409c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020072, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x00100032, 0x00000000, 0x00020046, 0x00208046, 0x00000000, 0x00000001, + 0x04000036, 0x001000c2, 0x00000000, 0x00020aa6, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_2d_array_uint_code[] = +{ +#if 0 + RWTexture2DArray<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[int3(u_info.dst_offset.xy + thread_id.xy, thread_id.z)] = u_info.clear_value; + } +#endif + 0x43425844, 0xa92219d4, 0xa2c5e47d, 0x0d308500, 0xf32197b4, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000e4, 0x00050050, 0x00000039, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400409c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020072, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x00100032, 0x00000000, 0x00020046, 0x00208046, 0x00000000, 0x00000001, + 0x04000036, 0x001000c2, 0x00000000, 0x00020aa6, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_2d_float_code[] = +{ +#if 0 + RWTexture2D<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[u_info.dst_offset.xy + thread_id.xy] = u_info.clear_value; + } +#endif + 0x43425844, 0x6e735b3f, 0x7348c4fa, 0xb3634e42, 0x50e2d99b, 0x00000001, 0x00000128, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000d4, 0x00050050, 0x00000035, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020032, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x001000f2, 0x00000000, 0x00020546, 0x00208546, 0x00000000, 0x00000001, + 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_2d_uint_code[] = +{ +#if 0 + RWTexture2D<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[u_info.dst_offset.xy + thread_id.xy] = u_info.clear_value; + } +#endif + 0x43425844, 0xf01db5dd, 0xc7dc5e55, 0xb017c1a8, 0x55abd52d, 0x00000001, 0x00000128, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000d4, 0x00050050, 0x00000035, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400189c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020032, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x001000f2, 0x00000000, 0x00020546, 0x00208546, 0x00000000, 0x00000001, + 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_3d_float_code[] = +{ +#if 0 + RWTexture3D<float4> dst; + + struct + { + float4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[int3(u_info.dst_offset.xy, 0) + thread_id.xyz] = u_info.clear_value; + } +#endif + 0x43425844, 0x5d8f36a0, 0x30fa86a5, 0xfec7f2ef, 0xdfd76cbb, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000e4, 0x00050050, 0x00000039, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400289c, 0x0011e000, 0x00000000, 0x00005555, + 0x0200005f, 0x00020072, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x00100032, 0x00000000, 0x00020046, 0x00208046, 0x00000000, 0x00000001, + 0x04000036, 0x001000c2, 0x00000000, 0x00020aa6, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +static const uint32_t cs_uav_clear_3d_uint_code[] = +{ +#if 0 + RWTexture3D<uint4> dst; + + struct + { + uint4 clear_value; + int2 dst_offset; + int2 dst_extent; + } u_info; + + [numthreads(8, 8, 1)] + void main(int3 thread_id : SV_DispatchThreadID) + { + if (all(thread_id.xy < u_info.dst_extent.xy)) + dst[int3(u_info.dst_offset.xy, 0) + thread_id.xyz] = u_info.clear_value; + } +#endif + 0x43425844, 0x5b9c95b1, 0xc9bde4e3, 0x9aaff806, 0x24a1d264, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000e4, 0x00050050, 0x00000039, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0400289c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00020072, 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000008, 0x00000001, + 0x07000022, 0x00100032, 0x00000000, 0x00020046, 0x00208ae6, 0x00000000, 0x00000001, 0x07000001, + 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0304001f, 0x0010000a, + 0x00000000, 0x0700001e, 0x00100032, 0x00000000, 0x00020046, 0x00208046, 0x00000000, 0x00000001, + 0x04000036, 0x001000c2, 0x00000000, 0x00020aa6, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x01000015, 0x0100003e, +}; + +#endif /* __VKD3D_SHADERS_H */ diff --git a/tests/d3d12.c b/tests/d3d12.c index 5284138..3b5264f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4812,7 +4812,7 @@ static void test_clear_unordered_access_view_buffer(void) {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {1, 0, 0, 0}, 1, false, true}, {DXGI_FORMAT_R32_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x3f800000 /* 1.0f */, 0, 0, 0}, 0x3f800000 /* 1.0f */, true, true}, + {0x3f800000 /* 1.0f */, 0, 0, 0}, 0x3f800000 /* 1.0f */, true}, {DXGI_FORMAT_R16G16_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, @@ -4822,16 +4822,16 @@ static void test_clear_unordered_access_view_buffer(void) {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true, true}, + {0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true}, {DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0xbf800000 /* -1.0f */, 0 /* 0.0f */, 0x3f000000 /* 1.0f */, 0x3f000000 /* 1.0f */}, 0, true, true}, + {0xbf800000 /* -1.0f */, 0 /* 0.0f */, 0x3f000000 /* 1.0f */, 0x3f000000 /* 1.0f */}, 0, true}, {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x1234, 0xabcd, 0, 0}, 0xabcd1234, false, true}, {DXGI_FORMAT_R16G16_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true}, {DXGI_FORMAT_R8G8B8A8_UINT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x11, 0x22, 0x33, 0x44}, 0x44332211, false, true}, @@ -4845,10 +4845,10 @@ static void test_clear_unordered_access_view_buffer(void) {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */}, - 0x00000380, true, true}, + 0x00000380, true}, }; memset(&desc, 0, sizeof(desc)); @@ -4982,48 +4982,48 @@ static void test_clear_unordered_access_view_image(void) tests[] = { /* Test clearing a specific mip level. */ - {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {1, 0, 0, 0}, 1, false, false}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, - {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {1, 0, 0, 0}, 1}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {1, 0, 0, 0}, 1}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 0, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, + {DXGI_FORMAT_R32_FLOAT, 2, 1, 1, 0, 1, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test clearing specific array layers. */ - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {}, {1, 0, 0, 0}, 1, false, false}, - {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {1, 0, 0, 0}, 1, false, false}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {}, {1, 0, 0, 0}, 1}, + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {1, 0, 0, 0}, 1}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, IMAGE_SIZE, 0, {}, - {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, + {0x3f000000, 0, 0, 0}, 0x3f000000, true}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, - {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, + {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {1, 0, 0, 0}, 1, false, true}, {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, - {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, + {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test multiple clear rects. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}}, {1, 0, 0, 0}, 1, false, true}, {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 2, {{1, 2, 3, 4}, {5, 6, 7, 8}}, - {0x3f000000, 0, 0, 0}, 0x3f000000, true, true}, + {0x3f000000, 0, 0, 0}, 0x3f000000, true}, /* Test uint clears with formats. */ - {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, false}, + {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001}, {DXGI_FORMAT_R16G16_UINT, 1, 1, 0, 0, 1, 0, {}, {0x12345, 0, 0, 0}, 0x00002345, false, true}, {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true}, {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00020001, false, true}, - {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, false}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true}, {DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, - {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, true, true}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x0000ff80, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, - {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, true, true}, + {0, 0, 0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */}, 0xff800000, true}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */}, - 0x00000380, true, true}, + 0x00000380, true}, }; static const struct -- 2.11.0

1 0

[PATCH vkd3d 1/7] vkd3d: Use size_t instead of SIZE_T for GPU VA sizes.
by Henri Verbeet 25 Nov '19

25 Nov '19

From: Hans-Kristian Arntzen <post(a)arntzen-software.no> This also fixes a format specifier warning in an ERR for the 32-bit Linux build. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 174182. libs/vkd3d/vkd3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 84b5ff2..c6bfe96 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -205,13 +205,13 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct vkd3d_gpu_va_allocation { D3D12_GPU_VIRTUAL_ADDRESS base; - SIZE_T size; + size_t size; void *ptr; }; struct vkd3d_gpu_va_slab { - SIZE_T size; + size_t size; void *ptr; }; -- 2.11.0

1 0

[PATCH 1/3] kernel32/tests: Add some tests for thread description API.
by Nikolay Sivov 25 Nov '19

25 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 132 +++++++++++++++++++++++++++++++++++ include/winternl.h | 9 ++- 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ddbbec93ad..180eed8241 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -105,6 +105,8 @@ static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE,THREADINFOCLASS,PVOID static BOOL (WINAPI *pGetThreadGroupAffinity)(HANDLE,GROUP_AFFINITY*); static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP_AFFINITY*); static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); +static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); +static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); static HANDLE create_target_process(const char *arg) { @@ -2111,6 +2113,133 @@ todo_wine CloseHandle(thread); } +static void test_thread_description(void) +{ + THREAD_DESCRIPTION_INFORMATION *thread_desc; + static const WCHAR *desc = L"thread_desc"; + ULONG len, len2, desc_len; + NTSTATUS status; + char buff[128]; + WCHAR *ptr; + HRESULT hr; + + if (!pGetThreadDescription) + { + skip("Thread description API is not supported.\n"); + return; + } + + desc_len = lstrlenW(desc) * sizeof(*desc); + thread_desc = (THREAD_DESCRIPTION_INFORMATION *)buff; + + /* Initial description. */ + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + len2 = 0; + thread_desc->Length = 1; + thread_desc->Description = (WCHAR *)thread_desc; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); + ok(!status, "Failed to get thread info, status %#x.\n", status); + ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + ok(!thread_desc->Length, "Unexpected description length %#x.\n", thread_desc->Length); + ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", + thread_desc->Description, thread_desc); + + hr = pSetThreadDescription(GetCurrentThread(), NULL); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Failed to get thread info, status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, sizeof(buff), &len); + ok(!status, "Failed to get thread info.\n"); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + ok(thread_desc->Length == (desc_len << 16 | desc_len), "Unexpected description length %#x.\n", + thread_desc->Length); + ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", + thread_desc->Description, thread_desc); + ok(!memcmp(thread_desc->Description, desc, desc_len), "Unexpected description string.\n"); + + /* Partial results. */ + len = 0; + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, buff, len - sizeof(WCHAR), &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); + + /* Change description. */ + thread_desc->Length = 8 << 16 | 8; + lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(status == STATUS_SUCCESS, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L"desc"), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc) - 1); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + + status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + + thread_desc->Description = NULL; + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + + hr = pSetThreadDescription(GetCurrentThread(), NULL); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + /* Set with 0 length/NULL pointer. */ + hr = pSetThreadDescription(GetCurrentThread(), L"123"); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + thread_desc->Length = 0; + thread_desc->Description = NULL; + status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); + ok(!status, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -2147,6 +2276,8 @@ static void init_funcs(void) X(GetThreadGroupAffinity); X(SetThreadGroupAffinity); + X(SetThreadDescription); + X(GetThreadDescription); X(FlsAlloc); X(FlsFree); @@ -2223,6 +2354,7 @@ START_TEST(thread) test_ThreadErrorMode(); test_thread_fpu_cw(); test_thread_actctx(); + test_thread_description(); test_threadpool(); } diff --git a/include/winternl.h b/include/winternl.h index 8b895a9392..d5c8d76ccf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -974,7 +974,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; typedef enum _THREADINFOCLASS { - ThreadBasicInformation, + ThreadBasicInformation = 0, ThreadTimes, ThreadPriority, ThreadBasePriority, @@ -1008,6 +1008,7 @@ typedef enum _THREADINFOCLASS { ThreadUmsInformation, ThreadCounterProfiling, ThreadIdealProcessorEx, + ThreadDescription = 38, MaxThreadInfoClass } THREADINFOCLASS; @@ -1027,6 +1028,12 @@ typedef struct _THREAD_DESCRIPTOR_INFORMATION LDT_ENTRY Entry; } THREAD_DESCRIPTOR_INFORMATION, *PTHREAD_DESCRIPTOR_INFORMATION; +typedef struct _THREAD_DESCRIPTION_INFORMATION +{ + DWORD Length; + WCHAR *Description; +} THREAD_DESCRIPTION_INFORMATION, *PTHREAD_DESCRIPTION_INFORMATION; + typedef struct _KERNEL_USER_TIMES { LARGE_INTEGER CreateTime; LARGE_INTEGER ExitTime; -- 2.24.0

3 6

[PATCH vkd3d v2 1/2] vkd3d: Add more features to CheckFeatureSupport().
by Conor McCarthy 25 Nov '19

25 Nov '19

Some games, e.g. Hitman 2, do not check for success, and if the feature check is unimplemented they will use uninitialised data as the result. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Fix corrupt patch. Supersedes 174442. --- include/vkd3d_d3d12.idl | 141 +++++++++++++++++++ libs/vkd3d/device.c | 276 +++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 5 + 3 files changed, 422 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8246424..3747c8e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1608,6 +1608,141 @@ typedef struct D3D12_FEATURE_DATA_SHADER_MODEL D3D_SHADER_MODEL HighestShaderModel; } D3D12_FEATURE_DATA_SHADER_MODEL; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS1 +{ + BOOL WaveOps; + UINT WaveLaneCountMin; + UINT WaveLaneCountMax; + UINT TotalLaneCount; + BOOL ExpandedComputeResourceStates; + BOOL Int64ShaderOps; +} D3D12_FEATURE_DATA_D3D12_OPTIONS1; + +typedef enum D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER +{ + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED = 0, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_1 = 1, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_2 = 2, +} D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS2 +{ + BOOL DepthBoundsTestSupported; + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER ProgrammableSamplePositionsTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS2; + +typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS +{ + D3D12_SHADER_CACHE_SUPPORT_NONE = 0x0, + D3D12_SHADER_CACHE_SUPPORT_SINGLE_PSO = 0x1, + D3D12_SHADER_CACHE_SUPPORT_LIBRARY = 0x2, + D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x4, + D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, +} D3D12_SHADER_CACHE_SUPPORT_FLAGS; + +typedef struct D3D12_FEATURE_DATA_SHADER_CACHE +{ + D3D12_SHADER_CACHE_SUPPORT_FLAGS SupportFlags; +} D3D12_FEATURE_DATA_SHADER_CACHE; + +typedef struct D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY +{ + D3D12_COMMAND_LIST_TYPE CommandListType; + UINT Priority; + BOOL PriorityForTypeIsSupported; +} D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY; + +typedef struct D3D12_FEATURE_DATA_ARCHITECTURE1 +{ + UINT NodeIndex; + BOOL TileBasedRenderer; + BOOL UMA; + BOOL CacheCoherentUMA; + BOOL IsolatedMMU; +} D3D12_FEATURE_DATA_ARCHITECTURE1; + +typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS +{ + D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE = 0x0, + D3D12_COMMAND_LIST_SUPPORT_FLAG_DIRECT = 0x1, + D3D12_COMMAND_LIST_SUPPORT_FLAG_BUNDLE = 0x2, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COMPUTE = 0x4, + D3D12_COMMAND_LIST_SUPPORT_FLAG_COPY = 0x8, +} D3D12_COMMAND_LIST_SUPPORT_FLAGS; + +typedef enum D3D12_VIEW_INSTANCING_TIER +{ + D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED = 0, + D3D12_VIEW_INSTANCING_TIER_1 = 1, + D3D12_VIEW_INSTANCING_TIER_2 = 2, + D3D12_VIEW_INSTANCING_TIER_3 = 3, +} D3D12_VIEW_INSTANCING_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS3 +{ + BOOL CopyQueueTimestampQueriesSupported; + BOOL CastingFullyTypedFormatSupported; + D3D12_COMMAND_LIST_SUPPORT_FLAGS WriteBufferImmediateSupportFlags; + D3D12_VIEW_INSTANCING_TIER ViewInstancingTier; + BOOL BarycentricsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS3; + +typedef struct D3D12_FEATURE_DATA_EXISTING_HEAPS +{ + BOOL Supported; +} D3D12_FEATURE_DATA_EXISTING_HEAPS; + +typedef enum D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER +{ + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0 = 0, + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_1 = 1, +} D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS4 +{ + BOOL MSAA64KBAlignedTextureSupported; + D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER SharedResourceCompatibilityTier; + BOOL Native16BitShaderOpsSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS4; + +typedef enum D3D12_HEAP_SERIALIZATION_TIER +{ + D3D12_HEAP_SERIALIZATION_TIER_0 = 0, + D3D12_HEAP_SERIALIZATION_TIER_10 = 10, +} D3D12_HEAP_SERIALIZATION_TIER; + +typedef struct D3D12_FEATURE_DATA_SERIALIZATION +{ + UINT NodeIndex; + D3D12_HEAP_SERIALIZATION_TIER HeapSerializationTier; +} D3D12_FEATURE_DATA_SERIALIZATION; + +typedef struct D3D12_FEATURE_DATA_CROSS_NODE +{ + D3D12_CROSS_NODE_SHARING_TIER SharingTier; + BOOL AtomicShaderInstructions; +} D3D12_FEATURE_DATA_CROSS_NODE; + +typedef enum D3D12_RENDER_PASS_TIER +{ + D3D12_RENDER_PASS_TIER_0 = 0, + D3D12_RENDER_PASS_TIER_1 = 1, + D3D12_RENDER_PASS_TIER_2 = 2, +} D3D12_RENDER_PASS_TIER; + +typedef enum D3D12_RAYTRACING_TIER +{ + D3D12_RAYTRACING_TIER_NOT_SUPPORTED = 0, + D3D12_RAYTRACING_TIER_1_0 = 10, +} D3D12_RAYTRACING_TIER; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS5 +{ + BOOL SRVOnlyTiledResourceTier3; + D3D12_RENDER_PASS_TIER RenderPassesTier; + D3D12_RAYTRACING_TIER RaytracingTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS5; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1624,6 +1759,12 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS2 = 18, D3D12_FEATURE_SHADER_CACHE = 19, D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, + D3D12_FEATURE_D3D12_OPTIONS3 = 21, + D3D12_FEATURE_EXISTING_HEAPS = 22, + D3D12_FEATURE_D3D12_OPTIONS4 = 23, + D3D12_FEATURE_SERIALIZATION = 24, + D3D12_FEATURE_CROSS_NODE = 25, + D3D12_FEATURE_D3D12_OPTIONS5 = 27, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7ff567d..cd850c9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1336,6 +1336,33 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE; device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; + device->feature_options1.WaveOps = FALSE; + device->feature_options1.WaveLaneCountMin = 0; + device->feature_options1.WaveLaneCountMax = 0; + device->feature_options1.TotalLaneCount = 0; + device->feature_options1.ExpandedComputeResourceStates = TRUE; + device->feature_options1.Int64ShaderOps = features->shaderInt64; + + /* Depth bounds test is enabled in D3D12_DEPTH_STENCIL_DESC1, which is not supported. */ + device->feature_options2.DepthBoundsTestSupported = FALSE; + /* d3d12_command_list_SetSamplePositions() is not implemented. */ + device->feature_options2.ProgrammableSamplePositionsTier = D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED; + + device->feature_options3.CopyQueueTimestampQueriesSupported = FALSE; + device->feature_options3.CastingFullyTypedFormatSupported = FALSE; + device->feature_options3.WriteBufferImmediateSupportFlags = D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE; + device->feature_options3.ViewInstancingTier = D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED; + device->feature_options3.BarycentricsSupported = FALSE; + + /* Alignment support can be tested later. */ + device->feature_options4.MSAA64KBAlignedTextureSupported = FALSE; + device->feature_options4.SharedResourceCompatibilityTier = D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER_0; + device->feature_options4.Native16BitShaderOpsSupported = features->shaderInt16; + + device->feature_options5.SRVOnlyTiledResourceTier3 = FALSE; + device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; + device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -1590,6 +1617,8 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, else goto out_destroy_queues; + device->feature_options3.CopyQueueTimestampQueriesSupported = !!device->copy_queue->timestamp_bits; + return S_OK; out_destroy_queues: @@ -2433,6 +2462,27 @@ bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) return true; } +static bool d3d12_is_64k_msaa_supported(struct d3d12_device *device) +{ + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_RESOURCE_DESC resource_desc; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1024; + resource_desc.Height = 1024; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + /* FIXME: is some cases Vulkan requires 0x20000 or more for non-MSAA resources which must have + * 0x10000 in their description, so we might resonably return true here for 0x20000 or 0x40000. */ + return SUCCEEDED(vkd3d_get_image_allocation_info(device, &resource_desc, &info)) + && info.Alignment <= 0x10000; +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -2683,6 +2733,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS1: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS1 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options1; + + TRACE("Wave ops %#x.\n", data->WaveOps); + TRACE("Min wave lane count %#x.\n", data->WaveLaneCountMin); + TRACE("Max wave lane count %#x.\n", data->WaveLaneCountMax); + TRACE("Total lane count %#x.\n", data->TotalLaneCount); + TRACE("Expanded compute resource states %#x.\n", data->ExpandedComputeResourceStates); + TRACE("Int64 shader ops %#x.\n", data->Int64ShaderOps); + return S_OK; + } + case D3D12_FEATURE_ROOT_SIGNATURE: { D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; @@ -2700,6 +2771,211 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ARCHITECTURE1: + { + D3D12_FEATURE_DATA_ARCHITECTURE1 *data = feature_data; + bool coherent; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + WARN("Assuming device does not support tile based rendering.\n"); + data->TileBasedRenderer = FALSE; + + data->UMA = d3d12_device_is_uma(device, &coherent); + data->CacheCoherentUMA = data->UMA ? coherent : FALSE; + + WARN("Assuming device does not have an isolated memory management unit.\n"); + data->IsolatedMMU = FALSE; + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x, isolated MMU %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA, data->IsolatedMMU); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS2: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS2 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options2; + + TRACE("Depth bounds test %#x.\n", data->DepthBoundsTestSupported); + TRACE("Programmable sample positions tier %#x.\n", data->ProgrammableSamplePositionsTier); + return S_OK; + } + + case D3D12_FEATURE_SHADER_CACHE: + { + D3D12_FEATURE_DATA_SHADER_CACHE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + /* FIXME: The D3D12 documentation states that D3D12_SHADER_CACHE_SUPPORT_SINGLE_PSO is + * always supported, but the CachedPSO field of D3D12_GRAPHICS_PIPELINE_STATE_DESC is + * ignored and GetCachedBlob() is a stub. */ + data->SupportFlags = D3D12_SHADER_CACHE_SUPPORT_NONE; + + TRACE("Shader cache support %#x.\n", data->SupportFlags); + return S_OK; + } + + case D3D12_FEATURE_COMMAND_QUEUE_PRIORITY: + { + D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + switch (data->CommandListType) + { + case D3D12_COMMAND_LIST_TYPE_DIRECT: + case D3D12_COMMAND_LIST_TYPE_COMPUTE: + case D3D12_COMMAND_LIST_TYPE_COPY: + data->PriorityForTypeIsSupported = FALSE; + TRACE("Command list type %#x, priority %u, supported %#x.\n", + data->CommandListType, data->Priority, data->PriorityForTypeIsSupported); + return S_OK; + + default: + FIXME("Unhandled command list type %#x.\n", data->CommandListType); + return E_INVALIDARG; + } + } + + case D3D12_FEATURE_D3D12_OPTIONS3: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS3 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options3; + + TRACE("Copy queue timestamp queries %#x.\n", data->CopyQueueTimestampQueriesSupported); + TRACE("Casting fully typed format %#x.\n", data->CastingFullyTypedFormatSupported); + TRACE("Write buffer immediate %#x.\n", data->WriteBufferImmediateSupportFlags); + TRACE("View instancing tier %#x.\n", data->ViewInstancingTier); + TRACE("Barycentrics %#x.\n", data->BarycentricsSupported); + return S_OK; + } + + case D3D12_FEATURE_EXISTING_HEAPS: + { + D3D12_FEATURE_DATA_EXISTING_HEAPS *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->Supported = FALSE; + + TRACE("Existing heaps %#x.\n", data->Supported); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS4: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS4 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options4; + data->MSAA64KBAlignedTextureSupported = d3d12_is_64k_msaa_supported(device); + + TRACE("64KB aligned MSAA textures %#x.\n", data->MSAA64KBAlignedTextureSupported); + TRACE("Shared resource compatibility tier %#x.\n", data->SharedResourceCompatibilityTier); + TRACE("Native 16-bit shader ops %#x.\n", data->Native16BitShaderOpsSupported); + return S_OK; + } + + case D3D12_FEATURE_SERIALIZATION: + { + D3D12_FEATURE_DATA_SERIALIZATION *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + data->HeapSerializationTier = D3D12_HEAP_SERIALIZATION_TIER_0; + + TRACE("Heap serialization tier %#x.\n", data->HeapSerializationTier); + return S_OK; + } + + case D3D12_FEATURE_CROSS_NODE: + { + D3D12_FEATURE_DATA_CROSS_NODE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->SharingTier = D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED; + data->AtomicShaderInstructions = FALSE; + + TRACE("Cross node sharing tier %#x.\n", data->SharingTier); + TRACE("Cross node shader atomics %#x.\n", data->AtomicShaderInstructions); + return S_OK; + } + + case D3D12_FEATURE_D3D12_OPTIONS5: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS5 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options5; + + TRACE("SRV tiled resource tier 3 only %#x.\n", data->SRVOnlyTiledResourceTier3); + TRACE("Render pass tier %#x.\n", data->RenderPassesTier); + TRACE("Ray tracing tier %#x.\n", data->RaytracingTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9edf96e..7ba1db4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1086,6 +1086,11 @@ struct d3d12_device PFN_vkd3d_memory_usage_callback pfn_memory_usage_callback; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; + D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; + D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; + D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; + D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4; + D3D12_FEATURE_DATA_D3D12_OPTIONS5 feature_options5; struct vkd3d_vulkan_info vk_info; -- 2.24.0

1 1

[PATCH] gdi32/tests: Fix a copy/paste error in an ok() message.
by Francois Gouget 25 Nov '19

25 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 3920b8c0c43..9a2584fd908 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -994,7 +994,7 @@ static void test_mf_SaveDC(void) ok(ret, "ret = %d\n", ret); hMetafile = CloseMetaFile(hdcMetafile); - ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); ret = DeleteMetaFile(hMetafile); ok( ret, "DeleteMetaFile error %d\n", GetLastError()); -- 2.20.1

2 1

[PATCH v2] shcore: Add stub for GetScaleFactorForMonitor
by Vijay Kiran Kamuju 25 Nov '19

25 Nov '19

Based on patch from Esdras Tarsis <esdrastarsis at gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 4 ++++ include/shtypes.idl | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9dfc..9ebda5164c1d 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f52..3f95c1ffd872 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5c8..d5b7a342e319 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d598280..6f2f7188738e 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -34,6 +36,8 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c8038187..c83562a24bb1 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR; -- 2.21.0

1 0

[PATCH v2] ntoskrnl.exe: Add tests for METHOD_NEITHER ioctl behavior.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Send just the tests. Correct an incorrect test. dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a0f63ade791..6827b74a3c9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1855,6 +1855,34 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG return ZwUnloadDriver(&name); } +static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->UserBuffer; + + if (!buffer) + { + irp->IoStatus.Status = STATUS_ACCESS_VIOLATION; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_ACCESS_VIOLATION; + } + + if (length < sizeof(teststr)) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + memcpy(buffer, teststr, sizeof(teststr)); + + /* This is deliberate; some broken drivers do this */ + *info = 0; + irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -1916,6 +1944,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) IoDetachDevice(lower_device); status = STATUS_SUCCESS; break; + case IOCTL_WINETEST_MISMATCHED_STATUS: + return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 313d554a37b..aa9de674e2f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -33,6 +33,7 @@ #define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 76bcf0d0ce6..c2422e067af 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -208,6 +208,19 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } +static void test_mismatched_status_ioctl(void) +{ + DWORD written = 0xdeadbeef; + char buf[32]; + BOOL res; + + res = DeviceIoControl(device, IOCTL_WINETEST_MISMATCHED_STATUS, NULL, 0, buf, + sizeof(buf), &written, NULL); + todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + todo_wine ok(written == 0xdeadbeef, "size = %u\n", written); + todo_wine ok(!strcmp(buf, teststr), "got '%s'\n", buf); +} + static void test_overlapped(void) { OVERLAPPED overlapped, overlapped2, *o; @@ -514,6 +527,7 @@ START_TEST(ntoskrnl) ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); + test_mismatched_status_ioctl(); main_test(); test_overlapped(); test_load_driver(service2); -- 2.21.0

2 1

[PATCH] winex11.drv/wintab: Fix values for lcSys* and lcOut*
by John Chadwick 25 Nov '19

25 Nov '19

Testing using the Wacom wintab32 (from driver version 6.3.37-3) on Windows 10, it appears that the values for lcOut* were likely accidentally mixed up with the values for lcSys*. The lcSys* values are, according to the documentation, supposed to specify the extent of the screen mapping area for the cursor, wheras lcOut* simply specifies the output coordinate space for the given context. There is no logical reason I'm aware of for why lcOut* would have different default values from lcIn*, and in testing Wacom wintab32 defaults lcOut* to match lcIn*. In addition, lcSysExt* should use SM_C*VIRTUALSCREEN instead of SM_C*SCREEN, to handle multi-monitor setups properly. Setting lcSysExt* to these values works even if the tablet is mapped to a subset of this area. After this change, PaintTool SAI 2 appears to work out of the box. Other wintab clients I tested appear to be unaffected (such as the Wintab SDK demos and Adobe Photoshop CS2.) Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/winex11.drv/wintab.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 12eb89ac7f..ef42a1f07c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -537,8 +537,8 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; - gSysContext.lcOutExtX= GetSystemMetrics(SM_CXSCREEN); - gSysContext.lcOutExtY= GetSystemMetrics(SM_CYSCREEN); + gSysContext.lcSysExtX = GetSystemMetrics(SM_CXVIRTUALSCREEN); + gSysContext.lcSysExtY = GetSystemMetrics(SM_CYVIRTUALSCREEN); /* initialize cursors */ disable_system_cursors(); @@ -671,9 +671,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.X.axUnits = TU_INCHES; gSysDevice.X.axResolution = Axis->resolution; gSysContext.lcInOrgX = Axis->min_value; - gSysContext.lcSysOrgX = Axis->min_value; + gSysContext.lcOutOrgX = Axis->min_value; gSysContext.lcInExtX = Axis->max_value; - gSysContext.lcSysExtX = Axis->max_value; + gSysContext.lcOutExtX = Axis->max_value; Axis++; } if (Val->num_axes>=2) @@ -684,9 +684,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.Y.axUnits = TU_INCHES; gSysDevice.Y.axResolution = Axis->resolution; gSysContext.lcInOrgY = Axis->min_value; - gSysContext.lcSysOrgY = Axis->min_value; + gSysContext.lcOutOrgY = Axis->min_value; gSysContext.lcInExtY = Axis->max_value; - gSysContext.lcSysExtY = Axis->max_value; + gSysContext.lcOutExtY = Axis->max_value; Axis++; } if (Val->num_axes>=3) -- 2.23.0

1 0

[PATCH vkd3d v2 2/2] vkd3d/tests: Add and modify tests for GetResourceAllocationInfo().
by Conor McCarthy 25 Nov '19

25 Nov '19

Test large DepthOrArraySize for small resources, and test compressed textures at the 64KB limit. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1485396..0a8cecb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29394,7 +29394,6 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; - uint64_t size; static const unsigned int alignments[] = { @@ -29429,12 +29428,15 @@ static void test_resource_allocation_info(void) { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT}, { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {256, 512, 1, 10, DXGI_FORMAT_BC1_UNORM}, + {256, 512, 64, 1, DXGI_FORMAT_BC1_UNORM}, {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, + {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; if (!(device = create_device())) @@ -29506,8 +29508,7 @@ static void test_resource_allocation_info(void) info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); - size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format); - if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (i < 6) { check_alignment(info.SizeInBytes, info.Alignment); } -- 2.24.0

1 0

[PATCH] shcore: Add stub for GetScaleFactorForMonitor
by Vijay Kiran Kamuju 25 Nov '19

25 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 4 ++++ include/shtypes.idl | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9dfc..9ebda5164c1d 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f52..3f95c1ffd872 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5c8..d5b7a342e319 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d598280..6f2f7188738e 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -34,6 +36,8 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c8038187..c83562a24bb1 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR; -- 2.21.0

2 2

[PATCH] ntdll: Implement SystemBatteryState for Mac OS.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/nt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ceda544a4df..3aa17b4f422 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -38,6 +38,9 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <IOKit/IOKitLib.h> +# include <IOKit/pwr_mgt/IOPM.h> +# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPowerSources.h> #endif #include <ctype.h> @@ -3338,6 +3341,73 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) return STATUS_SUCCESS; } +#elif defined(HAVE_IOKIT_IOKITLIB_H) + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + CFArrayRef batteries; + CFDictionaryRef battery; + CFNumberRef prop; + uint32_t value, voltage; + CFTimeInterval remain; + + if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + return STATUS_ACCESS_DENIED; + + if (CFArrayGetCount( batteries ) == 0) + { + /* Just assume we're on AC with no battery. */ + bs->AcOnLine = TRUE; + return STATUS_SUCCESS; + } + /* Just use the first battery. */ + battery = CFArrayGetValueAtIndex( batteries, 0 ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + + if (value & kIOBatteryInstalled) + bs->BatteryPresent = TRUE; + else + /* Since we are executing code, we must have AC power. */ + bs->AcOnLine = TRUE; + if (value & kIOBatteryChargerConnect) + { + bs->AcOnLine = TRUE; + if (value & kIOBatteryCharge) + bs->Charging = TRUE; + } + else + bs->Discharging = TRUE; + + /* We'll need the voltage to be able to interpret the other values. */ + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->MaxCapacity = value * voltage; + /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow + * Windows for now (5% and 33%). */ + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = bs->MaxCapacity / 3; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->RemainingCapacity = value * voltage; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->Rate = value * voltage; + + remain = IOPSGetTimeRemainingEstimate(); + if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) + bs->EstimatedTime = (ULONG)remain; + + CFRelease( batteries ); + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) -- 2.21.0

2 1

[PATCH 1/4] ntoskrnl.exe: Return driver dispatch result to caller.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a810dee573f..3a3c543be83 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -479,9 +479,10 @@ struct dispatch_context void *in_buff; }; -static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) +static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) { LARGE_INTEGER count; + NTSTATUS status; IoSetCompletionRoutine( irp, dispatch_irp_completion, context->handle, TRUE, TRUE, TRUE ); context->handle = 0; @@ -491,9 +492,10 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte context->irp = irp; device->CurrentIrp = irp; KeEnterCriticalRegion(); - IoCallDriver( device, irp ); + status = IoCallDriver( device, irp ); KeLeaveCriticalRegion(); device->CurrentIrp = NULL; + return status; } /* process a create request for a given file */ @@ -536,9 +538,7 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CREATE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a close request for a given file */ @@ -574,9 +574,7 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CLOSE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a read request for a given device */ @@ -616,9 +614,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_READ_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a write request for a given device */ @@ -652,9 +648,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) irp->Flags |= IRP_WRITE_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a flush request for a given device */ @@ -681,9 +675,7 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) irpsp = IoGetNextIrpStackLocation( irp ); irpsp->FileObject = file; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process an ioctl request for a given device */ @@ -696,6 +688,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( context->params.ioctl.file ); ULONG out_size = context->params.ioctl.out_size; + NTSTATUS status; if (!file) return STATUS_INVALID_HANDLE; @@ -744,10 +737,10 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); + status = dispatch_irp( device, irp, context ); HeapFree( GetProcessHeap(), 0, to_free ); - return STATUS_SUCCESS; + return status; } static NTSTATUS dispatch_free( struct dispatch_context *context ) -- 2.21.0

2 7

[PATCH 1/2] include: Use __fastcall directly in winelib builds, too.
by Chip Davis 25 Nov '19

25 Nov '19

It's still not safe to call a __fastcall function from Wine source, though, since we can't rely on this being present. winebuild still wants the old wrapper names, so for now we define aliases. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/hal/hal.c | 2 +- include/ddk/wdm.h | 6 +++--- include/windef.h | 21 +++++++++++++++------ include/wine/asm.h | 26 +++++++++++++++++++------- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 21ce6e12c99..2365cac57d0 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ -#ifndef _WIN32 +#if !defined(_WIN32) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a092216b824..3094fdbe42d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1554,9 +1554,9 @@ ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); -PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); -PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); -PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); +PSLIST_ENTRY FASTCALL ExInterlockedFlushSList(PSLIST_HEADER); +PSLIST_ENTRY FASTCALL ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); +PSLIST_ENTRY FASTCALL ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); diff --git a/include/windef.h b/include/windef.h index 0074d5cf6c4..b52f5eb836c 100644 --- a/include/windef.h +++ b/include/windef.h @@ -101,10 +101,22 @@ extern "C" { #endif /* __cdecl */ #ifndef __fastcall -# ifndef _MSC_VER +# ifdef __i386__ +# ifdef __GNUC__ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# define __fastcall __attribute__((__fastcall__)) __attribute__((__force_align_arg_pointer__)) +# elif (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)) +# define __fastcall __attribute__((__fastcall__)) +# else +# define __fastcall __stdcall +# endif +# elif !defined(_MSC_VER) +# define __fastcall __stdcall +# endif +# else # define __fastcall __stdcall # endif -#endif +#endif /* __fastcall */ #ifndef __thiscall # define __thiscall __stdcall @@ -150,10 +162,7 @@ extern "C" { #define _stdcall __ONLY_IN_WINELIB(__stdcall) #endif #ifndef _fastcall -#define _fastcall __ONLY_IN_WINELIB(__stdcall) -#endif -#ifndef __fastcall -#define __fastcall __ONLY_IN_WINELIB(__stdcall) +#define _fastcall __ONLY_IN_WINELIB(__fastcall) #endif #ifndef __export #define __export __ONLY_IN_WINELIB(__stdcall) diff --git a/include/wine/asm.h b/include/wine/asm.h index 8c664476ef1..c45d84c7307 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -29,8 +29,10 @@ #if defined(_WIN32) && defined(__i386__) # define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_FASTCALL(name, args) "@" name "@" #args #else # define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name, args) __ASM_NAME(name) #endif #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) @@ -56,22 +58,22 @@ #endif #ifdef __GNUC__ -# define __ASM_DEFINE_FUNC(name,code) \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); +# define __ASM_GLOBAL(code) asm(code); #else -# define __ASM_DEFINE_FUNC(name,code) void __asm_dummy_##__LINE__(void) { \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); } +# define __ASM_GLOBAL(code) void __asm_dummy_##__LINE__(void) { asm(code); } #endif +#define __ASM_DEFINE_FUNC(name,code) \ + __ASM_GLOBAL( ".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); + #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) /* fastcall support */ -#if defined(__i386__) && !defined(_WIN32) +#if defined(__i386__) && !defined(_WIN32) && ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ < 4))) # define DEFINE_FASTCALL1_WRAPPER(func) \ __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ @@ -87,6 +89,16 @@ "pushl %eax\n\t" \ "jmp " __ASM_STDCALL(#func,args) ) +#elif defined(__i386__) && !defined(_WIN32) + +/* winebuild still uses the thunk names, so provide them */ +# define DEFINE_FASTCALL1_WRAPPER(func) \ + __ASM_GLOBAL( ".globl " __ASM_STDCALL("__fastcall_" #func, 4) "\n\t" \ + __ASM_STDCALL("__fastcall_" #func, 4) " = " __ASM_FASTCALL(#func, 4) "\n\t" ); +# define DEFINE_FASTCALL_WRAPPER(func,args) \ + __ASM_GLOBAL( ".globl " __ASM_STDCALL("__fastcall_" #func, args) "\n\t" \ + __ASM_STDCALL("__fastcall_" #func, args) " = " __ASM_FASTCALL(#func, args) "\n\t" ); + #else /* __i386__ */ # define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ -- 2.21.0

2 2

[PATCH] setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 ++++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 2 + 3 files changed, 81 insertions(+), 28 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d1..8360048421a 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da05..6871f47023c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc1011..74c252c6fd5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) -- 2.21.0

1 0

[PATCH] winegcc: Pass through -fuse-ld= to the linker.
by Chip Davis 25 Nov '19

25 Nov '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tools/winegcc/winegcc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index dcd1ad9cfee..b72840a0e76 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -73,7 +73,7 @@ * object-file-name -llibrary -nostartfiles -nodefaultlibs * -nostdlib -s -static -static-libgcc -static-libstdc++ * -shared -shared-libgcc -symbolic -Wl,option - * -Xlinker option -u symbol --image-base + * -Xlinker option -u symbol --image-base -fuse-ld * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1329,6 +1329,9 @@ static int is_linker_arg(const char* arg) case 'a': if (strcmp("-arch", arg) == 0) return 1; break; + case 'f': + if (strncmp("-fuse-ld=", arg, 9) == 0) return 1; + break; } for (j = 0; j < ARRAY_SIZE(link_switches); j++) -- 2.21.0

1 0

[PATCH v4 resend 1/4] ntdll/tests: Test NtPowerInformation() with SystemExecutionState.
by Chip Davis 25 Nov '19

25 Nov '19

Test interaction between SetThreadExecutionState(), PowerSetRequest(), and this parameter. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Test that, when a thread terminates, its execution state is cleaned up. v3: Fix warnings. v4: Move to ntdll. Get rid of new test executable. dlls/ntdll/tests/info.c | 184 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 30ed6e5ef99..8e743320c65 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -41,6 +41,9 @@ static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_R static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); static NTSTATUS (WINAPI * pNtOpenThread)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID *); static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); +static HANDLE (WINAPI *pPowerCreateRequest)(REASON_CONTEXT *); +static BOOL (WINAPI *pPowerSetRequest)(HANDLE, POWER_REQUEST_TYPE); +static BOOL (WINAPI *pPowerClearRequest)(HANDLE, POWER_REQUEST_TYPE); static BOOL is_wow64; @@ -104,6 +107,10 @@ static BOOL InitFunctionPtrs(void) pGetLogicalProcessorInformationEx = (void *) GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + pPowerCreateRequest = (void *) GetProcAddress(hkernel32, "PowerCreateRequest"); + pPowerSetRequest = (void *) GetProcAddress(hkernel32, "PowerSetRequest"); + pPowerClearRequest = (void *) GetProcAddress(hkernel32, "PowerClearRequest"); + return TRUE; } @@ -1003,6 +1010,177 @@ static void test_query_processor_power_info(void) HeapFree(GetProcessHeap(), 0, ppi); } +static void test_system_execution_state(void) +{ + EXECUTION_STATE es, old_es; + NTSTATUS status; + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_SYSTEM_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + todo_wine ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + old_es = SetThreadExecutionState(ES_CONTINUOUS); + ok(old_es == (ES_CONTINUOUS|ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + + old_es = es; + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == old_es, "unexpected execution state 0x%08x vs 0x%08x\n", es, old_es); +} + +static HANDLE events[2]; + +static DWORD CALLBACK execution_state_thread(LPVOID param) +{ + EXECUTION_STATE old_es; + + SetThreadExecutionState(ES_SYSTEM_REQUIRED); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_DISPLAY_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + ok(old_es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + old_es = SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED); + ok(old_es == (ES_CONTINUOUS|ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", old_es); + SignalObjectAndWait(events[0], events[1], INFINITE, FALSE); + + return 0; +} + +static void test_system_execution_state_other_thread(void) +{ + HANDLE thread; + EXECUTION_STATE base_es, es; + NTSTATUS status; + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, execution_state_thread, NULL, 0, NULL); + ok(thread != NULL, "Failed to create thread, err %u\n", GetLastError()); + + WaitForSingleObject(events[0], INFINITE); + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], events[0], INFINITE, FALSE); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + SignalObjectAndWait(events[1], thread, INFINITE, FALSE); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(es == base_es, "unexpected execution state 0x%08x\n", es); + es = SetThreadExecutionState(0); + todo_wine ok(es == ES_CONTINUOUS, "unexpected execution state 0x%08x\n", es); + + CloseHandle(thread); + CloseHandle(events[0]); + CloseHandle(events[1]); +} + +static void test_system_execution_state_power_request(void) +{ + HANDLE req; + REASON_CONTEXT reason; + BOOL ret; + NTSTATUS status; + EXECUTION_STATE base_es, es; + static WCHAR reasonW[] = {'W', 'i', 'n', 'e', ' ', 't', 'e', 's', 't', 0}; + + if (!pPowerCreateRequest) + { + win_skip("Power request objects unavailable\n"); + return; + } + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &base_es, sizeof(base_es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + trace("base execution state = 0x%08x\n", base_es); + + reason.Version = 0; + reason.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING; + reason.Reason.SimpleReasonString = reasonW; + req = pPowerCreateRequest(&reason); + todo_wine ok(req != INVALID_HANDLE_VALUE, "err %u\n", GetLastError()); + + ret = pPowerSetRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_SYSTEM_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = pPowerClearRequest(req, PowerRequestSystemRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_SYSTEM_REQUIRED) || (base_es & ES_SYSTEM_REQUIRED), "unexpected execution state 0x%08x\n", es); + + ret = pPowerSetRequest(req, PowerRequestDisplayRequired); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + todo_wine ok(es & ES_DISPLAY_REQUIRED, "unexpected execution state 0x%08x\n", es); + + ret = CloseHandle(req); + todo_wine ok(ret, "err %u\n", GetLastError()); + + status = pNtPowerInformation(SystemExecutionState, NULL, 0, &es, sizeof(es)); + ok(status == STATUS_SUCCESS, "status %08x\n", status); + ok(!(es & ES_DISPLAY_REQUIRED) || (base_es & ES_DISPLAY_REQUIRED), "unexpected execution state 0x%08x\n", es); +} + static void test_query_process_wow64(void) { NTSTATUS status; @@ -2426,6 +2604,12 @@ START_TEST(info) trace("Starting test_query_processor_power_info()\n"); test_query_processor_power_info(); + /* 0x10 SystemExecutionState */ + trace("Starting test_system_execution_state()\n"); + test_system_execution_state(); + test_system_execution_state_other_thread(); + test_system_execution_state_power_request(); + /* NtQueryInformationProcess */ /* 0x0 ProcessBasicInformation */ -- 2.21.0

1 3

[PATCH resend] ntdll: Try mmap again without exec if it fails with it.
by Chip Davis 25 Nov '19

25 Nov '19

On some systems, mmap(2) with PROT_WRITE | PROT_EXEC can legitimately fail. If we added PROT_EXEC implicitly, try again without it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/virtual.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7f8dd3aa5ac..fb265bbd321 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1217,6 +1217,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { +try_again: if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; @@ -1237,7 +1238,16 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start case EPERM: /* noexec filesystem, fall back to read() */ if (flags & MAP_SHARED) { - if (prot & PROT_EXEC) ERR( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + if (prot & PROT_EXEC) + { + if (force_exec_prot && (vprot & (VPROT_WRITE|VPROT_EXEC)) == VPROT_WRITE) + { + /* exec + write may legitimately fail, in that case fall back to write only */ + prot &= ~PROT_EXEC; + goto try_again; + } + ERR( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); + } return STATUS_ACCESS_DENIED; } if (prot & PROT_EXEC) WARN( "failed to set PROT_EXEC on file map, noexec filesystem?\n" ); -- 2.21.0

1 0

[PATCH 3/3] dmloader: Rewrite IDirectMusicLoader8 ReleaseObject using find_cache_object
by Alistair Leslie-Hughes 25 Nov '19

25 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 87 +++++++++++++----------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b6dc3434f6..47e5fb41e8 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -686,70 +686,35 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *if return DMUS_E_LOADER_OBJECTNOTFOUND; } -static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - struct cache_entry *pObjectEntry; - HRESULT result = S_FALSE; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; - TRACE("(%p, %p)\n", This, pObject); - - if(!pObject) return E_POINTER; + TRACE("(%p, %p)\n", This, object); - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* iterate through the list of objects we know about; check only those with DMUS_OBJ_LOADED */ - TRACE(": looking for the object in cache\n"); - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if (TRACE_ON(dmloader)) - dump_DMUS_OBJECTDESC(&pObjectEntry->Desc); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_LOADED)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - result = S_OK; - break; - } - } - if (result == S_OK) { - /*TRACE(": releasing:\n%s - bInvalidDefaultDLS = %i\n - pObject = %p\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); */ - IDirectMusicObject_Release (pObjectEntry->pObject); - pObjectEntry->pObject = NULL; - pObjectEntry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; - } - return result; + if (!object) + return E_POINTER; + + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor (object, &desc); + + TRACE("Looking for the object in cache\n"); + entry = find_cache_object(This, &desc); + if (entry) { + dump_DMUS_OBJECTDESC(&entry->Desc); + + if (entry->pObject && entry->Desc.dwValidData & DMUS_OBJ_LOADED) { + IDirectMusicObject_Release (entry->pObject); + entry->pObject = NULL; + entry->Desc.dwValidData &= ~DMUS_OBJ_LOADED; + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class) -- 2.17.1

1 0

[PATCH 2/3] dmloader: Rewrite IDirectMusicLoader8 CacheObject using find_cache_object
by Alistair Leslie-Hughes 25 Nov '19

25 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 102 +++++++++++------------------------------ 1 file changed, 27 insertions(+), 75 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 24c04ab5bd..b6dc3434f6 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -655,83 +655,35 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * } while (1); } -static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) +static HRESULT WINAPI IDirectMusicLoaderImpl_CacheObject(IDirectMusicLoader8 *iface, + IDirectMusicObject *object) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - DMUS_OBJECTDESC Desc; - HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; - struct cache_entry *pObjectEntry; + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + DMUS_OBJECTDESC desc; + struct cache_entry *entry; + + TRACE("(%p, %p)\n", This, object); + + /* get descriptor */ + DM_STRUCT_INIT(&desc); + IDirectMusicObject_GetDescriptor (object, &desc); + + /* Iterate through the list and check if we have an alias (without object), corresponding + to the descriptor of the input object */ + entry = find_cache_object(This, &desc); + if (entry) { + if ((entry->Desc.dwValidData & DMUS_OBJ_LOADED) && entry->pObject) { + TRACE("Object already laoded.\n"); + return S_FALSE; + } - TRACE("(%p, %p)\n", This, pObject); - - /* get descriptor */ - DM_STRUCT_INIT(&Desc); - IDirectMusicObject_GetDescriptor (pObject, &Desc); - - /* now iterate through the list and check if we have an alias (without object), corresponding - to the descriptor of the input object */ - LIST_FOR_EACH_ENTRY(pObjectEntry, &This->cache, struct cache_entry, entry) { - if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (Desc.wszCategory, pObjectEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_NAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (Desc.wszName, pObjectEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - else if ((Desc.dwValidData & DMUS_OBJ_FILENAME) && - (pObjectEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (Desc.wszFileName, pObjectEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if ((pObjectEntry->Desc.dwValidData & DMUS_OBJ_LOADED) && pObjectEntry->pObject) - result = S_FALSE; - else - result = S_OK; - break; - } - } - - /* if we found such alias, then set everything */ - if (result == S_OK) { - pObjectEntry->Desc.dwValidData &= DMUS_OBJ_LOADED; - pObjectEntry->pObject = pObject; - IDirectMusicObject_AddRef (pObjectEntry->pObject); - } - - return result; + entry->Desc.dwValidData |= DMUS_OBJ_LOADED; + entry->pObject = object; + IDirectMusicObject_AddRef (entry->pObject); + return S_OK; + } + + return DMUS_E_LOADER_OBJECTNOTFOUND; } static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 *iface, IDirectMusicObject *pObject) -- 2.17.1

1 0

[PATCH 1/3] dmloader: Rewrite cache object lookup.
by Alistair Leslie-Hughes 25 Nov '19

25 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 174 +++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 74 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 69a438765d..24c04ab5bd 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -163,6 +163,85 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface) return ref; } +static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_OBJECTDESC *desc) +{ + struct cache_entry *existing; + + /* + * The Object is looked for the the following order. + * 1. DMUS_OBJ_OBJECT + * 2. DMUS_OBJ_STREAM + * 3. DMUS_OBJ_MEMORY + * 4. DMUS_OBJ_FILENAME and DMUS_OBJ_FULLPATH + * 5. DMUS_OBJ_NAME and DMUS_OBJ_CATEGORY + * 6. DMUS_OBJ_NAME + * 7. DMUS_OBJ_FILENAME + */ + + if (desc->dwValidData & DMUS_OBJ_OBJECT) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_OBJECT && + IsEqualGUID (&desc->guidObject, &existing->Desc.guidObject) ) { + TRACE("Found by DMUS_OBJ_OBJECT\n"); + return existing; + } + } + } + + if (desc->dwValidData & DMUS_OBJ_STREAM) + FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); + + if (desc->dwValidData & DMUS_OBJ_MEMORY) + FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + + if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == + (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH) && + !wcsncmp (desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH\n"); + return existing; + } + } + } + + if ((desc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) == + (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY) && + !wcsncmp (desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME) && + !wcsncmp (desc->wszCategory, existing->Desc.wszCategory, DMUS_MAX_CATEGORY)) { + TRACE("Found by DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if ((existing->Desc.dwValidData & DMUS_OBJ_NAME) == DMUS_OBJ_NAME && + !wcsncmp (desc->wszName, existing->Desc.wszName, DMUS_MAX_NAME)) { + TRACE("Found by DMUS_OBJ_NAME\n"); + return existing; + } + } + } + + if ((desc->dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (((existing->Desc.dwValidData & DMUS_OBJ_FILENAME) == DMUS_OBJ_FILENAME) && + !wcsncmp (desc->wszFileName, existing->Desc.wszFileName, DMUS_MAX_FILENAME)) { + TRACE("Found by DMUS_OBJ_FILENAME\n"); + return existing; + } + } + } + + return NULL; +} + static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDESC *pDesc, REFIID riid, void **ppv) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); @@ -187,80 +266,27 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac *ppv = NULL; return DMUS_E_LOADER_NOCLASSID; } - - /* OK, first we iterate through the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile) - or set via SetObject; */ - TRACE(": looking if we have object in the cache or if it can be found via alias\n"); - LIST_FOR_EACH_ENTRY(pExistingEntry, &This->cache, struct cache_entry, entry) { - if ((pDesc->dwValidData & DMUS_OBJ_OBJECT) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_OBJECT) && - IsEqualGUID (&pDesc->guidObject, &pExistingEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n"); - /* I suppose such stuff can happen only when GUID for object is given (GUID_DefaultGMCollection) */ - if (pExistingEntry->bInvalidDefaultDLS) { - TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); - return DMUS_E_LOADER_NOFILENAME; - } - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - break; - } - else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (pDesc->wszCategory, pExistingEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_NAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_FILENAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - } - + + /* Iterate through the list of objects we know about; these are either loaded + * (GetObject, LoadObjectFromFile) or set via SetObject; */ + TRACE(": looking if we have object in the cache or if it can be found via alias\n"); + pExistingEntry = find_cache_object(This, pDesc); + if (pExistingEntry) { + + if (pExistingEntry->bInvalidDefaultDLS) { + TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n"); + return DMUS_E_LOADER_NOFILENAME; + } + + if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { + TRACE(": already loaded\n"); + return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); + } + + TRACE(": not loaded yet\n"); + pObjectEntry = pExistingEntry; + } + /* basically, if we found alias, we use its descriptor to load... else we use info we were given */ if (pObjectEntry) { -- 2.17.1

1 0

[PATCH v3 3/3] kernel32: Implement SetUserGeoName().
by João Diogo Ferreira 24 Nov '19

24 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Treat with low priority. This actually useful and urgent, rather I mistakingly wrote it for something else and now I might as well make it useful. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 124 +++++++++++++++++++++++++++++------- include/winnls.h | 1 + 3 files changed, 102 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 30b0b1de67..67fdcd0c3b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1471,6 +1471,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6031ddfd64..1f7c9a0eda 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3109,7 +3109,6 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; DWORD count = sizeof(bufferW); - RtlInitUnicodeString(&keyW, nationW); switch (geoclass) { @@ -3139,30 +3138,28 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) } /****************************************************************************** - * SetUserGeoID (KERNEL32.@) - * - * Sets the ID of the user's geographic location. + * set_geo_reg * - * PARAMS - * geoid [I] The geographic ID to be set. + * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). * - * RETURNS - * SUCCESS: TRUE. - * FAILURE: FALSE. GetLastError() will return ERROR_INVALID_PARAMETER if the ID was invalid. + * The return value and last error set here can and should be + * returned to the callers of those two functions. */ -BOOL WINAPI SetUserGeoID(GEOID geoid) +static int WINAPI set_geo_reg(const struct geoinfo_t *geoptr) { - const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW, keyW; - WCHAR bufferW[10]; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR id_fmtW[] = {'%','i',0}; + static const WCHAR un_fmtW[] = {'%','0','3','i',0}; + static const WCHAR xx[] = {'X','X',0}; + UNICODE_STRING keyname, id_valuename, name_valuename; + WCHAR id_buffer[10], name_buffer[4]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if (!geoinfo) + if (!geoptr) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -3172,16 +3169,11 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.Length = sizeof(attr); attr.RootDirectory = hkey; - attr.ObjectName = &nameW; + attr.ObjectName = &keyname; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString(&nameW, geoW); - - if (geoinfo->kind == LOCATION_NATION) - RtlInitUnicodeString(&keyW, nationW); - else - RtlInitUnicodeString(&keyW, regionW); + RtlInitUnicodeString(&keyname, geoW); if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { @@ -3189,13 +3181,97 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) return FALSE; } - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + /* Prepare the GeoID */ + sprintfW(id_buffer, id_fmtW, geoptr->id); + + if (geoptr->kind == LOCATION_NATION) + RtlInitUnicodeString(&id_valuename, nationW); + else + RtlInitUnicodeString(&id_valuename, regionW); + + /* Now prepare geoname */ + RtlInitUnicodeString(&name_valuename, nameW); + + if (geoptr->uncode && !strcmpW(xx, geoptr->iso2W)) + sprintfW(name_buffer, un_fmtW, geoptr->uncode); + else + strcpyW(name_buffer, geoptr->iso2W); + + NtSetValueKey(hkey, &id_valuename, 0, REG_SZ, + id_buffer, (strlenW(id_buffer) + 1) * sizeof(WCHAR)); + NtSetValueKey(hkey, &name_valuename, 0, REG_SZ, + name_buffer, (strlenW(name_buffer) + 1) * sizeof(WCHAR)); + + TRACE("Set %s to ID %d; set Name to %s.\n", + wine_dbgstr_w(id_valuename.Buffer), geoptr->id, wine_dbgstr_w(name_buffer)); + NtClose(attr.RootDirectory); NtClose(hkey); return TRUE; } +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * + * Sets the user's geographic location via a GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. GetLastError() will return ERROR_INVALID_PARAMETER if the GeoID was invalid. + * + * NOTES + * On success, the geographic name be set to the location of the specified GeoID. + * + * SEE ALSO + * GetUserGeoID(), EnumSystemGeoID(), GetGeoInfoW(). + */ +BOOL WINAPI SetUserGeoID(GEOID geoid) +{ + TRACE("(%d)\n", geoid); + return set_geo_reg(get_geoinfoptr_by_id(geoid)); +} + +/****************************************************************************** + * SetUserGeoName (KERNEL32.@) + * + * Sets the user's geographic location via a GeoName. + * + * PARAMS + * geoname [I] The name of the location to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: GetLastError() will return ERROR_INVALID_PARAMETER if the name was invalid. + * + * NOTES + * On success, the geographic ID for the relevant class will be set to + * the location of the specified name. + * + * A GeoName is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * The name must be known to Wine, or this function will fail. + * Call EnumSystemGeoNames() to retrieve a list of valid names. + * + * SEE ALSO + * GetUserDefaultGeoName(), EnumSystemGeoNames(), GetGeoInfoEx(). + */ +BOOL WINAPI SetUserGeoName(WCHAR *geoname) +{ + TRACE("(%p = %s)\n", geoname, geoname ? wine_dbgstr_w(geoname) : "(nil)"); + + if (!geoname || !*geoname) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return set_geo_reg(get_geoinfoptr_by_name(geoname)); +} + /****************************************************************************** * get_geo_info * diff --git a/include/winnls.h b/include/winnls.h index 7f5a782815..11ec2f6236 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -966,6 +966,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(WCHAR *); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM); -- 2.24.0

2 1

[PATCH v3 2/3] kernel32: Implement GetGeoInfoEx().
by João Diogo Ferreira 24 Nov '19

24 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Treat with low priority. This actually useful and urgent, rather I mistakingly wrote it for something else and now I might as well make it useful. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 225 ++++++++++++++++++++++++++++------- dlls/kernel32/tests/locale.c | 60 +++++++++- include/winnls.h | 4 +- 4 files changed, 243 insertions(+), 47 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a26d65edf7..30b0b1de67 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -694,6 +694,7 @@ @ stdcall -import GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) +@ stdcall GetGeoInfoEx(wstr long ptr long) @ stdcall GetHandleContext(long) @ stdcall -import GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4a2795cd1c..6031ddfd64 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2993,7 +2993,12 @@ static const struct geoinfo_t geoinfodata[] = { { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; -static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) +/****************************************************************************** +* get_geoinfoptr_by_id +* +* Returns a pointer to the geoinfo struct matching a GeoID. +*/ +static const struct geoinfo_t *get_geoinfoptr_by_id(GEOID geoid) { int min, max; @@ -3018,6 +3023,69 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * get_geoinfoptr_by_type + * + * Returns a pointer to a geoinfo struct by + * matching a string to the specified geotype. + */ + +static inline const struct geoinfo_t *get_geoinfoptr_by_type(GEOTYPE geotype, const WCHAR *wstr) +{ + int i, num; + + if (!wstr || !*wstr) + return NULL; + + switch (geotype) + { + case GEO_ISO2: + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (!(strcmpW(geoinfodata[i].iso2W, wstr))) return &geoinfodata[i]; + break; + case GEO_ISO_UN_NUMBER: + if (!(num = atoiW(wstr))) return NULL; + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (num == geoinfodata[i].uncode) + return &geoinfodata[i]; + break; + } + return NULL; +} + +/****************************************************************************** + * get_geoinfoptr_by_name + * + * Parse a geoname and return a pointer to the matching geoinfo struct. + * This matches all the undocumented rules found in Windows. + */ +static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) +{ + static const WCHAR xx[] = {'X','X',0}; + const struct geoinfo_t *geoptr; + WCHAR buffer[4]; + int i; + + if (!name) + return NULL; + + switch (strlenW(name)) + { + case 2: + if (!strcmpW(name, xx)) + return get_geoinfoptr_by_id(39070); + for (i = 0; i <= 2; i++) + buffer[i] = toupperW(name[i]); + return get_geoinfoptr_by_type(GEO_ISO2, buffer); + case 3: + geoptr = get_geoinfoptr_by_type(GEO_ISO_UN_NUMBER, name); + if (geoptr && !strcmpW(xx, geoptr->iso2W)) + return geoptr; + default: + return NULL; + } +} + /****************************************************************************** * GetUserGeoID (KERNEL32.@) * @@ -3084,7 +3152,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) */ BOOL WINAPI SetUserGeoID(GEOID geoid) { - const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); + const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; @@ -3129,38 +3197,15 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) } /****************************************************************************** - * GetGeoInfoW (KERNEL32.@) + * get_geo_info * - * Retrieves information about a geographic location by its GeoID. + * Implements GetGeoInfoW() and GetGeoInfoEx(). * - * PARAMS - * geoid [I] The GeoID of the location of interest. - * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). - * data [O] The output buffer to store the information. - * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. - * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. - * - * RETURNS - * Success: The number of WCHARs (including null) written to the buffer -or- - * if no buffer was provided, the minimum length required to hold the full data. - * Failure: Zero. Call GetLastError() to determine the cause. - * - * NOTES - * On failure, GetLastError() will return one of the following values: - * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. - * - ERROR_INVALID_FLAGS: the specified geotype was invalid. - * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. - * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. - * - * The list of available GeoIDs can be retrieved with EnumSystemGeoID(). - * - * TODO - * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, - * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. + * The return value and last error set here can and should be + * returned to the caller of those two functions. */ -INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) +static int get_geo_info(const struct geoinfo_t *geoptr, GEOTYPE geotype, WCHAR *data, int data_len, LANGID lang) { - const struct geoinfo_t *ptr; WCHAR buffW[12]; const WCHAR *str = buffW; int len; @@ -3168,36 +3213,34 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, static const WCHAR id_fmtW[] = {'%','d',0}; static const WCHAR un_fmtW[] = {'%','0','3','d',0}; - TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - - if (!(ptr = get_geoinfo_dataptr(geoid))) { + if (!geoptr) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } switch (geotype) { case GEO_NATION: - if (ptr->kind != LOCATION_NATION) return 0; + if (geoptr->kind != LOCATION_NATION) return 0; case GEO_ID: - sprintfW(buffW, id_fmtW, ptr->id); + sprintfW(buffW, id_fmtW, geoptr->id); break; case GEO_ISO_UN_NUMBER: - sprintfW(buffW, un_fmtW, ptr->uncode); + sprintfW(buffW, un_fmtW, geoptr->uncode); break; case GEO_PARENT: - sprintfW(buffW, id_fmtW, ptr->parent); + sprintfW(buffW, id_fmtW, geoptr->parent); break; case GEO_ISO2: - str = ptr->iso2W; + str = geoptr->iso2W; break; case GEO_ISO3: - str = ptr->iso3W; + str = geoptr->iso3W; break; case GEO_NAME: - if (ptr->uncode && !strcmpW(xx, ptr->iso2W)) - sprintfW(buffW, un_fmtW, ptr->uncode); + if (geoptr->uncode && !strcmpW(xx, geoptr->iso2W)) + sprintfW(buffW, un_fmtW, geoptr->uncode); else - str = ptr->iso2W; + str = geoptr->iso2W; break; case GEO_RFC1766: case GEO_LCID: @@ -3229,10 +3272,51 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(); or check the + * currently set location with GetUserGeoID(). + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, + * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. + */ +int WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, WCHAR *data, int data_len, LANGID lang) +{ + TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); + return get_geo_info(get_geoinfoptr_by_id(geoid), geotype, data, data_len, lang); +} + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * Narrow character version of GetGeoInfoW(). */ -INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, LANGID lang) +int WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, char *data, int data_len, LANGID lang) { WCHAR *buffW; INT len; @@ -3262,6 +3346,61 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoEx (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoName. + * + * PARAMS + * location [I] GeoName of the location to learn about. + * geotype [I] Type of information to be retrieved (except GEO_LCID, GEO_NATION and GEO_RFC1766). + * data [O] Output buffer to store the information. + * data_len [I] Length of the buffer, measured in WCHARs and including the null terminator. + * + * RETURNS + * Same as GetGeoInfoW(). + * + * NOTES + * A GeoName is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * This function disallows some values of geotype: GEO_LCID, GEO_NATION and GEO_RFC1776. + * For GEO_NATION, use GEO_ID instead; for the other two, call GetGeoInfoW(). + * + * The list of available GeoNames can be retrieved with EnumSystemGeoNames(); or check the + * currently set location with GetUserDefaultGeoName(). + * + * For more notes and unhandled cases, consult GetGeoInfoW(). + */ +int WINAPI GetGeoInfoEx(WCHAR *location, GEOTYPE geotype, WCHAR *data, int data_len) +{ + TRACE("%p=%s %d %p %d\n", + location, location ? wine_dbgstr_w(location) : "null", geotype, data, data_len); + + if (!location || !*location) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + switch (geotype) + { + case GEO_LCID: + case GEO_NATION: + case GEO_RFC1766: + SetLastError(ERROR_INVALID_FLAGS); + return 0; + case GEO_PARENT: + { + const struct geoinfo_t *geoptr = get_geoinfoptr_by_name(location); + const struct geoinfo_t *parent = geoptr ? get_geoinfoptr_by_id(geoptr->parent) : NULL; + return get_geo_info(parent, GEO_NAME, data, data_len, 0); + } + default: + return get_geo_info(get_geoinfoptr_by_name(location), geotype, data, data_len, 0); + } +} + /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b501976228..6a040c2624 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -72,8 +72,9 @@ static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); -static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); -static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); +static int (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, char *, int, LANGID); +static int (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, WCHAR *, int, LANGID); +static int (WINAPI *pGetGeoInfoEx)(WCHAR *, GEOTYPE, WCHAR *, int); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -114,6 +115,7 @@ static void InitFunctionPointers(void) X(CompareStringEx); X(GetGeoInfoA); X(GetGeoInfoW); + X(GetGeoInfoEx); X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); @@ -4981,6 +4983,60 @@ static void test_GetGeoInfo(void) ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); + + if (pGetGeoInfoEx) + { + WCHAR buffer[10]; + WCHAR pt[] = {'P','T',0}, ptlow[] = {'p','t',0}, parent[] = {'0','3','9',0}, + xx[] = {'X','X',0}, world[] = {'0','0','1',0}, empty[] = {0}; + + /* GEO_PARENT should return the parent in geo name form. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(pt, GEO_PARENT, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, parent), "expected %s, got %s\n", wine_dbgstr_w(parent), wine_dbgstr_w(buffer)); + + /* Lowercase name should work the same. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(ptlow, GEO_PARENT, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, parent), "expected %s, got %s\n", wine_dbgstr_w(parent), wine_dbgstr_w(buffer)); + + /* GeoName XX should map to 001. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(xx, GEO_NAME, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, world), "expected %s, got %s\n", wine_dbgstr_w(world), wine_dbgstr_w(buffer)); + + /* Test types disallowed by GetGeoInfoEx. */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_LCID, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_NATION, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_RFC1766, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + /* Test null names */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(empty, GEO_NAME, buffer, ARRAY_SIZE(buffer)), + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ret == 0 (got %d) and error == 87 (got %d)\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(NULL, GEO_NAME, buffer, ARRAY_SIZE(buffer)), + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ret == 0 (got %d) and error == 87 (got %d)\n", ret, GetLastError()); + } + else + win_skip("GetGeoInfoEx not supported.\n"); } static int geoidenum_count; diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..7f5a782815 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -904,8 +904,8 @@ WINBASEAPI INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWST #define GetDateFormat WINELIB_NAME_AW(GetDateFormat) WINBASEAPI BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); WINBASEAPI BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); -WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); -WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); +WINBASEAPI int WINAPI GetGeoInfoA(GEOID,GEOTYPE,char*,int,LANGID); +WINBASEAPI int WINAPI GetGeoInfoW(GEOID,GEOTYPE,WCHAR*,int,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo) WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); -- 2.24.0

2 1

[PATCH v3 1/3] kernel32: Handle GEO_ID and GEO_NAME in GetGeoInfoW(), fix UN format.
by João Diogo Ferreira 24 Nov '19

24 Nov '19

UN codes are always formatted in groups of three digits in Windows. Also added more geotypes to the list of known unhandled cases. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- V3: Fix test failure on older Windows versions. V2: Don't use compound arguments in function call, and PROPERLY handle GEO_NATION. Supersedes: 174374 V3: Fix test failure on older Windows versions. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 48 ++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a5ec6593b0..4a2795cd1c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3130,6 +3130,33 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) /****************************************************************************** * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(). + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, + * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. */ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) { @@ -3137,7 +3164,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, WCHAR buffW[12]; const WCHAR *str = buffW; int len; - static const WCHAR fmtW[] = {'%','d',0}; + static const WCHAR xx[] = {'X','X',0}; + static const WCHAR id_fmtW[] = {'%','d',0}; + static const WCHAR un_fmtW[] = {'%','0','3','d',0}; TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); @@ -3148,13 +3177,15 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_NATION: - sprintfW(buffW, fmtW, ptr->id); + if (ptr->kind != LOCATION_NATION) return 0; + case GEO_ID: + sprintfW(buffW, id_fmtW, ptr->id); break; case GEO_ISO_UN_NUMBER: - sprintfW(buffW, fmtW, ptr->uncode); + sprintfW(buffW, un_fmtW, ptr->uncode); break; case GEO_PARENT: - sprintfW(buffW, fmtW, ptr->parent); + sprintfW(buffW, id_fmtW, ptr->parent); break; case GEO_ISO2: str = ptr->iso2W; @@ -3162,6 +3193,12 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, case GEO_ISO3: str = ptr->iso3W; break; + case GEO_NAME: + if (ptr->uncode && !strcmpW(xx, ptr->iso2W)) + sprintfW(buffW, un_fmtW, ptr->uncode); + else + str = ptr->iso2W; + break; case GEO_RFC1766: case GEO_LCID: case GEO_FRIENDLYNAME: @@ -3170,6 +3207,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, case GEO_OFFICIALLANGUAGES: case GEO_LATITUDE: case GEO_LONGITUDE: + case GEO_DIALINGCODE: + case GEO_CURRENCYCODE: + case GEO_CURRENCYSYMBOL: FIXME("type %d is not supported\n", geotype); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0e2c3496a9..b501976228 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4892,6 +4892,31 @@ static void test_GetGeoInfo(void) ok(ret == 4, "got %d\n", ret); ok(!strcmp(buffA, "203"), "got %s\n", buffA); + /* GEO_NATION should fail when the location is of type LOCATION_REGION */ + buffA[0] = 0; + ret = pGetGeoInfoA(39070, GEO_NATION, buffA, 20, 0); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(*buffA == 0, "expected empty string, got %s\n", buffA); + + /* GEO_ID should return an ID for all location types */ + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_ID, buffA, 20, 0); + if (!ret) + win_skip("GEO_ID not supported.\n"); + else + { + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "203"), "got %s\n", buffA); /* LOCATION_NATION */ + + ret = pGetGeoInfoA(47610, GEO_ID, buffA, 20, 0); /* LOCATION_REGION */ + ok(ret == 6, "got %d\n", ret); + ok(!strcmp(buffA, "47610"), "got %s\n", buffA); + + ret = pGetGeoInfoA(333, GEO_ID, buffA, 20, 0); /* LOCATION_BOTH */ + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "333"), "got %s\n", buffA); + } + /* GEO_PARENT */ buffA[0] = 0; ret = pGetGeoInfoA(203, GEO_PARENT, buffA, 20, 0); @@ -4911,6 +4936,44 @@ static void test_GetGeoInfo(void) { ok(ret == 4, "got %d\n", ret); ok(!strcmp(buffA, "643"), "got %s\n", buffA); + + /* GEO_ISO_UN_NUMBER should always be zero-padded */ + buffA[0] = 0; + ret = pGetGeoInfoA(27114, GEO_ISO_UN_NUMBER, buffA, 20, 0); + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "009"), "got %s\n", buffA); + + /* We're on Windows 8 or newer. GEO_NATION should fail with LOCATION_BOTH IDs. */ + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NATION, buffA, 20, 0); + ok(ret == 0, "got %d\n", ret); + ok(*buffA == 0, "got %s\n", buffA); + } + + buffA[0] = 0; + ret = pGetGeoInfoA(193, GEO_NAME, buffA, 20, 0); /* LOCATION_NATION */ + if (ret == 0) + win_skip("GEO_NAME not supported.\n"); + else + { + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "PT"), "expected PT, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(39070, GEO_NAME, buffA, 20, 0); /* LOCATION_REGION */ + ok(ret == 4, "expected ret == 4, got %d\n", ret); + ok(!strcmp(buffA, "001"), "expected 001, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NAME, buffA, 20, 0); /* LOCATION_BOTH */ + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "AN"), "expected AN, got %s\n", buffA); + + /* Special areas like Johnston Atoll should have geo name "XX" */ + buffA[0] = 0; + ret = pGetGeoInfoA(127, GEO_NAME, buffA, 20, 0); + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "XX"), "expected XX, got %s\n", buffA); } /* try invalid type value */ -- 2.24.0

2 1

[PATCH v2 3/3] kernel32: Implement SetUserGeoName().
by João Diogo Ferreira 24 Nov '19

24 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Treat with low priority. This actually useful and urgent, rather I mistakingly wrote it for something else and now I might as well make it useful. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 124 +++++++++++++++++++++++++++++------- include/winnls.h | 1 + 3 files changed, 102 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 30b0b1de67..67fdcd0c3b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1471,6 +1471,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6031ddfd64..1f7c9a0eda 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3109,7 +3109,6 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; DWORD count = sizeof(bufferW); - RtlInitUnicodeString(&keyW, nationW); switch (geoclass) { @@ -3139,30 +3138,28 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) } /****************************************************************************** - * SetUserGeoID (KERNEL32.@) - * - * Sets the ID of the user's geographic location. + * set_geo_reg * - * PARAMS - * geoid [I] The geographic ID to be set. + * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). * - * RETURNS - * SUCCESS: TRUE. - * FAILURE: FALSE. GetLastError() will return ERROR_INVALID_PARAMETER if the ID was invalid. + * The return value and last error set here can and should be + * returned to the callers of those two functions. */ -BOOL WINAPI SetUserGeoID(GEOID geoid) +static int WINAPI set_geo_reg(const struct geoinfo_t *geoptr) { - const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW, keyW; - WCHAR bufferW[10]; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR id_fmtW[] = {'%','i',0}; + static const WCHAR un_fmtW[] = {'%','0','3','i',0}; + static const WCHAR xx[] = {'X','X',0}; + UNICODE_STRING keyname, id_valuename, name_valuename; + WCHAR id_buffer[10], name_buffer[4]; OBJECT_ATTRIBUTES attr; HANDLE hkey; - if (!geoinfo) + if (!geoptr) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -3172,16 +3169,11 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) attr.Length = sizeof(attr); attr.RootDirectory = hkey; - attr.ObjectName = &nameW; + attr.ObjectName = &keyname; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString(&nameW, geoW); - - if (geoinfo->kind == LOCATION_NATION) - RtlInitUnicodeString(&keyW, nationW); - else - RtlInitUnicodeString(&keyW, regionW); + RtlInitUnicodeString(&keyname, geoW); if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) { @@ -3189,13 +3181,97 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) return FALSE; } - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + /* Prepare the GeoID */ + sprintfW(id_buffer, id_fmtW, geoptr->id); + + if (geoptr->kind == LOCATION_NATION) + RtlInitUnicodeString(&id_valuename, nationW); + else + RtlInitUnicodeString(&id_valuename, regionW); + + /* Now prepare geoname */ + RtlInitUnicodeString(&name_valuename, nameW); + + if (geoptr->uncode && !strcmpW(xx, geoptr->iso2W)) + sprintfW(name_buffer, un_fmtW, geoptr->uncode); + else + strcpyW(name_buffer, geoptr->iso2W); + + NtSetValueKey(hkey, &id_valuename, 0, REG_SZ, + id_buffer, (strlenW(id_buffer) + 1) * sizeof(WCHAR)); + NtSetValueKey(hkey, &name_valuename, 0, REG_SZ, + name_buffer, (strlenW(name_buffer) + 1) * sizeof(WCHAR)); + + TRACE("Set %s to ID %d; set Name to %s.\n", + wine_dbgstr_w(id_valuename.Buffer), geoptr->id, wine_dbgstr_w(name_buffer)); + NtClose(attr.RootDirectory); NtClose(hkey); return TRUE; } +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * + * Sets the user's geographic location via a GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. GetLastError() will return ERROR_INVALID_PARAMETER if the GeoID was invalid. + * + * NOTES + * On success, the geographic name be set to the location of the specified GeoID. + * + * SEE ALSO + * GetUserGeoID(), EnumSystemGeoID(), GetGeoInfoW(). + */ +BOOL WINAPI SetUserGeoID(GEOID geoid) +{ + TRACE("(%d)\n", geoid); + return set_geo_reg(get_geoinfoptr_by_id(geoid)); +} + +/****************************************************************************** + * SetUserGeoName (KERNEL32.@) + * + * Sets the user's geographic location via a GeoName. + * + * PARAMS + * geoname [I] The name of the location to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: GetLastError() will return ERROR_INVALID_PARAMETER if the name was invalid. + * + * NOTES + * On success, the geographic ID for the relevant class will be set to + * the location of the specified name. + * + * A GeoName is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * The name must be known to Wine, or this function will fail. + * Call EnumSystemGeoNames() to retrieve a list of valid names. + * + * SEE ALSO + * GetUserDefaultGeoName(), EnumSystemGeoNames(), GetGeoInfoEx(). + */ +BOOL WINAPI SetUserGeoName(WCHAR *geoname) +{ + TRACE("(%p = %s)\n", geoname, geoname ? wine_dbgstr_w(geoname) : "(nil)"); + + if (!geoname || !*geoname) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return set_geo_reg(get_geoinfoptr_by_name(geoname)); +} + /****************************************************************************** * get_geo_info * diff --git a/include/winnls.h b/include/winnls.h index 7f5a782815..11ec2f6236 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -966,6 +966,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(WCHAR *); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM); -- 2.24.0

2 1

[PATCH v2 2/3] kernel32: Implement GetGeoInfoEx().
by João Diogo Ferreira 24 Nov '19

24 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Treat with low priority. This actually useful and urgent, rather I mistakingly wrote it for something else and now I might as well make it useful. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 225 ++++++++++++++++++++++++++++------- dlls/kernel32/tests/locale.c | 60 +++++++++- include/winnls.h | 4 +- 4 files changed, 243 insertions(+), 47 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a26d65edf7..30b0b1de67 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -694,6 +694,7 @@ @ stdcall -import GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) +@ stdcall GetGeoInfoEx(wstr long ptr long) @ stdcall GetHandleContext(long) @ stdcall -import GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4a2795cd1c..6031ddfd64 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2993,7 +2993,12 @@ static const struct geoinfo_t geoinfodata[] = { { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; -static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) +/****************************************************************************** +* get_geoinfoptr_by_id +* +* Returns a pointer to the geoinfo struct matching a GeoID. +*/ +static const struct geoinfo_t *get_geoinfoptr_by_id(GEOID geoid) { int min, max; @@ -3018,6 +3023,69 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * get_geoinfoptr_by_type + * + * Returns a pointer to a geoinfo struct by + * matching a string to the specified geotype. + */ + +static inline const struct geoinfo_t *get_geoinfoptr_by_type(GEOTYPE geotype, const WCHAR *wstr) +{ + int i, num; + + if (!wstr || !*wstr) + return NULL; + + switch (geotype) + { + case GEO_ISO2: + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (!(strcmpW(geoinfodata[i].iso2W, wstr))) return &geoinfodata[i]; + break; + case GEO_ISO_UN_NUMBER: + if (!(num = atoiW(wstr))) return NULL; + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (num == geoinfodata[i].uncode) + return &geoinfodata[i]; + break; + } + return NULL; +} + +/****************************************************************************** + * get_geoinfoptr_by_name + * + * Parse a geoname and return a pointer to the matching geoinfo struct. + * This matches all the undocumented rules found in Windows. + */ +static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) +{ + static const WCHAR xx[] = {'X','X',0}; + const struct geoinfo_t *geoptr; + WCHAR buffer[4]; + int i; + + if (!name) + return NULL; + + switch (strlenW(name)) + { + case 2: + if (!strcmpW(name, xx)) + return get_geoinfoptr_by_id(39070); + for (i = 0; i <= 2; i++) + buffer[i] = toupperW(name[i]); + return get_geoinfoptr_by_type(GEO_ISO2, buffer); + case 3: + geoptr = get_geoinfoptr_by_type(GEO_ISO_UN_NUMBER, name); + if (geoptr && !strcmpW(xx, geoptr->iso2W)) + return geoptr; + default: + return NULL; + } +} + /****************************************************************************** * GetUserGeoID (KERNEL32.@) * @@ -3084,7 +3152,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) */ BOOL WINAPI SetUserGeoID(GEOID geoid) { - const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(geoid); + const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(geoid); static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; @@ -3129,38 +3197,15 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) } /****************************************************************************** - * GetGeoInfoW (KERNEL32.@) + * get_geo_info * - * Retrieves information about a geographic location by its GeoID. + * Implements GetGeoInfoW() and GetGeoInfoEx(). * - * PARAMS - * geoid [I] The GeoID of the location of interest. - * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). - * data [O] The output buffer to store the information. - * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. - * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. - * - * RETURNS - * Success: The number of WCHARs (including null) written to the buffer -or- - * if no buffer was provided, the minimum length required to hold the full data. - * Failure: Zero. Call GetLastError() to determine the cause. - * - * NOTES - * On failure, GetLastError() will return one of the following values: - * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. - * - ERROR_INVALID_FLAGS: the specified geotype was invalid. - * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. - * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. - * - * The list of available GeoIDs can be retrieved with EnumSystemGeoID(). - * - * TODO - * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, - * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. + * The return value and last error set here can and should be + * returned to the caller of those two functions. */ -INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) +static int get_geo_info(const struct geoinfo_t *geoptr, GEOTYPE geotype, WCHAR *data, int data_len, LANGID lang) { - const struct geoinfo_t *ptr; WCHAR buffW[12]; const WCHAR *str = buffW; int len; @@ -3168,36 +3213,34 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, static const WCHAR id_fmtW[] = {'%','d',0}; static const WCHAR un_fmtW[] = {'%','0','3','d',0}; - TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - - if (!(ptr = get_geoinfo_dataptr(geoid))) { + if (!geoptr) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } switch (geotype) { case GEO_NATION: - if (ptr->kind != LOCATION_NATION) return 0; + if (geoptr->kind != LOCATION_NATION) return 0; case GEO_ID: - sprintfW(buffW, id_fmtW, ptr->id); + sprintfW(buffW, id_fmtW, geoptr->id); break; case GEO_ISO_UN_NUMBER: - sprintfW(buffW, un_fmtW, ptr->uncode); + sprintfW(buffW, un_fmtW, geoptr->uncode); break; case GEO_PARENT: - sprintfW(buffW, id_fmtW, ptr->parent); + sprintfW(buffW, id_fmtW, geoptr->parent); break; case GEO_ISO2: - str = ptr->iso2W; + str = geoptr->iso2W; break; case GEO_ISO3: - str = ptr->iso3W; + str = geoptr->iso3W; break; case GEO_NAME: - if (ptr->uncode && !strcmpW(xx, ptr->iso2W)) - sprintfW(buffW, un_fmtW, ptr->uncode); + if (geoptr->uncode && !strcmpW(xx, geoptr->iso2W)) + sprintfW(buffW, un_fmtW, geoptr->uncode); else - str = ptr->iso2W; + str = geoptr->iso2W; break; case GEO_RFC1766: case GEO_LCID: @@ -3229,10 +3272,51 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(); or check the + * currently set location with GetUserGeoID(). + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, + * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. + */ +int WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, WCHAR *data, int data_len, LANGID lang) +{ + TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); + return get_geo_info(get_geoinfoptr_by_id(geoid), geotype, data, data_len, lang); +} + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * Narrow character version of GetGeoInfoW(). */ -INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, LANGID lang) +int WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, char *data, int data_len, LANGID lang) { WCHAR *buffW; INT len; @@ -3262,6 +3346,61 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoEx (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoName. + * + * PARAMS + * location [I] GeoName of the location to learn about. + * geotype [I] Type of information to be retrieved (except GEO_LCID, GEO_NATION and GEO_RFC1766). + * data [O] Output buffer to store the information. + * data_len [I] Length of the buffer, measured in WCHARs and including the null terminator. + * + * RETURNS + * Same as GetGeoInfoW(). + * + * NOTES + * A GeoName is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * This function disallows some values of geotype: GEO_LCID, GEO_NATION and GEO_RFC1776. + * For GEO_NATION, use GEO_ID instead; for the other two, call GetGeoInfoW(). + * + * The list of available GeoNames can be retrieved with EnumSystemGeoNames(); or check the + * currently set location with GetUserDefaultGeoName(). + * + * For more notes and unhandled cases, consult GetGeoInfoW(). + */ +int WINAPI GetGeoInfoEx(WCHAR *location, GEOTYPE geotype, WCHAR *data, int data_len) +{ + TRACE("%p=%s %d %p %d\n", + location, location ? wine_dbgstr_w(location) : "null", geotype, data, data_len); + + if (!location || !*location) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + switch (geotype) + { + case GEO_LCID: + case GEO_NATION: + case GEO_RFC1766: + SetLastError(ERROR_INVALID_FLAGS); + return 0; + case GEO_PARENT: + { + const struct geoinfo_t *geoptr = get_geoinfoptr_by_name(location); + const struct geoinfo_t *parent = geoptr ? get_geoinfoptr_by_id(geoptr->parent) : NULL; + return get_geo_info(parent, GEO_NAME, data, data_len, 0); + } + default: + return get_geo_info(get_geoinfoptr_by_name(location), geotype, data, data_len, 0); + } +} + /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b77c3617aa..bb56eeb053 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -72,8 +72,9 @@ static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); -static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); -static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); +static int (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, char *, int, LANGID); +static int (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, WCHAR *, int, LANGID); +static int (WINAPI *pGetGeoInfoEx)(WCHAR *, GEOTYPE, WCHAR *, int); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -114,6 +115,7 @@ static void InitFunctionPointers(void) X(CompareStringEx); X(GetGeoInfoA); X(GetGeoInfoW); + X(GetGeoInfoEx); X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); @@ -4980,6 +4982,60 @@ static void test_GetGeoInfo(void) ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); + + if (pGetGeoInfoEx) + { + WCHAR buffer[10]; + WCHAR pt[] = {'P','T',0}, ptlow[] = {'p','t',0}, parent[] = {'0','3','9',0}, + xx[] = {'X','X',0}, world[] = {'0','0','1',0}, empty[] = {0}; + + /* GEO_PARENT should return the parent in geo name form. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(pt, GEO_PARENT, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, parent), "expected %s, got %s\n", wine_dbgstr_w(parent), wine_dbgstr_w(buffer)); + + /* Lowercase name should work the same. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(ptlow, GEO_PARENT, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, parent), "expected %s, got %s\n", wine_dbgstr_w(parent), wine_dbgstr_w(buffer)); + + /* GeoName XX should map to 001. */ + buffer[0] = 0; + ret = pGetGeoInfoEx(xx, GEO_NAME, buffer, ARRAY_SIZE(buffer)); + ok(ret == 4, "expected 4, got %d\n", ret); + ok(!winetest_strcmpW(buffer, world), "expected %s, got %s\n", wine_dbgstr_w(world), wine_dbgstr_w(buffer)); + + /* Test types disallowed by GetGeoInfoEx. */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_LCID, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_NATION, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_RFC1766, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + /* Test null names */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(empty, GEO_NAME, buffer, ARRAY_SIZE(buffer)), + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ret == 0 (got %d) and error == 87 (got %d)\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(NULL, GEO_NAME, buffer, ARRAY_SIZE(buffer)), + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ret == 0 (got %d) and error == 87 (got %d)\n", ret, GetLastError()); + } + else + win_skip("GetGeoInfoEx not supported.\n"); } static int geoidenum_count; diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..7f5a782815 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -904,8 +904,8 @@ WINBASEAPI INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWST #define GetDateFormat WINELIB_NAME_AW(GetDateFormat) WINBASEAPI BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); WINBASEAPI BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); -WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); -WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); +WINBASEAPI int WINAPI GetGeoInfoA(GEOID,GEOTYPE,char*,int,LANGID); +WINBASEAPI int WINAPI GetGeoInfoW(GEOID,GEOTYPE,WCHAR*,int,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo) WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); -- 2.24.0

2 1

[PATCH v2 1/3] kernel32: Handle GEO_ID and GEO_NAME in GetGeoInfoW(), fix UN format.
by João Diogo Ferreira 24 Nov '19

24 Nov '19

UN codes are always formatted in groups of three digits in Windows. Also added more geotypes to the list of known unhandled cases. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- V2: Don't use compound arguments in function call, and PROPERLY handle GEO_NATION. Supersedes: 173903 --- dlls/kernel32/locale.c | 48 +++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a5ec6593b0..4a2795cd1c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3130,6 +3130,33 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) /****************************************************************************** * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(). + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_NATION, GEO_ISO_UN_NUMBER, + * GEO_ISO2, GEO_ISO3, GEO_PARENT and GEO_NAME. */ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) { @@ -3137,7 +3164,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, WCHAR buffW[12]; const WCHAR *str = buffW; int len; - static const WCHAR fmtW[] = {'%','d',0}; + static const WCHAR xx[] = {'X','X',0}; + static const WCHAR id_fmtW[] = {'%','d',0}; + static const WCHAR un_fmtW[] = {'%','0','3','d',0}; TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); @@ -3148,13 +3177,15 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_NATION: - sprintfW(buffW, fmtW, ptr->id); + if (ptr->kind != LOCATION_NATION) return 0; + case GEO_ID: + sprintfW(buffW, id_fmtW, ptr->id); break; case GEO_ISO_UN_NUMBER: - sprintfW(buffW, fmtW, ptr->uncode); + sprintfW(buffW, un_fmtW, ptr->uncode); break; case GEO_PARENT: - sprintfW(buffW, fmtW, ptr->parent); + sprintfW(buffW, id_fmtW, ptr->parent); break; case GEO_ISO2: str = ptr->iso2W; @@ -3162,6 +3193,12 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, case GEO_ISO3: str = ptr->iso3W; break; + case GEO_NAME: + if (ptr->uncode && !strcmpW(xx, ptr->iso2W)) + sprintfW(buffW, un_fmtW, ptr->uncode); + else + str = ptr->iso2W; + break; case GEO_RFC1766: case GEO_LCID: case GEO_FRIENDLYNAME: @@ -3170,6 +3207,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, case GEO_OFFICIALLANGUAGES: case GEO_LATITUDE: case GEO_LONGITUDE: + case GEO_DIALINGCODE: + case GEO_CURRENCYCODE: + case GEO_CURRENCYSYMBOL: FIXME("type %d is not supported\n", geotype); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0e2c3496a9..b77c3617aa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4892,6 +4892,36 @@ static void test_GetGeoInfo(void) ok(ret == 4, "got %d\n", ret); ok(!strcmp(buffA, "203"), "got %s\n", buffA); + /* GEO_NATION should fail when the location is of type LOCATION_REGION or LOCATION_BOTH */ + buffA[0] = 0; + ret = pGetGeoInfoA(39070, GEO_NATION, buffA, 20, 0); + ok(ret == 0, "got %d\n", ret); + ok(*buffA == 0, "got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NATION, buffA, 20, 0); + ok(ret == 0, "got %d\n", ret); + ok(*buffA == 0, "got %s\n", buffA); + + /* GEO_NATION should return an ID for all location types */ + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_ID, buffA, 20, 0); + if (!ret) + win_skip("GEO_ID not supported.\n"); + else + { + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "203"), "got %s\n", buffA); /* LOCATION_NATION */ + + ret = pGetGeoInfoA(47610, GEO_ID, buffA, 20, 0); /* LOCATION_REGION */ + ok(ret == 6, "got %d\n", ret); + ok(!strcmp(buffA, "47610"), "got %s\n", buffA); + + ret = pGetGeoInfoA(333, GEO_ID, buffA, 20, 0); /* LOCATION_BOTH */ + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "333"), "got %s\n", buffA); + } + /* GEO_PARENT */ buffA[0] = 0; ret = pGetGeoInfoA(203, GEO_PARENT, buffA, 20, 0); @@ -4911,6 +4941,38 @@ static void test_GetGeoInfo(void) { ok(ret == 4, "got %d\n", ret); ok(!strcmp(buffA, "643"), "got %s\n", buffA); + + /* GEO_ISO_UN_NUMBER should always be zero-padded */ + buffA[0] = 0; + ret = pGetGeoInfoA(27114, GEO_ISO_UN_NUMBER, buffA, 20, 0); + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "009"), "got %s\n", buffA); + } + + buffA[0] = 0; + ret = pGetGeoInfoA(193, GEO_NAME, buffA, 20, 0); /* LOCATION_NATION */ + if (ret == 0) + win_skip("GEO_NAME not supported.\n"); + else + { + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "PT"), "expected PT, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(39070, GEO_NAME, buffA, 20, 0); /* LOCATION_REGION */ + ok(ret == 4, "expected ret == 4, got %d\n", ret); + ok(!strcmp(buffA, "001"), "expected 001, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NAME, buffA, 20, 0); /* LOCATION_BOTH */ + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "AN"), "expected AN, got %s\n", buffA); + + /* Special areas like Johnston Atoll should have geo name "XX" */ + buffA[0] = 0; + ret = pGetGeoInfoA(127, GEO_NAME, buffA, 20, 0); + ok(ret == 3, "expected ret == 3, got %d\n", ret); + ok(!strcmp(buffA, "XX"), "expected XX, got %s\n", buffA); } /* try invalid type value */ -- 2.24.0

2 1

[PATCH] kernel32: Implement EnumSystemGeoNames().
by João Diogo Ferreira 24 Nov '19

24 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Treat with low priority. This patch doesn't fix anything anymore, and I'm only posting because I already spent time writing it. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 78 ++++++++++++++++++++++- dlls/kernel32/tests/locale.c | 119 +++++++++++++++++++++++++++++++++++ include/winnls.h | 2 + 4 files changed, 199 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a26d65edf7..07f8c1a93e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -420,6 +420,7 @@ @ stdcall -import EnumSystemCodePagesW(ptr long) @ stdcall -import EnumSystemFirmwareTables(long ptr long) @ stdcall EnumSystemGeoID(long long ptr) +@ stdcall EnumSystemGeoNames(long ptr long) @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall -import EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall -import EnumSystemLocalesA(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a5ec6593b0..3a8dea294a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3244,9 +3244,11 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L * - ERROR_INVALID_PARAMETER: no callback function was provided. * - ERROR_INVALID_FLAGS: the location type was invalid. * + * You can retrieve information about each location with GetGeoInfoW(). + * * TODO * On Windows 10, this function filters out those locations which - * simultaneously lack ISO and UN codes (e.g. Johnson Atoll). + * simultaneously lack ISO and UN codes (e.g. Johnston Atoll). */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { @@ -3284,6 +3286,80 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return TRUE; } +/****************************************************************************** + * EnumSystemGeoNames (KERNEL32.@) + * + * Calls a user's function for every location available on the system. + * + * PARAMS + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h"). + * enumproc [I] Callback function to call for each location (prototype in "winnls.h"). + * data [I] Any user-defined data to be passed to the enumproc callback function. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * The enumproc function returns TRUE to continue enumerating + * or FALSE to interrupt the enumeration. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: no callback function was provided; + * - ERROR_INVALID_FLAGS: the location type was invalid. + * + * You can retrieve information about each location with GetGeoInfoEx(). + */ +BOOL WINAPI EnumSystemGeoNames(GEOCLASS geoclass, GEO_ENUMNAMEPROC enumproc, LONG_PTR data) +{ + int i; + static WCHAR xx[] = {'X','X',0}; + + TRACE("(%d, %p, %ld)\n", geoclass, enumproc, data); + + if (!enumproc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) + { + const struct geoinfo_t *ptr = &geoinfodata[i]; + static const WCHAR un_fmt[] = {'%','0','3','i',0}; + WCHAR name[4]; + + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) + continue; + + /* LOCATION_BOTH counts as region. */ + if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) + continue; + + if (ptr->uncode && !strcmpW(xx, ptr->iso2W)) + sprintfW(name, un_fmt, ptr->uncode); + else + strcpyW(name, ptr->iso2W); + + /* Filter out locations without a geo name */ + if (!strcmpW(name, xx)) + continue; + + if (!enumproc(name, data)) + return TRUE; + } + + /* Windows also enumerates a single XX, which maps to 001 (ID: 39070, World) */ + if (geoclass != GEOCLASS_NATION) + enumproc(xx, data); + return TRUE; +} enum { BASE = 36, diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0e2c3496a9..48f20db981 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -75,6 +75,7 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static BOOL (WINAPI *pEnumSystemGeoNames)(GEOCLASS, GEO_ENUMNAMEPROC, LONG_PTR); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -115,6 +116,7 @@ static void InitFunctionPointers(void) X(GetGeoInfoA); X(GetGeoInfoW); X(EnumSystemGeoID); + X(EnumSystemGeoNames); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); @@ -5000,6 +5002,122 @@ static void test_EnumSystemGeoID(void) } } +static BOOL CALLBACK test_geoname_enumproc_deadbeef(WCHAR *name, LONG_PTR data) +{ + (void)name; + ok(data == 0xdeadbeef, "deadbeef: expected 0xdeadbeef, got 0x%lx", data); + return FALSE; +} + +struct test_enum_geoname_count_types { + unsigned int total, nation, region, both, xx; +}; + +static BOOL CALLBACK test_geoname_enumproc_counts(WCHAR *name, LONG_PTR data) +{ + struct test_enum_geoname_count_types *ptr = (void*)data; + + /* Known names */ + static const WCHAR nation[] = {'A','U',0}, + region[] = {'0','0','1',0}, + both[] = {'A','N',0}, + xx[] = {'X','X',0}; + + if (!ptr) + { + ok((INT_PTR)ptr, "geoname_enumproc_counts: expected some pointer, got %p\n", ptr); + return FALSE; + } + + ptr->total++; + + if (!winetest_strcmpW(name, nation)) + ptr->nation++; + if (!winetest_strcmpW(name, region)) + ptr->region++; + if (!winetest_strcmpW(name, both)) + ptr->both++; + if (!winetest_strcmpW(name, xx)) + ptr->xx++; + + return TRUE; +} + +static BOOL CALLBACK test_geoname_enumproc_dummy(WCHAR *name, LONG_PTR data) +{ + (void)name; + (void)data; + return FALSE; +} + +static void test_EnumSystemGeoNames(void) +{ + struct test_enum_geoname_count_types counts; + unsigned int nations, regions, total; + BOOL ret; + + if (!pEnumSystemGeoNames) + { + win_skip("unsupported platform.\n"); + return; + } + + ok(pEnumSystemGeoNames(GEOCLASS_ALL, test_geoname_enumproc_deadbeef, 0xdeadbeef), + "deadbeef: expected non-zero ret, got otherwise with error=%d.\n", GetLastError()); + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_NATION, test_geoname_enumproc_counts, (LONG_PTR)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation > 0 && counts.region == 0 && counts.xx == 0 && counts.both == 0, + "GEOCLASS_NATION: got total=%u, nation=%u, region=%u, xx=%u, both=%u (expected to find only nations).\n", + counts.total, counts.nation, counts.region, counts.xx, counts.both); + } + else + ok(ret, "GEONAME_NATION: expected non-zero, got otherwise.\n"); + + nations = counts.total; + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_REGION, test_geoname_enumproc_counts, (LONG_PTR)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation == 0 && counts.region > 0 && counts.xx == 1 && counts.both > 0, + "GEOCLASS_REGION: got total=%u, nation=%u, region=%u, xx=%u, both=%u (expected nation==0, region>=1, xx==1, both>=1).\n", + counts.total, counts.nation, counts.region, counts.xx, counts.both); + } + else + ok(ret, "GEONAME_REGION: expected ret != 0, got otherwise.\n"); + + regions = counts.total; + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_ALL, test_geoname_enumproc_counts, (LONG_PTR)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation > 0 && counts.region > 0 && counts.xx > 0 && counts.both > 0, + "GEOCLASS_ALL: got total=%u, nation=%u, region=%u, xx=%u, both=%u (expected at least 1 of each)\n", + counts.total, counts.nation, counts.region, counts.xx, counts.both); + } + else + ok(ret, "GEONAME_ALL: expected ret != 0, got otherwise.\n"); + + total = counts.total; + ok(total == nations + regions, "expected total count to match the amount of nations + regions (%u), got %u instead.\n", + nations + regions, total); + + /* Try invalid values */ + SetLastError(ERROR_SUCCESS); + ret = pEnumSystemGeoNames(GEOCLASS_ALL, NULL, 0xdeadbeef); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "null enumproc: expected ret=0 and error=87, got ret=%d and error=%d\n", ret, GetLastError()); + + SetLastError(ERROR_SUCCESS); + ret = pEnumSystemGeoNames(-1, test_geoname_enumproc_dummy, 0xdeadbeef); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, + "invalid geoclass: expected ret=0 and error=1004, got ret=%d and error=%d\n", ret, GetLastError()); +} + struct invariant_entry { const char *name; int id; @@ -6171,6 +6289,7 @@ START_TEST(locale) test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); + test_EnumSystemGeoNames(); test_invariant(); test_GetSystemPreferredUILanguages(); test_GetThreadPreferredUILanguages(); diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..aab6ec4398 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -760,6 +760,7 @@ typedef BOOL (CALLBACK *DATEFMT_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXA)(LPSTR,CALID); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXW)(LPWSTR,CALID); typedef BOOL (CALLBACK *GEO_ENUMPROC)(GEOID); +typedef BOOL (CALLBACK *GEO_ENUMNAMEPROC)(WCHAR*,LONG_PTR); typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID,LCID,LPSTR,LONG_PTR); typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCW)(LGRPID,LCID,LPWSTR,LONG_PTR); typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LONG_PTR); @@ -866,6 +867,7 @@ WINBASEAPI BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD); #define EnumSystemCodePages WINELIB_NAME_AW(EnumSystemCodePages) WINBASEAPI BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC); +WINBASEAPI BOOL WINAPI EnumSystemGeoNames(GEOCLASS,GEO_ENUMNAMEPROC,LONG_PTR); WINBASEAPI BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD); #define EnumSystemLocales WINELIB_NAME_AW(EnumSystemLocales) -- 2.24.0

2 1

[PATCH 1/2] dssenh: test when input signLen to CPSignHash is not 40.
by Zhang Shuai 24 Nov '19

24 Nov '19

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/dssenh/tests/dssenh.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d16e936a31..f11c854781 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -901,6 +901,14 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); + /* Error 0xEA if input signLen is less than 40 (weird) */ + signLen1 = 39; + result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, signValue1, &signLen1); + ok(!result && GetLastError() == 0xEA, + "Singing hash with signLen set to 39, expecting error code 0xEA," + "got %x\n", GetLastError()); + + signLen1 = 40; result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, signValue1, &signLen1); ok(result, "Failed to sign hash, got %x\n", GetLastError()); @@ -909,6 +917,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen2 == 40, "Expected a 40-byte signature, got %d\n", signLen2); + /* No error if input signLen is not 40 */ + signLen2 = 41; result = CryptSignHashA(hHash2, AT_SIGNATURE, NULL, 0, signValue2, &signLen2); ok(result, "Failed to sign hash2, got %x\n", GetLastError()); -- 2.19.1

1 1

First Patch for a bug
by Thales 23 Nov '19

23 Nov '19

Hello, I sent in a patch file for the first time. Unfortunately, I don't have a way of setting up git to send emails in my current situation, so I sent it as an attachment. I hope that's okay! I wrote a test for the bugzilla listed bug here:https://bugs.winehq.org/show_bug.cgi?id=47489 Regards,...John Alway

2 2

[PATCH 1/2] dssenh: testing when input signLen to CPSignHash is not 40.
by Zhang Shuai 23 Nov '19

23 Nov '19

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/dssenh/tests/dssenh.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d16e936a31..6ebb328b5f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -901,6 +901,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); + /* No error if input signLen is not 40 */ + signLen1 = 39; result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, signValue1, &signLen1); ok(result, "Failed to sign hash, got %x\n", GetLastError()); @@ -909,6 +911,8 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen2 == 40, "Expected a 40-byte signature, got %d\n", signLen2); + /* No error if input signLen is not 40 */ + signLen2 = 41; result = CryptSignHashA(hHash2, AT_SIGNATURE, NULL, 0, signValue2, &signLen2); ok(result, "Failed to sign hash2, got %x\n", GetLastError()); -- 2.19.1

2 3

[PATCH] kernel32: Allow NtQueryDirectoryFile underfilling FileInformation
by Myah Caron 23 Nov '19

23 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47832 Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 14a2d6b33a..c3be67cc3c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -801,7 +801,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } info->data_len = io.Information; - if (!has_wildcard || info->data_len < info->data_size - max_entry_size) + if (!has_wildcard) { if (has_wildcard) /* release unused buffer space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, -- 2.24.0

2 1

[PATCH v3 01/11] vbscript: Move the global lists to the script dispatch object.
by Gabriel Ivăncescu 23 Nov '19

23 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 15 +++++---- dlls/vbscript/interp.c | 39 +++++++++++----------- dlls/vbscript/vbdisp.c | 34 +++++++++++++------ dlls/vbscript/vbscript.c | 70 +++++++++++++--------------------------- dlls/vbscript/vbscript.h | 41 ++++++++++++----------- 5 files changed, 97 insertions(+), 102 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index bc00209..9ddfacf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1758,21 +1758,22 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { + ScriptDisp *obj = script->script_obj; class_desc_t *class; vbscode_t *code; unsigned i; - for(i = 0; i < script->global_vars_cnt; i++) { - if(!wcsicmp(script->global_vars[i]->name, identifier)) + for(i = 0; i < obj->global_vars_cnt; i++) { + if(!wcsicmp(obj->global_vars[i]->name, identifier)) return TRUE; } - for(i = 0; i < script->global_funcs_cnt; i++) { - if(!wcsicmp(script->global_funcs[i]->name, identifier)) + for(i = 0; i < obj->global_funcs_cnt; i++) { + if(!wcsicmp(obj->global_funcs[i]->name, identifier)) return TRUE; } - for(class = script->classes; class; class = class->next) { + for(class = obj->classes; class; class = class->next) { if(!wcsicmp(class->name, identifier)) return TRUE; } @@ -1977,8 +1978,8 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->procs; - script->procs = desc; + desc->next = script->script_obj->procs; + script->script_obj->procs = desc; *ret = desc; return S_OK; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d15a1b5..66ad206 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,7 +94,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } -static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +static BOOL lookup_global_vars(ScriptDisp *script, const WCHAR *name, ref_t *ref) { dynamic_var_t **vars = script->global_vars; size_t i, cnt = script->global_vars_cnt; @@ -112,6 +112,7 @@ static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *r static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { + ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; IDispatch *disp; unsigned i; @@ -175,11 +176,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_global_vars(ctx->script, name, ref)) + if(lookup_global_vars(script_obj, name, ref)) return S_OK; - for(i = 0; i < ctx->script->global_funcs_cnt; i++) { - function_t *func = ctx->script->global_funcs[i]; + for(i = 0; i < script_obj->global_funcs_cnt; i++) { + function_t *func = script_obj->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; @@ -221,12 +222,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT **out_var) { + ScriptDisp *script_obj = ctx->script->script_obj; dynamic_var_t *new_var; heap_pool_t *heap; WCHAR *str; unsigned size; - heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; + heap = ctx->func->type == FUNC_GLOBAL ? &script_obj->heap : &ctx->heap; new_var = heap_pool_alloc(heap, sizeof(*new_var)); if(!new_var) @@ -243,19 +245,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - size_t cnt = ctx->script->global_vars_cnt + 1; - if(cnt > ctx->script->global_vars_size) { + size_t cnt = script_obj->global_vars_cnt + 1; + if(cnt > script_obj->global_vars_size) { dynamic_var_t **new_vars; - if(ctx->script->global_vars) - new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + if(script_obj->global_vars) + new_vars = heap_realloc(script_obj->global_vars, cnt * 2 * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); if(!new_vars) return E_OUTOFMEMORY; - ctx->script->global_vars = new_vars; - ctx->script->global_vars_size = cnt * 2; + script_obj->global_vars = new_vars; + script_obj->global_vars_size = cnt * 2; } - ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; + script_obj->global_vars[script_obj->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; @@ -1113,7 +1115,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } - for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { + for(class_desc = ctx->script->script_obj->classes; class_desc; class_desc = class_desc->next) { if(!wcsicmp(class_desc->name, arg)) break; } @@ -1133,6 +1135,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_dim(exec_ctx_t *ctx) { + ScriptDisp *script_obj = ctx->script->script_obj; const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; const array_desc_t *array_desc; @@ -1146,13 +1149,13 @@ static HRESULT interp_dim(exec_ctx_t *ctx) if(ctx->func->type == FUNC_GLOBAL) { unsigned i; - for(i = 0; i < ctx->script->global_vars_cnt; i++) { - if(!wcsicmp(ctx->script->global_vars[i]->name, ident)) + for(i = 0; i < script_obj->global_vars_cnt; i++) { + if(!wcsicmp(script_obj->global_vars[i]->name, ident)) break; } - assert(i < ctx->script->global_vars_cnt); - v = &ctx->script->global_vars[i]->v; - array_ref = &ctx->script->global_vars[i]->array; + assert(i < script_obj->global_vars_cnt); + v = &script_obj->global_vars[i]->v; + array_ref = &script_obj->global_vars[i]->array; }else { ref_t ref; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 12626e0..06b1211 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -569,11 +569,26 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref); + unsigned i; TRACE("(%p) ref=%d\n", This, ref); if(!ref) { assert(!This->ctx); + + while (This->procs) + { + class_desc_t *class_desc = This->procs; + This->procs = class_desc->next; + heap_free(class_desc); + } + + for (i = 0; i < This->global_vars_cnt; i++) + release_dynamic_var(This->global_vars[i]); + + heap_pool_free(&This->heap); + heap_free(This->global_vars); + heap_free(This->global_funcs); heap_free(This); } @@ -639,15 +654,15 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(i = 0; i < This->ctx->global_vars_cnt; i++) { - if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) { + for(i = 0; i < This->global_vars_cnt; i++) { + if(!wcsicmp(This->global_vars[i]->name, bstrName)) { *pid = i + 1; return S_OK; } } - for(i = 0; i < This->ctx->global_funcs_cnt; i++) { - if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) { + for(i = 0; i < This->global_funcs_cnt; i++) { + if(!wcsicmp(This->global_funcs[i]->name, bstrName)) { *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } @@ -668,14 +683,14 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; - if (id > This->ctx->global_funcs_cnt) + if (id > This->global_funcs_cnt) return DISP_E_MEMBERNOTFOUND; switch (wFlags) { case DISPATCH_METHOD: case DISPATCH_METHOD | DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + hres = exec_script(This->ctx, TRUE, This->global_funcs[id - 1], NULL, pdp, pvarRes); break; default: FIXME("Unsupported flags %x\n", wFlags); @@ -685,16 +700,16 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } - if (id > This->ctx->global_vars_cnt) + if (id > This->global_vars_cnt) return DISP_E_MEMBERNOTFOUND; - if (This->ctx->global_vars[id - 1]->is_const) + if (This->global_vars[id - 1]->is_const) { FIXME("const not supported\n"); return E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); + return invoke_variant_prop(This->ctx, &This->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -768,6 +783,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl; script_disp->ref = 1; script_disp->ctx = ctx; + heap_pool_init(&script_disp->heap); *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index fdade9f..ad7f74b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -82,41 +82,42 @@ static inline BOOL is_started(VBScript *This) static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { + ScriptDisp *obj = ctx->script_obj; function_t *func_iter, **new_funcs; dynamic_var_t *var, **new_vars; size_t cnt, i; - cnt = ctx->global_vars_cnt + code->main_code.var_cnt; - if (cnt > ctx->global_vars_size) + cnt = obj->global_vars_cnt + code->main_code.var_cnt; + if (cnt > obj->global_vars_size) { - if (ctx->global_vars) - new_vars = heap_realloc(ctx->global_vars, cnt * sizeof(*new_vars)); + if (obj->global_vars) + new_vars = heap_realloc(obj->global_vars, cnt * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * sizeof(*new_vars)); if (!new_vars) return E_OUTOFMEMORY; - ctx->global_vars = new_vars; - ctx->global_vars_size = cnt; + obj->global_vars = new_vars; + obj->global_vars_size = cnt; } - cnt = ctx->global_funcs_cnt; + cnt = obj->global_funcs_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) cnt++; - if (cnt > ctx->global_funcs_size) + if (cnt > obj->global_funcs_size) { - if (ctx->global_funcs) - new_funcs = heap_realloc(ctx->global_funcs, cnt * sizeof(*new_funcs)); + if (obj->global_funcs) + new_funcs = heap_realloc(obj->global_funcs, cnt * sizeof(*new_funcs)); else new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); if (!new_funcs) return E_OUTOFMEMORY; - ctx->global_funcs = new_funcs; - ctx->global_funcs_size = cnt; + obj->global_funcs = new_funcs; + obj->global_funcs_size = cnt; } for (i = 0; i < code->main_code.var_cnt; i++) { - if (!(var = heap_pool_alloc(&ctx->heap, sizeof(*var)))) + if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var)))) return E_OUTOFMEMORY; var->name = code->main_code.vars[i].name; @@ -124,24 +125,24 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res var->is_const = FALSE; var->array = NULL; - ctx->global_vars[ctx->global_vars_cnt + i] = var; + obj->global_vars[obj->global_vars_cnt + i] = var; } - ctx->global_vars_cnt += code->main_code.var_cnt; + obj->global_vars_cnt += code->main_code.var_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) { - for (i = 0; i < ctx->global_funcs_cnt; i++) + for (i = 0; i < obj->global_funcs_cnt; i++) { - if (!wcsicmp(ctx->global_funcs[i]->name, func_iter->name)) + if (!wcsicmp(obj->global_funcs[i]->name, func_iter->name)) { /* global function already exists, replace it */ - ctx->global_funcs[i] = func_iter; + obj->global_funcs[i] = func_iter; break; } } - if (i == ctx->global_funcs_cnt) - ctx->global_funcs[ctx->global_funcs_cnt++] = func_iter; + if (i == obj->global_funcs_cnt) + obj->global_funcs[obj->global_funcs_cnt++] = func_iter; } if (code->classes) @@ -156,8 +157,8 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res class = class->next; } - class->next = ctx->classes; - ctx->classes = code->classes; + class->next = obj->classes; + obj->classes = code->classes; code->last_class = class; } @@ -210,24 +211,10 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { vbscode_t *code, *code_next; - class_desc_t *class_desc; - unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - for(i = 0; i < ctx->global_vars_cnt; i++) - release_dynamic_var(ctx->global_vars[i]); - - heap_free(ctx->global_vars); - heap_free(ctx->global_funcs); - ctx->global_vars = NULL; - ctx->global_vars_cnt = 0; - ctx->global_vars_size = 0; - ctx->global_funcs = NULL; - ctx->global_funcs_cnt = 0; - ctx->global_funcs_size = 0; - LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry) { if(code->is_persistent) @@ -249,13 +236,6 @@ static void release_script(script_ctx_t *ctx) heap_free(iter); } - while(ctx->procs) { - class_desc = ctx->procs; - ctx->procs = class_desc->next; - - heap_free(class_desc); - } - if(ctx->host_global) { IDispatch_Release(ctx->host_global); ctx->host_global = NULL; @@ -278,9 +258,6 @@ static void release_script(script_ctx_t *ctx) script_obj->ctx = NULL; IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - - heap_pool_free(&ctx->heap); - heap_pool_init(&ctx->heap); } static void release_code_list(script_ctx_t *ctx) @@ -1054,7 +1031,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU } ctx->safeopt = INTERFACE_USES_DISPEX; - heap_pool_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1cc36fd..f4e7bc7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -120,11 +120,31 @@ struct _vbdisp_t { VARIANT props[1]; }; +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; + BOOL is_const; + SAFEARRAY *array; +} dynamic_var_t; + typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + + class_desc_t *classes; + class_desc_t *procs; + script_ctx_t *ctx; + heap_pool_t heap; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t; @@ -158,14 +178,6 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) return dp->rgvarg + dp->cArgs-i-1; } -typedef struct _dynamic_var_t { - struct _dynamic_var_t *next; - VARIANT v; - const WCHAR *name; - BOOL is_const; - SAFEARRAY *array; -} dynamic_var_t; - struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -182,19 +194,6 @@ struct _script_ctx_t { EXCEPINFO ei; - dynamic_var_t **global_vars; - size_t global_vars_cnt; - size_t global_vars_size; - - function_t **global_funcs; - size_t global_funcs_cnt; - size_t global_funcs_size; - - class_desc_t *classes; - class_desc_t *procs; - - heap_pool_t heap; - struct list objects; struct list code_list; struct list named_items; -- 2.21.0

2 13

[PATCH] kernel32: Allow NtQueryDirectoryFile underfilling FileInformation
by qs niyg 23 Nov '19

23 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47832 Signed-Off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 14a2d6b33a..c3be67cc3c 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -801,7 +801,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } info->data_len = io.Information; - if (!has_wildcard || info->data_len < info->data_size - max_entry_size) + if (!has_wildcard) { if (has_wildcard) /* release unused buffer space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, -- 2.24.0

2 1

[PATCH v2] tapi32: Add error checks for lineInitialize
by Vijay Kiran Kamuju 23 Nov '19

23 Nov '19

v2: Fix a typo Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 4 ++++ dlls/tapi32/tests/tapi.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..a978e8e69321 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1165,6 +1165,10 @@ DWORD WINAPI lineInitialize( { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphLineApp, hInstance, lpfnCallback, debugstr_a(lpszAppName), lpdwNumDevs); + + if (!lphLineApp || !hInstance || !lpfnCallback || !lpdwNumDevs) + return LINEERR_INVALPOINTER; + return 0; } diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d49..e6fcc96b1853 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,16 +35,16 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); ok(!ret, "unexpected return value, got %u.\n", ret); -- 2.21.0

1 0

[PATCH] tapi32: Add error checks for lineInitialize
by Vijay Kiran Kamuju 23 Nov '19

23 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 4 ++++ dlls/tapi32/tests/tapi.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..a978e8e69321 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1165,6 +1165,10 @@ DWORD WINAPI lineInitialize( { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphLineApp, hInstance, lpfnCallback, debugstr_a(lpszAppName), lpdwNumDevs); + + if (!lphLineApp || !hInstance || !lpfnCallback || !lpdwNumDevs) + return LINERR_INVALPOINTER; + return 0; } diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d49..e6fcc96b1853 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,16 +35,16 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); ok(!ret, "unexpected return value, got %u.\n", ret); -- 2.21.0

2 1

[PATCH 1/5] strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback.
by Zebediah Figura 23 Nov '19

23 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 6 +++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/enumpins.c | 10 ++++------ dlls/strmbase/filter.c | 14 +++----------- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/wineqtdecoder/qtsplitter.c | 10 +++++----- include/wine/strmbase.h | 2 +- 17 files changed, 45 insertions(+), 55 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 6446ee6b4e..0262bc5bd8 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -67,7 +67,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin *audio_record_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *audio_record_get_pin(struct strmbase_filter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 1cbeb70f03..2e81a6b0c4 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -178,14 +178,14 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_QueryVendorInfo, }; -static IPin *avi_compressor_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *avi_compressor_get_pin(struct strmbase_filter *iface, unsigned int index) { AVICompressor *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 51a1a503af..1995358ac2 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -113,14 +113,14 @@ static inline AviMux* impl_from_strmbase_filter(struct strmbase_filter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin *avi_mux_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *avi_mux_get_pin(struct strmbase_filter *iface, unsigned int index) { AviMux *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; else if (index <= filter->input_pin_no) - return &filter->in[index - 1]->pin.pin.IPin_iface; + return &filter->in[index - 1]->pin.pin; return NULL; } diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index e3740bed13..fd0dd621e3 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -69,16 +69,16 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin *smart_tee_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *smart_tee_get_pin(struct strmbase_filter *iface, unsigned int index) { SmartTeeFilter *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->capture.pin.IPin_iface; + return &filter->capture.pin; else if (index == 2) - return &filter->preview.pin.IPin_iface; + return &filter->preview.pin; return NULL; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 0be0914836..883aade2dc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -82,14 +82,14 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); } -static IPin *vfw_capture_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *vfw_capture_get_pin(struct strmbase_filter *iface, unsigned int index) { VfwCapture *This = impl_from_strmbase_filter(iface); if (index >= 1) return NULL; - return &This->source.pin.IPin_iface; + return &This->source.pin; } static void vfw_capture_destroy(struct strmbase_filter *iface) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 59238f5896..9dd8c02b23 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -100,14 +100,14 @@ static void SampleGrabber_cleanup(SG_Impl *This) IUnknown_Release(This->seekthru_unk); } -static IPin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int index) { SG_Impl *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 59f1cc5a18..1c17980f58 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -341,12 +341,12 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID return FALSE; } -static IPin *async_reader_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *async_reader_get_pin(struct strmbase_filter *iface, unsigned int index) { AsyncReader *filter = impl_from_strmbase_filter(iface); if (!index && filter->pszFileName) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 046d94b0b8..8ff7917a7b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -519,11 +519,11 @@ static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *if return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_BaseFilter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 568d74a26a..01d9ad10fa 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -879,11 +879,11 @@ static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filte return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c5a455afb2..9379fa11e4 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -883,11 +883,11 @@ static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filte return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 5175158e96..1cfea85b0c 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -42,7 +42,6 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out) { IEnumPinsImpl *object; - IPin *pin; if (!out) return E_POINTER; @@ -59,7 +58,7 @@ HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out) IBaseFilter_AddRef(&base->IBaseFilter_iface); object->Version = base->pin_version; - while ((pin = base->ops->filter_get_pin(base, object->count))) + while (base->ops->filter_get_pin(base, object->count)) ++object->count; TRACE("Created enumerator %p.\n", object); @@ -137,12 +136,12 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** for (i = 0; i < cPins; ++i) { - IPin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i); + struct strmbase_pin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i); if (!pin) break; - IPin_AddRef(ppPins[i] = pin); + IPin_AddRef(ppPins[i] = &pin->IPin_iface); } if (pcFetched) @@ -173,14 +172,13 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - IPin *pin; TRACE("iface %p.\n", iface); if (enum_pins->Version != enum_pins->base->pin_version) { enum_pins->count = 0; - while ((pin = enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count))) + while (enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count)) ++enum_pins->count; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index ffe506d517..60e3823322 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -250,24 +250,16 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_pin *pin; unsigned int i; - PIN_INFO info; - HRESULT hr; - IPin *pin; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i) { - hr = IPin_QueryPinInfo(pin, &info); - if (FAILED(hr)) - return hr; - - if (info.pFilter) IBaseFilter_Release(info.pFilter); - - if (!lstrcmpW(id, info.achName)) + if (!lstrcmpW(id, pin->name)) { - IPin_AddRef(*ret = pin); + IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; } } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index aa134ba5da..add999b4ec 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -163,12 +163,12 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin *renderer_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *renderer_get_pin(struct strmbase_filter *iface, unsigned int index) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; return NULL; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 12a99eef67..e7d4d66164 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -114,14 +114,14 @@ static HRESULT source_get_media_type(struct strmbase_pin *This, unsigned int iPo return S_OK; } -static IPin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) { TransformFilter *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 394b919df9..479077b48f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1203,14 +1203,14 @@ static inline struct gstdemux_source *impl_from_IMediaSeeking(IMediaSeeking *ifa return CONTAINING_RECORD(iface, struct gstdemux_source, seek.IMediaSeeking_iface); } -static IPin *gstdemux_get_pin(struct strmbase_filter *base, unsigned int index) +static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsigned int index) { struct gstdemux *filter = impl_from_strmbase_filter(base); if (!index) - return &filter->sink.IPin_iface; + return &filter->sink; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin.IPin_iface; + return &filter->ppPins[index - 1]->pin.pin; return NULL; } diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2da0f691dc..fbec10a912 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -208,21 +208,21 @@ static inline QTInPin *impl_from_IPin(IPin *iface) * Base Filter */ -static IPin *qt_splitter_get_pin(struct strmbase_filter *base, unsigned int index) +static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, unsigned int index) { QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin.IPin_iface; + return &filter->pInputPin.pin; else if (index == 1) { if (filter->pVideo_Pin) - return &filter->pVideo_Pin->pin.pin.IPin_iface; + return &filter->pVideo_Pin->pin.pin; else if (filter->pAudio_Pin) - return &filter->pAudio_Pin->pin.pin.IPin_iface; + return &filter->pAudio_Pin->pin.pin; } else if (index == 2 && filter->pVideo_Pin && filter->pAudio_Pin) - return &filter->pAudio_Pin->pin.pin.IPin_iface; + return &filter->pAudio_Pin->pin.pin; return NULL; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index fd79e9726d..dd2f8426bf 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -166,7 +166,7 @@ struct strmbase_filter struct strmbase_filter_ops { - IPin *(*filter_get_pin)(struct strmbase_filter *iface, unsigned int index); + struct strmbase_pin *(*filter_get_pin)(struct strmbase_filter *iface, unsigned int index); void (*filter_destroy)(struct strmbase_filter *iface); HRESULT (*filter_query_interface)(struct strmbase_filter *iface, REFIID iid, void **out); -- 2.24.0

1 4

[PATCH] rasapi32: Add a few error checks in for RasGetErrorStringA and tests
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

Supercedes 174337 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/rasapi32/rasapi.c | 14 ++++++++++++-- dlls/rasapi32/tests/rasapi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133e..6f0dfaa06b33 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -458,14 +458,24 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetProjectionInfoA(HRASCONN hrasconn, RASPROJECTION rasprojection, diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 5171bb2762ca..d0850b8055af 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -28,6 +28,7 @@ static HMODULE hmodule; static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); +static DWORD (WINAPI *pRasGetErrorStringA)(UINT, LPSTR, DWORD); #define RASAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hmodule, #func); \ @@ -39,6 +40,7 @@ static void InitFunctionPtrs(void) hmodule = LoadLibraryA("rasapi32.dll"); RASAPI32_GET_PROC(RasEnumDevicesA) + RASAPI32_GET_PROC(RasGetErrorStringA) } static void test_rasenum(void) @@ -176,11 +178,44 @@ static void test_rasenum(void) HeapFree(GetProcessHeap(), 0, rasDevInfo); } +static void test_rasgeterrorstring(void) +{ + DWORD result; + UINT errcode; + CHAR buffer[512]; + + errcode = 87; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, NULL, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 10); + todo_wine ok(result == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 256); + todo_wine ok(result == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", result); + + errcode = 999; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); +} + START_TEST(rasapi) { InitFunctionPtrs(); test_rasenum(); + test_rasgeterrorstring(); FreeLibrary(hmodule); } -- 2.21.0

1 0

[PATCH] include: fix definition of PHONECALLBACK in tapi.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/tapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tapi.h b/include/tapi.h index 535ca67a4295..b87b139ddaaa 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -879,7 +879,7 @@ typedef struct phonestatus_tag { DWORD dwDevSpecificOffset; } PHONESTATUS, *LPPHONESTATUS; -typedef void (CALLBACK *PHONECALLBACK)(HANDLE, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *PHONECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct varstring_tag { DWORD dwTotalSize; -- 2.21.0

1 0

[PATCH] rasapi32: Add tests for RasGetErrorStringA
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/rasapi32/rasapi.c | 14 ++++++++++++-- dlls/rasapi32/tests/rasapi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133e..6f0dfaa06b33 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -458,14 +458,24 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetProjectionInfoA(HRASCONN hrasconn, RASPROJECTION rasprojection, diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 5171bb2762ca..d0850b8055af 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -28,6 +28,7 @@ static HMODULE hmodule; static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); +static DWORD (WINAPI *pRasGetErrorStringA)(UINT, LPSTR, DWORD); #define RASAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hmodule, #func); \ @@ -39,6 +40,7 @@ static void InitFunctionPtrs(void) hmodule = LoadLibraryA("rasapi32.dll"); RASAPI32_GET_PROC(RasEnumDevicesA) + RASAPI32_GET_PROC(RasGetErrorStringA) } static void test_rasenum(void) @@ -176,11 +178,44 @@ static void test_rasenum(void) HeapFree(GetProcessHeap(), 0, rasDevInfo); } +static void test_rasgeterrorstring(void) +{ + DWORD result; + UINT errcode; + CHAR buffer[512]; + + errcode = 87; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, NULL, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 10); + todo_wine ok(result == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 256); + todo_wine ok(result == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", result); + + errcode = 999; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); +} + START_TEST(rasapi) { InitFunctionPtrs(); test_rasenum(); + test_rasgeterrorstring(); FreeLibrary(hmodule); } -- 2.21.0

1 0

[PATCH] quartz/tests: Relax some more timings.
by Zebediah Figura 22 Nov '19

22 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4b233dbcff..ca4503117a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3163,7 +3163,7 @@ todo_wine check_filter_state(graph, State_Paused); Sleep(600); - start_time += 600 * 10000; + start_time += 550 * 10000; hr = IMediaFilter_Run(filter, 0); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3929,12 +3929,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3947,12 +3947,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); -- 2.24.0

2 1

[PATCH v2] quartz/tests: Fix some tests on w7u.
by Zebediah Figura 22 Nov '19

22 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 22ddb63746..568d74a26a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1350,6 +1350,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); -- 2.24.0

1 0

[PATCH] dmloader: Stop after find first matching object.
by Alistair Leslie-Hughes 22 Nov '19

22 Nov '19

This stops a crash in Legoland on startup when finding cached objects. Placing a break in each of the if's causes the wrong object to be loaded. The help states it looks at each type in order. So, we might have to loop the cache multiple times to ensure that when an object has flag DMUS_OBJ_OBJECT, it's preferred over a DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH match. I hope this simple change will be accepted until a proper solution is implemented. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0da8323e7e5..69a438765d5 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,6 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } + break; } else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && -- 2.24.0

2 1

[PATCH] quartz/tests: Fix some tests on w7u.
by Zebediah Figura 22 Nov '19

22 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 29a4bea781..dd2e9ace97 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1307,6 +1307,9 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, HRESULT hr; LONG size; + /* Note that the bitmap returned by GetCurrentImage() has a bit depth of + * 32 regardless of the format used for pin connection. */ + expect_bih.biBitCount = 32; expect_bih.biSizeImage = 32 * 16 * 4; IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); @@ -1450,6 +1453,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); -- 2.24.0

2 1

[PATCH] d3dcompiler_43/tests: Fix tracing the expected Stream value in reflection ok() calls.
by Francois Gouget 22 Nov '19

22 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dcompiler_43/tests/reflection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 810eac89364..f8c97230d61 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -434,7 +434,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -459,7 +459,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -741,7 +741,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -772,7 +772,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1009,7 +1009,7 @@ static void test_reflection_desc_ps_output(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count); -- 2.20.1

1 0

[PATCH v4] include: update definitions in ras.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

v4: define WS macro for error free compilation v3: fix definitions of in_addr and in6_addr v2: fix build errors Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/ras.h | 343 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 48 deletions(-) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6db..afaacaed6e3b 100644 --- a/include/ras.h +++ b/include/ras.h @@ -1,5 +1,6 @@ /* * Copyright (C) 1998 Marcus Meissner + * Copyright (C) 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,16 +29,29 @@ extern "C" { #include <inaddr.h> #include <in6addr.h> +typedef enum RASAPIVERSION +{ + RASAPIVERSION_500 = 1, + RASAPIVERSION_501, + RASAPIVERSION_600, + RASAPIVERSION_601, +} RASAPIVERSION; + +#define RASAPIVERSION_CURRENT RASAPIVERSION_601 + #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 #define RAS_MaxDeviceType 16 #define RAS_MaxEntryName 256 #define RAS_MaxPhoneNumber 128 +#define RAS_MaxIpAddress 15 +#define RAS_MaxIpxAddress 21 #define RAS_MaxAreaCode 10 #define RAS_MaxPadType 32 #define RAS_MaxX25Address 200 #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 +#define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ @@ -75,6 +89,31 @@ DECL_WINELIB_TYPE_AW(LPRASDEVINFO) DECLARE_HANDLE(HRASCONN); typedef HRASCONN* LPHRASCONN; +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 +#define RASCF_OwnerKnown 0x00000004 +#define RASCF_OwnerMatch 0x00000008 + +#define RASCF_IsOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown|RASCF_OwnerMatch)) +#define RASCF_IsNotOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown)) + +#define RDEOPT_UsePrefixSuffix 0x00000001 +#define RDEOPT_PausedStates 0x00000002 +#define RDEOPT_IgnoreModemSpeaker 0x00000004 +#define RDEOPT_SetModemSpeaker 0x00000008 +#define RDEOPT_IgnoreSoftwareCompression 0x00000010 +#define RDEOPT_SetSoftwareCompression 0x00000020 +#define RDEOPT_DisableConnectedUI 0x00000040 +#define RDEOPT_DisableReconnectUI 0x00000080 +#define RDEOPT_DisableReconnect 0x00000100 +#define RDEOPT_NoUser 0x00000200 +#define RDEOPT_PauseOnScript 0x00000400 +#define RDEOPT_Router 0x00000800 +#define RDEOPT_CustomDial 0x00001000 +#define RDEOPT_UseCustomScripting 0x00002000 +#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000 +#define RDEOPT_EapInfoCryptInCapable 0x00008000 + typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hRasConn; @@ -106,14 +145,20 @@ typedef struct tagRASCONNW { DECL_WINELIB_TYPE_AW(RASCONN) DECL_WINELIB_TYPE_AW(LPRASCONN) +#define REN_User 0x00000000 +#define REN_AllUsers 0x00000001 typedef struct tagRASENTRYNAMEA { DWORD dwSize; CHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + CHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEA, *LPRASENTRYNAMEA; typedef struct tagRASENTRYNAMEW { DWORD dwSize; WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + WCHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEW, *LPRASENTRYNAMEW; DECL_WINELIB_TYPE_AW(RASENTRYNAME) @@ -129,6 +174,8 @@ typedef struct tagRASDIALPARAMSA { CHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPSTR szEncPassword; } RASDIALPARAMSA, *LPRASDIALPARAMSA; typedef struct tagRASDIALPARAMSW { @@ -141,31 +188,131 @@ typedef struct tagRASDIALPARAMSW { WCHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPWSTR szEncPassword; } RASDIALPARAMSW, *LPRASDIALPARAMSW; DECL_WINELIB_TYPE_AW(RASDIALPARAMS) DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS) typedef struct tagRASIPADDR { - BYTE classA,classB,classC,classD; + BYTE classA,classB,classC,classD; } RASIPADDR; -#define RASEO_UseCountryAndAreaCodes 0x0001 -#define RASEO_SpecificIpAddr 0x0002 -#define RASEO_SpecificNameServers 0x0004 -#define RASEO_IpHeaderCompression 0x0008 -#define RASEO_RemoteDefaultGateway 0x0010 -#define RASEO_DisableLcpExtensions 0x0020 -#define RASEO_TerminalBeforeDial 0x0040 -#define RASEO_TerminalAfterDial 0x0080 -#define RASEO_ModemLights 0x0100 -#define RASEO_SwCompression 0x0200 -#define RASEO_RequireEncryptedPw 0x0400 -#define RASEO_RequireMsEncryptedPw 0x0800 -#define RASEO_RequireDataEncryption 0x1000 -#define RASEO_NetworkLogon 0x2000 -#define RASEO_UseLogonCredentials 0x4000 -#define RASEO_PromoteAlternates 0x8000 +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + +typedef struct WS(in6_addr) RASIPV6ADDR; +typedef struct WS(in_addr) RASIPV4ADDR; + +#undef WS + +#define RASEO_UseCountryAndAreaCodes 0x00000001 +#define RASEO_SpecificIpAddr 0x00000002 +#define RASEO_SpecificNameServers 0x00000004 +#define RASEO_IpHeaderCompression 0x00000008 +#define RASEO_RemoteDefaultGateway 0x00000010 +#define RASEO_DisableLcpExtensions 0x00000020 +#define RASEO_TerminalBeforeDial 0x00000040 +#define RASEO_TerminalAfterDial 0x00000080 +#define RASEO_ModemLights 0x00000100 +#define RASEO_SwCompression 0x00000200 +#define RASEO_RequireEncryptedPw 0x00000400 +#define RASEO_RequireMsEncryptedPw 0x00000800 +#define RASEO_RequireDataEncryption 0x00001000 +#define RASEO_NetworkLogon 0x00002000 +#define RASEO_UseLogonCredentials 0x00004000 +#define RASEO_PromoteAlternates 0x00008000 +#define RASEO_SecureLocalFiles 0x00010000 +#define RASEO_RequireEAP 0x00020000 +#define RASEO_RequirePAP 0x00040000 +#define RASEO_RequireSPAP 0x00080000 +#define RASEO_Custom 0x00100000 +#define RASEO_PreviewPhoneNumber 0x00200000 +#define RASEO_SharedPhoneNumbers 0x00800000 +#define RASEO_PreviewUserPw 0x01000000 +#define RASEO_PreviewDomain 0x02000000 +#define RASEO_ShowDialingProgress 0x04000000 +#define RASEO_RequireCHAP 0x08000000 +#define RASEO_RequireMsCHAP 0x10000000 +#define RASEO_RequireMsCHAP2 0x20000000 +#define RASEO_RequireW95MSCHAP 0x40000000 +#define RASEO_CustomScript 0x80000000 + +#define RASNP_NetBEUI 0x00000001 +#define RASNP_Ipx 0x00000002 +#define RASNP_Ip 0x00000004 +#define RASNP_Ipv6 0x00000008 + +#define RASFP_Ppp 0x00000001 +#define RASFP_Slip 0x00000002 +#define RASFP_Ras 0x00000004 + +#define RASEDM_DialAll 1 +#define RASEDM_DialAsNeeded 2 + +#define RASIDS_Disabled 0xffffffff +#define RASIDS_UseGlobalValue 0 + +#define RASET_Phone 1 +#define RASET_Vpn 2 +#define RASET_Direct 3 +#define RASET_Internet 4 +#define RASET_Broadband 5 + +#define ET_None 0 +#define ET_Require 1 +#define ET_RequireMax 2 +#define ET_Optional 3 + +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 +#define VS_SstpOnly 5 +#define VS_SstpFirst 6 +#define VS_Ikev2Only 7 +#define VS_Ikev2First 8 +#define VS_GREOnly 9 +#define VS_PptpSstp 12 +#define VS_L2tpSstp 13 +#define VS_Ikev2Sstp 14 + +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#define RASEO2_SecureRoutingCompartment 0x00000400 +#define RASEO2_UseTypicalSettings 0x00000800 +#define RASEO2_IPv6SpecificNameServers 0x00001000 +#define RASEO2_IPv6RemoteDefaultGateway 0x00002000 +#define RASEO2_RegisterIpWithDNS 0x00004000 +#define RASEO2_UseDNSSuffixForRegistration 0x00008000 +#define RASEO2_IPv4ExplicitMetric 0x00010000 +#define RASEO2_IPv6ExplicitMetric 0x00020000 +#define RASEO2_DisableIKENameEkuCheck 0x00040000 +#define RASEO2_DisableClassBasedStaticRoute 0x00080000 +#define RASEO2_SpecificIPv6Addr 0x00100000 +#define RASEO2_DisableMobility 0x00200000 +#define RASEO2_RequireMachineCertificates 0x00400000 +#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000 +#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000 +#define RASEO2_CacheCredentials 0x02000000 +#define RASEO2_AutoTriggerCapable 0x04000000 +#define RASEO2_IsThirdPartyProfile 0x08000000 +#define RASEO2_AuthTypeIsOtp 0x10000000 +#define RASEO2_IsAlwaysOn 0x20000000 +#define RASEO2_IsPrivateNetwork 0x40000000 typedef struct tagRASENTRYA { DWORD dwSize; DWORD dwfOptions; @@ -238,6 +385,15 @@ typedef struct tagRASENTRYA { CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYA, *LPRASENTRYA; typedef struct tagRASENTRYW { @@ -312,45 +468,84 @@ typedef struct tagRASENTRYW { WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYW, *LPRASENTRYW; DECL_WINELIB_TYPE_AW(RASENTRY) +#define RASTUNNELENDPOINT_UNKNOWN 0 +#define RASTUNNELENDPOINT_IPv4 1 +#define RASTUNNELENDPOINT_IPv6 2 +typedef struct tagRASTUNNELENDPOINT +{ + DWORD dwType; + union { + RASIPV4ADDR ipv4; + RASIPV6ADDR ipv6; + } DUMMYUNIONNAME; +} RASTUNNELENDPOINT; + #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 typedef enum tagRASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - RASCS_SubEntryConnected, - RASCS_SubEntryDisconnected, - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE, *LPRASCONNSTATE; + RASCS_OpenPort = 0, + RASCS_PortOpened, + RASCS_ConnectDevice, + RASCS_DeviceConnected, + RASCS_AllDevicesConnected, + RASCS_Authenticate, + RASCS_AuthNotify, + RASCS_AuthRetry, + RASCS_AuthCallback, + RASCS_AuthChangePassword, + RASCS_AuthProject, + RASCS_AuthLinkSpeed, + RASCS_AuthAck, + RASCS_ReAuthenticate, + RASCS_Authenticated, + RASCS_PrepareForCallback, + RASCS_WaitForModemReset, + RASCS_WaitForCallback, + RASCS_Projected, + RASCS_StartAuthentication, + RASCS_CallbackComplete, + RASCS_LogonNetwork, + RASCS_SubEntryConnected, + RASCS_SubEntryDisconnected, + RASCS_ApplySettings, + RASCS_Interactive = RASCS_PAUSED, + RASCS_RetryAuthentication, + RASCS_CallbackSetByCaller, + RASCS_PasswordExpired, + RASCS_InvokeEapUI, + RASCS_Connected = RASCS_DONE, + RASCS_Disconnected +} RASCONNSTATE, *LPRASCONNSTATE; + +#define RASDIALEVENT "RasDialEvent" +#define WM_RASDIALEVENT 0xCCCD + +typedef VOID (WINAPI *RASDIALFUNC)(UINT, RASCONNSTATE, DWORD); +typedef VOID (WINAPI *RASDIALFUNC1)(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI *RASDIALFUNC2)(ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); + +#define RASCSS_DONE 0x2000 +typedef enum tagRASCONNSUBSTATE +{ + RASCSS_None = 0, + RASCSS_Dormant, + RASCSS_Reconnecting, + RASCSS_Reconnected = RASCSS_DONE, +} RASCONNSUBSTATE, *LPRASCONNSUBSTATE; typedef struct tagRASCONNSTATUSA { @@ -359,6 +554,10 @@ typedef struct tagRASCONNSTATUSA DWORD dwError; CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; + CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSA, *LPRASCONNSTATUSA; typedef struct tagRASCONNSTATUSW @@ -368,6 +567,10 @@ typedef struct tagRASCONNSTATUSW DWORD dwError; WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; + WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSW, *LPRASCONNSTATUSW; DECL_WINELIB_TYPE_AW(RASCONNSTATUS) @@ -378,7 +581,9 @@ typedef enum tagRASPROJECTION RASP_PppNbf = 0x803F, RASP_PppIpx = 0x802B, RASP_PppIp = 0x8021, + RASP_PppCcp = 0x80FD, RASP_PppLcp = 0xC021, + RASP_PppIpv6 = 0x8057, RASP_Slip = 0x20000 } RASPROJECTION, *LPRASPROJECTION; @@ -402,12 +607,28 @@ typedef struct tagRASSUBENTRYW DWORD dwAlternateOffset; } RASSUBENTRYW, *LPRASSUBENTRYW; +typedef struct tagRASEAPINFO +{ + DWORD dwSizeofEapInfo; + BYTE *pbEapInfo; +} RASEAPINFO; + +typedef struct tagRASDEVSPECIFICINFO +{ + DWORD dwSize; + BYTE *pbDevSpecificInfo; +} RASDEVSPECIFICINFO, *PRASDEVSPECIFICINFO; + typedef struct tagRASDIALEXTENSIONS { DWORD dwSize; DWORD dwfOptions; HWND hwndParent; ULONG_PTR reserved; + ULONG_PTR reserved1; + RASEAPINFO RasEapInfo; + BOOL fSkipPppAuth; + RASDEVSPECIFICINFO RasDevSpecificInfo; } RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS; typedef struct tagRASAUTODIALENTRYA @@ -426,6 +647,32 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +#define RASADFLG_PositionDlg 0x00000001 +typedef struct tagRASADPARAMS +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; +} RASADPARAMS, *LPRASADPARAMS; + +typedef BOOL (WINAPI *RASADFUNCA)(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD); +typedef BOOL (WINAPI *RASADFUNCW)(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD); + +#define RASADP_DisableConnectionQuery 0 +#define RASADP_LoginSessionDisable 1 +#define RASADP_SavedAddressesLimit 2 +#define RASADP_FailedConnectionTimeout 3 +#define RASADP_ConnectionQueryTimeout 4 + +#define RASCN_Connection 0x00000001 +#define RASCN_Disconnection 0x00000002 +#define RASCN_BandwidthAdded 0x00000004 +#define RASCN_BandwidthRemoved 0x00000008 +#define RASCN_Dormant 0x00000010 +#define RASCN_ReConnection 0x00000020 + typedef struct _RAS_STATS { DWORD dwSize; -- 2.21.0

1 0

[PATCH] kernel32: Use RegLoadMUIStringW() from kernelbase.
by Nikolay Sivov 22 Nov '19

22 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/time.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 23b47084db..817a830518 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -47,6 +47,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winternl.h" #include "kernel_private.h" #include "wine/unicode.h" @@ -381,24 +382,6 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static BOOL reg_load_mui_string(HKEY hkey, LPCWSTR value, LPWSTR buffer, DWORD size) -{ - static const WCHAR advapi32W[] = {'a','d','v','a','p','i','3','2','.','d','l','l',0}; - DWORD (WINAPI *pRegLoadMUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD, DWORD *, DWORD, LPCWSTR); - HMODULE hDll; - BOOL ret = FALSE; - - hDll = LoadLibraryExW(advapi32W, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); - if (hDll) { - pRegLoadMUIStringW = (void *)GetProcAddress(hDll, "RegLoadMUIStringW"); - if (pRegLoadMUIStringW && - !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, DIR_System)) - ret = TRUE; - FreeLibrary(hDll); - } - return ret; -} - /*********************************************************************** * TIME_GetSpecificTimeZoneInfo * @@ -438,14 +421,14 @@ static BOOL TIME_GetSpecificTimeZoneInfo( const WCHAR *key_name, WORD year, if (!TIME_GetSpecificTimeZoneKey( key_name, &time_zone_key )) return FALSE; - if (!reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ) && + if (RegLoadMUIStringW( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName), NULL, 0, DIR_System ) && !reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName) )) { NtClose( time_zone_key ); return FALSE; } - if (!reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ) && + if (RegLoadMUIStringW( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName), NULL, 0, DIR_System ) && !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) )) { NtClose( time_zone_key ); @@ -1005,8 +988,8 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo if (!TIME_GetSpecificTimeZoneKey( tzinfo->TimeZoneKeyName, &time_zone_key )) return TIME_ZONE_ID_INVALID; - reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ); - reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ); + RegLoadMUIStringW( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName), NULL, 0, DIR_System ); + RegLoadMUIStringW( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName), NULL, 0, DIR_System ); NtClose( time_zone_key ); return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo ); -- 2.24.0

3 3

[PATCH] quartz/tests: Fix an invalid free.
by Zebediah Figura 22 Nov '19

22 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 8db5171358..160a8f8804 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1440,6 +1440,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, filter, NULL); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) { @@ -1511,8 +1512,6 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); - test_allocator(input); hr = IMemInputPin_GetAllocator(input, &allocator); -- 2.24.0

1 0

[PATCH 2/2] ucrtbase: Fix hexadecimal floats parsing in strtod.
by Piotr Caban 22 Nov '19

22 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 263 ++++++++++++++++++++++++++++++----- dlls/ucrtbase/tests/string.c | 15 +- 2 files changed, 239 insertions(+), 39 deletions(-)

1 0

[PATCH 1/2] msvcrt: Use isspace_l in string to number conversion functions.
by Piotr Caban 22 Nov '19

22 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH] wininet: Add support for detecting the proxy config URL.
by Hans Leidekker 22 Nov '19

22 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/internet.c | 201 +++++++++++++++++++++++++++++++++------ 2 files changed, 173 insertions(+), 32 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 6eeb7cf85b..e1d4979d87 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -2,9 +2,9 @@ EXTRADEFS = -D_WINX32_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 -DELAYIMPORTS = secur32 crypt32 cryptui +DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi EXTRAINCL = $(Z_CFLAGS) -EXTRALIBS = $(CORESERVICES_LIBS) $(Z_LIBS) +EXTRALIBS = $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 266100861d..3e8be9fa2b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -28,14 +28,6 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#endif - #include "winsock2.h" #include "ws2ipdef.h" @@ -56,6 +48,10 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "ws2tcpip.h" +#include "winternl.h" +#include "iphlpapi.h" +#include "dhcpcsdk.h" #include "wine/exception.h" @@ -2295,38 +2291,183 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -static WCHAR *get_proxy_autoconfig_url(void) +static IP_ADAPTER_ADDRESSES *get_adapters(void) { -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + ULONG err, size = 1024, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME; + IP_ADAPTER_ADDRESSES *tmp, *ret; - CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); - WCHAR *ret = NULL; - SIZE_T len; - const void *ref; + if (!(ret = heap_alloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = heap_realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + heap_free( ret ); + return NULL; +} + +static WCHAR *detect_proxy_autoconfig_url_dhcp(void) +{ + IP_ADAPTER_ADDRESSES *adapters, *ptr; + DHCPCAPI_PARAMS_ARRAY send_params, recv_params; + DHCPCAPI_PARAMS param; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1], *ret = NULL; + DWORD err, size; + BYTE *tmp, *buf = NULL; + + if (!(adapters = get_adapters())) return NULL; + + memset( &send_params, 0, sizeof(send_params) ); + memset( &param, 0, sizeof(param) ); + param.OptionId = OPTION_MSFT_IE_PROXY; + recv_params.nParams = 1; + recv_params.Params = &param; + + for (ptr = adapters; ptr; ptr = ptr->Next) + { + MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); + TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + + if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + /* FIXME: also skip adapters where DHCP is disabled */ + + size = 256; + if (!(buf = heap_alloc( size ))) goto done; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + while (err == ERROR_MORE_DATA) + { + if (!(tmp = heap_realloc( buf, size ))) goto done; + buf = tmp; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + } + if (err == ERROR_SUCCESS && param.nBytesData) + { + int len = MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, NULL, 0 ); + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, ret, len ); + ret[len] = 0; + } + TRACE("returning %s\n", debugstr_w(ret)); + break; + } + } - if (!settings) return NULL; +done: + heap_free( buf ); + heap_free( adapters ); + return ret; +} - if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) +static char *get_computer_name( COMPUTER_NAME_FORMAT format ) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( format, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = heap_alloc( size ))) return NULL; + if (!GetComputerNameExA( format, ret, &size )) { - CFRelease( settings ); + heap_free( ret ); return NULL; } - len = CFStringGetLength( ref ); - if (len) - ret = heap_alloc( (len+1) * sizeof(WCHAR) ); - if (ret) + return ret; +} + +static BOOL is_domain_suffix( const char *domain, const char *suffix ) +{ + int len_domain = strlen( domain ), len_suffix = strlen( suffix ); + + if (len_suffix > len_domain) return FALSE; + if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + return FALSE; +} + +static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) +{ + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); +} + +static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) +{ + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; + char name[NI_MAXHOST]; + WCHAR *ret, *p; + int len; + + while (ai && ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ai = ai->ai_next; + if (!ai) return NULL; + + if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; + + len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW ); + if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + lstrcpyW( p, httpW ); + p += lstrlenW( httpW ); + while (*hostname) { *p++ = *hostname++; } + lstrcpyW( p, wpadW ); + return ret; +} + +static WCHAR *detect_proxy_autoconfig_url_dns(void) +{ + char *fqdn, *domain, *p; + WCHAR *ret; + + if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; + if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) + { + heap_free( fqdn ); + return NULL; + } + p = fqdn; + while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { - CFStringGetCharacters( ref, CFRangeMake(0, len), ret ); - ret[len] = 0; + char *name; + struct addrinfo *ai; + int res; + + if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + { + heap_free( fqdn ); + heap_free( domain ); + return NULL; + } + strcpy( name, "wpad" ); + strcat( name, p ); + res = getaddrinfo( name, NULL, NULL, &ai ); + if (!res) + { + ret = build_wpad_url( name, ai ); + freeaddrinfo( ai ); + if (ret) + { + TRACE("returning %s\n", debugstr_w(ret)); + heap_free( name ); + break; + } + } + heap_free( name ); + p++; } - TRACE( "returning %s\n", debugstr_w(ret) ); - CFRelease( settings ); + heap_free( domain ); + heap_free( fqdn ); + return ret; +} + +static WCHAR *get_proxy_autoconfig_url(void) +{ + WCHAR *ret = detect_proxy_autoconfig_url_dhcp(); + if (!ret) ret = detect_proxy_autoconfig_url_dns(); return ret; -#else - static int once; - if (!once++) FIXME( "no support on this platform\n" ); - return NULL; -#endif } static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) -- 2.20.1

1 0

[PATCH] winhttp: Use wide character string literals.
by Hans Leidekker 22 Nov '19

22 Nov '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/request.c | 333 ++++++++++++--------------------- dlls/winhttp/session.c | 67 +++---- dlls/winhttp/url.c | 26 +-- dlls/winhttp/winhttp_private.h | 8 - 5 files changed, 155 insertions(+), 285 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 3166290eab..83efc7f85c 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -262,8 +262,6 @@ static struct attr *parse_attr( const WCHAR *str, int *used ) BOOL set_cookies( struct request *request, const WCHAR *cookies ) { - static const WCHAR pathW[] = {'p','a','t','h',0}; - static const WCHAR domainW[] = {'d','o','m','a','i','n',0}; BOOL ret = FALSE; WCHAR *buffer, *p; WCHAR *cookie_domain = NULL, *cookie_path = NULL; @@ -287,12 +285,12 @@ BOOL set_cookies( struct request *request, const WCHAR *cookies ) len = lstrlenW( p ); while (len && (attr = parse_attr( p, &used ))) { - if (!wcsicmp( attr->name, domainW )) + if (!wcsicmp( attr->name, L"domain" )) { domain = attr; cookie_domain = attr->value; } - else if (!wcsicmp( attr->name, pathW )) + else if (!wcsicmp( attr->name, L"path" )) { path = attr; cookie_path = attr->value; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0fd1d1abe9..7c8e6ba89e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -41,136 +41,79 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_KEEP_ALIVE_TIMEOUT 30000 -static const WCHAR attr_accept[] = {'A','c','c','e','p','t',0}; -static const WCHAR attr_accept_charset[] = {'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0}; -static const WCHAR attr_accept_encoding[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',0}; -static const WCHAR attr_accept_language[] = {'A','c','c','e','p','t','-','L','a','n','g','u','a','g','e',0}; -static const WCHAR attr_accept_ranges[] = {'A','c','c','e','p','t','-','R','a','n','g','e','s',0}; -static const WCHAR attr_age[] = {'A','g','e',0}; -static const WCHAR attr_allow[] = {'A','l','l','o','w',0}; -static const WCHAR attr_authorization[] = {'A','u','t','h','o','r','i','z','a','t','i','o','n',0}; -static const WCHAR attr_cache_control[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l',0}; -static const WCHAR attr_connection[] = {'C','o','n','n','e','c','t','i','o','n',0}; -static const WCHAR attr_content_base[] = {'C','o','n','t','e','n','t','-','B','a','s','e',0}; -static const WCHAR attr_content_encoding[] = {'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0}; -static const WCHAR attr_content_id[] = {'C','o','n','t','e','n','t','-','I','D',0}; -static const WCHAR attr_content_language[] = {'C','o','n','t','e','n','t','-','L','a','n','g','u','a','g','e',0}; -static const WCHAR attr_content_length[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; -static const WCHAR attr_content_location[] = {'C','o','n','t','e','n','t','-','L','o','c','a','t','i','o','n',0}; -static const WCHAR attr_content_md5[] = {'C','o','n','t','e','n','t','-','M','D','5',0}; -static const WCHAR attr_content_range[] = {'C','o','n','t','e','n','t','-','R','a','n','g','e',0}; -static const WCHAR attr_content_transfer_encoding[] = {'C','o','n','t','e','n','t','-','T','r','a','n','s','f','e','r','-','E','n','c','o','d','i','n','g',0}; -static const WCHAR attr_content_type[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; -static const WCHAR attr_cookie[] = {'C','o','o','k','i','e',0}; -static const WCHAR attr_date[] = {'D','a','t','e',0}; -static const WCHAR attr_from[] = {'F','r','o','m',0}; -static const WCHAR attr_etag[] = {'E','T','a','g',0}; -static const WCHAR attr_expect[] = {'E','x','p','e','c','t',0}; -static const WCHAR attr_expires[] = {'E','x','p','i','r','e','s',0}; -static const WCHAR attr_host[] = {'H','o','s','t',0}; -static const WCHAR attr_if_match[] = {'I','f','-','M','a','t','c','h',0}; -static const WCHAR attr_if_modified_since[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; -static const WCHAR attr_if_none_match[] = {'I','f','-','N','o','n','e','-','M','a','t','c','h',0}; -static const WCHAR attr_if_range[] = {'I','f','-','R','a','n','g','e',0}; -static const WCHAR attr_if_unmodified_since[] = {'I','f','-','U','n','m','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; -static const WCHAR attr_last_modified[] = {'L','a','s','t','-','M','o','d','i','f','i','e','d',0}; -static const WCHAR attr_location[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR attr_max_forwards[] = {'M','a','x','-','F','o','r','w','a','r','d','s',0}; -static const WCHAR attr_mime_version[] = {'M','i','m','e','-','V','e','r','s','i','o','n',0}; -static const WCHAR attr_pragma[] = {'P','r','a','g','m','a',0}; -static const WCHAR attr_proxy_authenticate[] = {'P','r','o','x','y','-','A','u','t','h','e','n','t','i','c','a','t','e',0}; -static const WCHAR attr_proxy_authorization[] = {'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0}; -static const WCHAR attr_proxy_connection[] = {'P','r','o','x','y','-','C','o','n','n','e','c','t','i','o','n',0}; -static const WCHAR attr_public[] = {'P','u','b','l','i','c',0}; -static const WCHAR attr_range[] = {'R','a','n','g','e',0}; -static const WCHAR attr_referer[] = {'R','e','f','e','r','e','r',0}; -static const WCHAR attr_retry_after[] = {'R','e','t','r','y','-','A','f','t','e','r',0}; -static const WCHAR attr_server[] = {'S','e','r','v','e','r',0}; -static const WCHAR attr_set_cookie[] = {'S','e','t','-','C','o','o','k','i','e',0}; -static const WCHAR attr_status[] = {'S','t','a','t','u','s',0}; -static const WCHAR attr_transfer_encoding[] = {'T','r','a','n','s','f','e','r','-','E','n','c','o','d','i','n','g',0}; -static const WCHAR attr_unless_modified_since[] = {'U','n','l','e','s','s','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; -static const WCHAR attr_upgrade[] = {'U','p','g','r','a','d','e',0}; -static const WCHAR attr_uri[] = {'U','R','I',0}; -static const WCHAR attr_user_agent[] = {'U','s','e','r','-','A','g','e','n','t',0}; -static const WCHAR attr_vary[] = {'V','a','r','y',0}; -static const WCHAR attr_via[] = {'V','i','a',0}; -static const WCHAR attr_warning[] = {'W','a','r','n','i','n','g',0}; -static const WCHAR attr_www_authenticate[] = {'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0}; - static const WCHAR *attribute_table[] = { - attr_mime_version, /* WINHTTP_QUERY_MIME_VERSION = 0 */ - attr_content_type, /* WINHTTP_QUERY_CONTENT_TYPE = 1 */ - attr_content_transfer_encoding, /* WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ - attr_content_id, /* WINHTTP_QUERY_CONTENT_ID = 3 */ + L"Mime-Version", /* WINHTTP_QUERY_MIME_VERSION = 0 */ + L"Content-Type" , /* WINHTTP_QUERY_CONTENT_TYPE = 1 */ + L"Content-Transfer-Encoding", /* WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ + L"Content-ID", /* WINHTTP_QUERY_CONTENT_ID = 3 */ NULL, /* WINHTTP_QUERY_CONTENT_DESCRIPTION = 4 */ - attr_content_length, /* WINHTTP_QUERY_CONTENT_LENGTH = 5 */ - attr_content_language, /* WINHTTP_QUERY_CONTENT_LANGUAGE = 6 */ - attr_allow, /* WINHTTP_QUERY_ALLOW = 7 */ - attr_public, /* WINHTTP_QUERY_PUBLIC = 8 */ - attr_date, /* WINHTTP_QUERY_DATE = 9 */ - attr_expires, /* WINHTTP_QUERY_EXPIRES = 10 */ - attr_last_modified, /* WINHTTP_QUERY_LAST_MODIFIEDcw = 11 */ + L"Content-Length", /* WINHTTP_QUERY_CONTENT_LENGTH = 5 */ + L"Content-Language", /* WINHTTP_QUERY_CONTENT_LANGUAGE = 6 */ + L"Allow", /* WINHTTP_QUERY_ALLOW = 7 */ + L"Public", /* WINHTTP_QUERY_PUBLIC = 8 */ + L"Date", /* WINHTTP_QUERY_DATE = 9 */ + L"Expires", /* WINHTTP_QUERY_EXPIRES = 10 */ + L"Last-Modified", /* WINHTTP_QUERY_LAST_MODIFIEDcw = 11 */ NULL, /* WINHTTP_QUERY_MESSAGE_ID = 12 */ - attr_uri, /* WINHTTP_QUERY_URI = 13 */ - attr_from, /* WINHTTP_QUERY_DERIVED_FROM = 14 */ + L"URI", /* WINHTTP_QUERY_URI = 13 */ + L"From", /* WINHTTP_QUERY_DERIVED_FROM = 14 */ NULL, /* WINHTTP_QUERY_COST = 15 */ NULL, /* WINHTTP_QUERY_LINK = 16 */ - attr_pragma, /* WINHTTP_QUERY_PRAGMA = 17 */ + L"Pragma", /* WINHTTP_QUERY_PRAGMA = 17 */ NULL, /* WINHTTP_QUERY_VERSION = 18 */ - attr_status, /* WINHTTP_QUERY_STATUS_CODE = 19 */ + L"Status", /* WINHTTP_QUERY_STATUS_CODE = 19 */ NULL, /* WINHTTP_QUERY_STATUS_TEXT = 20 */ NULL, /* WINHTTP_QUERY_RAW_HEADERS = 21 */ NULL, /* WINHTTP_QUERY_RAW_HEADERS_CRLF = 22 */ - attr_connection, /* WINHTTP_QUERY_CONNECTION = 23 */ - attr_accept, /* WINHTTP_QUERY_ACCEPT = 24 */ - attr_accept_charset, /* WINHTTP_QUERY_ACCEPT_CHARSET = 25 */ - attr_accept_encoding, /* WINHTTP_QUERY_ACCEPT_ENCODING = 26 */ - attr_accept_language, /* WINHTTP_QUERY_ACCEPT_LANGUAGE = 27 */ - attr_authorization, /* WINHTTP_QUERY_AUTHORIZATION = 28 */ - attr_content_encoding, /* WINHTTP_QUERY_CONTENT_ENCODING = 29 */ + L"Connection", /* WINHTTP_QUERY_CONNECTION = 23 */ + L"Accept", /* WINHTTP_QUERY_ACCEPT = 24 */ + L"Accept-Charset", /* WINHTTP_QUERY_ACCEPT_CHARSET = 25 */ + L"Accept-Encoding", /* WINHTTP_QUERY_ACCEPT_ENCODING = 26 */ + L"Accept-Language", /* WINHTTP_QUERY_ACCEPT_LANGUAGE = 27 */ + L"Authorization", /* WINHTTP_QUERY_AUTHORIZATION = 28 */ + L"Content-Encoding", /* WINHTTP_QUERY_CONTENT_ENCODING = 29 */ NULL, /* WINHTTP_QUERY_FORWARDED = 30 */ NULL, /* WINHTTP_QUERY_FROM = 31 */ - attr_if_modified_since, /* WINHTTP_QUERY_IF_MODIFIED_SINCE = 32 */ - attr_location, /* WINHTTP_QUERY_LOCATION = 33 */ + L"If-Modified-Since", /* WINHTTP_QUERY_IF_MODIFIED_SINCE = 32 */ + L"Location", /* WINHTTP_QUERY_LOCATION = 33 */ NULL, /* WINHTTP_QUERY_ORIG_URI = 34 */ - attr_referer, /* WINHTTP_QUERY_REFERER = 35 */ - attr_retry_after, /* WINHTTP_QUERY_RETRY_AFTER = 36 */ - attr_server, /* WINHTTP_QUERY_SERVER = 37 */ + L"Referer", /* WINHTTP_QUERY_REFERER = 35 */ + L"Retry-After", /* WINHTTP_QUERY_RETRY_AFTER = 36 */ + L"Server", /* WINHTTP_QUERY_SERVER = 37 */ NULL, /* WINHTTP_TITLE = 38 */ - attr_user_agent, /* WINHTTP_QUERY_USER_AGENT = 39 */ - attr_www_authenticate, /* WINHTTP_QUERY_WWW_AUTHENTICATE = 40 */ - attr_proxy_authenticate, /* WINHTTP_QUERY_PROXY_AUTHENTICATE = 41 */ - attr_accept_ranges, /* WINHTTP_QUERY_ACCEPT_RANGES = 42 */ - attr_set_cookie, /* WINHTTP_QUERY_SET_COOKIE = 43 */ - attr_cookie, /* WINHTTP_QUERY_COOKIE = 44 */ + L"User-Agent", /* WINHTTP_QUERY_USER_AGENT = 39 */ + L"WWW-Authenticate", /* WINHTTP_QUERY_WWW_AUTHENTICATE = 40 */ + L"Proxy-Authenticate", /* WINHTTP_QUERY_PROXY_AUTHENTICATE = 41 */ + L"Accept-Ranges", /* WINHTTP_QUERY_ACCEPT_RANGES = 42 */ + L"Set-Cookie", /* WINHTTP_QUERY_SET_COOKIE = 43 */ + L"Cookie", /* WINHTTP_QUERY_COOKIE = 44 */ NULL, /* WINHTTP_QUERY_REQUEST_METHOD = 45 */ NULL, /* WINHTTP_QUERY_REFRESH = 46 */ NULL, /* WINHTTP_QUERY_CONTENT_DISPOSITION = 47 */ - attr_age, /* WINHTTP_QUERY_AGE = 48 */ - attr_cache_control, /* WINHTTP_QUERY_CACHE_CONTROL = 49 */ - attr_content_base, /* WINHTTP_QUERY_CONTENT_BASE = 50 */ - attr_content_location, /* WINHTTP_QUERY_CONTENT_LOCATION = 51 */ - attr_content_md5, /* WINHTTP_QUERY_CONTENT_MD5 = 52 */ - attr_content_range, /* WINHTTP_QUERY_CONTENT_RANGE = 53 */ - attr_etag, /* WINHTTP_QUERY_ETAG = 54 */ - attr_host, /* WINHTTP_QUERY_HOST = 55 */ - attr_if_match, /* WINHTTP_QUERY_IF_MATCH = 56 */ - attr_if_none_match, /* WINHTTP_QUERY_IF_NONE_MATCH = 57 */ - attr_if_range, /* WINHTTP_QUERY_IF_RANGE = 58 */ - attr_if_unmodified_since, /* WINHTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ - attr_max_forwards, /* WINHTTP_QUERY_MAX_FORWARDS = 60 */ - attr_proxy_authorization, /* WINHTTP_QUERY_PROXY_AUTHORIZATION = 61 */ - attr_range, /* WINHTTP_QUERY_RANGE = 62 */ - attr_transfer_encoding, /* WINHTTP_QUERY_TRANSFER_ENCODING = 63 */ - attr_upgrade, /* WINHTTP_QUERY_UPGRADE = 64 */ - attr_vary, /* WINHTTP_QUERY_VARY = 65 */ - attr_via, /* WINHTTP_QUERY_VIA = 66 */ - attr_warning, /* WINHTTP_QUERY_WARNING = 67 */ - attr_expect, /* WINHTTP_QUERY_EXPECT = 68 */ - attr_proxy_connection, /* WINHTTP_QUERY_PROXY_CONNECTION = 69 */ - attr_unless_modified_since, /* WINHTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ + L"Age", /* WINHTTP_QUERY_AGE = 48 */ + L"Cache-Control", /* WINHTTP_QUERY_CACHE_CONTROL = 49 */ + L"Content-Base", /* WINHTTP_QUERY_CONTENT_BASE = 50 */ + L"Content-Location", /* WINHTTP_QUERY_CONTENT_LOCATION = 51 */ + L"Content-MD5", /* WINHTTP_QUERY_CONTENT_MD5 = 52 */ + L"Content-Range", /* WINHTTP_QUERY_CONTENT_RANGE = 53 */ + L"ETag", /* WINHTTP_QUERY_ETAG = 54 */ + L"Host", /* WINHTTP_QUERY_HOST = 55 */ + L"If-Match", /* WINHTTP_QUERY_IF_MATCH = 56 */ + L"If-None-Match", /* WINHTTP_QUERY_IF_NONE_MATCH = 57 */ + L"If-Range", /* WINHTTP_QUERY_IF_RANGE = 58 */ + L"If-Unmodified-Since", /* WINHTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ + L"Max-Forwards", /* WINHTTP_QUERY_MAX_FORWARDS = 60 */ + L"Proxy-Authorization", /* WINHTTP_QUERY_PROXY_AUTHORIZATION = 61 */ + L"Range", /* WINHTTP_QUERY_RANGE = 62 */ + L"Transfer-Encoding", /* WINHTTP_QUERY_TRANSFER_ENCODING = 63 */ + L"Upgrade", /* WINHTTP_QUERY_UPGRADE = 64 */ + L"Vary", /* WINHTTP_QUERY_VARY = 65 */ + L"Via", /* WINHTTP_QUERY_VIA = 66 */ + L"Warning", /* WINHTTP_QUERY_WARNING = 67 */ + L"Expect", /* WINHTTP_QUERY_EXPECT = 68 */ + L"Proxy-Connection", /* WINHTTP_QUERY_PROXY_CONNECTION = 69 */ + L"Unless-Modified-Since", /* WINHTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ NULL, /* WINHTTP_QUERY_PROXY_SUPPORT = 75 */ NULL, /* WINHTTP_QUERY_AUTHENTICATION_INFO = 76 */ NULL, /* WINHTTP_QUERY_PASSPORT_URLS = 77 */ @@ -543,14 +486,11 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD static WCHAR *build_absolute_request_path( struct request *request, const WCHAR **path ) { - static const WCHAR http[] = {'h','t','t','p',0}; - static const WCHAR https[] = {'h','t','t','p','s',0}; - static const WCHAR fmt[] = {'%','s',':','/','/','%','s',0}; const WCHAR *scheme; WCHAR *ret; int len, offset; - scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http; + scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? L"https" : L"http"; len = lstrlenW( scheme ) + lstrlenW( request->connect->hostname ) + 4; /* '://' + nul */ if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */ @@ -558,11 +498,10 @@ static WCHAR *build_absolute_request_path( struct request *request, const WCHAR len += lstrlenW( request->path ); if ((ret = heap_alloc( len * sizeof(WCHAR) ))) { - offset = swprintf( ret, len, fmt, scheme, request->connect->hostname ); + offset = swprintf( ret, len, L"%s://%s", scheme, request->connect->hostname ); if (request->connect->hostport) { - static const WCHAR port_fmt[] = {':','%','u',0}; - offset += swprintf( ret + offset, len - offset, port_fmt, request->connect->hostport ); + offset += swprintf( ret + offset, len - offset, L":%u", request->connect->hostport ); } lstrcpyW( ret + offset, request->path ); if (path) *path = ret + offset; @@ -573,8 +512,6 @@ static WCHAR *build_absolute_request_path( struct request *request, const WCHAR static WCHAR *build_request_string( struct request *request ) { - static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; - static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; WCHAR *path, *ret; unsigned int i, len; @@ -595,22 +532,22 @@ static WCHAR *build_request_string( struct request *request ) if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { lstrcpyW( ret, request->verb ); - lstrcatW( ret, spaceW ); + lstrcatW( ret, L" " ); lstrcatW( ret, path ); - lstrcatW( ret, spaceW ); + lstrcatW( ret, L" " ); lstrcatW( ret, request->version ); for (i = 0; i < request->num_headers; i++) { if (request->headers[i].is_request) { - lstrcatW( ret, crlfW ); + lstrcatW( ret, L"\r\n" ); lstrcatW( ret, request->headers[i].field ); - lstrcatW( ret, colonW ); + lstrcatW( ret, L": " ); lstrcatW( ret, request->headers[i].value ); } } - lstrcatW( ret, twocrlfW ); + lstrcatW( ret, L"\r\n\r\n" ); } if (path != request->path) heap_free( path ); @@ -850,12 +787,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } -static const WCHAR basicW[] = {'B','a','s','i','c',0}; -static const WCHAR ntlmW[] = {'N','T','L','M',0}; -static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; -static const WCHAR digestW[] = {'D','i','g','e','s','t',0}; -static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; - static const struct { const WCHAR *str; @@ -864,11 +795,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { L"Basic", ARRAY_SIZE(L"Basic") - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { L"NTLM", ARRAY_SIZE(L"NTLM") - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { L"Passport", ARRAY_SIZE(L"Passport") - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { L"Digest", ARRAY_SIZE(L"Digest") - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { L"Negotiate", ARRAY_SIZE(L"Negotiate") - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static enum auth_scheme scheme_from_flag( DWORD flag ) @@ -1147,7 +1078,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem case WINHTTP_AUTH_TARGET_SERVER: has_auth_value = get_authvalue( request, WINHTTP_QUERY_WWW_AUTHENTICATE, scheme_flag, auth_value, len ); auth_ptr = &request->authinfo; - auth_target = attr_authorization; + auth_target = L"Authorization"; if (request->creds[TARGET_SERVER][scheme].username) { if (scheme != SCHEME_BASIC && !has_auth_value) return FALSE; @@ -1166,7 +1097,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem if (!get_authvalue( request, WINHTTP_QUERY_PROXY_AUTHENTICATE, scheme_flag, auth_value, len )) return FALSE; auth_ptr = &request->proxy_authinfo; - auth_target = attr_proxy_authorization; + auth_target = L"Proxy-Authorization"; if (request->creds[TARGET_PROXY][scheme].username) { username = request->creds[TARGET_PROXY][scheme].username; @@ -1362,19 +1293,15 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem static WCHAR *build_proxy_connect_string( struct request *request ) { - static const WCHAR fmtW[] = {'%','s',':','%','u',0}; - static const WCHAR connectW[] = {'C','O','N','N','E','C','T', 0}; - static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; - static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; WCHAR *ret, *host; unsigned int i; int len = lstrlenW( request->connect->hostname ) + 7; if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - len = swprintf( host, len, fmtW, request->connect->hostname, request->connect->hostport ); + len = swprintf( host, len, L"%s:%u", request->connect->hostname, request->connect->hostport ); - len += ARRAY_SIZE(connectW); - len += ARRAY_SIZE(http1_1); + len += ARRAY_SIZE(L"CONNECT"); + len += ARRAY_SIZE(L"HTTP/1.1"); for (i = 0; i < request->num_headers; i++) { @@ -1385,23 +1312,23 @@ static WCHAR *build_proxy_connect_string( struct request *request ) if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { - lstrcpyW( ret, connectW ); - lstrcatW( ret, spaceW ); + lstrcpyW( ret, L"CONNECT" ); + lstrcatW( ret, L" " ); lstrcatW( ret, host ); - lstrcatW( ret, spaceW ); - lstrcatW( ret, http1_1 ); + lstrcatW( ret, L" " ); + lstrcatW( ret, L"HTTP/1.1" ); for (i = 0; i < request->num_headers; i++) { if (request->headers[i].is_request) { - lstrcatW( ret, crlfW ); + lstrcatW( ret, L"\r\n" ); lstrcatW( ret, request->headers[i].field ); - lstrcatW( ret, colonW ); + lstrcatW( ret, L": " ); lstrcatW( ret, request->headers[i].value ); } } - lstrcatW( ret, twocrlfW ); + lstrcatW( ret, L"\r\n\r\n" ); } heap_free( host ); @@ -1768,7 +1695,6 @@ static BOOL add_host_header( struct request *request, DWORD modifier ) BOOL ret; DWORD len; WCHAR *host; - static const WCHAR fmt[] = {'%','s',':','%','u',0}; struct connect *connect = request->connect; INTERNET_PORT port; @@ -1776,12 +1702,12 @@ static BOOL add_host_header( struct request *request, DWORD modifier ) if (port == INTERNET_DEFAULT_HTTP_PORT || port == INTERNET_DEFAULT_HTTPS_PORT) { - return process_header( request, attr_host, connect->hostname, modifier, TRUE ); + return process_header( request, L"Host", connect->hostname, modifier, TRUE ); } len = lstrlenW( connect->hostname ) + 7; /* sizeof(":65335") */ if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; - swprintf( host, len, fmt, connect->hostname, port ); - ret = process_header( request, attr_host, host, modifier, TRUE ); + swprintf( host, len, L"%s:%u", connect->hostname, port ); + ret = process_header( request, L"Host", host, modifier, TRUE ); heap_free( host ); return ret; } @@ -1921,8 +1847,6 @@ static BOOL refill_buffer( struct request *request, BOOL notify ) static void finished_reading( struct request *request ) { - static const WCHAR closeW[] = {'c','l','o','s','e',0}; - BOOL close = FALSE; WCHAR connection[20]; DWORD size = sizeof(connection); @@ -1933,9 +1857,9 @@ static void finished_reading( struct request *request ) else if (query_headers( request, WINHTTP_QUERY_CONNECTION, NULL, connection, &size, NULL ) || query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION, NULL, connection, &size, NULL )) { - if (!wcsicmp( connection, closeW )) close = TRUE; + if (!wcsicmp( connection, L"close" )) close = TRUE; } - else if (!wcscmp( request->version, http1_0 )) close = TRUE; + else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; if (close) { close_connection( request ); @@ -2199,10 +2123,6 @@ static char *build_wire_request( struct request *request, DWORD *len ) static BOOL send_request( struct request *request, const WCHAR *headers, DWORD headers_len, void *optional, DWORD optional_len, DWORD total_len, DWORD_PTR context, BOOL async ) { - static const WCHAR keep_alive[] = {'K','e','e','p','-','A','l','i','v','e',0}; - static const WCHAR no_cache[] = {'n','o','-','c','a','c','h','e',0}; - static const WCHAR length_fmt[] = {'%','l','d',0}; - BOOL ret = FALSE; struct connect *connect = request->connect; struct session *session = connect->session; @@ -2214,7 +2134,7 @@ static BOOL send_request( struct request *request, const WCHAR *headers, DWORD h drain_content( request ); if (session->agent) - process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"User-Agent", session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); if (connect->hostname) add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); @@ -2222,20 +2142,20 @@ static BOOL send_request( struct request *request, const WCHAR *headers, DWORD h if (request->creds[TARGET_SERVER][SCHEME_BASIC].username) do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC ); - if (total_len || (request->verb && !wcscmp( request->verb, postW ))) + if (total_len || (request->verb && !wcscmp( request->verb, L"POST" ))) { WCHAR length[21]; /* decimal long int + null */ - swprintf( length, ARRAY_SIZE(length), length_fmt, total_len ); - process_header( request, attr_content_length, length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + swprintf( length, ARRAY_SIZE(length), L"%ld", total_len ); + process_header( request, L"Content-Length", length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } if (!(request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE)) { - process_header( request, attr_connection, keep_alive, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"Connection", L"Keep-Alive", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } if (request->hdr.flags & WINHTTP_FLAG_REFRESH) { - process_header( request, attr_pragma, no_cache, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); - process_header( request, attr_cache_control, no_cache, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"Pragma", L"no-cache", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"Cache-Control", L"no-cache", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } if (headers && !add_request_headers( request, headers, headers_len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE )) { @@ -2452,7 +2372,7 @@ static DWORD set_content_length( struct request *request, DWORD status ) WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); - if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, headW )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, L"HEAD" )) request->content_length = 0; else { @@ -2462,7 +2382,7 @@ static DWORD set_content_length( struct request *request, DWORD status ) buflen = sizeof(encoding); if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && - !wcsicmp( encoding, chunkedW )) + !wcsicmp( encoding, L"chunked" )) { request->content_length = ~0u; request->read_chunked = TRUE; @@ -2517,8 +2437,6 @@ static BOOL read_line( struct request *request, char *buffer, DWORD *len ) static BOOL read_reply( struct request *request ) { - static const WCHAR crlf[] = {'\r','\n',0}; - char buffer[MAX_REPLY_LEN]; DWORD buflen, len, offset, crlf_len = 2; /* lstrlenW(crlf) */ char *status_code, *status_text; @@ -2549,7 +2467,7 @@ static BOOL read_reply( struct request *request ) /* we rely on the fact that the protocol is ascii */ MultiByteToWideChar( CP_ACP, 0, status_code, len, status_codeW, len ); status_codeW[len] = 0; - if (!(process_header( request, attr_status, status_codeW, + if (!(process_header( request, L"Status", status_codeW, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, FALSE ))) return FALSE; @@ -2571,7 +2489,7 @@ static BOOL read_reply( struct request *request ) len = max( buflen + crlf_len, INITIAL_HEADER_BUFFER_LEN ); if (!(raw_headers = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers, buflen ); - memcpy( raw_headers + buflen - 1, crlf, sizeof(crlf) ); + memcpy( raw_headers + buflen - 1, L"\r\n", sizeof(L"\r\n") ); heap_free( request->raw_headers ); request->raw_headers = raw_headers; @@ -2594,7 +2512,7 @@ static BOOL read_reply( struct request *request ) } if (!*buffer) { - memcpy( raw_headers + offset, crlf, sizeof(crlf) ); + memcpy( raw_headers + offset, L"\r\n", sizeof(L"\r\n") ); break; } MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); @@ -2606,7 +2524,7 @@ static BOOL read_reply( struct request *request ) break; } free_header( header ); - memcpy( raw_headers + offset + buflen - 1, crlf, sizeof(crlf) ); + memcpy( raw_headers + offset + buflen - 1, L"\r\n", sizeof(L"\r\n") ); offset += buflen + crlf_len - 1; } @@ -2621,7 +2539,7 @@ static void record_cookies( struct request *request ) for (i = 0; i < request->num_headers; i++) { struct header *set_cookie = &request->headers[i]; - if (!wcsicmp( set_cookie->field, attr_set_cookie ) && !set_cookie->is_request) + if (!wcsicmp( set_cookie->field, L"Set-Cookie" ) && !set_cookie->is_request) { set_cookies( request, set_cookie->value ); } @@ -2674,7 +2592,7 @@ static BOOL handle_redirect( struct request *request, DWORD status ) len = lstrlenW( request->path ) + 1 + len_loc; if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; lstrcpyW( path, request->path ); - lstrcatW( path, slashW ); + lstrcatW( path, L"/" ); memcpy( path + lstrlenW(path), location, len_loc * sizeof(WCHAR) ); path[len_loc] = 0; } @@ -2732,17 +2650,17 @@ static BOOL handle_redirect( struct request *request, DWORD status ) memcpy( request->path, uc.lpszUrlPath, (len + 1) * sizeof(WCHAR) ); request->path[len] = 0; } - else request->path = strdupW( slashW ); + else request->path = strdupW( L"/" ); } /* remove content-type/length headers */ - if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); - if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); + if ((index = get_header_index( request, L"Content-Type", 0, TRUE )) >= 0) delete_header( request, index ); + if ((index = get_header_index( request, L"Content-Length", 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, postW )) + if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { heap_free( request->verb ); - request->verb = strdupW( getW ); + request->verb = strdupW( L"GET" ); request->optional = NULL; request->optional_len = 0; } @@ -2770,12 +2688,11 @@ static BOOL is_passport_request( struct request *request ) static BOOL handle_passport_redirect( struct request *request ) { - static const WCHAR status401W[] = {'4','0','1',0}; DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE; int i, len = lstrlenW( request->raw_headers ); WCHAR *p = request->raw_headers; - if (!process_header( request, attr_status, status401W, flags, FALSE )) return FALSE; + if (!process_header( request, L"Status", L"401", flags, FALSE )) return FALSE; for (i = 0; i < len; i++) { @@ -3560,13 +3477,9 @@ static HRESULT WINAPI winhttp_request_Open( BSTR url, VARIANT async ) { - static const WCHAR typeW[] = {'*','/','*',0}; - static const WCHAR *acceptW[] = {typeW, NULL}; static const WCHAR httpsW[] = {'h','t','t','p','s'}; - static const WCHAR user_agentW[] = { - 'M','o','z','i','l','l','a','/','4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';',' ', - 'W','i','n','3','2',';',' ','W','i','n','H','t','t','p','.','W','i','n','H','t','t','p', - 'R','e','q','u','e','s','t','.','5',')',0}; + static const WCHAR *acceptW[] = {L"*/*", NULL}; + static const WCHAR user_agentW[] = L"Mozilla/4.0 (compatible; Win32; WinHttp.WinHttpRequest.5)"; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); URL_COMPONENTS uc; WCHAR *hostname, *path = NULL, *verb = NULL; @@ -3656,8 +3569,6 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( BSTR header, BSTR value ) { - static const WCHAR fmtW[] = {'%','s',':',' ','%','s','\r','\n',0}; - static const WCHAR emptyW[] = {0}; struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); DWORD len, err = ERROR_SUCCESS; WCHAR *str; @@ -3684,7 +3595,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( err = ERROR_OUTOFMEMORY; goto done; } - swprintf( str, len + 1, fmtW, header, value ? value : emptyW ); + swprintf( str, len + 1, L"%s: %s\r\n", header, value ? value : L"" ); if (!WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE )) { @@ -3843,7 +3754,7 @@ static HRESULT request_receive( struct winhttp_request *request ) return HRESULT_FROM_WIN32( GetLastError() ); } if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); - if (!wcscmp( request->verb, headW )) + if (!wcscmp( request->verb, L"HEAD" )) { request->state = REQUEST_STATE_RESPONSE_RECEIVED; return S_OK; @@ -3914,15 +3825,13 @@ static DWORD request_set_parameters( struct winhttp_request *request ) static void request_set_utf8_content_type( struct winhttp_request *request ) { - static const WCHAR fmtW[] = {'%','s',':',' ','%','s',0}; - static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; - static const WCHAR charset_utf8W[] = {'c','h','a','r','s','e','t','=','u','t','f','-','8',0}; WCHAR headerW[64]; int len; - len = swprintf( headerW, ARRAY_SIZE(headerW), fmtW, attr_content_type, text_plainW ); + len = swprintf( headerW, ARRAY_SIZE(headerW), L"%s: %s", L"Content-Type", L"text/plain" ); WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); - len = swprintf( headerW, ARRAY_SIZE(headerW), fmtW, attr_content_type, charset_utf8W ); + + len = swprintf( headerW, ARRAY_SIZE(headerW), L"%s: %s", L"Content-Type", L"charset=utf-8" ); WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON ); } @@ -3936,7 +3845,7 @@ static HRESULT request_send( struct winhttp_request *request ) DWORD err; if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); - if (wcscmp( request->verb, getW )) + if (wcscmp( request->verb, L"GET" )) { VariantInit( &data ); if (V_VT( &request->data ) == VT_BSTR) @@ -4139,8 +4048,6 @@ done: static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepage ) { - static const WCHAR utf8W[] = {'u','t','f','-','8',0}; - static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; WCHAR *buffer, *p; DWORD size; @@ -4153,14 +4060,14 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa { return GetLastError(); } - if ((p = wcsstr( buffer, charsetW ))) + if ((p = wcsstr( buffer, L"charset" ))) { - p += lstrlenW( charsetW ); + p += lstrlenW( L"charset" ); while (*p == ' ') p++; if (*p++ == '=') { while (*p == ' ') p++; - if (!wcsicmp( p, utf8W )) *codepage = CP_UTF8; + if (!wcsicmp( p, L"utf-8" )) *codepage = CP_UTF8; } } heap_free( buffer ); @@ -4496,9 +4403,7 @@ static HRESULT WINAPI winhttp_request_put_Option( } case WinHttpRequestOption_URLCodePage: { - static const WCHAR utf8W[] = {'u','t','f','-','8',0}; VARIANT cp; - VariantInit( &cp ); hr = VariantChangeType( &cp, &value, 0, VT_UI4 ); if (SUCCEEDED( hr )) @@ -4506,7 +4411,7 @@ static HRESULT WINAPI winhttp_request_put_Option( request->url_codepage = V_UI4( &cp ); TRACE("URL codepage: %u\n", request->url_codepage); } - else if (V_VT( &value ) == VT_BSTR && !wcsicmp( V_BSTR( &value ), utf8W )) + else if (V_VT( &value ) == VT_BSTR && !wcsicmp( V_BSTR( &value ), L"utf-8" )) { TRACE("URL codepage: UTF-8\n"); request->url_codepage = CP_UTF8; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 690b42ab56..3f8acf0e02 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -374,10 +374,9 @@ static const struct object_vtbl connect_vtbl = static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) { - static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; BOOL ret = FALSE; - if (!wcsicmp( domain, localW ) && !wcschr( server, '.' )) + if (!wcsicmp( domain, L"<local>" ) && !wcschr( server, '.' )) ret = TRUE; else if (*domain == '*') { @@ -1059,13 +1058,12 @@ static const struct object_vtbl request_vtbl = static BOOL add_accept_types_header( struct request *request, const WCHAR **types ) { - static const WCHAR acceptW[] = {'A','c','c','e','p','t',0}; static const DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; if (!types) return TRUE; while (*types) { - if (!process_header( request, acceptW, *types, flags, TRUE )) return FALSE; + if (!process_header( request, L"Accept", *types, flags, TRUE )) return FALSE; types++; } return TRUE; @@ -1141,11 +1139,11 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->receive_timeout = connect->session->receive_timeout; request->receive_response_timeout = connect->session->receive_response_timeout; - if (!verb || !verb[0]) verb = getW; + if (!verb || !verb[0]) verb = L"GET"; if (!(request->verb = strdupW( verb ))) goto end; if (!(request->path = get_request_path( object ))) goto end; - if (!version || !version[0]) version = http1_1; + if (!version || !version[0]) version = L"HTTP/1.1"; if (!(request->version = strdupW( version ))) goto end; if (!(add_accept_types_header( request, types ))) goto end; @@ -1408,8 +1406,6 @@ static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; char name[NI_MAXHOST]; WCHAR *ret, *p; int len; @@ -1419,12 +1415,12 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; - len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW ); + len = lstrlenW( L"http://" ) + strlen( hostname ) + lstrlenW( L"/wpad.dat" ); if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; - lstrcpyW( p, httpW ); - p += lstrlenW( httpW ); + lstrcpyW( p, L"http://" ); + p += lstrlenW( L"http://" ); while (*hostname) { *p++ = *hostname++; } - lstrcpyW( p, wpadW ); + lstrcpyW( p, L"/wpad.dat" ); return ret; } @@ -1504,15 +1500,9 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) return TRUE; } -static const WCHAR Connections[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'C','o','n','n','e','c','t','i','o','n','s',0 }; -static const WCHAR WinHttpSettings[] = { - 'W','i','n','H','t','t','p','S','e','t','t','i','n','g','s',0 }; +static const WCHAR path_connections[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Connections"; + static const DWORD WINHTTP_SETTINGS_MAGIC = 0x18; static const DWORD WININET_SETTINGS_MAGIC = 0x46; static const DWORD PROXY_TYPE_DIRECT = 1; @@ -1548,12 +1538,12 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) TRACE("%p\n", info); - l = RegOpenKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, KEY_READ, &key ); + l = RegOpenKeyExW( HKEY_LOCAL_MACHINE, path_connections, 0, KEY_READ, &key ); if (!l) { DWORD type, size = 0; - l = RegQueryValueExW( key, WinHttpSettings, NULL, &type, NULL, &size ); + l = RegQueryValueExW( key, L"WinHttpSettings", NULL, &type, NULL, &size ); if (!l && type == REG_BINARY && size >= sizeof(struct connection_settings_header) + 2 * sizeof(DWORD)) { @@ -1565,7 +1555,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) (struct connection_settings_header *)buf; DWORD *len = (DWORD *)(hdr + 1); - l = RegQueryValueExW( key, WinHttpSettings, NULL, NULL, buf, + l = RegQueryValueExW( key, L"WinHttpSettings", NULL, NULL, buf, &size ); if (!l && hdr->magic == WINHTTP_SETTINGS_MAGIC && hdr->unknown == 0) @@ -1668,8 +1658,6 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) */ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *config ) { - static const WCHAR settingsW[] = - {'D','e','f','a','u','l','t','C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; HKEY hkey = NULL; struct connection_settings_header *hdr = NULL; DWORD type, offset, len, size = 0; @@ -1685,15 +1673,15 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY memset( config, 0, sizeof(*config) ); config->fAutoDetect = TRUE; - if (RegOpenKeyExW( HKEY_CURRENT_USER, Connections, 0, KEY_READ, &hkey ) || - RegQueryValueExW( hkey, settingsW, NULL, &type, NULL, &size ) || + if (RegOpenKeyExW( HKEY_CURRENT_USER, path_connections, 0, KEY_READ, &hkey ) || + RegQueryValueExW( hkey, L"DefaultConnectionSettings", NULL, &type, NULL, &size ) || type != REG_BINARY || size < sizeof(struct connection_settings_header)) { ret = TRUE; goto done; } if (!(hdr = heap_alloc( size ))) goto done; - if (RegQueryValueExW( hkey, settingsW, NULL, &type, (BYTE *)hdr, &size ) || + if (RegQueryValueExW( hkey, L"DefaultConnectionSettings", NULL, &type, (BYTE *)hdr, &size ) || hdr->magic != WININET_SETTINGS_MAGIC) { ret = TRUE; @@ -1782,8 +1770,7 @@ static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) static char *download_script( const WCHAR *url, DWORD *out_size ) { - static const WCHAR typeW[] = {'*','/','*',0}; - static const WCHAR *acceptW[] = {typeW, NULL}; + static const WCHAR *acceptW[] = {L"*/*", NULL}; HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; @@ -1996,7 +1983,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) return FALSE; } - l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, + l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, path_connections, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL ); if (!l) { @@ -2044,7 +2031,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) *len++ = 0; *len++ = 0; } - l = RegSetValueExW( key, WinHttpSettings, 0, REG_BINARY, buf, size ); + l = RegSetValueExW( key, L"WinHttpSettings", 0, REG_BINARY, buf, size ); if (!l) ret = TRUE; heap_free( buf ); @@ -2150,22 +2137,15 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int } static const WCHAR wkday[7][4] = - {{'S','u','n', 0}, {'M','o','n', 0}, {'T','u','e', 0}, {'W','e','d', 0}, - {'T','h','u', 0}, {'F','r','i', 0}, {'S','a','t', 0}}; + {L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat"}; static const WCHAR month[12][4] = - {{'J','a','n', 0}, {'F','e','b', 0}, {'M','a','r', 0}, {'A','p','r', 0}, - {'M','a','y', 0}, {'J','u','n', 0}, {'J','u','l', 0}, {'A','u','g', 0}, - {'S','e','p', 0}, {'O','c','t', 0}, {'N','o','v', 0}, {'D','e','c', 0}}; + {L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"}; /*********************************************************************** * WinHttpTimeFromSystemTime (WININET.@) */ BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string ) { - static const WCHAR format[] = - {'%','s',',',' ','%','0','2','d',' ','%','s',' ','%','4','d',' ','%','0', - '2','d',':','%','0','2','d',':','%','0','2','d',' ','G','M','T', 0}; - TRACE("%p, %p\n", time, string); if (!time || !string) @@ -2174,7 +2154,8 @@ BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string ) return FALSE; } - swprintf( string, WINHTTP_TIME_FORMAT_BUFSIZE / sizeof(WCHAR), format, + swprintf( string, WINHTTP_TIME_FORMAT_BUFSIZE / sizeof(WCHAR), + L"%s, %02d %s %4d %02d:%02d:%02d GMT", wkday[time->wDayOfWeek], time->wDay, month[time->wMonth - 1], diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index d405090409..ba9ed4366a 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -29,9 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -static const WCHAR scheme_http[] = {'h','t','t','p',0}; -static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; - struct url_component { WCHAR **str; @@ -93,8 +90,7 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len ) static inline BOOL need_escape( WCHAR ch ) { - static const WCHAR escapes[] = {' ','"','#','%','<','>','[','\\',']','^','`','{','|','}','~',0}; - const WCHAR *p = escapes; + const WCHAR *p = L" \"#%<>[\\]^`{|}~"; if (ch <= 31 || ch >= 127) return TRUE; while (*p) @@ -106,7 +102,7 @@ static inline BOOL need_escape( WCHAR ch ) static BOOL escape_string( const WCHAR *src, DWORD src_len, WCHAR *dst, DWORD *dst_len ) { - 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"; WCHAR *p = dst; DWORD i; @@ -214,8 +210,8 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } - if (p - url == 4 && !wcsnicmp( url, scheme_http, 4 )) scheme_number = INTERNET_SCHEME_HTTP; - else if (p - url == 5 && !wcsnicmp( url, scheme_https, 5 )) scheme_number = INTERNET_SCHEME_HTTPS; + if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !wcsnicmp( url, L"https", 5 )) scheme_number = INTERNET_SCHEME_HTTPS; else { err = ERROR_WINHTTP_UNRECOGNIZED_SCHEME; @@ -343,15 +339,15 @@ exit: static INTERNET_SCHEME get_scheme( const WCHAR *scheme, DWORD len ) { - if (!wcsncmp( scheme, scheme_http, len )) return INTERNET_SCHEME_HTTP; - if (!wcsncmp( scheme, scheme_https, len )) return INTERNET_SCHEME_HTTPS; + if (!wcsncmp( scheme, L"http", len )) return INTERNET_SCHEME_HTTP; + if (!wcsncmp( scheme, L"https", len )) return INTERNET_SCHEME_HTTPS; return 0; } static const WCHAR *get_scheme_string( INTERNET_SCHEME scheme ) { - if (scheme == INTERNET_SCHEME_HTTP) return scheme_http; - if (scheme == INTERNET_SCHEME_HTTPS) return scheme_https; + if (scheme == INTERNET_SCHEME_HTTP) return L"http"; + if (scheme == INTERNET_SCHEME_HTTPS) return L"https"; return NULL; } @@ -375,7 +371,6 @@ static DWORD get_comp_length( DWORD len, DWORD flags, WCHAR *comp ) static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) { - static const WCHAR formatW[] = {'%','u',0}; INTERNET_SCHEME scheme; *len = 0; @@ -419,7 +414,7 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) { WCHAR port[sizeof("65535")]; - *len += swprintf( port, ARRAY_SIZE(port), formatW, uc->nPort ); + *len += swprintf( port, ARRAY_SIZE(port), L"%u", uc->nPort ); *len += 1; /* ":" */ } if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ @@ -434,7 +429,6 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) */ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { - static const WCHAR formatW[] = {'%','u',0}; DWORD len, len_escaped; INTERNET_SCHEME scheme; @@ -511,7 +505,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (!uses_default_port( scheme, uc->nPort )) { *url++ = ':'; - url += swprintf( url, sizeof("65535"), formatW, uc->nPort ); + url += swprintf( url, sizeof("65535"), L"%u", uc->nPort ); } /* add slash between hostname and path if necessary */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index a820241734..b3f7092d85 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -26,14 +26,6 @@ #include "sspi.h" #include "wincrypt.h" -static const WCHAR getW[] = {'G','E','T',0}; -static const WCHAR postW[] = {'P','O','S','T',0}; -static const WCHAR headW[] = {'H','E','A','D',0}; -static const WCHAR slashW[] = {'/',0}; -static const WCHAR http1_0[] = {'H','T','T','P','/','1','.','0',0}; -static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; -static const WCHAR chunkedW[] = {'c','h','u','n','k','e','d',0}; - struct object_header; struct object_vtbl { -- 2.20.1

1 0

[PATCH 1/2] winedbg: Use correct CALL operand size when fetching the delta.
by Conor McCarthy 22 Nov '19

22 Nov '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- programs/winedbg/be_x86_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 2346bc4d..5b95cefa 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -356,14 +356,14 @@ static BOOL fetch_value(const char* addr, unsigned sz, int* value) switch (sz) { - case 8: + case 1: if (!dbg_read_memory(addr, &value8, sizeof(value8))) return FALSE; *value = value8; break; - case 16: + case 2: if (!dbg_read_memory(addr, &value16, sizeof(value16))) return FALSE; *value = value16; - case 32: + case 4: if (!dbg_read_memory(addr, value, sizeof(*value))) return FALSE; break; default: return FALSE; -- 2.24.0

1 1

[PATCH] testbot: Give a higher priority to wine VMs.
by Francois Gouget 22 Nov '19

22 Nov '19

They are needed for patches that don't impact the Windows tests and thus are more likely to be needed next than Windows VMs. The build VMs should still remain in the top spot because delaying their tasks delays all the corresponding Windows tasks, which would leave the TestBot partially idle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index b6a89984c..c28e14331 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -411,9 +411,9 @@ sub _CheckAndClassifyVMs() $VM->Role eq "winetest" ? 10 : 20) + # extra ($VM->Type eq "build" ? 0 : - $VM->Type eq "win64" ? 1 : - $VM->Type eq "win32" ? 2 : - 3); # wine + $VM->Type eq "wine" ? 1 : + $VM->Type eq "win64" ? 2 : + 3); # win32 } # If a VM was in an inconsistent state, update the jobs status fields before -- 2.20.1

1 0

[PATCH 1/7] ucrtbase: Treat year more consistently in strftime.
by Jeff Smith 22 Nov '19

22 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/time.c | 27 ++++++++++++++------------- dlls/ucrtbase/tests/misc.c | 12 ++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4248fe4f85..8534738406 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1190,6 +1190,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, { MSVCRT_size_t ret, tmp; BOOL alternate; + int year = mstm ? mstm->tm_year + 1900 : -1; if(!str || !format) { if(str && max) @@ -1272,8 +1273,9 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #if _MSVCR_VER>=140 case 'C': - tmp = (1900+mstm->tm_year)/100; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) + goto einval_error; + if(!strftime_int(str, &ret, max, year/100, alternate ? 0 : 2, 0, 99)) return 0; break; #endif @@ -1283,6 +1285,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #if _MSVCR_VER>=140 case 'D': + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) + goto einval_error; if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) return 0; if(ret < max) @@ -1291,7 +1295,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; if(ret < max) str[ret++] = '/'; - if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) + if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99)) return 0; break; case 'e': @@ -1301,8 +1305,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, str[ret-2] = ' '; break; case 'F': - tmp = 1900+mstm->tm_year; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999)) return 0; if(ret < max) str[ret++] = '-'; @@ -1315,7 +1318,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; case 'g': case 'G': - tmp = 1900 + mstm->tm_year; + tmp = year; if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) tmp--; else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) @@ -1409,18 +1412,16 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; case 'y': #if _MSVCR_VER>=140 - if(!MSVCRT_CHECK_PMT(mstm->tm_year>=-1900 && mstm->tm_year<=8099)) - goto einval_error; - tmp = (mstm->tm_year+1900)%100; + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) #else - tmp = mstm->tm_year%100; + if(!MSVCRT_CHECK_PMT(year>=1900)) #endif - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + goto einval_error; + if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99)) return 0; break; case 'Y': - tmp = 1900+mstm->tm_year; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999)) return 0; break; case 'z': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index debf0b87a0..9c5045b66a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -930,23 +930,23 @@ static void test_strftime(void) BOOL todo; BOOL todo_handler; } tests[] = { - {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }, FALSE, TRUE}, - {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE}, + {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }}, + {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%C", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%C", "18", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, - {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, FALSE, TRUE}, + {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, - {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, FALSE, TRUE}, + {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, - {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }, TRUE}, + {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, {"%D", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, - {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE}, + {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, -- 2.23.0

3 14

[PATCH v3] include: update definitions in ras.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

v3: fix definitions of in_addr and in6_addr v2: fix build errors Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/ras.h | 335 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 287 insertions(+), 48 deletions(-) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6db..fea02dfc516f 100644 --- a/include/ras.h +++ b/include/ras.h @@ -1,5 +1,6 @@ /* * Copyright (C) 1998 Marcus Meissner + * Copyright (C) 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,16 +29,29 @@ extern "C" { #include <inaddr.h> #include <in6addr.h> +typedef enum RASAPIVERSION +{ + RASAPIVERSION_500 = 1, + RASAPIVERSION_501, + RASAPIVERSION_600, + RASAPIVERSION_601, +} RASAPIVERSION; + +#define RASAPIVERSION_CURRENT RASAPIVERSION_601 + #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 #define RAS_MaxDeviceType 16 #define RAS_MaxEntryName 256 #define RAS_MaxPhoneNumber 128 +#define RAS_MaxIpAddress 15 +#define RAS_MaxIpxAddress 21 #define RAS_MaxAreaCode 10 #define RAS_MaxPadType 32 #define RAS_MaxX25Address 200 #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 +#define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ @@ -75,6 +89,31 @@ DECL_WINELIB_TYPE_AW(LPRASDEVINFO) DECLARE_HANDLE(HRASCONN); typedef HRASCONN* LPHRASCONN; +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 +#define RASCF_OwnerKnown 0x00000004 +#define RASCF_OwnerMatch 0x00000008 + +#define RASCF_IsOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown|RASCF_OwnerMatch)) +#define RASCF_IsNotOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown)) + +#define RDEOPT_UsePrefixSuffix 0x00000001 +#define RDEOPT_PausedStates 0x00000002 +#define RDEOPT_IgnoreModemSpeaker 0x00000004 +#define RDEOPT_SetModemSpeaker 0x00000008 +#define RDEOPT_IgnoreSoftwareCompression 0x00000010 +#define RDEOPT_SetSoftwareCompression 0x00000020 +#define RDEOPT_DisableConnectedUI 0x00000040 +#define RDEOPT_DisableReconnectUI 0x00000080 +#define RDEOPT_DisableReconnect 0x00000100 +#define RDEOPT_NoUser 0x00000200 +#define RDEOPT_PauseOnScript 0x00000400 +#define RDEOPT_Router 0x00000800 +#define RDEOPT_CustomDial 0x00001000 +#define RDEOPT_UseCustomScripting 0x00002000 +#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000 +#define RDEOPT_EapInfoCryptInCapable 0x00008000 + typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hRasConn; @@ -106,14 +145,20 @@ typedef struct tagRASCONNW { DECL_WINELIB_TYPE_AW(RASCONN) DECL_WINELIB_TYPE_AW(LPRASCONN) +#define REN_User 0x00000000 +#define REN_AllUsers 0x00000001 typedef struct tagRASENTRYNAMEA { DWORD dwSize; CHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + CHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEA, *LPRASENTRYNAMEA; typedef struct tagRASENTRYNAMEW { DWORD dwSize; WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + WCHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEW, *LPRASENTRYNAMEW; DECL_WINELIB_TYPE_AW(RASENTRYNAME) @@ -129,6 +174,8 @@ typedef struct tagRASDIALPARAMSA { CHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPSTR szEncPassword; } RASDIALPARAMSA, *LPRASDIALPARAMSA; typedef struct tagRASDIALPARAMSW { @@ -141,31 +188,123 @@ typedef struct tagRASDIALPARAMSW { WCHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPWSTR szEncPassword; } RASDIALPARAMSW, *LPRASDIALPARAMSW; DECL_WINELIB_TYPE_AW(RASDIALPARAMS) DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS) typedef struct tagRASIPADDR { - BYTE classA,classB,classC,classD; + BYTE classA,classB,classC,classD; } RASIPADDR; -#define RASEO_UseCountryAndAreaCodes 0x0001 -#define RASEO_SpecificIpAddr 0x0002 -#define RASEO_SpecificNameServers 0x0004 -#define RASEO_IpHeaderCompression 0x0008 -#define RASEO_RemoteDefaultGateway 0x0010 -#define RASEO_DisableLcpExtensions 0x0020 -#define RASEO_TerminalBeforeDial 0x0040 -#define RASEO_TerminalAfterDial 0x0080 -#define RASEO_ModemLights 0x0100 -#define RASEO_SwCompression 0x0200 -#define RASEO_RequireEncryptedPw 0x0400 -#define RASEO_RequireMsEncryptedPw 0x0800 -#define RASEO_RequireDataEncryption 0x1000 -#define RASEO_NetworkLogon 0x2000 -#define RASEO_UseLogonCredentials 0x4000 -#define RASEO_PromoteAlternates 0x8000 +typedef struct WS(in_addr) RASIPV4ADDR; +typedef struct WS(in6_addr) RASIPV6ADDR; + +#define RASEO_UseCountryAndAreaCodes 0x00000001 +#define RASEO_SpecificIpAddr 0x00000002 +#define RASEO_SpecificNameServers 0x00000004 +#define RASEO_IpHeaderCompression 0x00000008 +#define RASEO_RemoteDefaultGateway 0x00000010 +#define RASEO_DisableLcpExtensions 0x00000020 +#define RASEO_TerminalBeforeDial 0x00000040 +#define RASEO_TerminalAfterDial 0x00000080 +#define RASEO_ModemLights 0x00000100 +#define RASEO_SwCompression 0x00000200 +#define RASEO_RequireEncryptedPw 0x00000400 +#define RASEO_RequireMsEncryptedPw 0x00000800 +#define RASEO_RequireDataEncryption 0x00001000 +#define RASEO_NetworkLogon 0x00002000 +#define RASEO_UseLogonCredentials 0x00004000 +#define RASEO_PromoteAlternates 0x00008000 +#define RASEO_SecureLocalFiles 0x00010000 +#define RASEO_RequireEAP 0x00020000 +#define RASEO_RequirePAP 0x00040000 +#define RASEO_RequireSPAP 0x00080000 +#define RASEO_Custom 0x00100000 +#define RASEO_PreviewPhoneNumber 0x00200000 +#define RASEO_SharedPhoneNumbers 0x00800000 +#define RASEO_PreviewUserPw 0x01000000 +#define RASEO_PreviewDomain 0x02000000 +#define RASEO_ShowDialingProgress 0x04000000 +#define RASEO_RequireCHAP 0x08000000 +#define RASEO_RequireMsCHAP 0x10000000 +#define RASEO_RequireMsCHAP2 0x20000000 +#define RASEO_RequireW95MSCHAP 0x40000000 +#define RASEO_CustomScript 0x80000000 + +#define RASNP_NetBEUI 0x00000001 +#define RASNP_Ipx 0x00000002 +#define RASNP_Ip 0x00000004 +#define RASNP_Ipv6 0x00000008 + +#define RASFP_Ppp 0x00000001 +#define RASFP_Slip 0x00000002 +#define RASFP_Ras 0x00000004 + +#define RASEDM_DialAll 1 +#define RASEDM_DialAsNeeded 2 + +#define RASIDS_Disabled 0xffffffff +#define RASIDS_UseGlobalValue 0 + +#define RASET_Phone 1 +#define RASET_Vpn 2 +#define RASET_Direct 3 +#define RASET_Internet 4 +#define RASET_Broadband 5 + +#define ET_None 0 +#define ET_Require 1 +#define ET_RequireMax 2 +#define ET_Optional 3 + +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 +#define VS_SstpOnly 5 +#define VS_SstpFirst 6 +#define VS_Ikev2Only 7 +#define VS_Ikev2First 8 +#define VS_GREOnly 9 +#define VS_PptpSstp 12 +#define VS_L2tpSstp 13 +#define VS_Ikev2Sstp 14 + +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#define RASEO2_SecureRoutingCompartment 0x00000400 +#define RASEO2_UseTypicalSettings 0x00000800 +#define RASEO2_IPv6SpecificNameServers 0x00001000 +#define RASEO2_IPv6RemoteDefaultGateway 0x00002000 +#define RASEO2_RegisterIpWithDNS 0x00004000 +#define RASEO2_UseDNSSuffixForRegistration 0x00008000 +#define RASEO2_IPv4ExplicitMetric 0x00010000 +#define RASEO2_IPv6ExplicitMetric 0x00020000 +#define RASEO2_DisableIKENameEkuCheck 0x00040000 +#define RASEO2_DisableClassBasedStaticRoute 0x00080000 +#define RASEO2_SpecificIPv6Addr 0x00100000 +#define RASEO2_DisableMobility 0x00200000 +#define RASEO2_RequireMachineCertificates 0x00400000 +#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000 +#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000 +#define RASEO2_CacheCredentials 0x02000000 +#define RASEO2_AutoTriggerCapable 0x04000000 +#define RASEO2_IsThirdPartyProfile 0x08000000 +#define RASEO2_AuthTypeIsOtp 0x10000000 +#define RASEO2_IsAlwaysOn 0x20000000 +#define RASEO2_IsPrivateNetwork 0x40000000 typedef struct tagRASENTRYA { DWORD dwSize; DWORD dwfOptions; @@ -238,6 +377,15 @@ typedef struct tagRASENTRYA { CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYA, *LPRASENTRYA; typedef struct tagRASENTRYW { @@ -312,45 +460,84 @@ typedef struct tagRASENTRYW { WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYW, *LPRASENTRYW; DECL_WINELIB_TYPE_AW(RASENTRY) +#define RASTUNNELENDPOINT_UNKNOWN 0 +#define RASTUNNELENDPOINT_IPv4 1 +#define RASTUNNELENDPOINT_IPv6 2 +typedef struct tagRASTUNNELENDPOINT +{ + DWORD dwType; + union { + RASIPV4ADDR ipv4; + RASIPV6ADDR ipv6; + } DUMMYUNIONNAME; +} RASTUNNELENDPOINT; + #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 typedef enum tagRASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - RASCS_SubEntryConnected, - RASCS_SubEntryDisconnected, - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE, *LPRASCONNSTATE; + RASCS_OpenPort = 0, + RASCS_PortOpened, + RASCS_ConnectDevice, + RASCS_DeviceConnected, + RASCS_AllDevicesConnected, + RASCS_Authenticate, + RASCS_AuthNotify, + RASCS_AuthRetry, + RASCS_AuthCallback, + RASCS_AuthChangePassword, + RASCS_AuthProject, + RASCS_AuthLinkSpeed, + RASCS_AuthAck, + RASCS_ReAuthenticate, + RASCS_Authenticated, + RASCS_PrepareForCallback, + RASCS_WaitForModemReset, + RASCS_WaitForCallback, + RASCS_Projected, + RASCS_StartAuthentication, + RASCS_CallbackComplete, + RASCS_LogonNetwork, + RASCS_SubEntryConnected, + RASCS_SubEntryDisconnected, + RASCS_ApplySettings, + RASCS_Interactive = RASCS_PAUSED, + RASCS_RetryAuthentication, + RASCS_CallbackSetByCaller, + RASCS_PasswordExpired, + RASCS_InvokeEapUI, + RASCS_Connected = RASCS_DONE, + RASCS_Disconnected +} RASCONNSTATE, *LPRASCONNSTATE; + +#define RASDIALEVENT "RasDialEvent" +#define WM_RASDIALEVENT 0xCCCD + +typedef VOID (WINAPI *RASDIALFUNC)(UINT, RASCONNSTATE, DWORD); +typedef VOID (WINAPI *RASDIALFUNC1)(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI *RASDIALFUNC2)(ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); + +#define RASCSS_DONE 0x2000 +typedef enum tagRASCONNSUBSTATE +{ + RASCSS_None = 0, + RASCSS_Dormant, + RASCSS_Reconnecting, + RASCSS_Reconnected = RASCSS_DONE, +} RASCONNSUBSTATE, *LPRASCONNSUBSTATE; typedef struct tagRASCONNSTATUSA { @@ -359,6 +546,10 @@ typedef struct tagRASCONNSTATUSA DWORD dwError; CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; + CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSA, *LPRASCONNSTATUSA; typedef struct tagRASCONNSTATUSW @@ -368,6 +559,10 @@ typedef struct tagRASCONNSTATUSW DWORD dwError; WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; + WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSW, *LPRASCONNSTATUSW; DECL_WINELIB_TYPE_AW(RASCONNSTATUS) @@ -378,7 +573,9 @@ typedef enum tagRASPROJECTION RASP_PppNbf = 0x803F, RASP_PppIpx = 0x802B, RASP_PppIp = 0x8021, + RASP_PppCcp = 0x80FD, RASP_PppLcp = 0xC021, + RASP_PppIpv6 = 0x8057, RASP_Slip = 0x20000 } RASPROJECTION, *LPRASPROJECTION; @@ -402,12 +599,28 @@ typedef struct tagRASSUBENTRYW DWORD dwAlternateOffset; } RASSUBENTRYW, *LPRASSUBENTRYW; +typedef struct tagRASEAPINFO +{ + DWORD dwSizeofEapInfo; + BYTE *pbEapInfo; +} RASEAPINFO; + +typedef struct tagRASDEVSPECIFICINFO +{ + DWORD dwSize; + BYTE *pbDevSpecificInfo; +} RASDEVSPECIFICINFO, *PRASDEVSPECIFICINFO; + typedef struct tagRASDIALEXTENSIONS { DWORD dwSize; DWORD dwfOptions; HWND hwndParent; ULONG_PTR reserved; + ULONG_PTR reserved1; + RASEAPINFO RasEapInfo; + BOOL fSkipPppAuth; + RASDEVSPECIFICINFO RasDevSpecificInfo; } RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS; typedef struct tagRASAUTODIALENTRYA @@ -426,6 +639,32 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +#define RASADFLG_PositionDlg 0x00000001 +typedef struct tagRASADPARAMS +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; +} RASADPARAMS, *LPRASADPARAMS; + +typedef BOOL (WINAPI *RASADFUNCA)(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD); +typedef BOOL (WINAPI *RASADFUNCW)(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD); + +#define RASADP_DisableConnectionQuery 0 +#define RASADP_LoginSessionDisable 1 +#define RASADP_SavedAddressesLimit 2 +#define RASADP_FailedConnectionTimeout 3 +#define RASADP_ConnectionQueryTimeout 4 + +#define RASCN_Connection 0x00000001 +#define RASCN_Disconnection 0x00000002 +#define RASCN_BandwidthAdded 0x00000004 +#define RASCN_BandwidthRemoved 0x00000008 +#define RASCN_Dormant 0x00000010 +#define RASCN_ReConnection 0x00000020 + typedef struct _RAS_STATS { DWORD dwSize; -- 2.21.0

2 1

[PATCH] user32/test: Start the AdjustWindowRectExForDpi() from a known state.
by Francois Gouget 22 Nov '19

22 Nov '19

rect and rect2 have been modified by the previous test by the time we get to AdjustWindowRectExForDpi(). This makes interpreting the traces harder in case of a failure. So reset them to the same starting state as for the AdjustWindowRectEx() test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- This does not fix the Windows 10 1709+ failures :-( dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 78dc55f00a8..b9309a8cba6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5407,6 +5407,8 @@ static void test_AWR_flags(void) style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); if (pAdjustWindowRectExForDpi) { + SetRect( &rect, 100, 100, 200, 200 ); + rect2 = rect; pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 ); wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 ); ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n", -- 2.20.1

2 2

[PATCH] urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.
by Jacek Caban 22 Nov '19

22 Nov '19

From: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 13 +++++++++++-- include/urlmon.idl | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-)

2 1

[PATCH] urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709.
by Jacek Caban 22 Nov '19

22 Nov '19

From: Francois Gouget <fgouget(a)free.fr> It does not check the relative path and thus will accept non-sensical % codes. This is fixed in Windows 10 1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] urlmon/tests: Don't perform extra uri tests if a failure was expected.
by Francois Gouget 22 Nov '19

22 Nov '19

When a failure is expected uri_combine_tests[] has no extra test data. So don't attempt to perform extra tests even if CoInternetCombineIUri() unexpectedly succeeds. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9069a9c1763..9d6af349dcc 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10587,7 +10587,7 @@ static void test_CoInternetCombineIUri(void) { ok(hr == uri_combine_tests[i].expected, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && uri_combine_tests[i].expected) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { -- 2.20.1

2 1

[PATCH] vbscript: Add script TypeInfo stub.
by Jacek Caban 22 Nov '19

22 Nov '19

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/vbscript/vbdisp.c | 268 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Trace the pstrItemName parameter.
by Gabriel Ivăncescu 22 Nov '19

22 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 60711fc..219d923 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -606,7 +606,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR { JScript *This = impl_from_IActiveScript(iface); - TRACE("(%p)->(%p)\n", This, ppdisp); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(pstrItemName), ppdisp); if(!ppdisp) return E_POINTER; -- 2.21.0

2 3

[PATCH] jscript: Fix a copy-paste mistake.
by Gabriel Ivăncescu 22 Nov '19

22 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 60711fc..67138da 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -130,7 +130,7 @@ static void clear_script_queue(JScript *This) static void clear_persistent_code_list(JScript *This) { - while(!list_empty(&This->queued_code)) + while(!list_empty(&This->persistent_code)) { bytecode_t *iter = LIST_ENTRY(list_head(&This->persistent_code), bytecode_t, entry); list_remove(&iter->entry); -- 2.21.0

2 1

[PATCH v2] include: update definitions in ras.h
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/ras.h | 336 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 288 insertions(+), 48 deletions(-) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6db..970884164385 100644 --- a/include/ras.h +++ b/include/ras.h @@ -1,5 +1,6 @@ /* * Copyright (C) 1998 Marcus Meissner + * Copyright (C) 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,16 +29,29 @@ extern "C" { #include <inaddr.h> #include <in6addr.h> +typedef enum RASAPIVERSION +{ + RASAPIVERSION_500 = 1, + RASAPIVERSION_501, + RASAPIVERSION_600, + RASAPIVERSION_601, +} RASAPIVERSION; + +#define RASAPIVERSION_CURRENT RASAPIVERSION_601 + #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 #define RAS_MaxDeviceType 16 #define RAS_MaxEntryName 256 #define RAS_MaxPhoneNumber 128 +#define RAS_MaxIpAddress 15 +#define RAS_MaxIpxAddress 21 #define RAS_MaxAreaCode 10 #define RAS_MaxPadType 32 #define RAS_MaxX25Address 200 #define RAS_MaxFacilities 200 #define RAS_MaxUserData 200 +#define RAS_MaxReplyMessage 1024 #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ @@ -75,6 +89,31 @@ DECL_WINELIB_TYPE_AW(LPRASDEVINFO) DECLARE_HANDLE(HRASCONN); typedef HRASCONN* LPHRASCONN; +#define RASCF_AllUsers 0x00000001 +#define RASCF_GlobalCreds 0x00000002 +#define RASCF_OwnerKnown 0x00000004 +#define RASCF_OwnerMatch 0x00000008 + +#define RASCF_IsOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown|RASCF_OwnerMatch)) +#define RASCF_IsNotOwner(rascFlags) (((rascFlags) & (RASCF_OwnerKnown|RASCF_OwnerMatch)) == (RASCF_OwnerKnown)) + +#define RDEOPT_UsePrefixSuffix 0x00000001 +#define RDEOPT_PausedStates 0x00000002 +#define RDEOPT_IgnoreModemSpeaker 0x00000004 +#define RDEOPT_SetModemSpeaker 0x00000008 +#define RDEOPT_IgnoreSoftwareCompression 0x00000010 +#define RDEOPT_SetSoftwareCompression 0x00000020 +#define RDEOPT_DisableConnectedUI 0x00000040 +#define RDEOPT_DisableReconnectUI 0x00000080 +#define RDEOPT_DisableReconnect 0x00000100 +#define RDEOPT_NoUser 0x00000200 +#define RDEOPT_PauseOnScript 0x00000400 +#define RDEOPT_Router 0x00000800 +#define RDEOPT_CustomDial 0x00001000 +#define RDEOPT_UseCustomScripting 0x00002000 +#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000 +#define RDEOPT_EapInfoCryptInCapable 0x00008000 + typedef struct tagRASCONNA { DWORD dwSize; HRASCONN hRasConn; @@ -106,14 +145,20 @@ typedef struct tagRASCONNW { DECL_WINELIB_TYPE_AW(RASCONN) DECL_WINELIB_TYPE_AW(LPRASCONN) +#define REN_User 0x00000000 +#define REN_AllUsers 0x00000001 typedef struct tagRASENTRYNAMEA { DWORD dwSize; CHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + CHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEA, *LPRASENTRYNAMEA; typedef struct tagRASENTRYNAMEW { DWORD dwSize; WCHAR szEntryName[ RAS_MaxEntryName + 1 ]; + DWORD dwFlags; + WCHAR szPhonebookPath[MAX_PATH + 1]; } RASENTRYNAMEW, *LPRASENTRYNAMEW; DECL_WINELIB_TYPE_AW(RASENTRYNAME) @@ -129,6 +174,8 @@ typedef struct tagRASDIALPARAMSA { CHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPSTR szEncPassword; } RASDIALPARAMSA, *LPRASDIALPARAMSA; typedef struct tagRASDIALPARAMSW { @@ -141,31 +188,124 @@ typedef struct tagRASDIALPARAMSW { WCHAR szDomain[ DNLEN + 1 ]; DWORD dwSubEntry; DWORD dwCallbackId; + DWORD dwIfIndex; + LPWSTR szEncPassword; } RASDIALPARAMSW, *LPRASDIALPARAMSW; DECL_WINELIB_TYPE_AW(RASDIALPARAMS) DECL_WINELIB_TYPE_AW(LPRASDIALPARAMS) typedef struct tagRASIPADDR { - BYTE classA,classB,classC,classD; + BYTE classA,classB,classC,classD; } RASIPADDR; -#define RASEO_UseCountryAndAreaCodes 0x0001 -#define RASEO_SpecificIpAddr 0x0002 -#define RASEO_SpecificNameServers 0x0004 -#define RASEO_IpHeaderCompression 0x0008 -#define RASEO_RemoteDefaultGateway 0x0010 -#define RASEO_DisableLcpExtensions 0x0020 -#define RASEO_TerminalBeforeDial 0x0040 -#define RASEO_TerminalAfterDial 0x0080 -#define RASEO_ModemLights 0x0100 -#define RASEO_SwCompression 0x0200 -#define RASEO_RequireEncryptedPw 0x0400 -#define RASEO_RequireMsEncryptedPw 0x0800 -#define RASEO_RequireDataEncryption 0x1000 -#define RASEO_NetworkLogon 0x2000 -#define RASEO_UseLogonCredentials 0x4000 -#define RASEO_PromoteAlternates 0x8000 +typedef struct in_addr RASIPV4ADDR; + +typedef struct in6_addr RASIPV6ADDR; + +#define RASEO_UseCountryAndAreaCodes 0x00000001 +#define RASEO_SpecificIpAddr 0x00000002 +#define RASEO_SpecificNameServers 0x00000004 +#define RASEO_IpHeaderCompression 0x00000008 +#define RASEO_RemoteDefaultGateway 0x00000010 +#define RASEO_DisableLcpExtensions 0x00000020 +#define RASEO_TerminalBeforeDial 0x00000040 +#define RASEO_TerminalAfterDial 0x00000080 +#define RASEO_ModemLights 0x00000100 +#define RASEO_SwCompression 0x00000200 +#define RASEO_RequireEncryptedPw 0x00000400 +#define RASEO_RequireMsEncryptedPw 0x00000800 +#define RASEO_RequireDataEncryption 0x00001000 +#define RASEO_NetworkLogon 0x00002000 +#define RASEO_UseLogonCredentials 0x00004000 +#define RASEO_PromoteAlternates 0x00008000 +#define RASEO_SecureLocalFiles 0x00010000 +#define RASEO_RequireEAP 0x00020000 +#define RASEO_RequirePAP 0x00040000 +#define RASEO_RequireSPAP 0x00080000 +#define RASEO_Custom 0x00100000 +#define RASEO_PreviewPhoneNumber 0x00200000 +#define RASEO_SharedPhoneNumbers 0x00800000 +#define RASEO_PreviewUserPw 0x01000000 +#define RASEO_PreviewDomain 0x02000000 +#define RASEO_ShowDialingProgress 0x04000000 +#define RASEO_RequireCHAP 0x08000000 +#define RASEO_RequireMsCHAP 0x10000000 +#define RASEO_RequireMsCHAP2 0x20000000 +#define RASEO_RequireW95MSCHAP 0x40000000 +#define RASEO_CustomScript 0x80000000 + +#define RASNP_NetBEUI 0x00000001 +#define RASNP_Ipx 0x00000002 +#define RASNP_Ip 0x00000004 +#define RASNP_Ipv6 0x00000008 + +#define RASFP_Ppp 0x00000001 +#define RASFP_Slip 0x00000002 +#define RASFP_Ras 0x00000004 + +#define RASEDM_DialAll 1 +#define RASEDM_DialAsNeeded 2 + +#define RASIDS_Disabled 0xffffffff +#define RASIDS_UseGlobalValue 0 + +#define RASET_Phone 1 +#define RASET_Vpn 2 +#define RASET_Direct 3 +#define RASET_Internet 4 +#define RASET_Broadband 5 + +#define ET_None 0 +#define ET_Require 1 +#define ET_RequireMax 2 +#define ET_Optional 3 + +#define VS_Default 0 +#define VS_PptpOnly 1 +#define VS_PptpFirst 2 +#define VS_L2tpOnly 3 +#define VS_L2tpFirst 4 +#define VS_SstpOnly 5 +#define VS_SstpFirst 6 +#define VS_Ikev2Only 7 +#define VS_Ikev2First 8 +#define VS_GREOnly 9 +#define VS_PptpSstp 12 +#define VS_L2tpSstp 13 +#define VS_Ikev2Sstp 14 + +#define RASEO2_SecureFileAndPrint 0x00000001 +#define RASEO2_SecureClientForMSNet 0x00000002 +#define RASEO2_DontNegotiateMultilink 0x00000004 +#define RASEO2_DontUseRasCredentials 0x00000008 +#define RASEO2_UsePreSharedKey 0x00000010 +#define RASEO2_Internet 0x00000020 +#define RASEO2_DisableNbtOverIP 0x00000040 +#define RASEO2_UseGlobalDeviceSettings 0x00000080 +#define RASEO2_ReconnectIfDropped 0x00000100 +#define RASEO2_SharePhoneNumbers 0x00000200 +#define RASEO2_SecureRoutingCompartment 0x00000400 +#define RASEO2_UseTypicalSettings 0x00000800 +#define RASEO2_IPv6SpecificNameServers 0x00001000 +#define RASEO2_IPv6RemoteDefaultGateway 0x00002000 +#define RASEO2_RegisterIpWithDNS 0x00004000 +#define RASEO2_UseDNSSuffixForRegistration 0x00008000 +#define RASEO2_IPv4ExplicitMetric 0x00010000 +#define RASEO2_IPv6ExplicitMetric 0x00020000 +#define RASEO2_DisableIKENameEkuCheck 0x00040000 +#define RASEO2_DisableClassBasedStaticRoute 0x00080000 +#define RASEO2_SpecificIPv6Addr 0x00100000 +#define RASEO2_DisableMobility 0x00200000 +#define RASEO2_RequireMachineCertificates 0x00400000 +#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000 +#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000 +#define RASEO2_CacheCredentials 0x02000000 +#define RASEO2_AutoTriggerCapable 0x04000000 +#define RASEO2_IsThirdPartyProfile 0x08000000 +#define RASEO2_AuthTypeIsOtp 0x10000000 +#define RASEO2_IsAlwaysOn 0x20000000 +#define RASEO2_IsPrivateNetwork 0x40000000 typedef struct tagRASENTRYA { DWORD dwSize; DWORD dwfOptions; @@ -238,6 +378,15 @@ typedef struct tagRASENTRYA { CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYA, *LPRASENTRYA; typedef struct tagRASENTRYW { @@ -312,45 +461,84 @@ typedef struct tagRASENTRYW { WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; DWORD dwRedialCount; DWORD dwRedialPause; + + RASIPV6ADDR ipv6addrDns; + RASIPV6ADDR ipv6addrDnsAlt; + DWORD dwIPv4InterfaceMetric; + DWORD dwIPv6InterfaceMetric; + + RASIPV6ADDR ipv6addr; + DWORD dwIPv6PrefixLength; + DWORD dwNetworkOutageTime; } RASENTRYW, *LPRASENTRYW; DECL_WINELIB_TYPE_AW(RASENTRY) +#define RASTUNNELENDPOINT_UNKNOWN 0 +#define RASTUNNELENDPOINT_IPv4 1 +#define RASTUNNELENDPOINT_IPv6 2 +typedef struct tagRASTUNNELENDPOINT +{ + DWORD dwType; + union { + RASIPV4ADDR ipv4; + RASIPV6ADDR ipv6; + } DUMMYUNIONNAME; +} RASTUNNELENDPOINT; + #define RASCS_PAUSED 0x1000 #define RASCS_DONE 0x2000 typedef enum tagRASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - RASCS_SubEntryConnected, - RASCS_SubEntryDisconnected, - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE, *LPRASCONNSTATE; + RASCS_OpenPort = 0, + RASCS_PortOpened, + RASCS_ConnectDevice, + RASCS_DeviceConnected, + RASCS_AllDevicesConnected, + RASCS_Authenticate, + RASCS_AuthNotify, + RASCS_AuthRetry, + RASCS_AuthCallback, + RASCS_AuthChangePassword, + RASCS_AuthProject, + RASCS_AuthLinkSpeed, + RASCS_AuthAck, + RASCS_ReAuthenticate, + RASCS_Authenticated, + RASCS_PrepareForCallback, + RASCS_WaitForModemReset, + RASCS_WaitForCallback, + RASCS_Projected, + RASCS_StartAuthentication, + RASCS_CallbackComplete, + RASCS_LogonNetwork, + RASCS_SubEntryConnected, + RASCS_SubEntryDisconnected, + RASCS_ApplySettings, + RASCS_Interactive = RASCS_PAUSED, + RASCS_RetryAuthentication, + RASCS_CallbackSetByCaller, + RASCS_PasswordExpired, + RASCS_InvokeEapUI, + RASCS_Connected = RASCS_DONE, + RASCS_Disconnected +} RASCONNSTATE, *LPRASCONNSTATE; + +#define RASDIALEVENT "RasDialEvent" +#define WM_RASDIALEVENT 0xCCCD + +typedef VOID (WINAPI *RASDIALFUNC)(UINT, RASCONNSTATE, DWORD); +typedef VOID (WINAPI *RASDIALFUNC1)(HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); +typedef DWORD (WINAPI *RASDIALFUNC2)(ULONG_PTR, DWORD, HRASCONN, UINT, RASCONNSTATE, DWORD, DWORD); + +#define RASCSS_DONE 0x2000 +typedef enum tagRASCONNSUBSTATE +{ + RASCSS_None = 0, + RASCSS_Dormant, + RASCSS_Reconnecting, + RASCSS_Reconnected = RASCSS_DONE, +} RASCONNSUBSTATE, *LPRASCONNSUBSTATE; typedef struct tagRASCONNSTATUSA { @@ -359,6 +547,10 @@ typedef struct tagRASCONNSTATUSA DWORD dwError; CHAR szDeviceType[RAS_MaxDeviceType + 1]; CHAR szDeviceName[RAS_MaxDeviceName + 1]; + CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSA, *LPRASCONNSTATUSA; typedef struct tagRASCONNSTATUSW @@ -368,6 +560,10 @@ typedef struct tagRASCONNSTATUSW DWORD dwError; WCHAR szDeviceType[RAS_MaxDeviceType + 1]; WCHAR szDeviceName[RAS_MaxDeviceName + 1]; + WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1]; + RASTUNNELENDPOINT localEndPoint; + RASTUNNELENDPOINT remoteEndPoint; + RASCONNSUBSTATE rasconnsubstate; } RASCONNSTATUSW, *LPRASCONNSTATUSW; DECL_WINELIB_TYPE_AW(RASCONNSTATUS) @@ -378,7 +574,9 @@ typedef enum tagRASPROJECTION RASP_PppNbf = 0x803F, RASP_PppIpx = 0x802B, RASP_PppIp = 0x8021, + RASP_PppCcp = 0x80FD, RASP_PppLcp = 0xC021, + RASP_PppIpv6 = 0x8057, RASP_Slip = 0x20000 } RASPROJECTION, *LPRASPROJECTION; @@ -402,12 +600,28 @@ typedef struct tagRASSUBENTRYW DWORD dwAlternateOffset; } RASSUBENTRYW, *LPRASSUBENTRYW; +typedef struct tagRASEAPINFO +{ + DWORD dwSizeofEapInfo; + BYTE *pbEapInfo; +} RASEAPINFO; + +typedef struct tagRASDEVSPECIFICINFO +{ + DWORD dwSize; + BYTE *pbDevSpecificInfo; +} RASDEVSPECIFICINFO, *PRASDEVSPECIFICINFO; + typedef struct tagRASDIALEXTENSIONS { DWORD dwSize; DWORD dwfOptions; HWND hwndParent; ULONG_PTR reserved; + ULONG_PTR reserved1; + RASEAPINFO RasEapInfo; + BOOL fSkipPppAuth; + RASDEVSPECIFICINFO RasDevSpecificInfo; } RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS; typedef struct tagRASAUTODIALENTRYA @@ -426,6 +640,32 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +#define RASADFLG_PositionDlg 0x00000001 +typedef struct tagRASADPARAMS +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; +} RASADPARAMS, *LPRASADPARAMS; + +typedef BOOL (WINAPI *RASADFUNCA)(LPSTR, LPSTR, LPRASADPARAMS, LPDWORD); +typedef BOOL (WINAPI *RASADFUNCW)(LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD); + +#define RASADP_DisableConnectionQuery 0 +#define RASADP_LoginSessionDisable 1 +#define RASADP_SavedAddressesLimit 2 +#define RASADP_FailedConnectionTimeout 3 +#define RASADP_ConnectionQueryTimeout 4 + +#define RASCN_Connection 0x00000001 +#define RASCN_Disconnection 0x00000002 +#define RASCN_BandwidthAdded 0x00000004 +#define RASCN_BandwidthRemoved 0x00000008 +#define RASCN_Dormant 0x00000010 +#define RASCN_ReConnection 0x00000020 + typedef struct _RAS_STATS { DWORD dwSize; -- 2.21.0

2 1

[PATCH] gdi32/tests: Reserve sufficient room for DIB data.
by Jeff Smith 22 Nov '19

22 Nov '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48054 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8fe160546c..dea7c3d9db 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -910,10 +910,15 @@ static void test_dibsections(void) ReleaseDC(0, hdc); } +#define DATA_WIDTH 2 +#define DATA_HEIGHT 2 +#define MAX_PLANES 64 +#define MAX_BPP 64 + static void test_dib_formats(void) { BITMAPINFO *bi; - char data[256]; + char data[((DATA_WIDTH * MAX_BPP + 31) / 32) * 4 * DATA_HEIGHT * MAX_PLANES]; void *bits; int planes, bpp, compr, format; HBITMAP hdib, hbmp; @@ -928,9 +933,9 @@ static void test_dib_formats(void) memset( data, 0xaa, sizeof(data) ); - for (bpp = 0; bpp <= 64; bpp++) + for (bpp = 0; bpp <= MAX_BPP; bpp++) { - for (planes = 0; planes <= 64; planes++) + for (planes = 0; planes <= MAX_PLANES; planes++) { for (compr = 0; compr < 8; compr++) { @@ -949,8 +954,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -969,8 +974,8 @@ static void test_dib_formats(void) if (!planes) expect_ok = FALSE; memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1027,8 +1032,8 @@ static void test_dib_formats(void) bpp, bi->bmiHeader.biBitCount ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = planes; bi->bmiHeader.biBitCount = bpp; bi->bmiHeader.biCompression = compr; @@ -1067,8 +1072,8 @@ static void test_dib_formats(void) memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biBitCount = 16; bi->bmiHeader.biCompression = BI_BITFIELDS; @@ -1121,7 +1126,7 @@ static void test_dib_formats(void) ok( ret, "SetDIBits failed with bad bitfields\n" ); bi->bmiHeader.biWidth = -2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1144,7 +1149,7 @@ static void test_dib_formats(void) ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with negative width\n" ); bi->bmiHeader.biWidth = 0; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); @@ -1167,7 +1172,7 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 2, NULL, bi, DIB_RGB_COLORS); ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with zero width\n" ); - bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; bi->bmiHeader.biHeight = 0; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; @@ -1193,8 +1198,8 @@ static void test_dib_formats(void) /* some functions accept DIB_PAL_COLORS+1, but not beyond */ - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+1, &bits, NULL, 0); @@ -1217,8 +1222,8 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+1); ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+1\n" ); - bi->bmiHeader.biWidth = 2; - bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biWidth = DATA_WIDTH; + bi->bmiHeader.biHeight = DATA_HEIGHT; bi->bmiHeader.biBitCount = 1; bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+2, &bits, NULL, 0); -- 2.23.0

3 2

[PATCH v2] comdlg32: update the print dialog resources
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

This is based on prnsetup.dlg from psdk. Further changes will be done for all the common dialogs, based on the dlg files in the psdk. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/comdlg32/comdlg32.rc | 39 ++++++++++++++++++++------------------- dlls/comdlg32/printdlg.c | 14 ++++++-------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index a1689f4abea8..b0f651ffaab0 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -351,7 +351,7 @@ FONT 8, "MS Shell Dlg" } -PRINT32 DIALOG 32, 32, 288, 186 +PRINTDLGORD DIALOG 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print" @@ -359,7 +359,7 @@ FONT 8, "MS Shell Dlg" { GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Properties...", psh2, 212, 17, 60,14, WS_GROUP CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 LTEXT "&Name:", stc6, 16, 20, 36,8 LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -372,7 +372,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON,16,106,64,12 CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER @@ -391,7 +391,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp, 50, 164, 50,14, WS_GROUP } -PRINT32_SETUP DIALOG 32, 32, 288, 178 +PRNSETUPDLGORD DIALOG 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print Setup" FONT 8, "MS Shell Dlg" @@ -399,7 +399,7 @@ BEGIN GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 60, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Properties...", psh2, 212, 17, 60,14, WS_GROUP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 60, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX @@ -428,32 +428,33 @@ END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup Page" +CAPTION "Page Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 112, 36, 8 + CONTROL "", rct1, "Static", SS_WHITERECT | WS_GROUP, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT | WS_GROUP, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT | WS_GROUP, 84, 88, 80, 4 + GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX | WS_GROUP + LTEXT "Si&ze:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 132, 36, 8 + LTEXT "&Source:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 172, 30, 8 + GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX | WS_GROUP + AUTORADIOBUTTON "P&ortrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Margins", grp4, 80, 156, 152, 56, BS_GROUPBOX | WS_GROUP + LTEXT "&Left:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Right:", stc16, 159, 172, 30, 8 EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "T&op:", stc17, 88, 192, 30, 8 + LTEXT "&Top:", stc17, 88, 192, 30, 8 EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bottom:", stc18, 159, 192, 30, 8 EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14 + PUSHBUTTON "&Help",pshHelp, 8, 220, 50, 14 + /* PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14 */ END NEWFILEOPENORD DIALOG 0, 0, 280, 164 diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 0da728b1247f..c9ce75245409 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2115,7 +2115,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateA(const PRINTDLGA *lppd) lppd->lpSetupTemplateName, (LPSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32_SETUP", + hResInfo = FindResourceA(COMDLG32_hInstance, MAKEINTRESOURCEA(PRNSETUPDLGORD), (LPSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } @@ -2128,7 +2128,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateA(const PRINTDLGA *lppd) (LPSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceA(COMDLG32_hInstance, "PRINT32", + hResInfo = FindResourceA(COMDLG32_hInstance, MAKEINTRESOURCEA(PRINTDLGORD), (LPSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } @@ -2140,8 +2140,6 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; - static const WCHAR xpsetup[] = { 'P','R','I','N','T','3','2','_','S','E','T','U','P',0}; - static const WCHAR xprint[] = { 'P','R','I','N','T','3','2',0}; if (lppd->Flags & PD_PRINTSETUP) { if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) { @@ -2151,7 +2149,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) lppd->lpSetupTemplateName, (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceW(COMDLG32_hInstance, xpsetup, (LPWSTR)RT_DIALOG); + hResInfo = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PRNSETUPDLGORD), (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } } else { @@ -2163,7 +2161,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceW(COMDLG32_hInstance, xprint, (LPWSTR)RT_DIALOG); + hResInfo = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PRINTDLGORD), (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } } @@ -2320,7 +2318,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) PRINT_PTRA *PrintStructures; /* load Dialog resources, - * depending on Flags indicates Print32 or Print32_setup dialog + * depending on Flags indicates PRINTDLGORD or PRNSETUPDLGORD dialog */ hDlgTmpl = PRINTDLG_GetDlgTemplateA(lppd); if (!hDlgTmpl) { @@ -2471,7 +2469,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) PRINT_PTRW *PrintStructures; /* load Dialog resources, - * depending on Flags indicates Print32 or Print32_setup dialog + * depending on Flags indicates PRINTDLGORD or PRNSETUPDLGORD dialog */ hDlgTmpl = PRINTDLG_GetDlgTemplateW(lppd); if (!hDlgTmpl) { -- 2.21.0

2 2

[PATCH] include: add the corresponding #define to #ifndef WIN32_NO_STATUS.
by Zhang Shuai 22 Nov '19

22 Nov '19

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- include/ntstatus.h | 1 + include/winnt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index a91ce97731..26b5039539 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -22,6 +22,7 @@ #define __WINE_NTSTATUS_H #ifndef WIN32_NO_STATUS +#define WIN32_NO_STATUS /* * Exception codes diff --git a/include/winnt.h b/include/winnt.h index d18b2e03b4..0a05f145f4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -600,6 +600,7 @@ typedef DWORD FLONG; /* Defines */ #ifndef WIN32_NO_STATUS +#define WIN32_NO_STATUS #define STATUS_WAIT_0 ((DWORD) 0x00000000) #define STATUS_ABANDONED_WAIT_0 ((DWORD) 0x00000080) -- 2.19.1

3 3

[PATCH] dssenh: add keylength tests for enhanced and schannel providers.
by Zhang Shuai 22 Nov '19

22 Nov '19

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/dssenh/tests/dssenh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b62f592f5f..aa99acded0 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -261,7 +261,7 @@ static const struct keylength_test dssDH_keylength[] = { }; static const struct keylength_test dssENH_keylength[] = { - /* min 512 max 1024 (AT_KEYEXCHANGE max 4096), increment by 64*/ + /* min 512 max 1024 (AT_KEYEXCHANGE, CALG_DH_EPHEM, CALG_DH_SF max 4096), increment by 64*/ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 512 << 16, TRUE}, {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ @@ -285,12 +285,16 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_EPHEM, 768 << 16, TRUE}, {CALG_DH_EPHEM, 1024 << 16, TRUE}, {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 1088 << 16, TRUE}, + {CALG_DH_EPHEM, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 512 << 16, TRUE}, {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ {CALG_DH_SF, 768 << 16, TRUE}, {CALG_DH_SF, 1024 << 16, TRUE}, {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 1088 << 16, TRUE}, + {CALG_DH_SF, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ -- 2.19.1

1 0

[PATCH] comdlg32: update the print dialog resources
by Vijay Kiran Kamuju 22 Nov '19

22 Nov '19

This is based on prnsetup.dlg from psdk. Further changes will be done for all the common dialogs, based on the dlg files in the psdk. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/comdlg32/comdlg32.rc | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index a1689f4abea8..b0f651ffaab0 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -351,7 +351,7 @@ FONT 8, "MS Shell Dlg" } -PRINT32 DIALOG 32, 32, 288, 186 +PRINTDLGORD DIALOG 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print" @@ -359,7 +359,7 @@ FONT 8, "MS Shell Dlg" { GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Properties...", psh2, 212, 17, 60,14, WS_GROUP CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 LTEXT "&Name:", stc6, 16, 20, 36,8 LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX @@ -372,7 +372,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON,16,106,64,12 CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER @@ -391,7 +391,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp, 50, 164, 50,14, WS_GROUP } -PRINT32_SETUP DIALOG 32, 32, 288, 178 +PRNSETUPDLGORD DIALOG 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print Setup" FONT 8, "MS Shell Dlg" @@ -399,7 +399,7 @@ BEGIN GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 60, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + PUSHBUTTON "&Properties...", psh2, 212, 17, 60,14, WS_GROUP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 60, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX @@ -428,32 +428,33 @@ END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Setup Page" +CAPTION "Page Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 112, 36, 8 + CONTROL "", rct1, "Static", SS_WHITERECT | WS_GROUP, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT | WS_GROUP, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT | WS_GROUP, 84, 88, 80, 4 + GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX | WS_GROUP + LTEXT "Si&ze:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 132, 36, 8 + LTEXT "&Source:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 172, 30, 8 + GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX | WS_GROUP + AUTORADIOBUTTON "P&ortrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "L&andscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Margins", grp4, 80, 156, 152, 56, BS_GROUPBOX | WS_GROUP + LTEXT "&Left:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Right:", stc16, 159, 172, 30, 8 EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "T&op:", stc17, 88, 192, 30, 8 + LTEXT "&Top:", stc17, 88, 192, 30, 8 EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bottom:", stc18, 159, 192, 30, 8 EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14 + PUSHBUTTON "&Help",pshHelp, 8, 220, 50, 14 + /* PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14 */ END NEWFILEOPENORD DIALOG 0, 0, 280, 164 -- 2.21.0

2 1

[PATCH resend] winex11: Fix off-by-one error in color value scaling
by Alex Henrie 22 Nov '19

22 Nov '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/palette.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 25bdb5f2bf..6cc6a0fe34 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -293,19 +293,19 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template { if( i < NB_RESERVED_COLORS/2 ) { - color.red = sys_pal_template[i].peRed * 65535 / 255; - color.green = sys_pal_template[i].peGreen * 65535 / 255; - color.blue = sys_pal_template[i].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[i]; + color.red = sys_pal_template[i].peRed * (65535 / 255); + color.green = sys_pal_template[i].peGreen * (65535 / 255); + color.blue = sys_pal_template[i].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[i]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } else if( i >= palette_size - NB_RESERVED_COLORS/2 ) { - int j = NB_RESERVED_COLORS + i - palette_size; - color.red = sys_pal_template[j].peRed * 65535 / 255; - color.green = sys_pal_template[j].peGreen * 65535 / 255; - color.blue = sys_pal_template[j].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[j]; + int j = NB_RESERVED_COLORS + i - palette_size; + color.red = sys_pal_template[j].peRed * (65535 / 255); + color.green = sys_pal_template[j].peGreen * (65535 / 255); + color.blue = sys_pal_template[j].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[j]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } @@ -633,9 +633,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa { XColor color; color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx; - color.red = COLOR_sysPal[idx].peRed << 8; - color.green = COLOR_sysPal[idx].peGreen << 8; - color.blue = COLOR_sysPal[idx].peBlue << 8; + color.red = COLOR_sysPal[idx].peRed * (65535 / 255); + color.green = COLOR_sysPal[idx].peGreen * (65535 / 255); + color.blue = COLOR_sysPal[idx].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); } @@ -1156,9 +1156,9 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index]; color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index; - color.red = entries[i].peRed << 8; - color.green = entries[i].peGreen << 8; - color.blue = entries[i].peBlue << 8; + color.red = entries[i].peRed * (65535 / 255); + color.green = entries[i].peGreen * (65535 / 255); + color.blue = entries[i].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); -- 2.24.0

1 0

[PATCH 1/6] quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible.
by Zebediah Figura 22 Nov '19

22 Nov '19

We already rejected any other format types when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b71d15a5d2..e38a773239 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) +static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; @@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } - else - { - FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); - return VFW_E_RUNTIME_ERROR; - } TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); @@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); - - return S_OK; } static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, -- 2.24.0

2 8

[PATCH] dssenh: implement CPAcquireContext and CPReleaseContext
by Zhang Shuai 22 Nov '19

22 Nov '19

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/dssenh/Makefile.in | 14 +++- dlls/dssenh/dssenh.rgs | 60 +++++++++++++++ dlls/dssenh/dssenh.spec | 4 +- dlls/dssenh/rsrc.rc | 31 ++++++++ dlls/rsaenh/rsaenh.c | 161 +++++++++++++++++++++++++++++++++++----- 5 files changed, 247 insertions(+), 23 deletions(-) create mode 100644 dlls/dssenh/dssenh.rgs create mode 100644 dlls/dssenh/rsrc.rc diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee51..80c904fcab 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,6 +1,18 @@ MODULE = dssenh.dll +IMPORTLIB = dssenh +IMPORTS = bcrypt crypt32 advapi32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + ../rsaenh/aes.c \ + ../rsaenh/des.c \ + ../rsaenh/handle.c \ + ../rsaenh/implglue.c \ + ../rsaenh/mpi.c \ + ../rsaenh/rc2.c \ + ../rsaenh/rc4.c \ + ../rsaenh/rsa.c \ + ../rsaenh/rsaenh.c + +RC_SRCS = rsrc.rc diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs new file mode 100644 index 0000000000..e16d8e0bc7 --- /dev/null +++ b/dlls/dssenh/dssenh.rgs @@ -0,0 +1,60 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 13 + } + ForceRemove 'Microsoft Base DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 13 + } + ForceRemove 'Microsoft Base DSS Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 3 + } + ForceRemove 'Microsoft DH SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 18 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 013' + { + val 'Name' = s 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + val 'TypeName' = s 'DSS Signature with Diffe-zhellman Key Exchange' + } + ForceRemove 'Type 003' + { + val 'Name' = s 'Microsoft Base DSS Cryptographic Provider' + val 'TypeName' = s 'DSS Signature' + } + ForceRemove 'Type 018' + { + val 'Name' = s 'Microsoft DH SChannel Cryptographic Provider' + val 'TypeName' = s 'Diffie-Hellman SChannel' + } + } + } + } + } + } +} diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index c5c2545281..a98b26fc6f 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -1,4 +1,4 @@ -@ stub CPAcquireContext +@ stdcall CPAcquireContext(ptr str long ptr) RSAENH_CPAcquireContext @ stub CPCreateHash @ stub CPDecrypt @ stub CPDeriveKey @@ -17,7 +17,7 @@ @ stub CPHashData @ stub CPHashSessionKey @ stub CPImportKey -@ stub CPReleaseContext +@ stdcall CPReleaseContext(long long) RSAENH_CPReleaseContext @ stub CPSetHashParam @ stub CPSetKeyParam @ stub CPSetProvParam diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc new file mode 100644 index 0000000000..3ec4fc17f1 --- /dev/null +++ b/dlls/dssenh/rsrc.rc @@ -0,0 +1,31 @@ +/* + * Resources for dssenh + * + * Copyright (c) 2007 Alexandre Julliard + * + * 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 + */ + +/* @makedep: dssenh.rgs */ +1 WINE_REGISTRY dssenh.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine dssenh" +#define WINE_FILENAME_STR "dssenh.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9119d4be2d..8c0fb20d4b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HINSTANCE instance; +static CHAR szDllName[MAX_PATH]; +#define provider_is_rsa() (szDllName[0] == 'r' && szDllName[1] == 's' && szDllName[2] == 'a') /****************************************************************************** * CRYPTHASH - hash objects @@ -112,6 +114,10 @@ typedef struct tagCRYPTKEY #define RSAENH_PERSONALITY_ENHANCED 2u #define RSAENH_PERSONALITY_SCHANNEL 3u #define RSAENH_PERSONALITY_AES 4u +#define DSSENH_PERSONALITY_BASE 5u +#define DSSENH_PERSONALITY_BASE_DH 6u +#define DSSENH_PERSONALITY_ENHANCED 7u +#define DSSENH_PERSONALITY_SCHANNEL 8u #define RSAENH_MAGIC_CONTAINER 0x26384993u typedef struct tagKEYCONTAINER @@ -150,6 +156,7 @@ typedef struct tagKEYCONTAINER #define RSAENH_TLS1_VERSION_MAJOR 3 #define RSAENH_TLS1_VERSION_MINOR 1 #define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s" +#define DSSENH_REGKEY "Software\\Wine\\Crypto\\DSS\\%s" #define RSAENH_MIN(a,b) ((a)<(b)?(a):(b)) /****************************************************************************** @@ -158,7 +165,7 @@ typedef struct tagKEYCONTAINER #define RSAENH_MAX_ENUMALGS 24 #define RSAENH_PCT1_SSL2_SSL3_TLS1 (CRYPT_FLAG_PCT1|CRYPT_FLAG_SSL2|CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1) #define S(s) sizeof(s), s -static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = +static const PROV_ENUMALGS_EX aProvEnumAlgsEx[9][RSAENH_MAX_ENUMALGS+1] = { { {CALG_RC2, 40, 40, 56, 0, S("RC2"), S("RSA Data Security's RC2")}, @@ -254,6 +261,61 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_RSA_KEYX, 1024, 384, 16384, CRYPT_FLAG_SIGNING|CRYPT_FLAG_IPSEC, S("RSA_KEYX"), S("RSA Key Exchange")}, {CALG_HMAC, 0, 0, 0, 0, S("HMAC"), S("Hugo's MAC (HMAC)")}, {0, 0, 0, 0, 0, S(""), S("")} + }, + /* MS_DEF_DSS_PROV */ + { + {CALG_SHA, 160, 160, 160, CRYPT_FLAG_SIGNING, S("SHA-1"), S("Secure Hash Algorithm (SHA-1)")}, + {CALG_MD5, 128, 128, 128, 0, S("MD5"), S("Message Digest 5 (MD5)")}, + {CALG_DSS_SIGN, 1024, 512, 1024, CRYPT_FLAG_SIGNING, S("DSA_SIGN"), S("Digital Signature Algorithm")}, + {0, 0, 0, 0, 0, S(""), S("")} + }, + /* MS_DEF_DSS_DH_PROV */ + { + {CALG_CYLINK_MEK, 40, 40, 40, 0, S("CYLINK MEK"), S("CYLINK Message Encryption Algorithm")}, + {CALG_RC2, 40, 40, 56, 0, S("RC2"), S("RSA Data Security's RC2")}, + {CALG_RC4, 40, 40, 56, 0, S("RC4"), S("RSA Data Security's RC4")}, + {CALG_DES, 56, 56, 56, 0, S("DES"), S("Data Encryption Standard (DES)")}, + {CALG_SHA, 160, 160, 160, CRYPT_FLAG_SIGNING, S("SHA-1"), S("Secure Hash Algorithm (SHA-1)")}, + {CALG_MD5, 128, 128, 128, 0, S("MD5"), S("Message Digest 5 (MD5)")}, + {CALG_DSS_SIGN, 1024, 512, 1024, CRYPT_FLAG_SIGNING, S("DSA_SIGN"), S("Digital Signature Algorithm")}, + {CALG_DH_SF, 512, 512, 1024, 0, S("DH_KEYX"), S("Diffie-Hellman Key Exchange Algorithm")}, + {CALG_DH_EPHEM, 512, 512, 1024, 0, S("DH_KEYX"), S("Diffie-Hellman Ephemeral Algorithm")}, + {0, 0, 0, 0, 0, S(""), S("")} + }, + /* MS_ENH_DSS_DH_PROV */ + { + {CALG_CYLINK_MEK, 40, 40, 40, 0, S("CYLINK MEK"), S("CYLINK Message Encryption Algorithm")}, + {CALG_RC2, 128, 40, 128, 0, S("RC2"), S("RSA Data Security's RC2")}, + {CALG_RC4, 128, 40, 128, 0, S("RC4"), S("RSA Data Security's RC4")}, + {CALG_3DES_112, 112, 112, 112, 0, S("3DES TWO KEY"), S("Two Key Triple DES")}, + {CALG_3DES, 168, 168, 168, 0, S("3DES"), S("Three Key Triple DES")}, + {CALG_DES, 56, 56, 56, 0, S("DES"), S("Data Encryption Standard (DES)")}, + {CALG_SHA, 160, 160, 160, CRYPT_FLAG_SIGNING, S("SHA-1"), S("Secure Hash Algorithm (SHA-1)")}, + {CALG_MD5, 128, 128, 128, 0, S("MD5"), S("Message Digest 5 (MD5)")}, + {CALG_DSS_SIGN, 1024, 512, 1024, CRYPT_FLAG_SIGNING, S("DSA_SIGN"), S("Digital Signature Algorithm")}, + {CALG_DH_SF, 512, 512, 1024, 0, S("DH_KEYX"), S("Diffie-Hellman Key Exchange Algorithm")}, + {CALG_DH_EPHEM, 512, 512, 1024, 0, S("DH_KEYX"), S("Diffie-Hellman Ephemeral Algorithm")}, + {0, 0, 0, 0, 0, S(""), S("")} + }, + /* MS_DEF_DH_SCHANNEL_PROV */ + { + {CALG_CYLINK_MEK, 40, 40, 40, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("CYLINK MEK"), S("CYLINK Message Encryption Algorithm")}, + {CALG_RC2, 40, 40, 128, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("RC2"), S("RSA Data Security's RC2")}, + {CALG_RC4, 40, 40, 128, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("RC4"), S("RSA Data Security's RC4")}, + {CALG_3DES_112, 112, 112, 112, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("3DES TWO KEY"), S("Two Key Triple DES")}, + {CALG_3DES, 168, 168, 168, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("3DES"), S("Three Key Triple DES")}, + {CALG_DES, 56, 56, 56, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("DES"), S("Data Encryption Standard (DES)")}, + {CALG_SHA, 160, 160, 160, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1|CRYPT_FLAG_SIGNING, S("SHA-1"), S("Secure Hash Algorithm (SHA-1)")}, + {CALG_MD5, 128, 128, 128, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1|CRYPT_FLAG_SIGNING, S("MD5"), S("Message Digest 5 (MD5)")}, + {CALG_DSS_SIGN, 1024, 512, 1024, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1|CRYPT_FLAG_SIGNING, S("DSA_SIGN"), S("Digital Signature Algorithm")}, + {CALG_DH_SF, 512, 512, 4096, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("DH_KEYX"), S("Diffie-Hellman Key Exchange Algorithm")}, + {CALG_DH_EPHEM, 512, 512, 4096, CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1, S("DH_KEYX"), S("Diffie-Hellman Ephemeral Algorithm")}, + {CALG_SSL3_MASTER, 384, 384, 384, CRYPT_FLAG_SSL3, S("SSL3 MASTER"), S("SSL3 Master")}, + {CALG_TLS1_MASTER, 384, 384, 384, CRYPT_FLAG_TLS1, S("TLS1 MASTER"), S("TLS1 Master")}, + {CALG_SCHANNEL_MASTER_HASH, 0, 0, -1, 0, S("SCH MASTER HASH"), S("SChannel Master Hash")}, + {CALG_SCHANNEL_MAC_KEY, 0, 0, -1, 0, S("SCH MAC KEY"), S("SChannel MAC Key")}, + {CALG_SCHANNEL_ENC_KEY, 0, 0, -1, 0, S("SCH ENC KEY"), S("SChannel Encryption Key")}, + {0, 0, 0, 0, 0, S(""), S("")} } }; #undef S @@ -350,6 +412,40 @@ RSAENH_CPHashData( */ static struct handle_table handle_table; +/****************************************************************************** + * get_dll_name [Internal] + * + * Get the dll name by calling GetModuleFileNameA. Use dll name to distinguish + * whether we are RSA or DSS. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * We assume the filepath returned by GetModuleFileNameA is always of the + * format "C:\windows\system32\xxxxxx.dll". + */ +static BOOL get_dll_name(void) +{ + DWORD i, dwLastBkslashPos = -1; + GetModuleFileNameA(instance, szDllName, sizeof(szDllName)); + if (GetLastError() != ERROR_SUCCESS) { + TRACE("Unable to get dll name: error %08lx", GetLastError()); + return FALSE; + } + for (i = 0; szDllName[i]; i++) { + if (szDllName[i] == '\\') + dwLastBkslashPos = i; + } + if (dwLastBkslashPos != -1) { + for (i = 0; szDllName[i + dwLastBkslashPos]; i++) { + szDllName[i] = szDllName[i + dwLastBkslashPos + 1]; + } + } + return TRUE; +} + /****************************************************************************** * DllMain (RSAENH.@) * @@ -363,6 +459,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID reserved) instance = hInstance; DisableThreadLibraryCalls(hInstance); init_handle_table(&handle_table); + if (!get_dll_name()) { + return FALSE; + } break; case DLL_PROCESS_DETACH: @@ -1084,15 +1183,18 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; - sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); + if (provider_is_rsa()) + sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); + else /* provider_is_dss */ + sprintf(szRSABase, DSSENH_REGKEY, pKeyContainer->szName); if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) hRootKey = HKEY_LOCAL_MACHINE; else hRootKey = HKEY_CURRENT_USER; - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA|DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA|DSS */ return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL) == ERROR_SUCCESS; @@ -1115,15 +1217,18 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM ac CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; - sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); + if (provider_is_rsa()) + sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); + else /* provider_is_dss */ + sprintf(szRSABase, DSSENH_REGKEY, pszContainerName); if (dwFlags & CRYPT_MACHINE_KEYSET) hRootKey = HKEY_LOCAL_MACHINE; else hRootKey = HKEY_CURRENT_USER; - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA|DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA|DSS */ return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == ERROR_SUCCESS; } @@ -1142,7 +1247,10 @@ static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; - sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + if (provider_is_rsa()) + sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + else /* provider_is_dss */ + sprintf(szRegKey, DSSENH_REGKEY, pszContainerName); if (dwFlags & CRYPT_MACHINE_KEYSET) hRootKey = HKEY_LOCAL_MACHINE; @@ -1171,7 +1279,7 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) DWORD dwFlags; /* On WinXP, persistent keys are stored in a file located at: - * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string + * $AppData$\\Microsoft\\Crypto\\RSA|DSS\\$SID$\\some_hex_string */ if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) @@ -1281,17 +1389,30 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const pKeyContainer->hSignatureKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE; if (pVTable && pVTable->pszProvName) { lstrcpynA(pKeyContainer->szProvName, pVTable->pszProvName, MAX_PATH); - if (!strcmp(pVTable->pszProvName, MS_DEF_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_BASE; - } else if (!strcmp(pVTable->pszProvName, MS_ENHANCED_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; - } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; - } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || - !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; - } else { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG; + if (provider_is_rsa()) { + if (!strcmp(pVTable->pszProvName, MS_DEF_PROV_A)) { + pKeyContainer->dwPersonality = RSAENH_PERSONALITY_BASE; + } else if (!strcmp(pVTable->pszProvName, MS_ENHANCED_PROV_A)) { + pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; + } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { + pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; + } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || + !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { + pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; + } else { + pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG; + } + } + else /* provider_is_dss */ { + if (!strcmp(pVTable->pszProvName, MS_DEF_DSS_DH_PROV_A)) { + pKeyContainer->dwPersonality = DSSENH_PERSONALITY_BASE_DH; + } else if (!strcmp(pVTable->pszProvName, MS_DEF_DH_SCHANNEL_PROV_A)) { + pKeyContainer->dwPersonality = DSSENH_PERSONALITY_SCHANNEL; + } else if (!strcmp(pVTable->pszProvName, MS_DEF_DSS_PROV_A)) { + pKeyContainer->dwPersonality = DSSENH_PERSONALITY_BASE; + } else { + pKeyContainer->dwPersonality = DSSENH_PERSONALITY_ENHANCED; + } } } -- 2.19.1

2 1

[PATCH] dmloader: Only use the GUID when looking for cached objects.
by Alistair Leslie-Hughes 21 Nov '19

21 Nov '19

--- dlls/dmloader/loader.c | 50 +----------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0da8323e7e5..c4c54412e12 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,55 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } - } - else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by fullpath filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY)) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME) && - !wcsncmp (pDesc->wszCategory, pExistingEntry->Desc.wszCategory, DMUS_MAX_CATEGORY)) { - TRACE(": found it by name and category\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_NAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_NAME) && - !wcsncmp (pDesc->wszName, pExistingEntry->Desc.wszName, DMUS_MAX_NAME)) { - TRACE(": found it by name\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } - } - else if ((pDesc->dwValidData & DMUS_OBJ_FILENAME) && - (pExistingEntry->Desc.dwValidData & DMUS_OBJ_FILENAME) && - !wcsncmp (pDesc->wszFileName, pExistingEntry->Desc.wszFileName, DMUS_MAX_FILENAME)) { - TRACE(": found it by filename\n"); - if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); - return IDirectMusicObject_QueryInterface (pExistingEntry->pObject, riid, ppv); - } else { - TRACE(": not loaded yet\n"); - pObjectEntry = pExistingEntry; - } + break; } } -- 2.24.0

2 2

[PATCH 3/3] dmscript: Clarify TRACE in IsParamSupported method of Script track
by Michael Stefaniuc 21 Nov '19

21 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/scripttrack.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7035f2b57a..608e36bd90 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -139,14 +139,13 @@ static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID r return S_OK; } -static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type) -- 2.20.1

1 0

[PATCH 2/3] dmscript/tests: Add some Script track tests
by Michael Stefaniuc 21 Nov '19

21 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 77 ++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index d372f39d9e..365b006025 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -203,18 +203,87 @@ static void test_dmscript(void) static void test_scripttrack(void) { - IDirectMusicTrack *dmt; + IDirectMusicTrack8 *dmt; IPersistStream *ps; CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicTrack, (void**)&dmt); + &IID_IDirectMusicTrack8, (void**)&dmt); ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); + ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + } + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt, 0, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_Compose(dmt, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ - hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack8_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, NULL); @@ -233,7 +302,7 @@ static void test_scripttrack(void) hr = IPersistStream_Save(ps, NULL, TRUE); ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); - while (IDirectMusicTrack_Release(dmt)); + while (IDirectMusicTrack8_Release(dmt)); } struct chunk { -- 2.20.1

1 0

[PATCH 1/3] dmscript: Implement unimplemented Script track methods
by Michael Stefaniuc 21 Nov '19

21 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/scripttrack.c | 48 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 05c8f393a8..7035f2b57a 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -149,20 +149,22 @@ static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, R return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, @@ -202,21 +204,25 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, - DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, - MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, - IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *track2, + MUSIC_TIME join, IUnknown *context, DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context, + group, res_track); + + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { -- 2.20.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