Ros-dev

ros-dev@reactos.org

5790 discussions

Re: [ros-dev] Ros-dev Digest, Vol 59, Issue 3

by Olaf Siejka

Sorry for not deleting the post content:/ Back to sysreg... i`d issue a deadline, like 24-48h and until then i`d lock the trunk. If this issue is not fixed until the deadline, offending revision should be reverted and trunk unfrozen. I can only hope we arent getting many regressions in the meantime.

16 years, 2 months

Regression after ARM commit

by Olaf Siejka

Hiya Revision 41657 introduces a regression with VirtualBox Guest Additions video driver. Please see http://www.reactos.org/bugzilla/show_bug.cgi?id=4650 for more details. Regards 2009/7/2 <ros-dev-request(a)reactos.org> > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Re: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using marlett font. - See issue #4450 for details. (Ged) > 2. Re: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using marlett font. - See issue #4450 for details. (James Tabor) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 1 Jul 2009 23:10:03 +0100 > From: "Ged" <gedmurphy(a)gmail.com> > Subject: Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using > marlett font. - See issue #4450 for details. > To: <ros-dev(a)reactos.org> > Message-ID: <001801c9fa98$af921810$0eb64830$@com> > Content-Type: text/plain; charset="utf-8" > > Did you read this patch before committing it? > Your last patch fixed tchar usage and then this next patch introduces new > ones. > > > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of mkupfer(a)svn.reactos.org > Sent: 01 July 2009 22:57 > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT > gmail DOT com> - Add symbols to system menu by using marlett font. - See > issue #4450 for details. > > Author: mkupfer > Date: Thu Jul 2 01:56:44 2009 > New Revision: 41733 > > URL: http://svn.reactos.org/svn/reactos?rev=41733&view=rev > Log: > Mikhail Denisenko <denisenkom AT gmail DOT com> > - Add symbols to system menu by using marlett font. > - See issue #4450 for details. > > Modified: > trunk/reactos/dll/win32/user32/windows/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 [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Jul 2 > 01:56:44 2009 > @@ -42,7 +42,6 @@ > #define IS_SYSTEM_POPUP(MenuInfo) \ > (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) > @@ -307,7 +306,7 @@ > Size->cx = Size->cy = 0; > > /* check if there is a magic menu item associated with this item */ > - if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) > + if (IS_MAGIC_BITMAP(Bmp)) > { > switch((INT_PTR) Bmp) > { > @@ -339,18 +338,15 @@ > case (INT_PTR) HBMMENU_MBAR_CLOSE: > case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: > case (INT_PTR) HBMMENU_MBAR_CLOSE_D: > + case (INT_PTR) HBMMENU_POPUP_CLOSE: > + case (INT_PTR) HBMMENU_POPUP_RESTORE: > + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > /* 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; > - case (INT_PTR) HBMMENU_POPUP_CLOSE: > - case (INT_PTR) HBMMENU_POPUP_RESTORE: > - case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > - case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > - default: > - FIXME("Magic menu bitmap not implemented\n"); > - return; > } > } > > @@ -359,6 +355,70 @@ > Size->cx = Bm.bmWidth; > Size->cy = Bm.bmHeight; > } > +} > + > +/*********************************************************************** > + * MenuDrawPopupGlyph > + * > + * Draws popup magic glyphs (can be found in system menu). > + */ > +static void FASTCALL > +MenuDrawPopupGlyph(HDC dc, LPRECT r, INT_PTR popupMagic, BOOL inactive, > BOOL hilite) > +{ > + LOGFONTW lf; > + HFONT hFont, hOldFont; > + COLORREF clrsave; > + INT bkmode; > + TCHAR symbol; > + switch (popupMagic) > + { > + case (INT_PTR) HBMMENU_POPUP_RESTORE: > + symbol = '2'; > + break; > + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > + symbol = '0'; > + break; > + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > + symbol = '1'; > + break; > + case (INT_PTR) HBMMENU_POPUP_CLOSE: > + symbol = 'r'; > + break; > + default: > + ERR("Invalid popup magic bitmap %d\n", (int)popupMagic); > + return; > + } > + ZeroMemory(&lf, sizeof(LOGFONTW)); > + InflateRect(r, -2, -2); > + lf.lfHeight = r->bottom - r->top; > + lf.lfWidth = 0; > + lf.lfWeight = FW_NORMAL; > + lf.lfCharSet = DEFAULT_CHARSET; > + lstrcpy(lf.lfFaceName, TEXT("Marlett")); > + hFont = CreateFontIndirect(&lf); > + /* save font and text color */ > + hOldFont = SelectObject(dc, hFont); > + clrsave = GetTextColor(dc); > + bkmode = GetBkMode(dc); > + /* set color and drawing mode */ > + SetBkMode(dc, TRANSPARENT); > + if (inactive) > + { > + /* draw shadow */ > + if (!hilite) > + { > + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); > + TextOut(dc, r->left + 1, r->top + 1, &symbol, 1); > + } > + } > + SetTextColor(dc, GetSysColor(inactive ? COLOR_GRAYTEXT : (hilite ? > COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT))); > + /* draw selected symbol */ > + TextOut(dc, r->left, r->top, &symbol, 1); > + /* restore previous settings */ > + SetTextColor(dc, clrsave); > + SelectObject(dc, hOldFont); > + SetBkMode(dc, bkmode); > + DeleteObject(hFont); > } > > /*********************************************************************** > @@ -382,7 +442,7 @@ > Bmp = hbmpToDraw; > > /* Check if there is a magic menu item associated with this item */ > - if (IS_MAGIC_ITEM(hbmpToDraw)) > + if (IS_MAGIC_BITMAP(hbmpToDraw)) > { > UINT Flags = 0; > RECT r; > @@ -459,8 +519,7 @@ > case (INT_PTR) HBMMENU_POPUP_RESTORE: > case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > - default: > - FIXME("Magic menu bitmap not implemented\n"); > + MenuDrawPopupGlyph(Dc, &r, (INT_PTR)hbmpToDraw, Item->fState & > MF_GRAYED, Item->fState & MF_HILITE); > return; > } > InflateRect(&r, -1, -1); > @@ -736,9 +795,17 @@ > checked = TRUE; > } > } > - if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & > MNS_CHECKORBMP))) > + if (Item->hbmpItem) > { > - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, > Action, MenuBar); > + RECT bmpRect; > + CopyRect(&bmpRect, &Rect); > + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & > MNS_NOCHECK)) > + bmpRect.left += CheckBitmapWidth + 2; > + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) > + { > + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; > + MenuDrawBitmapItem(Dc, Item, &bmpRect, MenuInfo->Self, WndOwner, > Action, MenuBar); > + } > } > /* Draw the popup-menu arrow */ > if (0 != (Item->fType & MF_POPUP)) > @@ -767,7 +834,9 @@ > UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE > : DT_LEFT | DT_VCENTER | DT_SINGLELINE; > > - if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) > + if(MenuInfo->dwStyle & MNS_CHECKORBMP) > + Rect.left += max(0, MenuInfo->maxBmpSize.cx - > GetSystemMetrics(SM_CXMENUCHECK)); > + else > Rect.left += MenuInfo->maxBmpSize.cx; > > if (0 != (Item->fState & MFS_DEFAULT)) > @@ -779,11 +848,6 @@ > { > Rect.left += MENU_BAR_ITEMS_SPACE / 2; > Rect.right -= MENU_BAR_ITEMS_SPACE / 2; > - } > - if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != > 0 ) > - { > - Rect.left += MenuInfo->maxBmpSize.cx; > - Rect.right -= MenuInfo->maxBmpSize.cx; > } > > Text = (PWCHAR) Item->dwTypeData; > @@ -1103,8 +1167,30 @@ > NTSTATUS WINAPI > User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength) > { > - LRESULT Result; > - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); > + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); > + LRESULT Result = (LRESULT)hmenu; > + > + // removing space for checkboxes from menu > + MENUINFO menuinfo = {0}; > + menuinfo.cbSize = sizeof(menuinfo); > + menuinfo.fMask = MIM_STYLE; > + GetMenuInfo(hmenu, &menuinfo); > + menuinfo.dwStyle |= MNS_NOCHECK; > + SetMenuInfo(hmenu, &menuinfo); > + > + // adding bitmaps to menu items > + MENUITEMINFOW info = {0}; > + info.cbSize = sizeof(info); > + info.fMask |= MIIM_BITMAP; > + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; > + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_RESTORE; > + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; > + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_CLOSE; > + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); > + > return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); > } > > @@ -1247,7 +1333,6 @@ > MenuInfo->maxBmpSize.cy = abs(Size.cy); > } > MenuSetRosMenuInfo(MenuInfo); > - ItemInfo->Rect.right += Size.cx + 2; > itemheight = Size.cy + 2; > > if( !(MenuInfo->dwStyle & MNS_NOCHECK)) > > > > > ------------------------------ > > Message: 2 > Date: Wed, 1 Jul 2009 20:26:20 -0500 > From: James Tabor <jimtabor.rosdev(a)gmail.com> > Subject: Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using > marlett font. - See issue #4450 for details. > To: ReactOS Development List <ros-dev(a)reactos.org> > Message-ID: > <b93fa9340907011826s2b31d0d3va7674a0446a00020(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi! > > On Wed, Jul 1, 2009 at 5:10 PM, Ged<gedmurphy(a)gmail.com> wrote: > > Did you read this patch before committing it? > > Your last patch fixed tchar usage and then this next patch introduces new > ones. > > > > > Looks okay, interesting way for setting up the system menu for kernel > space. Need to test this with every application in our test library to > make sure this all works! > > > @@ -1103,8 +1167,30 @@ > > NTSTATUS WINAPI > > User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG > ArgumentLength) > > { > > - LRESULT Result; > > - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); > > + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); > > + LRESULT Result = (LRESULT)hmenu; > > + > > + // removing space for checkboxes from menu > > + MENUINFO menuinfo = {0}; > > + menuinfo.cbSize = sizeof(menuinfo); > > + menuinfo.fMask = MIM_STYLE; > > + GetMenuInfo(hmenu, &menuinfo); > > + menuinfo.dwStyle |= MNS_NOCHECK; > > + SetMenuInfo(hmenu, &menuinfo); > > + > > + // adding bitmaps to menu items > > + MENUITEMINFOW info = {0}; > > + info.cbSize = sizeof(info); > > + info.fMask |= MIIM_BITMAP; > > + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; > > + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_RESTORE; > > + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; > > + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_CLOSE; > > + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); > > + > > return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); > > } > > > > > ------------------------------ > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > End of Ros-dev Digest, Vol 59, Issue 2 > ************************************** >

16 years, 2 months

testing on buildserver is broken

by Christoph von Wittich

hangs with endless ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED!

16 years, 2 months

Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details.

by Ged

Did you read this patch before committing it? Your last patch fixed tchar usage and then this next patch introduces new ones. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 01 July 2009 22:57 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details. Author: mkupfer Date: Thu Jul 2 01:56:44 2009 New Revision: 41733 URL: http://svn.reactos.org/svn/reactos?rev=41733&view=rev Log: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details. Modified: trunk/reactos/dll/win32/user32/windows/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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Jul 2 01:56:44 2009 @@ -42,7 +42,6 @@ #define IS_SYSTEM_POPUP(MenuInfo) \ (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) @@ -307,7 +306,7 @@ Size->cx = Size->cy = 0; /* check if there is a magic menu item associated with this item */ - if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) + if (IS_MAGIC_BITMAP(Bmp)) { switch((INT_PTR) Bmp) { @@ -339,18 +338,15 @@ case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: case (INT_PTR) HBMMENU_MBAR_CLOSE_D: + case (INT_PTR) HBMMENU_POPUP_CLOSE: + case (INT_PTR) HBMMENU_POPUP_RESTORE: + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: /* 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; - case (INT_PTR) HBMMENU_POPUP_CLOSE: - case (INT_PTR) HBMMENU_POPUP_RESTORE: - case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: - case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); - return; } } @@ -359,6 +355,70 @@ Size->cx = Bm.bmWidth; Size->cy = Bm.bmHeight; } +} + +/*********************************************************************** + * MenuDrawPopupGlyph + * + * Draws popup magic glyphs (can be found in system menu). + */ +static void FASTCALL +MenuDrawPopupGlyph(HDC dc, LPRECT r, INT_PTR popupMagic, BOOL inactive, BOOL hilite) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + INT bkmode; + TCHAR symbol; + switch (popupMagic) + { + case (INT_PTR) HBMMENU_POPUP_RESTORE: + symbol = '2'; + break; + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: + symbol = '0'; + break; + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + symbol = '1'; + break; + case (INT_PTR) HBMMENU_POPUP_CLOSE: + symbol = 'r'; + break; + default: + ERR("Invalid popup magic bitmap %d\n", (int)popupMagic); + return; + } + ZeroMemory(&lf, sizeof(LOGFONTW)); + InflateRect(r, -2, -2); + lf.lfHeight = r->bottom - r->top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); + if (inactive) + { + /* draw shadow */ + if (!hilite) + { + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + TextOut(dc, r->left + 1, r->top + 1, &symbol, 1); + } + } + SetTextColor(dc, GetSysColor(inactive ? COLOR_GRAYTEXT : (hilite ? COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT))); + /* draw selected symbol */ + TextOut(dc, r->left, r->top, &symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); } /*********************************************************************** @@ -382,7 +442,7 @@ Bmp = hbmpToDraw; /* Check if there is a magic menu item associated with this item */ - if (IS_MAGIC_ITEM(hbmpToDraw)) + if (IS_MAGIC_BITMAP(hbmpToDraw)) { UINT Flags = 0; RECT r; @@ -459,8 +519,7 @@ case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); + MenuDrawPopupGlyph(Dc, &r, (INT_PTR)hbmpToDraw, Item->fState & MF_GRAYED, Item->fState & MF_HILITE); return; } InflateRect(&r, -1, -1); @@ -736,9 +795,17 @@ checked = TRUE; } } - if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + if (Item->hbmpItem) { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + RECT bmpRect; + CopyRect(&bmpRect, &Rect); + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & MNS_NOCHECK)) + bmpRect.left += CheckBitmapWidth + 2; + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; + MenuDrawBitmapItem(Dc, Item, &bmpRect, MenuInfo->Self, WndOwner, Action, MenuBar); + } } /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) @@ -767,7 +834,9 @@ UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE : DT_LEFT | DT_VCENTER | DT_SINGLELINE; - if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) + if(MenuInfo->dwStyle & MNS_CHECKORBMP) + Rect.left += max(0, MenuInfo->maxBmpSize.cx - GetSystemMetrics(SM_CXMENUCHECK)); + else Rect.left += MenuInfo->maxBmpSize.cx; if (0 != (Item->fState & MFS_DEFAULT)) @@ -779,11 +848,6 @@ { Rect.left += MENU_BAR_ITEMS_SPACE / 2; Rect.right -= MENU_BAR_ITEMS_SPACE / 2; - } - if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != 0 ) - { - Rect.left += MenuInfo->maxBmpSize.cx; - Rect.right -= MenuInfo->maxBmpSize.cx; } Text = (PWCHAR) Item->dwTypeData; @@ -1103,8 +1167,30 @@ NTSTATUS WINAPI User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength) { - LRESULT Result; - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); + LRESULT Result = (LRESULT)hmenu; + + // removing space for checkboxes from menu + MENUINFO menuinfo = {0}; + menuinfo.cbSize = sizeof(menuinfo); + menuinfo.fMask = MIM_STYLE; + GetMenuInfo(hmenu, &menuinfo); + menuinfo.dwStyle |= MNS_NOCHECK; + SetMenuInfo(hmenu, &menuinfo); + + // adding bitmaps to menu items + MENUITEMINFOW info = {0}; + info.cbSize = sizeof(info); + info.fMask |= MIIM_BITMAP; + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_RESTORE; + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_CLOSE; + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); } @@ -1247,7 +1333,6 @@ MenuInfo->maxBmpSize.cy = abs(Size.cy); } MenuSetRosMenuInfo(MenuInfo); - ItemInfo->Rect.right += Size.cx + 2; itemheight = Size.cy + 2; if( !(MenuInfo->dwStyle & MNS_NOCHECK))

