Removed local variable shadows warnings.
This commit is contained in:
parent
081ee94117
commit
64c86ffe66
|
@ -523,7 +523,7 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
|
|||
CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS );
|
||||
if( hXorBits )
|
||||
{
|
||||
char* bits = (char *)bmi + size +
|
||||
char* xbits = (char *)bmi + size +
|
||||
DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth,
|
||||
bmi->bmiHeader.biHeight,
|
||||
bmi->bmiHeader.biBitCount) / 2;
|
||||
|
@ -558,14 +558,14 @@ static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16
|
|||
hOld = SelectObject(hMem, hAndBits);
|
||||
res = StretchDIBits(hMem, 0, 0, width, height, 0, 0,
|
||||
pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight,
|
||||
bits, pInfo, DIB_RGB_COLORS, SRCCOPY);
|
||||
xbits, pInfo, DIB_RGB_COLORS, SRCCOPY);
|
||||
SelectObject(hMem, hOld);
|
||||
DeleteDC(hMem);
|
||||
} else res = FALSE;
|
||||
if (!res) { DeleteObject(hAndBits); hAndBits = 0; }
|
||||
}
|
||||
} else hAndBits = CreateDIBitmap( hdc, &pInfo->bmiHeader,
|
||||
CBM_INIT, bits, pInfo, DIB_RGB_COLORS );
|
||||
CBM_INIT, xbits, pInfo, DIB_RGB_COLORS );
|
||||
|
||||
if( !hAndBits ) DeleteObject( hXorBits );
|
||||
}
|
||||
|
|
|
@ -398,10 +398,10 @@ HWND EVENT_Capture(HWND hwnd, INT16 ht)
|
|||
|
||||
if( capturePrev )
|
||||
{
|
||||
WND* wndPtr = WIN_FindWndPtr( capturePrev );
|
||||
if( wndPtr && (wndPtr->flags & WIN_ISWIN32) )
|
||||
WND* xwndPtr = WIN_FindWndPtr( capturePrev );
|
||||
if( xwndPtr && (xwndPtr->flags & WIN_ISWIN32) )
|
||||
SendMessageA( capturePrev, WM_CAPTURECHANGED, 0L, hwnd);
|
||||
WIN_ReleaseWndPtr(wndPtr);
|
||||
WIN_ReleaseWndPtr(xwndPtr);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSA lpmb)
|
|||
|
||||
if (TWEAK_WineLook >= WIN95_LOOK) {
|
||||
NONCLIENTMETRICSA nclm;
|
||||
INT i;
|
||||
nclm.cbSize = sizeof(NONCLIENTMETRICSA);
|
||||
SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
|
||||
hFont = CreateFontIndirectA (&nclm.lfMessageFont);
|
||||
|
|
|
@ -2662,12 +2662,12 @@ Pos: /* -----------------------------------------------------------------------
|
|||
!= (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) )
|
||||
{
|
||||
/* get a previous visible region for SWP_CopyValidBits() */
|
||||
DWORD flags = DCX_WINDOW;
|
||||
DWORD dflags = DCX_WINDOW;
|
||||
|
||||
if (wndPtr->dwStyle & WS_CLIPSIBLINGS)
|
||||
flags |= DCX_CLIPSIBLINGS;
|
||||
dflags |= DCX_CLIPSIBLINGS;
|
||||
|
||||
visRgn = DCE_GetVisRgn(hwnd, flags, 0, 0);
|
||||
visRgn = DCE_GetVisRgn(hwnd, dflags, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue