Module: wine Branch: oldstable Commit: 0c0c89f9e6f8b1eace36de874a0e69d75a080f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0c89f9e6f8b1eace36de874...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Thu May 18 02:12:49 2017 +0000
oleaut32: Remove dead code.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit c260de0faaf42021a592f3f750623e21b2c3f3a6) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/oleaut32/variant.c | 22 ---------------------- 1 file changed, 22 deletions(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 17f753a..188e393 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2617,17 +2617,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (leftvt == VT_NULL && (rightvt == VT_EMPTY || - rightvt == VT_NULL || rightvt == VT_I2 || - rightvt == VT_I4 || rightvt == VT_R4 || - rightvt == VT_R8 || rightvt == VT_CY || - rightvt == VT_DATE || rightvt == VT_BSTR || - rightvt == VT_BOOL || rightvt == VT_DECIMAL || - rightvt == VT_I1 || rightvt == VT_UI1 || - rightvt == VT_UI2 || rightvt == VT_UI4 || - rightvt == VT_I8 || rightvt == VT_UI8 || - rightvt == VT_INT || rightvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } } @@ -2657,17 +2646,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (rightvt == VT_NULL && (leftvt == VT_EMPTY || - leftvt == VT_NULL || leftvt == VT_I2 || - leftvt == VT_I4 || leftvt == VT_R4 || - leftvt == VT_R8 || leftvt == VT_CY || - leftvt == VT_DATE || leftvt == VT_BSTR || - leftvt == VT_BOOL || leftvt == VT_DECIMAL || - leftvt == VT_I1 || leftvt == VT_UI1 || - leftvt == VT_UI2 || leftvt == VT_UI4 || - leftvt == VT_I8 || leftvt == VT_UI8 || - leftvt == VT_INT || leftvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } }