wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Nikolay Sivov : mf/tests: Add another format to Video Processor supported formats list.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 7fe6ae49faf3ca2f95287d29f10cb24b6305297f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe6ae49faf3ca2f95287d29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 12:16:09 2022 +0300 mf/tests: Add another format to Video Processor supported formats list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 + include/mfapi.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8b3e0dd65b2..f628a1116e4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3382,6 +3382,7 @@ static BOOL is_supported_video_type(const GUID *guid) || IsEqualGUID(guid, &MFVideoFormat_IYUV) || IsEqualGUID(guid, &MFVideoFormat_YV12) || IsEqualGUID(guid, &MFVideoFormat_NV12) + || IsEqualGUID(guid, &MFVideoFormat_NV21) || IsEqualGUID(guid, &MFVideoFormat_420O) || IsEqualGUID(guid, &MFVideoFormat_P010) || IsEqualGUID(guid, &MFVideoFormat_P016) diff --git a/include/mfapi.h b/include/mfapi.h index 5b60833f529..d4493501624 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -109,6 +109,7 @@ DEFINE_MEDIATYPE_GUID(MFVideoFormat_MSS1, MAKEFOURCC('M','S','S','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_MSS2, MAKEFOURCC('M','S','S','2')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_NV11, MAKEFOURCC('N','V','1','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_NV12, MAKEFOURCC('N','V','1','2')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_NV21, MAKEFOURCC('N','V','2','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ORAW, MAKEFOURCC('O','R','A','W')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_P010, MAKEFOURCC('P','0','1','0')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_P016, MAKEFOURCC('P','0','1','6'));

1 0

Nikolay Sivov : mf: Move standard quality manager stub to a separate file.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 84f0f115687d2fd317d35f9f3d938c885e9bbb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f0f115687d2fd317d35f9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 12:10:07 2022 +0300 mf: Move standard quality manager stub to a separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/quality.c | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/session.c | 283 ----------------------------------------------- 3 files changed, 312 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84f0f115687d2fd317d3…

1 0

Nikolay Sivov : scrrun/dictionary: Remove typedef from object data type.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: a5f2f8afb5d84cb499b322d689f241ac04e68457 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5f2f8afb5d84cb499b322d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 11:33:34 2022 +0300 scrrun/dictionary: Remove typedef from object data type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 175 ++++++++++++++++++++++++----------------------- 1 file changed, 88 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5f2f8afb5d84cb499b3…

1 0

Nikolay Sivov : scrrun: Use CRT allocation functions.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 5fc49aa2c9511ef01fbcd343391380744f7b8060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc49aa2c9511ef01fbcd343… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 11:33:33 2022 +0300 scrrun: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 71 ++++++++++++----------- dlls/scrrun/filesystem.c | 143 ++++++++++++++++++++++++----------------------- 2 files changed, 107 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc49aa2c9511ef01fbc…

1 0

Eric Pouech : rpcss: Use correct integral type.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: b5a3848ee752d02c2534d6639526995ed07dd4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a3848ee752d02c2534d663… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:46:29 2022 +0100 rpcss: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index af055e6000a..99b4020882b 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -56,7 +56,7 @@ HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned i PMInterfacePointer object, unsigned int *cookie) { struct registered_class *entry; - static int next_cookie; + static LONG next_cookie; if (!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY;

1 0

Eric Pouech : progman: Use correct integral type.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 268ede1e62b18cf2a4896c66ad60a7d7df97c420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=268ede1e62b18cf2a4896c66… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:44:44 2022 +0100 progman: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/grpfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index f3a084d290a..62cc1172fad 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -511,7 +511,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) HLOCAL hProgram; INT NumProg, Title, Progs, Icons, Extension; INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum; - DWORD sizeAnd, sizeXor; + UINT sizeAnd, sizeXor; BOOL need_extension; LPCSTR lpszTitle = LocalLock(group->hName);

1 0

Eric Pouech : find: Use correct integral type.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 5a714bd99e57eec23d18848fdc216b526a1eb40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a714bd99e57eec23d18848f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:43:52 2022 +0100 find: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/find/find.c b/programs/find/find.c index 7d178874b4d..5b86325d1c2 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(find); static BOOL read_char_from_handle(HANDLE handle, char *char_out) { static char buffer[4096]; - static UINT buffer_max = 0; - static UINT buffer_pos = 0; + static DWORD buffer_max = 0; + static DWORD buffer_pos = 0; /* Read next content into buffer */ if (buffer_pos >= buffer_max)

1 0

Michael Stefaniuc : dmusic: Forward the synth port GetCaps to the synth method.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 57a7d8b54c76150ee2e5e365e339f117995b48d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a7d8b54c76150ee2e5e365… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:25 2022 +0100 dmusic: Forward the synth port GetCaps to the synth method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 490ff88059e..afdd0d7be63 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -38,7 +38,6 @@ struct synth_port { IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; BOOL active; - DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; int nrofgroups; DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; @@ -388,9 +387,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); - *port_caps = This->caps; - - return S_OK; + return IDirectMusicSynth_GetPortCaps(This->synth, port_caps); } static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD io_control_code, @@ -808,7 +805,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param HRESULT hr = E_FAIL; int i; - TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + TRACE("(%p, %p)\n", port_params, port); *port = NULL; @@ -824,7 +821,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->parent = parent; obj->active = FALSE; obj->params = *port_params; - obj->caps = *port_caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void **)&obj->synth);

1 0

Michael Stefaniuc : dmsynth: Add error handling to the synth GetPortCaps method.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: e835e143f0f2682ef05fe513a755e12df7835e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e835e143f0f2682ef05fe513… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:24 2022 +0100 dmsynth: Add error handling to the synth GetPortCaps method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 3 +++ dlls/dmsynth/tests/dmsynth.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 51b33e8df8d..f05f769761e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -295,6 +295,9 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *ifa TRACE("(%p)->(%p)\n", This, caps); + if (!caps || caps->dwSize < sizeof(*caps)) + return E_INVALIDARG; + *caps = This->caps; return S_OK; diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index e27d8abdb26..59ced1f0f21 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -64,6 +64,7 @@ static void test_dmsynth(void) KSPROPERTY property; ULONG value; ULONG bytes; + DMUS_PORTCAPS caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); @@ -146,6 +147,16 @@ static void test_dmsynth(void) ref_clock_synth = get_refcount(clock_synth); ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); + /* GetPortCaps */ + hr = IDirectMusicSynth_GetPortCaps(dmsynth, NULL); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + memset(&caps, 0, sizeof(caps)); + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + caps.dwSize = sizeof(caps) + 1; + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == S_OK, "GetPortCaps failed: %#x\n", hr); + if (control_synth) IDirectMusicSynth_Release(control_synth); if (control_sink)

1 0

Michael Stefaniuc : dmusic: Implement the E_NOTIMPL methods of the synth port.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 340e1feef0500b46121e37803684dfdae492f390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340e1feef0500b46121e3780… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:23 2022 +0100 dmusic: Implement the E_NOTIMPL methods of the synth port. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7fe72563bb0..490ff88059e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -240,20 +240,14 @@ static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusi static HRESULT WINAPI synth_port_SetReadNotificationHandle(IDirectMusicPort *iface, HANDLE event) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, event); - - return S_OK; + TRACE("(%p, %p): method not implemented\n", iface, event); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_Read(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, buffer); - - return S_OK; + TRACE("(%p, %p): method not implemented\n", iface, buffer); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDirectMusicInstrument *instrument, @@ -384,11 +378,8 @@ static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_S static HRESULT WINAPI synth_port_Compact(IDirectMusicPort *iface) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(): stub\n", iface, This); - - return S_OK; + TRACE("(%p): method not implemented\n", iface); + return E_NOTIMPL; } static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *port_caps)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
73
Older →

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 January 2022