- wine-devel - winehq.org

[PATCH] msdaps: Avoid casts from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msdaps/row_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 2b496bece20..9cc64cd0218 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -589,9 +589,9 @@ static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) server->class = *class; server->inner_unk = NULL; if(IsEqualGUID(class, &CLSID_wine_row_server)) - create_row_marshal((IUnknown*)server, (void**)&server->marshal); + create_row_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) - create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + create_rowset_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else ERR("create_server called with class %s\n", debugstr_guid(class)); -- 2.31.1

1 0

[PATCH v3 2/2 resend] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 26 Aug '21

26 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 6f4f118257f..a200e40451e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1055,8 +1055,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.32.0

1 0

[PATCH v3 1/2 resend] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 26 Aug '21

26 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 231ef753f22..6f4f118257f 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1066,8 +1066,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.32.0

1 0

[PATCH 1/2] d3dx10: Add a stub mesh object.
by Nikolay Sivov 26 Aug '21

26 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/mesh.c | 378 ++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 dlls/d3dx10_43/mesh.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index a763f588996..b6baed2b619 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ compiler.c \ d3dx10_43_main.c \ font.c \ + mesh.c \ sprite.c \ texture.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index aaa056acdd2..da6629ad1a0 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -34,7 +34,7 @@ @ stdcall D3DX10CreateFontIndirectA(ptr ptr ptr) @ stdcall D3DX10CreateFontIndirectW(ptr ptr ptr) @ stdcall D3DX10CreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DX10CreateMesh(ptr ptr long str long long long ptr) +@ stdcall D3DX10CreateMesh(ptr ptr long str long long long ptr) @ stub D3DX10CreateShaderResourceViewFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromFileW(ptr wstr ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c new file mode 100644 index 00000000000..8507df82884 --- /dev/null +++ b/dlls/d3dx10_43/mesh.c @@ -0,0 +1,378 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +struct d3dx10_mesh +{ + ID3DX10Mesh ID3DX10Mesh_iface; + LONG refcount; +}; + +static inline struct d3dx10_mesh *impl_from_ID3DX10Mesh(ID3DX10Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_mesh, ID3DX10Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_QueryInterface(ID3DX10Mesh *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Mesh) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(mesh); + + return refcount; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFaceCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBufferCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFlags(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexDescription(ID3DX10Mesh *iface, + const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) +{ + FIXME("iface %p, desc %p, count %p stub!\n", iface, desc, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetVertexData(ID3DX10Mesh *iface, UINT index, + const void *data) +{ + FIXME("iface %p, index %u, data %p stub!\n", iface, index, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetIndexData(ID3DX10Mesh *iface, const void *data, + UINT count) +{ + FIXME("iface %p, data %p, count %u stub!\n", iface, data, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetIndexBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeData(ID3DX10Mesh *iface, + const UINT *data) +{ + FIXME("iface %p, data %p stub!\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeTable(ID3DX10Mesh *iface, + const D3DX10_ATTRIBUTE_RANGE *table, UINT size) +{ + FIXME("iface %p, table %p, size %u stub!\n", iface, table, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeTable(ID3DX10Mesh *iface, + D3DX10_ATTRIBUTE_RANGE *table, UINT *size) +{ + FIXME("iface %p, table %p, size %p stub!\n", iface, table, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAdjacencyAndPointReps(ID3DX10Mesh *iface, + float epsilon) +{ + FIXME("iface %p, epsilon %.8e stub!\n", iface, epsilon); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateGSAdjacency(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAdjacencyData(ID3DX10Mesh *iface, + const UINT *adjacency) +{ + FIXME("iface %p, adjacency %p stub!\n", iface, adjacency); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAdjacencyBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetPointRepData(ID3DX10Mesh *iface, + const UINT *pointreps) +{ + FIXME("iface %p, pointreps %p stub!\n", iface, pointreps); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetPointRepBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Discard(ID3DX10Mesh *iface, + D3DX10_MESH_DISCARD_FLAGS flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CloneMesh(ID3DX10Mesh *iface, UINT flags, + const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, UINT decl_count, + ID3DX10Mesh **cloned_mesh) +{ + FIXME("iface %p, flags %#x, pos_semantic %s, desc %p, decl_count %u, cloned_mesh %p stub!\n", + iface, flags, debugstr_a(pos_semantic), desc, decl_count, cloned_mesh); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Optimize(ID3DX10Mesh *iface, UINT flags, + UINT *face_remap, ID3D10Blob **vertex_remap) +{ + FIXME("iface %p, flags %#x, face_remap %p, vertex_remap %p stub!\n", iface, flags, + face_remap, vertex_remap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAttributeBufferFromTable(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Intersect(ID3DX10Mesh *iface, D3DXVECTOR3 *ray_pos, + D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, float *u, float *v, float *dist, + ID3D10Blob **all_hits) +{ + FIXME("iface %p, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_IntersectSubset(ID3DX10Mesh *iface, UINT attr_id, + D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, float *u, float *v, + float *dist, ID3D10Blob **all_hits) +{ + FIXME("iface %p, attr_id %u, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, attr_id, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CommitToDevice(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubset(ID3DX10Mesh *iface, UINT attr_id) +{ + FIXME("iface %p, attr_id %u stub!\n", iface, attr_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubsetInstanced(ID3DX10Mesh *iface, UINT attr_id, + UINT instance_count, UINT start_instance) +{ + FIXME("iface %p, attr_id %u, instance_count %u, start_instance %u stub!\n", iface, attr_id, + instance_count, start_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceIndexBuffer(ID3DX10Mesh *iface, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static const ID3DX10MeshVtbl d3dx10_mesh_vtbl = +{ + d3dx10_mesh_QueryInterface, + d3dx10_mesh_AddRef, + d3dx10_mesh_Release, + d3dx10_mesh_GetFaceCount, + d3dx10_mesh_GetVertexCount, + d3dx10_mesh_GetVertexBufferCount, + d3dx10_mesh_GetFlags, + d3dx10_mesh_GetVertexDescription, + d3dx10_mesh_SetVertexData, + d3dx10_mesh_GetVertexBuffer, + d3dx10_mesh_SetIndexData, + d3dx10_mesh_GetIndexBuffer, + d3dx10_mesh_SetAttributeData, + d3dx10_mesh_GetAttributeBuffer, + d3dx10_mesh_SetAttributeTable, + d3dx10_mesh_GetAttributeTable, + d3dx10_mesh_GenerateAdjacencyAndPointReps, + d3dx10_mesh_GenerateGSAdjacency, + d3dx10_mesh_SetAdjacencyData, + d3dx10_mesh_GetAdjacencyBuffer, + d3dx10_mesh_SetPointRepData, + d3dx10_mesh_GetPointRepBuffer, + d3dx10_mesh_Discard, + d3dx10_mesh_CloneMesh, + d3dx10_mesh_Optimize, + d3dx10_mesh_GenerateAttributeBufferFromTable, + d3dx10_mesh_Intersect, + d3dx10_mesh_IntersectSubset, + d3dx10_mesh_CommitToDevice, + d3dx10_mesh_DrawSubset, + d3dx10_mesh_DrawSubsetInstanced, + d3dx10_mesh_GetDeviceVertexBuffer, + d3dx10_mesh_GetDeviceIndexBuffer, +}; + +HRESULT WINAPI D3DX10CreateMesh(ID3D10Device *device, const D3D10_INPUT_ELEMENT_DESC *decl, + UINT decl_count, const char *position_semantic, UINT vertex_count, UINT face_count, + UINT options, ID3DX10Mesh **mesh) +{ + struct d3dx10_mesh *object; + + FIXME("device %p, decl %p, decl_count %u, position_semantic %s, vertex_count %u, face_count %u, " + "options %#x, mesh %p semi-stub.\n", device, decl, decl_count, debugstr_a(position_semantic), vertex_count, + face_count, options, mesh); + + *mesh = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Mesh_iface.lpVtbl = &d3dx10_mesh_vtbl; + object->refcount = 1; + + *mesh = &object->ID3DX10Mesh_iface; + + return S_OK; +} -- 2.32.0

2 3

[PATCH v2 1/4] user32/tests: Mark some winevents optional in the SetParent sequence.
by Connor McAdams 26 Aug '21

26 Aug '21

Earlier patch set messages within the sequence to be optional, update winevents in sequence to match this. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Fix winevent_hook_todo checks in patch 2/4. dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..079d63158c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16694,12 +16694,12 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, -- 2.25.1

2 6

[PATCH 1/4] user32/tests: Mark some winevents optional in the SetParent sequence.
by Connor McAdams 25 Aug '21

25 Aug '21

Earlier patch set messages within the sequence to be optional, update winevents in sequence to match this. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..079d63158c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16694,12 +16694,12 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, -- 2.25.1

2 5

[PATCH 1/4] quartz: Always return S_FALSE from DllCanUnloadNow().
by Zebediah Figura 25 Aug '21

25 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/acmwrapper.c | 2 -- dlls/quartz/avidec.c | 2 -- dlls/quartz/dsoundrender.c | 2 -- dlls/quartz/filesource.c | 2 -- dlls/quartz/filtergraph.c | 2 -- dlls/quartz/filtermapper.c | 2 -- dlls/quartz/main.c | 24 ++---------------------- dlls/quartz/memallocator.c | 2 -- dlls/quartz/passthrough.c | 2 -- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/systemclock.c | 2 -- dlls/quartz/videorenderer.c | 2 -- dlls/quartz/vmr9.c | 10 ++-------- 13 files changed, 4 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..a07bdfef0ca 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -484,8 +484,6 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) FreeMediaType(&filter->mt); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..3d947e1b1bf 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -538,8 +538,6 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..9ecdb280cc6 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -549,8 +549,6 @@ static void dsound_render_destroy(struct strmbase_filter *iface) strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static struct strmbase_pin *dsound_render_get_pin(struct strmbase_filter *iface, unsigned int index) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..e5e7b482984 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -351,8 +351,6 @@ static void async_reader_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..47b9da9510b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -475,8 +475,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); - - InterlockedDecrement(&object_locks); } return ref; } diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..230273891d4 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -487,8 +487,6 @@ static ULONG WINAPI Inner_Release(IUnknown *iface) if (ref == 0) { CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } return ref; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..ed7080b76b9 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -24,11 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -LONG object_locks = 0; - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_DETACH && !reserved) @@ -127,21 +124,15 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } return hres; } -static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL lock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - if(dolock) - InterlockedIncrement(&object_locks); - else - InterlockedDecrement(&object_locks); + FIXME("iface %p, lock %d, stub!\n", iface, lock); return S_OK; } @@ -199,17 +190,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return QUARTZ_DllGetClassObject( rclsid, riid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (QUARTZ.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - if (!object_locks && QUARTZ_DllCanUnloadNow() == S_OK) - return S_OK; - return S_FALSE; -} - - #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name }, diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..531fbe874cf 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -911,8 +911,6 @@ static void StdMemAllocator_Destroy(IMemAllocator *iface) DeleteCriticalSection(&This->csState); CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..2f8fe9dc370 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -80,8 +80,6 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) { strmbase_passthrough_cleanup(&passthrough->passthrough); free(passthrough); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index de83c2535db..c706d906a26 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -58,8 +58,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -extern LONG object_locks; - /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..cebe4846f04 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -115,8 +115,6 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); heap_free(clock); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a59a9b5213..1dbb8a02181 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -130,8 +130,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) video_window_cleanup(&filter->window); strmbase_renderer_cleanup(&filter->renderer); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT video_renderer_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..4bde811c6d7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -528,12 +528,6 @@ static void vmr_disconnect(struct strmbase_renderer *This) } } -static void vmr_free(struct quartz_vmr *filter) -{ - free(filter); - InterlockedDecrement(&object_locks); -} - static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +557,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); if (!filter->IVMRSurfaceAllocatorNotify9_refcount) - vmr_free(filter); + free(filter); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) @@ -1955,7 +1949,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount && !filter->renderer.filter.refcount) - vmr_free(filter); + free(filter); return refcount; } -- 2.30.2

1 3

[PATCH 1/2] ntdll: Unify get_file_info and fd_get_file_info.
by Erich E. Hoover 25 Aug '21

25 Aug '21

get_file_info and fd_get_file_info duplicate the same logic except that they either work on paths or file descriptors (respectively). This patch consolidates these two routines and moves some of the path-specific behavior to an updated [fd_]is_mount_point. Besides consolidation, this patch simplifies the reparse point patches (coming soon!) since there's now only one routine that handles both path-based and fd-based requests for file information. Best, Erich

1 0

[PATCH] msvcrt/tests: Remove redundant NULL check before free()
by Michael Stefaniuc 25 Aug '21

25 Aug '21

--- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } } -- 2.31.1

1 0

[PATCH] d3dx10: Remove redundant NULL check before heap_free()
by Michael Stefaniuc 25 Aug '21

25 Aug '21

--- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder) -- 2.31.1

1 0

[PATCH 1/5] d3d10/effect: Use shader reflection to return output signature description.
by Nikolay Sivov 25 Aug '21

25 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 54 ++++++++------------------------------ dlls/d3d10/tests/effect.c | 37 +++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 249d4ea384a..359c1f017f7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -106,7 +106,7 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { struct d3d10_effect_shader_signature input_signature; - struct d3d10_effect_shader_signature output_signature; + ID3D10ShaderReflection *reflection; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 520f816098f..3f0916e60d5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -599,16 +599,12 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { case TAG_ISGN: - case TAG_OSGN: { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig; + struct d3d10_effect_shader_signature *sig = &s->input_signature; char *ptr; - if (tag == TAG_ISGN) sig = &s->input_signature; - else sig = &s->output_signature; - if (!(sig->signature = heap_alloc_zero(size))) { ERR("Failed to allocate input signature data\n"); @@ -666,28 +662,22 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; D3D10_SHADER_INPUT_BIND_DESC bind_desc; - ID3D10ShaderReflection *reflection; struct d3d10_effect_variable *var; D3D10_SHADER_DESC desc; unsigned int i, y; - HRESULT hr; - - if (FAILED(hr = D3D10ReflectShader(data, data_size, &reflection))) - return hr; - reflection->lpVtbl->GetDesc(reflection, &desc); + sv->reflection->lpVtbl->GetDesc(sv->reflection, &desc); sv->resource_count = desc.BoundResources; if (!(sv->resources = heap_calloc(sv->resource_count, sizeof(*sv->resources)))) { ERR("Failed to allocate shader resource binding information memory.\n"); - reflection->lpVtbl->Release(reflection); return E_OUTOFMEMORY; } for (i = 0; i < desc.BoundResources; ++i) { - reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &bind_desc); + sv->reflection->lpVtbl->GetResourceBindingDesc(sv->reflection, i, &bind_desc); sr = &sv->resources[i]; sr->in_type = bind_desc.Type; @@ -731,7 +721,6 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const if (!sr->variable) { WARN("Failed to find shader resource.\n"); - reflection->lpVtbl->Release(reflection); return E_FAIL; } } @@ -774,6 +763,9 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; + if (FAILED(hr = D3D10ReflectShader(ptr, dxbc_size, &v->u.shader.reflection))) + return hr; + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) return hr; @@ -2747,8 +2739,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { + if (s->reflection) + s->reflection->lpVtbl->Release(s->reflection); shader_free_signature(&s->input_signature); - shader_free_signature(&s->output_signature); switch (type) { @@ -7068,7 +7061,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; - D3D10_SIGNATURE_PARAMETER_DESC *d; TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); @@ -7087,35 +7079,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } s = &v->effect->used_shaders[shader_index]->u.shader; - if (!s->output_signature.signature) - { - WARN("No shader signature\n"); - return D3DERR_INVALIDCALL; - } - - /* Check desc for NULL, this crashes on W7/DX10 */ - if (!desc) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - if (element_index >= s->output_signature.element_count) - { - WARN("Invalid element index specified\n"); - return E_INVALIDARG; - } - d = &s->output_signature.elements[element_index]; - desc->SemanticName = d->SemanticName; - desc->SemanticIndex = d->SemanticIndex; - desc->SystemValueType = d->SystemValueType; - desc->ComponentType = d->ComponentType; - desc->Register = d->Register; - desc->ReadWriteMask = d->ReadWriteMask; - desc->Mask = d->Mask; + if (!s->reflection) + return D3DERR_INVALIDCALL; - return S_OK; + return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9a217993e7e..df0d1a99ef4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -23,6 +23,8 @@ #include <float.h> +#define D3DERR_INVALIDCALL 0x8876086c + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -2796,8 +2798,9 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; D3D10_EFFECT_SHADER_DESC shaderdesc; + D3D10_SIGNATURE_PARAMETER_DESC sign; ID3D10Device *device; ULONG refcount; @@ -3648,6 +3651,38 @@ todo_wine shaderdesc.SODecl); } + /* Output signature description */ + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); + + v = effect->lpVtbl->GetVariableByName(effect, "v"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + /* NULL shader variable */ + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.32.0

3 15

[PATCH] d3dx10_41/tests: Enable tests.
by Nikolay Sivov 25 Aug '21

25 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_41/Makefile.in | 1 + dlls/d3dx10_41/tests/Makefile.in | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 dlls/d3dx10_41/tests/Makefile.in diff --git a/configure.ac b/configure.ac index a9750330443..801407c71a3 100644 --- a/configure.ac +++ b/configure.ac @@ -3086,6 +3086,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 41ebda9892c..a3a64fef6d8 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_41.dll +IMPORTLIB = d3dx10_41 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_41/tests/Makefile.in b/dlls/d3dx10_41/tests/Makefile.in new file mode 100644 index 00000000000..bde10a26ea7 --- /dev/null +++ b/dlls/d3dx10_41/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_41.dll +IMPORTS = d3dx10_41 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.32.0

2 1

[v2 PATCH 1/3] d3dx10: Add a stub mesh object.
by Matteo Bruni 25 Aug '21

25 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Rename a couple of "size" arguments to "count" (trivial) dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/mesh.c | 378 ++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 dlls/d3dx10_43/mesh.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index a763f588996..b6baed2b619 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ compiler.c \ d3dx10_43_main.c \ font.c \ + mesh.c \ sprite.c \ texture.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index aaa056acdd2..da6629ad1a0 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -34,7 +34,7 @@ @ stdcall D3DX10CreateFontIndirectA(ptr ptr ptr) @ stdcall D3DX10CreateFontIndirectW(ptr ptr ptr) @ stdcall D3DX10CreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DX10CreateMesh(ptr ptr long str long long long ptr) +@ stdcall D3DX10CreateMesh(ptr ptr long str long long long ptr) @ stub D3DX10CreateShaderResourceViewFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromFileW(ptr wstr ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c new file mode 100644 index 00000000000..276319719f8 --- /dev/null +++ b/dlls/d3dx10_43/mesh.c @@ -0,0 +1,378 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +struct d3dx10_mesh +{ + ID3DX10Mesh ID3DX10Mesh_iface; + LONG refcount; +}; + +static inline struct d3dx10_mesh *impl_from_ID3DX10Mesh(ID3DX10Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_mesh, ID3DX10Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_QueryInterface(ID3DX10Mesh *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Mesh) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(mesh); + + return refcount; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFaceCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBufferCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFlags(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexDescription(ID3DX10Mesh *iface, + const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) +{ + FIXME("iface %p, desc %p, count %p stub!\n", iface, desc, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetVertexData(ID3DX10Mesh *iface, UINT index, + const void *data) +{ + FIXME("iface %p, index %u, data %p stub!\n", iface, index, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetIndexData(ID3DX10Mesh *iface, const void *data, + UINT count) +{ + FIXME("iface %p, data %p, count %u stub!\n", iface, data, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetIndexBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeData(ID3DX10Mesh *iface, + const UINT *data) +{ + FIXME("iface %p, data %p stub!\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeTable(ID3DX10Mesh *iface, + const D3DX10_ATTRIBUTE_RANGE *table, UINT count) +{ + FIXME("iface %p, table %p, count %u stub!\n", iface, table, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeTable(ID3DX10Mesh *iface, + D3DX10_ATTRIBUTE_RANGE *table, UINT *count) +{ + FIXME("iface %p, table %p, count %p stub!\n", iface, table, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAdjacencyAndPointReps(ID3DX10Mesh *iface, + float epsilon) +{ + FIXME("iface %p, epsilon %.8e stub!\n", iface, epsilon); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateGSAdjacency(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAdjacencyData(ID3DX10Mesh *iface, + const UINT *adjacency) +{ + FIXME("iface %p, adjacency %p stub!\n", iface, adjacency); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAdjacencyBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetPointRepData(ID3DX10Mesh *iface, + const UINT *pointreps) +{ + FIXME("iface %p, pointreps %p stub!\n", iface, pointreps); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetPointRepBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Discard(ID3DX10Mesh *iface, + D3DX10_MESH_DISCARD_FLAGS flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CloneMesh(ID3DX10Mesh *iface, UINT flags, + const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, UINT decl_count, + ID3DX10Mesh **cloned_mesh) +{ + FIXME("iface %p, flags %#x, pos_semantic %s, desc %p, decl_count %u, cloned_mesh %p stub!\n", + iface, flags, debugstr_a(pos_semantic), desc, decl_count, cloned_mesh); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Optimize(ID3DX10Mesh *iface, UINT flags, + UINT *face_remap, ID3D10Blob **vertex_remap) +{ + FIXME("iface %p, flags %#x, face_remap %p, vertex_remap %p stub!\n", iface, flags, + face_remap, vertex_remap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAttributeBufferFromTable(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Intersect(ID3DX10Mesh *iface, D3DXVECTOR3 *ray_pos, + D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, float *u, float *v, float *dist, + ID3D10Blob **all_hits) +{ + FIXME("iface %p, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_IntersectSubset(ID3DX10Mesh *iface, UINT attr_id, + D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, float *u, float *v, + float *dist, ID3D10Blob **all_hits) +{ + FIXME("iface %p, attr_id %u, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, attr_id, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CommitToDevice(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubset(ID3DX10Mesh *iface, UINT attr_id) +{ + FIXME("iface %p, attr_id %u stub!\n", iface, attr_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubsetInstanced(ID3DX10Mesh *iface, UINT attr_id, + UINT instance_count, UINT start_instance) +{ + FIXME("iface %p, attr_id %u, instance_count %u, start_instance %u stub!\n", iface, attr_id, + instance_count, start_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceIndexBuffer(ID3DX10Mesh *iface, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static const ID3DX10MeshVtbl d3dx10_mesh_vtbl = +{ + d3dx10_mesh_QueryInterface, + d3dx10_mesh_AddRef, + d3dx10_mesh_Release, + d3dx10_mesh_GetFaceCount, + d3dx10_mesh_GetVertexCount, + d3dx10_mesh_GetVertexBufferCount, + d3dx10_mesh_GetFlags, + d3dx10_mesh_GetVertexDescription, + d3dx10_mesh_SetVertexData, + d3dx10_mesh_GetVertexBuffer, + d3dx10_mesh_SetIndexData, + d3dx10_mesh_GetIndexBuffer, + d3dx10_mesh_SetAttributeData, + d3dx10_mesh_GetAttributeBuffer, + d3dx10_mesh_SetAttributeTable, + d3dx10_mesh_GetAttributeTable, + d3dx10_mesh_GenerateAdjacencyAndPointReps, + d3dx10_mesh_GenerateGSAdjacency, + d3dx10_mesh_SetAdjacencyData, + d3dx10_mesh_GetAdjacencyBuffer, + d3dx10_mesh_SetPointRepData, + d3dx10_mesh_GetPointRepBuffer, + d3dx10_mesh_Discard, + d3dx10_mesh_CloneMesh, + d3dx10_mesh_Optimize, + d3dx10_mesh_GenerateAttributeBufferFromTable, + d3dx10_mesh_Intersect, + d3dx10_mesh_IntersectSubset, + d3dx10_mesh_CommitToDevice, + d3dx10_mesh_DrawSubset, + d3dx10_mesh_DrawSubsetInstanced, + d3dx10_mesh_GetDeviceVertexBuffer, + d3dx10_mesh_GetDeviceIndexBuffer, +}; + +HRESULT WINAPI D3DX10CreateMesh(ID3D10Device *device, const D3D10_INPUT_ELEMENT_DESC *decl, + UINT decl_count, const char *position_semantic, UINT vertex_count, UINT face_count, + UINT options, ID3DX10Mesh **mesh) +{ + struct d3dx10_mesh *object; + + FIXME("device %p, decl %p, decl_count %u, position_semantic %s, vertex_count %u, face_count %u, " + "options %#x, mesh %p semi-stub.\n", device, decl, decl_count, debugstr_a(position_semantic), vertex_count, + face_count, options, mesh); + + *mesh = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Mesh_iface.lpVtbl = &d3dx10_mesh_vtbl; + object->refcount = 1; + + *mesh = &object->ID3DX10Mesh_iface; + + return S_OK; +} -- 2.26.3

1 2

[PATCH 1/4] ntoskrnl.exe/tests: Add more HID usage nary tests.
by Rémi Bernon 25 Aug '21

25 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 12 ++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 ++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 8111af23c06..ce942815dcb 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -299,6 +299,16 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) REPORT_COUNT(1, 8), REPORT_SIZE(1, 1), INPUT(1, Data|Var|Abs), + + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 16), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(1, Data|Ary|Abs), END_COLLECTION, USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), @@ -477,7 +487,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 23; + ULONG expected_size = 25; ok(!in_size, "got input size %u\n", in_size); ok(out_size == expected_size, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f11dce1cc93..a7a67f298ab 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1684,13 +1684,13 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 24, + .InputReportByteLength = 26, .OutputReportByteLength = 3, .FeatureReportByteLength = 18, .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 13, + .NumberInputButtonCaps = 17, .NumberInputValueCaps = 7, - .NumberInputDataIndices = 43, + .NumberInputDataIndices = 47, .NumberFeatureButtonCaps = 1, .NumberFeatureValueCaps = 5, .NumberFeatureDataIndices = 7, @@ -1699,13 +1699,13 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 23, + .InputReportByteLength = 25, .OutputReportByteLength = 2, .FeatureReportByteLength = 17, .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 13, + .NumberInputButtonCaps = 17, .NumberInputValueCaps = 7, - .NumberInputDataIndices = 43, + .NumberInputDataIndices = 47, .NumberFeatureButtonCaps = 1, .NumberFeatureValueCaps = 5, .NumberFeatureDataIndices = 7, @@ -1872,12 +1872,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; USAGE_AND_PAGE usage_and_pages[16]; - HIDP_BUTTON_CAPS button_caps[16]; + HIDP_BUTTON_CAPS button_caps[32]; HIDP_VALUE_CAPS value_caps[16]; char buffer[200], report[200]; DWORD collection_count; DWORD waveform_list; - HIDP_DATA data[32]; + HIDP_DATA data[64]; USAGE usages[16]; NTSTATUS status; HIDP_CAPS caps; @@ -2186,7 +2186,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = HidP_MaxUsageListLength(HidP_Feature + 1, 0, preparsed_data); ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0); value = HidP_MaxUsageListLength(HidP_Input, 0, preparsed_data); - ok(value == 42, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 42); + ok(value == 50, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 50); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data); ok(value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 32); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED, preparsed_data); @@ -2307,7 +2307,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Input, preparsed_data); - ok(value == 50, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 50); + ok(value == 58, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 58); value = HidP_MaxDataListLength(HidP_Output, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Feature, preparsed_data); @@ -2328,6 +2328,35 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled winetest_pop_context(); } + /* HID nary usage collections are set with 1-based usage index in their declaration order */ + + memset(report, 0, caps.InputReportByteLength); + status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, + caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + value = 2; + usages[0] = 0x8e; + usages[1] = 0x8f; + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + todo_wine + ok(report[caps.InputReportByteLength - 2] == 3, "unexpected usage index %d, expected 3\n", + report[caps.InputReportByteLength - 2]); + todo_wine + ok(report[caps.InputReportByteLength - 1] == 4, "unexpected usage index %d, expected 4\n", + report[caps.InputReportByteLength - 1]); + report[caps.InputReportByteLength - 2] = 0; + report[caps.InputReportByteLength - 1] = 0; + value = 1; + usages[0] = 0x8c; + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + todo_wine + ok(report[caps.InputReportByteLength - 2] == 1, "unexpected usage index %d, expected 1\n", + report[caps.InputReportByteLength - 2]); + memset(report, 0xcd, sizeof(report)); status = HidP_InitializeReportForID(HidP_Feature, 3, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); -- 2.33.0

2 4

[PATCH 1/3] dinput: Allocate data format on device creation.
by Rémi Bernon 25 Aug '21

25 Aug '21

It's accessed on Release, and this will make it easier to handle device creation failure cleanup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm resending this HID joystick implementation, I think HID layer is now in a good shape and this will be a good occasion to start testing it. The input events should at least work, and the force feedback support otoh will require the complete winebus refactoring first. This series is just the initial implementation, which does nothing, but I splitted and added some small refactoring first to make it simpler. Since last time I shaved the initial implementation to only include the necessary functions, and I'll add specific implementation of new methods as they start to be implemented (instead of having stubs of everything). The enumeration is mostly the same as the last version I sent. dlls/dinput/device.c | 9 +++++++++ dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 3 +-- dlls/dinput/joystick_osx.c | 3 +-- dlls/dinput/keyboard.c | 4 +--- dlls/dinput/mouse.c | 3 +-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ac60a21326c..25084f82a9c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1708,11 +1708,20 @@ HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl * const GUID *guid, IDirectInputImpl *dinput, void **out ) { IDirectInputDeviceImpl *This; + DIDATAFORMAT *format; + if (!(This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return DIERR_OUTOFMEMORY; + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) + { + HeapFree( GetProcessHeap(), 0, This ); + return DIERR_OUTOFMEMORY; + } + This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = vtbl; This->ref = 1; This->guid = *guid; + This->data_format.wine_df = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..258f6e9e5e0 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -411,6 +411,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); newDevice->joydev = &joystick_devices[index]; @@ -438,7 +439,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm goto FAILED1; /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); df->dwNumObjs = newDevice->generic.devcaps.dwAxes + newDevice->generic.devcaps.dwPOVs + newDevice->generic.devcaps.dwButtons; @@ -465,7 +465,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } - newDevice->generic.base.data_format.wine_df = df; /* initialize default properties */ for (i = 0; i < c_dfDIJoystick2.dwNumObjs; i++) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..06a735f7d91 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -407,6 +407,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); newDevice->generic.joy_polldev = joy_polldev; @@ -468,7 +469,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (setup_dinput_options(&newDevice->generic, default_axis_map) != DI_OK) goto failed; /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto failed; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; @@ -514,7 +514,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->generic.devcaps.dwButtons++) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx; - newDevice->generic.base.data_format.wine_df = df; fake_current_js_state(newDevice); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 27a47b07639..62a063b6da1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1075,6 +1075,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); newDevice->id = index; @@ -1138,7 +1139,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm } /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); df->dwNumObjs = newDevice->generic.devcaps.dwAxes + newDevice->generic.devcaps.dwPOVs + newDevice->generic.devcaps.dwButtons; @@ -1203,7 +1203,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } - newDevice->generic.base.data_format.wine_df = df; /* initialize default properties */ get_osx_device_elements_props(newDevice); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fc9dbdb2ed4..5d532ab8059 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -203,12 +203,12 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar if (FAILED(hr = direct_input_device_alloc( sizeof(SysKeyboardImpl), &SysKeyboardWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); newDevice->subtype = get_keyboard_subtype(); /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; @@ -226,8 +226,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar } df->dwNumObjs = idx; - newDevice->base.data_format.wine_df = df; - *out = newDevice; return DI_OK; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 22e40a60285..145a792f396 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -149,6 +149,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; @@ -165,7 +166,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (hkey) RegCloseKey(hkey); /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIMouse2.dwSize))) goto failed; memcpy(df, &c_dfDIMouse2, c_dfDIMouse2.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; memcpy(df->rgodf, c_dfDIMouse2.rgodf, df->dwNumObjs * df->dwObjSize); @@ -177,7 +177,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm else df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; - newDevice->base.data_format.wine_df = df; if (dinput->dwVersion >= 0x0800) { newDevice->base.use_raw_input = TRUE; -- 2.33.0

1 2

[PATCH] winegstreamer: Create media source read thread after initializing wg_parser.
by Paul Gofman 25 Aug '21

25 Aug '21

Fixes race condition as wg_parser is used right away in the created thread. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 05544ef7abe..01ab626254a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1315,8 +1315,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); - if (!(parser = unix_funcs->wg_decodebin_parser_create())) { hr = E_OUTOFMEMORY; @@ -1324,6 +1322,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ } object->wg_parser = parser; + object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); + object->state = SOURCE_OPENING; if (FAILED(hr = unix_funcs->wg_parser_connect(parser, file_size))) -- 2.31.1

