Skip to content

W
wine-winehq
Commit bb96e264 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

oleaut32: Remove some deadcode from VarMod().

Always true/false conditions appear to exist since initial implementation was introduced in 2d1bccd0.
parent 557a4e06
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
dlls/oleaut32/variant.c
View file @ bb96e264
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment