user32: Remove unused variables.
This commit is contained in:
parent
2a87ef68c5
commit
d8ce2207b8
|
@ -77,7 +77,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
RECT r;
|
RECT r;
|
||||||
int old_state = 0;
|
|
||||||
int hidden = 0;
|
int hidden = 0;
|
||||||
|
|
||||||
SERVER_START_REQ( set_caret_info )
|
SERVER_START_REQ( set_caret_info )
|
||||||
|
@ -95,7 +94,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti
|
||||||
r.top = reply->old_rect.top;
|
r.top = reply->old_rect.top;
|
||||||
r.right = reply->old_rect.right;
|
r.right = reply->old_rect.right;
|
||||||
r.bottom = reply->old_rect.bottom;
|
r.bottom = reply->old_rect.bottom;
|
||||||
old_state = reply->old_state;
|
|
||||||
hidden = reply->old_hide;
|
hidden = reply->old_hide;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -332,7 +330,6 @@ BOOL WINAPI ShowCaret( HWND hwnd )
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
RECT r;
|
RECT r;
|
||||||
int old_state = 0;
|
|
||||||
int hidden = 0;
|
int hidden = 0;
|
||||||
|
|
||||||
SERVER_START_REQ( set_caret_info )
|
SERVER_START_REQ( set_caret_info )
|
||||||
|
@ -350,7 +347,6 @@ BOOL WINAPI ShowCaret( HWND hwnd )
|
||||||
r.top = reply->old_rect.top;
|
r.top = reply->old_rect.top;
|
||||||
r.right = reply->old_rect.right;
|
r.right = reply->old_rect.right;
|
||||||
r.bottom = reply->old_rect.bottom;
|
r.bottom = reply->old_rect.bottom;
|
||||||
old_state = reply->old_state;
|
|
||||||
hidden = reply->old_hide;
|
hidden = reply->old_hide;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -384,11 +384,10 @@ static ICONCACHE* CURSORICON_FindCache(HICON hIcon)
|
||||||
ICONCACHE *ptr;
|
ICONCACHE *ptr;
|
||||||
ICONCACHE *pRet=NULL;
|
ICONCACHE *pRet=NULL;
|
||||||
BOOL IsFound = FALSE;
|
BOOL IsFound = FALSE;
|
||||||
int count;
|
|
||||||
|
|
||||||
EnterCriticalSection( &IconCrst );
|
EnterCriticalSection( &IconCrst );
|
||||||
|
|
||||||
for (count = 0, ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next, count++ )
|
for (ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next)
|
||||||
{
|
{
|
||||||
if ( hIcon == ptr->hIcon )
|
if ( hIcon == ptr->hIcon )
|
||||||
{
|
{
|
||||||
|
|
|
@ -165,12 +165,9 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd)
|
||||||
{
|
{
|
||||||
WDML_SERVER* pServer;
|
WDML_SERVER* pServer;
|
||||||
WDML_INSTANCE* pInstance;
|
WDML_INSTANCE* pInstance;
|
||||||
HDDEDATA hDdeData;
|
|
||||||
HWND hwndServer;
|
HWND hwndServer;
|
||||||
WNDCLASSEXW wndclass;
|
WNDCLASSEXW wndclass;
|
||||||
|
|
||||||
hDdeData = NULL;
|
|
||||||
|
|
||||||
TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd);
|
TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd);
|
||||||
|
|
||||||
/* First check instance
|
/* First check instance
|
||||||
|
|
|
@ -3424,7 +3424,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
|
||||||
{
|
{
|
||||||
if (es->style & ES_MULTILINE) {
|
if (es->style & ES_MULTILINE) {
|
||||||
INT l;
|
INT l;
|
||||||
INT li;
|
|
||||||
INT vlc;
|
INT vlc;
|
||||||
INT ww;
|
INT ww;
|
||||||
INT cw = es->char_width;
|
INT cw = es->char_width;
|
||||||
|
@ -3433,7 +3432,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
|
||||||
INT dx = 0;
|
INT dx = 0;
|
||||||
|
|
||||||
l = EDIT_EM_LineFromChar(es, es->selection_end);
|
l = EDIT_EM_LineFromChar(es, es->selection_end);
|
||||||
li = EDIT_EM_LineIndex(es, l);
|
|
||||||
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP));
|
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP));
|
||||||
vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
|
vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
|
||||||
if (l >= es->y_offset + vlc)
|
if (l >= es->y_offset + vlc)
|
||||||
|
|
|
@ -679,11 +679,10 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect)
|
||||||
{
|
{
|
||||||
if (menu->bScrolling)
|
if (menu->bScrolling)
|
||||||
{
|
{
|
||||||
UINT arrow_bitmap_width, arrow_bitmap_height;
|
UINT arrow_bitmap_height;
|
||||||
BITMAP bmp;
|
BITMAP bmp;
|
||||||
|
|
||||||
GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp);
|
GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp);
|
||||||
arrow_bitmap_width = bmp.bmWidth;
|
|
||||||
arrow_bitmap_height = bmp.bmHeight;
|
arrow_bitmap_height = bmp.bmHeight;
|
||||||
rect->top += arrow_bitmap_height - menu->nScrollPos;
|
rect->top += arrow_bitmap_height - menu->nScrollPos;
|
||||||
rect->bottom += arrow_bitmap_height - menu->nScrollPos;
|
rect->bottom += arrow_bitmap_height - menu->nScrollPos;
|
||||||
|
|
|
@ -2226,7 +2226,7 @@ static void wait_message_reply( UINT flags )
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
unsigned int wake_bits = 0, changed_bits = 0;
|
unsigned int wake_bits = 0;
|
||||||
DWORD dwlc, res;
|
DWORD dwlc, res;
|
||||||
|
|
||||||
SERVER_START_REQ( set_queue_mask )
|
SERVER_START_REQ( set_queue_mask )
|
||||||
|
@ -2235,10 +2235,7 @@ static void wait_message_reply( UINT flags )
|
||||||
req->changed_mask = req->wake_mask;
|
req->changed_mask = req->wake_mask;
|
||||||
req->skip_wait = 1;
|
req->skip_wait = 1;
|
||||||
if (!wine_server_call( req ))
|
if (!wine_server_call( req ))
|
||||||
{
|
wake_bits = reply->wake_bits;
|
||||||
wake_bits = reply->wake_bits;
|
|
||||||
changed_bits = reply->changed_bits;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
SERVER_END_REQ;
|
SERVER_END_REQ;
|
||||||
|
|
||||||
|
|
|
@ -951,11 +951,9 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )
|
||||||
STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved);
|
STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved);
|
||||||
HANDLE16 oldDS = stack16->ds;
|
HANDLE16 oldDS = stack16->ds;
|
||||||
HINSTANCE16 gdi_inst;
|
HINSTANCE16 gdi_inst;
|
||||||
WORD gdi_heap;
|
|
||||||
int userPercent, gdiPercent;
|
int userPercent, gdiPercent;
|
||||||
|
|
||||||
if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0;
|
if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0;
|
||||||
gdi_heap = gdi_inst | 7;
|
|
||||||
|
|
||||||
switch(resType)
|
switch(resType)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1867,7 +1867,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
|
||||||
WND *win;
|
WND *win;
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
RECT visible_rect, old_window_rect;
|
RECT visible_rect, old_window_rect;
|
||||||
DWORD new_style;
|
|
||||||
|
|
||||||
if (!(win = WIN_GetPtr( hwnd ))) return FALSE;
|
if (!(win = WIN_GetPtr( hwnd ))) return FALSE;
|
||||||
if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE;
|
if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE;
|
||||||
|
@ -1901,7 +1900,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SERVER_END_REQ;
|
SERVER_END_REQ;
|
||||||
new_style = win->dwStyle;
|
|
||||||
WIN_ReleasePtr( win );
|
WIN_ReleasePtr( win );
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Reference in New Issue