16 years, 2 months

r41685 crashes early at boot in my real hardware (P-i @ 200 MHz)

by Javier Agustìn Fernàndez Arroyo

Hi all, As talked with Aleksey i would want to let you knwo that revision r41685 is broken, in my real hardware, at least. This is the log i get, im sorry to say i cannot give you more details (backtraces, disasm´s, and so, since even kb does not work after the crash. (ntoskrnl/kd/kdio.c:221) ReactOS 0.4-SVN (Build 20090629-r41685) (ntoskrnl/kd/kdio.c:222) Command Line: NOGUIBOOT DEBUGPORT=COM1 NOGUIBOOT DEBUGPORT=COM1 (ntoskrnl/kd/kdio.c:223) ARC Paths: multi(0)disk(0)cdrom(159) \ multi(0)disk(0)cdrom(159) \reactos\ Used memory 327284Kb (ntoskrnl/mm/mminit.c:224) Start End Type (ntoskrnl/mm/mminit.c:225) 0x80000000 - 0x80800000 Undefined region (ntoskrnl/mm/mminit.c:228) 0x80800000 - 0x80E00000 FreeLDR Kernel mapping region (ntoskrnl/mm/mminit.c:231) 0x80E00000 - 0x80FE0000 PFN Database region (ntoskrnl/mm/mminit.c:238) 0x80FE0000 - 0x873E0000 Non paged pool region (ntoskrnl/mm/mminit.c:241) 0x873E0000 - 0x8D7E0000 Paged pool region (ARMÂ³::INIT:340) System PTE count has been tuned to 22000 (90112000 bytes) (ARMÂ³::INIT:445) NP Pool has been tuned to: 10584064 bytes and 130072576 bytes (ARMÂ³::INIT:490) System PTE VA starts at: F3000000 (ARMÂ³::INIT:491) NP Expansion VA begins at: F89EC000 and ends at: FFBE0000 (ARMÂ³::INIT:507) PFN DB VA begins at: B0000000 and ends at: B01E0000 (ARMÂ³::INIT:510) PFN DB PA PFN begins at: 1000 (ARMÂ³::INIT:511) NP VA begins at: B01E0000 and ends at: B0BF8000 (ARMÂ³::INIT:514) NP PA PFN begins at: 11e0 (ARMÂ³::SYSPTE:341) System PTE space for 1 starting at: C03E27B4 and ending at: C03FEF78 Assertion '(MmNumberOfSystemPtes - OldCount) <= 1000' failed at ARMÂ³::INIT line 652 Entered debugger on embedded INT3 at 0x0008:0x808bfcf6. kdb:>

16 years, 2 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 41610: Remove a hack from NtAccessCheck(). Bug #4169.

by Alex Ionescu

Oh, I see. All these white spaces were hacks. Thanks for mixing in 500 whitespace and formatting changes with 5 lines of code changes. It makes it really clear! Has the kernel become a no-man's land of garbage? I'm thinking of removing my name from the sources if this keeps up. Best regards, Alex Ionescu On Thu, Jun 25, 2009 at 6:29 AM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Thu Jun 25 17:29:58 2009 > New Revision: 41610 > > URL: http://svn.reactos.org/svn/reactos?rev=41610&view=rev > Log: > Remove a hack from NtAccessCheck(). Bug #4169. > > Modified: > trunk/reactos/ntoskrnl/se/semgr.c > > Modified: trunk/reactos/ntoskrnl/se/semgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=41… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Jun 25 17:29:58 2009 > @@ -49,7 +49,7 @@ > SepExports.SeSystemEnvironmentPrivilege = SeSystemEnvironmentPrivilege; > SepExports.SeChangeNotifyPrivilege = SeChangeNotifyPrivilege; > SepExports.SeRemoteShutdownPrivilege = SeRemoteShutdownPrivilege; > - > + > SepExports.SeNullSid = SeNullSid; > SepExports.SeWorldSid = SeWorldSid; > SepExports.SeLocalSid = SeLocalSid; > @@ -72,11 +72,11 @@ > SepExports.SeAuthenticatedUsersSid = SeAuthenticatedUsersSid; > SepExports.SeRestrictedSid = SeRestrictedSid; > SepExports.SeAnonymousLogonSid = SeAnonymousLogonSid; > - > + > SepExports.SeUndockPrivilege = SeUndockPrivilege; > SepExports.SeSyncAgentPrivilege = SeSyncAgentPrivilege; > SepExports.SeEnableDelegationPrivilege = SeEnableDelegationPrivilege; > - > + > SeExports = &SepExports; > return TRUE; > } > @@ -92,18 +92,18 @@ > if (!SepInitSDs()) return FALSE; > SepInitPrivileges(); > if (!SepInitExports()) return FALSE; > - > + > /* Initialize the subject context lock */ > ExInitializeResource(&SepSubjectContextLock); > - > + > /* Initialize token objects */ > SepInitializeTokenImplementation(); > - > + > /* Clear impersonation info for the idle thread */ > PsGetCurrentThread()->ImpersonationInfo = NULL; > PspClearCrossThreadFlag(PsGetCurrentThread(), > CT_ACTIVE_IMPERSONATION_INFO_BIT); > - > + > /* Initialize the boot token */ > ObInitializeFastReference(&PsGetCurrentProcess()->Token, NULL); > ObInitializeFastReference(&PsGetCurrentProcess()->Token, > @@ -117,7 +117,7 @@ > { > NTSTATUS Status; > PAGED_CODE(); > - > + > /* Insert the system token into the tree */ > Status = ObInsertObject((PVOID)(PsGetCurrentProcess()->Token.Value & > ~MAX_FAST_REFS), > @@ -127,7 +127,7 @@ > NULL, > NULL); > ASSERT(NT_SUCCESS(Status)); > - > + > /* FIXME: TODO \\ Security directory */ > return TRUE; > } > @@ -140,17 +140,17 @@ > switch (ExpInitializationPhase) > { > case 0: > - > + > /* Do Phase 0 */ > return SepInitializationPhase0(); > - > + > case 1: > - > + > /* Do Phase 1 */ > return SepInitializationPhase1(); > - > + > default: > - > + > /* Don't know any other phase! Bugcheck! */ > KeBugCheckEx(UNEXPECTED_INITIALIZATION_CALL, > 0, > @@ -170,7 +170,7 @@ > HANDLE DirectoryHandle; > HANDLE EventHandle; > NTSTATUS Status; > - > + > /* Create '\Security' directory */ > RtlInitUnicodeString(&Name, > L"\\Security"); > @@ -187,7 +187,7 @@ > DPRINT1("Failed to create 'Security' directory!\n"); > return FALSE; > } > - > + > /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ > RtlInitUnicodeString(&Name, > L"\\LSA_AUTHENTICATION_INITALIZED"); > @@ -207,12 +207,12 @@ > NtClose(DirectoryHandle); > return FALSE; > } > - > + > ZwClose(EventHandle); > ZwClose(DirectoryHandle); > - > + > /* FIXME: Create SRM port and listener thread */ > - > + > return TRUE; > } > > @@ -228,16 +228,16 @@ > IN PGENERIC_MAPPING GenericMapping) > { > PAGED_CODE(); > - > + > /* Select the operation type */ > switch (OperationType) > { > /* Setting a new descriptor */ > case SetSecurityDescriptor: > - > + > /* Sanity check */ > ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); > - > + > /* Set the information */ > return ObSetSecurityDescriptorInfo(Object, > SecurityInformation, > @@ -245,33 +245,33 @@ > OldSecurityDescriptor, > PoolType, > GenericMapping); > - > + > case QuerySecurityDescriptor: > - > + > /* Query the information */ > return ObQuerySecurityDescriptorInfo(Object, > SecurityInformation, > SecurityDescriptor, > ReturnLength, > OldSecurityDescriptor); > - > + > case DeleteSecurityDescriptor: > - > + > /* De-assign it */ > return ObDeassignSecurity(OldSecurityDescriptor); > - > + > case AssignSecurityDescriptor: > - > + > /* Assign it */ > ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); > return STATUS_SUCCESS; > - > + > default: > - > + > /* Bug check */ > KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); > } > - > + > /* Should never reach here */ > ASSERT(FALSE); > return STATUS_SUCCESS; > @@ -284,14 +284,14 @@ > { > ULONG i; > PTOKEN Token = (PTOKEN)_Token; > - > + > PAGED_CODE(); > - > + > if (Token->UserAndGroupCount == 0) > { > return FALSE; > } > - > + > for (i=0; i<Token->UserAndGroupCount; i++) > { > if (RtlEqualSid(Sid, Token->UserAndGroups[i].Sid)) > @@ -300,11 +300,11 @@ > { > return TRUE; > } > - > + > return FALSE; > } > } > - > + > return FALSE; > } > > @@ -314,7 +314,7 @@ > OUT PACCESS_MASK DesiredAccess) > { > *DesiredAccess = 0; > - > + > if (SecurityInformation & (OWNER_SECURITY_INFORMATION | > GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) > { > @@ -331,7 +331,7 @@ > OUT PACCESS_MASK DesiredAccess) > { > *DesiredAccess = 0; > - > + > if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) > { > *DesiredAccess |= WRITE_OWNER; > @@ -374,7 +374,7 @@ > PSID Sid; > NTSTATUS Status; > PAGED_CODE(); > - > + > /* Check if this is kernel mode */ > if (AccessMode == KernelMode) > { > @@ -391,12 +391,12 @@ > /* Give the desired and previous access */ > *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; > } > - > + > /* Success */ > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > - > + > /* Check if we didn't get an SD */ > if (!SecurityDescriptor) > { > @@ -404,7 +404,7 @@ > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* Check for invalid impersonation */ > if ((SubjectSecurityContext->ClientToken) && > (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation)) > @@ -412,7 +412,7 @@ > *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL; > return FALSE; > } > - > + > /* Check for no access desired */ > if (!DesiredAccess) > { > @@ -423,31 +423,31 @@ > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* Return the previous access only */ > *GrantedAccess = PreviouslyGrantedAccess; > *AccessStatus = STATUS_SUCCESS; > *Privileges = NULL; > return TRUE; > } > - > + > /* Acquire the lock if needed */ > if (!SubjectContextLocked) SeLockSubjectContext(SubjectSecurityContext); > - > + > /* Map given accesses */ > RtlMapGenericMask(&DesiredAccess, GenericMapping); > if (PreviouslyGrantedAccess) > RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); > - > - > - > + > + > + > CurrentAccess = PreviouslyGrantedAccess; > - > - > - > + > + > + > Token = SubjectSecurityContext->ClientToken ? > SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; > - > + > /* Get the DACL */ > Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, > &Present, > @@ -459,11 +459,11 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *AccessStatus = Status; > return FALSE; > } > - > + > /* RULE 1: Grant desired access if the object is unprotected */ > if (Present == TRUE && Dacl == NULL) > { > @@ -471,18 +471,18 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = DesiredAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > - > + > CurrentAccess = PreviouslyGrantedAccess; > - > + > /* RULE 2: Check token for 'take ownership' privilege */ > Privilege.Luid = SeTakeOwnershipPrivilege; > Privilege.Attributes = SE_PRIVILEGE_ENABLED; > - > + > if (SepPrivilegeCheck(Token, > &Privilege, > 1, > @@ -497,13 +497,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = CurrentAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > } > - > + > /* RULE 3: Check whether the token is the owner */ > Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, > &Sid, > @@ -515,11 +515,11 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *AccessStatus = Status; > return FALSE; > } > - > + > if (Sid && SepSidInToken(Token, Sid)) > { > CurrentAccess |= (READ_CONTROL | WRITE_DAC); > @@ -530,13 +530,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = CurrentAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > } > - > + > /* Fail if DACL is absent */ > if (Present == FALSE) > { > @@ -544,12 +544,12 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = 0; > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* RULE 4: Grant rights according to the DACL */ > CurrentAce = (PACE)(Dacl + 1); > for (i = 0; i < Dacl->AceCount; i++) > @@ -563,13 +563,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = 0; > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > } > - > + > else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) > { > if (SepSidInToken(Token, Sid)) > @@ -585,17 +585,17 @@ > } > CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); > } > - > + > if (SubjectContextLocked == FALSE) > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n", > CurrentAccess, DesiredAccess); > - > + > *GrantedAccess = CurrentAccess & DesiredAccess; > - > + > if (DesiredAccess & MAXIMUM_ALLOWED) > { > *GrantedAccess = CurrentAccess; > @@ -688,32 +688,24 @@ > SubjectSecurityContext.ProcessAuditId = NULL; > SeLockSubjectContext(&SubjectSecurityContext); > > - /* FIXME */ > /* Now perform the access check */ > - if (SeAccessCheck(SecurityDescriptor, > - &SubjectSecurityContext, > - TRUE, > - DesiredAccess, > - 0, > - &PrivilegeSet, //FIXME > - GenericMapping, > - PreviousMode, > - GrantedAccess, > - AccessStatus)) > - { > - Status = *AccessStatus; > - } > - else > - { > - Status = STATUS_ACCESS_DENIED; > - } > + SeAccessCheck(SecurityDescriptor, > + &SubjectSecurityContext, > + TRUE, > + DesiredAccess, > + 0, > + &PrivilegeSet, //FIXME > + GenericMapping, > + PreviousMode, > + GrantedAccess, > + AccessStatus); > > /* Unlock subject context and dereference the token */ > SeUnlockSubjectContext(&SubjectSecurityContext); > ObDereferenceObject(Token); > > - /* Check succeeded? */ > - return Status; > + /* Check succeeded */ > + return STATUS_SUCCESS; > } > > > >

16 years, 2 months

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 41658: - Move all the functions from drvlck.c and verifier.c to ARM3's drvmgmt.c: - "Managing driver managing" (by David Welch) is no more... the routines have been properly renamed and cleaned up. - Also moved Driver Verifier helper routines in here, and fixed a couple of bugs: - Do not allow hooking of the kernel or HAL image (tested on Windows Server 2003) - Cleanup some useless variable redefinitions and code complexity. - Documented what some of the Mm Lock/U

by Timo Kreuzer

this commit - removed Alex Ionescu's name from his code (verifier.c) - reformatted his code simply to reformat it - changed license from GPL to BSD Recommend this user gets banned for breaking licence / IP policies / coding rules. :-P Regards, Timo ros-arm-bringup(a)svn.reactos.org wrote: > Author: ros-arm-bringup > Date: Sun Jun 28 11:32:52 2009 > New Revision: 41658 > > URL: http://svn.reactos.org/svn/reactos?rev=41658&view=rev > Log: > - Move all the functions from drvlck.c and verifier.c to ARM3's drvmgmt.c: > - "Managing driver managing" (by David Welch) is no more... the routines have been properly renamed and cleaned up. > - Also moved Driver Verifier helper routines in here, and fixed a couple of bugs: > - Do not allow hooking of the kernel or HAL image (tested on Windows Server 2003) > - Cleanup some useless variable redefinitions and code complexity. > - Documented what some of the Mm Lock/Unlock Pageable Section/Driver functions should do, for later if needed. > - Made aliasses so the typo "Pagable" functions redirect to the correct "Pageable" functions. > - No functional change -- the Verifier functions were unused, and the drvlock.c functions were unimplemented (and still are). > - Also move one more *Pageable* function from wset.c to ARM3's drvmgmt.c -- it seemed to have been a lost orphan (Also unimplemented). > > > Added: > trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c > - copied, changed from r41647, trunk/reactos/ntoskrnl/mm/drvlck.c > Removed: > trunk/reactos/ntoskrnl/mm/drvlck.c > trunk/reactos/ntoskrnl/mm/verifier.c > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > trunk/reactos/ntoskrnl/mm/wset.c > trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > trunk/reactos/ntoskrnl/ntoskrnl.pspec > > Copied: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c (from r41647, trunk/reactos/ntoskrnl/mm/drvlck.c) > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -1,102 +1,324 @@ > /* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS kernel > - * FILE: ntoskrnl/mm/drvlck.c > - * PURPOSE: Managing driver managing > - * > - * PROGRAMMERS: David Welch (welch(a)mcmail.com) > - */ > - > -/* INCLUDES *****************************************************************/ > + * PROJECT: ReactOS Kernel > + * LICENSE: BSD - See COPYING.ARM in the top level directory > + * FILE: ntoskrnl/mm/ARM3/drvmgmt.c > + * PURPOSE: ARM Memory Manager Driver Management > + * PROGRAMMERS: ReactOS Portable Systems Group > + */ > + > +/* INCLUDES *******************************************************************/ > > #include <ntoskrnl.h> > +#define NDEBUG > #include <debug.h> > > -/* FUNCTIONS *****************************************************************/ > - > -#undef MmLockPagableDataSection > - > -#if 0 > +#line 15 "ARMĂ�Âł::DRVMGMT" > +#define MODULE_INVOLVED_IN_ARM3 > +#include "../ARM3/miarm.h" > + > +/* GLOBALS *******************************************************************/ > + > +MM_DRIVER_VERIFIER_DATA MmVerifierData; > +LIST_ENTRY MiVerifierDriverAddedThunkListHead; > +KMUTANT MmSystemLoadLock; > +ULONG MiActiveVerifierThunks; > +extern LIST_ENTRY PsLoadedModuleList; > + > +/* PRIVATE FUNCTIONS *********************************************************/ > + > +PLDR_DATA_TABLE_ENTRY > +NTAPI > +MiLookupDataTableEntry(IN PVOID Address) > +{ > + PLDR_DATA_TABLE_ENTRY LdrEntry, FoundEntry = NULL; > + PLIST_ENTRY NextEntry; > + PAGED_CODE(); > + > + // > + // Loop entries > + // > + NextEntry = PsLoadedModuleList.Flink; > + do > + { > + // > + // Get the loader entry > + // > + LdrEntry = CONTAINING_RECORD(NextEntry, > + LDR_DATA_TABLE_ENTRY, > + InLoadOrderLinks); > + > + // > + // Check if the address matches > + // > + if ((Address >= LdrEntry->DllBase) && > + (Address < (PVOID)((ULONG_PTR)LdrEntry->DllBase + > + LdrEntry->SizeOfImage))) > + { > + // > + // Found a match > + // > + FoundEntry = LdrEntry; > + break; > + } > + > + // > + // Move on > + // > + NextEntry = NextEntry->Flink; > + } while(NextEntry != &PsLoadedModuleList); > + > + // > + // Return the entry > + // > + return FoundEntry; > +} > + > +/* PUBLIC FUNCTIONS ***********************************************************/ > + > +/* > + * @unimplemented > + */ > VOID > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -/* > - * FUNCTION: Releases a section of driver code or driver data, previously > - * locked into system space with MmLockPagableCodeSection, > - * MmLockPagableDataSection or MmLockPagableSectionByHandle > - * ARGUMENTS: > - * ImageSectionHandle = Handle returned by MmLockPagableCodeSection or > - * MmLockPagableDataSection > - */ > -{ > - // MmUnlockMemoryArea((MEMORY_AREA *)ImageSectionHandle); > - UNIMPLEMENTED; > -} > -#endif > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > - > -#if 0 > +NTAPI > +MmUnlockPageableImageSection(IN PVOID ImageSectionHandle) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > +VOID > +NTAPI > +MmLockPageableSectionByHandle(IN PVOID ImageSectionHandle) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > PVOID > -MmLockPagableCodeSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > -#endif > - > +NTAPI > +MmLockPageableDataSection(IN PVOID AddressWithinSection) > +{ > + // > + // We should just find the section and call MmLockPageableSectionByHandle > + // > + UNIMPLEMENTED; > + return AddressWithinSection; > +} > + > +/* > + * @unimplemented > + */ > +PVOID > +NTAPI > +MmPageEntireDriver(IN PVOID AddressWithinSection) > +{ > + // > + // We should find the driver loader entry and return its base address > + // > + UNIMPLEMENTED; > + return NULL; > +} > + > +/* > + * @unimplemented > + */ > +VOID > +NTAPI > +MmResetDriverPaging(IN PVOID AddressWithinSection) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > +ULONG > +NTAPI > +MmTrimAllSystemPageableMemory(IN ULONG PurgeTransitionList) > +{ > + UNIMPLEMENTED; > + return 0; > +} > > /* > * @implemented > */ > -PVOID NTAPI > -MmLockPagableDataSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), > - AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > -/* > - * @unimplemented > - */ > -PVOID NTAPI > -MmPageEntireDriver(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > - return NULL; > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmResetDriverPaging(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > +NTSTATUS > +NTAPI > +MmAddVerifierThunks(IN PVOID ThunkBuffer, > + IN ULONG ThunkBufferSize) > +{ > + PDRIVER_VERIFIER_THUNK_PAIRS ThunkTable; > + ULONG ThunkCount; > + PDRIVER_SPECIFIED_VERIFIER_THUNKS DriverThunks; > + PLDR_DATA_TABLE_ENTRY LdrEntry; > + PVOID ModuleBase, ModuleEnd; > + ULONG i; > + NTSTATUS Status = STATUS_SUCCESS; > + PAGED_CODE(); > + > + // > + // Make sure the driver verifier is initialized > + // > + if (!MiVerifierDriverAddedThunkListHead.Flink) return STATUS_NOT_SUPPORTED; > + > + // > + // Get the thunk pairs and count them > + // > + ThunkCount = ThunkBufferSize / sizeof(DRIVER_VERIFIER_THUNK_PAIRS); > + if (!ThunkCount) return STATUS_INVALID_PARAMETER_1; > + > + // > + // Now allocate our own thunk table > + // > + DriverThunks = ExAllocatePoolWithTag(PagedPool, > + sizeof(*DriverThunks) + > + ThunkCount * > + sizeof(DRIVER_VERIFIER_THUNK_PAIRS), > + 'tVmM'); > + if (!DriverThunks) return STATUS_INSUFFICIENT_RESOURCES; > + > + // > + // Now copy the driver-fed part > + // > + ThunkTable = (PDRIVER_VERIFIER_THUNK_PAIRS)(DriverThunks + 1); > + RtlCopyMemory(ThunkTable, > + ThunkBuffer, > + ThunkCount * sizeof(DRIVER_VERIFIER_THUNK_PAIRS)); > + > + // > + // Acquire the system load lock > + // > + KeEnterCriticalRegion(); > + KeWaitForSingleObject(&MmSystemLoadLock, > + WrVirtualMemory, > + KernelMode, > + FALSE, > + NULL); > + > + // > + // Get the loader entry > + // > + LdrEntry = MiLookupDataTableEntry(ThunkTable->PristineRoutine); > + if (!LdrEntry) > + { > + // > + // Fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + > + // > + // Get driver base and end > + // > + ModuleBase = LdrEntry->DllBase; > + ModuleEnd = (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage); > + > + // > + // Don't allow hooking the kernel or HAL > + // > + if (ModuleBase < (PVOID)(KSEG0_BASE + MmBootImageSize)) > + { > + // > + // Fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + > + // > + // Loop all the thunks > + // > + for (i = 0; i < ThunkCount; i++) > + { > + // > + // Make sure it's in the driver > + // > + if (((ULONG_PTR)ThunkTable->PristineRoutine < (ULONG_PTR)ModuleBase) || > + ((ULONG_PTR)ThunkTable->PristineRoutine >= (ULONG_PTR)ModuleEnd)) > + { > + // > + // Nope, fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + } > + > + // > + // Otherwise, add this entry > + // > + DriverThunks->DataTableEntry = LdrEntry; > + DriverThunks->NumberOfThunks = ThunkCount; > + MiActiveVerifierThunks++; > + InsertTailList(&MiVerifierDriverAddedThunkListHead, > + &DriverThunks->ListEntry); > + DriverThunks = NULL; > + > +Cleanup: > + // > + // Release the lock > + // > + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); > + KeLeaveCriticalRegion(); > + > + // > + // Free the table if we failed and return status > + // > + if (DriverThunks) ExFreePool(DriverThunks); > + return Status; > +} > + > +/* > + * @implemented > + */ > +LOGICAL > +NTAPI > +MmIsDriverVerifying(IN PDRIVER_OBJECT DriverObject) > +{ > + PLDR_DATA_TABLE_ENTRY LdrEntry; > + > + // > + // Get the loader entry > + // > + LdrEntry = (PLDR_DATA_TABLE_ENTRY)DriverObject->DriverSection; > + if (!LdrEntry) return FALSE; > + > + // > + // Check if we're verifying or not > + // > + return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; > +} > + > +/* > + * @implemented > + */ > +NTSTATUS > +NTAPI > +MmIsVerifierEnabled(OUT PULONG VerifierFlags) > +{ > + // > + // Check if we've actually added anything to the list > + // > + if (MiVerifierDriverAddedThunkListHead.Flink) > + { > + // > + // We have, read the verifier level > + // > + *VerifierFlags = MmVerifierData.Level; > + return STATUS_SUCCESS; > + } > + > + // > + // Otherwise, we're disabled > + // > + *VerifierFlags = 0; > + return STATUS_NOT_SUPPORTED; > } > > /* EOF */ > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -52,6 +52,7 @@ > extern PMMPTE MiFirstReservedZeroingPte; > extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType]; > extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; > +extern ULONG MmBootImageSize; > > VOID > NTAPI > > Removed: trunk/reactos/ntoskrnl/mm/drvlck.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=4… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/drvlck.c (removed) > @@ -1,102 +1,0 @@ > -/* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS kernel > - * FILE: ntoskrnl/mm/drvlck.c > - * PURPOSE: Managing driver managing > - * > - * PROGRAMMERS: David Welch (welch(a)mcmail.com) > - */ > - > -/* INCLUDES *****************************************************************/ > - > -#include <ntoskrnl.h> > -#include <debug.h> > - > -/* FUNCTIONS *****************************************************************/ > - > -#undef MmLockPagableDataSection > - > -#if 0 > -VOID > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -/* > - * FUNCTION: Releases a section of driver code or driver data, previously > - * locked into system space with MmLockPagableCodeSection, > - * MmLockPagableDataSection or MmLockPagableSectionByHandle > - * ARGUMENTS: > - * ImageSectionHandle = Handle returned by MmLockPagableCodeSection or > - * MmLockPagableDataSection > - */ > -{ > - // MmUnlockMemoryArea((MEMORY_AREA *)ImageSectionHandle); > - UNIMPLEMENTED; > -} > -#endif > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > - > -#if 0 > -PVOID > -MmLockPagableCodeSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > -#endif > - > - > -/* > - * @implemented > - */ > -PVOID NTAPI > -MmLockPagableDataSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), > - AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > -/* > - * @unimplemented > - */ > -PVOID NTAPI > -MmPageEntireDriver(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > - return NULL; > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmResetDriverPaging(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > -} > - > -/* EOF */ > > Removed: trunk/reactos/ntoskrnl/mm/verifier.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/verifier.c (removed) > @@ -1,190 +1,0 @@ > -/* > -* PROJECT: ReactOS Kernel > -* LICENSE: GPL - See COPYING in the top level directory > -* FILE: ntoskrnl/mm/verifier.c > -* PURPOSE: Mm Driver Verifier Routines > -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) > -*/ > - > -/* INCLUDES ******************************************************************/ > - > -#include <ntoskrnl.h> > -#define NDEBUG > -#include <debug.h> > - > -/* GLOBALS *******************************************************************/ > - > -MM_DRIVER_VERIFIER_DATA MmVerifierData; > -LIST_ENTRY MiVerifierDriverAddedThunkListHead; > -KMUTANT MmSystemLoadLock; > -ULONG MiActiveVerifierThunks; > - > -extern LIST_ENTRY PsLoadedModuleList; > - > -/* PRIVATE FUNCTIONS *********************************************************/ > - > -PLDR_DATA_TABLE_ENTRY > -NTAPI > -MiLookupDataTableEntry(IN PVOID Address) > -{ > - PLDR_DATA_TABLE_ENTRY LdrEntry, FoundEntry = NULL; > - PLIST_ENTRY NextEntry; > - PAGED_CODE(); > - > - /* Loop entries */ > - NextEntry = PsLoadedModuleList.Flink; > - do > - { > - /* Get the loader entry */ > - LdrEntry = CONTAINING_RECORD(NextEntry, > - LDR_DATA_TABLE_ENTRY, > - InLoadOrderLinks); > - > - /* Check if the address matches */ > - if ((Address >= LdrEntry->DllBase) && > - (Address < (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage))) > - { > - /* Found a match */ > - FoundEntry = LdrEntry; > - break; > - } > - > - /* Move on */ > - NextEntry = NextEntry->Flink; > - } while(NextEntry != &PsLoadedModuleList); > - > - /* Return the entry */ > - return FoundEntry; > -} > - > -/* PUBLIC FUNCTIONS **********************************************************/ > - > -/* > - * @implemented > - */ > -NTSTATUS > -NTAPI > -MmAddVerifierThunks(IN PVOID ThunkBuffer, > - IN ULONG ThunkBufferSize) > -{ > - PDRIVER_VERIFIER_THUNK_PAIRS ThunkPairs, DriverThunkTable; > - ULONG ThunkCount; > - PDRIVER_SPECIFIED_VERIFIER_THUNKS ThunkTable; > - PLDR_DATA_TABLE_ENTRY LdrEntry; > - PVOID ModuleBase, ModuleEnd; > - ULONG i; > - NTSTATUS Status = STATUS_SUCCESS; > - PAGED_CODE(); > - > - /* Make sure the driver verifier is initialized */ > - if (!MiVerifierDriverAddedThunkListHead.Flink) return STATUS_NOT_SUPPORTED; > - > - /* Get the thunk pairs and count them */ > - ThunkPairs = (PDRIVER_VERIFIER_THUNK_PAIRS)ThunkBuffer; > - ThunkCount = ThunkBufferSize / sizeof(DRIVER_VERIFIER_THUNK_PAIRS); > - if (!ThunkCount) return STATUS_INVALID_PARAMETER_1; > - > - /* Now allocate our own thunk table */ > - ThunkTable = ExAllocatePoolWithTag(PagedPool, > - sizeof(DRIVER_SPECIFIED_VERIFIER_THUNKS) + > - ThunkCount * > - sizeof(DRIVER_VERIFIER_THUNK_PAIRS), > - TAG('M', 'm', 'V', 't')); > - if (!ThunkTable) return STATUS_INSUFFICIENT_RESOURCES; > - > - /* Now copy the driver-fed part */ > - DriverThunkTable = (PDRIVER_VERIFIER_THUNK_PAIRS)(ThunkTable + 1); > - RtlCopyMemory(DriverThunkTable, > - ThunkPairs, > - ThunkCount * sizeof(DRIVER_VERIFIER_THUNK_PAIRS)); > - > - /* Acquire the system load lock */ > - KeEnterCriticalRegion(); > - KeWaitForSingleObject(&MmSystemLoadLock, > - WrVirtualMemory, > - KernelMode, > - FALSE, > - NULL); > - > - /* Get the loader entry */ > - LdrEntry = MiLookupDataTableEntry(DriverThunkTable->PristineRoutine); > - if (!LdrEntry) > - { > - /* Fail */ > - Status = STATUS_INVALID_PARAMETER_2; > - goto Cleanup; > - } > - > - /* Get driver base and end */ > - ModuleBase = LdrEntry->DllBase; > - ModuleEnd = (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage); > - > - /* Loop all the thunks */ > - for (i = 0; i < ThunkCount; i++) > - { > - /* Make sure it's in the driver */ > - if (((ULONG_PTR)DriverThunkTable->PristineRoutine < (ULONG_PTR)ModuleBase) || > - ((ULONG_PTR)DriverThunkTable->PristineRoutine >= (ULONG_PTR)ModuleEnd)) > - { > - /* Nope, fail */ > - Status = STATUS_INVALID_PARAMETER_2; > - goto Cleanup; > - } > - } > - > - /* Otherwise, add this entry */ > - ThunkTable->DataTableEntry = LdrEntry; > - ThunkTable->NumberOfThunks = ThunkCount; > - MiActiveVerifierThunks++; > - InsertTailList(&MiVerifierDriverAddedThunkListHead, > - &ThunkTable->ListEntry); > - ThunkTable = NULL; > - > -Cleanup: > - /* Release the lock */ > - KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); > - KeLeaveCriticalRegion(); > - > - /* Free the table if we failed and return status */ > - if (ThunkTable) ExFreePool(ThunkTable); > - return Status; > -} > - > -/* > - * @implemented > - */ > -LOGICAL > -NTAPI > -MmIsDriverVerifying(IN PDRIVER_OBJECT DriverObject) > -{ > - PLDR_DATA_TABLE_ENTRY LdrEntry; > - > - /* Get the loader entry */ > - LdrEntry = (PLDR_DATA_TABLE_ENTRY)DriverObject->DriverSection; > - if (!LdrEntry) return FALSE; > - > - /* Check if we're verifying or not */ > - return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; > -} > - > -/* > - * @implemented > - */ > -NTSTATUS > -NTAPI > -MmIsVerifierEnabled(OUT PULONG VerifierFlags) > -{ > - /* Check if we've actually added anything to the list */ > - if (MiVerifierDriverAddedThunkListHead.Flink) > - { > - /* We have, read the verifier level */ > - *VerifierFlags = MmVerifierData.Level; > - return STATUS_SUCCESS; > - } > - > - /* Otherwise, we're disabled */ > - *VerifierFlags = 0; > - return STATUS_NOT_SUPPORTED; > -} > - > -/* EOF */ > > Modified: trunk/reactos/ntoskrnl/mm/wset.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?rev=416… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -46,16 +46,3 @@ > } > return(STATUS_SUCCESS); > } > - > -/* > - * @unimplemented > - */ > -ULONG > -NTAPI > -MmTrimAllSystemPagableMemory ( > - IN ULONG PurgeTransitionList > - ) > -{ > - UNIMPLEMENTED; > - return 0; > -} > > Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -361,6 +361,7 @@ > </if> > <directory name="ARM3"> > <file>contmem.c</file> > + <file>drvmgmt.c</file> > <file>dynamic.c</file> > <file>hypermap.c</file> > <file>init.c</file> > @@ -372,7 +373,6 @@ > <file>anonmem.c</file> > <file>balance.c</file> > <file>dbgpool.c</file> > - <file>drvlck.c</file> > <file>freelist.c</file> > <file>kmap.c</file> > <file>marea.c</file> > @@ -392,7 +392,6 @@ > <file>rmap.c</file> > <file>section.c</file> > <file>sysldr.c</file> > - <file>verifier.c</file> > <file>virtual.c</file> > <file>wset.c</file> > <if property="_ELF_" value="1"> > > Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -771,9 +771,9 @@ > @ stdcall MmIsRecursiveIoFault() > @ stdcall MmIsThisAnNtAsSystem() > @ stdcall MmIsVerifierEnabled(ptr) > -@ stdcall MmLockPagableDataSection(ptr) > -@ stdcall MmLockPagableImageSection(ptr) MmLockPagableDataSection > -@ stdcall MmLockPagableSectionByHandle(ptr) > +@ stdcall MmLockPagableDataSection(ptr) MmLockPageableDataSection > +@ stdcall MmLockPagableImageSection(ptr) MmLockPageableDataSection > +@ stdcall MmLockPagableSectionByHandle(ptr) MmLockPageableSectionByHandle > @ stdcall MmMapIoSpace(long long long long) > @ stdcall MmMapLockedPages(ptr long) > @ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) > @@ -801,8 +801,8 @@ > @ stdcall MmSetBankedSection(long long long long long long) > @ stdcall MmSizeOfMdl(ptr long) > @ extern MmSystemRangeStart > -@ stdcall MmTrimAllSystemPagableMemory(long) > -@ stdcall MmUnlockPagableImageSection(ptr) > +@ stdcall MmTrimAllSystemPagableMemory(long) MmTrimAllSystemPageableMemory > +@ stdcall MmUnlockPagableImageSection(ptr) MmUnlockPageableImageSection > @ stdcall MmUnlockPages(ptr) > @ stdcall MmUnmapIoSpace(ptr long) > @ stdcall MmUnmapLockedPages(ptr ptr) > > >

16 years, 2 months

Re: [ros-dev] [ros-diffs] [cwittich] 41599: stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003

by Alex Ionescu

Statics? Win32 flags? Hungarian notation? What is this -- Wine? Please revert this shit. Best regards, Alex Ionescu On Wed, Jun 24, 2009 at 12:53 PM, <cwittich(a)svn.reactos.org> wrote: > Author: cwittich > Date: Wed Jun 24 23:53:54 2009 > New Revision: 41599 > > URL: http://svn.reactos.org/svn/reactos?rev=41599&view=rev > Log: > stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003 > > Modified: > trunk/reactos/ntoskrnl/po/power.c > > Modified: trunk/reactos/ntoskrnl/po/power.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=41… > ============================================================================== > --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Jun 24 23:53:54 2009 > @@ -588,6 +588,16 @@ > NtSetThreadExecutionState(IN EXECUTION_STATE esFlags, > OUT EXECUTION_STATE *PreviousFlags) > { > - UNIMPLEMENTED; > - return STATUS_NOT_IMPLEMENTED; > -} > + static EXECUTION_STATE current = > + ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; > + EXECUTION_STATE old = current; > + > + UNIMPLEMENTED; > + > + if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) > + current = esFlags; > + > + *PreviousFlags = old; > + > + return STATUS_SUCCESS; > +} > >

16 years, 2 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 41604: Rewrite (NtUser)SystemParametersInfo and related. - Instead of getting the data from the window station and other strange places, the values are now mostly stored in a global variable. This is possible because NtUser

by Steven Edwards

On Wed, Jun 24, 2009 at 10:43 PM, <tkreuzer(a)svn.reactos.org> wrote: > - user32_winetest sysparams: before: 634 executed / 235 failures, after: > 1093 executed, 11 failures > Very impressive. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 2 months

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 41571: - Do not reformat other people's code simply to reformat it.

by Timo Kreuzer

lol, what about keeping the style consistent? Also "//" is C++ / C99 comment style and not ANSI C compliant. ros-arm-bringup(a)svn.reactos.org schrieb: > Author: ros-arm-bringup > Date: Tue Jun 23 09:00:48 2009 > New Revision: 41571 > > URL: http://svn.reactos.org/svn/reactos?rev=41571&view=rev > Log: > - Do not reformat other people's code simply to reformat it. > > > Modified: > trunk/reactos/ntoskrnl/mm/mminit.c > > Modified: trunk/reactos/ntoskrnl/mm/mminit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 23 09:00:48 2009 > @@ -384,7 +384,9 @@ > /* Unmap low memory */ > MmDeletePageTable(NULL, 0); > > - /* Initialize ARMĂ?Âł */ > + // > + // Initialize ARMĂ?Âł > + // > MmArmInitSystem(0, KeLoaderBlock); > > /* Initialize nonpaged pool */ > > >

16 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev