mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Removed several patches (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
2f2045c5c8
commit
7bcb2e7adb
@ -82,7 +82,7 @@ Included bug fixes and improvements
|
||||
* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
|
||||
* Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
|
||||
* ~~Fix ordering of IP addresses by metric if two addresses have the same metric.~~
|
||||
* Fix passing of unicode environment from msvcrt to CreateProcessW. ([Wine Bug #37635](https://bugs.winehq.org/show_bug.cgi?id=37635))
|
||||
* ~~Fix passing of unicode environment from msvcrt to CreateProcessW.~~ ([Wine Bug #37635](https://bugs.winehq.org/show_bug.cgi?id=37635))
|
||||
* Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
|
||||
* Fix unintentional leaks with ntdll internals
|
||||
* Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655))
|
||||
|
||||
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -7,7 +7,8 @@ wine-compholio (1.7.33) UNRELEASED; urgency=low
|
||||
* Removed patch to fix ordering of IP addresses by metric if two addresses have the same metric (accepted upstream).
|
||||
* Removed patch to reset data->pWintrustData->u.pFile->hFile after closing handle (accepted upstream).
|
||||
* Removed patch to simplify implementation of ws32 get_poll_results (accepted upstream).
|
||||
* Partially removed patches for api-ms-win-core-* stub dlls (accepted upstream).
|
||||
* Removed patch to fix passing of unicode environment from msvcrt to CreateProcessW (accepted upstream).
|
||||
* Removed patches for api-ms-win-core-* stub dlls (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 30 Nov 2014 18:19:00 +0100
|
||||
|
||||
wine-compholio (1.7.32) unstable; urgency=low
|
||||
|
||||
@ -23,7 +23,6 @@ PATCHLIST := \
|
||||
Miscellaneous.ok \
|
||||
Pipelight.ok \
|
||||
Staging.ok \
|
||||
api-ms-win-core-Stubs.ok \
|
||||
atl-IOCS_Property.ok \
|
||||
comctl32-LoadIconMetric.ok \
|
||||
configure-Absolute_RPATH.ok \
|
||||
@ -56,7 +55,6 @@ PATCHLIST := \
|
||||
libs-Unicode_Collation.ok \
|
||||
libwine-BSD_mmap_fixed.ok \
|
||||
msvcp90-basic_string_wchar_dtor.ok \
|
||||
msvcrt-Spawn_Process.ok \
|
||||
msvcrt-atof_strtod.ok \
|
||||
ntdll-DOS_Attributes.ok \
|
||||
ntdll-Dynamic_DST.ok \
|
||||
@ -256,28 +254,6 @@ Staging.ok:
|
||||
echo '+ { "Michael Müller", "loader: Add commandline option --check-libs.", 1 },'; \
|
||||
) > Staging.ok
|
||||
|
||||
# Patchset api-ms-win-core-Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in, dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-
|
||||
# | datetime-l1-1-0.spec, dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in, dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-
|
||||
# | core-fibers-l1-1-0.spec, dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in, dlls/api-ms-win-core-winrt-error-l1-1-1
|
||||
# | /api-ms-win-core-winrt-error-l1-1-1.spec, dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in, dlls/api-ms-win-core-
|
||||
# | xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec, tools/make_specfiles
|
||||
# |
|
||||
.INTERMEDIATE: api-ms-win-core-Stubs.ok
|
||||
api-ms-win-core-Stubs.ok:
|
||||
$(call APPLY_FILE,api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch)
|
||||
$(call APPLY_FILE,api-ms-win-core-Stubs/0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch)
|
||||
$(call APPLY_FILE,api-ms-win-core-Stubs/0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch)
|
||||
$(call APPLY_FILE,api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch)
|
||||
@( \
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-fibers-l1-1-0: Add dll.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-datetime-l1-1-0: Add dll.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-xstate-l2-1-0: Add stub dll.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "api-ms-win-core-winrt-error-l1-1-1: Add stub dll.", 1 },'; \
|
||||
) > api-ms-win-core-Stubs.ok
|
||||
|
||||
# Patchset atl-IOCS_Property
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -801,21 +777,6 @@ msvcp90-basic_string_wchar_dtor.ok:
|
||||
echo '+ { "Michael Müller", "msvcp90/tests: Add tests to check that basic_string_wchar_dtor returns NULL.", 1 },'; \
|
||||
) > msvcp90-basic_string_wchar_dtor.ok
|
||||
|
||||
# Patchset msvcrt-Spawn_Process
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37635] Fix passing of unicode environment from msvcrt to CreateProcessW.
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msvcrt/process.c
|
||||
# |
|
||||
.INTERMEDIATE: msvcrt-Spawn_Process.ok
|
||||
msvcrt-Spawn_Process.ok:
|
||||
$(call APPLY_FILE,msvcrt-Spawn_Process/0001-msvcrt-Fix-passing-of-explicit-environment-to-spawn-.patch)
|
||||
@( \
|
||||
echo '+ { "Ron Yorston", "msvcrt: Fix passing of explicit environment to spawn/exec calls.", 1 },'; \
|
||||
) > msvcrt-Spawn_Process.ok
|
||||
|
||||
# Patchset msvcrt-atof_strtod
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 3548deeba0307b5fd911116975409b2182e15a4f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Nov 2014 21:31:43 +0100
|
||||
Subject: api-ms-win-core-fibers-l1-1-0: Add dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in | 1 +
|
||||
dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec | 4 ++++
|
||||
tools/make_specfiles | 1 +
|
||||
4 files changed, 7 insertions(+)
|
||||
create mode 100644 dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in
|
||||
create mode 100644 dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index eea1baf..ded14e8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0)
|
||||
diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..f4cc782
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = api-ms-win-core-fibers-l1-1-0.dll
|
||||
diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec b/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..26afab1
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec
|
||||
@@ -0,0 +1,4 @@
|
||||
+@ stdcall FlsAlloc(ptr) kernel32.FlsAlloc
|
||||
+@ stdcall FlsFree(long) kernel32.FlsFree
|
||||
+@ stdcall FlsGetValue(long) kernel32.FlsGetValue
|
||||
+@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 641f18e..8866ab2 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -159,6 +159,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-file-l2-1-1",
|
||||
"api-ms-win-core-sysinfo-l1-2-1",
|
||||
"api-ms-win-core-processthreads-l1-1-2",
|
||||
+ "api-ms-win-core-fibers-l1-1-0",
|
||||
"api-ms-win-core-fibers-l1-1-1",
|
||||
"api-ms-win-core-file-l2-1-0",
|
||||
"api-ms-win-core-localization-l1-2-1",
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From eff671feeb578061da7a273d5e49e28c49f42b6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Nov 2014 21:50:28 +0100
|
||||
Subject: api-ms-win-core-datetime-l1-1-0: Add dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in | 1 +
|
||||
.../api-ms-win-core-datetime-l1-1-0.spec | 4 ++++
|
||||
tools/make_specfiles | 1 +
|
||||
4 files changed, 7 insertions(+)
|
||||
create mode 100644 dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in
|
||||
create mode 100644 dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ded14e8..30bc3ce 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/amstream/tests)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1)
|
||||
diff --git a/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..f722f65
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = api-ms-win-core-datetime-l1-1-0.dll
|
||||
diff --git a/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec b/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..c49cf5e
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec
|
||||
@@ -0,0 +1,4 @@
|
||||
+@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA
|
||||
+@ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW
|
||||
+@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA
|
||||
+@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 8866ab2..a51ed00 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -163,6 +163,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-fibers-l1-1-1",
|
||||
"api-ms-win-core-file-l2-1-0",
|
||||
"api-ms-win-core-localization-l1-2-1",
|
||||
+ "api-ms-win-core-datetime-l1-1-0",
|
||||
"api-ms-win-core-datetime-l1-1-1",
|
||||
],
|
||||
[
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 9930401b757f8cddb493e656772c275b278ae74a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Nov 2014 19:07:20 +0100
|
||||
Subject: api-ms-win-core-xstate-l2-1-0: Add stub dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in | 1 +
|
||||
.../api-ms-win-core-xstate-l2-1-0.spec | 6 ++++++
|
||||
tools/make_specfiles | 1 +
|
||||
4 files changed, 9 insertions(+)
|
||||
create mode 100644 dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in
|
||||
create mode 100644 dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 30bc3ce..e007f17 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0)
|
||||
diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in b/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..9fafff3
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = api-ms-win-core-xstate-l2-1-0.dll
|
||||
diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..0f9438d
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec
|
||||
@@ -0,0 +1,6 @@
|
||||
+@ stub CopyContext
|
||||
+@ stub GetEnabledXStateFeatures
|
||||
+@ stub GetXStateFeaturesMask
|
||||
+@ stub InitializeContext
|
||||
+@ stub LocateXStateFeature
|
||||
+@ stub SetXStateFeaturesMask
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index a51ed00..7ef15d6 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -165,6 +165,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-localization-l1-2-1",
|
||||
"api-ms-win-core-datetime-l1-1-0",
|
||||
"api-ms-win-core-datetime-l1-1-1",
|
||||
+ "api-ms-win-core-xstate-l2-1-0",
|
||||
],
|
||||
[
|
||||
"ole32",
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 2b93ecb2dd631effac24746ac21573920a44c07f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 26 Nov 2014 20:13:34 +0100
|
||||
Subject: api-ms-win-core-winrt-error-l1-1-1: Add stub dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in | 1 +
|
||||
.../api-ms-win-core-winrt-error-l1-1-1.spec | 19 +++++++++++++++++++
|
||||
3 files changed, 21 insertions(+)
|
||||
create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
|
||||
create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e007f17..863f5e7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
|
||||
diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..fe36f7b
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = api-ms-win-core-winrt-error-l1-1-1.dll
|
||||
diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
|
||||
new file mode 100644
|
||||
index 0000000..b1ad813
|
||||
--- /dev/null
|
||||
+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
|
||||
@@ -0,0 +1,19 @@
|
||||
+@ stub GetRestrictedErrorInfo
|
||||
+@ stub IsErrorPropagationEnabled
|
||||
+@ stub RoCaptureErrorContext
|
||||
+@ stub RoClearError
|
||||
+@ stub RoFailFastWithErrorContext
|
||||
+@ stub RoGetErrorReportingFlags
|
||||
+@ stub RoGetMatchingRestrictedErrorInfo
|
||||
+@ stub RoInspectCapturedStackBackTrace
|
||||
+@ stub RoInspectThreadErrorInfo
|
||||
+@ stub RoOriginateError
|
||||
+@ stub RoOriginateErrorW
|
||||
+@ stub RoOriginateLanguageException
|
||||
+@ stub RoReportFailedDelegate
|
||||
+@ stub RoReportUnhandledError
|
||||
+@ stub RoResolveRestrictedErrorInfoReference
|
||||
+@ stub RoSetErrorReportingFlags
|
||||
+@ stub RoTransformError
|
||||
+@ stub RoTransformErrorW
|
||||
+@ stub SetRestrictedErrorInfo
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 0e2b29c185f7ce92ac81cbc94d9da9604e5fbc08 Mon Sep 17 00:00:00 2001
|
||||
From: Ron Yorston <rmy@tigress.co.uk>
|
||||
Date: Wed, 26 Nov 2014 17:29:08 +0000
|
||||
Subject: msvcrt: Fix passing of explicit environment to spawn/exec calls
|
||||
|
||||
Explicit sets of environment variables passed to spawn/exec are
|
||||
consistently converted to wide character environment blocks. Because
|
||||
CREATE_UNICODE_ENVIRONMENT isn't included in the process creation flags
|
||||
the environment block is incorrectly passed through another conversion
|
||||
to wide characters in create_process_impl.
|
||||
---
|
||||
dlls/msvcrt/process.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
|
||||
index b782727..549c64a 100644
|
||||
--- a/dlls/msvcrt/process.c
|
||||
+++ b/dlls/msvcrt/process.c
|
||||
@@ -149,8 +149,8 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT
|
||||
si.cb = sizeof(si);
|
||||
msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2);
|
||||
if (!CreateProcessW(fullname, cmdline, NULL, NULL, TRUE,
|
||||
- flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0,
|
||||
- env, NULL, &si, &pi))
|
||||
+ (flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0) |
|
||||
+ CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi))
|
||||
{
|
||||
msvcrt_set_errno(GetLastError());
|
||||
MSVCRT_free(si.lpReserved2);
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [37635] Fix passing of unicode environment from msvcrt to CreateProcessW.
|
||||
Loading…
Reference in New Issue
Block a user