winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2022
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
726 discussions
Start a n
N
ew thread
Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 529e4154a34a5a774fe7036552ffbb060740da90 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=529e4154a34a5a774fe70365…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 3 22:29:17 2022 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 398 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 196 insertions(+), 202 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=529e4154a34a5a774fe7…
1
0
0
0
Jacek Caban : msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 907859d7cb8852a914b18251db2aae9449bece54 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=907859d7cb8852a914b18251…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 18:58:45 2022 +0100 msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52292
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_gccmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/crt_gccmain.c b/dlls/msvcrt/crt_gccmain.c index ed25f385d1b..88ca2874732 100644 --- a/dlls/msvcrt/crt_gccmain.c +++ b/dlls/msvcrt/crt_gccmain.c @@ -22,7 +22,7 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ +#ifdef __WINE_PE_BUILD /* mingw compilers emit call to __main() when main() function is defined. * it's used by crt to call global constructors and register global destructors. */
1
0
0
0
Alex Henrie : wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity).
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: adc3492107467d0877342ca084b8b6f64c623c9e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=adc3492107467d0877342ca0…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 21:04:02 2021 -0700 wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close;
1
0
0
0
Alexandre Julliard : ntdll: Support debugger attach from a 64-bit process to a 32-bit process.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: e16ccaf05d845ea490d845d896cb284b5b00aa87 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e16ccaf05d845ea490d845d8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 17:32:39 2022 +0100 ntdll: Support debugger attach from a 64-bit process to a 32-bit process. This is needed until 64-bit ntdll can be mapped in all processes. Partial revert of 8dc6987ba5c3fdaa5baea8b00a860f62a3716c08. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52157
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 10 ++++++++++ dlls/ntdll/tests/wow64.c | 2 -- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/server.c | 4 ++++ dlls/ntdll/unix/unix_private.h | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 82b8daa47af..7b36c988e81 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -558,6 +558,16 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, DbgUiRemoteBreakin, NULL, 0, 0, 0, 0, NULL ); +#ifdef _WIN64 + /* FIXME: hack for debugging 32-bit wow64 process without a 64-bit ntdll */ + if (status == STATUS_INVALID_PARAMETER) + { + ULONG_PTR wow; + if (!NtQueryInformationProcess( process, ProcessWow64Information, &wow, sizeof(wow), NULL ) && wow) + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, + (void *)0x7ffe1000, NULL, 0, 0, 0, 0, NULL ); + } +#endif if (!status) NtClose( handle ); return status; } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index efe51dd507b..f5d7b08cac3 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -39,7 +39,6 @@ static NTSTATUS (WINAPI *pNtWow64ReadVirtualMemory64)(HANDLE,ULONG64,void*,ULONG static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void *,ULONG64,ULONG64*); #endif -static BOOL is_win64 = (sizeof(void *) > sizeof(int)); static BOOL is_wow64; static void *code_mem; @@ -329,7 +328,6 @@ static void test_peb_teb(void) } ret = DebugActiveProcess( pi.dwProcessId ); - todo_wine_if( is_win64 ) ok( ret, "debugging failed\n" ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; ok( res == sizeof(peb), "wrong len %lx\n", res ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 10884a7a673..96301b1654e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -106,6 +106,7 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif +void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -1046,6 +1047,7 @@ static void load_ntdll_functions( HMODULE module ) if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) + GET_FUNC( DbgUiRemoteBreakin ); GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 6a3224d8385..9d0594d3374 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -534,6 +534,10 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { +#ifndef _WIN64 + /* FIXME: hack for debugging 32-bit process without a 64-bit ntdll */ + if (is_wow64 && func == (void *)0x7ffe1000) func = pDbgUiRemoteBreakin; +#endif attr->TotalLength = sizeof(buffer); attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; attr->Attributes[0].Size = sizeof(id); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 42b03cab8f6..a79edabc37c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,6 +92,7 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ +extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN;
1
0
0
0
Alexandre Julliard : server: Don't return image information for terminating processes.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 14645b06a79f726965ae11d17db69a9521de6a2d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=14645b06a79f726965ae11d1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 16:59:50 2022 +0100 server: Don't return image information for terminating processes. Fixes a test failure caused by 8eacd3e50792925cbd209f8a1940f3e96b725137. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index bcb66271771..58ae97cdb2f 100644 --- a/server/process.c +++ b/server/process.c @@ -1503,7 +1503,10 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + { + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + } release_object( process ); } }
1
0
0
0
Eric Pouech : po: Some more French translations.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 39f77b25aacf248e18e747bf31c2055a9cfbc89a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=39f77b25aacf248e18e747bf…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 3 15:43:21 2022 +0100 po: Some more French translations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 160 +++++++++++++++++++++++---------------------------------------- 1 file changed, 58 insertions(+), 102 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=39f77b25aacf248e18e7…
1
0
0
0
Rémi Bernon : dinput/tests: Remove verbose and redundant tests.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 6ac7d042f7c301c822cca740a9f4011c741ad659 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6ac7d042f7c301c822cca740…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:36 2022 +0100 dinput/tests: Remove verbose and redundant tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f1fd4be36e5..e986bf2d1cb 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2170,15 +2170,9 @@ static BOOL test_device_types( DWORD version ) hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst[i], "%d", dwSize ); - todo_wine - check_member_guid( devinst, expect_devinst[i], guidInstance ); check_member_guid( devinst, expect_devinst[i], guidProduct ); todo_wine_if( version <= 0x700 && i == 3 ) check_member( devinst, expect_devinst[i], "%#x", dwDevType ); - todo_wine - check_member_wstr( devinst, expect_devinst[i], tszInstanceName ); - todo_wine - check_member_wstr( devinst, expect_devinst[i], tszProductName ); check_member_guid( devinst, expect_devinst[i], guidFFDriver ); check_member( devinst, expect_devinst[i], "%04x", wUsagePage ); check_member( devinst, expect_devinst[i], "%04x", wUsage );
1
0
0
0
Rémi Bernon : dinput/tests: Split joystick tests into separate sources.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: 4c4dedb941c14af1a523a63d71b065ff4458cfaa URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4c4dedb941c14af1a523a63d…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:35 2022 +0100 dinput/tests: Split joystick tests into separate sources. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 2 + dlls/dinput/tests/dinput_test.h | 100 + dlls/dinput/tests/driver_hid.c | 1 + dlls/dinput/tests/driver_hid.h | 2 - dlls/dinput/tests/force_feedback.c | 4337 +++++++++++++++++++++++ dlls/dinput/tests/hid.c | 6761 +----------------------------------- dlls/dinput/tests/joystick8.c | 2594 ++++++++++++++ 7 files changed, 7122 insertions(+), 6675 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c4dedb941c14af1a523…
1
0
0
0
Rémi Bernon : dinput/tests: Move tests from dinput8/tests.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: d22746fe09da29e9d71ee304fd19a59065437ea9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d22746fe09da29e9d71ee304…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 3 14:43:34 2022 +0100 dinput/tests: Move tests from dinput8/tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/dinput/tests/Makefile.in | 12 ++++++++++-- dlls/{dinput8/tests/device.c => dinput/tests/device8.c} | 2 +- dlls/dinput/tests/dinput.c | 4 +++- dlls/{dinput8/tests/dinput.c => dinput/tests/dinput8.c} | 5 ++--- dlls/{dinput8 => dinput}/tests/driver_hid.c | 0 dlls/{dinput8 => dinput}/tests/driver_hid.h | 0 dlls/{dinput8 => dinput}/tests/driver_hid.spec | 0 dlls/{dinput8 => dinput}/tests/hid.c | 0 dlls/{dinput8 => dinput}/tests/pop_hid_macros.h | 0 dlls/{dinput8 => dinput}/tests/psh_hid_macros.h | 0 dlls/dinput8/tests/Makefile.in | 12 ------------ 13 files changed, 16 insertions(+), 21 deletions(-) diff --git a/configure b/configure index d05938409a5..5c3536900d1 100755 --- a/configure +++ b/configure @@ -21820,7 +21820,6 @@ wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 -wine_fn_config_makefile dlls/dinput8/tests enable_tests wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation wine_fn_config_makefile dlls/directmanipulation/tests enable_tests wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 9b2c111119f..ddd45b8c241 100644 --- a/configure.ac +++ b/configure.ac @@ -2743,7 +2743,6 @@ WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) -WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 858c2cdae7a..87a4dad2708 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,9 +1,17 @@ TESTDLL = dinput.dll -IMPORTS = dinput ole32 version user32 +IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -C_SRCS = \ +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native + +SOURCES = \ device.c \ + device8.c \ dinput.c \ + dinput8.c \ + driver_hid.c \ + driver_hid.spec \ + hid.c \ joystick.c \ keyboard.c \ mouse.c diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput/tests/device8.c similarity index 99% rename from dlls/dinput8/tests/device.c rename to dlls/dinput/tests/device8.c index 8b34de276db..817e843e33c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput/tests/device8.c @@ -1836,7 +1836,7 @@ static void test_keyboard_info(void) ok( ref == 0, "Release returned %d\n", ref ); } -START_TEST(device) +START_TEST(device8) { instance = GetModuleHandleW( NULL ); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c7fa0b76397..10da888fdd4 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -19,8 +19,10 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#include <initguid.h> #include <windows.h> +#include "objbase.h" + +#include <initguid.h> #include <dinput.h> #include <dinputd.h> diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput/tests/dinput8.c similarity index 99% rename from dlls/dinput8/tests/dinput.c rename to dlls/dinput/tests/dinput8.c index 3e2e4fbb371..81aeb8191f6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput/tests/dinput8.c @@ -22,13 +22,12 @@ #include <windows.h> #include <objidl.h> -#include <initguid.h> #include <dinput.h> #include <dinputd.h> #include "wine/test.h" -HINSTANCE hInstance; +static HINSTANCE hInstance; static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { @@ -711,7 +710,7 @@ static void test_Initialize(void) IDirectInput8_Release(pDI); } -START_TEST(dinput) +START_TEST(dinput8) { hInstance = GetModuleHandleA(NULL); diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c similarity index 100% rename from dlls/dinput8/tests/driver_hid.c rename to dlls/dinput/tests/driver_hid.c diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h similarity index 100% rename from dlls/dinput8/tests/driver_hid.h rename to dlls/dinput/tests/driver_hid.h diff --git a/dlls/dinput8/tests/driver_hid.spec b/dlls/dinput/tests/driver_hid.spec similarity index 100% rename from dlls/dinput8/tests/driver_hid.spec rename to dlls/dinput/tests/driver_hid.spec diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput/tests/hid.c similarity index 100% rename from dlls/dinput8/tests/hid.c rename to dlls/dinput/tests/hid.c diff --git a/dlls/dinput8/tests/pop_hid_macros.h b/dlls/dinput/tests/pop_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/pop_hid_macros.h rename to dlls/dinput/tests/pop_hid_macros.h diff --git a/dlls/dinput8/tests/psh_hid_macros.h b/dlls/dinput/tests/psh_hid_macros.h similarity index 100% rename from dlls/dinput8/tests/psh_hid_macros.h rename to dlls/dinput/tests/psh_hid_macros.h diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in deleted file mode 100644 index 336dbd500ba..00000000000 --- a/dlls/dinput8/tests/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -TESTDLL = dinput8.dll -IMPORTS = dinput8 dinput ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust winmm - -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native - -SOURCES = \ - device.c \ - dinput.c \ - driver_hid.c \ - driver_hid.spec \ - hid.c
1
0
0
0
Paul Gofman : ddraw/tests: Port tests for fullscreen window size reset from d3d9.
by Alexandre Julliard
03 Jan '22
03 Jan '22
Module: wine Branch: master Commit: c52f7de2486f4d02fd18057e1ccfad4bb794f7ac URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c52f7de2486f4d02fd18057e…
Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 29 14:01:07 2021 +0300 ddraw/tests: Port tests for fullscreen window size reset from d3d9. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 156 insertions(+), 4 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c52f7de2486f4d02fd18…
1
0
0
0
← Newer
1
...
68
69
70
71
72
73
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
Results per page:
10
25
50
100
200