wine-devel August 2021

wine-devel@winehq.org

78 participants
929 discussions

[PATCH] winebus.sys: Print the debug string and not the pointer to it
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 41aef8ab018..e9c85deb846 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -339,7 +339,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function DEVICE_OBJECT *ret = NULL; int cont; - TRACE("bus_id %p\n", debugstr_w(bus_id)); + TRACE("bus_id %s\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) -- 2.31.1

1 0

[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

← Newer
1
...
24
25
26
27
28
29
30
...
93
Older →

Jump to page:

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 August 2021