2 1

[PATCH] winmm/tests: Fix an ASCII / ANSI mixup in a trace() message.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winmm/tests/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index b9e35aa519d..a72966c320b 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -983,7 +983,7 @@ static void mixer_testsA(void) MMRESULT rc; UINT ndev, d; - trace("--- Testing ASCII functions ---\n"); + trace("--- Testing ANSI functions ---\n"); ndev=mixerGetNumDevs(); trace("found %d Mixer devices\n",ndev); -- 2.20.1

1 0

[PATCH] winspool.drv: Fix ASCII / ANSI mixups in comments and TRACE() messages.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winspool.drv/info.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d6aa60a028f..8a17355f120 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4047,7 +4047,7 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) * Get ValueName from hkey storing result in out * when the Value in the registry has only a filename, use driverdir as prefix * outlen is space left in out - * String is stored either as unicode or ascii + * String is stored either as unicode or ansi * */ @@ -4180,7 +4180,7 @@ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) * WINSPOOL_GetDevModeFromReg * * Get ValueName from hkey storing result in ptr. buflen is space left in ptr - * DevMode is stored either as unicode or ascii. + * DevMode is stored either as unicode or ansi. */ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, @@ -6770,7 +6770,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pValueName, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); if (ppev->dwType != REG_SZ && ppev->dwType != REG_EXPAND_SZ && ppev->dwType != REG_MULTI_SZ) @@ -6789,7 +6789,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pData, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); TRACE (" (only first string of REG_MULTI_SZ printed)\n"); } -- 2.20.1

1 0

[PATCH] setupapi: Fix a couple of ASCII / ANSI mixups in comments.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/setupapi/misc.c | 2 +- dlls/setupapi/setupapi_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 26e5359804c..4d3ced2e4ae 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1781,7 +1781,7 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); } - /* This is the normal way to proceed. The log files are ASCII files + /* This is the normal way to proceed. The log files are ANSI files * and W is to be converted. */ ret = SetupLogErrorA(msg, severity); diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 21ac50e0f3c..7681348a11c 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -94,7 +94,7 @@ extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; -/* support for Ascii queue callback functions */ +/* support for ANSI queue callback functions */ struct callback_WtoA_context { -- 2.20.1

1 0

[PATCH] msi: Fix ASCII / ANSI mixups in comments.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 950a18d0e74..a039a5af4c7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -735,7 +735,7 @@ struct tagMSIMIME #define MSIHANDLE_MAGIC 0x4d434923 -/* handle unicode/ascii output in the Msi* API functions */ +/* handle unicode/ansi output in the Msi* API functions */ typedef struct { BOOL unicode; union { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bf93f3e9afe..23e938f1759 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1806,7 +1806,7 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSI_FormatRecordW(package, record, message, &len); } - /* convert it to ASCII */ + /* convert it to ANSI */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); -- 2.20.1

1 0

[PATCH] secur32/tests: Fix an ASCII / ANSI mixup in an ntlm comment.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/secur32/tests/ntlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 930a49e451b..5ed650ffc2d 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1384,7 +1384,7 @@ static void testAcquireCredentialsHandleW(void) getSecError(ret)); pFreeCredentialsHandle(&cred); - /* Test using the ASCII structure. */ + /* Test using the ANSI structure. */ idA.User = (unsigned char*) test_user; idA.UserLength = strlen(test_user); idA.Domain = (unsigned char *) workgroup; -- 2.20.1

