niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

oleaut32: Remove some deadcode from VarMod().

Browse source 
Always true/false conditions appear to exist since initial implementation
was introduced in 2d1bccd0c4.
This commit is contained in:
Nikolay Sivov 2023-11-24 20:25:24 +01:00 • committed by Alexandre Julliard
parent 557a4e061b
commit bb96e26440
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dlls/oleaut32/variant.c
View file

@ -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;