wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to allow non-nullterminated string as working directory in kernel32.create_startup_info (fixes Wine Staging Bug #543).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-08-30 09:55:05 +02:00
parent a21372e977
commit 9d3f4bc8ce
5 changed files with 97 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -39,8 +39,9 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [5]:**
**Bug fixes and features included in the next upcoming release [6]:**
* Allow non-nullterminated string as working directory in kernel32.create_startup_info
* Fix access violation in MSYS2 git when cloning repository
* Fix error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
* Fix failure to create anonymous file mapping after failed open_fd server call

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ wine-staging (1.7.51) UNRELEASED; urgency=low
open_fd server call (fixes Wine Staging Bug #538).
* Added patch to fix error handling in DeferWindowPos when passing an invalid
HWND.
* Added patch to allow non-nullterminated string as working directory in
kernel32.create_startup_info (fixes Wine Staging Bug #543).
* Removed patch to fix bug in wineserver debug_children inheritance (accepted
upstream).
* Removed patch to use helper function for NtWaitForMultipleObjects and

76
patches/kernel32-Cwd_Startup_Info/0001-kernel32-Allow-non-nullterminated-string-as-working-.patch Normal file
View File

@ -0,0 +1,76 @@
From b47be04e640f03748edc8a5e6693c37df2a68d27 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 30 Aug 2015 08:38:30 +0200
Subject: kernel32: Allow non-nullterminated string as working directory in
create_startup_info.
---
dlls/kernel32/process.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index a40f124..6622fcb 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1629,7 +1629,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
const RTL_USER_PROCESS_PARAMETERS *cur_params;
const WCHAR *title;
startup_info_t *info;
- DWORD size;
+ DWORD size, cur_dir_length;
void *ptr;
UNICODE_STRING newdir;
WCHAR imagepath[MAX_PATH];
@@ -1643,24 +1643,27 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
cur_params = NtCurrentTeb()->Peb->ProcessParameters;
newdir.Buffer = NULL;
- if (cur_dir)
+ if (cur_dir && RtlDosPathNameToNtPathName_U( cur_dir, &newdir, NULL, NULL ))
{
- if (RtlDosPathNameToNtPathName_U( cur_dir, &newdir, NULL, NULL ))
- cur_dir = newdir.Buffer + 4; /* skip \??\ prefix */
- else
- cur_dir = NULL;
+ cur_dir = newdir.Buffer + 4; /* skip \??\ prefix */
+ cur_dir_length = newdir.Length - 4 * sizeof(WCHAR);
}
- if (!cur_dir)
+ else if (NtCurrentTeb()->Tib.SubSystemTib) /* FIXME: hack */
{
- if (NtCurrentTeb()->Tib.SubSystemTib) /* FIXME: hack */
- cur_dir = ((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath.Buffer;
- else
- cur_dir = cur_params->CurrentDirectory.DosPath.Buffer;
+ const UNICODE_STRING *dir = &((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath;
+ cur_dir = dir->Buffer;
+ cur_dir_length = dir->Length;
+ }
+ else
+ {
+ const UNICODE_STRING *dir = &cur_params->CurrentDirectory.DosPath;
+ cur_dir = dir->Buffer;
+ cur_dir_length = dir->Length;
}
title = startup->lpTitle ? startup->lpTitle : imagepath;
size = sizeof(*info);
- size += strlenW( cur_dir ) * sizeof(WCHAR);
+ size += cur_dir_length;
size += cur_params->DllPath.Length;
size += strlenW( imagepath ) * sizeof(WCHAR);
size += strlenW( cmdline ) * sizeof(WCHAR);
@@ -1717,7 +1720,9 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline,
info->show = startup->wShowWindow;
ptr = info + 1;
- info->curdir_len = append_string( &ptr, cur_dir );
+ info->curdir_len = cur_dir_length;
+ memcpy( ptr, cur_dir, cur_dir_length );
+ ptr = (char *)ptr + cur_dir_length;
info->dllpath_len = cur_params->DllPath.Length;
memcpy( ptr, cur_params->DllPath.Buffer, cur_params->DllPath.Length );
ptr = (char *)ptr + cur_params->DllPath.Length;
--
2.5.0

1
patches/kernel32-Cwd_Startup_Info/definition Normal file
View File

@ -0,0 +1 @@
Fixes: Allow non-nullterminated string as working directory in kernel32.create_startup_info

16
patches/patchinstall.sh
View File

@ -146,6 +146,7 @@ patch_enable_all ()
enable_iphlpapi_TCP_Table="$1"
enable_kernel32_CompareStringEx="$1"
enable_kernel32_CopyFileEx="$1"
enable_kernel32_Cwd_Startup_Info="$1"
enable_kernel32_GetFinalPathNameByHandle="$1"
enable_kernel32_GetLogicalProcessorInformationEx="$1"
enable_kernel32_LocaleNameToLCID="$1"
@ -519,6 +520,9 @@ patch_enable ()
kernel32-CopyFileEx)
enable_kernel32_CopyFileEx="$2"
;;
kernel32-Cwd_Startup_Info)
enable_kernel32_Cwd_Startup_Info="$2"
;;
kernel32-GetFinalPathNameByHandle)
enable_kernel32_GetFinalPathNameByHandle="$2"
;;
@ -3222,6 +3226,18 @@ if test "$enable_kernel32_CopyFileEx" -eq 1; then
) >> "$patchlist"
fi
# Patchset kernel32-Cwd_Startup_Info
# |
# | Modified files:
# | * dlls/kernel32/process.c
# |
if test "$enable_kernel32_Cwd_Startup_Info" -eq 1; then
patch_apply kernel32-Cwd_Startup_Info/0001-kernel32-Allow-non-nullterminated-string-as-working-.patch
(
echo '+ { "Sebastian Lackner", "kernel32: Allow non-nullterminated string as working directory in create_startup_info.", 1 },';
) >> "$patchlist"
fi
# Patchset kernel32-GetFinalPathNameByHandle
# |
# | This patchset fixes the following Wine bugs: