February 2022 - Wine-Commits

Eric Pouech : amstream: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 71e90100bfe1c05de6efe8e9bb976922e3df32cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e90100bfe1c05de6efe8e9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:45 2022 +0100 amstream: 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/amstream/Makefile.in | 1 - dlls/amstream/audiodata.c | 8 ++++---- dlls/amstream/audiostream.c | 38 +++++++++++++++++++------------------- dlls/amstream/ddrawstream.c | 40 ++++++++++++++++++++-------------------- dlls/amstream/filter.c | 18 +++++++++--------- dlls/amstream/multimedia.c | 16 ++++++++-------- 6 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71e90100bfe1c05de6ef…

1 0

Eric Pouech : actxprxy: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 9da38cc0e72c4760b2573f2ec94f3395e7c6bb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da38cc0e72c4760b2573f2e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:15 2022 +0100 actxprxy: 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/actxprxy/Makefile.in | 1 - dlls/actxprxy/usrmarshal.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index bdb4fcb1ecb..a4618bd560f 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = actxprxy.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 7197ff86a98..33db1327a8d 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -175,7 +175,7 @@ HRESULT CALLBACK IEnumShellItems_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld, %p, %p)\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumShellItems_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -187,7 +187,7 @@ HRESULT __RPC_STUB IEnumShellItems_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld, %p, %p)\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumShellItems_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt;

1 0

Eric Pouech : adsldp: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: adb7d5732e130571174a37a7b5e1ea4c1b2946f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb7d5732e130571174a37a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:21 2022 +0100 adsldp: 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/adsldp/Makefile.in | 1 - dlls/adsldp/adsldp.c | 72 ++++++++++++++++++++++++------------------------- dlls/adsldp/schema.c | 8 +++--- 3 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb7d5732e130571174a…

1 0

Eric Pouech : advpack: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 463822e6e9388ebd8685b9b1bf1491441cf9fa51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=463822e6e9388ebd8685b9b1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:33 2022 +0100 advpack: 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/advpack/Makefile.in | 1 - dlls/advpack/advpack.c | 20 ++++++++++---------- dlls/advpack/files.c | 24 ++++++++++++------------ dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 8 ++++---- 5 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=463822e6e9388ebd8685…

1 0

Eric Pouech : apphelp: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 30dd2c2326351fd036a81a9b588caeab04db31f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30dd2c2326351fd036a81a9b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:51 2022 +0100 apphelp: 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/apphelp/Makefile.in | 1 - dlls/apphelp/apphelp.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in index 68186b5f98a..4803e1d3dd4 100644 --- a/dlls/apphelp/Makefile.in +++ b/dlls/apphelp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = apphelp.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index a603a044b94..f5e2f167a66 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -74,7 +74,7 @@ BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int c HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) { - FIXME("stub: %08x %s\n", flags, debugstr_w(path)); + FIXME("stub: %08lx %s\n", flags, debugstr_w(path)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } @@ -88,7 +88,7 @@ PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent) { - FIXME("stub: %p %d\n", pdb, parent); + FIXME("stub: %p %ld\n", pdb, parent); return TAGID_NULL; } @@ -99,6 +99,6 @@ void WINAPI SdbCloseDatabase(PDB pdb) void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) { - FIXME("stub: %p %p %d\n", hsdb, path, size); + FIXME("stub: %p %p %ld\n", hsdb, path, size); if (size && path) *path = 0; }

1 0

