wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : quartz: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 4364ff8d5c0387edd6fae142affe8e844b291518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4364ff8d5c0387edd6fae142… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 4 15:41:27 2022 -0600 quartz: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/acmwrapper.c | 18 ++- dlls/quartz/avidec.c | 31 +++-- dlls/quartz/dsoundrender.c | 40 +++--- dlls/quartz/filesource.c | 15 ++- dlls/quartz/filtergraph.c | 296 ++++++++++++++++++++++---------------------- dlls/quartz/filtermapper.c | 96 +++++++------- dlls/quartz/main.c | 9 +- dlls/quartz/memallocator.c | 44 +++---- dlls/quartz/passthrough.c | 4 +- dlls/quartz/regsvr.c | 2 +- dlls/quartz/systemclock.c | 15 +-- dlls/quartz/videorenderer.c | 10 +- dlls/quartz/vmr9.c | 121 +++++++++--------- dlls/quartz/window.c | 83 +++++++------ 15 files changed, 387 insertions(+), 398 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4364ff8d5c0387edd6fa…

1 0

Michael Stefaniuc : dswave: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: deb6096775f46842fc16836d67ddc39d1974577f URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb6096775f46842fc16836d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:36:00 2022 +0100 dswave: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/Makefile.in | 1 - dlls/dswave/dmobject.c | 20 ++++++++++---------- dlls/dswave/dswave.c | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index f047d3bf7df..9a08518397b 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dswave.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dswave/dmobject.c b/dlls/dswave/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dswave/dmobject.c +++ b/dlls/dswave/dmobject.c @@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) return; TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); - TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize); #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") - TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData); X(DMUS_OBJ_OBJECT); X(DMUS_OBJ_CLASS); X(DMUS_OBJ_NAME); @@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk) return "(null)"; if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); - return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size); + return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size); } static HRESULT stream_read(IStream *stream, void *data, ULONG size) @@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ - TRACE_(dmfile)("Short read: %u < %u\n", read, size); + TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); return E_FAIL; } @@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) return hr; if (size != elem_size) { - WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n", debugstr_chunk(chunk), size, elem_size); return DMUS_E_UNSUPPORTED_STREAM; } @@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, ULONG size) { if (chunk->size != size) { - WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n", + WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n", debugstr_fourcc(chunk->id), chunk->size, wine_dbgstr_longlong(chunk->offset.QuadPart), size); return E_FAIL; @@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, struct chunk_entry chunk = {.parent = riff}; HRESULT hr; - TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); + TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff)); desc->dwValidData = 0; desc->dwSize = sizeof(*desc); @@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, break; } } - TRACE("Found %#x\n", desc->dwValidData); + TRACE("Found %#lx\n", desc->dwValidData); return hr; } @@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); return hr; } - TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID), + TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID), reference.dwValidData); if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData))) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 349c7e2fda5..1b83d5ab053 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -72,7 +72,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : dswave/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 3d68dfba07522e4db0c7a8729b0b656e1e938873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d68dfba07522e4db0c7a872… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:35:59 2022 +0100 dswave/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/Makefile.in | 1 - dlls/dswave/tests/dswave.c | 71 +++++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d68dfba07522e4db0c7…

1 0

Michael Stefaniuc : dmusic: Don't trace both the This and iface pointers.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 50811b568000ba395057f0b90b99456f11dd3d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50811b568000ba395057f0b9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:35:58 2022 +0100 dmusic: Don't trace both the This and iface pointers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/collection.c | 4 ++-- dlls/dmusic/port.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 0f9fb54cccb..05f67d5578d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -60,7 +60,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; @@ -72,7 +72,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl *ret_iface = &This->dmobj.IPersistStream_iface; else { - WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9d58dd8924d..d593d739a9e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -151,7 +151,7 @@ static HRESULT WINAPI synth_port_QueryInterface(IDirectMusicPort *iface, REFIID { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) *ret_iface = &This->IDirectMusicPort_iface; @@ -218,7 +218,7 @@ static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusi LPBYTE data; DWORD size; - TRACE("(%p/%p)->(%p)\n", iface, This, buffer); + TRACE("(%p, %p)\n", iface, buffer); if (!buffer) return E_POINTER; @@ -339,10 +339,9 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi static HRESULT WINAPI synth_port_UnloadInstrument(IDirectMusicPort *iface, IDirectMusicDownloadedInstrument *downloaded_instrument) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); - TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument); + TRACE("(%p, %p)\n", iface, downloaded_instrument); if (!downloaded_instrument) return E_POINTER; @@ -361,7 +360,7 @@ static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IRefer { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, clock); + TRACE("(%p, %p)\n", iface, clock); return IDirectMusicSynth8_GetLatencyClock(This->synth, clock); } @@ -385,7 +384,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); + TRACE("(%p, %p)\n", iface, port_caps); return IDirectMusicSynth_GetPortCaps(This->synth, port_caps); } @@ -416,7 +415,7 @@ static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DW { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, channel_groups); + TRACE("(%p, %p)\n", iface, channel_groups); *channel_groups = This->nrofgroups; @@ -586,7 +585,7 @@ static HRESULT WINAPI synth_port_download_QueryInterface(IDirectMusicPortDownloa { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } @@ -595,7 +594,7 @@ static ULONG WINAPI synth_port_download_AddRef(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } @@ -604,7 +603,7 @@ static ULONG WINAPI synth_port_download_Release(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } @@ -686,7 +685,7 @@ static HRESULT WINAPI synth_port_thru_QueryInterface(IDirectMusicThru *iface, RE { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } @@ -695,7 +694,7 @@ static ULONG WINAPI synth_port_thru_AddRef(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } @@ -704,7 +703,7 @@ static ULONG WINAPI synth_port_thru_Release(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); }

1 0

Michael Stefaniuc : dmusic: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 8729840f94aeaa4be5233b40a2d070270d7aa5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8729840f94aeaa4be5233b40… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:35:57 2022 +0100 dmusic: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/Makefile.in | 1 - dlls/dmusic/buffer.c | 10 ++++----- dlls/dmusic/clock.c | 6 +++--- dlls/dmusic/collection.c | 36 +++++++++++++++---------------- dlls/dmusic/dmobject.c | 20 +++++++++--------- dlls/dmusic/dmusic.c | 14 ++++++------ dlls/dmusic/dmusic_main.c | 12 +++++------ dlls/dmusic/download.c | 4 ++-- dlls/dmusic/instrument.c | 50 +++++++++++++++++++++---------------------- dlls/dmusic/port.c | 54 +++++++++++++++++++++++------------------------ 10 files changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8729840f94aeaa4be523…

1 0

Michael Stefaniuc : dmsynth: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 26a9ce80089073b583681325dbcadbb47dc33e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a9ce80089073b583681325… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 4 22:35:56 2022 +0100 dmsynth: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/Makefile.in | 1 - dlls/dmsynth/synth.c | 68 ++++++++++++++++++++++++------------------------ dlls/dmsynth/synthsink.c | 14 +++++----- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26a9ce80089073b58368…

1 0

Esme Povirk : diasymreader: Return success from SymWriter_OpenScope.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 7ac9798680d0a03e4f3b7d726cb5402456fa0f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac9798680d0a03e4f3b7d72… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:52 2022 -0600 diasymreader: Return success from SymWriter_OpenScope. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index efa0f48947d..1820ccb51b0 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -144,7 +144,8 @@ static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 s ULONG32 *pRetVal) { FIXME("(%p,%u,%p)\n", iface, startOffset, pRetVal); - return E_NOTIMPL; + *pRetVal = 0xdeadbeef; + return S_OK; } static HRESULT WINAPI SymWriter_CloseScope(ISymUnmanagedWriter5 *iface, ULONG32 endOffset)

1 0

Esme Povirk : diasymreader: Return success from methods with no output variables.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: b8f322aa33fd384fa3c2eea3d518eac6250e93cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f322aa33fd384fa3c2eea3… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:51 2022 -0600 diasymreader: Return success from methods with no output variables. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 50b79e2175c..efa0f48947d 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -125,19 +125,19 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod) { FIXME("(%p,0x%x)\n", iface, entryMethod); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenMethod(ISymUnmanagedWriter5 *iface, mdMethodDef method) { FIXME("(%p,0x%x)\n", iface, method); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseMethod(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 startOffset, @@ -150,14 +150,14 @@ static HRESULT WINAPI SymWriter_OpenScope(ISymUnmanagedWriter5 *iface, ULONG32 s static HRESULT WINAPI SymWriter_CloseScope(ISymUnmanagedWriter5 *iface, ULONG32 endOffset) { FIXME("(%p,%u)\n", iface, endOffset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetScopeRange(ISymUnmanagedWriter5 *iface, ULONG32 scopeID, ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%u,%u,%u)\n", iface, scopeID, startOffset, endOffset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineLocalVariable(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -165,7 +165,7 @@ static HRESULT WINAPI SymWriter_DefineLocalVariable(ISymUnmanagedWriter5 *iface, ULONG32 addr1, ULONG32 addr2, ULONG32 addr3, ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineParameter(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -173,7 +173,7 @@ static HRESULT WINAPI SymWriter_DefineParameter(ISymUnmanagedWriter5 *iface, con ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, sequence, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineField(ISymUnmanagedWriter5 *iface, mdTypeDef parent, @@ -181,7 +181,7 @@ static HRESULT WINAPI SymWriter_DefineField(ISymUnmanagedWriter5 *iface, mdTypeD ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,0x%x,%s,0x%x,%u,%u)\n", iface, parent, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineGlobalVariable(ISymUnmanagedWriter5 *iface, const WCHAR *name, @@ -189,45 +189,45 @@ static HRESULT WINAPI SymWriter_DefineGlobalVariable(ISymUnmanagedWriter5 *iface ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,%u,%u)\n", iface, debugstr_w(name), attributes, cSig, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Close(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetSymAttributes(ISymUnmanagedWriter5 *iface, mdToken parent, const WCHAR *name, ULONG32 cData, unsigned char data[]) { FIXME("(%p,0x%x,%s,%u)\n", iface, parent, debugstr_w(name), cData); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenNamespace(ISymUnmanagedWriter5 *iface, const WCHAR *name) { FIXME("(%p,%s)\n", iface, debugstr_w(name)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseNamespace(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_UsingNamespace(ISymUnmanagedWriter5 *iface, const WCHAR *fullName) { FIXME("(%p,%s)\n", iface, debugstr_w(fullName)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_SetMethodSourceRange(ISymUnmanagedWriter5 *iface, ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn) { FIXME("(%p,%p,%u,%u,%p,%u,%u)\n", iface, startDoc, startLine, startColumn, endDoc, endLine, endColumn); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *filename, @@ -297,33 +297,33 @@ static HRESULT WINAPI SymWriter_DefineSequencePoints(ISymUnmanagedWriter5 *iface ULONG32 spCount, ULONG32 offsets[], ULONG32 lines[], ULONG32 columns[], ULONG32 endLines[], ULONG32 endColumns[]) { FIXME("(%p,%p,%u)\n", iface, document, spCount); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_RemapToken(ISymUnmanagedWriter5 *iface, mdToken oldToken, mdToken newToken) { FIXME("(%p,0x%x,0x%x)\n", iface, oldToken, newToken); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Initialize2(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *tempFilename, IStream *pIStream, BOOL fFullBuild, const WCHAR *finalFilename) { FIXME("(%p,%p,%s,%p,%u,%s)\n", iface, emitter, debugstr_w(tempFilename), pIStream, fFullBuild, debugstr_w(finalFilename)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineConstant(ISymUnmanagedWriter5 *iface, const WCHAR *name, VARIANT value, ULONG32 cSig, unsigned char signature[]) { FIXME("(%p,%s,%s,%u,%p)\n", iface, debugstr_w(name), debugstr_variant(&value), cSig, signature); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Abort(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineLocalVariable2(ISymUnmanagedWriter5 *iface, const WCHAR *name, ULONG32 attributes, @@ -331,32 +331,32 @@ static HRESULT WINAPI SymWriter_DefineLocalVariable2(ISymUnmanagedWriter5 *iface ULONG32 startOffset, ULONG32 endOffset) { FIXME("(%p,%s,0x%x,0x%x,%u)\n", iface, debugstr_w(name), attributes, sigToken, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineGlobalVariable2(ISymUnmanagedWriter5 *iface, const WCHAR *name, ULONG32 attributes, mdSignature sigToken, ULONG32 addrKind, ULONG32 addr1, ULONG32 addr2, ULONG32 addr3) { FIXME("(%p,%s,0x%x,0x%x,%u)\n", iface, debugstr_w(name), attributes, sigToken, addrKind); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_DefineConstant2(ISymUnmanagedWriter5 *iface, const WCHAR *name, VARIANT value, mdSignature sigToken) { FIXME("(%p,%s,%s,0x%x)\n", iface, debugstr_w(name), debugstr_variant(&value), sigToken); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_OpenMethod2(ISymUnmanagedWriter5 *iface, mdMethodDef method, ULONG32 isect, ULONG32 offset) { FIXME("(%p,0x%x,%u,%u)\n", iface, method, isect, offset); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_Commit(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_GetDebugInfoWithPadding(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cbData, @@ -369,20 +369,20 @@ static HRESULT WINAPI SymWriter_GetDebugInfoWithPadding(ISymUnmanagedWriter5 *if static HRESULT WINAPI SymWriter_OpenMapTokensToSourceSpans(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_CloseMapTokensToSourceSpans(ISymUnmanagedWriter5 *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_MapTokenToSourceSpan(ISymUnmanagedWriter5 *iface, mdToken token, ISymUnmanagedDocumentWriter* document, ULONG32 line, ULONG32 column, ULONG32 endLine, ULONG32 endColumn) { FIXME("(%p,%x,%p,%u,%u,%u,%u)\n", iface, token, document, line, column, endLine, endColumn); - return E_NOTIMPL; + return S_OK; } @@ -458,7 +458,7 @@ static HRESULT WINAPI SymWriter_OpenMod(IPdbWriter *iface, const WCHAR *modulena static HRESULT WINAPI SymWriter_CloseMod(IPdbWriter *iface) { FIXME("(%p)\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_GetPath(IPdbWriter *iface, DWORD ccData, DWORD *pccData, WCHAR *path)

1 0

Esme Povirk : diasymreader: Implement SymWriter_GetSignatureAge.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 54f30df9afca0855518f5d84268907443c193a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f30df9afca0855518f5d84… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:50 2022 -0600 diasymreader: Implement SymWriter_GetSignatureAge. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 78d3d81a1bd..50b79e2175c 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <time.h> #define COBJMACROS @@ -39,6 +40,7 @@ typedef struct SymWriter { LONG ref; CRITICAL_SECTION lock; GUID pdb_guid; + DWORD pdb_timestamp; DWORD pdb_age; WCHAR pdb_filename[MAX_PATH]; } SymWriter; @@ -240,6 +242,8 @@ static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown if (filename) wcsncpy_s(This->pdb_filename, MAX_PATH, filename, _TRUNCATE); + This->pdb_timestamp = _time32(NULL); + LeaveCriticalSection(&This->lock); return S_OK; @@ -465,8 +469,20 @@ static HRESULT WINAPI SymWriter_GetPath(IPdbWriter *iface, DWORD ccData, DWORD * static HRESULT WINAPI SymWriter_GetSignatureAge(IPdbWriter *iface, DWORD *timestamp, DWORD *age) { - FIXME("(%p,%p,%p)\n", iface, timestamp, age); - return E_NOTIMPL; + SymWriter *This = impl_from_IPdbWriter(iface); + + TRACE("(%p,%p,%p)\n", This, timestamp, age); + + EnterCriticalSection(&This->lock); + + if (timestamp) + *timestamp = This->pdb_timestamp; + if (age) + *age = This->pdb_age; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IPdbWriterVtbl SymWriter_PdbWriter_Vtbl = {

1 0

Esme Povirk : diasymreader: Stub IPdbWriter.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 6a0262b2920bbb0b76346953795bc6e923d632a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0262b2920bbb0b76346953… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 4 13:41:49 2022 -0600 diasymreader: Stub IPdbWriter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/Makefile.in | 2 + dlls/diasymreader/diasymreader.idl | 39 ++++++++++++++++++ dlls/diasymreader/diasymreader_private.h | 1 + dlls/diasymreader/writer.c | 70 ++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in index 34e1286a496..545368d5c11 100644 --- a/dlls/diasymreader/Makefile.in +++ b/dlls/diasymreader/Makefile.in @@ -7,4 +7,6 @@ C_SRCS = \ main.c \ writer.c +IDL_SRCS = diasymreader.idl + RC_SRCS = diasymreader.rc diff --git a/dlls/diasymreader/diasymreader.idl b/dlls/diasymreader/diasymreader.idl new file mode 100644 index 00000000000..954495e515d --- /dev/null +++ b/dlls/diasymreader/diasymreader.idl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#pragma makedep header + +/* Undocumented interface used by + * https://github.com/dotnet/symreader/blob/fe43beb65a8567834c717e2478ba36f1e9… */ +[ + object, + uuid(98ecee1e-752d-11d3-8d56-00c04f680b2b), + pointer_default(unique) +] +interface IPdbWriter : IUnknown +{ + HRESULT SetPath([in] const WCHAR *fullpath, [in] IStream *stream, [in] BOOL fullbuild); + HRESULT OpenMod([in] const WCHAR *modulename, [in] const WCHAR *filename); + HRESULT CloseMod(); + HRESULT GetPath([in] DWORD ccData, [out] DWORD *pccData, [out, size_is(ccData), length_is(*pccData)] WCHAR *path); + HRESULT GetSignatureAge([out] DWORD *timestamp, [out] DWORD *age); +} diff --git a/dlls/diasymreader/diasymreader_private.h b/dlls/diasymreader/diasymreader_private.h index 4275193e3d4..2d05859d447 100644 --- a/dlls/diasymreader/diasymreader_private.h +++ b/dlls/diasymreader/diasymreader_private.h @@ -19,5 +19,6 @@ #include "corhdr.h" #include "cordebug.h" #include "corsym.h" +#include "diasymreader.h" HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 638c3adec51..78d3d81a1bd 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(diasymreader); typedef struct SymWriter { ISymUnmanagedWriter5 iface; + IPdbWriter IPdbWriter_iface; LONG ref; CRITICAL_SECTION lock; GUID pdb_guid; @@ -47,6 +48,11 @@ static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *if return CONTAINING_RECORD(iface, SymWriter, iface); } +static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) +{ + return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); +} + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -63,6 +69,10 @@ static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFI { *ppv = &This->iface; } + else if (IsEqualIID(&IID_IPdbWriter, iid)) + { + *ppv = &This->IPdbWriter_iface; + } else { WARN("unknown interface %s\n", debugstr_guid(iid)); @@ -411,6 +421,65 @@ static const ISymUnmanagedWriter5Vtbl SymWriter_Vtbl = { SymWriter_MapTokenToSourceSpan }; +static HRESULT WINAPI SymWriter_PdbWriter_QueryInterface(IPdbWriter *iface, REFIID iid, void **ppv) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_QueryInterface(&This->iface, iid, ppv); +} + +static ULONG WINAPI SymWriter_PdbWriter_AddRef(IPdbWriter *iface) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_AddRef(&This->iface); +} + +static ULONG WINAPI SymWriter_PdbWriter_Release(IPdbWriter *iface) +{ + SymWriter *This = impl_from_IPdbWriter(iface); + return ISymUnmanagedWriter5_Release(&This->iface); +} + +static HRESULT WINAPI SymWriter_SetPath(IPdbWriter *iface, const WCHAR *fullpath, IStream *stream, BOOL fullbuild) +{ + FIXME("(%p,%s,%p,%u)\n", iface, debugstr_w(fullpath), stream, fullbuild); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_OpenMod(IPdbWriter *iface, const WCHAR *modulename, const WCHAR *fullpath) +{ + FIXME("(%p,%s,%s)\n", iface, debugstr_w(modulename), debugstr_w(fullpath)); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_CloseMod(IPdbWriter *iface) +{ + FIXME("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_GetPath(IPdbWriter *iface, DWORD ccData, DWORD *pccData, WCHAR *path) +{ + FIXME("(%p,%lu,%p,%p)\n", iface, ccData, pccData, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI SymWriter_GetSignatureAge(IPdbWriter *iface, DWORD *timestamp, DWORD *age) +{ + FIXME("(%p,%p,%p)\n", iface, timestamp, age); + return E_NOTIMPL; +} + +static const IPdbWriterVtbl SymWriter_PdbWriter_Vtbl = { + SymWriter_PdbWriter_QueryInterface, + SymWriter_PdbWriter_AddRef, + SymWriter_PdbWriter_Release, + SymWriter_SetPath, + SymWriter_OpenMod, + SymWriter_CloseMod, + SymWriter_GetPath, + SymWriter_GetSignatureAge +}; + HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) { SymWriter *This; @@ -421,6 +490,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) return E_OUTOFMEMORY; This->iface.lpVtbl = &SymWriter_Vtbl; + This->IPdbWriter_iface.lpVtbl = &SymWriter_PdbWriter_Vtbl; This->ref = 1; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock");

1 0

Jump to page:

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-commits February 2022