November 2019 - Wine-devel - list.winehq.org

[PATCH] fonts: Change the charset of wingdings.sfd to SYMBOL_CHARSET.
by katahiromz . 08 Nov '19

08 Nov '19

See attachment.

2 4

[PATCH v3] ole32: Obtain stream size regardless of current position
by Micah N Gorrell 08 Nov '19

08 Nov '19

Use STREAM_SEEK_END when attempting to determine the size of a stream that clipboard data has just been rendered into. This corrects an issue with Office 2016 where the current position of the stream is 0 while rendering a target of image/png. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0c02d02a65..9df37750a3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -788,7 +788,7 @@ static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL * if(FAILED(hr)) goto error; offs.QuadPart = 0; - IStream_Seek(med.u.pstm, offs, STREAM_SEEK_CUR, &pos); + IStream_Seek(med.u.pstm, offs, STREAM_SEEK_END, &pos); IStream_Seek(med.u.pstm, offs, STREAM_SEEK_SET, NULL); hr = IStream_CopyTo(med.u.pstm, stm, pos, NULL, NULL); ReleaseStgMedium(&med); -- 2.23.0

3 2

[PATCH] testbot: All but a few winediag messages are errors.
by Francois Gouget 08 Nov '19

08 Nov '19

Only a few winediag messages may legitimately occur when running the tests. The presence of other winediag messages indicates an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index acb87a42e..019e3c6cd 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -167,7 +167,19 @@ sub GetLogLineCategory($) } if ($Line =~ /:winediag:/) { - return "diag"; + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found / or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; } if (# TestBot script error messages $Line =~ /^[a-zA-Z.]+:error: / or -- 2.20.1

1 0

[PATCH] testbot/web: Document why WineTestBot::Log is used.
by Francois Gouget 08 Nov '19

08 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index fe056aa48..d616a7c1d 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -29,7 +29,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 43f14948b..f45389145 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -28,7 +28,7 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; -- 2.20.1

1 0

[PATCH] testbot: Trace the chunks in _DumpDiff().
by Francois Gouget 08 Nov '19

08 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 019e3c6cd..ea1ad89cc 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -821,17 +821,19 @@ sub _DumpDiff($$) print STDERR "$Label:\n"; $Diff = $Diff->Copy(); + my $Chunk = 0; while ($Diff->Next()) { if ($Diff->Same()) { - print STDERR " $_\n" for ($Diff->Same()); + print STDERR "$Chunk $_\n" for ($Diff->Same()); } else { - print STDERR "-$_\n" for ($Diff->Items(1)); - print STDERR "+$_\n" for ($Diff->Items(2)); + print STDERR "$Chunk -$_\n" for ($Diff->Items(1)); + print STDERR "$Chunk +$_\n" for ($Diff->Items(2)); } + $Chunk++; } } -- 2.20.1

1 0

[PATCH] testbot/web: Trace how long it takes to generate the JobDetails page.
by Francois Gouget 08 Nov '19

08 Nov '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The parsing of the reference reports to detect new failres makes it slow (see bug 48035). testbot/web/JobDetails.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index fc98e14b0..a59fa000d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -31,6 +31,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Log; # For Elapsed() use WineTestBot::LogUtils; use WineTestBot::Missions; use WineTestBot::StepsTasks; @@ -41,6 +42,7 @@ use WineTestBot::Engine::Notify; sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{start} = Time(); my $JobId = $self->GetParam("Key"); if (! defined($JobId)) @@ -645,6 +647,12 @@ sub GenerateDataCell($$$$$) } } +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; +} + package main; -- 2.20.1

1 0

[PATCH 1/3] rpcss: Make initialization helper easier to extend.
by Nikolay Sivov 08 Nov '19

08 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/rpcss/rpcss_main.c | 102 ++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 6d24ccbc07..42749028c3 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -37,53 +37,60 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; -static BOOL RPCSS_Initialize(void) +static RPC_STATUS RPCSS_Initialize(void) { - static unsigned short irot_protseq[] = IROT_PROTSEQ; - static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; - RPC_STATUS status; - - WINE_TRACE("\n"); - - status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - return status; - status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - { - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - return FALSE; - } - - status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint_lrpc, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - irot_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); - if (status != RPC_S_OK) - goto fail; - - return TRUE; + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static const struct protseq_map + { + unsigned short *protseq; + unsigned short *endpoint; + } protseqs[] = + { + { epm_protseq, epm_endpoint }, + { epm_protseq_lrpc, epm_endpoint_lrpc }, + { irot_protseq, irot_endpoint }, + }; + RPC_IF_HANDLE ifspecs[] = + { + epm_v3_0_s_ifspec, + Irot_v0_2_s_ifspec, + }; + RPC_STATUS status; + int i, j; + + WINE_TRACE("\n"); + + for (i = 0, j = 0; i < ARRAY_SIZE(ifspecs); ++i, j = i) + { + status = RpcServerRegisterIf(ifspecs[i], NULL, NULL); + if (status != RPC_S_OK) + goto fail; + } + + for (i = 0; i < ARRAY_SIZE(protseqs); ++i) + { + status = RpcServerUseProtseqEpW(protseqs[i].protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + protseqs[i].endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + } + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + return RPC_S_OK; fail: - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); - return FALSE; + for (i = 0; i < j; ++i) + RpcServerUnregisterIf(ifspecs[i], NULL, FALSE); + + return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) @@ -121,10 +128,15 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; + RPC_STATUS ret; TRACE( "starting service\n" ); - if (!RPCSS_Initialize()) return; + if ((ret = RPCSS_Initialize())) + { + WARN("Failed to initialize rpc interfaces, status %d.\n", ret); + return; + } exit_event = CreateEventW( NULL, TRUE, FALSE, NULL ); -- 2.24.0.rc1

