February 2022 - Wine-commits

Eric Pouech : tapi32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: e0c75af0f65cc830079cdd2271e148514ca1d876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c75af0f65cc830079cdd22… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:16 2022 +0100 tapi32: 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/tapi32/Makefile.in | 1 - dlls/tapi32/line.c | 148 ++++++++++++++++++++++++------------------------ dlls/tapi32/phone.c | 38 ++++++------- 3 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0c75af0f65cc830079c…

1 0

Eric Pouech : taskschd: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f925d0d8c4d3c0c711d6642101d800b2197cb2e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f925d0d8c4d3c0c711d66421… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:22 2022 +0100 taskschd: 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/taskschd/Makefile.in | 1 - dlls/taskschd/folder.c | 28 ++++++------- dlls/taskschd/folder_collection.c | 10 ++--- dlls/taskschd/regtask.c | 22 +++++------ dlls/taskschd/task.c | 82 +++++++++++++++++++-------------------- 5 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f925d0d8c4d3c0c711d6…

1 0

Nikolay Sivov : mfmediaengine: Shutdown media source when clearing current presentation.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 9a7d166e6bfdbd5b1f5dbee6cbb9b66e44372e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7d166e6bfdbd5b1f5dbee6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:39 2022 +0300 mfmediaengine: Shutdown media source when clearing current presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 31aee0209f6..4a7d85348d7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -141,6 +141,10 @@ struct media_engine IMFSourceResolver *resolver; BSTR current_source; struct + { + IMFMediaSource *source; + } presentation; + struct { LONGLONG pts; SIZE size; @@ -1071,6 +1075,16 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I return hr; } +static void media_engine_clear_presentation(struct media_engine *engine) +{ + if (engine->presentation.source) + { + IMFMediaSource_Shutdown(engine->presentation.source); + IMFMediaSource_Release(engine->presentation.source); + } + memset(&engine->presentation, 0, sizeof(engine->presentation)); +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; @@ -1081,6 +1095,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi HRESULT hr; media_engine_release_video_frame_resources(engine); + media_engine_clear_presentation(engine); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1134,6 +1149,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return E_UNEXPECTED; } + engine->presentation.source = source; + IMFMediaSource_AddRef(engine->presentation.source); + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); @@ -1340,6 +1358,7 @@ static void free_media_engine(struct media_engine *engine) if (engine->resolver) IMFSourceResolver_Release(engine->resolver); media_engine_release_video_frame_resources(engine); + media_engine_clear_presentation(engine); if (engine->device_manager) { IMFDXGIDeviceManager_CloseDeviceHandle(engine->device_manager, engine->device_handle); @@ -2086,6 +2105,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngineEx *iface) else { media_engine_set_flag(engine, FLAGS_ENGINE_SHUT_DOWN, TRUE); + media_engine_clear_presentation(engine); IMFMediaSession_Shutdown(engine->session); } LeaveCriticalSection(&engine->cs);

1 0

Francois Gouget : testbot/reporttest: Fix inconsistencies with the 'dll versions' block.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: tools Branch: master Commit: e31d44adf4c67af98ba2287346d23822ef507248 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e31d44adf4c67af98ba2287… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 18 16:03:47 2022 +0100 testbot/reporttest: Fix inconsistencies with the 'dll versions' block. The dlls which are declared as missing or which have other 'load errors' should not have stub/test results (add placeholders to avoid future errors). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 57 ++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 6af2ff5..debd3ce 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -16,6 +16,8 @@ Operating system version: PlatformId=2 wProductType=1 Dll info: + activeds=dll is missing + adsldp=dll is missing advapi32=5.1.2600.5755 advpack=8.0.6001.18702 amstream=6.5.2600.5512 @@ -209,6 +211,9 @@ Dll info: xinput1_3=version error 5 xmllite=version not present 2 Test output: +----- activeds=dll is missing +----- adsldp=dll is missing + stub advapi32:cred ----- WTBS Simple test patch ----- Stubs automatically generate a successful dlls or programs test. @@ -342,6 +347,9 @@ apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s +----- atl100=dll is missing +----- atl80=dll is missing + atl:atl_ax start dlls/atl/tests/atl_ax.c ----- WTBS Timeout after a test failure ----- Expected assessement: Timeout @@ -366,6 +374,8 @@ atl:registrar:0922 done (0) in 0s avifil32 is missing and thus no test will be run for it and no entry will be found in the test report. +----- bcrypt=dll is missing + browseui:autocomplete start dlls/browseui/tests/autocomplete.c ----- A test unit with a skipped test ----- Expected assessement: Success, 1 skipped @@ -406,6 +416,8 @@ batch.c:42: Test marked todo: Hello Wine! 0ddc:batch: 1701 tests executed (0 marked as todo, 0 failures), 0 skipped. cmd.exe:batch:0ddc done (0) in 3s +----- combase=dll is missing + comcat:comcat start dlls/comcat/tests/comcat.c ----- A test unit with a missing todo test line ----- Expected assessement: "Missing todo line" error @@ -679,6 +691,11 @@ stub crypt32:store stub crypt32:str stub cryptnet:cryptnet stub cryptui:cryptui +----- d2d1=dll is missing +----- d3d10core=dll is missing +----- d3d10_1=dll is missing +----- d3d10=dll is missing +----- d3d11=dll is missing stub d3d8:device stub d3d8:stateblock stub d3d8:visual @@ -686,8 +703,12 @@ stub d3d9:d3d9ex stub d3d9:device stub d3d9:stateblock stub d3d9:visual +----- d3dcompiler_43=dll is missing stub d3drm:d3drm stub d3drm:vector +----- d3dx10_43=dll is missing +----- d3dx11_43=dll is missing +----- d3dx9_36=dll is missing stub d3dxof:d3dxof stub ddrawex:ddrawex stub ddrawex:surface @@ -734,13 +755,17 @@ stub dsound:duplex stub dsound:propset stub dssenh:dssenh stub dswave:dswave +----- dwrite=dll is missing stub dxdiagn:container stub dxdiagn:provider +----- dxgi=dll is missing +----- explorerframe=dll is missing stub faultrep:faultrep stub fusion:asmcache stub fusion:asmenum stub fusion:asmname stub fusion:fusion +----- gameux=dll is missing stub gdi32:bitmap stub gdi32:brush stub gdi32:clipping @@ -828,6 +853,7 @@ stub mapi32:prop stub mapi32:util stub mlang:mlang stub mmcndmgr:mmcndmgr +----- mmdevapi=dll is missing stub mpr:mpr stub msacm32:msacm stub mscms:profile @@ -863,12 +889,19 @@ stub mstask:task stub mstask:task_scheduler stub mstask:task_trigger stub msvcirt:msvcirt +----- msvcp100=dll is missing +----- msvcp110=dll is missing +----- msvcp120=dll is missing +----- msvcp140=dll is missing stub msvcp60:ios stub msvcp60:string stub msvcp90:ios stub msvcp90:misc stub msvcp90:string +----- msvcr100=dll is missing +----- msvcr120=dll is missing stub msvcr90:msvcr90 +----- msvcrtd=dll is missing stub msvcrt:cpp stub msvcrt:data stub msvcrt:dir @@ -896,6 +929,7 @@ stub netapi32:apibuf stub netapi32:ds stub netapi32:wksta stub netcfgx:netcfgx +----- netprofm=dll is missing stub ntdll:atom stub ntdll:change stub ntdll:directory @@ -950,7 +984,9 @@ stub oledb32:database stub oledb32:marshal stub oledlg:main stub opengl32:opengl +----- packager=dll is missing stub pdh:pdh +----- propsys=dll is missing stub psapi:psapi_main stub qcap:qcap stub qcap:smartteefilter @@ -1034,13 +1070,16 @@ stub shlwapi:shreg stub shlwapi:string stub shlwapi:thread stub shlwapi:url +----- slc=dll is missing stub snmpapi:util stub spoolss:spoolss stub sti:sti stub sxs:cache stub sxs:name stub t2embed:t2embed +----- taskschd=dll is missing stub twain_32:dsm +----- ucrtbase=dll is missing stub urlmon:generated stub urlmon:misc stub urlmon:protocol @@ -1078,11 +1117,14 @@ stub uxtheme:system stub vbscript:createobj stub vbscript:run stub vbscript:vbscript +----- vcomp=dll is missing stub version:info stub version:install stub wbemdisp:wbemdisp stub wbemprox:query stub wbemprox:services +----- webservices=dll is missing +----- wer=dll is missing stub wiaservc:wia stub windowscodecsext:transform stub windowscodecs:bitmap @@ -1117,6 +1159,7 @@ stub winmm:mmio stub winmm:timer stub winmm:wave stub winspool.drv:info +----- wintab32=dll is missing stub wintrust:asn stub wintrust:crypt stub wintrust:register @@ -1125,13 +1168,15 @@ stub wlanapi:wlanapi stub wldap32:parse stub wmiutils:path stub wmp:oleobj -stub ws2_32:protocol -stub ws2_32:sock -stub wscript.exe:run -stub wshom.ocx:wshom -stub wsnmp32:wsnmp -stub wtsapi32:wtsapi +----- wpc=dll is native +----- ws2_32=dll is a stub +----- wscript.exe=dll is missing +----- wshom.ocx=dll is missing an ordinal +----- wsnmp32=dll is missing an entrypoint +----- wtsapi32=dll is missing the requested side-by-side version +----- xaudio2_7=load error 5 stub xcopy.exe:xcopy +stub xinput1_3:xinput stub xmllite:reader xmllite:writer start dlls/xmllite/tests/writer.c

1 0

Francois Gouget : testbot/reporttest: Add a test for timeouts during --list.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: tools Branch: master Commit: 1f4b11d5254d22af038db5c13f60a778e8a6fa27 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1f4b11d5254d22af038db5c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 18 16:03:49 2022 +0100 testbot/reporttest: Add a test for timeouts during --list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index debd3ce..e0503f9 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -199,7 +199,7 @@ Dll info: wlanapi=5.1.2600.5512 wldap32=5.1.2600.5512 wmiutils=5.1.2600.5512 - wmp=11.0.5721.5280 + wmp=load error 258 wpc=dll is native ws2_32=dll is a stub wscript.exe=dll is missing @@ -1167,7 +1167,7 @@ stub wintrust:softpub stub wlanapi:wlanapi stub wldap32:parse stub wmiutils:path -stub wmp:oleobj +----- wmp=load error 258 ----- wpc=dll is native ----- ws2_32=dll is a stub ----- wscript.exe=dll is missing

1 0

Cressida Silver : CJSILVER WWN 412
by Jeremy Newman 18 Feb '22

18 Feb '22

Module: website Branch: master Commit: 4e822c1dd69e52d3c5c39e4f5a056b6c8cc3c42b URL: https://source.winehq.org/git/website.git/?a=commit;h=4e822c1dd69e52d3c5c39… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Feb 18 11:09:05 2022 -0600 CJSILVER WWN 412 --- news/en/2022021802.xml | 13 +++ wwn/en/wn20220218_412.xml | 280 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 293 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=4e822c1dd69e52d3c…

1 0

Eric Pouech : quartz: Always allocate the entire VIDEOINFO structure.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: e102068c0daab41f953d0594df1cdb92ae70de72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e102068c0daab41f953d0594… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 12:33:09 2022 -0600 quartz: Always allocate the entire VIDEOINFO structure. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f8660890273..f473c829cba 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -342,9 +342,12 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface if (index < ARRAY_SIZE(formats)) { - if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, dwBitMasks[3])))) + /* In theory we could allocate less than this, but gcc generates + * -Warray-bounds warnings if we access the structure through a + * VIDEOINFO pointer, even if we only access valid fields. */ + if (!(format = CoTaskMemAlloc(sizeof(*format)))) return E_OUTOFMEMORY; - memset(format, 0, offsetof(VIDEOINFO, dwBitMasks[3])); + memset(format, 0, sizeof(*format)); format->rcSource = sink_format->rcSource; format->rcTarget = sink_format->rcTarget;

1 0

Eric Pouech : ntdll/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 0c85e59beac3a71ffa8df9d2a3bdc9e56299ff6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c85e59beac3a71ffa8df9d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:23 2022 +0100 ntdll/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e9d42127c3e..d6b323dd9d7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1461,7 +1461,7 @@ static void test_query_firmware(void) NTSTATUS status; SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = 0;

1 0

Eric Pouech : kernel32/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: cb48c6dca4b207a7b4ea34a7e0a092777cce847d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb48c6dca4b207a7b4ea34a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:29 2022 +0100 kernel32/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ad87bb38a16..ec74c920960 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -715,7 +715,7 @@ static void test_GetSystemFirmwareTable(void) return; } - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = RSMB; sfti->Action = SystemFirmwareTable_Get;

1 0

Eric Pouech : kernel32/test: Fully allocate KEY_VALUE_*_INFORMATION.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 37a830916b76646ed6925f5053db3b8e896c8563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a830916b76646ed6925f50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:36 2022 +0100 kernel32/test: Fully allocate KEY_VALUE_*_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index bd8d531edf0..7d069666604 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -742,7 +742,7 @@ static void test_NtQueryValueKey(void) ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); - basic_info = HeapAlloc(GetProcessHeap(), 0, len); + basic_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*basic_info)); status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->TitleIndex); @@ -761,7 +761,7 @@ static void test_NtQueryValueKey(void) HeapFree(GetProcessHeap(), 0, basic_info); len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - partial_info = HeapAlloc(GetProcessHeap(), 0, len); + partial_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*partial_info)); status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->TitleIndex); @@ -780,7 +780,7 @@ static void test_NtQueryValueKey(void) HeapFree(GetProcessHeap(), 0, partial_info); len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); - full_info = HeapAlloc(GetProcessHeap(), 0, len); + full_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*full_info)); status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->TitleIndex);

1 0