Module: wine Branch: master Commit: bb96e264408002118217c38776195a9a729aa4bf URL: https://gitlab.winehq.org/wine/wine/-/commit/bb96e264408002118217c38776195a9...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Nov 24 20:25:24 2023 +0100
oleaut32: Remove some deadcode from VarMod().
Always true/false conditions appear to exist since initial implementation was introduced in 2d1bccd0c478274c727de0a531df2da35039e136.
---
dlls/oleaut32/variant.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fa4492b968a..b3c96b18c2b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5401,7 +5401,6 @@ end: */ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - BOOL lOk = TRUE; HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; @@ -5429,7 +5428,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) }
/* check for invalid inputs */ - lOk = TRUE; switch (V_VT(left) & VT_TYPEMASK) { case VT_BOOL : case VT_I1 : @@ -5531,15 +5529,10 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE; - } else if((V_VT(left) == VT_NULL) || (V_VT(left) == VT_EMPTY) || (V_VT(left) == VT_ERROR) || - lOk) + } else { V_VT(result) = VT_NULL; rc = S_OK; - } else - { - V_VT(result) = VT_NULL; - rc = DISP_E_BADVARTYPE; } goto end; case VT_VARIANT: @@ -5551,7 +5544,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) rc = DISP_E_TYPEMISMATCH; goto end; case VT_RECORD: - if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35)) || !lOk) + if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35))) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE;