Ros-diffs

ros-diffs@reactos.org

81390 discussions

[turner] 23223: you can thank me later jim ;)
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 09:50:06 2006 New Revision: 23223 URL: http://svn.reactos.org/svn/reactos?rev=23223&view=rev Log: you can thank me later jim ;) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:50:06 2006 @@ -351,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry) + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); return Menu; }

1 0

[jimtabor] 23222: Put back revision 23192
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 09:37:33 2006 New Revision: 23222 URL: http://svn.reactos.org/svn/reactos?rev=23222&view=rev Log: Put back revision 23192 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:37:33 2006 @@ -351,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry) return Menu; } @@ -455,7 +455,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); IntCloneMenuItems(Menu, Source);

1 0

[jimtabor] 23221: -Part 1 -Win32k and User32 - Menu.c: Made set menu items selective masking. Setting masks fixed the garbage going into the item structure. Now right justify menu bar works. There are some more cosmetic issues left to do. I have those ready next week or so. Running wine menu test fail due to exception in kernel32 IsBadStringPtrA&W isbad.c. Funny? Does PSEH work in user mode? The string test is needed. Misc fixed, some restructuring and Wine ports. Please let me know if it breaks
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 09:28:44 2006 New Revision: 23221 URL: http://svn.reactos.org/svn/reactos?rev=23221&view=rev Log: -Part 1 -Win32k and User32 - Menu.c: Made set menu items selective masking. Setting masks fixed the garbage going into the item structure. Now right justify menu bar works. There are some more cosmetic issues left to do. I have those ready next week or so. Running wine menu test fail due to exception in kernel32 IsBadStringPtrA&W isbad.c. Funny? Does PSEH work in user mode? The string test is needed. Misc fixed, some restructuring and Wine ports. Please let me know if it breaks something. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sat Jul 22 09:28:44 2006 @@ -1,34 +1,12 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * Partly based on Wine code - * Copyright 1993 Martin Ayotte - * Copyright 1994 Alexandre Julliard - * Copyright 1997 Morten Welinder - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/menu.c + * FILE: user32/windows/menu.c * PURPOSE: Menus - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 09-05-2001 CSH Created + * + * PROGRAMMERS: Casper S. Hornstrup + * James Tabor */ /* INCLUDES ******************************************************************/ @@ -62,6 +40,7 @@ (0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU)) #define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) +#define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define MENU_ITEM_HBMP_SPACE (5) #define MENU_BAR_ITEMS_SPACE (12) @@ -155,7 +134,7 @@ /*********************************************************************** * MenuSetRosMenuInfo * - * Set full information about menu + * Set full information about menu */ static BOOL FASTCALL MenuSetRosMenuInfo(PROSMENUINFO MenuInfo) @@ -186,13 +165,16 @@ static BOOL FASTCALL MenuGetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo) { + UINT Save_Mask = ItemInfo->fMask; /* Save the org mask bits. */ + if (ItemInfo->dwTypeData != NULL) { HeapFree(GetProcessHeap(), 0, ItemInfo->dwTypeData); } + ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE - | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; + | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; ItemInfo->dwTypeData = NULL; if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) @@ -217,14 +199,14 @@ return FALSE; } } - + ItemInfo->fMask = Save_Mask; return TRUE; } /*********************************************************************** * MenuSetRosMenuItemInfo * - * Set full information about a menu item + * Set selected information about a menu item, need to set the mask bits. */ static BOOL FASTCALL MenuSetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo) @@ -236,10 +218,6 @@ { ItemInfo->cch = strlenW(ItemInfo->dwTypeData); } - ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE - | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; - - Ret = NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, TRUE); return Ret; @@ -368,10 +346,11 @@ /* fall through */ case (INT_PTR) HBMMENU_MBAR_RESTORE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE: + case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: - case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_CLOSE_D: /* FIXME: Why we need to subtract these magic values? */ + /* to make them smaller than the menu bar? */ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; @@ -422,9 +401,9 @@ switch ((INT_PTR)hbmpToDraw) { case (INT_PTR) HBMMENU_SYSTEM: - if (NULL != Item->hbmpItem) + if (NULL != Item->dwTypeData) { - Bmp = Item->hbmpItem; + Bmp = (HBITMAP)Item->dwTypeData; if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm)) { return; @@ -432,6 +411,7 @@ } else { + if (!BmpSysMenu) BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)); Bmp = BmpSysMenu; if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm)) { @@ -514,8 +494,8 @@ /* handle fontsize > bitmap_height */ Top = (Bm.bmHeight < h) ? Rect->top + (h - Bm.bmHeight) / 2 : Rect->top; Left = Rect->left; - Rop = (0 != (Item->fState & MF_HILITE) && ! IS_MAGIC_ITEM(Item->hbmpItem)) ? NOTSRCCOPY : SRCCOPY; - if (0 != (Item->fState & MF_HILITE) && IS_BITMAP_ITEM(Item->fType)) + Rop= ((Item->fState & MF_HILITE) && !IS_MAGIC_BITMAP(hbmpToDraw)) ? NOTSRCCOPY : SRCCOPY; + if ((Item->fState & MF_HILITE) && Item->hbmpItem) { SetBkColor(Dc, GetSysColor(COLOR_HIGHLIGHT)); } @@ -545,7 +525,6 @@ UserDrawSysMenuButton(Wnd, Dc, &Rect, Item->fState & (MF_HILITE | MF_MOUSESELECT)); } - return; } @@ -587,7 +566,9 @@ SetBkColor(Dc, GetSysColor(bkgnd)); } - if (0 != (Item->fType & MF_OWNERDRAW)) + Rect = Item->Rect; + + if (Item->fType & MF_OWNERDRAW) { /* ** Experimentation under Windows reveals that an owner-drawn @@ -620,7 +601,7 @@ dis.itemAction = Action; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ dis.hwndItem = (HWND) MenuInfo->Self; dis.hDC = Dc; - dis.rcItem = Item->Rect; + dis.rcItem = Rect; DPRINT("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", Wnd, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, @@ -648,171 +629,157 @@ Item->Rect.right, Item->Rect.bottom); if (MenuBar && 0 != (Item->fType & MF_SEPARATOR)) - { - return; - } - - Rect = Item->Rect; - - if (0 == (Item->fType & MF_OWNERDRAW)) - { - if (Item->fState & MF_HILITE) - { - if (flat_menu) - { - InflateRect (&Rect, -1, -1); - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); - InflateRect (&Rect, 1, 1); - FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - else - { - if (MenuBar) - { - DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); - } - else - { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - } - } - else - { - FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); - } - } + { + return; + } + + if (Item->fState & MF_HILITE) + { + if (flat_menu) + { + InflateRect (&Rect, -1, -1); + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); + InflateRect (&Rect, 1, 1); + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } + else + { + if (MenuBar) + { + DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } + } + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); + } SetBkMode(Dc, TRANSPARENT); - if (0 == (Item->fType & MF_OWNERDRAW)) - { - /* vertical separator */ - if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) - { - HPEN oldPen; - RECT rc = Rect; - rc.top = 3; - rc.bottom = Height - 3; - if (flat_menu) - { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); - MoveToEx( Dc, rc.left, rc.top, NULL ); - LineTo( Dc, rc.left, rc.bottom ); - SelectObject( Dc, oldPen ); - } - else - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); - } - - /* horizontal separator */ - if (0 != (Item->fType & MF_SEPARATOR)) - { - HPEN oldPen; - RECT rc = Rect; - rc.left++; - rc.right--; - rc.top += SEPARATOR_HEIGHT / 2; - if (flat_menu) - { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); - MoveToEx( Dc, rc.left, rc.top, NULL ); - LineTo( Dc, rc.right, rc.top ); - SelectObject( Dc, oldPen ); - } - else - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); - return; - } - } + /* vertical separator */ + if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) + { + HPEN oldPen; + RECT rc = Rect; + rc.top = 3; + rc.bottom = Height - 3; + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.left, rc.bottom ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); + } + + /* horizontal separator */ + if (0 != (Item->fType & MF_SEPARATOR)) + { + HPEN oldPen; + RECT rc = Rect; + rc.left++; + rc.right--; + rc.top += SEPARATOR_HEIGHT / 2; + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.right, rc.top ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); + return; + } #if 0 /* helper lines for debugging */ + /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ FrameRect(Dc, &Rect, GetStockObject(BLACK_BRUSH)); - SelectObject(Dc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); + SelectObject(Dc, GetSysColorPen(COLOR_WINDOWFRAME)); MoveToEx(Dc, Rect.left, (Rect.top + Rect.bottom) / 2, NULL); LineTo(Dc, Rect.right, (Rect.top + Rect.bottom) / 2); #endif if (! MenuBar) - { - INT y = Rect.top + Rect.bottom; - UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); - UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); - - if (0 == (Item->fType & MF_OWNERDRAW)) - { - /* Draw the check mark - * - * FIXME: - * Custom checkmark bitmaps are monochrome but not always 1bpp. - */ - HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked; - if (NULL != bm) /* we have a custom bitmap */ - { - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - BitBlt(Dc, Rect.left, (y - CheckBitmapHeight) / 2, - CheckBitmapWidth, CheckBitmapHeight, - DcMem, 0, 0, SRCCOPY); - DeleteDC(DcMem); - } - else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */ - { - RECT r; - HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); - DrawFrameControl(DcMem, &r, DFC_MENU, - 0 != (Item->fType & MFT_RADIOCHECK) ? - DFCS_MENUBULLET : DFCS_MENUCHECK); - BitBlt(Dc, Rect.left, (y - r.bottom) / 2, r.right, r.bottom, - DcMem, 0, 0, SRCCOPY ); - DeleteDC(DcMem); - DeleteObject(bm); - } - if (Item->hbmpItem) - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); - } - } - - /* Draw the popup-menu arrow */ - if (0 != (Item->fType & MF_POPUP)) - { - HDC DcMem = CreateCompatibleDC(Dc); - HBITMAP OrigBitmap; - - OrigBitmap = SelectObject(DcMem, StdMnArrow); - BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, - (y - ArrowBitmapHeight) / 2, - ArrowBitmapWidth, ArrowBitmapHeight, - DcMem, 0, 0, SRCCOPY); - SelectObject(DcMem, OrigBitmap); - DeleteDC(DcMem); - } - - Rect.left += CheckBitmapWidth; - Rect.right -= ArrowBitmapWidth; - } - else - /* Draw the item text or bitmap */ - if (Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) //IS_BITMAP_ITEM(Item->fType)) - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); - } - - /* Done for owner-drawn */ - if (0 != (Item->fType & MF_OWNERDRAW)) - { - return; - } + { + INT y = Rect.top + Rect.bottom; + RECT Rc = Rect; + UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); + UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); + int checked = FALSE; + /* Draw the check mark + * + * FIXME: + * Custom checkmark bitmaps are monochrome but not always 1bpp. + */ + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + { + HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked; + if (NULL != bm) /* we have a custom bitmap */ + { + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + BitBlt(Dc, Rc.left, (y - CheckBitmapHeight) / 2, + CheckBitmapWidth, CheckBitmapHeight, + DcMem, 0, 0, SRCCOPY); + DeleteDC(DcMem); + checked = TRUE; + } + else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */ + { + RECT r; + HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); + DrawFrameControl(DcMem, &r, DFC_MENU, + 0 != (Item->fType & MFT_RADIOCHECK) ? + DFCS_MENUBULLET : DFCS_MENUCHECK); + BitBlt(Dc, Rc.left, (y - r.bottom) / 2, r.right, r.bottom, + DcMem, 0, 0, SRCCOPY ); + DeleteDC(DcMem); + DeleteObject(bm); + checked = TRUE; + } + } + if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } + /* Draw the popup-menu arrow */ + if (0 != (Item->fType & MF_POPUP)) + { + HDC DcMem = CreateCompatibleDC(Dc); + HBITMAP OrigBitmap; + + OrigBitmap = SelectObject(DcMem, StdMnArrow); + BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, + (y - ArrowBitmapHeight) / 2, + ArrowBitmapWidth, ArrowBitmapHeight, + DcMem, 0, 0, SRCCOPY); + SelectObject(DcMem, OrigBitmap); + DeleteDC(DcMem); + } + Rect.left += CheckBitmapWidth; + Rect.right -= ArrowBitmapWidth; + } + else if (Item->hbmpItem) /* Draw the bitmap */ + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } /* No bitmap - process text if present */ - else if ( !(Item->fType & MF_SYSMENU) && IS_STRING_ITEM(Item->fType)) - { - register int i; + if (Item->Text) + { + register int i = 0; HFONT FontOld = NULL; UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE @@ -833,14 +800,18 @@ Rect.left += MenuInfo->maxBmpSize.cx; Rect.right -= MenuInfo->maxBmpSize.cx; } + Text = (PWCHAR) Item->dwTypeData; - for (i = 0; L'\0' != Text[i]; i++) + if(Text) + { + for (i = 0; L'\0' != Text[i]; i++) { if (L'\t' == Text[i] || L'\b' == Text[i]) { break; } } + } if (0 != (Item->fState & MF_GRAYED)) { @@ -887,7 +858,7 @@ { SelectObject(Dc, FontOld); } - } + } } /*********************************************************************** @@ -1032,7 +1003,7 @@ MENUITEMINFOW mii; mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE; + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; mii.fType = GET_DWORD(res); res += sizeof(DWORD); mii.fState = GET_DWORD(res); @@ -1065,8 +1036,6 @@ } else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR)) { - DbgPrint("WARN: Converting NULL menu item %04x, type %04x to SEPARATOR\n", - mii.wID, mii.fType); mii.fType |= MF_SEPARATOR; } InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii); @@ -1209,9 +1178,12 @@ INT OrgX, INT OrgY, BOOL MenuBar) { PWCHAR p; + SIZE MenuCharSize; UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); DPRINT("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY); + + MenuCharSize.cx = GdiGetCharDimensions( Dc, NULL, &MenuCharSize.cy ); SetRect(&ItemInfo->Rect, OrgX, OrgY, OrgX, OrgY); @@ -1235,16 +1207,13 @@ /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average * width of a menufont character to the width of an owner-drawn menu. */ - ItemInfo->Rect.right += mis.itemWidth + 2 * - GdiGetCharDimensions( Dc, NULL, NULL ); + ItemInfo->Rect.right += mis.itemWidth + 2 * MenuCharSize.cx; + if (MenuBar) { - ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE; - /* under at least win95 you seem to be given a standard height for the menu and the height value is ignored */ - - ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENU) - 1; + ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENUSIZE); } else { @@ -1252,21 +1221,18 @@ } DPRINT("id=%04x size=%dx%d\n", ItemInfo->wID, mis.itemWidth, mis.itemHeight); - /* Fall through to get check/arrow width calculation. */ + return; } if (0 != (ItemInfo->fType & MF_SEPARATOR)) { ItemInfo->Rect.bottom += SEPARATOR_HEIGHT; + if( !MenuBar) + ItemInfo->Rect.right += ArrowBitmapWidth + MenuCharSize.cx; return; } - if (0 != (ItemInfo->fType & MF_OWNERDRAW)) - { - return; - } - - if (ItemInfo->hbmpItem) //IS_BITMAP_ITEM(ItemInfo->fType)) + if (ItemInfo->hbmpItem) { SIZE Size; @@ -1289,7 +1255,6 @@ { ItemInfo->Rect.right += ArrowBitmapWidth; } - } else { @@ -1309,7 +1274,7 @@ } /* it must be a text item - unless it's the system menu */ - if (0 == (ItemInfo->fType & MF_SYSMENU) && IS_STRING_ITEM(ItemInfo->fType)) + if (0 == (ItemInfo->fType & MF_SYSMENU) && ItemInfo->Text) { SIZE Size; @@ -1372,7 +1337,7 @@ Start = 0; MaxX = 2 + 1; - MenuInitRosMenuItemInfo(&ItemInfo); + MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) { OrgX = MaxX; @@ -1394,7 +1359,6 @@ { break; } - MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, FALSE); if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { @@ -1409,7 +1373,7 @@ } MaxX = max(MaxX, ItemInfo.Rect.right); OrgY = ItemInfo.Rect.bottom; - if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab) + if ((ItemInfo.Text) && 0 != ItemInfo.XTab) { MaxTab = max(MaxTab, ItemInfo.XTab); MaxTabWidth = max(MaxTabWidth, ItemInfo.Rect.right - ItemInfo.XTab); @@ -1423,7 +1387,7 @@ if (MenuGetRosMenuItemInfo(MenuInfo->Self, Start, &ItemInfo)) { ItemInfo.Rect.right = MaxX; - if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab) + if ((ItemInfo.Text) && 0 != ItemInfo.XTab) { ItemInfo.XTab = MaxTab; } @@ -1476,6 +1440,7 @@ MaxY = Rect->top + 1; Start = 0; HelpPos = -1; + MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) { @@ -1502,6 +1467,7 @@ DPRINT("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY); MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, TRUE); + if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -1531,7 +1497,8 @@ } } -/* FIXME: Is this really needed? */ +/* FIXME: Is this really needed? */ /*NO! it is not needed, why make the +HBMMENU_MBAR_CLOSE, MINIMIZE & RESTORE, look the same size as the menu bar! */ #if 0 /* Finish the line (set all items to the largest height found) */ while (Start < i) @@ -1544,7 +1511,7 @@ Start++; } #else - Start = i; + Start = i; /* This works! */ #endif } @@ -1731,7 +1698,9 @@ SendMessageW(Wnd, WM_INITMENU, (WPARAM)Menu, 0); - if (MenuGetRosMenuInfo(&MenuInfo, Menu) && 0 == MenuInfo.Height) + MenuGetRosMenuInfo(&MenuInfo, Menu); + + if (0 == MenuInfo.Height) { /* app changed/recreated menu bar entries in WM_INITMENU Recalculate menu sizes else clicks will not work */ @@ -1739,6 +1708,15 @@ SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } + /* This makes the menus of applications built with Delphi work. + * It also enables menus to be displayed in more than one window, + * but there are some bugs left that need to be fixed in this case. + */ + if(MenuInfo.Self == Menu) + { + MenuInfo.Wnd = Wnd; + MenuSetRosMenuInfo(&MenuInfo); + } } return TRUE; @@ -1771,6 +1749,7 @@ MenuInitRosMenuItemInfo(&ItemInfo); if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT); MenuSetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo); } @@ -1936,12 +1915,12 @@ SelectObject(Dc, hMenuFont); MenuInitRosMenuItemInfo(&ItemInfo); - /* Clear previous highlighted item */ if (NO_SELECTED_ITEM != MenuInfo->FocusedItem) { if (MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT); MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); } @@ -1959,6 +1938,7 @@ { if (0 == (ItemInfo.fType & MF_SEPARATOR)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_HILITE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, @@ -1993,7 +1973,6 @@ } } } - MenuCleanupRosMenuItemInfo(&ItemInfo); ReleaseDC(MenuInfo->Wnd, Dc); } @@ -2113,7 +2092,7 @@ } #if 0 mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_STATE; + mii.fMask |= MIIM_STATE; if((DefItem != SC_CLOSE) && GetMenuItemInfoW(Menu, DefItem, FALSE, &mii) && (mii.fState & (MFS_GRAYED | MFS_DISABLED))) { @@ -2188,7 +2167,7 @@ } SelectObject(Dc, hMenuFont); - + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_HILITE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, &ItemInfo, MenuInfo->Height, @@ -2202,8 +2181,8 @@ ItemInfo.Rect = Rect; } + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_MOUSESELECT; - MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); if (IS_SYSTEM_MENU(MenuInfo)) @@ -2264,6 +2243,7 @@ if (NULL != MenuInfo && NULL != TopPopup && NO_SELECTED_ITEM != MenuInfo->FocusedItem) { MenuInitRosMenuItemInfo(&ItemInfo); + ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE; if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo) || 0 == (ItemInfo.fType & MF_POPUP) || 0 == (ItemInfo.fState & MF_MOUSESELECT)) @@ -2272,6 +2252,7 @@ return; } ItemInfo.fState &= ~MF_MOUSESELECT; + ItemInfo.fMask |= MIIM_STATE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); if (MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu)) { @@ -3123,7 +3104,7 @@ ItemInfo = Items; for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++) { - if (IS_STRING_ITEM(ItemInfo->fType) && NULL != ItemInfo->dwTypeData) + if ((ItemInfo->Text) && NULL != ItemInfo->dwTypeData) { WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2; do @@ -3412,6 +3393,7 @@ break; } break; /* WM_KEYDOWN */ + case WM_CHAR: case WM_SYSCHAR: { @@ -3457,7 +3439,9 @@ } else { + PeekMessageW( &Msg, 0, Msg.message, Msg.message, PM_REMOVE ); DispatchMessageW(&Msg); + continue; } if (! fEndMenu) @@ -3625,7 +3609,27 @@ } - +/* + * From MSDN: + * The MFT_BITMAP, MFT_SEPARATOR, and MFT_STRING values cannot be combined + * with one another. Also MFT_OWNERDRAW. Set fMask to MIIM_TYPE to use fType. + * + * Windows 2K/XP: fType is used only if fMask has a value of MIIM_FTYPE. + * + * MIIM_TYPE: Retrieves or sets the fType and dwTypeData members. Windows + * 2K/XP: MIIM_TYPE is replaced by MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING. + * MFT_STRING is replaced by MIIM_STRING. + * (So, I guess we should use MIIM_STRING only for strings?) + * + * MIIM_FTYPE: Windows 2K/Windows XP: Retrieves or sets the fType member. + * + * Based on wine, SetMenuItemInfo_common: + * 1) set MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP any one with MIIM_TYPE, + * it will result in a error. + * 2) set menu mask to MIIM_FTYPE and MFT_BITMAP ftype it will result in a error. + * These conditions are addressed in Win32k IntSetMenuItemInfo. + * + */ static BOOL FASTCALL @@ -3636,11 +3640,14 @@ LPCWSTR NewItem, BOOL Unicode) { +/* + * Let us assume MIIM_FTYPE is set and building a new menu item structure. + */ if(Flags & MF_BITMAP) { - mii->fType |= MFT_BITMAP; - mii->fMask |= MIIM_BITMAP; + mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/ mii->hbmpItem = (HBITMAP) NewItem; + mii->fType &= ~MFT_BITMAP; /* just incase, Kill the old way */ } else if(Flags & MF_OWNERDRAW) { @@ -3648,13 +3655,12 @@ mii->fMask |= MIIM_DATA; mii->dwItemData = (DWORD) NewItem; } + else if (Flags & MF_SEPARATOR) + { + mii->fType |= MFT_SEPARATOR; + } else /* Default action MF_STRING. */ { - /* - if(mii->dwTypeData != NULL) - { - HeapFree(GetProcessHeap(),0, mii.dwTypeData); - }*/ /* Item beginning with a backspace is a help item */ if (NewItem != NULL) { @@ -3677,11 +3683,8 @@ } } } - else - { - mii->fType |= MFT_SEPARATOR; - } - mii->fMask |= MIIM_TYPE; + mii->fMask |= MIIM_STRING; + mii->fType |= MFT_STRING; /* Zero */ mii->dwTypeData = (LPWSTR)NewItem; if (Unicode) mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); @@ -3690,29 +3693,40 @@ mii->hbmpItem = NULL; } - if(Flags & MF_RIGHTJUSTIFY) + if(Flags & MF_RIGHTJUSTIFY) /* Same as MF_HELP */ { mii->fType |= MFT_RIGHTJUSTIFY; } + + if(Flags & MF_BYPOSITION) + { + mii->fType |= MF_BYPOSITION; + } + if(Flags & MF_MENUBREAK) { mii->fType |= MFT_MENUBREAK; } - if(Flags & MF_MENUBARBREAK) + else if(Flags & MF_MENUBARBREAK) { mii->fType |= MFT_MENUBARBREAK; } - if(Flags & MF_DISABLED) - { - mii->fState |= MFS_DISABLED; - } + if(Flags & MF_GRAYED) { mii->fState |= MFS_GRAYED; + mii->fMask |= MIIM_STATE; } - - if ((mii->fType & MF_POPUP) && (Flags & MF_POPUP) && (mii->hSubMenu != (HMENU)IDNewItem)) - NtUserDestroyMenu( mii->hSubMenu ); /* ModifyMenu() spec */ + else if(Flags & MF_DISABLED) + { + mii->fState |= MFS_DISABLED; + mii->fMask |= MIIM_STATE; + } + else /* default state */ + { + mii->fState |= MFS_ENABLED; + mii->fMask |= MIIM_STATE; + } if(Flags & MF_POPUP) { @@ -3808,6 +3822,7 @@ if (0 != (Items[i].fType & MF_MENUBARBREAK)) break; if ( i >= idFirst && i <= idLast ) { + Items[i].fMask = MIIM_STATE | MIIM_FTYPE; if ( i == idCheck) { Items[i].fType |= MFT_RADIOCHECK; @@ -4042,14 +4057,14 @@ return FALSE; } - if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0) + if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); } AnsiBuffer = mii->dwTypeData; - Count = mii->cch; + Count = miiW.cch = mii->cch; RtlCopyMemory(&miiW, mii, mii->cbSize); miiW.dwTypeData = 0; @@ -4061,7 +4076,10 @@ } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) + { + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; + } RtlCopyMemory(mii, &miiW, miiW.cbSize); @@ -4073,7 +4091,7 @@ return TRUE; } - if (IS_STRING_ITEM(miiW.fType)) + if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, mii->cch, NULL, NULL); @@ -4107,7 +4125,7 @@ return FALSE; } - if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0) + if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); @@ -4115,7 +4133,7 @@ String = mii->dwTypeData; Count = mii->cch; - RtlCopyMemory(&miiW, mii, mii->cbSize); + RtlCopyMemory(&miiW, mii, mii->cbSize); miiW.dwTypeData = 0; if (String) @@ -4126,9 +4144,12 @@ } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) + { + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; - - RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over write user data. + } + + RtlCopyMemory(mii, &miiW, miiW.cbSize); // Okay to over write user data. if (!String || !Count) { @@ -4138,7 +4159,7 @@ return TRUE; } - if (IS_STRING_ITEM(miiW.fType)) + if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { lstrcpynW( String, miiW.dwTypeData, Count ); } @@ -4175,10 +4196,9 @@ { ROSMENUINFO MenuInfo; ROSMENUITEMINFO mii; - + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_STATE | MIIM_TYPE | MIIM_SUBMENU; - mii.dwTypeData = NULL; + mii.fMask = MIIM_STATE | MIIM_FTYPE | MIIM_SUBMENU; SetLastError(0); if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE)) @@ -4220,9 +4240,10 @@ UINT uFlag) { MENUITEMINFOA mii; + memset( &mii, 0, sizeof(mii) ); mii.dwTypeData = lpString; - mii.fMask = MIIM_STRING; - mii.fType = MF_STRING; + mii.fMask = MIIM_STRING | MIIM_FTYPE; + mii.fType = MFT_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; @@ -4246,9 +4267,10 @@ UINT uFlag) { MENUITEMINFOW miiW; + memset( &miiW, 0, sizeof(miiW) ); miiW.dwTypeData = lpString; - miiW.fMask = MIIM_STRING; - miiW.fType = MF_STRING; + miiW.fMask = MIIM_STRING | MIIM_FTYPE; + miiW.fType = MFT_STRING; miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; @@ -4327,10 +4349,9 @@ LPCSTR lpNewItem) { MENUITEMINFOA mii; + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_FTYPE; MenuSetItemData((LPMENUITEMINFOW) &mii, uFlags, @@ -4363,12 +4384,21 @@ if((lpmii->cbSize == sizeof(MENUITEMINFOA)) || (lpmii->cbSize == sizeof(MENUITEMINFOA) - sizeof(HBITMAP))) { - RtlMoveMemory ( &mi, lpmii, lpmii->cbSize ); - + RtlCopyMemory ( &mi, lpmii, lpmii->cbSize ); + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) + { + mi.cbSize = sizeof( MENUITEMINFOW); + mi.hbmpItem = NULL; + } /* copy the text string */ - if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(mi.fType) == MF_STRING) && mi.dwTypeData) - { + if (((mi.fMask & MIIM_STRING) || + ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) + && mi.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrA(lpmii->dwTypeData, Count)) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); if (!NT_SUCCESS (Status)) { @@ -4379,7 +4409,6 @@ mi.cch = MenuText.Length / sizeof(WCHAR); CleanHeap = TRUE; } - res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi); if ( CleanHeap ) RtlFreeUnicodeString ( &MenuText ); @@ -4402,7 +4431,6 @@ MENUITEMINFOW mi; UNICODE_STRING MenuText; BOOL res = FALSE; - mi.hbmpItem = (HBITMAP)0; /* while we could just pass 'lpmii' to win32k, we make a copy so that if a bad user passes bad data, we crash his process instead of the @@ -4411,18 +4439,25 @@ if((lpmii->cbSize == sizeof(MENUITEMINFOW)) || (lpmii->cbSize == sizeof(MENUITEMINFOW) - sizeof(HBITMAP))) { - memcpy(&mi, lpmii, lpmii->cbSize); - + RtlCopyMemory(&mi, lpmii, lpmii->cbSize); + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) + { + mi.cbSize = sizeof( MENUITEMINFOW); + mi.hbmpItem = NULL; + } /* copy the text string */ - if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(mi.fType) == MF_STRING) && - mi.dwTypeData != NULL) - { + if (((mi.fMask & MIIM_STRING) || + ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) + && mi.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData); mi.dwTypeData = MenuText.Buffer; mi.cch = MenuText.Length / sizeof(WCHAR); - }; - + } res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi); } return res; @@ -4442,10 +4477,9 @@ LPCWSTR lpNewItem) { MENUITEMINFOW mii; + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_FTYPE; MenuSetItemData( &mii, uFlags, @@ -4581,18 +4615,28 @@ UINT_PTR uIDNewItem, LPCSTR lpNewItem) { + ROSMENUINFO mi; + ROSMENUITEMINFO rmii; MENUITEMINFOA mii; memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; - - if(!GetMenuItemInfoA( hMnu, - uPosition, - (BOOL)(MF_BYPOSITION & uFlags), - &mii)) return FALSE; - + mii.fMask = MIIM_FTYPE; + + if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE; + + mi.Height = 0; + + if (!MenuSetRosMenuInfo( &mi )) return FALSE; + + MenuInitRosMenuItemInfo( &rmii ); + + if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; + + if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ + + MenuCleanupRosMenuItemInfo( &rmii ); + MenuSetItemData((LPMENUITEMINFOW) &mii, uFlags, uIDNewItem, @@ -4618,24 +4662,36 @@ UINT_PTR uIDNewItem, LPCWSTR lpNewItem) { + ROSMENUINFO mi; + ROSMENUITEMINFO rmii; MENUITEMINFOW mii; memset ( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fState = MFS_ENABLED; - - if(!NtUserMenuItemInfo( hMnu, - uPosition, - (BOOL)(MF_BYPOSITION & uFlags), - (PROSMENUITEMINFO) &mii, - FALSE)) return FALSE; - + mii.fMask = MIIM_FTYPE; + + if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE; + + mi.Height = 0; // Force size recalculation. + + if (!MenuSetRosMenuInfo( &mi )) return FALSE; + + MenuInitRosMenuItemInfo( &rmii ); + + if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; + + if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ + + MenuCleanupRosMenuItemInfo( &rmii ); + + /* Init new data for this menu item */ MenuSetItemData( &mii, uFlags, uIDNewItem, lpNewItem, TRUE); + /* Now, make Win32k IntSetMenuItemInfo handle the changes to this menu item. */ return SetMenuItemInfoW( hMnu, uPosition, (BOOL)(MF_BYPOSITION & uFlags), @@ -4714,7 +4770,9 @@ HBITMAP hBitmapChecked) { ROSMENUITEMINFO uItem; - + memset ( &uItem, 0, sizeof(uItem) ); + uItem.fMask = MIIM_STATE | MIIM_BITMAP; + if(!(NtUserMenuItemInfo(hMenu, uPosition, (BOOL)(MF_BYPOSITION & uFlags), &uItem, FALSE))) return FALSE; @@ -4746,16 +4804,38 @@ { MENUITEMINFOW MenuItemInfoW; UNICODE_STRING UnicodeString; - ULONG Result; + NTSTATUS Status; + ULONG Result = FALSE; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); - if ((MenuItemInfoW.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING) && - MenuItemInfoW.dwTypeData != NULL) + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, + MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW); + MenuItemInfoW.hbmpItem = NULL; + } +/* + * MIIM_STRING == good + * MIIM_TYPE & MFT_STRING == good + * MIIM_STRING & MFT_STRING == good + * MIIM_STRING & MFT_OWNERSRAW == good + */ + if (((MenuItemInfoW.fMask & MIIM_STRING) || + ((MenuItemInfoW.fMask & MIIM_TYPE) && + (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) + && MenuItemInfoW.dwTypeData != NULL) + { +/* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrA(lpmii->dwTypeData, Count )) return FALSE; + Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)MenuItemInfoW.dwTypeData); + if (!NT_SUCCESS (Status)) + { + SetLastError (RtlNtStatusToDosError(Status)); + return FALSE; + } MenuItemInfoW.dwTypeData = UnicodeString.Buffer; MenuItemInfoW.cch = UnicodeString.Length / sizeof(WCHAR); } @@ -4788,15 +4868,30 @@ LPCMENUITEMINFOW lpmii) { MENUITEMINFOW MenuItemInfoW; + ULONG Result; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); - if (0 != (MenuItemInfoW.fMask & MIIM_STRING)) + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) { - MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); + MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW); + MenuItemInfoW.hbmpItem = NULL; } - return NtUserMenuItemInfo(hMenu, uItem, fByPosition, + if (((MenuItemInfoW.fMask & MIIM_STRING) || + ((MenuItemInfoW.fMask & MIIM_TYPE) && + (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) + && MenuItemInfoW.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if (!Count) Count++; + if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; + MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); + } + Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + + return Result; } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:28:44 2006 @@ -302,9 +302,8 @@ Window = UserGetWindowObject(Menu->MenuInfo.Wnd); if (Window) { - Window->IDMenu = 0;; + Window->IDMenu = 0; } - } ObmDeleteObject(Menu->MenuInfo.Self, otMenu); ObDereferenceObject(WindowStation); @@ -352,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); return Menu; } @@ -456,7 +455,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); IntCloneMenuItems(Menu, Source); @@ -693,6 +692,10 @@ { NTSTATUS Status; + if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) + { + lpmii->fType = MenuItem->fType; + } if(lpmii->fMask & MIIM_BITMAP) { lpmii->hbmpItem = MenuItem->hbmpItem; @@ -706,10 +709,6 @@ { lpmii->dwItemData = MenuItem->dwItemData; } - if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) - { - lpmii->fType = MenuItem->fType; - } if(lpmii->fMask & MIIM_ID) { lpmii->wID = MenuItem->wID; @@ -722,7 +721,9 @@ { lpmii->hSubMenu = MenuItem->hSubMenu; } - if (lpmii->fMask & (MIIM_STRING | MIIM_TYPE)) + + if ((lpmii->fMask & MIIM_STRING) || + ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))) { if (lpmii->dwTypeData == NULL) { @@ -745,6 +746,7 @@ { lpmii->Rect = MenuItem->Rect; lpmii->XTab = MenuItem->XTab; + lpmii->Text = MenuItem->Text.Buffer; } return TRUE; @@ -754,7 +756,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { PMENU_OBJECT SubMenuObject; - UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MF_BYPOSITION | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); if(!MenuItem || !MenuObject || !lpmii) { @@ -762,36 +764,61 @@ } if( lpmii->fType & ~fTypeMask) { - DPRINT("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); + DbgPrint("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE); } - if(lpmii->fMask & MIIM_BITMAP) - { - MenuItem->hbmpItem = lpmii->hbmpItem; - } - if(lpmii->fMask & MIIM_CHECKMARKS) - { - MenuItem->hbmpChecked = lpmii->hbmpChecked; - MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked; - } - if(lpmii->fMask & MIIM_DATA) - { - MenuItem->dwItemData = lpmii->dwItemData; - } - if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) - { + if(lpmii->fMask & MIIM_TYPE) + { + if(lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) + { + DbgPrint("IntSetMenuItemInfo: Invalid combination of fMask bits used\n"); + /* this does not happen on Win9x/ME */ + SetLastNtError( ERROR_INVALID_PARAMETER); + return FALSE; + } /* * Delete the menu item type when changing type from * MF_STRING. */ if (MenuItem->fType != lpmii->fType && - MENU_ITEM_TYPE(MenuItem->fType) == MF_STRING) + MENU_ITEM_TYPE(MenuItem->fType) == MFT_STRING) { FreeMenuText(MenuItem); RtlInitUnicodeString(&MenuItem->Text, NULL); } - MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); - MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); + if(lpmii->fType & MFT_BITMAP) + { +// if(lpmii->hbmpItem) + MenuItem->hbmpItem = lpmii->hbmpItem; +// else +// { /* Win 9x/Me stuff */ +// MenuItem->hbmpItem = (HBITMAP)lpmii->dwTypeData; +// } + } + MenuItem->fType |= lpmii->fType; + } + if (lpmii->fMask & MIIM_FTYPE ) + { + if(( lpmii->fType & MFT_BITMAP)) + { + DbgPrint("IntSetMenuItemInfo: Can not use FTYPE and MFT_BITMAP.\n"); + SetLastNtError( ERROR_INVALID_PARAMETER); + return FALSE; + } + MenuItem->fType |= lpmii->fType; + } + if(lpmii->fMask & MIIM_BITMAP) + { + MenuItem->hbmpItem = lpmii->hbmpItem; + } + if(lpmii->fMask & MIIM_CHECKMARKS) + { + MenuItem->hbmpChecked = lpmii->hbmpChecked; + MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked; + } + if(lpmii->fMask & MIIM_DATA) + { + MenuItem->dwItemData = lpmii->dwItemData; } if(lpmii->fMask & MIIM_ID) { @@ -829,8 +856,9 @@ MenuItem->fType &= ~MF_POPUP; } } - if ((lpmii->fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING)) + + if ((lpmii->fMask & MIIM_STRING) || + ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))) { FreeMenuText(MenuItem); @@ -870,6 +898,7 @@ { MenuItem->Rect = lpmii->Rect; MenuItem->XTab = lpmii->XTab; + lpmii->Text = MenuItem->Text.Buffer; /* Send back new allocated string or zero */ } return TRUE;

1 0

[turner] 23220: Revert my backspace patch from before. I found a better way to handle backspaces which doesnt break backspacing in ftp.exe(and some of apps) while still fixing ncftp.exe.
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 09:16:26 2006 New Revision: 23220 URL: http://svn.reactos.org/svn/reactos?rev=23220&view=rev Log: Revert my backspace patch from before. I found a better way to handle backspaces which doesnt break backspacing in ftp.exe(and some of apps) while still fixing ncftp.exe. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sat Jul 22 09:16:26 2006 @@ -607,8 +607,12 @@ && Input->InputEvent.Event.KeyEvent.bKeyDown && Input->InputEvent.Event.KeyEvent.uChar.AsciiChar != '\0') { - /* backspace handling */ - if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) + /* + * backspace handling - if we are in charge of echoing it then we handle it here + * otherwise we treat it like a normal char. + */ + if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar && 0 + != (Console->Mode & ENABLE_ECHO_INPUT)) { /* echo if it has not already been done, and either we or the client has chars to be deleted */ if (! Input->Echoed @@ -622,14 +626,14 @@ i -= 2; /* if we already have something to return, just back it up by 2 */ } else - { - /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ + { /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); - Request->Data.ReadConsoleRequest.NrCharactersRead++; - Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; - return Request->Status; + Request->Data.ReadConsoleRequest.NrCharactersRead = 0; + Request->Status = STATUS_NOTIFY_CLEANUP; + return STATUS_NOTIFY_CLEANUP; + } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */

1 0

[hpoussin] 23219: Get rid of TCHAR variables. Use WCHAR instead.
by hpoussin＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: hpoussin Date: Sat Jul 22 02:15:21 2006 New Revision: 23219 URL: http://svn.reactos.org/svn/reactos?rev=23219&view=rev Log: Get rid of TCHAR variables. Use WCHAR instead. Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev.rbuild trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Sat Jul 22 02:15:21 2006 @@ -30,8 +30,8 @@ static BOOL SearchDriver( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL); + IN LPCWSTR Directory OPTIONAL, + IN LPCWSTR InfFile OPTIONAL); /* * @implemented @@ -250,14 +250,14 @@ static BOOL SearchDriver( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Directory OPTIONAL, - IN LPCTSTR InfFile OPTIONAL) -{ - SP_DEVINSTALL_PARAMS DevInstallParams = {0,}; + IN LPCWSTR Directory OPTIONAL, + IN LPCWSTR InfFile OPTIONAL) +{ + SP_DEVINSTALL_PARAMS_W DevInstallParams = {0,}; BOOL ret; - DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); - if (!SetupDiGetDeviceInstallParams(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) { TRACE("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); return FALSE; @@ -267,20 +267,20 @@ if (InfFile) { DevInstallParams.Flags |= DI_ENUMSINGLEINF; - _tcsncpy(DevInstallParams.DriverPath, InfFile, MAX_PATH); + wcsncpy(DevInstallParams.DriverPath, InfFile, MAX_PATH); } else if (Directory) { DevInstallParams.Flags &= ~DI_ENUMSINGLEINF; - _tcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH); + wcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH); } else { DevInstallParams.Flags &= ~DI_ENUMSINGLEINF; - *DevInstallParams.DriverPath = _T('\0'); - } - - ret = SetupDiSetDeviceInstallParams( + *DevInstallParams.DriverPath = '\0'; + } + + ret = SetupDiSetDeviceInstallParamsW( DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams); @@ -319,20 +319,20 @@ } static BOOL -IsDots(IN LPCTSTR str) -{ - if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; +IsDots(IN LPCWSTR str) +{ + if(wcscmp(str, L".") && wcscmp(str, L"..")) return FALSE; return TRUE; } -static LPCTSTR -GetFileExt(IN LPTSTR FileName) -{ - LPCTSTR Dot; - - Dot = _tcsrchr(FileName, _T('.')); +static LPCWSTR +GetFileExt(IN LPWSTR FileName) +{ + LPCWSTR Dot; + + Dot = wcsrchr(FileName, '.'); if (!Dot) - return _T(""); + return L""; return Dot; } @@ -340,40 +340,40 @@ static BOOL SearchDriverRecursive( IN PDEVINSTDATA DevInstData, - IN LPCTSTR Path) -{ - WIN32_FIND_DATA wfd; - TCHAR DirPath[MAX_PATH]; - TCHAR FileName[MAX_PATH]; - TCHAR FullPath[MAX_PATH]; - TCHAR LastDirPath[MAX_PATH] = _T(""); - TCHAR PathWithPattern[MAX_PATH]; + IN LPCWSTR Path) +{ + WIN32_FIND_DATAW wfd; + WCHAR DirPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + WCHAR FullPath[MAX_PATH]; + WCHAR LastDirPath[MAX_PATH] = L""; + WCHAR PathWithPattern[MAX_PATH]; BOOL ok = TRUE; BOOL retval = FALSE; HANDLE hFindFile = INVALID_HANDLE_VALUE; - _tcscpy(DirPath, Path); - - if (DirPath[_tcsclen(DirPath) - 1] != '\\') - _tcscat(DirPath, _T("\\")); - - _tcscpy(PathWithPattern, DirPath); - _tcscat(PathWithPattern, _T("\\*")); - - for (hFindFile = FindFirstFile(PathWithPattern, &wfd); + wcscpy(DirPath, Path); + + if (DirPath[wcslen(DirPath) - 1] != '\\') + wcscat(DirPath, L"\\"); + + wcscpy(PathWithPattern, DirPath); + wcscat(PathWithPattern, L"\\*"); + + for (hFindFile = FindFirstFileW(PathWithPattern, &wfd); ok && hFindFile != INVALID_HANDLE_VALUE; - ok = FindNextFile(hFindFile, &wfd)) - { - - _tcscpy(FileName, wfd.cFileName); + ok = FindNextFileW(hFindFile, &wfd)) + { + + wcscpy(FileName, wfd.cFileName); if (IsDots(FileName)) continue; if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Recursive search */ - _tcscpy(FullPath, DirPath); - _tcscat(FullPath, FileName); + wcscpy(FullPath, DirPath); + wcscat(FullPath, FileName); if (SearchDriverRecursive(DevInstData, FullPath)) { retval = TRUE; @@ -382,13 +382,13 @@ } else { - LPCTSTR pszExtension = GetFileExt(FileName); - - if ((_tcsicmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)) - { - _tcscpy(LastDirPath, DirPath); - - if (_tcsclen(DirPath) > MAX_PATH) + LPCWSTR pszExtension = GetFileExt(FileName); + + if ((wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath, DirPath) != 0)) + { + wcscpy(LastDirPath, DirPath); + + if (wcslen(DirPath) > MAX_PATH) /* Path is too long to be searched */ continue; @@ -422,11 +422,11 @@ /* We need to check all specified directories to be * sure to find the best driver for the device. */ - LPCTSTR Path; - for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += _tcslen(Path) + 1) + LPCWSTR Path; + for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += wcslen(Path) + 1) { TRACE("Search driver in %S\n", Path); - if (_tcslen(Path) == 2 && Path[1] == ':') + if (wcslen(Path) == 2 && Path[1] == ':') { if (SearchDriverRecursive(DevInstData, Path)) result = TRUE; @@ -449,13 +449,13 @@ IN BOOL IncludeCustomPath, IN HWND hwndCombo OPTIONAL) { - TCHAR drive[] = {'?',':',0}; + WCHAR drive[] = {'?',':',0}; DWORD dwDrives = 0; DWORD i; UINT nType; DWORD CustomTextLength = 0; DWORD LengthNeeded = 0; - LPTSTR Buffer; + LPWSTR Buffer; /* Calculate length needed to store the search paths */ if (IncludeRemovableDevices) @@ -465,7 +465,7 @@ { if (dwDrives & i) { - nType = GetDriveType(drive); + nType = GetDriveTypeW(drive); if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) { LengthNeeded += 3; @@ -484,7 +484,7 @@ DevInstData->CustomSearchPath = Buffer = HeapAlloc( GetProcessHeap(), 0, - (LengthNeeded + 1) * sizeof(TCHAR)); + (LengthNeeded + 1) * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); @@ -499,19 +499,19 @@ { if (dwDrives & i) { - nType = GetDriveType(drive); + nType = GetDriveTypeW(drive); if (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM) { - Buffer += 1 + _stprintf(Buffer, drive); + Buffer += 1 + swprintf(Buffer, drive); } } } } if (IncludeCustomPath) { - Buffer += 1 + ComboBox_GetText(hwndCombo, Buffer, CustomTextLength); - } - *Buffer = _T('\0'); + Buffer += 1 + GetWindowTextW(hwndCombo, Buffer, CustomTextLength); + } + *Buffer = '\0'; return TRUE; } @@ -522,7 +522,7 @@ { BOOL ret; - TRACE("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + TRACE("Installing driver %s: %s\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); ret = SetupDiCallClassInstaller( DIF_SELECTBESTCOMPATDRV, @@ -733,7 +733,7 @@ } } - TRACE("Installing %S (%S)\n", DevInstData->buffer, InstanceId); + TRACE("Installing %s (%S)\n", DevInstData->buffer, InstanceId); /* Search driver in default location and removable devices */ if (!PrepareFoldersToScan(DevInstData, FALSE, FALSE, NULL)) Modified: trunk/reactos/dll/win32/newdev/newdev.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rb… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.rbuild (original) +++ trunk/reactos/dll/win32/newdev/newdev.rbuild Sat Jul 22 02:15:21 2006 @@ -1,7 +1,5 @@ <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> <include base="newdev">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <importlibrary definition="newdev.spec.def" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h Sat Jul 22 02:15:21 2006 @@ -1,6 +1,7 @@ #ifndef __NEWDEV_PRIVATE_H #define __NEWDEV_PRIVATE_H +#define COBJMACROS #include <windows.h> #include <windowsx.h> #include <commctrl.h> @@ -9,7 +10,6 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <shlobj.h> -#include <tchar.h> #include <wine/debug.h> #include <stdio.h> @@ -29,7 +29,7 @@ SP_DEVINFO_DATA devInfoData; SP_DRVINFO_DATA drvInfoData; - LPTSTR CustomSearchPath; /* MULTI_SZ string */ + LPWSTR CustomSearchPath; /* MULTI_SZ string */ } DEVINSTDATA, *PDEVINSTDATA; #define WM_SEARCH_FINISHED (WM_USER + 10) Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Sat Jul 22 02:15:21 2006 @@ -237,8 +237,8 @@ HKEY hKey = NULL; DWORD dwRegType; DWORD dwPathLength; - LPTSTR Buffer = NULL; - LPCTSTR Path; + LPWSTR Buffer = NULL; + LPCWSTR Path; LONG rc; (void)ComboBox_ResetContent(hwndCombo); @@ -255,9 +255,9 @@ TRACE("RegOpenKeyEx() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegQueryValueEx( + rc = RegQueryValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", NULL, &dwRegType, NULL, @@ -269,15 +269,15 @@ } /* Allocate enough space to add 2 NULL chars at the end of the string */ - Buffer = HeapAlloc(GetProcessHeap(), 0, dwPathLength + 2 * sizeof(TCHAR)); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwPathLength + 2 * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); goto cleanup; } - rc = RegQueryValueEx( + rc = RegQueryValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", NULL, NULL, (LPBYTE)Buffer, @@ -290,7 +290,7 @@ Buffer[dwPathLength] = Buffer[dwPathLength + 1] = '\0'; /* Populate combo box */ - for (Path = Buffer; *Path; Path += _tcslen(Path) + 1) + for (Path = Buffer; *Path; Path += wcslen(Path) + 1) { (void)ComboBox_AddString(hwndCombo, Path); if (Path == Buffer) @@ -307,10 +307,10 @@ SaveCustomPath( IN HWND hwndCombo) { - LPTSTR CustomPath = NULL; + LPWSTR CustomPath = NULL; DWORD CustomPathLength; - LPTSTR Buffer = NULL; - LPTSTR pBuffer; /* Pointer into Buffer */ + LPWSTR Buffer = NULL; + LPWSTR pBuffer; /* Pointer into Buffer */ int ItemsCount, Length; DWORD i; DWORD TotalLength = 0; @@ -320,13 +320,13 @@ /* Get custom path */ Length = ComboBox_GetTextLength(hwndCombo) + 1; - CustomPath = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(TCHAR)); + CustomPath = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); if (!CustomPath) { TRACE("HeapAlloc() failed\n"); goto cleanup; } - CustomPathLength = ComboBox_GetText(hwndCombo, CustomPath, Length) + 1; + CustomPathLength = GetWindowTextW(hwndCombo, CustomPath, Length) + 1; /* Calculate length of the buffer */ ItemsCount = ComboBox_GetCount(hwndCombo); @@ -348,7 +348,7 @@ TotalLength++; /* Final NULL char */ /* Allocate buffer */ - Buffer = HeapAlloc(GetProcessHeap(), 0, (CustomPathLength + TotalLength + 1) * sizeof(TCHAR)); + Buffer = HeapAlloc(GetProcessHeap(), 0, (CustomPathLength + TotalLength + 1) * sizeof(WCHAR)); if (!Buffer) { TRACE("HeapAlloc() failed\n"); @@ -365,7 +365,7 @@ TRACE("ComboBox_GetLBText() failed\n"); goto cleanup; } - else if (UseCustomPath && _tcsicmp(CustomPath, pBuffer) == 0) + else if (UseCustomPath && wcsicmp(CustomPath, pBuffer) == 0) UseCustomPath = FALSE; pBuffer += 1 + Length; } @@ -378,7 +378,7 @@ } TotalLength += CustomPathLength; - _tcscpy(Buffer, CustomPath); + wcscpy(Buffer, CustomPath); /* Save the buffer */ /* RegSetKeyValue would have been better... */ @@ -393,13 +393,13 @@ TRACE("RegOpenKeyEx() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegSetValueEx( + rc = RegSetValueExW( hKey, - _T("Installation Sources"), + L"Installation Sources", 0, REG_MULTI_SZ, (const BYTE*)Buffer, - TotalLength * sizeof(TCHAR)); + TotalLength * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { TRACE("RegSetValueEx() failed with error 0x%lx\n", rc); @@ -595,21 +595,20 @@ pidl = SHBrowseForFolder(&bi); if (pidl) { - TCHAR Directory[MAX_PATH]; + WCHAR Directory[MAX_PATH]; IMalloc* malloc; - if (SHGetPathFromIDList(pidl, Directory)) + if (SHGetPathFromIDListW(pidl, Directory)) { /* Set the IDC_COMBO_PATH text */ - ComboBox_SetText(GetDlgItem(hwndDlg, IDC_COMBO_PATH), Directory); + SetWindowTextW(GetDlgItem(hwndDlg, IDC_COMBO_PATH), Directory); } /* Free memory, if possible */ if (SUCCEEDED(SHGetMalloc(&malloc))) { - FIXME("Memory leak!\n"); - //malloc->Free(pidl); - //malloc->Release(); + IMalloc_Free(malloc, pidl); + IMalloc_Release(malloc); } return TRUE; } @@ -1223,23 +1222,23 @@ static HFONT CreateTitleFont(VOID) { - NONCLIENTMETRICS ncm; - LOGFONT LogFont; + NONCLIENTMETRICSW ncm; + LOGFONTW LogFont; HDC hdc; INT FontSize; HFONT hFont; - ncm.cbSize = sizeof(NONCLIENTMETRICS); + ncm.cbSize = sizeof(NONCLIENTMETRICSW); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); LogFont = ncm.lfMessageFont; LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + wcscpy(LogFont.lfFaceName, L"MS Shell Dlg"); hdc = GetDC(NULL); FontSize = 12; LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; - hFont = CreateFontIndirect(&LogFont); + hFont = CreateFontIndirectW(&LogFont); ReleaseDC(NULL, hdc); return hFont;

1 0

[turner] 23218: Fix the horribly broken SetProgramWindow implementation
by turner＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: turner Date: Sat Jul 22 01:11:46 2006 New Revision: 23218 URL: http://svn.reactos.org/svn/reactos?rev=23218&view=rev Log: Fix the horribly broken SetProgramWindow implementation Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 01:11:46 2006 @@ -1582,7 +1582,7 @@ STDCALL SetProgmanWindow(HWND hWnd) { - return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); + return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); } /*

1 0

[mbosma] 23217: remove locking in section.c
by mbosma＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: mbosma Date: Sat Jul 22 00:32:51 2006 New Revision: 23217 URL: http://svn.reactos.org/svn/reactos?rev=23217&view=rev Log: remove locking in section.c Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jul 22 00:32:51 2006 @@ -165,22 +165,6 @@ KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); } - - -/* - * FUNCTION: Waits in kernel mode indefinitely for a file object lock. - * ARGUMENTS: PFILE_OBJECT to wait for. - * RETURNS: Status of the wait. - */ -static NTSTATUS -MmspWaitForFileLock(PFILE_OBJECT File) -{ - if(File->Flags & FO_SYNCHRONOUS_IO) - return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); - else - return 0; -} - VOID MmFreePageTablesSectionSegment(PMM_SECTION_SEGMENT Segment) @@ -3556,18 +3540,6 @@ RtlZeroMemory(&Segment->PageDirectory, sizeof(SECTION_PAGE_DIRECTORY)); /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ExFreePool(Segment); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } - - /* * Set the lock before assigning the segment to the file object */ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); @@ -3601,20 +3573,6 @@ } else { - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); - Segment->ReferenceCount--; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DataSectionObjectLock); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } - Section->Segment = Segment; ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); MmLockSectionSegment(Segment); @@ -4418,19 +4376,6 @@ Section->ImageSection = ImageSectionObject; ASSERT(ImageSectionObject->Segments); - - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ImageSectionObject->Segments); - ExFreePool(ImageSectionObject); - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - return(Status); - } ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ImageSectionObjectLock); tmpImageSectionObject = InterlockedCompareExchangePointer(&FileObject->SectionObjectPointer->ImageSectionObject, @@ -4472,20 +4417,6 @@ } else { - /* - * Lock the file - */ - Status = MmspWaitForFileLock(FileObject); - if (Status != STATUS_SUCCESS) - { - ObDereferenceObject(Section); - ObDereferenceObject(FileObject); - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&ImageSectionObjectLock); - ImageSectionObject->RefCount--; - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&ImageSectionObjectLock); - return(Status); - } - Section->ImageSection = ImageSectionObject; SectionSegments = ImageSectionObject->Segments;

1 0

[ion] 23216: - Add bugcheck CRITICAL_OBJECT_TERMINATED - Implement PspCatchCriticalBreak and fix the 5 or so FIXMEs that depended on it.
by ion＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: ion Date: Fri Jul 21 23:59:16 2006 New Revision: 23216 URL: http://svn.reactos.org/svn/reactos?rev=23216&view=rev Log: - Add bugcheck CRITICAL_OBJECT_TERMINATED - Implement PspCatchCriticalBreak and fix the 5 or so FIXMEs that depended on it. Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.mc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc Fri Jul 21 23:59:16 2006 @@ -1109,6 +1109,13 @@ CRITICAL_PROCESS_DIED . +MessageId=0xF4 +Severity=Success +Facility=System +SymbolicName=CRITICAL_OBJECT_TERMINATION +Language=English +CRITICAL_OBJECT_TERMINATION +. MessageId=0xFC Severity=Success Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Fri Jul 21 23:59:16 2006 @@ -21,6 +21,61 @@ /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +PspCatchCriticalBreak(IN PCHAR Message, + IN PVOID ProcessOrThread, + IN PCHAR ImageName) +{ + UCHAR Action[2]; + BOOLEAN Handled = FALSE; + PAGED_CODE(); + + /* Check if a debugger is enabled */ + if (KdDebuggerEnabled) + { + /* Print out the message */ + DbgPrint(Message, ProcessOrThread, ImageName); + do + { + /* If a debugger isn't present, don't prompt */ + if (KdDebuggerNotPresent) break; + + /* A debuger is active, prompt for action */ + DbgPrompt("Break, or Ignore (bi)?", Action, sizeof(Action)); + switch (Action[0]) + { + /* Break */ + case 'B': case 'b': + + /* Do a breakpoint */ + DbgBreakPoint(); + + /* Ignore */ + case 'I': case 'i': + + /* Handle it */ + Handled = TRUE; + + /* Unrecognized */ + default: + break; + } + } while (!Handled); + } + + /* Did we ultimately handle this? */ + if (!Handled) + { + /* We didn't, bugcheck */ + KeBugCheckEx(CRITICAL_OBJECT_TERMINATION, + ((PKPROCESS)ProcessOrThread)->Header.Type, + (ULONG_PTR)ProcessOrThread, + (ULONG_PTR)ImageName, + (ULONG_PTR)Message); + } +} + NTSTATUS NTAPI PspTerminateProcess(IN PEPROCESS Process, @@ -29,12 +84,13 @@ PAGED_CODE(); PETHREAD Thread = NULL; - /* Check if this is a Critical Process, and Bugcheck */ + /* Check if this is a Critical Process */ if (Process->BreakOnTermination) { - /* FIXME: Add critical Process support */ - DPRINT1("A critical Process is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical process 0x%p (%s)\n", + Process, + Process->ImageFileName); } /* Set the delete flag */ @@ -442,8 +498,10 @@ /* Check if this is a Critical Thread */ if ((KdDebuggerEnabled) && (Thread->BreakOnTermination)) { - /* FIXME: Add critical thread support */ - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Critical thread 0x%p (in %s) exited\n", + Thread, + CurrentProcess->ImageFileName); } /* Check if it's the last thread and this is a Critical Process */ @@ -452,8 +510,10 @@ /* Check if a debugger is here to handle this */ if (KdDebuggerEnabled) { - /* FIXME: Add critical process support */ - DbgBreakPoint(); + /* Break to debugger */ + PspCatchCriticalBreak("Critical process 0x%p (in %s) exited\n", + CurrentProcess, + CurrentProcess->ImageFileName); } else { @@ -805,9 +865,10 @@ /* Check if this is a Critical Thread, and Bugcheck */ if (Thread->BreakOnTermination) { - /* FIXME: Add critical thread support */ - DPRINT1("A critical thread is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical thread 0x%p (%s)\n", + Thread, + Thread->ThreadsProcess->ImageFileName); } /* Check if we are already inside the thread */ @@ -981,9 +1042,10 @@ /* Check if this is a Critical Process, and Bugcheck */ if (Process->BreakOnTermination) { - /* FIXME: Add critical Process support */ - DPRINT1("A critical Process is being terminated\n"); - KEBUGCHECK(0); + /* Break to debugger */ + PspCatchCriticalBreak("Terminating critical process 0x%p (%s)\n", + Process, + Process->ImageFileName); } /* Lock the Process */

