Rebase against 38f3d59ed694afba7913b4992d13cb044a09126c.

[user32-CharToOem]
Removed patch to properly handle invalid parameters in CharToOem* and
OemToChar* APIs (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-07-08 21:12:11 +02:00
parent 867c8334a1
commit 970dc74e89
9 changed files with 183 additions and 513 deletions

View File

@@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "94b6a885a880728f5e0a865fc17a82532723e756"
echo "38f3d59ed694afba7913b4992d13cb044a09126c"
}
# Show version information
@@ -322,7 +322,6 @@ patch_enable_all ()
enable_taskmgr_Memory_Usage="$1"
enable_user_exe16_CONTAINING_RECORD="$1"
enable_user_exe16_DlgDirList="$1"
enable_user32_CharToOem="$1"
enable_user32_DM_SETDEFID="$1"
enable_user32_DeferWindowPos="$1"
enable_user32_DialogBoxParam="$1"
@@ -1143,9 +1142,6 @@ patch_enable ()
user.exe16-DlgDirList)
enable_user_exe16_DlgDirList="$2"
;;
user32-CharToOem)
enable_user32_CharToOem="$2"
;;
user32-DM_SETDEFID)
enable_user32_DM_SETDEFID="$2"
;;
@@ -6639,21 +6635,6 @@ if test "$enable_user_exe16_DlgDirList" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-CharToOem
# |
# | This patchset fixes the following Wine bugs:
# | * [#21891] Properly handle invalid parameters in CharToOem* and OemToChar* APIs
# |
# | Modified files:
# | * dlls/user32/lstr.c, dlls/user32/tests/text.c
# |
if test "$enable_user32_CharToOem" -eq 1; then
patch_apply user32-CharToOem/0001-user32-Properly-handle-invalid-parameters-in-CharToO.patch
(
echo '+ { "Dmitry Timoshkov", "user32: Properly handle invalid parameters in CharToOem* and OemToChar* APIs.", 1 },';
) >> "$patchlist"
fi
# Patchset user32-DM_SETDEFID
# |
# | This patchset fixes the following Wine bugs: