wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 623bc9fa54311d941d09760dc5300697ba11debe.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-11-16 10:25:40 +11:00
parent 5088fc67ba
commit 8a5220955b
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/wbemdisp-ISWbemObject-Invoke/0002-vbscript-Support-VT_BSTR-VT_ARRAY-Iterator.patch
View File

@@ -1,7 +1,7 @@
From 74016f3aae967c669ee1cebdf4d1ebc15c3719b0 Mon Sep 17 00:00:00 2001
From 8850da28b9f319acffafb09f660db62d37b3cf29 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 17 May 2021 18:18:44 +1000
Subject: [PATCH 2/4] vbscript: Support VT_BSTR|VT_ARRAY Iterator
Subject: [PATCH] vbscript: Support VT_BSTR|VT_ARRAY Iterator
This isn't correct and the patch 4 show that this is the case.
@@ -15,10 +15,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 11d95e57758..35a6165a819 100644
index 4cfe9596b0c..0117eedcb76 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -1422,6 +1422,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx)
@@ -1456,6 +1456,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx)
V_UNKNOWN(r) = (IUnknown*)iter;
break;
}
@@ -27,7 +27,7 @@ index 11d95e57758..35a6165a819 100644
case VT_VARIANT|VT_ARRAY|VT_BYREF: {
IEnumVARIANT *iter;
diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c
index d30842c52eb..c0b8b749038 100644
index 03b1abde481..7350a822b37 100644
--- a/dlls/vbscript/utils.c
+++ b/dlls/vbscript/utils.c
@@ -106,11 +106,20 @@ static HRESULT WINAPI safearray_iter_IEnumVARIANT_Next(IEnumVARIANT *iface,
@@ -65,9 +65,9 @@ index d30842c52eb..c0b8b749038 100644
- return E_NOTIMPL;
- }
-
iter = heap_alloc(sizeof(*iter));
iter = malloc(sizeof(*iter));
if(!iter)
return E_OUTOFMEMORY;
--
2.30.2
2.38.1