November 2018 - Wine-Commits

Michael Stefaniuc : wbemprox: Prefer the standard ARRAY_SIZE macro.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 904820a523154e2435d16efbc923da59ece8a95e URL: https://source.winehq.org/git/wine.git/?a=commit;h=904820a523154e2435d16efb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:59:48 2018 +0100 wbemprox: Prefer the standard ARRAY_SIZE macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++-------------------- dlls/wbemprox/class.c | 4 +-- dlls/wbemprox/qualifier.c | 4 +-- dlls/wbemprox/services.c | 4 +-- dlls/wbemprox/wbemprox_private.h | 2 -- dlls/wbemprox/wql.y | 26 +++++++-------- 6 files changed, 53 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=904820a523154e2435d1…

1 0

Francois Gouget : testbot: Shorten the test report names.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: tools Branch: master Commit: 0a6fa83afe698b98d5f6847030c2d9558ac618ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a6fa83afe698b98d5f6847… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 16 11:14:15 2018 +0100 testbot: Shorten the test report names. The context makes it clear enough whether the report was produced on Windows or in Wine. So use a shorter, more readable name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 59b2d0a..f142982 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -596,11 +596,11 @@ sub GetLogFileNames($;$) } my %_LogFileLabels = ( - "exe32.report" => "32 bit Windows report", - "exe64.report" => "64 bit Windows report", - "win32.report" => "32 bit Wine report", - "wow32.report" => "32 bit WoW Wine report", - "wow64.report" => "64 bit Wow Wine report", + "exe32.report" => "32 bit report", + "exe64.report" => "64 bit report", + "win32.report" => "32 bit report", + "wow32.report" => "32 bit WoW report", + "wow64.report" => "64 bit WoW report", "log" => "task log", "old_log" => "old logs", );

1 0

Francois Gouget : testbot: Provide a better title for Wine update tasks.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: tools Branch: master Commit: aef6074283a828b07249abcdc213184625771853 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aef6074283a828b07249abc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 16 11:14:23 2018 +0100 testbot: Provide a better title for Wine update tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/StepsTasks.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index cfd78e5..8128bf9 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -70,7 +70,11 @@ sub GetTitle($) my ($self) = @_; my @TitleParts; - if ($self->Type eq "build") + if ($self->Type eq "reconfig") + { + push @TitleParts, "Wine update"; + } + elsif ($self->Type eq "build") { push @TitleParts, "build"; }

1 0

Józef Kucia : vkd3d: Use at least D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT for textures.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: vkd3d Branch: master Commit: a5646b3aff52b58dad7492a5d460cbed95103a48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5646b3aff52b58dad7492a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 16 13:28:24 2018 +0100 vkd3d: Use at least D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT for textures. It's the smallest alignment for textures supported by D3D12. Vulkan implementations may return lower values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 3 +++ tests/d3d12.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c854050..cf40e7a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2062,6 +2062,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } else { + /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ if (desc->SampleDesc.Count != 1) default_alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; @@ -2070,6 +2071,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour WARN("Failed to get allocation info for texture.\n"); valid = false; } + + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); } if (valid && desc->Alignment % info->Alignment) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7fb0b41..c827785 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21218,6 +21218,8 @@ static void test_suballocate_small_textures(void) check_alignment(info.SizeInBytes, info.Alignment); } + ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got alignment %"PRIu64".\n", info.Alignment); + heap_desc.SizeInBytes = ARRAY_SIZE(textures) * info.SizeInBytes; memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;

1 0

Michael Stefaniuc : l3codeca.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: db7d040ad188a0fbfe6967716fc4b5d60023f0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7d040ad188a0fbfe696771… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 14 20:46:02 2018 +0100 l3codeca.acm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index f71aac3..8ad6ae8 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -676,13 +676,13 @@ static LRESULT MPEG3_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "MPEG Layer-3 Codec", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine MPEG3 decoder", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR;

1 0

Michael Stefaniuc : msvidc32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: 21d0f36511a29b3b0e1267d48472f48e2c2385ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d0f36511a29b3b0e1267d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:12 2018 +0100 msvidc32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index b3faaf6..5a750d1 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -460,8 +460,8 @@ static LRESULT CRAM_GetInfo( const Msvideo1Context *info, ICINFO *icinfo, DWORD icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(MSVIDC32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(MSVIDC32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(MSVIDC32_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(MSVIDC32_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); /* msvfw32 will fill icinfo->szDriver for us */ return sizeof(ICINFO);

1 0

Michael Stefaniuc : ole32/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: 2d735f076d92958be5cb4d8262fd1c15b01a9d5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d735f076d92958be5cb4d82… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:16 2018 +0100 ole32/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 3919395..bbe7fb5 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -1067,7 +1067,7 @@ static void test_marshal_SNB(void) ok(*(ULONG*)wiresnb->rgString == wiresnb->ulCntStr, "got %u\n", *(ULONG*)wiresnb->rgString); dataW = &wiresnb->rgString[2]; ok(!lstrcmpW(dataW, str1W), "marshalled string 0: %s\n", wine_dbgstr_w(dataW)); - dataW += sizeof(str1W)/sizeof(WCHAR); + dataW += ARRAY_SIZE(str1W); ok(!lstrcmpW(dataW, str2W), "marshalled string 1: %s\n", wine_dbgstr_w(dataW)); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL);

1 0

Michael Stefaniuc : setupx.dll16: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: f2c0d96bb734af8f5239ab9f9a750cb173fe03cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c0d96bb734af8f5239ab9f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:18 2018 +0100 setupx.dll16: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/setupx_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index db15cfe..9245ead 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -303,7 +303,7 @@ static void SETUPX_CreateStandardLDDs(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup", &hKey); - for (n=0; n < sizeof(LDID_Data)/sizeof(LDID_DATA); n++) + for (n=0; n < ARRAY_SIZE(LDID_Data); n++) { buffer[0] = '\0';

1 0

Alexander Morozov : crypt32: Use correct private key for signing.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: 263f6ef20123bd35dbcecca48a3137dc2be9ef94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=263f6ef20123bd35dbcecca4… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Nov 14 15:33:38 2018 +0300 crypt32: Use correct private key for signing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/msg.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 1b390f4..ac70fe0 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -116,6 +116,7 @@ typedef struct _CRYPT_SIGNED_INFO CRYPT_CONTENT_INFO content; DWORD cSignerInfo; PCMSG_CMS_SIGNER_INFO rgSignerInfo; + PDWORD signerKeySpec; } CRYPT_SIGNED_INFO; BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *, void *pvData, diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 26f2616..9fe63e2 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1130,12 +1130,15 @@ static BOOL CSignedMsgData_Sign(CSignedMsgData *msg_data) for (i = 0; ret && i < msg_data->info->cSignerInfo; i++) { HCRYPTHASH hash; + DWORD keySpec = msg_data->info->signerKeySpec[i]; + if (!keySpec) + keySpec = AT_SIGNATURE; if (msg_data->info->rgSignerInfo[i].AuthAttrs.cAttr) hash = msg_data->signerHandles[i].authAttrHash; else hash = msg_data->signerHandles[i].contentHash; - ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, NULL, + ret = CryptSignHashW(hash, keySpec, NULL, 0, NULL, &msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); if (ret) { @@ -1144,7 +1147,7 @@ static BOOL CSignedMsgData_Sign(CSignedMsgData *msg_data) msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); if (msg_data->info->rgSignerInfo[i].EncryptedHash.pbData) { - ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, + ret = CryptSignHashW(hash, keySpec, NULL, 0, msg_data->info->rgSignerInfo[i].EncryptedHash.pbData, &msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); if (ret) @@ -1194,6 +1197,7 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) for (i = 0; i < msg->msg_data.info->cSignerInfo; i++) CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]); CSignedMsgData_CloseHandles(&msg->msg_data); + CryptMemFree(msg->msg_data.info->signerKeySpec); CryptMemFree(msg->msg_data.info->rgSignerInfo); CryptMemFree(msg->msg_data.info); } @@ -1416,6 +1420,9 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, msg->msg_data.info->cSignerInfo * sizeof(CMSG_CMS_SIGNER_INFO)); ret = CSignedMsgData_AllocateHandles(&msg->msg_data); + msg->msg_data.info->signerKeySpec = CryptMemAlloc(info->cSigners * sizeof(DWORD)); + if (!msg->msg_data.info->signerKeySpec) + ret = FALSE; for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) { if (info->rgSigners[i].SignerId.dwIdChoice == @@ -1432,6 +1439,8 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, CryptReleaseContext(info->rgSigners[i].hCryptProv, 0); } + msg->msg_data.info->signerKeySpec[i] = + info->rgSigners[i].dwKeySpec; } } else

1 0

Sven Baars : mfplat: Implement MFCreateMediaEvent.
by Alexandre Julliard Nov. 15, 2018

Nov. 15, 2018

Module: wine Branch: master Commit: d7b05b219d34a8d719b722d6982412680453521e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b05b219d34a8d719b722d6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Nov 13 23:20:45 2018 +0100 mfplat: Implement MFCreateMediaEvent. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 361 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 66 +++++++++ include/mfapi.h | 2 + include/mfobjects.idl | 103 +++++++++++++ 5 files changed, 533 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7b05b219d34a8d719b7…

1 0