From 96325cabedb4c7d2629f68377e850a1fe99ce6c6 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 14 Apr 2015 19:11:31 +0200 Subject: [PATCH] Removed patch to increase wineconsole commandline buffer size (fixed upstream). --- README.md | 2 +- debian/changelog | 1 + patches/patchinstall.sh | 19 -------------- ...ease-buffer-to-allow-larger-commandl.patch | 25 ------------------- patches/wineconsole-Buffer_Size/definition | 1 - 5 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch delete mode 100644 patches/wineconsole-Buffer_Size/definition diff --git a/README.md b/README.md index 67829a3e..8fd54291 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ for more details.* * Improve stubs for AEV_{Get,Set}MasterVolumeLevel * Improve stubs for AEV_{Get,Set}Mute * Improvement for heap allocation performance -* Increase wineconsole commandline buffer size ([Wine Bug #34814](https://bugs.winehq.org/show_bug.cgi?id=34814)) +* ~~Increase wineconsole commandline buffer size~~ ([Wine Bug #34814](https://bugs.winehq.org/show_bug.cgi?id=34814)) * ~~Invalidate key state cache globally after calling LL hooks~~ ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871)) * Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983)) * Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486)) diff --git a/debian/changelog b/debian/changelog index edc7dcc6..aeb5495c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ wine-staging (1.7.41) UNRELEASED; urgency=low * Removed patchset to invalidate the key state cache after calling LL hooks (accepted upstream). * Removed patches for PowerRequest stub functions (accepted upstream). * Removed patch to fix compatibility with gnutls28 (accepted upstream). + * Removed patch to increase wineconsole commandline buffer size (fixed upstream). -- Sebastian Lackner Sun, 05 Apr 2015 03:11:58 +0200 wine-staging (1.7.40) unstable; urgency=low diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 99231d66..d447642c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -221,7 +221,6 @@ patch_enable_all () enable_winecfg_Libraries="$1" enable_winecfg_Staging="$1" enable_winecfg_Unmounted_Devices="$1" - enable_wineconsole_Buffer_Size="$1" enable_wined3d_CSMT_Helper="$1" enable_wined3d_CSMT_Main="$1" enable_wined3d_DXTn="$1" @@ -732,9 +731,6 @@ patch_enable () winecfg-Unmounted_Devices) enable_winecfg_Unmounted_Devices="$2" ;; - wineconsole-Buffer_Size) - enable_wineconsole_Buffer_Size="$2" - ;; wined3d-CSMT_Helper) enable_wined3d_CSMT_Helper="$2" ;; @@ -4522,21 +4518,6 @@ if test "$enable_winecfg_Unmounted_Devices" -eq 1; then ) >> "$patchlist" fi -# Patchset wineconsole-Buffer_Size -# | -# | This patchset fixes the following Wine bugs: -# | * [#34814] Increase wineconsole commandline buffer size -# | -# | Modified files: -# | * programs/wineconsole/wineconsole.c -# | -if test "$enable_wineconsole_Buffer_Size" -eq 1; then - patch_apply wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch - ( - echo '+ { "Sebastian Lackner", "wineconsole: Increase buffer to allow larger commandline strings.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winedevice-Fix_Relocation # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch b/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch deleted file mode 100644 index 27f637e7..00000000 --- a/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a98938b7cea50114a55f24e608581dc27eac9cab Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Wed, 4 Mar 2015 21:16:58 +0100 -Subject: wineconsole: Increase buffer to allow larger commandline strings. - ---- - programs/wineconsole/wineconsole.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c -index 3c2faf5..038b360 100644 ---- a/programs/wineconsole/wineconsole.c -+++ b/programs/wineconsole/wineconsole.c -@@ -830,7 +830,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh - break; - case from_process_name: - { -- WCHAR buffer[256]; -+ static WCHAR buffer[4096]; - - MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, sizeof(buffer) / sizeof(buffer[0])); - --- -2.3.0 - diff --git a/patches/wineconsole-Buffer_Size/definition b/patches/wineconsole-Buffer_Size/definition deleted file mode 100644 index 7507537e..00000000 --- a/patches/wineconsole-Buffer_Size/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [34814] Increase wineconsole commandline buffer size