January 2022 - Wine-commits

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

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

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 : 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

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

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 : 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 : 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

Eric Pouech : include: Fix signedness in wine_dbgstr_variant().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: f253fbd62a58c01fa559b649a2e6daa76185dd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f253fbd62a58c01fa559b649… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 25 10:53:16 2022 +0100 include: Fix signedness in wine_dbgstr_variant(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 6aac7fe82e8..9730e85d97a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -451,9 +451,9 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_UI1: return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); case VT_UI2: - return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + return wine_dbg_sprintf( "%p {VT_UI2: %u}", v, V_UI2(v) ); case VT_UI4: - return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + return wine_dbg_sprintf( "%p {VT_UI4: %u}", v, V_UI4(v) ); case VT_I8: return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); case VT_UI8:

1 0

Fabian Maurer : advapi32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 51abf02cec6a8475f507447d55420fe3ee3fca15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51abf02cec6a8475f507447d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:23 2022 +0100 advapi32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 16 ++++++++-------- dlls/advapi32/tests/service.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c73e28a98e6..009a941c700 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1028,7 +1028,7 @@ cleanup: rc = GetFileAttributesA(file); rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); -todo_wine + todo_wine ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); @@ -1488,10 +1488,10 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine + todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1600,7 +1600,7 @@ todo_wine PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); -todo_wine + todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); @@ -5365,9 +5365,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) SetLastError(0xdeadbeef); ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); -todo_wine + todo_wine ok(present == 1, "acl is not present\n"); -todo_wine + todo_wine ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5376,7 +5376,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); @@ -5385,7 +5385,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); -todo_wine + todo_wine ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); ok(defaulted == 0, "defaulted is set to TRUE\n"); } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cbe7fffbc7a..21704048778 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2728,7 +2728,7 @@ static void test_EventLog(void) !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */ || !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted -p") /* Win10 */, "got %s\n", config->lpBinaryPathName); -todo_wine + todo_wine ok(!strcmpi(config->lpLoadOrderGroup, "Event Log"), "got %s\n", config->lpLoadOrderGroup); ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); @@ -2749,7 +2749,7 @@ todo_wine status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, "got %#x\n", status.dwServiceType); ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); -todo_wine + todo_wine ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN),

1 0