Eric Pouech : avicap32: Enable compilation with long types.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: c55079fefb6e0a3f34765fbc460a071e00468fde URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55079fefb6e0a3f34765fbc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:11:15 2022 +0100 avicap32: 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/avicap32/Makefile.in | 1 - dlls/avicap32/avicap32_main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index b640349b57d..9281990e211 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = avicap32.dll UNIXLIB = avicap32.so IMPORTLIB = avicap32 diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 3ce9d5240b8..cefd1f0fe6e 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -59,13 +59,13 @@ static void register_class(void) }; if (!RegisterClassExW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) - ERR("Failed to register class, error %u.\n", GetLastError()); + ERR("Failed to register class, error %lu.\n", GetLastError()); } static void unregister_class(void) { if (!UnregisterClassW(class_name, avicap_instance) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) - ERR("Failed to unregister class, error %u.\n", GetLastError()); + ERR("Failed to unregister class, error %lu.\n", GetLastError()); } /*********************************************************************** @@ -74,7 +74,7 @@ static void unregister_class(void) HWND VFWAPI capCreateCaptureWindowW(const WCHAR *window_name, DWORD style, int x, int y, int width, int height, HWND parent, int id) { - TRACE("window_name %s, style %#x, x %d, y %d, width %d, height %d, parent %p, id %#x.\n", + TRACE("window_name %s, style %#lx, x %d, y %d, width %d, height %d, parent %p, id %#x.\n", debugstr_w(window_name), style, x, y, width, height, parent, id); return CreateWindowW(class_name, window_name, style, x, y, width, height, parent, NULL, avicap_instance, NULL);

1 0

Zebediah Figura : winegstreamer: Release stream_cs on error in stream_thread().
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: fc5719e4c57079b19bde8d169bf0b55194649e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc5719e4c57079b19bde8d16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:19:31 2022 -0600 winegstreamer: Release stream_cs on error in stream_thread(). This fixes a deadlock when trying to skip video in Persona 4 Golden. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index fc919ef2c49..9dfe2380284 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -146,6 +146,7 @@ static DWORD WINAPI stream_thread(void *arg) else if (hr != NS_E_NO_MORE_SAMPLES) { ERR("Failed to get sample, hr %#lx.\n", hr); + LeaveCriticalSection(&reader->stream_cs); return 0; } }

1 0

Michael Stefaniuc : dmime: Fix the size of the DMUS_PORTPARAMS.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: da5c70ce8de0c10319fe0406e707e415d05788e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5c70ce8de0c10319fe0406… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:51:57 2022 +0100 dmime: Fix the size of the DMUS_PORTPARAMS. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8b38e12eb28..554518c5d5b 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -643,7 +643,6 @@ static HRESULT perf_dmport_create(IDirectMusicPerformance8Impl *perf, DMUS_PORTP if (FAILED(hr = IDirectMusic8_GetDefaultPort(perf->dmusic, &guid))) return hr; - params->dwSize = sizeof(params); params->dwValidParams |= DMUS_PORTPARAMS_SHARE; params->fShare = TRUE; @@ -671,6 +670,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (!port) { DMUS_PORTPARAMS params = { + .dwSize = sizeof(params), .dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS, .dwChannelGroups = 1 }; @@ -1148,6 +1148,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire } /* Create a port */ + params.dwSize = sizeof(params); params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; params.dwChannelGroups = (pchannel_count + 15) / 16; params.dwAudioChannels = format.nChannels;

1 0

Zebediah Figura : qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 72ede0ec6b18508e36197c8525d4861a7434751f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ede0ec6b18508e36197c85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:44 2022 -0600 qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fe4add83b7c..45b995cc2ff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1177,9 +1177,12 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); - hr = BaseOutputPinImpl_InitAllocator(base, pAlloc); - if(FAILED(hr)) + if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc))) + { + ERR("Failed to create allocator, hr %#x.\n", hr); return hr; + } hr = IMemInputPin_GetAllocatorRequirements(pPin, &req); if(FAILED(hr))

1 0

Zebediah Figura : strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 98a2689f76ecbe097a0219d7ee332b4f6382bc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a2689f76ecbe097a0219d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:46 2022 -0600 strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 1 - libs/strmbase/pin.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 868ea4c580a..3e92136b7f7 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -105,7 +105,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index f6e4ef1c139..36784f60a23 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl = source_NewSegment, }; -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) -{ - return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); -} - HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, IMemInputPin *pPin, IMemAllocator **pAlloc) { @@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, hr = IMemInputPin_GetAllocator(pPin, pAlloc); if (hr == VFW_E_NO_ALLOCATOR) - /* Input pin provides no allocator, use standard memory allocator */ - hr = BaseOutputPinImpl_InitAllocator(This, pAlloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc); if (SUCCEEDED(hr)) {

1 0