diff --git a/README.md b/README.md index ff2e30fc..9e8507bb 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,14 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [12]:** +**Bug fixes and features included in the next upcoming release [13]:** * Add shell32 placeholder icons to match offsets with Windows ([Wine Bug #30185](https://bugs.winehq.org/show_bug.cgi?id=30185)) * Add stub for iphlpapi.ConvertInterfaceLuidToGuid ([Wine Bug #38576](https://bugs.winehq.org/show_bug.cgi?id=38576)) * Add stubbed ISWbemSecurity interfaces in wbemdisp * Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #36704](https://bugs.winehq.org/show_bug.cgi?id=36704)) * Also handle '\r' as whitespace in wbemprox queries +* Also output winedbg system information to the terminal, not only to dialog * Assign a drive serial number during prefix creation/update ([Wine Bug #17823](https://bugs.winehq.org/show_bug.cgi?id=17823)) * Fix NULL pointer dereference in get_frame_by_name ([Wine Bug #34982](https://bugs.winehq.org/show_bug.cgi?id=34982)) * Fix crash in Gothic 1/2 with builtin directmusic caused by wrong return value ([Wine Bug #7425](https://bugs.winehq.org/show_bug.cgi?id=7425)) diff --git a/debian/changelog b/debian/changelog index 046ce0d4..a00e0189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ wine-staging (1.7.44) UNRELEASED; urgency=low * Added patch to fix NULL pointer dereference in get_frame_by_name. * Added patch to fix handling of opening a file with RootDirectory pointing to a file handle. + * Added patch to output winedbg system information also to the terminal, not + only to dialog. * Removed patch to reset device state in SysKeyboard*Impl_Acquire (accepted upstream). * Removed patch to avoid creating thread queues for foreign threads in diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 856ff7d6..73f5e78b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -261,6 +261,7 @@ patch_enable_all () enable_wined3d_UnhandledBlendFactor="$1" enable_wined3d_resource_check_usage="$1" enable_wined3d_wined3d_swapchain_present="$1" + enable_winedbg_SystemInfo="$1" enable_winedevice_Fix_Relocation="$1" enable_winemenubuilder_Desktop_Icon_Path="$1" enable_winepulse_PulseAudio_Support="$1" @@ -848,6 +849,9 @@ patch_enable () wined3d-wined3d_swapchain_present) enable_wined3d_wined3d_swapchain_present="$2" ;; + winedbg-SystemInfo) + enable_winedbg_SystemInfo="$2" + ;; winedevice-Fix_Relocation) enable_winedevice_Fix_Relocation="$2" ;; @@ -5399,6 +5403,18 @@ if test "$enable_wineconsole_Insert_Mode" -eq 1; then ) >> "$patchlist" fi +# Patchset winedbg-SystemInfo +# | +# | Modified files: +# | * programs/winedbg/tgt_active.c +# | +if test "$enable_winedbg_SystemInfo" -eq 1; then + patch_apply winedbg-SystemInfo/0001-winedbg-Also-output-system-information-to-the-termin.patch + ( + echo '+ { "Sebastian Lackner", "winedbg: Also output system information to the terminal, not only to dialog.", 1 },'; + ) >> "$patchlist" +fi + # Patchset winedevice-Fix_Relocation # | # | This patchset fixes the following Wine bugs: diff --git a/patches/winedbg-SystemInfo/0001-winedbg-Also-output-system-information-to-the-termin.patch b/patches/winedbg-SystemInfo/0001-winedbg-Also-output-system-information-to-the-termin.patch new file mode 100644 index 00000000..f60582da --- /dev/null +++ b/patches/winedbg-SystemInfo/0001-winedbg-Also-output-system-information-to-the-termin.patch @@ -0,0 +1,29 @@ +From 2fde182ba17d4ff0672f94038cb59ad1d4839867 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sat, 30 May 2015 01:25:47 +0200 +Subject: winedbg: Also output system information to the terminal, not only to + dialog. + +--- + programs/winedbg/tgt_active.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c +index 8cfce32..989e433 100644 +--- a/programs/winedbg/tgt_active.c ++++ b/programs/winedbg/tgt_active.c +@@ -836,10 +836,10 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) + + dbg_interactiveP = TRUE; + parser_handle(input); ++ output_system_info(); + + if (output != INVALID_HANDLE_VALUE) + { +- output_system_info(); + SetEvent( event ); + WaitForSingleObject( thread, INFINITE ); + CloseHandle( output ); +-- +2.4.2 + diff --git a/patches/winedbg-SystemInfo/definition b/patches/winedbg-SystemInfo/definition new file mode 100644 index 00000000..008115b2 --- /dev/null +++ b/patches/winedbg-SystemInfo/definition @@ -0,0 +1 @@ +Fixes: Also output winedbg system information to the terminal, not only to dialog