wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Alexandre Julliard : mountmgr: Add some helpers to abstract the Unix calls from device.c.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9c587c50990061dfe6e9a322bf2caaeda08b54a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c587c50990061dfe6e9a322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:06:43 2021 +0100 mountmgr: Add some helpers to abstract the Unix calls from device.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 3 +- dlls/mountmgr.sys/device.c | 378 +++++++----------------------------------- dlls/mountmgr.sys/unixlib.c | 279 +++++++++++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 30 ++++ 4 files changed, 370 insertions(+), 320 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c587c50990061dfe6e9…

1 0

Alexandre Julliard : mountmgr: Pass the SCSI device information when creating a volume.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 88cde9e71727c36244369e4076ff5b07025b2262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88cde9e71727c36244369e40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 12:29:00 2021 +0100 mountmgr: Pass the SCSI device information when creating a volume. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 4 +-- dlls/mountmgr.sys/device.c | 75 ++++++++++---------------------------------- dlls/mountmgr.sys/diskarb.c | 48 ++++++++++++++-------------- dlls/mountmgr.sys/mountmgr.h | 38 +++++++++++++--------- 4 files changed, 65 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88cde9e71727c3624436…

1 0

Alexandre Julliard : mountmgr: Remove the obsolete libhal support.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 37b7259f0764aaf5cee67762655af2a700142f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b7259f0764aaf5cee67762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 11:21:14 2021 +0100 mountmgr: Remove the obsolete libhal support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 116 --------------- configure.ac | 13 -- dlls/mountmgr.sys/dbus.c | 364 +---------------------------------------------- include/config.h.in | 3 - 4 files changed, 1 insertion(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37b7259f0764aaf5cee6…

1 0

Alexandre Julliard : mountmgr: Pass a Unix interface name in the dhcp_request_params ioctl.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: dbe3269c9d97f59d2b4a17a8cb3a33de92bedc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe3269c9d97f59d2b4a17a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 11:07:37 2021 +0100 mountmgr: Pass a Unix interface name in the dhcp_request_params ioctl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/dhcpcsvc.c | 21 ++++++++++++++++++--- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/dbus.c | 28 +++++++--------------------- dlls/mountmgr.sys/diskarb.c | 25 +++++++------------------ dlls/mountmgr.sys/mountmgr.c | 21 +++++++++------------ dlls/mountmgr.sys/mountmgr.h | 4 ++-- include/ddk/mountmgr.h | 2 +- 7 files changed, 45 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbe3269c9d97f59d2b4a…

1 0

Michael Stefaniuc : dmloader: Drop ifdef'ed out dead code.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 5e42498e634abda051aa59a3faeb2cf10469b1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e42498e634abda051aa59a3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 24 19:23:16 2021 +0100 dmloader: Drop ifdef'ed out dead code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b90584b09a0..00170f42937 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -538,13 +538,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac return DMUS_E_LOADER_FAILEDOPEN; } - /* *sigh*... some ms objects have lousy implementation of ParseDescriptor that clears input descriptor :( */ -#ifdef NOW_WE_ARE_FREE - /* parse descriptor: we actually use input descriptor; fields that aren't available from stream remain, - otherwise real info is set */ - IDirectMusicObject_ParseDescriptor (pObject, pStream, pDesc); -#endif - /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { IStream_Release(pStream);

1 0

Daniel Lehman : mscms: Fix uninitialized variable warning.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: daa0e3019f8ac2f15ed23c64287e35385716d0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa0e3019f8ac2f15ed23c64… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 09:57:08 2021 -0800 mscms: Fix uninitialized variable warning. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 523476269f1..83bfcb50143 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1125,7 +1125,6 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese */ BOOL WINAPI IsColorProfileValid( HPROFILE handle, PBOOL valid ) { - BOOL ret; struct profile *profile = grab_profile( handle ); TRACE( "( %p, %p )\n", handle, valid ); @@ -1137,9 +1136,9 @@ BOOL WINAPI IsColorProfileValid( HPROFILE handle, PBOOL valid ) release_profile( profile ); return FALSE; } - if (profile->data) ret = *valid = TRUE; + *valid = !!profile->data; release_profile( profile ); - return ret; + return *valid; } /******************************************************************************

1 0

Hugh McMaster : chcp: Add a help string.
by Alexandre Julliard 24 Nov '21

24 Nov '21

1 0

Hugh McMaster : chcp: Print the active code page after successfully setting the new one.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: ec2f579c7133f092b19c4baa3b67c2ec66107ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2f579c7133f092b19c4baa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 23 23:41:39 2021 +1100 chcp: Print the active code page after successfully setting the new one. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 5b3486a4366..cc64e044b06 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -102,10 +102,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int codepage = _wtoi(argv[1]); int success = SetConsoleCP(codepage) && SetConsoleOutputCP(codepage); - if (!success) - { + if (success) + output_message(STRING_ACTIVE_CODE_PAGE, codepage); + else output_message(STRING_INVALID_CODE_PAGE); - } + return !success; }

1 0

Hugh McMaster : chcp: Add internationalization support.
by Alexandre Julliard 24 Nov '21

24 Nov '21

1 0

Rémi Bernon : dinput: Stub HID joystick GetEffectStatus implementation.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 2ca15c8dc8754016a46b9884f083c2030b5417f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca15c8dc8754016a46b9884… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 24 16:09:42 2021 +0100 dinput: Stub HID joystick GetEffectStatus implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 17 +++++++++++++++-- dlls/dinput8/tests/hid.c | 14 -------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 971e775867f..06be759b685 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2707,11 +2707,24 @@ static HRESULT WINAPI hid_joystick_effect_Stop( IDirectInputEffect *iface ) static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *iface, DWORD *status ) { - FIXME( "iface %p, status %p stub!\n", iface, status ); + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + HRESULT hr; + + FIXME( "iface %p, status %p semi-stub!\n", iface, status ); if (!status) return E_POINTER; + *status = 0; - return DIERR_UNSUPPORTED; + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if (!impl->index) + hr = DIERR_NOTDOWNLOADED; + else + hr = DI_OK; + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static void set_parameter_value( struct hid_joystick_effect *impl, char *report_buf, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index bda738bc178..a8ea8eaea9f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8873,9 +8873,7 @@ static void test_device_managed_effect(void) ok( hr == E_POINTER, "GetEffectStatus returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); flags = DIEP_ALLPARAMS; @@ -8888,7 +8886,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, NULL, 0 ); hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetEffectStatus returned %#x\n", hr ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); @@ -8898,9 +8895,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); @@ -8919,9 +8914,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; @@ -8946,7 +8939,6 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8956,7 +8948,6 @@ static void test_device_managed_effect(void) ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8974,7 +8965,6 @@ static void test_device_managed_effect(void) ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8994,9 +8984,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; @@ -9014,9 +9002,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
96
Older →

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 November 2021