diff --git a/README.md b/README.md index 18412450..3caaed61 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ for more details.* * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995)) * Allow to cancel a file operation via progress callback ([Wine Bug #22690](https://bugs.winehq.org/show_bug.cgi?id=22690)) * Allow to edit winecfg library override by double clicking -* Allow to enable/disable InsertMode in wineconsole settings ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697)) +* ~~Allow to enable/disable InsertMode in wineconsole settings~~ ([Wine Bug #38697](https://bugs.winehq.org/show_bug.cgi?id=38697)) * Allow to open files/directories without any access rights in order to query attributes * Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652)) * Allow to set pixel format for desktop window @@ -221,7 +221,7 @@ for more details.* * Revert patch causing crash in IrfanView when using the WebP plugin ([Wine Bug #38895](https://bugs.winehq.org/show_bug.cgi?id=38895)) * SO_CONNECT_TIME returns the appropriate time * Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559)) -* SecuROM 5.x media validation fails ([Wine Bug #21448](https://bugs.winehq.org/show_bug.cgi?id=21448)) +* ~~SecuROM 5.x media validation fails~~ ([Wine Bug #21448](https://bugs.winehq.org/show_bug.cgi?id=21448)) * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652)) * Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile * Show unmounted devices in winecfg and allow changing the unix path diff --git a/debian/changelog b/debian/changelog index 2d7fbbe4..3f2e632b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ wine-staging (1.7.48) UNRELEASED; urgency=low * Added patch to forward exitcode from child process when in wineconsole. + * Removed patch to allow to enable/disable InsertMode in wineconsole settings + (accepted upstream). + * Removed patch to improve IoGetDeviceObjectPointer stub to appease SecuROM + 5.x (accepted upstream). -- Sebastian Lackner Mon, 13 Jul 2015 02:29:48 +0200 wine-staging (1.7.47) unstable; urgency=low diff --git a/patches/dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch b/patches/dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch deleted file mode 100644 index 28c9e2b1..00000000 --- a/patches/dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ef42bee07f37038aa690ddf8c164c7fff8512a25 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 12 Jul 2015 03:36:20 +0200 -Subject: dwrite: Avoid dereferencing NULL pointer for fonts without VDMX. - ---- - dlls/dwrite/opentype.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c -index 63e1b74..8d90c04 100644 ---- a/dlls/dwrite/opentype.c -+++ b/dlls/dwrite/opentype.c -@@ -1347,7 +1347,7 @@ static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) - BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 *descent) - { - const struct VDMX_Header *hdr = (const struct VDMX_Header*)data; -- const struct VDMX_group *group = find_vdmx_group(hdr); -+ const struct VDMX_group *group; - const struct VDMX_vTable *tables; - WORD recs, i; - --- -2.4.5 - diff --git a/patches/ntdll-Coverity/0001-ntdll-Fix-incorrect-assignment-in-assert-statement-C.patch b/patches/ntdll-Coverity/0001-ntdll-Fix-incorrect-assignment-in-assert-statement-C.patch deleted file mode 100644 index 1b533a80..00000000 --- a/patches/ntdll-Coverity/0001-ntdll-Fix-incorrect-assignment-in-assert-statement-C.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ffe94b77e7f50263d8e3ae5f3466a757f9d9d4e Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 11 Jul 2015 15:28:27 +0200 -Subject: ntdll: Fix incorrect assignment in assert statement (Coverity). - ---- - dlls/ntdll/threadpool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c -index a4e0619..23091f3 100644 ---- a/dlls/ntdll/threadpool.c -+++ b/dlls/ntdll/threadpool.c -@@ -1598,7 +1598,7 @@ static NTSTATUS tp_waitqueue_lock( struct threadpool_object *wait ) - struct waitqueue_bucket *bucket; - NTSTATUS status; - HANDLE thread; -- assert( wait->type = TP_OBJECT_TYPE_WAIT ); -+ assert( wait->type == TP_OBJECT_TYPE_WAIT ); - - wait->u.wait.signaled = 0; - wait->u.wait.bucket = NULL; --- -2.4.5 - diff --git a/patches/ntoskrnl-Stubs/0018-ntoskrnl.exe-Improve-IoGetDeviceObjectPointer-stub-t.patch b/patches/ntoskrnl-Stubs/0018-ntoskrnl.exe-Improve-IoGetDeviceObjectPointer-stub-t.patch deleted file mode 100644 index 70f0a22f..00000000 --- a/patches/ntoskrnl-Stubs/0018-ntoskrnl.exe-Improve-IoGetDeviceObjectPointer-stub-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 61970080c0dc917618c2884ceeeb1ef664705292 Mon Sep 17 00:00:00 2001 -From: "Erich E. Hoover" -Date: Sun, 14 Jun 2015 18:58:20 -0600 -Subject: ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease - SecuROM 5.x. - ---- - dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 2051939..57352e4 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.c -+++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -884,10 +884,16 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, - */ - NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) - { -+ static DEVICE_OBJECT stub_device; -+ static DRIVER_OBJECT stub_driver; -+ - FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); - -+ stub_device.StackSize = 0x80; /* minimum value to appease SecuROM 5.x */ -+ stub_device.DriverObject = &stub_driver; -+ - *file = NULL; -- *device = NULL; -+ *device = &stub_device; - - return STATUS_SUCCESS; - } --- -2.4.3 - diff --git a/patches/ntoskrnl-Stubs/definition b/patches/ntoskrnl-Stubs/definition index ee79ad26..c46ffd29 100644 --- a/patches/ntoskrnl-Stubs/definition +++ b/patches/ntoskrnl-Stubs/definition @@ -11,4 +11,4 @@ Fixes: Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages Fixes: Implement ntoskrnl.KeInitializeMutex Fixes: [38103] Process Hacker 2.x needs ntoskrnl.ProbeForRead Fixes: Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine -Fixes: [21448] SecuROM 5.x media validation fails +# Fixes: [21448] SecuROM 5.x media validation fails diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f743192d..7c648084 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit 744f7b69bf4692265588e10650090ca2f5129ccd" + echo " commit c3dd56c99332c4ad9dbd095935d2c17c53463154" echo "" } @@ -112,7 +112,6 @@ patch_enable_all () enable_dinput_Events="$1" enable_dsound_EAX="$1" enable_dsound_Fast_Mixer="$1" - enable_dwrite_VDMX="$1" enable_dxgi_GetDesc="$1" enable_dxva2_Video_Decoder="$1" enable_fltmgr_Stub_SYS="$1" @@ -152,7 +151,6 @@ patch_enable_all () enable_ntdll_APC_Start_Process="$1" enable_ntdll_Activation_Context="$1" enable_ntdll_CLI_Images="$1" - enable_ntdll_Coverity="$1" enable_ntdll_DOS_Attributes="$1" enable_ntdll_DeviceType_Systemroot="$1" enable_ntdll_DllRedirects="$1" @@ -252,7 +250,6 @@ patch_enable_all () enable_winecfg_Staging="$1" enable_winecfg_Unmounted_Devices="$1" enable_wineconsole_Forward_Exitcode="$1" - enable_wineconsole_Insert_Mode="$1" enable_wined3d_Accounting="$1" enable_wined3d_CSMT_Helper="$1" enable_wined3d_CSMT_Main="$1" @@ -414,9 +411,6 @@ patch_enable () dsound-Fast_Mixer) enable_dsound_Fast_Mixer="$2" ;; - dwrite-VDMX) - enable_dwrite_VDMX="$2" - ;; dxgi-GetDesc) enable_dxgi_GetDesc="$2" ;; @@ -534,9 +528,6 @@ patch_enable () ntdll-CLI_Images) enable_ntdll_CLI_Images="$2" ;; - ntdll-Coverity) - enable_ntdll_Coverity="$2" - ;; ntdll-DOS_Attributes) enable_ntdll_DOS_Attributes="$2" ;; @@ -834,9 +825,6 @@ patch_enable () wineconsole-Forward_Exitcode) enable_wineconsole_Forward_Exitcode="$2" ;; - wineconsole-Insert_Mode) - enable_wineconsole_Insert_Mode="$2" - ;; wined3d-Accounting) enable_wined3d_Accounting="$2" ;; @@ -2584,18 +2572,6 @@ if test "$enable_dsound_EAX" -eq 1; then ) >> "$patchlist" fi -# Patchset dwrite-VDMX -# | -# | Modified files: -# | * dlls/dwrite/opentype.c -# | -if test "$enable_dwrite_VDMX" -eq 1; then - patch_apply dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch - ( - echo '+ { "Sebastian Lackner", "dwrite: Avoid dereferencing NULL pointer for fonts without VDMX.", 1 },'; - ) >> "$patchlist" -fi - # Patchset dxgi-GetDesc # | # | This patchset fixes the following Wine bugs: @@ -3333,18 +3309,6 @@ if test "$enable_ntdll_CLI_Images" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-Coverity -# | -# | Modified files: -# | * dlls/ntdll/threadpool.c -# | -if test "$enable_ntdll_Coverity" -eq 1; then - patch_apply ntdll-Coverity/0001-ntdll-Fix-incorrect-assignment-in-assert-statement-C.patch - ( - echo '+ { "Sebastian Lackner", "ntdll: Fix incorrect assignment in assert statement (Coverity).", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-DOS_Attributes # | # | This patchset fixes the following Wine bugs: @@ -3732,7 +3696,6 @@ fi # | # | This patchset fixes the following Wine bugs: # | * [#38103] Process Hacker 2.x needs ntoskrnl.ProbeForRead -# | * [#21448] SecuROM 5.x media validation fails # | # | Modified files: # | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h @@ -3755,7 +3718,6 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then patch_apply ntoskrnl-Stubs/0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch patch_apply ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch patch_apply ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch - patch_apply ntoskrnl-Stubs/0018-ntoskrnl.exe-Improve-IoGetDeviceObjectPointer-stub-t.patch ( echo '+ { "Austin English", "ntoskrnl.exe: add KeWaitForMultipleObjects stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.", 1 },'; @@ -3774,7 +3736,6 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then echo '+ { "Austin English", "ntoskrnl.exe: Add stub for ProbeForRead.", 1 },'; echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Add stub for ProbeForWrite.", 1 },'; echo '+ { "Michael Müller", "ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine.", 1 },'; - echo '+ { "Erich E. Hoover", "ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x.", 1 },'; ) >> "$patchlist" fi @@ -4868,26 +4829,6 @@ if test "$enable_wineconsole_Forward_Exitcode" -eq 1; then ) >> "$patchlist" fi -# Patchset wineconsole-Insert_Mode -# | -# | This patchset fixes the following Wine bugs: -# | * [#38697] Allow to enable/disable InsertMode in wineconsole settings -# | -# | Modified files: -# | * programs/wineconsole/dialog.c, programs/wineconsole/wineconsole.c, programs/wineconsole/wineconsole.rc, -# | programs/wineconsole/wineconsole_res.h -# | -if test "$enable_wineconsole_Insert_Mode" -eq 1; then - patch_apply wineconsole-Insert_Mode/0001-wineconsole-Rearrange-user-dialog-to-make-space-for-.patch - patch_apply wineconsole-Insert_Mode/0002-wineconsole-Improve-semantics-of-some-poorly-worded-.patch - patch_apply wineconsole-Insert_Mode/0003-wineconsole-Add-InsertMode-to-the-user-dialog.patch - ( - echo '+ { "Hugh McMaster", "wineconsole: Rearrange user dialog to make space for InsertMode checkbox.", 1 },'; - echo '+ { "Hugh McMaster", "wineconsole: Improve semantics of some poorly-worded resource strings.", 1 },'; - echo '+ { "Hugh McMaster", "wineconsole: Add InsertMode to the user dialog.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-Accounting # | # | Modified files: @@ -4916,18 +4857,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-wined3d_swapchain_present -# | -# | Modified files: -# | * dlls/wined3d/swapchain.c -# | -if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then - patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch - ( - echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-MESA_GPU_Info # | # | Modified files: @@ -5012,6 +4941,18 @@ if test "$enable_wined3d_resource_check_usage" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-wined3d_swapchain_present +# | +# | Modified files: +# | * dlls/wined3d/swapchain.c +# | +if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then + patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch + ( + echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch b/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch index 6d0b11a6..c4cba5d4 100644 --- a/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch +++ b/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch @@ -1,4 +1,4 @@ -From 94f11de5d7ea9594acdfb3d778d7abca7d2c3017 Mon Sep 17 00:00:00 2001 +From cb92c3e3611dd8d8d97992b79e1c9fc449ff2569 Mon Sep 17 00:00:00 2001 From: Daniel Jelinski Date: Sun, 8 Feb 2015 06:32:34 +0100 Subject: wine.inf: Add registry keys for Windows Performance Library. @@ -8,12 +8,12 @@ Subject: wine.inf: Add registry keys for Windows Performance Library. 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index a4548f2..d0548cb 100644 +index 315ef29..2de7e61 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -484,6 +484,10 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 - HKLM,%CurrentVersionNT%\Language Pack,,16 +@@ -492,6 +492,10 @@ HKLM,%CurrentVersionNT%\Language Pack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 + HKLM,%CurrentVersionNT%\OpenGLDrivers,,16 HKLM,%CurrentVersionNT%\Perflib,,16 +HKLM,%CurrentVersionNT%\Perflib,Last Counter,0x10003,1846 +HKLM,%CurrentVersionNT%\Perflib,Last Help,0x10003,1847 @@ -23,5 +23,5 @@ index a4548f2..d0548cb 100644 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 -- -2.2.2 +2.4.5 diff --git a/patches/wineconsole-Insert_Mode/0001-wineconsole-Rearrange-user-dialog-to-make-space-for-.patch b/patches/wineconsole-Insert_Mode/0001-wineconsole-Rearrange-user-dialog-to-make-space-for-.patch deleted file mode 100644 index 8045e25c..00000000 --- a/patches/wineconsole-Insert_Mode/0001-wineconsole-Rearrange-user-dialog-to-make-space-for-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f5b87201251c3fd2d10cc9208ade78d0a100d26a Mon Sep 17 00:00:00 2001 -From: Hugh McMaster -Date: Thu, 28 May 2015 21:29:24 +1000 -Subject: wineconsole: Rearrange user dialog to make space for InsertMode - checkbox - ---- - programs/wineconsole/wineconsole.rc | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc -index e4e0624..4dd06b7 100644 ---- a/programs/wineconsole/wineconsole.rc -+++ b/programs/wineconsole/wineconsole.rc -@@ -54,31 +54,31 @@ IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine comma - - END - --IDD_OPTION DIALOG 36, 24, 140, 105 -+IDD_OPTION DIALOG 36, 24, 140, 153 - STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU - CAPTION "Options" - FONT 8, "MS Shell Dlg" - { -- GROUPBOX "Cursor size", -1, 5, 5, 65, 56, BS_GROUPBOX -+ GROUPBOX "Cursor size", -1, 5, 5, 70, 54, BS_GROUPBOX - AUTORADIOBUTTON "&Small", IDC_OPT_CURSOR_SMALL, 9, 18, 50, 10, WS_TABSTOP - AUTORADIOBUTTON "&Medium", IDC_OPT_CURSOR_MEDIUM, 9, 30, 50, 10, WS_TABSTOP - AUTORADIOBUTTON "&Large", IDC_OPT_CURSOR_LARGE, 9, 42, 50, 10, WS_TABSTOP - -- GROUPBOX "Control", -1, 75, 5, 125, 56, BS_GROUPBOX -- LTEXT "Popup menu", -1, 79, 18, 50, 18 -- AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 138, 18, 60, 10, WS_TABSTOP -- AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 138, 30, 60, 10, WS_TABSTOP -- LTEXT "Quick edit", -1, 79, 42, 50, 18 -- AUTOCHECKBOX "&enable", IDC_OPT_QUICK_EDIT, 138, 42, 60, 10, WS_TABSTOP -+ GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX -+ AUTOCHECKBOX "&Quick edit", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP - -- GROUPBOX "Command history", -1, 5, 63, 195, 40, BS_GROUPBOX -- LTEXT "&Number of recalled commands:", -1, 9, 75, 78, 18 -- EDITTEXT IDC_OPT_HIST_SIZE, 87, 77, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER -+ GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX -+ AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP -+ AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 9, 86, 60, 10, WS_TABSTOP -+ -+ GROUPBOX "Command history", -1, 5, 105, 195, 42, BS_GROUPBOX -+ LTEXT "&Number of recalled commands:", -1, 9, 118, 110, 10 -+ EDITTEXT IDC_OPT_HIST_SIZE, 123, 117, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER - CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 -- AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 125, 75, 60, 18, WS_TABSTOP|BS_MULTILINE -+ AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE - } - --IDD_FONT DIALOG 36, 24, 140, 105 -+IDD_FONT DIALOG 36, 24, 140, 153 - STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU - CAPTION "Font" - FONT 8, "MS Shell Dlg" -@@ -94,7 +94,7 @@ FONT 8, "MS Shell Dlg" - LTEXT "", IDC_FNT_FONT_INFO, 128, 73, 80, 27 - } - --IDD_CONFIG DIALOG 36, 24, 140, 105 -+IDD_CONFIG DIALOG 36, 24, 140, 153 - STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU - CAPTION "Configuration" - FONT 8, "MS Shell Dlg" --- -2.4.1 - diff --git a/patches/wineconsole-Insert_Mode/0002-wineconsole-Improve-semantics-of-some-poorly-worded-.patch b/patches/wineconsole-Insert_Mode/0002-wineconsole-Improve-semantics-of-some-poorly-worded-.patch deleted file mode 100644 index 0a4bad11..00000000 --- a/patches/wineconsole-Insert_Mode/0002-wineconsole-Improve-semantics-of-some-poorly-worded-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c89f895ce2d7e5a29491bf658bdae0b53fbf0c08 Mon Sep 17 00:00:00 2001 -From: Hugh McMaster -Date: Thu, 28 May 2015 21:29:47 +1000 -Subject: wineconsole: Improve semantics of some poorly-worded resource strings - ---- - programs/wineconsole/wineconsole.rc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc -index 4dd06b7..4226ba3 100644 ---- a/programs/wineconsole/wineconsole.rc -+++ b/programs/wineconsole/wineconsole.rc -@@ -65,17 +65,17 @@ FONT 8, "MS Shell Dlg" - AUTORADIOBUTTON "&Large", IDC_OPT_CURSOR_LARGE, 9, 42, 50, 10, WS_TABSTOP - - GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX -- AUTOCHECKBOX "&Quick edit", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP -+ AUTOCHECKBOX "&QuickEdit mode", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP - - GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 9, 86, 60, 10, WS_TABSTOP - - GROUPBOX "Command history", -1, 5, 105, 195, 42, BS_GROUPBOX -- LTEXT "&Number of recalled commands:", -1, 9, 118, 110, 10 -+ LTEXT "&Number of stored commands:", -1, 9, 118, 110, 10 - EDITTEXT IDC_OPT_HIST_SIZE, 123, 117, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER - CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 -- AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE -+ AUTOCHECKBOX "&Remove duplicates", IDC_OPT_HIST_NODOUBLE, 9, 130, 80, 10, WS_TABSTOP|BS_MULTILINE - } - - IDD_FONT DIALOG 36, 24, 140, 153 --- -2.4.1 - diff --git a/patches/wineconsole-Insert_Mode/0003-wineconsole-Add-InsertMode-to-the-user-dialog.patch b/patches/wineconsole-Insert_Mode/0003-wineconsole-Add-InsertMode-to-the-user-dialog.patch deleted file mode 100644 index fa9525b9..00000000 --- a/patches/wineconsole-Insert_Mode/0003-wineconsole-Add-InsertMode-to-the-user-dialog.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 51f0cd8d176e8889b969ba9f02de67041c30b313 Mon Sep 17 00:00:00 2001 -From: Hugh McMaster -Date: Thu, 28 May 2015 21:53:55 +1000 -Subject: wineconsole: Add InsertMode to the user dialog - ---- - programs/wineconsole/dialog.c | 5 +++++ - programs/wineconsole/wineconsole.c | 32 +++++++++++++++++++++++++++++++- - programs/wineconsole/wineconsole.rc | 1 + - programs/wineconsole/wineconsole_res.h | 1 + - 4 files changed, 38 insertions(+), 1 deletion(-) - -diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c -index 8573d07..493990d 100644 ---- a/programs/wineconsole/dialog.c -+++ b/programs/wineconsole/dialog.c -@@ -76,6 +76,8 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L - SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, di->config.history_size, FALSE); - SendDlgItemMessageW(hDlg, IDC_OPT_HIST_NODOUBLE, BM_SETCHECK, - (di->config.history_nodup) ? BST_CHECKED : BST_UNCHECKED, 0); -+ SendDlgItemMessageW(hDlg, IDC_OPT_INSERT_MODE, BM_SETCHECK, -+ (di->config.insert_mode) ? BST_CHECKED : BST_UNCHECKED, 0); - SendDlgItemMessageW(hDlg, IDC_OPT_CONF_CTRL, BM_SETCHECK, - (di->config.menu_mask & MK_CONTROL) ? BST_CHECKED : BST_UNCHECKED, 0); - SendDlgItemMessageW(hDlg, IDC_OPT_CONF_SHIFT, BM_SETCHECK, -@@ -121,6 +123,9 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L - val = (IsDlgButtonChecked(hDlg, IDC_OPT_HIST_NODOUBLE) & BST_CHECKED) != 0; - di->config.history_nodup = val; - -+ val = (IsDlgButtonChecked(hDlg, IDC_OPT_INSERT_MODE) & BST_CHECKED) != 0; -+ di->config.insert_mode = val; -+ - val = 0; - if (IsDlgButtonChecked(hDlg, IDC_OPT_CONF_CTRL) & BST_CHECKED) val |= MK_CONTROL; - if (IsDlgButtonChecked(hDlg, IDC_OPT_CONF_SHIFT) & BST_CHECKED) val |= MK_SHIFT; -diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c -index ed5f816..b7a968c 100644 ---- a/programs/wineconsole/wineconsole.c -+++ b/programs/wineconsole/wineconsole.c -@@ -150,6 +150,25 @@ static BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode) - } - - /****************************************************************** -+ * WINECON_SetInsertMode -+ * -+ * -+ */ -+static void WINECON_SetInsertMode(HANDLE hConIn, int enable) -+{ -+ DWORD mode; -+ -+ if (GetConsoleMode( hConIn, &mode )) -+ { -+ if (enable) -+ mode |= ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS; -+ else -+ mode &= ~ENABLE_INSERT_MODE; -+ SetConsoleMode( hConIn, mode ); -+ } -+} -+ -+/****************************************************************** - * WINECON_GetConsoleTitle - * - * -@@ -397,6 +416,11 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf - data->curcfg.history_nodup = cfg->history_nodup; - WINECON_SetHistoryMode(data->hConIn, cfg->history_nodup); - } -+ if (data->curcfg.insert_mode != cfg->insert_mode) -+ { -+ data->curcfg.insert_mode = cfg->insert_mode; -+ WINECON_SetInsertMode(data->hConIn, cfg->insert_mode); -+ } - data->curcfg.menu_mask = cfg->menu_mask; - data->curcfg.quick_edit = cfg->quick_edit; - if (1 /* FIXME: font info has changed */) -@@ -533,7 +557,12 @@ static void WINECON_Delete(struct inner_data* data) - */ - static BOOL WINECON_GetServerConfig(struct inner_data* data) - { -- BOOL ret; -+ BOOL ret; -+ DWORD mode; -+ -+ if (!GetConsoleMode( data->hConIn, &mode )) mode = 0; -+ data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == -+ (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - - SERVER_START_REQ(get_console_input_info) - { -@@ -545,6 +574,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) - } - SERVER_END_REQ; - if (!ret) return FALSE; -+ - SERVER_START_REQ(get_console_output_info) - { - req->handle = wine_server_obj_handle( data->hConOut ); -diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc -index 4226ba3..a3afa1b 100644 ---- a/programs/wineconsole/wineconsole.rc -+++ b/programs/wineconsole/wineconsole.rc -@@ -66,6 +66,7 @@ FONT 8, "MS Shell Dlg" - - GROUPBOX "Console", -1, 80, 5, 120, 54, BS_GROUPBOX - AUTOCHECKBOX "&QuickEdit mode", IDC_OPT_QUICK_EDIT, 84, 18, 70, 10, WS_TABSTOP -+ AUTOCHECKBOX "&Insert mode", IDC_OPT_INSERT_MODE, 84, 30, 70, 10, WS_TABSTOP - - GROUPBOX "Popup menu", -1, 5, 61, 70, 42, BS_GROUPBOX - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 9, 74, 60, 10, WS_TABSTOP -diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h -index ac62b58..8261fd5 100644 ---- a/programs/wineconsole/wineconsole_res.h -+++ b/programs/wineconsole/wineconsole_res.h -@@ -70,6 +70,7 @@ - #define IDC_OPT_CONF_CTRL 0x0107 - #define IDC_OPT_CONF_SHIFT 0x0108 - #define IDC_OPT_QUICK_EDIT 0x0109 -+#define IDC_OPT_INSERT_MODE 0x0110 - - #define IDC_FNT_LIST_FONT 0x0201 - #define IDC_FNT_LIST_SIZE 0x0202 --- -2.4.1 - diff --git a/patches/wineconsole-Insert_Mode/definition b/patches/wineconsole-Insert_Mode/definition deleted file mode 100644 index 4670839a..00000000 --- a/patches/wineconsole-Insert_Mode/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [38697] Allow to enable/disable InsertMode in wineconsole settings diff --git a/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch b/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch index 5f74d719..152417c4 100644 --- a/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch +++ b/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch @@ -1,4 +1,4 @@ -From 10565101ae7063c68218c68487b8e57d044496ff Mon Sep 17 00:00:00 2001 +From cac0838d345702dec114c18ff6d38222b8bf5747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 6 Jun 2015 06:53:34 +0200 Subject: wined3d: Use real values for memory accounting on NVIDIA cards. @@ -46,7 +46,7 @@ index 56cf325..8f62570 100644 wine_dbgstr_longlong(device->adapter->vram_bytes), wine_dbgstr_longlong(device->adapter->vram_bytes_used), diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index eb749ea..c1eeaef 100644 +index 61c3059..97c7f36 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -220,6 +220,7 @@ static const struct wined3d_extension_map gl_extension_map[] = @@ -57,7 +57,7 @@ index eb749ea..c1eeaef 100644 /* SGI */ {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP }, -@@ -1391,7 +1392,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor +@@ -1392,7 +1393,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor return NULL; } @@ -67,7 +67,7 @@ index eb749ea..c1eeaef 100644 enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) { OSVERSIONINFOW os_version; -@@ -1500,6 +1502,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, +@@ -1501,6 +1503,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver = DRIVER_UNKNOWN; } @@ -84,8 +84,8 @@ index eb749ea..c1eeaef 100644 if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with 0x%s bytes.\n", -@@ -3652,7 +3664,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) - adapter->d3d_info.valid_rt_mask |= (1 << i); +@@ -3801,7 +3813,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) + } fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); - init_driver_info(driver_info, card_vendor, device); @@ -94,7 +94,7 @@ index eb749ea..c1eeaef 100644 return TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h -index 009dca6..2c400fa 100644 +index 8c07ed1..3007516 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -153,6 +153,7 @@ enum wined3d_gl_extension @@ -106,5 +106,5 @@ index 009dca6..2c400fa 100644 SGIS_GENERATE_MIPMAP, /* WGL extensions */ -- -2.4.2 +2.4.5 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index f634c197..29c0cc6c 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -1307,7 +1307,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { -@@ -1821,7 +1823,9 @@ +@@ -1830,7 +1832,9 @@ out: device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); @@ -1317,7 +1317,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries); -@@ -1856,7 +1860,9 @@ +@@ -1865,7 +1869,9 @@ device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); @@ -1327,7 +1327,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); device_context_remove(device, context); -@@ -2264,7 +2270,11 @@ +@@ -2273,7 +2279,11 @@ return TRUE; } @@ -1339,7 +1339,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c static void context_validate_onscreen_formats(struct wined3d_context *context, const struct wined3d_rendertarget_view *depth_stencil) { -@@ -2280,6 +2290,7 @@ +@@ -2289,6 +2299,7 @@ WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ @@ -1347,7 +1347,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c wined3d_resource_load_location(&context->current_rt->resource, context, WINED3D_LOCATION_TEXTURE_RGB); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); -@@ -2294,6 +2305,22 @@ +@@ -2303,6 +2314,22 @@ return context_generate_rt_mask_from_surface(rt); else return context_generate_rt_mask(context->offscreenBuffer); @@ -1370,7 +1370,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } /* Context activation is done by the caller. */ -@@ -2325,7 +2352,11 @@ +@@ -2334,7 +2361,11 @@ } else { @@ -1382,7 +1382,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; -@@ -2372,7 +2403,11 @@ +@@ -2381,7 +2412,11 @@ DWORD rt_mask = 0, *cur_mask; UINT i; @@ -1394,7 +1394,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c || rt_count != context->gl_info->limits.buffers) { if (!context_validate_rt_config(rt_count, rts, dsv)) -@@ -2414,11 +2449,17 @@ +@@ -2423,11 +2458,17 @@ } else { @@ -1412,7 +1412,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource))) -@@ -2431,7 +2472,11 @@ +@@ -2440,7 +2481,11 @@ } else { @@ -1424,7 +1424,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL); } -@@ -2466,6 +2511,7 @@ +@@ -2475,6 +2520,7 @@ return TRUE; } @@ -1432,7 +1432,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_rendertarget_view **rts = state->fb.render_targets; -@@ -2475,6 +2521,18 @@ +@@ -2484,6 +2530,18 @@ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])); @@ -1451,7 +1451,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c else if (!context->render_offscreen) return context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0])); -@@ -2497,8 +2555,14 @@ +@@ -2506,8 +2564,14 @@ /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -1466,7 +1466,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c DWORD *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) -@@ -2529,8 +2593,10 @@ +@@ -2538,8 +2602,10 @@ context_apply_draw_buffers(context, rt_mask); *cur_mask = rt_mask; } @@ -1477,7 +1477,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit) -@@ -2768,12 +2834,22 @@ +@@ -2777,12 +2843,22 @@ /* Context activation is done by the caller. */ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -1500,7 +1500,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); -@@ -2975,7 +3051,11 @@ +@@ -2984,7 +3060,11 @@ { if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo) { @@ -1512,7 +1512,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c context->use_immediate_mode_draw = TRUE; } else -@@ -3115,11 +3195,19 @@ +@@ -3124,11 +3204,19 @@ } /* Context activation is done by the caller. */ @@ -1532,7 +1532,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c unsigned int i, j; WORD map; -@@ -3151,12 +3239,17 @@ +@@ -3160,12 +3248,17 @@ for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) { if (map & 1) @@ -1550,7 +1550,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } if (state->index_buffer) { -@@ -3260,7 +3353,11 @@ +@@ -3269,7 +3362,11 @@ if (texture->texture_srgb.name) wined3d_texture_load(texture, context, TRUE); wined3d_texture_load(texture, context, FALSE); @@ -9614,7 +9614,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -5395,9 +5395,15 @@ +@@ -5478,9 +5478,15 @@ DebugBreak(); }