wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

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

10 Feb '22

Module: wine Branch: master Commit: a49e82639b8bd0ec52198f5819d3ea7820bf2372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49e82639b8bd0ec52198f58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 9 23:34:05 2022 +0100 dmcompos/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/dmcompos/tests/Makefile.in | 1 - dlls/dmcompos/tests/dmcompos.c | 205 ++++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a49e82639b8bd0ec5219…

1 0

Nikolay Sivov : opcservices/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: ebe67a8f5b2f2ac601c9c08aa07729c99f59423f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe67a8f5b2f2ac601c9c08a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:20:50 2022 +0300 opcservices/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/Makefile.in | 1 - dlls/opcservices/tests/opcservices.c | 374 +++++++++++++++++------------------ 2 files changed, 187 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebe67a8f5b2f2ac601c9…

1 0

Nikolay Sivov : opcservices: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 119f6e7b2a49a189e5ca9edbe590e8c4cf1ce11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=119f6e7b2a49a189e5ca9edb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:20:49 2022 +0300 opcservices: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 1 - dlls/opcservices/compress.c | 3 ++- dlls/opcservices/factory.c | 31 ++++++++++++++-------------- dlls/opcservices/package.c | 48 ++++++++++++++++++++++---------------------- dlls/opcservices/uri.c | 20 +++++++++--------- 5 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=119f6e7b2a49a189e5ca…

1 0

Nikolay Sivov : include: Update another HRESULT definition.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 40c6c18ba2d99e68a3593eebaf8cbefa605bca18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c6c18ba2d99e68a3593eeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:20:30 2022 +0300 include: Update another HRESULT definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_main.c | 2 +- dlls/ole32/itemmoniker.c | 4 ++-- include/winerror.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index c8c2778501a..7b8fbcc48c1 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -107,7 +107,7 @@ HRESULT WINAPI DllCanUnloadNow(void) * as well? */ - TRACE( ": returning 0x%08x\n", hr ); + TRACE( ": returning %#lx\n", hr ); return hr; } diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 112a8db4b16..5c69266fc9c 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -451,7 +451,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr); hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, riid, ppvResult); @@ -482,7 +482,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *p if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr); hr = IOleItemContainer_GetObjectStorage(container, moniker->itemName, pbc, riid, ppvResult); IOleItemContainer_Release(container); diff --git a/include/winerror.h b/include/winerror.h index f412989a6a4..b63b74a5b18 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -89,11 +89,11 @@ #define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -# ifdef _MSC_VER -typedef long HRESULT; -# else -typedef int HRESULT; -# endif +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +typedef long HRESULT; +#else +typedef int HRESULT; +#endif #endif static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) {

1 0

Eric Pouech : dmstyle: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 73a05ffb99bf618449b968e099e9ce72fd45002f URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a05ffb99bf618449b968e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:22 2022 +0100 dmstyle: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/Makefile.in | 1 - dlls/dmstyle/auditiontrack.c | 24 +++++++++--------- dlls/dmstyle/chordtrack.c | 52 +++++++++++++++++++------------------- dlls/dmstyle/commandtrack.c | 30 +++++++++++----------- dlls/dmstyle/dmobject.c | 20 +++++++-------- dlls/dmstyle/dmutils.c | 6 ++--- dlls/dmstyle/motiftrack.c | 24 +++++++++--------- dlls/dmstyle/mutetrack.c | 24 +++++++++--------- dlls/dmstyle/style.c | 60 ++++++++++++++++++++++---------------------- dlls/dmstyle/styletrack.c | 38 ++++++++++++++-------------- 10 files changed, 139 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73a05ffb99bf618449b9…

1 0

Eric Pouech : dmscript: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 223d76cdb72d9d06bd601c7e672c03da60aa1529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223d76cdb72d9d06bd601c7e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:21 2022 +0100 dmscript: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/Makefile.in | 1 - dlls/dmscript/dmobject.c | 20 ++++++++++---------- dlls/dmscript/script.c | 22 +++++++++++----------- dlls/dmscript/scripttrack.c | 24 ++++++++++++------------ 4 files changed, 33 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=223d76cdb72d9d06bd60…

1 0

Eric Pouech : dmloader: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 33041701dc54cd4f0d22cda26b2b5b53c66df215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33041701dc54cd4f0d22cda2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:20 2022 +0100 dmloader: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/Makefile.in | 1 - dlls/dmloader/container.c | 30 +++++++++++++++--------------- dlls/dmloader/debug.c | 4 ++-- dlls/dmloader/dmloader_main.c | 2 +- dlls/dmloader/dmobject.c | 20 ++++++++++---------- dlls/dmloader/loader.c | 10 +++++----- dlls/dmloader/loaderstream.c | 36 ++++++++++++++++++------------------ 7 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33041701dc54cd4f0d22…

1 0

Eric Pouech : dmcompos: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 73b591c2748ef858e2294ee6d3a65d6ab31eddeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b591c2748ef858e2294ee6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:19 2022 +0100 dmcompos: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/Makefile.in | 1 - dlls/dmcompos/chordmap.c | 14 +++++++------- dlls/dmcompos/chordmaptrack.c | 24 ++++++++++++------------ dlls/dmcompos/composer.c | 8 ++++---- dlls/dmcompos/dmobject.c | 20 ++++++++++---------- dlls/dmcompos/signposttrack.c | 24 ++++++++++++------------ 6 files changed, 45 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73b591c2748ef858e229…

1 0

Francois Gouget : testbot/VMs: Set the default VM type to win64.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: tools Branch: master Commit: a9aa24938b78d0990a9ec13b218103f763ba2ea1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9aa24938b78d0990a9ec13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 02:11:55 2022 +0100 testbot/VMs: Set the default VM type to win64. This is only relevant when creating a new VM and the most commonly created VM type is 64-bit Windows VMs (for the various locales). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0b11d81..596499a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -171,6 +171,7 @@ sub InitializeNew($$) my ($self, $Collection) = @_; $self->Status("off"); + $self->Type("win64"); $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection);

1 0

Francois Gouget : testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: tools Branch: master Commit: 122e1af344c8d333b6d6414a3aba5687e3c13fce URL: https://source.winehq.org/git/tools.git/?a=commit;h=122e1af344c8d333b6d6414… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 19:51:55 2022 +0100 testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd. "shutdown.exe /p" waits for no process which may give it a slight edge in not getting stuck; but it also does not wait for TestAgentd to reply to the Run() RPC. "shutdown.exe /s" does not seem to have this problem (and supports /t if need be). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4b84f9b..0cccd12 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -292,7 +292,7 @@ sub ShutDown() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : ["/sbin/shutdown", "--poweroff", "now"]; Debug(Elapsed($Start), " Running @$Cmd\n"); my $PTA = GetPrivilegedTA($VM->GetAgent());

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