Skip to content

W
wine-winehq
Commit ed9c7396 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut32: Fix local variable shadowing in OLEFontImpl_Invoke.

parent e2359813
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
dlls/oleaut32/olefont.c
View file @ ed9c7396
...@@ -1377,7 +1377,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1377,7 +1377,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return hr; return hr;
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL);
...@@ -1399,7 +1398,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1399,7 +1398,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return hr; return hr;
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL);
...@@ -1421,7 +1419,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1421,7 +1419,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return hr; return hr;
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL);
...@@ -1440,7 +1437,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1440,7 +1437,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return OLEFontImpl_get_Size((IFont *)this, &V_CY(pVarResult)); return OLEFontImpl_get_Size((IFont *)this, &V_CY(pVarResult));
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_CY); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_CY);
...@@ -1459,7 +1455,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1459,7 +1455,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return OLEFontImpl_get_Weight((IFont *)this, &V_I2(pVarResult)); return OLEFontImpl_get_Weight((IFont *)this, &V_I2(pVarResult));
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2);
...@@ -1478,7 +1473,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( ...@@ -1478,7 +1473,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke(
return OLEFontImpl_get_Charset((IFont *)this, &V_I2(pVarResult)); return OLEFontImpl_get_Charset((IFont *)this, &V_I2(pVarResult));
} else { } else {
VARIANTARG vararg; VARIANTARG vararg;
HRESULT hr;
VariantInit(&vararg); VariantInit(&vararg);
hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2);
......
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