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 wscript-support-d-u-switches patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-05-29 14:02:57 +10:00
parent 2ebe0e23aa
commit 9efac47eec
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -283,6 +283,7 @@ patch_enable_all ()
enable_ws2_32_APC_Performance="$1"
enable_ws2_32_Connect_Time="$1"
enable_ws2_32_getsockopt="$1"
enable_wscript_support_d_u_switches="$1"
enable_xactengine_initial="$1"
enable_xactengine3_7_Notification="$1"
enable_xactengine3_7_PrepareWave="$1"
@ -895,6 +896,9 @@ patch_enable ()
ws2_32-getsockopt)
enable_ws2_32_getsockopt="$2"
;;
wscript-support-d-u-switches)
enable_wscript_support_d_u_switches="$2"
;;
xactengine-initial)
enable_xactengine_initial="$2"
;;
@ -4243,6 +4247,18 @@ if test "$enable_ws2_32_getsockopt" -eq 1; then
patch_apply ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch
fi
# Patchset wscript-support-d-u-switches
# |
# | This patchset fixes the following Wine bugs:
# | * [#49905] wscript: return TRUE for /d and /u stub switches
# |
# | Modified files:
# | * programs/wscript/main.c
# |
if test "$enable_wscript_support_d_u_switches" -eq 1; then
patch_apply wscript-support-d-u-switches/0001-wscript-return-TRUE-for-d-and-u-stub-switches.patch
fi
# Patchset xactengine-initial
# |
# | This patchset fixes the following Wine bugs:

33
patches/wscript-support-d-u-switches/0001-wscript-return-TRUE-for-d-and-u-stub-switches.patch Normal file
View File

@ -0,0 +1,33 @@
From d68918425e249c5c218ee6f0c9418e2e2daf9931 Mon Sep 17 00:00:00 2001
From: Dmitry Kislyuk <dimaki@rocketmail.com>
Date: Wed, 28 Apr 2021 09:47:41 -0500
Subject: [PATCH] wscript: return TRUE for /d and /u stub switches
Patch by Robert Wilhelm from bug:
https://bugs.winehq.org/show_bug.cgi?id=49905
VbsEdit is able to execute scripts with this patch applied.
Signed-off-by: Dmitry Kislyuk <dimaki@rocketmail.com>
---
programs/wscript/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index a7005a9289c..6d6e8935149 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -393,6 +393,10 @@ static BOOL set_host_properties(const WCHAR *prop)
wshInteractive = VARIANT_FALSE;
else if(wcsicmp(prop, L"nologo") == 0)
WINE_FIXME("ignored %s switch\n", debugstr_w(L"nologo"));
+ else if(wcsicmp(prop, L"d") == 0)
+ WINE_FIXME("ignored %s switch\n", debugstr_w(L"d"));
+ else if(wcsicmp(prop, L"u") == 0)
+ WINE_FIXME("ignored %s switch\n", debugstr_w(L"u"));
else
{
WINE_FIXME("unsupported switch %s\n", debugstr_w(prop));
--
2.30.2

1
patches/wscript-support-d-u-switches/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [49905] wscript: return TRUE for /d and /u stub switches