wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : qasf: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 73287cdff1556dd066a3566b008b606fb3144a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73287cdff1556dd066a3566b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:04:41 2022 -0600 qasf: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 1 - dlls/qasf/dmowrapper.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index d82abfeea7d..ee8fd0451e1 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 54581b48bee..95e12e860ae 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -86,7 +86,7 @@ static HRESULT WINAPI buffer_SetLength(IMediaBuffer *iface, DWORD len) { struct buffer *buffer = impl_from_IMediaBuffer(iface); - TRACE("iface %p, len %u.\n", iface, len); + TRACE("iface %p, len %lu.\n", iface, len); return IMediaSample_SetActualDataLength(buffer->sample, len); } @@ -216,7 +216,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, &filter->sources[i].buffer.sample, NULL, NULL, 0))) { - ERR("Failed to get sample, hr %#x.\n", hr); + ERR("Failed to get sample, hr %#lx.\n", hr); goto out; } buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -263,7 +263,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) { if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { - WARN("Downstream sink returned %#x.\n", hr); + WARN("Downstream sink returned %#lx.\n", hr); goto out; } IMediaSample_SetActualDataLength(sample, 0); @@ -300,7 +300,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed { if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) { - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); goto out; } @@ -324,7 +324,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (FAILED(hr = IMediaObject_ProcessInput(dmo, index, &filter->input_buffer.IMediaBuffer_iface, flags, start, stop - start))) { - ERR("ProcessInput() failed, hr %#x.\n", hr); + ERR("ProcessInput() failed, hr %#lx.\n", hr); goto out; } @@ -346,11 +346,11 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); process_output(filter, dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) { @@ -372,7 +372,7 @@ static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr); for (i = 0; i < filter->source_count; ++i) {

1 0

Michael Stefaniuc : dmband: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 0990abd7b95274d20673f884f546ea9a2392905f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0990abd7b95274d20673f884… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:51 2022 +0100 dmband: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/Makefile.in | 1 - dlls/dmband/band.c | 44 +++++++++++++++++++++---------------------- dlls/dmband/bandtrack.c | 50 ++++++++++++++++++++++++------------------------- dlls/dmband/dmobject.c | 20 ++++++++++---------- dlls/dmband/dmutils.c | 6 +++--- 5 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0990abd7b95274d20673…

1 0

Michael Stefaniuc : dmband/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: f586cfa52d37cf43dbbab803e62e3a13c5e4b7f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f586cfa52d37cf43dbbab803… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:50 2022 +0100 dmband/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/tests/Makefile.in | 1 - dlls/dmband/tests/dmband.c | 142 +++++++++++++++++++++--------------------- 2 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f586cfa52d37cf43dbba…

1 0

Michael Stefaniuc : dmime: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 690e012f015e9cf52d6d207503a4ad87d2e89fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690e012f015e9cf52d6d2075… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:49 2022 +0100 dmime: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++---- dlls/dmime/dmobject.c | 20 +++++++------- dlls/dmime/graph.c | 8 +++--- dlls/dmime/lyricstrack.c | 32 +++++++++++----------- dlls/dmime/markertrack.c | 14 +++++----- dlls/dmime/paramcontroltrack.c | 24 ++++++++--------- dlls/dmime/performance.c | 60 +++++++++++++++++++++--------------------- dlls/dmime/segment.c | 58 ++++++++++++++++++++-------------------- dlls/dmime/segmentstate.c | 8 +++--- dlls/dmime/segtriggertrack.c | 34 ++++++++++++------------ dlls/dmime/seqtrack.c | 24 ++++++++--------- dlls/dmime/sysextrack.c | 24 ++++++++--------- dlls/dmime/tempotrack.c | 26 +++++++++--------- dlls/dmime/timesigtrack.c | 16 +++++------ dlls/dmime/wavetrack.c | 50 +++++++++++++++++------------------ 16 files changed, 204 insertions(+), 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690e012f015e9cf52d6d…

1 0

Michael Stefaniuc : dmime/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: f648478075cf1455a6a5327998fa659d67e26124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f648478075cf1455a6a53279… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 23:14:47 2022 +0100 dmime/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 1 - dlls/dmime/tests/dmime.c | 316 ++++++++++++++++++++--------------------- dlls/dmime/tests/performance.c | 241 ++++++++++++++++--------------- 3 files changed, 274 insertions(+), 284 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f648478075cf1455a6a5…

1 0

Nikolay Sivov : evr/tests: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: e4f911153debb859a545f688cff896e6f260944a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f911153debb859a545f688… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 9 12:53:41 2022 +0300 evr/tests: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 1 - dlls/evr/tests/evr.c | 1291 ++++++++++++++++++++++---------------------- 2 files changed, 647 insertions(+), 645 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f911153debb859a545…

1 0

Nikolay Sivov : ole32: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 233042bd751ac82f50870ff26bc765d2e94d0355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=233042bd751ac82f50870ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 8 23:09:20 2022 +0300 ole32: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/antimoniker.c | 11 ++- dlls/ole32/bindctx.c | 10 +-- dlls/ole32/classmoniker.c | 18 ++--- dlls/ole32/clipboard.c | 44 ++++++------ dlls/ole32/comcat.c | 6 +- dlls/ole32/compobj.c | 8 +-- dlls/ole32/compositemoniker.c | 44 ++++++------ dlls/ole32/datacache.c | 25 ++++--- dlls/ole32/defaulthandler.c | 37 +++++----- dlls/ole32/filelockbytes.c | 12 ++-- dlls/ole32/filemoniker.c | 6 +- dlls/ole32/git.c | 14 ++-- dlls/ole32/itemmoniker.c | 18 ++--- dlls/ole32/memlockbytes.c | 6 +- dlls/ole32/moniker.c | 28 ++++---- dlls/ole32/ole2.c | 52 +++++++------- dlls/ole32/ole2stubs.c | 4 +- dlls/ole32/oleobj.c | 33 ++++----- dlls/ole32/pointermoniker.c | 32 ++++----- dlls/ole32/stg_prop.c | 104 +++++++++++++-------------- dlls/ole32/stg_stream.c | 26 +++---- dlls/ole32/storage32.c | 162 +++++++++++++++++++----------------------- dlls/ole32/usrmarshal.c | 89 ++++++++++++----------- 24 files changed, 375 insertions(+), 416 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233042bd751ac82f5087…

1 0

Francois Gouget : testbot/SetWinLocale: Simplify tracing the command lines.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: tools Branch: master Commit: 86a56c50f78309b1c22ea2e9a6d46b4c8db73641 URL: https://source.winehq.org/git/tools.git/?a=commit;h=86a56c50f78309b1c22ea2e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:46:28 2022 +0100 testbot/SetWinLocale: Simplify tracing the command lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 4cc3644..29b57b3 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -869,7 +869,7 @@ sub SetWinLocales($$$$$$$$) $KeyboardIds ? $KeyboardIds->[0] : ".", $SysCopy ? "true" : "false", $DefCopy ? "true" : "false", $OptUseIntl ? "true" : "false"]; - Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); + Debug(Elapsed($Start), " Running: @$Cmd\n"); my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); my $Out = $TA->GetFileToString("$name0.out"); @@ -901,7 +901,7 @@ SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, if ($OptReboot) { my $Cmd = ["shutdown.exe", "/r", "/d", "00:00", "/t", "0"]; - Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); + Debug(Elapsed($Start), " Rebooting: @$Cmd\n"); my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows

1 0

Francois Gouget : testbot/SetWinLocale: Provide a dummy reboot reason.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: tools Branch: master Commit: 33de404f4ee904ed8f6411e9cc06ba3a1ec497e6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=33de404f4ee904ed8f6411e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:46:25 2022 +0100 testbot/SetWinLocale: Provide a dummy reboot reason. This matches LibvirtTool. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b43b501..4cc3644 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -900,7 +900,7 @@ SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, if ($OptReboot) { - my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + my $Cmd = ["shutdown.exe", "/r", "/d", "00:00", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0);

1 0

Francois Gouget : testbot/SetWinLocale: Better detect when Windows has rebooted.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: tools Branch: master Commit: 1ac164b1d6af05258a864270cafc61bf60ad9dc5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ac164b1d6af05258a86427… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 8 23:46:22 2022 +0100 testbot/SetWinLocale: Better detect when Windows has rebooted. This no longer relies on a long pause to give time for Windows to start rebooting and should detect when TestAgentd is ready again faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index df0d6f7..b43b501 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -902,18 +902,19 @@ if ($OptReboot) { my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); + my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows - # Wait a bit to make sure we don't reconnect before Windows has rebooted. - sleep(30); - - Debug(Elapsed($Start), " Waiting for Windows to boot\n"); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$TA->Ping()) + my ($OneTimeout, $MinAttempts, $MinTimeout) = $TA->SetConnectTimeout(3, 1, 3); + while (1) { - FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); + my $NewCount = $TA->GetProperties("start.count"); + next if (!defined $NewCount); # Rebooting (TestAgentd is not running) + last if ($NewCount != $OldCount); # start.count got incremented + sleep(10); # Not rebooting yet } + $TA->SetConnectTimeout($OneTimeout, $MinAttempts, $MinTimeout); # Skip this check on pre-Windows 10 versions, i.e. those that don't have # 'CountryName' and if the settings were not changed in the first place.

1 0

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