Added oleaut32_VarAdd patchset

This commit is contained in:
Alistair Leslie-Hughes 2025-01-24 20:23:21 +11:00
parent b45a0aead3
commit 667ee8a4ff
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From e27947e6cd77f408bf8586456b19c1ff2e41eea4 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 24 Jan 2025 20:15:24 +1100
Subject: [PATCH] oleaut32: VarAnd use VT_I4 when converting VT_BSTR
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56280
---
dlls/oleaut32/variant.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index bb1e83e9b7e..ba6db0adf62 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -3114,7 +3114,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
hres = VariantChangeType(&varLeft,&varLeft,
VARIANT_LOCALBOOL, VT_BOOL);
if (SUCCEEDED(hres) && V_VT(&varLeft) != resvt)
- hres = VariantChangeType(&varLeft,&varLeft,0,resvt);
+ hres = VariantChangeType(&varLeft,&varLeft,0, VT_I4);
if (FAILED(hres)) goto VarAnd_Exit;
}
--
2.45.2

View File

@ -0,0 +1,2 @@
Fixes: [56280] oleaut32: VarAnd use VT_I4 when converting VT_BSTR