February 2022 - Wine-Commits

Rémi Bernon : mfreadwrite/reader: Use separate refcount for events callbacks.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: be85638b5b38f9f07ccd23024485d4f90c57e5de URL: https://source.winehq.org/git/wine.git/?a=commit;h=be85638b5b38f9f07ccd2302… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 11 09:51:20 2022 +0300 mfreadwrite/reader: Use separate refcount for events callbacks. This resolves circular dependency, with source and streams holding references to the callbacks, subscribed to their event queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 91 +++++++++++++++++++++++++---------------- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 6d35a59f3a8..0b6c6fa8583 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -154,6 +154,7 @@ struct source_reader IMFAsyncCallback stream_events_callback; IMFAsyncCallback async_commands_callback; LONG refcount; + LONG public_refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; IMFSourceReaderCallback *async_callback; @@ -203,6 +204,51 @@ static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVi return CONTAINING_RECORD(iface, struct media_stream, notify_cb); } +static void source_reader_release_responses(struct source_reader *reader, struct media_stream *stream); + +static ULONG source_reader_addref(struct source_reader *reader) +{ + return InterlockedIncrement(&reader->refcount); +} + +static ULONG source_reader_release(struct source_reader *reader) +{ + ULONG refcount = InterlockedDecrement(&reader->refcount); + unsigned int i; + + if (!refcount) + { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); + if (reader->descriptor) + IMFPresentationDescriptor_Release(reader->descriptor); + if (reader->attributes) + IMFAttributes_Release(reader->attributes); + IMFMediaSource_Release(reader->source); + + for (i = 0; i < reader->stream_count; ++i) + { + struct media_stream *stream = &reader->streams[i]; + + if (stream->stream) + IMFMediaStream_Release(stream->stream); + if (stream->current) + IMFMediaType_Release(stream->current); + if (stream->decoder.transform) + IMFTransform_Release(stream->decoder.transform); + if (stream->allocator) + IMFVideoSampleAllocatorEx_Release(stream->allocator); + } + source_reader_release_responses(reader, NULL); + free(reader->streams); + MFUnlockWorkQueue(reader->queue); + DeleteCriticalSection(&reader->cs); + free(reader); + } + + return refcount; +} + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -325,13 +371,13 @@ static HRESULT WINAPI source_reader_callback_QueryInterface(IMFAsyncCallback *if static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *iface, @@ -611,13 +657,13 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) @@ -888,13 +934,13 @@ static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = static ULONG WINAPI source_reader_async_commands_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return source_reader_addref(reader); } static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return source_reader_release(reader); } static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) @@ -1326,7 +1372,7 @@ static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID r static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - ULONG refcount = InterlockedIncrement(&reader->refcount); + ULONG refcount = InterlockedIncrement(&reader->public_refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1336,41 +1382,15 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - ULONG refcount = InterlockedDecrement(&reader->refcount); - unsigned int i; + ULONG refcount = InterlockedDecrement(&reader->public_refcount); TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { - if (reader->async_callback) - IMFSourceReaderCallback_Release(reader->async_callback); if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); - if (reader->descriptor) - IMFPresentationDescriptor_Release(reader->descriptor); - if (reader->attributes) - IMFAttributes_Release(reader->attributes); - IMFMediaSource_Release(reader->source); - - for (i = 0; i < reader->stream_count; ++i) - { - struct media_stream *stream = &reader->streams[i]; - - if (stream->stream) - IMFMediaStream_Release(stream->stream); - if (stream->current) - IMFMediaType_Release(stream->current); - if (stream->decoder.transform) - IMFTransform_Release(stream->decoder.transform); - if (stream->allocator) - IMFVideoSampleAllocatorEx_Release(stream->allocator); - } - source_reader_release_responses(reader, NULL); - free(reader->streams); - MFUnlockWorkQueue(reader->queue); - DeleteCriticalSection(&reader->cs); - free(reader); + source_reader_release(reader); } return refcount; @@ -2268,6 +2288,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; + object->public_refcount = 1; object->refcount = 1; list_init(&object->responses); if (shutdown_on_release) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index f484925b28a..8417a0d37b7 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -862,7 +862,8 @@ skip_read_sample: hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); - IMFSourceReader_Release(reader); + refcount = IMFSourceReader_Release(reader); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Async mode. */ callback = create_async_callback();

1 0

Eric Pouech : mfmediaengine: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: bbfb164e0a9616895de0d9cec1e51fb28cf621ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfb164e0a9616895de0d9ce… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 09:48:53 2022 +0300 mfmediaengine: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 1 - dlls/mfmediaengine/main.c | 70 +++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbfb164e0a9616895de0…

1 0

Nikolay Sivov : mfplay/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 5838951610e4331c3d9d670e65f92ebb08941885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5838951610e4331c3d9d670e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 11 09:47:28 2022 +0300 mfplay/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/tests/Makefile.in | 1 - dlls/mfplay/tests/mfplay.c | 152 +++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5838951610e4331c3d9d…

1 0

Hans Leidekker : mscms: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 5442ddc78d2ec91cc11206f8c1051aea3936db38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5442ddc78d2ec91cc11206f8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 11 10:50:35 2022 +0100 mscms: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++--- dlls/mscms/stub.c | 30 ++-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 372 +++++++++++++++++++++---------------------- dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 239 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5442ddc78d2ec91cc112…

1 0

Eric Pouech : imaadp32.acm: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: d0819c7e5b335a2633f2d130c93c319aca7e35aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0819c7e5b335a2633f2d130… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:05 2022 +0100 imaadp32.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/Makefile.in | 1 - dlls/imaadp32.acm/imaadp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index e01f5494653..ff982fd138e 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = imaadp32.acm IMPORTS = winmm user32 diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index b6d70dcbe2f..0b5e6a83ae6 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -569,7 +569,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -628,12 +628,12 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -877,7 +877,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -898,7 +898,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -923,7 +923,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0

Eric Pouech : inetcpl.cpl: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 0c4fdeee408e2124f162bd6dc1a4d0687c04869b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4fdeee408e2124f162bd6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:29 2022 +0100 inetcpl.cpl: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/Makefile.in | 1 - dlls/inetcpl.cpl/connections.c | 6 +++--- dlls/inetcpl.cpl/content.c | 4 ++-- dlls/inetcpl.cpl/general.c | 8 ++++---- dlls/inetcpl.cpl/inetcpl.c | 6 +++--- dlls/inetcpl.cpl/security.c | 30 +++++++++++++++--------------- 6 files changed, 27 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c4fdeee408e2124f162…

1 0

Eric Pouech : inetmib1: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: adf47c60e664397b9598bb9a099ec53faea742e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf47c60e664397b9598bb9a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:35 2022 +0100 inetmib1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/Makefile.in | 1 - dlls/inetmib1/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index 5bfdf5fe769..25391ff2624 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inetmib1.dll IMPORTS = snmpapi DELAYIMPORTS = iphlpapi diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 31dc4d5e8e2..90da277375e 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1318,7 +1318,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, AsnObjectIdentifier myOid = DEFINE_OID(mib2System); UINT i; - TRACE("(%d, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent, + TRACE("(%ld, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent, pFirstSupportedRegion); minSupportedIDLength = UINT_MAX; @@ -1447,7 +1447,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) {

1 0

Eric Pouech : ifsmgr.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: db73856ecac3be3645e891e990b8a498891225b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db73856ecac3be3645e891e9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:39:59 2022 +0100 ifsmgr.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ifsmgr.vxd/Makefile.in | 1 - dlls/ifsmgr.vxd/ifsmgr.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in index 302778577e2..65c6be21036 100644 --- a/dlls/ifsmgr.vxd/Makefile.in +++ b/dlls/ifsmgr.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ifsmgr.vxd IMPORTS = kernel diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c index ab232ec6c23..22800b95c05 100644 --- a/dlls/ifsmgr.vxd/ifsmgr.c +++ b/dlls/ifsmgr.vxd/ifsmgr.c @@ -107,7 +107,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped) { - TRACE("(%d,%p,%d,%p,%d,%p,%p): stub\n", + TRACE("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer, lpcbBytesReturned, lpOverlapped); @@ -146,7 +146,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW FIXME( "Control 'IFS_IOCTL_GET_NETPRO_NAME_A' not implemented\n"); return FALSE; default: - FIXME( "Control %d not implemented\n", dwIoControlCode); + FIXME( "Control %ld not implemented\n", dwIoControlCode); return FALSE; } }

1 0

Eric Pouech : inseng: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 8d006c1db7553e01f1ee53d4ecaed96b3e7a038b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d006c1db7553e01f1ee53d4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:47 2022 +0100 inseng: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/Makefile.in | 1 - dlls/inseng/inseng_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index f4b1d4b915f..0217203791a 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 2c95a2e72bd..c72a12955b8 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -74,7 +74,7 @@ static ULONG WINAPI InstallEngine_AddRef(IInstallEngine2 *iface) InstallEngine *This = impl_from_IInstallEngine2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) InstallEngine *This = impl_from_IInstallEngine2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -109,14 +109,14 @@ static HRESULT WINAPI InstallEngine_SetCifFile(IInstallEngine2 *iface, const cha static HRESULT WINAPI InstallEngine_DownloadComponents(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } static HRESULT WINAPI InstallEngine_InstallComponents(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } @@ -158,7 +158,7 @@ static HRESULT WINAPI InstallEngine_UnregisterInstallEngineCallback(IInstallEngi static HRESULT WINAPI InstallEngine_SetAction(IInstallEngine2 *iface, const char *id, DWORD action, DWORD priority) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%s %d %d)\n", This, debugstr_a(id), action, priority); + FIXME("(%p)->(%s %ld %ld)\n", This, debugstr_a(id), action, priority); return E_NOTIMPL; } @@ -207,7 +207,7 @@ static HRESULT WINAPI InstallEngine_SetInstallDrive(IInstallEngine2 *iface, char static HRESULT WINAPI InstallEngine_SetInstallOptions(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; } @@ -228,7 +228,7 @@ static HRESULT WINAPI InstallEngine_SetIStream(IInstallEngine2 *iface, IStream * static HRESULT WINAPI InstallEngine_Abort(IInstallEngine2 *iface, DWORD flags) { InstallEngine *This = impl_from_IInstallEngine2(iface); - FIXME("(%p)->(%x)\n", This, flags); + FIXME("(%p)->(%lx)\n", This, flags); return E_NOTIMPL; }

1 0

Eric Pouech : jscript: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: e8e0917a9c3153b98a8f7a3b29c3989335300404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8e0917a9c3153b98a8f7a3b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:11 2022 +0100 jscript: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/Makefile.in | 1 - dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 56 ++++++++++++++++++++++----------------------- dlls/jscript/engine.c | 20 ++++++++-------- dlls/jscript/error.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 38 +++++++++++++++--------------- dlls/jscript/jscript_main.c | 4 ++-- dlls/jscript/jsregexp.c | 2 +- dlls/jscript/jsutils.c | 4 ++-- dlls/jscript/regexp.c | 6 ++--- dlls/jscript/string.c | 6 ++--- 13 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8e0917a9c3153b98a8f…

1 0