1 0

[hpoussin] 23215: Add a hack to be able to use serial mice again (IRP_MJ_CLOSE is not set after IoGetDeviceObjectPointer() + ObDereferenceObject())
by hpoussin＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: hpoussin Date: Fri Jul 21 23:49:32 2006 New Revision: 23215 URL: http://svn.reactos.org/svn/reactos?rev=23215&view=rev Log: Add a hack to be able to use serial mice again (IRP_MJ_CLOSE is not set after IoGetDeviceObjectPointer() + ObDereferenceObject()) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Fri Jul 21 23:49:32 2006 @@ -1000,6 +1000,14 @@ ObDereferenceObject(FileObject); + /* hpoussin, July 2006. Dereferencing the FileObject once + * is not enough to trigger the sending of IRP_MJ_CLEANUP. + * So, do it once more... According to Alex, it's because + * FileObjects should start with a ref count of 1 instead + * of 2 at the moment... + */ + ObDereferenceObject(FileObject); + return STATUS_SUCCESS; }

1 0

[ion] 23214: - Implement Kernel, Memory Manager and Process Manager APIs for the following concepts (not yet used): - Process Quantum. - Fixed and Variable Quantum Tables. - Long and Short Quantum Variability. - Priority Separation and Separation Masks. - Foreground Quantum Table. - Process Priority, Priority Modes and Priority Classes. - Virtual Memory Priority - Job Scheduling Classes - Implement PsSetProcessPriorityByClass.
by ion＠svn.reactos.org 21 Jul '06

21 Jul '06

Author: ion Date: Fri Jul 21 23:28:38 2006 New Revision: 23214 URL: http://svn.reactos.org/svn/reactos?rev=23214&view=rev Log: - Implement Kernel, Memory Manager and Process Manager APIs for the following concepts (not yet used): - Process Quantum. - Fixed and Variable Quantum Tables. - Long and Short Quantum Variability. - Priority Separation and Separation Masks. - Foreground Quantum Table. - Process Priority, Priority Modes and Priority Classes. - Virtual Memory Priority - Job Scheduling Classes - Implement PsSetProcessPriorityByClass. Modified: trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Fri Jul 21 23:28:38 2006 @@ -929,6 +929,9 @@ #endif } KPROCESS, *PKPROCESS; +#define ASSERT_PROCESS(object) \ + ASSERT((((object)->Header.Type & KOBJECT_TYPE_MASK) == ProcessObject)) + // // System Service Table Descriptor // Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Jul 21 23:28:38 2006 @@ -107,6 +107,12 @@ #define PROCESS_PRIORITY_IDLE 3 #define PROCESS_PRIORITY_NORMAL 8 #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 + +// +// Process Priority Separation Values (OR) +// +#define PSP_VARIABLE_QUANTUMS 4 +#define PSP_LONG_QUANTUMS 16 // // Number of TLS expansion slots @@ -303,6 +309,13 @@ } THREADINFOCLASS; #else + +typedef enum _PSPROCESSPRIORITYMODE +{ + PsProcessPriorityForeground, + PsProcessPriorityBackground, + PsProcessPrioritySpinning +} PSPROCESSPRIORITYMODE; typedef enum _JOBOBJECTINFOCLASS { Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 21 23:28:38 2006 @@ -48,4 +48,5 @@ // Ke: // - Add code for interval recalulation when wait interrupted by an APC // -/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// + Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Jul 21 23:28:38 2006 @@ -397,6 +397,21 @@ LARGE_INTEGER DirectoryTableBase ); +VOID +NTAPI +KeSetQuantumProcess( + IN PKPROCESS Process, + IN UCHAR Quantum +); + +KPRIORITY +NTAPI +KeSetPriorityAndQuantumProcess( + IN PKPROCESS Process, + IN KPRIORITY Priority, + IN UCHAR Quantum OPTIONAL +); + ULONG STDCALL KeForceResumeThread(IN PKTHREAD Thread); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Jul 21 23:28:38 2006 @@ -654,6 +654,13 @@ NTAPI MmGetSessionLocaleId(VOID); +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess( + IN PEPROCESS Process, + IN UCHAR MemoryPriority +); + /* i386/pfault.c *************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri Jul 21 23:28:38 2006 @@ -18,6 +18,8 @@ #define PSP_MAX_CREATE_THREAD_NOTIFY 8 #define PSP_MAX_LOAD_IMAGE_NOTIFY 8 #define PSP_MAX_CREATE_PROCESS_NOTIFY 8 + +#define PSP_JOB_SCHEDULING_CLASSES 10 VOID NTAPI @@ -226,7 +228,8 @@ extern PKWIN32_THREAD_CALLOUT PspW32ThreadCallout; extern PVOID PspSystemDllEntryPoint; extern PVOID PspSystemDllBase; - +extern BOOLEAN PspUseJobSchedulingClasses; +extern CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES]; #include "ps_x.h" #endif /* __INCLUDE_INTERNAL_PS_H */ Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Fri Jul 21 23:28:38 2006 @@ -6,6 +6,18 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ + +// +// Extract Quantum Settings from the Priority Separation Mask +// +#define PspPrioritySeparationFromMask(Mask) \ + ((Mask) & 3) + +#define PspQuantumTypeFromMask(Mask) \ + ((Mask) & 12) + +#define PspQuantumLengthFromMask(Mask) \ + ((Mask) & 48) VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Fri Jul 21 23:28:38 2006 @@ -221,6 +221,204 @@ Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); } +VOID +NTAPI +KeSetQuantumProcess(IN PKPROCESS Process, + IN UCHAR Quantum) +{ + KIRQL OldIrql; + PLIST_ENTRY NextEntry, ListHead; + PKTHREAD Thread; + ASSERT_PROCESS(Process); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Lock Dispatcher */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Set new quantum */ + Process->QuantumReset = Quantum; + + /* Loop all child threads */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Set quantum */ + Thread->QuantumReset = Quantum; + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + /* Release Dispatcher Database */ + KeReleaseDispatcherDatabaseLock(OldIrql); +} + +KPRIORITY +NTAPI +KeSetPriorityAndQuantumProcess(IN PKPROCESS Process, + IN KPRIORITY Priority, + IN UCHAR Quantum OPTIONAL) +{ + KPRIORITY Delta; + PLIST_ENTRY NextEntry, ListHead; + KPRIORITY NewPriority, OldPriority; + KIRQL OldIrql; + PKTHREAD Thread; + BOOLEAN Released; + ASSERT_PROCESS(Process); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Check if the process already has this priority */ + if (Process->BasePriority == Priority) + { + /* Don't change anything */ + return Process->BasePriority; + } + + /* If the caller gave priority 0, normalize to 1 */ + if (!Priority) Priority = 1; + + /* Lock Dispatcher */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Check if we are modifying the quantum too */ + if (Quantum) Process->QuantumReset = Quantum; + + /* Save the current base priority and update it */ + OldPriority = Process->BasePriority; + Process->BasePriority = Priority; + + /* Calculate the priority delta */ + Delta = Priority - OldPriority; + + /* Set the list head and list entry */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + + /* Check if this is a real-time priority */ + if (Priority >= LOW_REALTIME_PRIORITY) + { + /* Loop the thread list */ + while (NextEntry != ListHead) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Update the quantum if we had one */ + if (Quantum) Thread->QuantumReset = Quantum; + + /* Calculate the new priority */ + NewPriority = Thread->BasePriority + Delta; + if (NewPriority < LOW_REALTIME_PRIORITY) + { + /* We're in real-time range, don't let it go below */ + NewPriority = LOW_REALTIME_PRIORITY; + } + else if (NewPriority > HIGH_PRIORITY) + { + /* We're going beyond the maximum priority, normalize */ + NewPriority = HIGH_PRIORITY; + } + + /* + * If priority saturation occured or the old priority was still in + * the real-time range, don't do anything. + */ + if (!(Thread->Saturation) || (OldPriority < LOW_REALTIME_PRIORITY)) + { + /* Check if we had priority saturation */ + if (Thread->Saturation > 0) + { + /* Boost priority to maximum */ + NewPriority = HIGH_PRIORITY; + } + else if (Thread->Saturation < 0) + { + /* If we had negative saturation, set minimum priority */ + NewPriority = LOW_REALTIME_PRIORITY; + } + + /* Update priority and quantum */ + Thread->BasePriority = NewPriority; + Thread->Quantum = Thread->QuantumReset; + + /* Disable decrements and update priority */ + Thread->PriorityDecrement = 0; + KiSetPriorityThread(Thread, NewPriority, &Released); + } + + /* Go to the next thread */ + NextEntry = NextEntry->Flink; + } + } + else + { + /* Loop the thread list */ + while (NextEntry != ListHead) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Update the quantum if we had one */ + if (Quantum) Thread->QuantumReset = Quantum; + + /* Calculate the new priority */ + NewPriority = Thread->BasePriority + Delta; + if (NewPriority >= LOW_REALTIME_PRIORITY) + { + /* We're not real-time range, don't let it enter RT range */ + NewPriority = LOW_REALTIME_PRIORITY - 1; + } + else if (NewPriority <= LOW_PRIORITY) + { + /* We're going below the minimum priority, normalize */ + NewPriority = 1; + } + + /* + * If priority saturation occured or the old priority was still in + * the real-time range, don't do anything. + */ + if (!(Thread->Saturation) || + (OldPriority >= LOW_REALTIME_PRIORITY)) + { + /* Check if we had priority saturation */ + if (Thread->Saturation > 0) + { + /* Boost priority to maximum */ + NewPriority = LOW_REALTIME_PRIORITY - 1; + } + else if (Thread->Saturation < 0) + { + /* If we had negative saturation, set minimum priority */ + NewPriority = 1; + } + + /* Update priority and quantum */ + Thread->BasePriority = NewPriority; + Thread->Quantum = Thread->QuantumReset; + + /* Disable decrements and update priority */ + Thread->PriorityDecrement = 0; + KiSetPriorityThread(Thread, NewPriority, &Released); + } + + /* Go to the next thread */ + NextEntry = NextEntry->Flink; + } + } + + /* Release Dispatcher Database */ + if (!Released) KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Return previous priority */ + return OldPriority; +} + /* * @implemented */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Jul 21 23:28:38 2006 @@ -29,7 +29,7 @@ static BOOLEAN IsThisAnNtAsSystem = FALSE; -static MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem; +MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem; PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Fri Jul 21 23:28:38 2006 @@ -17,11 +17,35 @@ extern ULONG NtMinorVersion; extern ULONG NtOSCSDVersion; extern ULONG NtGlobalFlag; +extern MM_SYSTEM_SIZE MmSystemSize; #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess(IN PEPROCESS Process, + IN UCHAR MemoryPriority) +{ + UCHAR OldPriority; + + /* Check if we have less then 16MB of Physical Memory */ + if ((MmSystemSize == MmSmallSystem) && + (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) + { + /* Always use background priority */ + MemoryPriority = 0; + } + + /* Save the old priority and update it */ + OldPriority = Process->Vm.Flags.MemoryPriority; + Process->Vm.Flags.MemoryPriority = MemoryPriority; + + /* Return the old priority */ + return OldPriority; +} LCID NTAPI Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=2321… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Fri Jul 21 23:28:38 2006 @@ -18,14 +18,28 @@ #pragma alloc_text(INIT, PsInitJobManagment) #endif - - /* GLOBALS *******************************************************************/ POBJECT_TYPE PsJobType = NULL; LIST_ENTRY PsJobListHead; static FAST_MUTEX PsJobListLock; + +BOOLEAN PspUseJobSchedulingClasses; + +CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES] = +{ + 1 * 6, + 2 * 6, + 3 * 6, + 4 * 6, + 5 * 6, + 6 * 6, + 7 * 6, + 8 * 6, + 9 * 6, + 10 * 6 +}; static GENERIC_MAPPING PiJobMapping = { Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Fri Jul 21 23:28:38 2006 @@ -27,6 +27,49 @@ LARGE_INTEGER ShortPsLockDelay; +ULONG PsPrioritySeparation; +CHAR PspForegroundQuantum[3]; + +/* Fixed quantum table */ +CHAR PspFixedQuantums[6] = +{ + /* Short quantums */ + 3 * 6, /* Level 1 */ + 3 * 6, /* Level 2 */ + 3 * 6, /* Level 3 */ + + /* Long quantums */ + 6 * 6, /* Level 1 */ + 6 * 6, /* Level 2 */ + 6 * 6 /* Level 3 */ +}; + +/* Variable quantum table */ +CHAR PspVariableQuantums[6] = +{ + /* Short quantums */ + 1 * 6, /* Level 1 */ + 2 * 6, /* Level 2 */ + 3 * 6, /* Level 3 */ + + /* Long quantums */ + 2 * 6, /* Level 1 */ + 4 * 6, /* Level 2 */ + 6 * 6 /* Level 3 */ +}; + +/* Priority table */ +KPRIORITY PspPriorityTable[PROCESS_PRIORITY_CLASS_ABOVE_NORMAL + 1] = +{ + 8, + 4, + 8, + 13, + 24, + 6, + 10 +}; + /* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS @@ -140,6 +183,164 @@ /* Reference the Process we had referenced earlier */ if (OldProcess) ObDereferenceObject(OldProcess); return FoundProcess; +} + +KPRIORITY +NTAPI +PspComputeQuantumAndPriority(IN PEPROCESS Process, + IN PSPROCESSPRIORITYMODE Mode, + OUT PCHAR Quantum) +{ + ULONG i; + UCHAR LocalQuantum, MemoryPriority; + PAGED_CODE(); + + /* Check if this is a foreground process */ + if (Mode == PsProcessPriorityForeground) + { + /* Set the memory priority and use priority separation */ + MemoryPriority = 2; + i = PsPrioritySeparation; + } + else + { + /* Set the background memory priority and no separation */ + MemoryPriority = 0; + i = 0; + } + + /* Make sure that the process mode isn't spinning */ + if (Mode != PsProcessPrioritySpinning) + { + /* Set the priority */ + MmSetMemoryPriorityProcess(Process, MemoryPriority); + } + + /* Make sure that the process isn't idle */ + if (Process->PriorityClass != PROCESS_PRIORITY_CLASS_IDLE) + { + /* Does the process have a job? */ + if ((Process->Job) && (PspUseJobSchedulingClasses)) + { + /* Use job quantum */ + LocalQuantum = PspJobSchedulingClasses[Process->Job-> + SchedulingClass]; + } + else + { + /* Use calculated quantum */ + LocalQuantum = PspForegroundQuantum[i]; + } + } + else + { + /* Process is idle, use default quantum */ + LocalQuantum = 6; + } + + /* Return quantum to caller */ + *Quantum = LocalQuantum; + + /* Return priority */ + return PspPriorityTable[Process->PriorityClass]; +} + +VOID +NTAPI +PsChangeQuantumTable(IN BOOLEAN Immediate, + IN ULONG PrioritySeparation) +{ + PEPROCESS Process = NULL; + ULONG i; + UCHAR Quantum; + PCHAR QuantumTable; + PAGED_CODE(); + + /* Write the current priority separation */ + PsPrioritySeparation = PspPrioritySeparationFromMask(PrioritySeparation); + + /* Normalize it if it was too high */ + if (PsPrioritySeparation == 3) PsPrioritySeparation = 2; + + /* Get the quantum table to use */ + if (PspQuantumTypeFromMask(PrioritySeparation) == PSP_VARIABLE_QUANTUMS) + { + /* Use a variable table */ + QuantumTable = PspVariableQuantums; + } + else + { + /* Use fixed table */ + QuantumTable = PspFixedQuantums; + } + + /* Now check if we should use long or short */ + if (PspQuantumLengthFromMask(PrioritySeparation) == PSP_LONG_QUANTUMS) + { + /* Use long quantums */ + QuantumTable += 3; + } + + /* Check if we're using long fixed quantums */ + if (QuantumTable == &PspFixedQuantums[3]) + { + /* Use Job scheduling classes */ + PspUseJobSchedulingClasses = TRUE; + } + else + { + /* Otherwise, we don't */ + PspUseJobSchedulingClasses = FALSE; + } + + /* Copy the selected table into the Foreground Quantum table */ + RtlCopyMemory(PspForegroundQuantum, + QuantumTable, + sizeof(PspForegroundQuantum)); + + /* Check if we should apply these changes real-time */ + if (Immediate) + { + /* We are...loop every process */ + Process == PsGetNextProcess(Process); + while (Process) + { + /* + * Use the priority separation, unless the process has + * low memory priority + */ + i = (Process->Vm.Flags.MemoryPriority == 1) ? + 0: PsPrioritySeparation; + + /* Make sure that the process isn't idle */ + if (Process->PriorityClass != PROCESS_PRIORITY_CLASS_IDLE) + { + /* Does the process have a job? */ + if ((Process->Job) && (PspUseJobSchedulingClasses)) + { + /* Use job quantum */ + Quantum = PspJobSchedulingClasses[Process->Job-> + SchedulingClass]; + } + else + { + /* Use calculated quantum */ + Quantum = PspForegroundQuantum[i]; + } + } + else + { + /* Process is idle, use default quantum */ + Quantum = 6; + } + + /* Now set the quantum */ + KeSetQuantumProcess(&Process->Pcb, Quantum); + + /* Get the next process */ + Process == PsGetNextProcess(Process); + } + } } NTSTATUS @@ -861,15 +1062,21 @@ } /* - * @unimplemented - */ -NTSTATUS + * @implemented + */ +VOID NTAPI PsSetProcessPriorityByClass(IN PEPROCESS Process, - IN ULONG Type) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSPROCESSPRIORITYMODE Type) +{ + UCHAR Quantum; + ULONG Priority; + + /* Compute quantum and priority */ + Priority = PspComputeQuantumAndPriority(Process, Type, &Quantum); + + /* Set them */ + KeSetPriorityAndQuantumProcess(&Process->Pcb, Priority, Quantum); } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs