wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : dwrite: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 46667959e744d4c8eaa725fe98b5b4884fe1de39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46667959e744d4c8eaa725fe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:08 2022 +0100 dwrite: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 - dlls/dwrite/analyzer.c | 16 +++++----- dlls/dwrite/font.c | 76 ++++++++++++++++++++++++------------------------ dlls/dwrite/format.c | 8 ++--- dlls/dwrite/gdiinterop.c | 22 +++++++------- dlls/dwrite/layout.c | 40 ++++++++++++------------- dlls/dwrite/main.c | 20 ++++++------- dlls/dwrite/opentype.c | 6 ++-- 8 files changed, 94 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46667959e744d4c8eaa7…

1 0

Eric Pouech : dsound: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 86bc819f07a67dc5ef2cb5bc9f8d609daa0f7b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bc819f07a67dc5ef2cb5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:37 2022 +0100 dsound: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 86 ++++++++++++++++++++++---------------------- dlls/dsound/capture.c | 80 ++++++++++++++++++++--------------------- dlls/dsound/dsound.c | 34 +++++++++--------- dlls/dsound/dsound_main.c | 24 ++++++------- dlls/dsound/duplex.c | 12 +++---- dlls/dsound/mixer.c | 52 +++++++++++++-------------- dlls/dsound/primary.c | 90 +++++++++++++++++++++++------------------------ dlls/dsound/propset.c | 30 ++++++++-------- dlls/dsound/sound3d.c | 62 ++++++++++++++++---------------- 10 files changed, 235 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86bc819f07a67dc5ef2c…

1 0

Eric Pouech : msacm.dll16: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c9bff72bce96a8ce344b646c043da5f54eb38178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bff72bce96a8ce344b646c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:49 2022 +0100 msacm.dll16: 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/msacm.dll16/Makefile.in | 1 - dlls/msacm.dll16/msacm.c | 48 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in index c4991005de1..dccaf17c721 100644 --- a/dlls/msacm.dll16/Makefile.in +++ b/dlls/msacm.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm.dll16 IMPORTS = msacm32 EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll diff --git a/dlls/msacm.dll16/msacm.c b/dlls/msacm.dll16/msacm.c index 48729f9608c..30182c92b2f 100644 --- a/dlls/msacm.dll16/msacm.c +++ b/dlls/msacm.dll16/msacm.c @@ -73,7 +73,7 @@ MMRESULT16 WINAPI acmMetrics16( MMRESULT16 WINAPI acmDriverEnum16( ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(%p, %d, %d): stub\n", + FIXME("(%p, %ld, %ld): stub\n", fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -87,7 +87,7 @@ MMRESULT16 WINAPI acmDriverEnum16( MMRESULT16 WINAPI acmDriverDetails16( HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", hadid, padd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -99,7 +99,7 @@ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) { - FIXME("(%p, 0x%04x, %ld, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", phadid, hinstModule, lParam, dwPriority, fdwAdd ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -112,7 +112,7 @@ MMRESULT16 WINAPI acmDriverAdd16( MMRESULT16 WINAPI acmDriverRemove16( HACMDRIVERID16 hadid, DWORD fdwRemove) { - FIXME("(0x%04x, %d): stub\n", hadid, fdwRemove); + FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -123,7 +123,7 @@ MMRESULT16 WINAPI acmDriverRemove16( MMRESULT16 WINAPI acmDriverOpen16( LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %d): stub\n", phad, hadid, fdwOpen); + FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -134,7 +134,7 @@ MMRESULT16 WINAPI acmDriverOpen16( MMRESULT16 WINAPI acmDriverClose16( HACMDRIVER16 had, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", had, fdwClose); + FIXME("(0x%04x, %ld): stub\n", had, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ LRESULT WINAPI acmDriverMessage16( MMRESULT16 WINAPI acmDriverID16( HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) { - FIXME("(0x%04x, %p, %d): stub\n", hao, phadid, fdwDriverID); + FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -169,7 +169,7 @@ MMRESULT16 WINAPI acmDriverID16( MMRESULT16 WINAPI acmDriverPriority16( HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) { - FIXME("(0x%04x, %d, %d): stub\n", + FIXME("(0x%04x, %ld, %ld): stub\n", hadid, dwPriority, fdwPriority ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -182,7 +182,7 @@ MMRESULT16 WINAPI acmDriverPriority16( MMRESULT16 WINAPI acmFormatTagDetails16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -194,7 +194,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -218,7 +218,7 @@ MMRESULT16 WINAPI acmFormatChoose16( MMRESULT16 WINAPI acmFormatDetails16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -230,7 +230,7 @@ MMRESULT16 WINAPI acmFormatEnum16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -244,7 +244,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -257,7 +257,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -269,7 +269,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -293,7 +293,7 @@ MMRESULT16 WINAPI acmFilterChoose16( MMRESULT16 WINAPI acmFilterDetails16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -305,7 +305,7 @@ MMRESULT16 WINAPI acmFilterEnum16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -321,7 +321,7 @@ MMRESULT16 WINAPI acmStreamOpen16( LPWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %p, %p, %p, %d, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen ); @@ -335,7 +335,7 @@ MMRESULT16 WINAPI acmStreamOpen16( MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", has, fdwClose); + FIXME("(0x%04x, %ld): stub\n", has, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -347,7 +347,7 @@ MMRESULT16 WINAPI acmStreamSize16( HACMSTREAM16 has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize) { - FIXME("(0x%04x, %d, %p, %d): stub\n", + FIXME("(0x%04x, %ld, %p, %ld): stub\n", has, cbInput, pdwOutputBytes, fdwSize ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -360,7 +360,7 @@ MMRESULT16 WINAPI acmStreamSize16( MMRESULT16 WINAPI acmStreamConvert16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwConvert); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -371,7 +371,7 @@ MMRESULT16 WINAPI acmStreamConvert16( MMRESULT16 WINAPI acmStreamReset16( HACMSTREAM16 has, DWORD fdwReset) { - FIXME("(0x%04x, %d): stub\n", has, fdwReset); + FIXME("(0x%04x, %ld): stub\n", has, fdwReset); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -382,7 +382,7 @@ MMRESULT16 WINAPI acmStreamReset16( MMRESULT16 WINAPI acmStreamPrepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwPrepare); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -393,7 +393,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader16( MMRESULT16 WINAPI acmStreamUnprepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) { - FIXME("(0x%04x, %p, %d): stub\n", + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwUnprepare ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Eric Pouech : msacm32.drv: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 4b59776e86b77cce34be3e121ebe4962081533b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b59776e86b77cce34be3e12… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:38 2022 +0100 msacm32.drv: 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/msacm32.drv/Makefile.in | 1 - dlls/msacm32.drv/wavemap.c | 76 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b59776e86b77cce34be…

1 0

Eric Pouech : mpr: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8c30c5277a18a8b6f9117f569c733d9c346692de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c30c5277a18a8b6f9117f56… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:32 2022 +0100 mpr: 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/mpr/Makefile.in | 1 - dlls/mpr/multinet.c | 4 +-- dlls/mpr/nps.c | 18 ++++++------- dlls/mpr/pwcache.c | 2 +- dlls/mpr/wnet.c | 72 ++++++++++++++++++++++++++-------------------------- 5 files changed, 48 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c30c5277a18a8b6f911…

1 0

Eric Pouech : mprapi: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: e0f64ccd5dbc82decda7b89f7857e0a29431f8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0f64ccd5dbc82decda7b89f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:26 2022 +0100 mprapi: 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/mprapi/Makefile.in | 1 - dlls/mprapi/mprapi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index fe164b39429..c97e316deb5 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mprapi.dll IMPORTLIB = mprapi diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index b3d641fe108..8af9ebf0152 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mprapi); */ DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr) { - FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr); + FIXME("(0x%lx/%lu, %p): stub!\n", mprerror, mprerror, localstr); *localstr = NULL; return ERROR_MR_MID_NOT_FOUND;

1 0

Eric Pouech : mp3dmod: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2303b77a498a560e5f9b59115b8d4dc7aae0ccf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2303b77a498a560e5f9b5911… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:20 2022 +0100 mp3dmod: 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/mp3dmod/Makefile.in | 1 - dlls/mp3dmod/mp3dmod.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 4220efc3171..dabbb1dfeae 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index adcee393806..12c34421ce9 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -87,7 +87,7 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->ref); - TRACE("(%p) AddRef from %d\n", This, refcount - 1); + TRACE("(%p) AddRef from %ld\n", This, refcount - 1); return refcount; } @@ -97,7 +97,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->ref); - TRACE("(%p) Release from %d\n", This, refcount + 1); + TRACE("(%p) Release from %ld\n", This, refcount + 1); if (!refcount) { @@ -152,7 +152,7 @@ static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *inp static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -161,7 +161,7 @@ static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -170,7 +170,7 @@ static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (type_index) return DMO_E_NO_MORE_ITEMS; @@ -191,7 +191,7 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index const WAVEFORMATEX *input_format; WAVEFORMATEX *format; - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (!dmo->intype_set) return DMO_E_TYPE_NOT_SET; @@ -224,7 +224,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -257,7 +257,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index long enc; int err; - TRACE("(%p)->(%d, %p, %#x)\n", iface, index, type, flags); + TRACE("(%p)->(%ld, %p, %#lx)\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -286,7 +286,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index err = mpg123_format(This->mh, format->nSamplesPerSec, format->nChannels, enc); if (err != MPG123_OK) { - ERR("Failed to set format: %u channels, %u samples/sec, %u bits/sample.\n", + ERR("Failed to set format: %u channels, %lu samples/sec, %u bits/sample.\n", format->nChannels, format->nSamplesPerSec, format->wBitsPerSample); return DMO_E_TYPE_NOT_ACCEPTED; } @@ -299,14 +299,14 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index static HRESULT WINAPI MediaObject_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } @@ -316,7 +316,7 @@ static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); + TRACE("iface %p, index %lu, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -330,7 +330,7 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, alignment %p.\n", iface, index, size, alignment); + TRACE("iface %p, index %lu, size %p, alignment %p.\n", iface, index, size, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -342,14 +342,14 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i static HRESULT WINAPI MediaObject_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, latency); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("(%p)->(%d, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("(%p)->(%ld, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -395,7 +395,7 @@ static HRESULT WINAPI MediaObject_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, flags); return E_NOTIMPL; } @@ -409,7 +409,7 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, DWORD len; int err; - TRACE("(%p)->(%d, %p, %#x, %s, %s)\n", iface, index, buffer, flags, + TRACE("(%p)->(%ld, %p, %#lx, %s, %s)\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); if (This->buffer) @@ -458,7 +458,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags BYTE *data; int err; - TRACE("(%p)->(%#x, %d, %p, %p)\n", iface, flags, count, buffers, status); + TRACE("(%p)->(%#lx, %ld, %p, %p)\n", iface, flags, count, buffers, status); if (count > 1) FIXME("Multiple buffers not handled.\n"); @@ -513,7 +513,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags else if (err != MPG123_OK) ERR("mpg123_read() returned %d\n", err); if (written < framesize) - ERR("short write: %Id/%u\n", written, framesize); + ERR("short write: %Id/%lu\n", written, framesize); got_data = 1; @@ -537,7 +537,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) { - FIXME("(%p)->(%d) stub!\n", iface, lock); + FIXME("(%p)->(%ld) stub!\n", iface, lock); return E_NOTIMPL; }

1 0

Eric Pouech : mountmgr.sys: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 9035f66c68a52e15851a352016fe6ff47a9d9a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9035f66c68a52e15851a3520… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:14 2022 +0100 mountmgr.sys: 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/mountmgr.sys/Makefile.in | 1 - dlls/mountmgr.sys/dbus.c | 6 +++--- dlls/mountmgr.sys/device.c | 18 +++++++++--------- dlls/mountmgr.sys/mountmgr.c | 8 ++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 66918d3a750..612ac71f869 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mountmgr.sys UNIXLIB = mountmgr.so IMPORTS = uuid advapi32 ntoskrnl diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 70b2f0c1592..81c9f89d246 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -753,7 +753,7 @@ static DBusMessage *dhcp4_config_option_request( const char *unix_name, const ch return reply; } -static const char *map_option( ULONG option ) +static const char *map_option( unsigned option ) { switch (option) { @@ -792,7 +792,7 @@ NTSTATUS dhcp_request( void *args ) ptr->S_un.S_addr = inet_addr( value ); params->req->offset = params->offset; params->req->size = sizeof(*ptr); - TRACE( "returning %08x\n", *(DWORD *)ptr ); + TRACE( "returning %08x\n", *(unsigned int*)ptr ); } ret = sizeof(*ptr); break; @@ -814,7 +814,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index b8a0040195d..50b2f38bbd8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -717,7 +717,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** } else { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(name.Buffer), status ); RtlFreeUnicodeString( &name ); } return status; @@ -890,7 +890,7 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!(name = wine_get_dos_file_name( unix_device ))) { - ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); + ERR("Failed to convert %s to NT, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -898,7 +898,7 @@ static BOOL get_volume_device_info( struct volume *volume ) RtlFreeHeap( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { - WARN("Failed to open %s, err %u\n", debugstr_a(unix_device), GetLastError()); + WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } @@ -1008,7 +1008,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, get_filesystem_serial( volume ); } - TRACE("fs_type %#x, label %s, serial %08x\n", volume->fs_type, debugstr_w(volume->label), volume->serial); + TRACE("fs_type %#x, label %s, serial %08lx\n", volume->fs_type, debugstr_w(volume->label), volume->serial); if (guid && memcmp( &volume->guid, guid, sizeof(volume->guid) )) { @@ -1526,7 +1526,7 @@ NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_ ptr += strlen(ptr) + 1; } - TRACE( "returning %c: dev %s mount %s type %u\n", + TRACE( "returning %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), type ); iosb->Information = ptr - (char *)output; @@ -1622,7 +1622,7 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) struct volume *volume; NTSTATUS status; - TRACE( "volume query %x length %u\n", info_class, length ); + TRACE( "volume query %x length %lu\n", info_class, length ); EnterCriticalSection( &device_section ); volume = dev->volume; @@ -1722,7 +1722,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) struct disk_device *dev = device->DeviceExtension; NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -1794,7 +1794,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + FIXME("Unsupported ioctl %lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); status = STATUS_NOT_SUPPORTED; break; @@ -1864,7 +1864,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p status = IoCreateDevice( driver, 0, &nt_name, 0, 0, FALSE, &dev_obj ); if (status != STATUS_SUCCESS) { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(nt_name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(nt_name.Buffer), status ); return FALSE; } swprintf( symlink_buffer, ARRAY_SIZE(symlink_buffer), symlink_format, n ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1be55bee419..1f9bd56a384 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -251,7 +251,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) { enum device_type type = DEVICE_UNKNOWN; - TRACE( "defining %c: dev %s mount %s type %u\n", + TRACE( "defining %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), input->type ); switch (input->type) { @@ -467,7 +467,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) NTSTATUS status; ULONG info = 0; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -592,7 +592,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) else status = STATUS_INVALID_PARAMETER; break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; break; } @@ -641,7 +641,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) status = IoCreateSymbolicLink( &linkW, &nameW ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return status; }

1 0

Eric Pouech : monodebg.vxd: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: a4a74345419dddf1f310e576ac016d61e999544a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a74345419dddf1f310e576… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:08 2022 +0100 monodebg.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/monodebg.vxd/Makefile.in | 1 - dlls/monodebg.vxd/monodebg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index f076568c1c8..ccbfdba36e4 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = monodebg.vxd C_SRCS = \ diff --git a/dlls/monodebg.vxd/monodebg.c b/dlls/monodebg.vxd/monodebg.c index 715c29601c4..e625a050e1a 100644 --- a/dlls/monodebg.vxd/monodebg.c +++ b/dlls/monodebg.vxd/monodebg.c @@ -46,7 +46,7 @@ BOOL WINAPI MONODEBG_DeviceIoControl(DWORD dwIoControlCode, ERR("%s\n",debugstr_a(lpvInBuffer)); break; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,

1 0

Eric Pouech : mmsystem.dll16: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2c8802f26e35540a748e34bbb48830ff1c0849d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8802f26e35540a748e34bb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:02 2022 +0100 mmsystem.dll16: 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/mmsystem.dll16/Makefile.in | 1 - dlls/mmsystem.dll16/driver.c | 4 +-- dlls/mmsystem.dll16/mci16.c | 4 +-- dlls/mmsystem.dll16/message16.c | 36 +++++++++++++-------------- dlls/mmsystem.dll16/mmio16.c | 6 ++--- dlls/mmsystem.dll16/mmsystem.c | 54 ++++++++++++++++++++--------------------- 6 files changed, 52 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8802f26e35540a748e…

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