1 0

[PATCH 1/3] kernel32/tests: Remove the macros from the GetDateFormatEx() tests.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 67 ++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f6d1adcfbd2..105c839d57f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -951,32 +951,32 @@ static void test_GetDateFormatEx(void) return; } - STRINGSW("",""); /* If flags are set, then format must be NULL */ SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, DATE_LONGDATE, NULL, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQW; - STRINGSW("",""); /* NULL buffer, len > 0 */ + /* If flags are set, then format must be NULL */ + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, DATE_LONGDATE, NULL, L"", buffer, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, NULL, input, NULL, ARRAY_SIZE(buffer), NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - - STRINGSW("",""); /* NULL buffer, len == 0 */ - ret = pGetDateFormatEx(localeW, 0, NULL, input, NULL, 0, NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; - STRINGSW("",""); /* Invalid flag combination */ + /* NULL buffer, len > 0 */ + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, NULL, L"", NULL, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); + + /* NULL buffer, len == 0 */ + ret = pGetDateFormatEx(localeW, 0, NULL, L"", NULL, 0, NULL); + expect_wstr(ret, NULL, L""); + + /* Invalid flag combination */ + wcscpy(buffer, L"pristine"); ret = pGetDateFormatEx(localeW, DATE_LONGDATE|DATE_SHORTDATE, NULL, - input, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQW; + L"", NULL, 0, NULL); + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); + SetLastError(0xdeadbeef); + /* Incorrect DOW and time */ curtime.wYear = 2002; curtime.wMonth = 10; curtime.wDay = 23; @@ -985,10 +985,8 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 34512; /* Invalid */ curtime.wSecond = 65535; /* Invalid */ curtime.wMilliseconds = 12345; - STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); /* Incorrect DOW and time */ - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_wstr(ret, buffer, L"Wednesday 23 October 2002"); curtime.wYear = 2002; curtime.wMonth = 10; @@ -998,10 +996,10 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 34512; /* Invalid */ curtime.wSecond = 65535; /* Invalid */ curtime.wMilliseconds = 12345; - STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), emptyW); /* Use reserved arg */ - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), emptyW); /* Use reserved arg */ + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); /* Limit tests */ @@ -1013,11 +1011,8 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 0; curtime.wSecond = 0; curtime.wMilliseconds = 0; - STRINGSW("dddd d MMMM yyyy","Monday 1 January 1601"); - SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_wstr(ret, buffer, L"Monday 1 January 1601"); curtime.wYear = 1600; curtime.wMonth = 12; @@ -1027,11 +1022,9 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 59; curtime.wSecond = 59; curtime.wMilliseconds = 999; - STRINGSW("dddd d MMMM yyyy","Friday 31 December 1600"); - SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); } static void test_GetDateFormatW(void) -- 2.20.1

1 2

[PATCH v4] user32: Don't save maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 +++++++++++++++++++++++------- dlls/user32/winpos.c | 73 +++++++++++++++++++++++++++++++++-------- 2 files changed, 102 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..7edd63a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,27 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_maximized_area_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static RECT get_work_rect_for_style( HMONITOR monitor, DWORD style ) +{ + MONITORINFO mon_info; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + return mon_info.rcWork; + } + return mon_info.rcMonitor; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -741,19 +762,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) { RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } + rc_work = get_work_rect_for_style( monitor, style ); rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) @@ -916,6 +926,38 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( WND *wnd ) +{ + HMONITOR monitor; + RECT rc_work; + + /* For top level windows covering the work area, we might have + to "forget" the maximized position. Windows presumably does + this to avoid situations where the border style changes, + which would lead the window to be outside the screen, or the + window gets reloaded on a different screen, and the "saved" + position no longer applies to it (despite being maximized). + + Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ + if (wnd->parent && wnd->parent != GetDesktopWindow()) + return; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + rc_work = get_work_rect_for_style( monitor, wnd->dwStyle ); + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1379,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + update_maximized_pos( pWnd ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1468,11 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) + { + pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + update_maximized_pos( pWnd ); + } if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 3

[PATCH 8/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 11 ++++++----- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-)

2 1

[PATCH v2 9/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 20 -------------------- dlls/gdi32/objects.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5868824dd8f..1dcf4b2c844 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -224,26 +224,6 @@ HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP bitmap, BOOL pen, BOOL is } -/*********************************************************************** - * CreateDIBPatternBrush (GDI32.@) - * - * Create a logical brush with a pattern from a DIB. - */ -HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) -{ - LOGBRUSH logbrush; - - TRACE("%p\n", hbitmap ); - - logbrush.lbStyle = BS_DIBPATTERN; - logbrush.lbColor = coloruse; - - logbrush.lbHatch = (ULONG_PTR)hbitmap; - - return create_brush( &logbrush ); -} - - /*********************************************************************** * NtGdiCreateDIBBrush (win32u.@) * diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 9f43f1505e8..e5aa641edf3 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -448,6 +448,22 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); } +/*********************************************************************** + * CreateDIBPatternBrush (GDI32.@) + */ +HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) +{ + HBRUSH brush; + void *mem; + + TRACE( "%p\n", hbitmap ); + + if (!(mem = GlobalLock( hbitmap ))) return 0; + brush = NtGdiCreateDIBBrush( mem, coloruse, /* FIXME */ 0, FALSE, FALSE, hbitmap ); + GlobalUnlock( hbitmap ); + return brush; +} + /*********************************************************************** * CreateDIBPatternBrushPt (GDI32.@) */ -- 2.23.0

1 0

[PATCH v2 8/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 11 ++++++----- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index c723b7c842f..5868824dd8f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -245,20 +245,21 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) /*********************************************************************** - * CreateDIBPatternBrushPt (GDI32.@) + * NtGdiCreateDIBBrush (win32u.@) * * Create a logical brush with a pattern from a DIB. */ -HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ) { - const BITMAPINFO *info=data; + const BITMAPINFO *info = data; LOGBRUSH logbrush; if (!data) return NULL; - TRACE("%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, - info->bmiHeader.biHeight, info->bmiHeader.biBitCount); + TRACE( "%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, + info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); logbrush.lbStyle = BS_DIBPATTERNPT; logbrush.lbColor = coloruse; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 6981eea72d0..9f43f1505e8 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -448,6 +448,14 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); } +/*********************************************************************** + * CreateDIBPatternBrushPt (GDI32.@) + */ +HBRUSH WINAPI CreateDIBPatternBrushPt( const void *data, UINT coloruse ) +{ + return NtGdiCreateDIBBrush( data, coloruse, /* FIXME */ 0, FALSE, FALSE, data ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 928d1cec505..66611b38fb0 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -195,7 +195,8 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); -HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); -- 2.23.0

1 0

[PATCH v2 7/9] gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 408d93b2167..c723b7c842f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -209,16 +209,17 @@ HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) /*********************************************************************** - * CreatePatternBrush (GDI32.@) + * NtGdiCreatePatternBrushInternal (win32u.@) * * Create a logical brush with a pattern from a bitmap. */ -HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP bitmap, BOOL pen, BOOL is_8x8 ) { LOGBRUSH logbrush = { BS_PATTERN, 0, 0 }; - TRACE("%p\n", hbitmap ); - logbrush.lbHatch = (ULONG_PTR)hbitmap; + TRACE( "%p\n", bitmap ); + + logbrush.lbHatch = (ULONG_PTR)bitmap; return create_brush( &logbrush ); } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 80f7454c2cb..6981eea72d0 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -440,6 +440,14 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) return NtGdiCreateHatchBrush( style, color, FALSE ); } +/*********************************************************************** + * CreatePatternBrush (GDI32.@) + */ +HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) +{ + return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a7936561b23..928d1cec505 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -198,7 +198,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); -HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, -- 2.23.0

1 0

[PATCH v2 6/9] gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index d3b83beffe8..408d93b2167 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -190,15 +190,15 @@ HBRUSH create_brush( const LOGBRUSH *brush ) /*********************************************************************** - * CreateHatchBrush (GDI32.@) + * NtGdiCreateHatchBrush (win32u.@) * * Create a logical brush with a hatched pattern. */ -HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) { LOGBRUSH logbrush; - TRACE("%d %06x\n", style, color ); + TRACE( "%d %06x\n", style, color ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b68cdd455b9..80f7454c2cb 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -432,6 +432,14 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) return NtGdiCreateSolidBrush( color, NULL ); } +/*********************************************************************** + * CreateHatchBrush (GDI32.@) + */ +HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +{ + return NtGdiCreateHatchBrush( style, color, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index d275a239434..a7936561b23 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -197,6 +197,7 @@ HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, UL HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); -- 2.23.0

1 0

[PATCH v2 5/9] gdi32: Use NtGdiCreateSolidBrush for CreateSolidBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 75737d1083b..d3b83beffe8 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -268,11 +268,11 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) /*********************************************************************** - * CreateSolidBrush (GDI32.@) + * NtGdiCreateSolidBrush (win32u.@) * * Create a logical brush consisting of a single colour. */ -HBRUSH WINAPI CreateSolidBrush( COLORREF color ) +HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ) { LOGBRUSH logbrush; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 48474515151..b68cdd455b9 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -424,6 +424,14 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH *brush ) } } +/*********************************************************************** + * CreateSolidBrush (GDI32.@) + */ +HBRUSH WINAPI CreateSolidBrush( COLORREF color ) +{ + return NtGdiCreateSolidBrush( color, NULL ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index ba4d2ff3556..d275a239434 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -202,7 +202,7 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH bru HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ); -HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color ); +HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ); BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ); BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ); LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, -- 2.23.0

1 0

[PATCH v2 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5febac710dc..75737d1083b 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -167,26 +167,7 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * } -/*********************************************************************** - * CreateBrushIndirect (GDI32.@) - * - * Create a logical brush with a given style, color or pattern. - * - * PARAMS - * brush [I] Pointer to a LOGBRUSH structure describing the desired brush. - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot be - * created. - * - * NOTES - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - Windows 95 and earlier cannot create brushes from bitmaps or DIBs larger - * than 8x8 pixels. If a larger bitmap is given, only a portion of the bitmap - * is used. - */ -HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) +HBRUSH create_brush( const LOGBRUSH *brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; @@ -212,19 +193,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) * CreateHatchBrush (GDI32.@) * * Create a logical brush with a hatched pattern. - * - * PARAMS - * style [I] Direction of lines for the hatch pattern (HS_* values from "wingdi.h") - * color [I] Colour of the hatched pattern - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) { @@ -236,7 +204,7 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = style; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -244,18 +212,6 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) * CreatePatternBrush (GDI32.@) * * Create a logical brush with a pattern from a bitmap. - * - * PARAMS - * hbitmap [I] Bitmap containing pattern for the brush - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) { @@ -263,7 +219,7 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) TRACE("%p\n", hbitmap ); logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -271,21 +227,6 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) * CreateDIBPatternBrush (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * hbitmap [I] Global object containing BITMAPINFO structure for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - This function is for compatibility only. CreateDIBPatternBrushPt() should - * be used instead. */ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) { @@ -298,7 +239,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -306,19 +247,6 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) * CreateDIBPatternBrushPt (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * data [I] Pointer to a BITMAPINFO structure and image data for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) { @@ -335,7 +263,7 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) logbrush.lbColor = coloruse; logbrush.lbHatch = (ULONG_PTR)data; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -343,18 +271,6 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) * CreateSolidBrush (GDI32.@) * * Create a logical brush consisting of a single colour. - * - * PARAMS - * color [I] Colour to make the solid brush - * - * RETURNS - * A handle to the newly created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) { @@ -366,7 +282,7 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = 0; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index da428d149ce..07277a12e8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,12 +641,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) font_init(); /* create stock objects */ - stock_objects[WHITE_BRUSH] = CreateBrushIndirect( &WhiteBrush ); - stock_objects[LTGRAY_BRUSH] = CreateBrushIndirect( &LtGrayBrush ); - stock_objects[GRAY_BRUSH] = CreateBrushIndirect( &GrayBrush ); - stock_objects[DKGRAY_BRUSH] = CreateBrushIndirect( &DkGrayBrush ); - stock_objects[BLACK_BRUSH] = CreateBrushIndirect( &BlackBrush ); - stock_objects[NULL_BRUSH] = CreateBrushIndirect( &NullBrush ); + stock_objects[WHITE_BRUSH] = create_brush( &WhiteBrush ); + stock_objects[LTGRAY_BRUSH] = create_brush( &LtGrayBrush ); + stock_objects[GRAY_BRUSH] = create_brush( &GrayBrush ); + stock_objects[DKGRAY_BRUSH] = create_brush( &DkGrayBrush ); + stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); + stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); stock_objects[WHITE_PEN] = CreatePenIndirect( &WhitePen ); stock_objects[BLACK_PEN] = CreatePenIndirect( &BlackPen ); @@ -672,7 +672,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); - stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); + stock_objects[DC_BRUSH] = create_brush( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); /* clear the NOSYSTEM bit on all stock objects*/ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 91230666fad..ffa28f39c73 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -168,6 +168,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ +extern HBRUSH create_brush( const LOGBRUSH *brush ); extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4225437aa4a..48474515151 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -398,6 +398,32 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) return NtGdiCreatePen( style, width, color, NULL ); } +/*********************************************************************** + * CreateBrushIndirect (GDI32.@) + */ +HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH *brush ) +{ + switch (brush->lbStyle) + { + case BS_NULL: + return GetStockObject( NULL_BRUSH ); + case BS_SOLID: + return CreateSolidBrush( brush->lbColor ); + case BS_HATCHED: + return CreateHatchBrush( brush->lbHatch, brush->lbColor ); + case BS_PATTERN: + case BS_PATTERN8X8: + return CreatePatternBrush( (HBITMAP)brush->lbHatch ); + case BS_DIBPATTERN: + return CreateDIBPatternBrush( (HGLOBAL)brush->lbHatch, brush->lbColor ); + case BS_DIBPATTERNPT: + return CreateDIBPatternBrushPt( (void *)brush->lbHatch, brush->lbColor ); + default: + WARN( "invalid brush style %u\n", brush->lbStyle ); + return 0; + } +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a2201bd511..f04ee22ab6d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -361,6 +361,16 @@ static void test_brush_org( void ) ReleaseDC( 0, hdc ); } +static void test_null_brush(void) +{ + LOGBRUSH lb; + HBRUSH brush; + + lb.lbStyle = BS_NULL; + brush = CreateBrushIndirect(&lb); + ok(brush == GetStockObject(NULL_BRUSH), "brush is not NULL_BRUSH\n"); +} + START_TEST(brush) { test_solidbrush(); @@ -368,4 +378,5 @@ START_TEST(brush) test_pattern_brush(); test_palette_brush(); test_brush_org(); + test_null_brush(); } -- 2.23.0

1 0

[PATCH v2 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3073f745f92..f370d088585 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -32,11 +32,6 @@ #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" -#include "winternl.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" -#include "ddk/d3dkmthk.h" #include "ntgdi_private.h" #include "wine/list.h" @@ -45,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); - struct graphics_driver { struct list entry; @@ -163,20 +156,6 @@ BOOL is_display_device( LPCWSTR name ) return TRUE; } -static HANDLE get_display_device_init_mutex( void ) -{ - HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); - - WaitForSingleObject( mutex, INFINITE ); - return mutex; -} - -static void release_display_device_init_mutex( HANDLE mutex ) -{ - ReleaseMutex( mutex ); - CloseHandle( mutex ); -} - #ifdef __i386__ static const WCHAR printer_env[] = L"w32x86"; #elif defined __x86_64__ @@ -1249,76 +1228,6 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return status; } -/****************************************************************************** - * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] - */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) -{ - WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - NTSTATUS status = STATUS_UNSUCCESSFUL; - D3DKMT_OPENADAPTERFROMLUID luid_desc; - SP_DEVINFO_DATA device_data; - DWORD size, state_flags; - DEVPROPTYPE type; - HANDLE mutex; - int index; - - TRACE("(%p)\n", desc); - - if (!desc) - return STATUS_UNSUCCESSFUL; - - TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); - if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) - return STATUS_UNSUCCESSFUL; - - index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; - if (*end) - return STATUS_UNSUCCESSFUL; - - /* Get adapter LUID from SetupAPI */ - mutex = get_display_device_init_mutex(); - - size = sizeof( bufferW ); - swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); - if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ - lstrcpyW( key_nameW, bufferW + 18 ); - size = sizeof( state_flags ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, - &state_flags, &size )) - goto done; - - if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - goto done; - - size = sizeof( bufferW ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); - device_data.cbSize = sizeof( device_data ); - SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), - NULL, 0)) - goto done; - - if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - - desc->hAdapter = luid_desc.hAdapter; - desc->AdapterLuid = luid_desc.AdapterLuid; - desc->VidPnSourceId = index; - -done: - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return status; -} - /****************************************************************************** * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 3acafbc9331..4225437aa4a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -19,9 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "gdi_private.h" +#include "winuser.h" +#include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -29,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct hdc_list { HDC hdc; @@ -619,3 +629,88 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *co { return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); } + +static HANDLE get_display_device_init_mutex( void ) +{ + HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + +/*********************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + NTSTATUS status = STATUS_UNSUCCESSFUL; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + SP_DEVINFO_DATA device_data; + DWORD size, state_flags; + DEVPROPTYPE type; + HANDLE mutex; + int index; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); + if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) + return STATUS_UNSUCCESSFUL; + + index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; + if (*end) + return STATUS_UNSUCCESSFUL; + + /* Get adapter LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + + size = sizeof( bufferW ); + swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, + RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ + lstrcpyW( key_nameW, bufferW + 18 ); + size = sizeof( state_flags ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, + &state_flags, &size )) + goto done; + + if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + goto done; + + size = sizeof( bufferW ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + device_data.cbSize = sizeof( device_data ); + SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) + goto done; + + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; + + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; + desc->VidPnSourceId = index; + +done: + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return status; +} -- 2.23.0

1 0

[PATCH v2 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fba1f1cffea..3073f745f92 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1257,13 +1257,11 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; HDEVINFO devinfo = INVALID_HANDLE_VALUE; NTSTATUS status = STATUS_UNSUCCESSFUL; - static D3DKMT_HANDLE handle_start = 0; - struct d3dkmt_adapter *adapter; + D3DKMT_OPENADAPTERFROMLUID luid_desc; SP_DEVINFO_DATA device_data; DWORD size, state_flags; DEVPROPTYPE type; HANDLE mutex; - LUID luid; int index; TRACE("(%p)\n", desc); @@ -1279,10 +1277,6 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI if (*end) return STATUS_UNSUCCESSFUL; - adapter = heap_alloc( sizeof( *adapter ) ); - if (!adapter) - return STATUS_NO_MEMORY; - /* Get adapter LUID from SetupAPI */ mutex = get_display_device_init_mutex(); @@ -1309,28 +1303,39 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI device_data.cbSize = sizeof( device_data ); SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof( luid ), NULL, 0)) + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) goto done; - EnterCriticalSection( &driver_section ); - /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ - adapter->handle = ++handle_start; - list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - desc->hAdapter = handle_start; - desc->AdapterLuid = luid; + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; desc->VidPnSourceId = index; - status = STATUS_SUCCESS; done: SetupDiDestroyDeviceInfoList( devinfo ); release_display_device_init_mutex( mutex ); - if (status != STATUS_SUCCESS) - heap_free( adapter ); return status; } +/****************************************************************************** + * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + if (!(adapter = heap_alloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + desc->hAdapter = adapter->handle = ++handle_start; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} + /****************************************************************************** * NtGdiDdDDICreateDevice (win32u.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 48ce04e3819..5bddcd26de6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -89,6 +89,7 @@ @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid @ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics @ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit @ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index dc53ea343c0..2ca3c4d7448 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -122,6 +122,12 @@ typedef struct _D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; } D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME; +typedef struct _D3DKMT_OPENADAPTERFROMLUID +{ + LUID AdapterLuid; + D3DKMT_HANDLE hAdapter; +} D3DKMT_OPENADAPTERFROMLUID; + typedef struct _D3DKMT_SETVIDPNSOURCEOWNER { D3DKMT_HANDLE hDevice; diff --git a/include/ntgdi.h b/include/ntgdi.h index 7f3ecec8c64..ba4d2ff3556 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -333,6 +333,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); -- 2.23.0

1 0

[PATCH v2 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index de1942894de..5a8d29ae5bf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1579,9 +1579,9 @@ error: /*********************************************************************** - * D3DKMTCreateDCFromMemory (GDI32.@) + * NtGdiDdDDICreateDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { const struct d3dddi_format_info { @@ -1693,9 +1693,9 @@ error: /*********************************************************************** - * D3DKMTDestroyDCFromMemory (GDI32.@) + * NtGdiDdDDIDestroyDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) { if (!desc) return STATUS_INVALID_PARAMETER; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1df4660211e..fba1f1cffea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1203,27 +1203,27 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) } /****************************************************************************** - * D3DKMTOpenAdapterFromHdc [GDI32.@] + * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( void *pData ) +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTEscape [GDI32.@] + * NtGdiDdDDIEscape (win32u.@) */ -NTSTATUS WINAPI D3DKMTEscape( const void *pData ) +NTSTATUS WINAPI NtGdiDdDDIEscape( const void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTCloseAdapter [GDI32.@] + * NtGdiDdDDICloseAdapter (win32u.@) */ -NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; struct d3dkmt_adapter *adapter; @@ -1332,9 +1332,9 @@ done: } /****************************************************************************** - * D3DKMTCreateDevice [GDI32.@] + * NtGdiDdDDICreateDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) { static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; @@ -1377,9 +1377,9 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) } /****************************************************************************** - * D3DKMTDestroyDevice [GDI32.@] + * NtGdiDdDDIDestroyDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; @@ -1397,7 +1397,7 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { memset( &set_owner_desc, 0, sizeof(set_owner_desc) ); set_owner_desc.hDevice = desc->hDevice; - D3DKMTSetVidPnSourceOwner( &set_owner_desc ); + NtGdiDdDDISetVidPnSourceOwner( &set_owner_desc ); list_remove( &device->entry ); heap_free( device ); status = STATUS_SUCCESS; @@ -1410,27 +1410,27 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) } /****************************************************************************** - * D3DKMTQueryStatistics [GDI32.@] + * NtGdiDdDDIQueryStatistics (win32u.@) */ -NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ) { FIXME("(%p): stub\n", stats); return STATUS_SUCCESS; } /****************************************************************************** - * D3DKMTSetQueuedLimit [GDI32.@] + * NtGdiDdDDISetQueuedLimit (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) { FIXME( "(%p): stub\n", desc ); return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** - * D3DKMTSetVidPnSourceOwner [GDI32.@] + * NtGdiDdDDISetVidPnSourceOwner (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { TRACE("(%p)\n", desc); @@ -1448,9 +1448,9 @@ NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *des } /****************************************************************************** - * D3DKMTCheckVidPnExclusiveOwnership [GDI32.@] + * NtGdiDdDDICheckVidPnExclusiveOwnership (win32u.@) */ -NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { TRACE("(%p)\n", desc); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6aef8c2dbf6..48ce04e3819 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,18 +80,18 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) -@ stdcall D3DKMTCloseAdapter(ptr) -@ stdcall D3DKMTCreateDCFromMemory(ptr) -@ stdcall D3DKMTCreateDevice(ptr) -@ stdcall D3DKMTDestroyDCFromMemory(ptr) -@ stdcall D3DKMTDestroyDevice(ptr) -@ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) NtGdiDdDDICheckVidPnExclusiveOwnership +@ stdcall D3DKMTCloseAdapter(ptr) NtGdiDdDDICloseAdapter +@ stdcall D3DKMTCreateDCFromMemory(ptr) NtGdiDdDDICreateDCFromMemory +@ stdcall D3DKMTCreateDevice(ptr) NtGdiDdDDICreateDevice +@ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory +@ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice +@ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) -@ stdcall D3DKMTOpenAdapterFromHdc(ptr) -@ stdcall D3DKMTQueryStatistics(ptr) -@ stdcall D3DKMTSetQueuedLimit(ptr) -@ stdcall D3DKMTSetVidPnSourceOwner(ptr) +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ntgdi.h b/include/ntgdi.h index e1bb6fb901d..7f3ecec8c64 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -20,7 +20,9 @@ #define _NTGDI_ #include <wingdi.h> +#include <winternl.h> #include <winspool.h> +#include <ddk/d3dkmthk.h> typedef struct _GDI_HANDLE_ENTRY { @@ -325,4 +327,14 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiUpdateColors( HDC hdc ); BOOL WINAPI NtGdiWidenPath( HDC hdc ); +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); + #endif /* _NTGDI_ */ -- 2.23.0

1 0

[PATCH] conhost: Use font face length as number of characters.
by Jacek Caban 25 Aug '21

25 Aug '21

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 13 +++++++++---- programs/conhost/window.c | 24 +++++++++++++----------- 2 files changed, 22 insertions(+), 15 deletions(-)

1 0

[PATCH 9/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 20 -------------------- dlls/gdi32/objects.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-)

1 0

[PATCH 7/9] gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 6/9] gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 5/9] gdi32: Use NtGdiCreateSolidBrush for CreateSolidBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-)

1 0

[PATCH 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-)

1 0

[PATCH 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Jacek Caban 25 Aug '21

25 Aug '21

And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-)

1 0

[PATCH 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-)

1 0

[PATCH] winex11.drv: When mapping a layered window make sure that surface has a valid bounding rectangle.
by Dmitry Timoshkov 25 Aug '21

25 Aug '21

Otherwise surface->flush() would be a no-op. This may happen 1. when UpdateLayeredWindow() was initially called on an invisible window 2. when a window is unmapped during being converted to managed 3. layered windows are mapped only once their attributes are set Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a41865..dfe7d1ce716 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1128,7 +1128,10 @@ static void map_window( HWND hwnd, DWORD new_style ) XMapWindow( data->display, data->whole_window ); XFlush( data->display ); if (data->surface && data->vis.visualid != default_visual.visualid) + { + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &data->window_rect ); data->surface->funcs->flush( data->surface ); + } } else set_xembed_flags( data, XEMBED_MAPPED ); -- 2.31.1

1 1

[PATCH v2] ntoskrnl.exe: Add NtTraceControl/ZwTraceControl stubs
by Alistair Leslie-Hughes 25 Aug '21

25 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/server.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 14 ++++++++++++++ dlls/wow64/syscall.h | 1 + 5 files changed, 28 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1bff52a299d..c3d17d989ac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -414,6 +414,7 @@ @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) @ stdcall -syscall NtTestAlert() +@ stdcall -syscall NtTraceControl(long ptr long ptr long long) # @ stub NtTraceEvent # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @@ -1435,6 +1436,7 @@ @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread @ stdcall -private -syscall ZwTestAlert() NtTestAlert +@ stdcall -private -syscall ZwTraceControl(long ptr long ptr long long) NtTraceControl # @ stub ZwTraceEvent # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 986eb6c3250..05fae06fc37 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -721,6 +721,15 @@ NTSTATUS WINAPI NtTestAlert(void) return STATUS_SUCCESS; } +/*********************************************************************** + * NtTraceControl (NTDLL.@) + */ +NTSTATUS WINAPI NtTraceControl(ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size) +{ + FIXME("code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, + outbuf, outbuf_len, size); + return STATUS_SUCCESS; +} /*********************************************************************** * server_queue_process_apc diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f51833b91a0..071dae6ceca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -818,6 +818,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stdcall NtTraceControl(long ptr long ptr long long) @ stub NtTraceEvent @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @ stub NtVdmControl @@ -1514,6 +1515,7 @@ @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private ZwTerminateProcess(long long) NtTerminateProcess +@ stdcall -private ZwTraceControl(long ptr long ptr long long) NtTraceControl @ stub ZwTranslateFilePath @ stdcall ZwUnloadDriver(ptr) @ stdcall -private ZwUnloadKey(ptr) NtUnloadKey diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 2560fc10a0a..e4a58eeef6d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1480,6 +1480,20 @@ NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) return NtTestAlert(); } +/********************************************************************** + * wow64_NtTraceControl + */ +NTSTATUS WINAPI wow64_NtTraceControl( UINT *args ) +{ + ULONG code = get_ulong( &args ); + void *inbuf = get_ptr( &args ); + ULONG inbuf_len = get_ulong( &args ); + void *outbuf = get_ptr( &args ); + ULONG outbuf_len = get_ulong( &args ); + ULONG *size = get_ptr( &args ); + + return NtTraceControl(code, inbuf, inbuf_len, outbuf, outbuf_len, size); +} /********************************************************************** * wow64_NtWaitForDebugEvent diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index d6c1b7c74fa..a565e9cda3a 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -228,6 +228,7 @@ SYSCALL_ENTRY( NtTerminateProcess ) \ SYSCALL_ENTRY( NtTerminateThread ) \ SYSCALL_ENTRY( NtTestAlert ) \ + SYSCALL_ENTRY( NtTraceControl ) \ SYSCALL_ENTRY( NtUnloadDriver ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockFile ) \ -- 2.32.0

1 0

[PATCH] services: Check correct permission
by Alistair Leslie-Hughes 25 Aug '21

25 Aug '21

Function svcctl_QueryServiceConfigW already checked for this permission, so make sense that QueryServiceConfig2W should as well. MSDN states "This handle is returned by the OpenService or CreateService function and must have the SERVICE_QUERY_CONFIG access right" Patch by Bugzilla user Dalai. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50412 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/services/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8d688c2f904..0f0a83df421 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -979,7 +979,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, memset(buffer, 0, size); - if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0) return err; switch (level) -- 2.32.0

1 0

[PATCH] nsiproxy: Include sys/queue.h from tcp.c
by Gerald Pfeifer 25 Aug '21

25 Aug '21

In what looks like a change between FreeBSD 11 and later versions (FreeBSD 12 and 13), we now need to explicitly include sys/queue.h to avoid In file included from dlls/nsiproxy.sys/tcp.c:42: /usr/include/netinet/tcp_var.h:516:2: error: expected specifier-qualifier-list before 'TAILQ_ENTRY' 516 | TAILQ_ENTRY(tcptw) tw_2msl; Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8567330be99..603aefadfe9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -58,6 +58,10 @@ #include <netinet/ip_var.h> #endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif + #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif -- 2.31.1

2 1

[PATCH] iphlpapi: Return early on error.
by Huw Davies 25 Aug '21

25 Aug '21

This prevents using err uninitialized. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51655 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Supersedes 212361. dlls/iphlpapi/iphlpapi_main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 47c8a507e38..f83271eae97 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1206,15 +1206,11 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags } } if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); - if (err) goto err; + if (err) return err; } aa->DnsSuffix = heap_alloc( MAX_DNS_SUFFIX_STRING_LENGTH * sizeof(WCHAR) ); - if (!aa->DnsSuffix) - { - err = ERROR_NOT_ENOUGH_MEMORY; - goto err; - } + if (!aa->DnsSuffix) return ERROR_NOT_ENOUGH_MEMORY; aa->DnsSuffix[0] = '\0'; if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, NULL, &size ) && @@ -1231,8 +1227,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags aa = aa->Next; } -err: - return err; + return ERROR_SUCCESS; } static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) -- 2.23.0

1 0

[PATCH 4/4] uxtheme: Draw scroll bar parent background only when theme parts are transparent.
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Fix hangs in Source Insight 4 Options->Window->Styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/scrollbar.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 386f0446049..a9d5a83f2bb 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -100,9 +100,6 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES thumbstate = SCRBS_PRESSED; } - if (bar == SB_CTL) - DrawThemeParentBackground(hwnd, dc, NULL); - if (vertical) { int uparrowstate, downarrowstate; @@ -132,16 +129,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.bottom = partrect.top + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, uparrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); partrect.bottom = rect->bottom; partrect.top = partrect.bottom - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, downarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.top = rect->top + arrowsize; partrect.bottom = rect->top + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKVERT, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); } @@ -149,6 +152,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.top = rect->top + thumbpos; partrect.bottom = partrect.top + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNVERT, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -167,7 +172,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.top = rect->top + arrowsize; if (partrect.bottom > partrect.top) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKVERT, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } } else { int leftarrowstate, rightarrowstate; @@ -197,16 +206,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.right = partrect.left + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, leftarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); partrect.right = rect->right; partrect.left = partrect.right - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, rightarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.left = rect->left + arrowsize; partrect.right = rect->left + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKHORZ, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); } @@ -214,6 +229,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.left = rect->left + thumbpos; partrect.right = partrect.left + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNHORZ, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -232,7 +249,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.left = rect->left + arrowsize; if (partrect.right > partrect.left) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKHORZ, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } } } -- 2.30.2

1 0

[PATCH 3/4] uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51553 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index ed22d923250..6f74d2d3d7d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1072,11 +1072,18 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) if (!bmp || GetObjectW( bmp, sizeof(dib), &dib ) != sizeof(dib)) return FALSE; - if(dib.dsBm.bmBitsPixel != 32) + if (dib.dsBm.bmBitsPixel != 32 || dib.dsBmih.biCompression != BI_RGB) /* nothing to do */ return TRUE; - *hasAlpha = TRUE; + /* If all alpha values are 0xff, don't use alpha blending */ + for (n = 0, p = dib.dsBm.bmBits; n < dib.dsBmih.biWidth * dib.dsBmih.biHeight; n++, p += 4) + if ((*hasAlpha = (p[3] != 0xff))) + break; + + if (!*hasAlpha) + return TRUE; + p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ -- 2.30.2

1 0

[PATCH 2/4] uxtheme: Implement DrawThemeIcon().
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51589 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 521f9eb32a9..4394f4943b7 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -2,6 +2,7 @@ * Win32 5.1 Theme drawing * * Copyright (C) 2003 Kevin Koltzau + * Copyright 2021 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdlib.h> #include <stdarg.h> @@ -25,6 +28,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "commctrl.h" +#include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -1649,10 +1654,57 @@ HRESULT WINAPI DrawThemeEdge(HTHEME hTheme, HDC hdc, int iPartId, HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, HIMAGELIST himl, int iImageIndex) { - FIXME("%d %d: stub\n", iPartId, iStateId); - if(!hTheme) + INT effect = ICE_NONE, saturation = 0, alpha = 128; + IImageList *image_list = (IImageList *)himl; + IMAGELISTDRAWPARAMS params = {0}; + COLORREF color = 0; + + TRACE("%p %p %d %d %s %p %d\n", hTheme, hdc, iPartId, iStateId, wine_dbgstr_rect(pRect), himl, + iImageIndex); + + if (!hTheme) return E_HANDLE; - return E_NOTIMPL; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_ICONEFFECT, &effect); + switch (effect) + { + case ICE_NONE: + params.fState = ILS_NORMAL; + break; + case ICE_GLOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_GLOWCOLOR, &color); + params.fState = ILS_GLOW; + params.crEffect = color; + break; + case ICE_SHADOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_SHADOWCOLOR, &color); + params.fState = ILS_SHADOW; + params.crEffect = color; + break; + case ICE_PULSE: + GetThemeInt(hTheme, iPartId, iStateId, TMT_SATURATION, &saturation); + params.fState = ILS_SATURATE; + params.Frame = saturation; + break; + case ICE_ALPHA: + GetThemeInt(hTheme, iPartId, iStateId, TMT_ALPHALEVEL, &alpha); + params.fState = ILS_ALPHA; + params.Frame = alpha; + break; + } + + params.cbSize = sizeof(params); + params.himl = himl; + params.i = iImageIndex; + params.hdcDst = hdc; + params.x = pRect->left; + params.y = pRect->top; + params.cx = pRect->right - pRect->left; + params.cy = pRect->bottom - pRect->top; + params.rgbBk = CLR_NONE; + params.rgbFg = CLR_NONE; + params.fStyle = ILD_TRANSPARENT; + return IImageList_Draw(image_list, &params); } /*********************************************************************** -- 2.30.2

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