3 6

[PATCH] kernelbase: Implement EqualDomainSid.
by Dmitry Timoshkov 08 Nov '19

08 Nov '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/tests/security.c | 78 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 55 +++++++++++++++++++++++ include/winbase.h | 1 + include/winerror.h | 2 + 6 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 54b479dc5d..5a4344852e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -281,7 +281,7 @@ @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) @ stdcall EnumerateTraceGuids(ptr long ptr) # @ stub EnumerateTraceGuidsEx -# @ stub EqualDomainSid +@ stdcall -import EqualDomainSid(ptr ptr ptr) @ stdcall -import EqualPrefixSid(ptr ptr) @ stdcall -import EqualSid(ptr ptr) # @ stub EventAccessControl diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5f65ed385d..938a0b9e76 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -130,6 +130,7 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,P static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); +static BOOL (WINAPI *pEqualDomainSid)(PSID,PSID,BOOL*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); @@ -218,6 +219,7 @@ static void init(void) pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); + pEqualDomainSid = (void *)GetProcAddress(hmod, "EqualDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW"); @@ -7570,6 +7572,81 @@ static void test_BuildSecurityDescriptorW(void) LocalFree(new_sd); } +static void test_EqualDomainSid(void) +{ + SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; + char sid_buffer[SECURITY_MAX_SID_SIZE], sid_buffer2[SECURITY_MAX_SID_SIZE]; + PSID domainsid, sid = sid_buffer, sid2 = sid_buffer2; + DWORD size; + BOOL ret, equal; + unsigned int i; + + if (!pEqualDomainSid) + { + win_skip("EqualDomainSid not available\n"); + return; + } + + if (!pCreateWellKnownSid) + { + win_skip("CreateWellKnownSid not available\n"); + return; + } + + ret = AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid); + ok(ret, "AllocateAndInitializeSid error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pEqualDomainSid(NULL, NULL, NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_SID, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pEqualDomainSid(domainsid, domainsid, NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(well_known_sid_values); i++) + { + SID *pisid = sid; + + size = sizeof(sid_buffer); + if (!pCreateWellKnownSid(i, NULL, sid, &size)) + { + trace("Well known SID %u not supported\n", i); + continue; + } + + equal = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pEqualDomainSid(sid, domainsid, &equal); + if (pisid->SubAuthority[0] != SECURITY_BUILTIN_DOMAIN_RID) + { + ok(!ret, "%u: got %d\n", i, ret); + ok(GetLastError() == ERROR_NON_DOMAIN_SID, "%u: got %u\n", i, GetLastError()); + ok(equal == 0xdeadbeef, "%u: got %d\n", i, equal); + continue; + } + + ok(ret, "%u: got %d\n", i, ret); + ok(GetLastError() == 0, "%u: got %u\n", i, GetLastError()); + ok(equal == 0, "%u: got %d\n", i, equal); + + size = sizeof(sid_buffer2); + ret = pCreateWellKnownSid(i, well_known_sid_values[i].without_domain ? NULL : domainsid, sid2, &size); + ok(ret, "%u: CreateWellKnownSid error %u\n", i, GetLastError()); + + equal = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pEqualDomainSid(sid, sid2, &equal); + ok(ret, "%u: got %d\n", i, ret); + ok(GetLastError() == 0, "%u: got %u\n", i, GetLastError()); + ok(equal == 1, "%u: got %d\n", i, equal); + } + + FreeSid(domainsid); +} + START_TEST(security) { init(); @@ -7606,6 +7683,7 @@ START_TEST(security) test_PrivateObjectSecurity(); test_acls(); test_GetWindowsAccountDomainSid(); + test_EqualDomainSid(); test_GetSecurityInfo(); test_GetSidSubAuthority(); test_CheckTokenMembership(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a86a3fe252..5b2c5ef2e0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -323,7 +323,7 @@ @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateStateAtomValues # @ stub EnumerateStateContainerItems -@ stub EqualDomainSid +@ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @ stdcall EscapeCommFunction(long long) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 327172c236..d1736e61b8 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -274,6 +274,61 @@ BOOL WINAPI EqualSid( PSID sid1, PSID sid2 ) return ret; } +/****************************************************************************** + * EqualDomainSid (kernelbase.@) + */ +BOOL WINAPI EqualDomainSid( PSID sid1, PSID sid2, BOOL *equal ) +{ + MAX_SID builtin_sid, domain_sid1, domain_sid2; + DWORD size; + + TRACE( "(%p,%p,%p)\n", sid1, sid2, equal ); + + if (!IsValidSid( sid1 ) || !IsValidSid( sid2 )) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + if (!equal) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + size = sizeof(domain_sid1); + if (GetWindowsAccountDomainSid( sid1, &domain_sid1, &size )) + { + size = sizeof(domain_sid2); + if (GetWindowsAccountDomainSid( sid2, &domain_sid2, &size )) + { + *equal = EqualSid( &domain_sid1, &domain_sid2 ); + SetLastError( 0 ); + return TRUE; + } + } + + size = sizeof(builtin_sid); + if (!CreateWellKnownSid( WinBuiltinDomainSid, NULL, &builtin_sid, &size )) + return FALSE; + + if (!memcmp(GetSidIdentifierAuthority( sid1 )->Value, builtin_sid.IdentifierAuthority.Value, sizeof(builtin_sid.IdentifierAuthority.Value)) && + !memcmp(GetSidIdentifierAuthority( sid2 )->Value, builtin_sid.IdentifierAuthority.Value, sizeof(builtin_sid.IdentifierAuthority.Value))) + { + if (*GetSidSubAuthorityCount( sid1 ) != 0 && *GetSidSubAuthorityCount( sid2 ) != 0 && + (*GetSidSubAuthority( sid1, 0 ) == SECURITY_BUILTIN_DOMAIN_RID || + *GetSidSubAuthority( sid2, 0 ) == SECURITY_BUILTIN_DOMAIN_RID)) + { + *equal = EqualSid( sid1, sid2 ); + SetLastError( 0 ); + return TRUE; + } + } + + SetLastError( ERROR_NON_DOMAIN_SID ); + return FALSE; +} + /****************************************************************************** * FreeSid (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 90179b3d85..2d9fafa52d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2002,6 +2002,7 @@ WINBASEAPI BOOL WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG_P WINBASEAPI BOOL WINAPI EnumResourceTypesExA(HMODULE,ENUMRESTYPEPROCA,LONG_PTR,DWORD,LANGID); WINBASEAPI BOOL WINAPI EnumResourceTypesExW(HMODULE,ENUMRESTYPEPROCW,LONG_PTR,DWORD,LANGID); #define EnumResourceTypesEx WINELIB_NAME_AW(EnumResourceTypesEx) +WINADVAPI BOOL WINAPI EqualDomainSid(PSID,PSID,BOOL*); WINADVAPI BOOL WINAPI EqualSid(PSID, PSID); WINADVAPI BOOL WINAPI EqualPrefixSid(PSID,PSID); WINBASEAPI DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL); diff --git a/include/winerror.h b/include/winerror.h index 40dd6d9efa..73027c4189 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -762,6 +762,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NOT_SUPPORTED_ON_SBS 1254 #define ERROR_SERVER_SHUTDOWN_IN_PROGRESS 1255 #define ERROR_HOST_DOWN 1256 +#define ERROR_NON_ACCOUNT_SID 1257 +#define ERROR_NON_DOMAIN_SID 1258 #define ERROR_ACCESS_DISABLED_BY_POLICY 1260 #define ERROR_REG_NAT_CONSUMPTION 1261 #define ERROR_PKINIT_FAILURE 1263 -- 2.20.1

1 0

[PATCH 1/4] configure: Install winebus.inf.
by Zebediah Figura 08 Nov '19

08 Nov '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Spotted by Jactry Zeng. configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index c99db6984b5..e5003f769c4 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ -- 2.23.0

1 3

[PATCH] dmime: Trace dwGroupBits parameter consistently
by Alistair Leslie-Hughes 08 Nov '19

08 Nov '19

dwGroupBits is either printed out as %d or %x. Changed them all to use %x as 0xFFFFFFFF is a common value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a0e6191864..7f00dc119e 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %d, 0x%x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, 0x%x, 0x%x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -243,12 +243,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %d)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, 0x%x)\n", This, pTrack, dwGroupBits); LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %d,%p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%u: %p -> 0x%x,%p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, 0x%x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, 0x%x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } -- 2.17.1

1 0