Commit 45f13cef authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

comctl32: Fix local variable shadowing in load_string by moving len to the block…

comctl32: Fix local variable shadowing in load_string by moving len to the block in which it is actually used.
parent e1452426
...@@ -2898,7 +2898,6 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) ...@@ -2898,7 +2898,6 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) static LPWSTR load_string( HINSTANCE instance, LPCWSTR str )
{ {
LPWSTR ret; LPWSTR ret;
UINT len;
if (IS_INTRESOURCE(str)) if (IS_INTRESOURCE(str))
{ {
...@@ -2906,6 +2905,7 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) ...@@ -2906,6 +2905,7 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str )
HGLOBAL hmem; HGLOBAL hmem;
WCHAR *ptr; WCHAR *ptr;
WORD i, id = LOWORD(str); WORD i, id = LOWORD(str);
UINT len;
if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((id >> 4) + 1), (LPWSTR)RT_STRING ))) if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((id >> 4) + 1), (LPWSTR)RT_STRING )))
return NULL; return NULL;
......
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