Removed patch to increase MAX_WINPROCS (fixed upstream).

This commit is contained in:
Sebastian Lackner 2016-04-21 19:14:43 +02:00
parent ab065dcd70
commit a1979756c6
3 changed files with 0 additions and 64 deletions

View File

@ -334,7 +334,6 @@ patch_enable_all ()
enable_user32_Refresh_MDI_Menus="$1"
enable_user32_ScrollWindowEx="$1"
enable_user32_SetCoalescableTimer="$1"
enable_user32_WndProc="$1"
enable_user32_lpCreateParams="$1"
enable_uxtheme_GTK_Theming="$1"
enable_version_GetFileVersionInfoSizeExW="$1"
@ -1176,9 +1175,6 @@ patch_enable ()
user32-SetCoalescableTimer)
enable_user32_SetCoalescableTimer="$2"
;;
user32-WndProc)
enable_user32_WndProc="$2"
;;
user32-lpCreateParams)
enable_user32_lpCreateParams="$2"
;;
@ -1865,9 +1861,6 @@ if test "$enable_category_stable" -eq 1; then
if test "$enable_user32_DrawTextExW" -gt 1; then
abort "Patchset user32-DrawTextExW disabled, but category-stable depends on that."
fi
if test "$enable_user32_WndProc" -gt 1; then
abort "Patchset user32-WndProc disabled, but category-stable depends on that."
fi
if test "$enable_wine_inf_Performance" -gt 1; then
abort "Patchset wine.inf-Performance disabled, but category-stable depends on that."
fi
@ -1956,7 +1949,6 @@ if test "$enable_category_stable" -eq 1; then
enable_shell32_RunDLL_CallEntry16=1
enable_shell32_SHFileOperation_Win9x=1
enable_user32_DrawTextExW=1
enable_user32_WndProc=1
enable_wine_inf_Performance=1
enable_wine_inf_ProfileList_UserSID=1
enable_wineboot_HKEY_DYN_DATA=1
@ -6862,21 +6854,6 @@ if test "$enable_user32_SetCoalescableTimer" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-WndProc
# |
# | This patchset fixes the following Wine bugs:
# | * [#32451] Fix for programs leaking wndproc slots
# |
# | Modified files:
# | * dlls/user.exe16/message.c, dlls/user32/winproc.c
# |
if test "$enable_user32_WndProc" -eq 1; then
patch_apply user32-WndProc/0001-user32-Increase-MAX_WINPROCS-to-16384.patch
(
echo '+ { "Sebastian Lackner", "user32: Increase MAX_WINPROCS to 16384.", 2 },';
) >> "$patchlist"
fi
# Patchset uxtheme-GTK_Theming
# |
# | This patchset has the following (direct or indirect) dependencies:

View File

@ -1,39 +0,0 @@
From f45183ad9d9ac42023f1222a58c1ebb45f0b6ba6 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 8 Aug 2014 23:40:58 +0200
Subject: user32: Increase MAX_WINPROCS to 16384. (try 2)
---
dlls/user.exe16/message.c | 2 +-
dlls/user32/winproc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index 935b025..965da59 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -108,7 +108,7 @@ typedef struct
#include "poppack.h"
#define WINPROC_HANDLE (~0u >> 16)
-#define MAX_WINPROCS32 4096
+#define MAX_WINPROCS32 16384
#define MAX_WINPROCS16 1024
static WNDPROC16 winproc16_array[MAX_WINPROCS16];
diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index 3642109..828729b 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -45,7 +45,7 @@ typedef struct tagWINDOWPROC
WNDPROC procW; /* Unicode window proc */
} WINDOWPROC;
-#define MAX_WINPROCS 4096
+#define MAX_WINPROCS 16384
#define MAX_WINPROC_RECURSION 64
#define WINPROC_PROC16 ((WINDOWPROC *)1) /* placeholder for 16-bit window procs */
--
2.1.3

View File

@ -1,2 +0,0 @@
Fixes: [32451] Fix for programs leaking wndproc slots
Category: stable