Author: tkreuzer Date: Thu Dec 18 08:11:25 2014 New Revision: 65721
URL: http://svn.reactos.org/svn/reactos?rev=65721&view=rev Log: [WIN32K] Fix MSVC warnings
Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/prop.c
Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursori... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -31,8 +31,8 @@ USHORT atomModName; USHORT rt; ULONG CURSORF_flags; - INT cpcur; - INT cicur; + UINT cpcur; + UINT cicur; PCURICON_OBJECT * aspcur; DWORD * aicur; INT * ajifRate;
Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -128,8 +128,8 @@ HBRUSH hbrush = NtGdiSelectBrush( hdc, gpsi->hbrGray ); NtGdiPatBlt( hdc, rect->left, rect->top, rect->right - rect->left - width, height, PATINVERT ); NtGdiPatBlt( hdc, rect->left, rect->top + height, width, rect->bottom - rect->top - height, PATINVERT ); - NtGdiPatBlt( hdc, rect->left + width, rect->bottom - 1, rect->right - rect->left - width, -height, PATINVERT ); - NtGdiPatBlt( hdc, rect->right - 1, rect->top, -width, rect->bottom - rect->top - height, PATINVERT ); + NtGdiPatBlt( hdc, rect->left + width, rect->bottom - 1, rect->right - rect->left - width, -(LONG)height, PATINVERT ); + NtGdiPatBlt( hdc, rect->right - 1, rect->top, -(LONG)width, rect->bottom - rect->top - height, PATINVERT ); NtGdiSelectBrush( hdc, hbrush ); }
@@ -1023,7 +1023,7 @@ return (DefWndHandleWindowPosChanging(Wnd, (WINDOWPOS*)lParam)); }
- case WM_WINDOWPOSCHANGED: + case WM_WINDOWPOSCHANGED: { return (DefWndHandleWindowPosChanged(Wnd, (WINDOWPOS*)lParam)); }
Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c?... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -209,7 +209,7 @@ } /* Free the Item */ DesktopHeapFree(pMenu->head.rpdesk, pMenu->rgItems ); - pMenu->rgItems = NULL; + pMenu->rgItems = NULL; pMenu->cItems = 0; } return TRUE; @@ -462,7 +462,7 @@ SubMenu = MenuObject;
if(!(MenuItem = MENU_InsertItem( SubMenu, uItem, fByPosition ? MF_BYPOSITION : MF_BYCOMMAND, &SubMenu, &uItem ))) return FALSE; - + if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo, lpstr)) { IntRemoveMenuItem(SubMenu, uItem, fByPosition ? MF_BYPOSITION : MF_BYCOMMAND, FALSE); @@ -684,7 +684,7 @@ { IntSetMenuInfo( item->spSubMenu, lpmi); } - } + } } if (sizeof(MENUINFO) < lpmi->cbSize) { @@ -761,8 +761,8 @@
if (sizeof(ROSMENUITEMINFO) == lpmii->cbSize) { - lpmii->Rect.left = MenuItem->xItem; - lpmii->Rect.top = MenuItem->yItem; + lpmii->Rect.left = MenuItem->xItem; + lpmii->Rect.top = MenuItem->yItem; lpmii->Rect.right = MenuItem->cxItem; // Do this for now...... lpmii->Rect.bottom = MenuItem->cyItem; lpmii->dxTab = MenuItem->dxTab; @@ -829,7 +829,7 @@ if (MenuItem->hbmp <= HBMMENU_POPUP_MINIMIZE && MenuItem->hbmp >= HBMMENU_CALLBACK) MenuItem->fState |= MFS_HBMMENUBMP; else - MenuItem->fState &= ~MFS_HBMMENUBMP; + MenuItem->fState &= ~MFS_HBMMENUBMP; } if(lpmii->fMask & MIIM_CHECKMARKS) { @@ -939,8 +939,8 @@
if (sizeof(ROSMENUITEMINFO) == lpmii->cbSize) { - MenuItem->xItem = lpmii->Rect.left; - MenuItem->yItem = lpmii->Rect.top; + MenuItem->xItem = lpmii->Rect.left; + MenuItem->yItem = lpmii->Rect.top; MenuItem->cxItem = lpmii->Rect.right; // Do this for now...... MenuItem->cyItem = lpmii->Rect.bottom; MenuItem->dxTab = lpmii->dxTab; @@ -1025,7 +1025,7 @@ UINT i; PITEM MenuItem = MenuObject->rgItems;
- if (!MenuItem) return FALSE; + if (!MenuItem) return FALSE;
/* reset all default-item flags */ for (i = 0; MenuItem, i < MenuObject->cItems; i++, MenuItem++) @@ -1324,7 +1324,7 @@ return (pItem->spSubMenu->cItems << 8) | ((pItem->fState|pItem->fType) & 0xff); } else - return (pItem->fType | pItem->fState); + return (pItem->fType | pItem->fState); }
HMENU FASTCALL IntGetSubMenu( HMENU hMenu, int nPos) @@ -1369,7 +1369,7 @@ { return i; } - else + else { HMENU hsubmenu = hSubMenu; UINT pos = IntFindSubMenu( &hsubmenu, hSubTarget ); @@ -1610,8 +1610,8 @@
if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION))) { - Rect->left = MenuItem->xItem; - Rect->top = MenuItem->yItem; + Rect->left = MenuItem->xItem; + Rect->top = MenuItem->yItem; Rect->right = MenuItem->cxItem; // Do this for now...... Rect->bottom = MenuItem->cyItem; } @@ -1659,7 +1659,7 @@ UserDestroyMenu(hSysMenu); return NULL; } - + SysMenu->fFlags |= MNF_SYSMENU; SysMenu->hWnd = Window->head.h;
@@ -1811,7 +1811,7 @@ if (Menu && Window != Menu->spwndNotify) { Menu->spwndNotify = Window; - } + }
return TRUE; } @@ -2198,7 +2198,7 @@ if (!Menu) RETURN(FALSE);
- if (idItem < 0 || idItem > Menu->cItems) + if ((idItem < 0) || ((ULONG)idItem > Menu->cItems)) RETURN(FALSE);
RECTL_vSetEmptyRect(&kmbi.rcBar); @@ -2320,8 +2320,8 @@
if ((MenuItem = MENU_FindItem (&Menu, &uItem, MF_BYPOSITION))) { - Rect.left = MenuItem->xItem; - Rect.top = MenuItem->yItem; + Rect.left = MenuItem->xItem; + Rect.top = MenuItem->yItem; Rect.right = MenuItem->cxItem; // Do this for now...... Rect.bottom = MenuItem->cyItem; } @@ -2427,7 +2427,7 @@ PMENU Menu; PWND Window = NULL; PITEM mi; - int i; + ULONG i; DECLARE_RETURN(int);
TRACE("Enter NtUserMenuItemFromPoint\n"); @@ -2450,8 +2450,8 @@ for (i = 0; i < Menu->cItems; i++, mi++) { RECTL Rect; - Rect.left = mi->xItem; - Rect.top = mi->yItem; + Rect.left = mi->xItem; + Rect.top = mi->yItem; Rect.right = mi->cxItem; // Do this for now...... Rect.bottom = mi->cyItem; //MENU_AdjustMenuItemRect(Menu, &Rect); Need gpsi OBMI via callback!
Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c?... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Thu Dec 18 08:11:25 2014 @@ -5,7 +5,7 @@ * FILE: subsys/win32k/ntuser/prop.c * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) */ - + #include <win32k.h> DBG_DEFAULT_CHANNEL(UserProp);
@@ -16,7 +16,7 @@ { PLIST_ENTRY ListEntry; PPROPERTY Property; - int i; + UINT i;
ListEntry = Window->PropListHead.Flink;
-
tkreuzer＠svn.reactos.org