February 2022 - Wine-Commits

Alexandre Julliard : msado15: Fix some LONG/LONG_PTR mismatches.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 1bf3ebdfc4b7f7ec7c0506392ec3e67e245c2e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bf3ebdfc4b7f7ec7c050639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 15:33:23 2022 +0100 msado15: Fix some LONG/LONG_PTR mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 4 ++-- dlls/msado15/connection.c | 4 +++- dlls/msado15/recordset.c | 40 +++++++++++++++++------------------ dlls/msado15/stream.c | 12 +++++------ dlls/msado15/tests/msado15.c | 47 ++++++++++++++++++++++-------------------- include/msado15_backcompat.idl | 42 +++++++++++++++++++------------------ 6 files changed, 78 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bf3ebdfc4b7f7ec7c05…

1 0

Michael Stefaniuc : dmusic: Don't trace both the This and iface pointers.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 Feb. 4, 2022

Feb. 4, 2022

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

Eric Pouech : vcomp: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 26b56e4f991fc229f615f787ce376b9944c31caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=26b56e4f991fc229f615f787… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:50:00 2022 +0100 vcomp: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 14c3546cb5a..c4f2572c86a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -626,78 +626,78 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) void CDECL _vcomp_atomic_add_i4(int *dest, int val) { - InterlockedExchangeAdd(dest, val); + InterlockedExchangeAdd((LONG *)dest, val); } void CDECL _vcomp_atomic_and_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old & val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old & val, old) != old); } void CDECL _vcomp_atomic_div_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old / val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old / val, old) != old); } void CDECL _vcomp_atomic_div_ui4(unsigned int *dest, unsigned int val) { unsigned int old; - do old = *dest; while (InterlockedCompareExchange((int *)dest, old / val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old / val, old) != old); } void CDECL _vcomp_atomic_mul_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old * val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old * val, old) != old); } void CDECL _vcomp_atomic_or_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old | val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old | val, old) != old); } void CDECL _vcomp_atomic_shl_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old << val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old << val, old) != old); } void CDECL _vcomp_atomic_shr_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old >> val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old >> val, old) != old); } void CDECL _vcomp_atomic_shr_ui4(unsigned int *dest, unsigned int val) { unsigned int old; - do old = *dest; while (InterlockedCompareExchange((int *)dest, old >> val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old >> val, old) != old); } void CDECL _vcomp_atomic_sub_i4(int *dest, int val) { - InterlockedExchangeAdd(dest, -val); + InterlockedExchangeAdd((LONG *)dest, -val); } void CDECL _vcomp_atomic_xor_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old ^ val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old ^ val, old) != old); } static void CDECL _vcomp_atomic_bool_and_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old && val, old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old && val, old) != old); } static void CDECL _vcomp_atomic_bool_or_i4(int *dest, int val) { int old; - do old = *dest; while (InterlockedCompareExchange(dest, old ? old : (val != 0), old) != old); + do old = *dest; while (InterlockedCompareExchange((LONG *)dest, old ? old : (val != 0), old) != old); } void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) @@ -822,7 +822,7 @@ void CDECL _vcomp_atomic_add_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old + val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_div_r4(float *dest, float val) @@ -833,7 +833,7 @@ void CDECL _vcomp_atomic_div_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old / val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_mul_r4(float *dest, float val) @@ -844,7 +844,7 @@ void CDECL _vcomp_atomic_mul_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old * val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_atomic_sub_r4(float *dest, float val) @@ -855,7 +855,7 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = *(float *)&old - val; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) @@ -866,7 +866,7 @@ static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = (*(float *)&old != 0.0) ? (val != 0.0) : 0.0; } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) @@ -877,7 +877,7 @@ static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) old = *(int *)dest; *(float *)&new = (*(float *)&old != 0.0) ? *(float *)&old : (val != 0.0); } - while (InterlockedCompareExchange((int *)dest, new, old) != old); + while (InterlockedCompareExchange((LONG *)dest, new, old) != old); } void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) @@ -1850,7 +1850,7 @@ static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_i curr_end -= step; } - if ((new_start = InterlockedCompareExchange(dynamic_start, next_start, start)) != start) + if ((new_start = InterlockedCompareExchange((LONG volatile*)dynamic_start, next_start, start)) != start) { start = new_start; continue;

1 0

Daniel Lehman : include: Add _sscanf_l.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 3237e4025a276585ab5781dbb06258c0986cc5ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3237e4025a276585ab5781db… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Feb 2 17:28:50 2022 -0800 include: Add _sscanf_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e53929b94bc..ce198542285 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -359,6 +359,18 @@ static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char return ret; } +static inline int WINAPIV _sscanf_l(const char *buffer, const char *format, _locale_t locale, ...) __WINE_CRT_SCANF_ATTR(2, 4); +static inline int WINAPIV _sscanf_l(const char *buffer, const char *format, _locale_t locale, ...) +{ + int ret; + va_list args; + + va_start(args, locale); + ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, locale, args); + va_end(args); + return ret; +} + static inline int WINAPIV fscanf(FILE *file, const char *format, ...) __WINE_CRT_SCANF_ATTR(2, 3); static inline int WINAPIV fscanf(FILE *file, const char *format, ...) { @@ -432,6 +444,7 @@ static inline int vsnprintf(char *buffer, size_t size, const char *format, va_li { return _vsnprintf(buffer,size,format,args); } _ACRTIMP int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...) __WINE_CRT_SCANF_ATTR(3, 5); +_ACRTIMP int WINAPIV _sscanf_l(const char *,const char*,_locale_t,...) __WINE_CRT_SCANF_ATTR(2, 4); _ACRTIMP int WINAPIV fscanf(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3); _ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...) __WINE_CRT_SCANF_ATTR(2, 3); _ACRTIMP int WINAPIV scanf(const char*,...) __WINE_CRT_SCANF_ATTR(1, 2);

1 0

Esme Povirk : diasymreader: Implement SymWriter_GetSignatureAge.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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

Michael Stefaniuc : dswave/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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

Zebediah Figura : quartz: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 Feb. 4, 2022

Feb. 4, 2022

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: ae9b4f10db6e0fc563d208ea2a365f597f7f709d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9b4f10db6e0fc563d208ea… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 4 10:45:39 2022 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/lt.po b/po/lt.po index c01a11326e9..440f8bd2ef5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-21 23:32+0200\n" +"PO-Revision-Date: 2022-02-04 10:44+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0\n" +"X-Generator: Poedit 3.0.1\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -6962,54 +6962,40 @@ msgid "This network connection does not exist.\n" msgstr "Šis tinklo ryšys neegzistuoja.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Netinkamas pertraukties metu.\n" +msgstr "Kreipinys pertrauktas.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Neteisinga rodyklė.\n" +msgstr "Neteisinga failo rodyklė.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Neteisingas tinklo adresas.\n" +msgstr "Neteisingas rodyklės adresas.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Neteisingas vardas.\n" +msgstr "Neteisingas argumentas.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Sujungimas nutrauktas kito serverio.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Taškas nerastas.\n" +msgstr "Serveris nerastas.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Atributas nerastas.\n" +msgstr "Neautoritetingas serveris nerastas.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Įvyko nepataisoma klaida.\n" +msgstr "Nepataisoma klaida.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Vardas teisingas, nėra duomenų įrašo.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n"

1 0