Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[rharabien] 54687: [SHELL32] - Fix Recycle Bin attributes. Context menu does not have "Delete" option anymore. - Minor code improvements
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 22:56:13 2011 New Revision: 54687 URL: http://svn.reactos.org/svn/reactos?rev=54687&view=rev Log: [SHELL32] - Fix Recycle Bin attributes. Context menu does not have "Delete" option anymore. - Minor code improvements Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -470,7 +470,10 @@ lResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszShellFolderKey, 0, KEY_READ, &hSFKey); if (lResult != ERROR_SUCCESS) - return FALSE; + { + ERR("Cannot open key: %ls\n", wszShellFolderKey); + return FALSE; + } dwLen = sizeof(DWORD); lResult = RegQueryValueExW(hSFKey, wszCallForAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -858,7 +858,6 @@ } } - if (rfg & SFGAO_FILESYSTEM) { if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) @@ -899,14 +898,12 @@ bAddSep = TRUE; } - if (rfg & SFGAO_CANLINK) { bAddSep = FALSE; _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); } - if (rfg & SFGAO_CANDELETE) { Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -546,8 +546,8 @@ SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", - this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); + TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) return E_INVALIDARG; @@ -557,18 +557,22 @@ if (*rgfInOut == 0) *rgfInOut = ~0; - if(cidl == 0) { + if(cidl == 0) + { *rgfInOut &= dwDesktopAttributes; - } else { - while (cidl > 0 && *apidl) { - pdump (*apidl); - if (_ILIsDesktop(*apidl)) { + } + else + { + while (cidl > 0 && *apidl) + { + pdump(*apidl); + if (_ILIsDesktop(*apidl)) *rgfInOut &= dwDesktopAttributes; - } else if (_ILIsMyComputer(*apidl)) { + else if (_ILIsMyComputer(*apidl)) *rgfInOut &= dwMyComputerAttributes; - } else { - SHELL32_GetItemAttributes ((IShellFolder *)this, *apidl, rgfInOut); - } + else + SHELL32_GetItemAttributes((IShellFolder *)this, *apidl, rgfInOut); + apidl++; cidl--; } @@ -576,7 +580,7 @@ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE("-- result=0x%08x\n", *rgfInOut); return hr; } Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -583,7 +583,7 @@ SFGAOF *rgfInOut) { TRACE("(%p, %d, {%p, ...}, {%x})\n", this, cidl, apidl ? apidl[0] : NULL, (unsigned int)*rgfInOut); - *rgfInOut &= SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; + *rgfInOut &= SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -398,18 +398,18 @@ dwAttributes = *pdwAttributes; /* Attributes of some special folders are hardcoded */ - if (_ILIsDrive(pidl)) { + if (_ILIsDrive(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME; - } else if (_ILIsMyComputer(pidl) || _ILIsNetHood(pidl)) { + else if (_ILIsMyComputer(pidl) || _ILIsNetHood(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANDELETE| SFGAO_CANRENAME|SFGAO_CANLINK; - } else if (_ILIsControlPanel(pidl)) { + else if (_ILIsControlPanel(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_CANLINK; - } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) *pdwAttributes = dwAttributes; - } else if (_ILGetDataPointer(pidl)) + else if (_ILGetDataPointer(pidl)) { dwAttributes = _ILGetFileAttributes(pidl, NULL, 0);

1 0

[rharabien] 54686: [ATL] - Fix processing of binary data in registrar scripts
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 22:37:47 2011 New Revision: 54686 URL: http://svn.reactos.org/svn/reactos?rev=54686&view=rev Log: [ATL] - Fix processing of binary data in registrar scripts Modified: trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=5468… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Sun Dec 18 22:37:47 2011 @@ -473,7 +473,7 @@ inline unsigned int HexToBin(char a) { if (a >= '0' && a <= '9') - return a - 0x30; + return a - '0'; if (a >= 'A' && a <= 'F') return a - 'A' + 10; if (a >= 'a' && a <= 'f') @@ -630,7 +630,7 @@ return DISP_E_EXCEPTION; count = count / 2; for (curIndex = 0; curIndex < count; curIndex++) - buf->str[curIndex] = (HexToBin(buf->str[curIndex * 2]) << 4) | HexToBin(buf->str[curIndex * 2 + 1]); + ((BYTE*)buf->str)[curIndex] = (HexToBin(buf->str[curIndex * 2]) << 4) | HexToBin(buf->str[curIndex * 2 + 1]); lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_BINARY, (PBYTE)buf->str, count); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres);

1 0

[rharabien] 54685: [SHELL32] - Add back "Empty Recycle Bin" context menu item
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 21:54:59 2011 New Revision: 54685 URL: http://svn.reactos.org/svn/reactos?rev=54685&view=rev Log: [SHELL32] - Add back "Empty Recycle Bin" context menu item Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] Sun Dec 18 21:54:59 2011 @@ -23,10 +23,17 @@ } 'shellex' { - 'find' = e '@%%SystemRoot%%\system32\SHELL32.dll,-29188' + 'ContextMenuHandlers' { - 'ContextMenuHandlers' - 'PropertySheetHandlers' + '{645FF040-5081-101B-9F08-00AA002F954E}' + { + } + } + 'PropertySheetHandlers' + { + '{645FF040-5081-101B-9F08-00AA002F954E}' + { + } } } }

1 0

[rharabien] 54684: [SHELL32] - Formatting + some minor changes
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 21:54:04 2011 New Revision: 54684 URL: http://svn.reactos.org/svn/reactos?rev=54684&view=rev Log: [SHELL32] - Formatting + some minor changes Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.cpp trunk/reactos/dll/win32/shell32/folders/fonts.h trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.cpp trunk/reactos/dll/win32/shell32/folders/netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h trunk/reactos/dll/win32/shell32/shlfolder.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde…

1 0

[rharabien] 54683: [SHELL32] - Remove unused/empty files - Improve directory layout
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 15:47:41 2011 New Revision: 54683 URL: http://svn.reactos.org/svn/reactos?rev=54683&view=rev Log: [SHELL32] - Remove unused/empty files - Improve directory layout Added: trunk/reactos/dll/win32/shell32/TODO.txt (with props) trunk/reactos/dll/win32/shell32/defcontextmenu.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp trunk/reactos/dll/win32/shell32/folders/ (with props) trunk/reactos/dll/win32/shell32/folders/admintools.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp trunk/reactos/dll/win32/shell32/folders/fonts.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_fonts.h trunk/reactos/dll/win32/shell32/folders/fs.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp trunk/reactos/dll/win32/shell32/folders/netplaces.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h trunk/reactos/dll/win32/shell32/newmenu.cpp - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shv_item_new.cpp trunk/reactos/dll/win32/shell32/newmenu.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shv_item_new.h trunk/reactos/dll/win32/shell32/openwithmenu.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/she_ocmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/she_ocmenu.h trunk/reactos/dll/win32/shell32/systray.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/ros-systray.cpp Removed: trunk/reactos/dll/win32/shell32/GlueCode.cpp trunk/reactos/dll/win32/shell32/GlueCode.h trunk/reactos/dll/win32/shell32/basebar.cpp trunk/reactos/dll/win32/shell32/basebar.h trunk/reactos/dll/win32/shell32/menuband.cpp trunk/reactos/dll/win32/shell32/menuband.h trunk/reactos/dll/win32/shell32/menubandsite.cpp trunk/reactos/dll/win32/shell32/menubandsite.h trunk/reactos/dll/win32/shell32/menudeskbar.cpp trunk/reactos/dll/win32/shell32/menudeskbar.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/regsvr.cpp trunk/reactos/dll/win32/shell32/ros-systray.cpp trunk/reactos/dll/win32/shell32/she_ocmenu.cpp trunk/reactos/dll/win32/shell32/she_ocmenu.h trunk/reactos/dll/win32/shell32/shell.cpp trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp trunk/reactos/dll/win32/shell32/shfldr_admintools.h trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp trunk/reactos/dll/win32/shell32/shfldr_cpanel.h trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp trunk/reactos/dll/win32/shell32/shfldr_desktop.h trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp trunk/reactos/dll/win32/shell32/shfldr_fonts.h trunk/reactos/dll/win32/shell32/shfldr_fs.cpp trunk/reactos/dll/win32/shell32/shfldr_fs.h trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp trunk/reactos/dll/win32/shell32/shfldr_mycomp.h trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp trunk/reactos/dll/win32/shell32/shfldr_netplaces.h trunk/reactos/dll/win32/shell32/shfldr_printers.cpp trunk/reactos/dll/win32/shell32/shfldr_printers.h trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp trunk/reactos/dll/win32/shell32/shv_item_new.cpp trunk/reactos/dll/win32/shell32/shv_item_new.h trunk/reactos/dll/win32/shell32/toolband.cpp trunk/reactos/dll/win32/shell32/toolband.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/control.cpp trunk/reactos/dll/win32/shell32/cpanel.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Removed: trunk/reactos/dll/win32/shell32/GlueCode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/GlueCode… Removed: trunk/reactos/dll/win32/shell32/GlueCode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/GlueCode… Added: trunk/reactos/dll/win32/shell32/TODO.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/TODO.txt… Removed: trunk/reactos/dll/win32/shell32/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/basebar.… Removed: trunk/reactos/dll/win32/shell32/basebar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/basebar.… Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… Modified: trunk/reactos/dll/win32/shell32/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanel.h… Removed: trunk/reactos/dll/win32/shell32/menuband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menuband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menubandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menubandsite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menudeskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menudesk… Removed: trunk/reactos/dll/win32/shell32/menudeskbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menudesk… Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Removed: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Removed: trunk/reactos/dll/win32/shell32/regsvr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Removed: trunk/reactos/dll/win32/shell32/ros-systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/ros-syst… Removed: trunk/reactos/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Removed: trunk/reactos/dll/win32/shell32/she_ocmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Removed: trunk/reactos/dll/win32/shell32/shell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell.cp… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… Removed: trunk/reactos/dll/win32/shell32/shfldr_admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… Removed: trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… Removed: trunk/reactos/dll/win32/shell32/shfldr_cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… Removed: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Removed: trunk/reactos/dll/win32/shell32/shfldr_desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Removed: trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Removed: trunk/reactos/dll/win32/shell32/shfldr_netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Removed: trunk/reactos/dll/win32/shell32/shfldr_printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… Removed: trunk/reactos/dll/win32/shell32/shfldr_printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… Removed: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Removed: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Removed: trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… Removed: trunk/reactos/dll/win32/shell32/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Removed: trunk/reactos/dll/win32/shell32/shv_item_new.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Removed: trunk/reactos/dll/win32/shell32/toolband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/toolband… Removed: trunk/reactos/dll/win32/shell32/toolband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/toolband…

1 0

[cgutman] 54682: [NTOSKRNL] - Fix COW file mappings (modifications to the mappings no longer change the file on disk) - Fixes bug #4308
by cgutman＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: cgutman Date: Sun Dec 18 04:55:11 2011 New Revision: 54682 URL: http://svn.reactos.org/svn/reactos?rev=54682&view=rev Log: [NTOSKRNL] - Fix COW file mappings (modifications to the mappings no longer change the file on disk) - Fixes bug #4308 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Dec 18 04:55:11 2011 @@ -3165,7 +3165,7 @@ Segment->Protection = SectionPageProtection; Segment->Flags = MM_DATAFILE_SEGMENT; Segment->Characteristics = 0; - Segment->WriteCopy = FALSE; + Segment->WriteCopy = (SectionPageProtection & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)); if (AllocationAttributes & SEC_RESERVE) { Segment->Length = Segment->RawLength = 0; @@ -4058,6 +4058,23 @@ PMEMORY_AREA MArea; NTSTATUS Status; PHYSICAL_ADDRESS BoundaryAddressMultiple; + + if (Segment->WriteCopy) + { + /* We have to do this because the not present fault + * and access fault handlers depend on the protection + * that should be granted AFTER the COW fault takes + * place to be in Region->Protect. The not present fault + * handler changes this to the correct protection for COW when + * mapping the pages into the process's address space. If a COW + * fault takes place, the access fault handler sets the page protection + * to these values for the newly copied pages + */ + if (Protect == PAGE_WRITECOPY) + Protect = PAGE_READWRITE; + else if (Protect == PAGE_EXECUTE_WRITECOPY) + Protect = PAGE_EXECUTE_READWRITE; + } BoundaryAddressMultiple.QuadPart = 0;

1 0

[ion] 54681: [NTOSKRNL]: An old patch that implements most of the Query/Set classes for processes, and cleans up those that aren't yet implemented. Adds support for KeBoostPriorityThread, KeSetDisa...
by ion＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: ion Date: Sun Dec 18 04:27:20 2011 New Revision: 54681 URL: http://svn.reactos.org/svn/reactos?rev=54681&view=rev Log: [NTOSKRNL]: An old patch that implements most of the Query/Set classes for processes, and cleans up those that aren't yet implemented. Adds support for KeBoostPriorityThread, KeSetDisableBoostProcess, KeSetAutoAlignmentProcess, KeSetAffinityProcess and the scheduling impact of these APIs. Also fixes some bugs in existing classes. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ps/query.c 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 [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Dec 18 04:27:20 2011 @@ -221,6 +221,12 @@ #define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 #define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #define STA_OWNS_WORKING_SET_BITS 0x1F8 + +// +// Kernel Process flags (maybe in ketypes.h?) +// +#define KPSF_AUTO_ALIGNMENT_BIT 0 +#define KPSF_DISABLE_BOOST_BIT 1 // // Process Flags @@ -762,6 +768,11 @@ UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; +typedef struct _PROCESS_FOREGROUND_BACKGROUND +{ + BOOLEAN Foreground; +} PROCESS_FOREGROUND_BACKGROUND, *PPROCESS_FOREGROUND_BACKGROUND; + // // Thread Information Structures for NtQueryProcessInformation // 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sun Dec 18 04:27:20 2011 @@ -269,6 +269,34 @@ IN BOOLEAN Disable ); +BOOLEAN +NTAPI +KeSetDisableBoostProcess( + IN PKPROCESS Process, + IN BOOLEAN Disable +); + +BOOLEAN +NTAPI +KeSetAutoAlignmentProcess( + IN PKPROCESS Process, + IN BOOLEAN Enable +); + +KAFFINITY +NTAPI +KeSetAffinityProcess( + IN PKPROCESS Process, + IN KAFFINITY Affinity +); + +VOID +NTAPI +KeBoostPriorityThread( + IN PKTHREAD Thread, + IN KPRIORITY Increment +); + VOID NTAPI KeBalanceSetManager(IN PVOID Context); Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sun Dec 18 04:27:20 2011 @@ -258,6 +258,90 @@ /* Release lock */ KiReleaseProcessLock(&ProcessLock); +} + +KAFFINITY +NTAPI +KeSetAffinityProcess(IN PKPROCESS Process, + IN KAFFINITY Affinity) +{ + + KLOCK_QUEUE_HANDLE ProcessLock; + PLIST_ENTRY NextEntry, ListHead; + KAFFINITY OldAffinity; + PKTHREAD Thread; + ASSERT_PROCESS(Process); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + ASSERT((Affinity & KeActiveProcessors) != 0); + + /* Lock the process */ + KiAcquireProcessLock(Process, &ProcessLock); + + /* Acquire the dispatcher lock */ + KiAcquireDispatcherLockAtDpcLevel(); + + /* Capture old affinity and update it */ + OldAffinity = Process->Affinity; + Process->Affinity = Affinity; + + /* Loop all child threads */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Set affinity on it */ + KiSetAffinityThread(Thread, Affinity); + NextEntry = NextEntry->Flink; + } + + /* Release Dispatcher Database */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Release the process lock */ + KiReleaseProcessLockFromDpcLevel(&ProcessLock); + KiExitDispatcher(ProcessLock.OldIrql); + + /* Return previous affinity */ + return OldAffinity; +} + +BOOLEAN +NTAPI +KeSetAutoAlignmentProcess(IN PKPROCESS Process, + IN BOOLEAN Enable) +{ + /* Set or reset the bit depending on what the enable flag says */ + if (Enable) + { + return InterlockedBitTestAndSet(&Process->ProcessFlags, + KPSF_AUTO_ALIGNMENT_BIT); + } + else + { + return InterlockedBitTestAndReset(&Process->ProcessFlags, + KPSF_AUTO_ALIGNMENT_BIT); + } +} + +BOOLEAN +NTAPI +KeSetDisableBoostProcess(IN PKPROCESS Process, + IN BOOLEAN Disable) +{ + /* Set or reset the bit depending on what the disable flag says */ + if (Disable) + { + return InterlockedBitTestAndSet(&Process->ProcessFlags, + KPSF_DISABLE_BOOST_BIT); + } + else + { + return InterlockedBitTestAndReset(&Process->ProcessFlags, + KPSF_DISABLE_BOOST_BIT); + } } KPRIORITY Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sun Dec 18 04:27:20 2011 @@ -222,6 +222,53 @@ /* Return the old state */ return PreviousState; +} + +VOID +NTAPI +KeBoostPriorityThread(IN PKTHREAD Thread, + IN KPRIORITY Increment) +{ + KIRQL OldIrql; + KPRIORITY Priority; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Lock the Dispatcher Database */ + OldIrql = KiAcquireDispatcherLock(); + + /* Only threads in the dynamic range get boosts */ + if (Thread->Priority < LOW_REALTIME_PRIORITY) + { + /* Lock the thread */ + KiAcquireThreadLock(Thread); + + /* Check again, and make sure there's not already a boost */ + if ((Thread->Priority < LOW_REALTIME_PRIORITY) && + !(Thread->PriorityDecrement)) + { + /* Compute the new priority and see if it's higher */ + Priority = Thread->BasePriority + Increment; + if (Priority > Thread->Priority) + { + if (Priority >= LOW_REALTIME_PRIORITY) + { + Priority = LOW_REALTIME_PRIORITY - 1; + } + + /* Reset the quantum */ + Thread->Quantum = Thread->QuantumReset; + + /* Set the new Priority */ + KiSetPriorityThread(Thread, Priority); + } + } + + /* Release thread lock */ + KiReleaseThreadLock(Thread); + } + + /* Release the dispatcher lokc */ + KiReleaseDispatcherLock(OldIrql); } ULONG Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Dec 18 04:27:20 2011 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* FIXME: From winbase.h... what to do? */ +#define SEM_NOALIGNMENTFAULTEXCEPT 0x04 /* Include Information Class Tables */ #include "internal/ps_i.h" @@ -247,6 +250,7 @@ _SEH2_TRY { + /* FIXME: Call KeQueryValuesProcess */ IoCounters->ReadOperationCount = Process->ReadOperationCount.QuadPart; IoCounters->ReadTransferCount = Process->ReadTransferCount.QuadPart; IoCounters->WriteOperationCount = Process->WriteOperationCount.QuadPart; @@ -292,11 +296,12 @@ _SEH2_TRY { /* Copy time information from EPROCESS/KPROCESS */ + /* FIXME: Call KeQueryRuntimeProcess */ ProcessTime->CreateTime = Process->CreateTime; ProcessTime->UserTime.QuadPart = Process->Pcb.UserTime * - 100000LL; + KeMaximumIncrement; ProcessTime->KernelTime.QuadPart = Process->Pcb.KernelTime * - 100000LL; + KeMaximumIncrement; ProcessTime->ExitTime = Process->ExitTime; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -349,10 +354,16 @@ ObDereferenceObject(Process); break; - /* LDT, WS and VDM Information: not implemented */ - case ProcessLdtInformation: - case ProcessWorkingSetWatch: - case ProcessWx86Information: + case ProcessHandleCount: + + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -363,17 +374,31 @@ NULL); if (!NT_SUCCESS(Status)) break; - DPRINT1("Not implemented: %lx\n", ProcessInformationClass); + /* Count the number of handles this process has */ + HandleCount = ObGetProcessHandleCount(Process); + + /* Protect write in SEH */ + _SEH2_TRY + { + /* Return the count of handles */ + *(PULONG)ProcessInformation = HandleCount; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Dereference the process */ ObDereferenceObject(Process); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessHandleCount: + break; + + /* Session ID for the process */ + case ProcessSessionInformation: /* Set the return length*/ - Length = sizeof(ULONG); + Length = sizeof(PROCESS_SESSION_INFORMATION); if (ProcessInformationLength != Length) { @@ -390,14 +415,11 @@ NULL); if (!NT_SUCCESS(Status)) break; - /* Count the number of handles this process has */ - HandleCount = ObGetProcessHandleCount(Process); - - /* Protect write in SEH */ - _SEH2_TRY - { - /* Return the count of handles */ - *(PULONG)ProcessInformation = HandleCount; + /* Enter SEH for write safety */ + _SEH2_TRY + { + /* Write back the Session ID */ + SessionInfo->SessionId = Process->Session; //MmGetSessionId(Process); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -410,98 +432,19 @@ ObDereferenceObject(Process); break; - /* Session ID for the process */ - case ProcessSessionInformation: - - /* Set the return length*/ - Length = sizeof(PROCESS_SESSION_INFORMATION); - - if (ProcessInformationLength != Length) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) break; - - /* Enter SEH for write safety */ - _SEH2_TRY - { - /* Write back the Session ID */ - SessionInfo->SessionId = Process->Session; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Dereference the process */ - ObDereferenceObject(Process); - break; - - /* WOW64: Not implemented */ - case ProcessWow64Information: - - /* Set the return length */ - Length = sizeof(ULONG_PTR); - - if (ProcessInformationLength != Length) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) break; - - /* Protect write in SEH */ - _SEH2_TRY - { -#ifdef _WIN64 - DPRINT1("Not implemented: ProcessWow64Information\n"); - Status = STATUS_NOT_IMPLEMENTED; -#else - /* Wow64 not present */ - *(PULONG_PTR)ProcessInformation = 0; -#endif - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Dereference the process */ - ObDereferenceObject(Process); - break; - /* Virtual Memory Statistics */ case ProcessVmCounters: + /* Validate the input length */ + if ((ProcessInformationLength != sizeof(VM_COUNTERS)) && + (ProcessInformationLength != sizeof(VM_COUNTERS_EX))) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + /* Set the return length */ - Length = sizeof(VM_COUNTERS); - - if (ProcessInformationLength != Length) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + Length = ProcessInformationLength; /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, @@ -525,9 +468,9 @@ VmCounters->QuotaPagedPoolUsage = Process->QuotaUsage[0]; VmCounters->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; VmCounters->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; - VmCounters->PagefileUsage = Process->QuotaUsage[2]; - VmCounters->PeakPagefileUsage = Process->QuotaPeak[2]; - + VmCounters->PagefileUsage = Process->QuotaUsage[2] << PAGE_SHIFT; + VmCounters->PeakPagefileUsage = Process->QuotaPeak[2] << PAGE_SHIFT; + //VmCounters->PrivateUsage = Process->CommitCharge << PAGE_SHIFT; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -582,7 +525,7 @@ /* Priority Boosting status */ case ProcessPriorityBoost: - /* Set the return length*/ + /* Set the return length */ Length = sizeof(ULONG); if (ProcessInformationLength != Length) @@ -621,12 +564,20 @@ /* DOS Device Map */ case ProcessDeviceMap: - /* Set the return length*/ + /* Set the return length */ Length = sizeof(PROCESS_DEVICEMAP_INFORMATION); if (ProcessInformationLength != Length) { - Status = STATUS_INFO_LENGTH_MISMATCH; + if (ProcessInformationLength == sizeof(PROCESS_DEVICEMAP_INFORMATION_EX)) + { + DPRINT1("PROCESS_DEVICEMAP_INFORMATION_EX not supported!\n"); + Status = STATUS_NOT_IMPLEMENTED; + } + else + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } break; } @@ -751,7 +702,7 @@ ObDereferenceObject(Process); break; - case ProcessBreakOnTermination: + case ProcessDebugFlags: /* Set the return length*/ Length = sizeof(ULONG); @@ -773,6 +724,42 @@ /* Enter SEH for writing back data */ _SEH2_TRY { + /* Return the debug flag state */ + *(PULONG)ProcessInformation = Process->NoDebugInherit ? 0 : 1; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Dereference the process */ + ObDereferenceObject(Process); + break; + + case ProcessBreakOnTermination: + + /* Set the return length*/ + Length = sizeof(ULONG); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Enter SEH for writing back data */ + _SEH2_TRY + { /* Return the BreakOnTermination state */ *(PULONG)ProcessInformation = Process->BreakOnTermination; } @@ -831,20 +818,52 @@ } _SEH2_END; break; - - /* Not yet implemented, or unknown */ - case ProcessBasePriority: - case ProcessRaisePriority: - case ProcessExceptionPort: - case ProcessAccessToken: - case ProcessLdtSize: - case ProcessIoPortHandlers: - case ProcessUserModeIOPL: - case ProcessEnableAlignmentFaultFixup: - case ProcessAffinityMask: - case ProcessForegroundInformation: + + case ProcessImageInformation: + DPRINT1("Image Information Query Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessDebugObjectHandle: + DPRINT1("Debug Object Query Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessHandleTracing: + DPRINT1("Handle tracing Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessLUIDDeviceMapsEnabled: + DPRINT1("LUID Device Maps Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessExecuteFlags: + DPRINT1("No execute Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessWow64Information: + case ProcessLdtInformation: + case ProcessWx86Information: + DPRINT1("VDM/16-bit implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessWorkingSetWatch: + DPRINT1("WS Watch Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessPooledUsageAndLimits: + DPRINT1("Pool limits Not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Not supported by Server 2003 */ default: - DPRINT1("Unsupported or unimplemented: %lx\n", ProcessInformationClass); + DPRINT1("Unsupported info class: %lx\n", ProcessInformationClass); Status = STATUS_INVALID_INFO_CLASS; } @@ -882,8 +901,14 @@ HANDLE TokenHandle = NULL; PROCESS_SESSION_INFORMATION SessionInfo = {0}; PROCESS_PRIORITY_CLASS PriorityClass = {0}; + PROCESS_FOREGROUND_BACKGROUND Foreground = {0}; PVOID ExceptionPort; ULONG Break; + KAFFINITY ValidAffinity, Affinity = 0; + ULONG DefaultHardErrorMode = 0, BasePriority = 0, MemoryPriority = 0; + ULONG DisableBoost = 0, DebugFlags = 0, EnableFixup = 0, Boost = 0; + PLIST_ENTRY Next; + PETHREAD Thread; PAGED_CODE(); /* Verify Information Class validity */ @@ -946,6 +971,14 @@ } _SEH2_END; + /* Setting the error port requires the SeTcbPrivilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Can't set the session ID, bail out. */ + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + /* Get the LPC Port */ Status = ObReferenceObjectByHandle(PortHandle, 0, @@ -1008,16 +1041,29 @@ /* Enter SEH for direct buffer read */ _SEH2_TRY { - /* Update the current mode abd return the previous one */ - InterlockedExchange((LONG*)&Process->DefaultHardErrorProcessing, - *(PLONG)ProcessInformation); + DefaultHardErrorMode = *(PULONG)ProcessInformation; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Get exception code */ Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Set the mode */ + Process->DefaultHardErrorProcessing = DefaultHardErrorMode; + + /* Call Ke for the update */ + if (DefaultHardErrorMode & SEM_NOALIGNMENTFAULTEXCEPT) + { + KeSetAutoAlignmentProcess(&Process->Pcb, TRUE); + } + else + { + KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); + } + Status = STATUS_SUCCESS; break; /* Session ID */ @@ -1119,7 +1165,12 @@ break; } - /* TODO: Check privileges */ + if ((PriorityClass.PriorityClass != Process->PriorityClass) && + (PriorityClass.PriorityClass == PROCESS_PRIORITY_CLASS_REALTIME)) + { + /* TODO: Check privileges */ + DPRINT1("Should check privilege\n"); + } /* Check if we have a job */ if (Process->Job) @@ -1132,39 +1183,153 @@ /* Set process priority mode (foreground or background) */ PsSetProcessPriorityByClass(Process, - !PriorityClass.Foreground ? PsProcessPriorityBackground : - PsProcessPriorityForeground); - + PriorityClass.Foreground ? + PsProcessPriorityForeground : + PsProcessPriorityBackground); Status = STATUS_SUCCESS; break; - case ProcessQuotaLimits: + case ProcessForegroundInformation: /* Check buffer length */ - if (ProcessInformationLength != sizeof(QUOTA_LIMITS)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - DPRINT1("Not implemented: ProcessQuotaLimits\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - + if (ProcessInformationLength != sizeof(PROCESS_FOREGROUND_BACKGROUND)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for capture */ + _SEH2_TRY + { + /* Capture the caller's buffer */ + Foreground = *(PPROCESS_FOREGROUND_BACKGROUND)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Set process priority mode (foreground or background) */ + PsSetProcessPriorityByClass(Process, + Foreground.Foreground ? + PsProcessPriorityForeground : + PsProcessPriorityBackground); + Status = STATUS_SUCCESS; + break; + case ProcessBasePriority: - /* Check buffer length */ + /* Validate input length */ if (ProcessInformationLength != sizeof(KPRIORITY)) { Status = STATUS_INFO_LENGTH_MISMATCH; break; } - DPRINT1("Not implemented: ProcessBasePriority\n"); - Status = STATUS_NOT_IMPLEMENTED; + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + BasePriority = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Extract the memory priority out of there */ + if (BasePriority & 0x80000000) + { + MemoryPriority = MEMORY_PRIORITY_FOREGROUND; + BasePriority &= ~0x80000000; + } + else + { + MemoryPriority = MEMORY_PRIORITY_BACKGROUND; + } + + /* Validate the number */ + if ((BasePriority > HIGH_PRIORITY) || (BasePriority <= LOW_PRIORITY)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if the new base is higher */ + if (BasePriority > Process->Pcb.BasePriority) + { + DPRINT1("Should check privilege\n"); + } + + /* Call Ke */ + KeSetPriorityAndQuantumProcess(&Process->Pcb, BasePriority, 0); + + /* Now set the memory priority */ + MmSetMemoryPriorityProcess(Process, MemoryPriority); + Status = STATUS_SUCCESS; break; case ProcessRaisePriority: + + /* Validate input length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + Boost = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Make sure the process isn't dying */ + if (ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Lock it */ + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&Process->ProcessLock); + + /* Loop the threads */ + for (Next = Process->ThreadListHead.Flink; + Next != &Process->ThreadListHead; + Next = Next->Flink) + { + /* Call Ke for the thread */ + Thread = CONTAINING_RECORD(Next, ETHREAD, ThreadListEntry); + KeBoostPriorityThread(&Thread->Tcb, Boost); + } + + /* Release the lock and rundown */ + ExReleasePushLockShared(&Process->ProcessLock); + KeLeaveCriticalRegion(); + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Set success code */ + Status = STATUS_SUCCESS; + } + else + { + /* Avoid race conditions */ + Status = STATUS_PROCESS_IS_TERMINATING; + } + break; + + case ProcessBreakOnTermination: /* Check buffer length */ if (ProcessInformationLength != sizeof(ULONG)) @@ -1173,37 +1338,164 @@ break; } - DPRINT1("Not implemented: ProcessRaisePriority\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessWx86Information: - + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + Break = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Setting 'break on termination' requires the SeDebugPrivilege */ + if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Set or clear the flag */ + if (Break) + { + PspSetProcessFlag(Process, PSF_BREAK_ON_TERMINATION_BIT); + } + else + { + PspClearProcessFlag(Process, PSF_BREAK_ON_TERMINATION_BIT); + } + + break; + + case ProcessAffinityMask: + /* Check buffer length */ - if (ProcessInformationLength != sizeof(HANDLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - DPRINT1("Not implemented: ProcessWx86Information\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessDebugPort: - - /* Check buffer length */ - if (ProcessInformationLength != sizeof(HANDLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - DPRINT1("Not implemented: ProcessDebugPort\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessBreakOnTermination: + if (ProcessInformationLength != sizeof(KAFFINITY)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + Affinity = *(PKAFFINITY)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Make sure it's valid for the CPUs present */ + ValidAffinity = Affinity & KeActiveProcessors; + if (!Affinity || (ValidAffinity != Affinity)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Check if it's within job affinity limits */ + if (Process->Job) + { + /* Not yet implemented */ + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + /* Make sure the process isn't dying */ + if (ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Lock it */ + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&Process->ProcessLock); + + /* Call Ke to do the work */ + KeSetAffinityProcess(&Process->Pcb, ValidAffinity); + + /* Release the lock and rundown */ + ExReleasePushLockShared(&Process->ProcessLock); + KeLeaveCriticalRegion(); + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Set success code */ + Status = STATUS_SUCCESS; + } + else + { + /* Avoid race conditions */ + Status = STATUS_PROCESS_IS_TERMINATING; + } + break; + + /* Priority Boosting status */ + case ProcessPriorityBoost: + + /* Validate input length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + DisableBoost = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Make sure the process isn't dying */ + if (ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Lock it */ + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&Process->ProcessLock); + + /* Call Ke to do the work */ + KeSetDisableBoostProcess(&Process->Pcb, DisableBoost); + + /* Loop the threads too */ + for (Next = Process->ThreadListHead.Flink; + Next != &Process->ThreadListHead; + Next = Next->Flink) + { + /* Call Ke for the thread */ + Thread = CONTAINING_RECORD(Next, ETHREAD, ThreadListEntry); + KeSetDisableBoostThread(&Thread->Tcb, DisableBoost); + } + + /* Release the lock and rundown */ + ExReleasePushLockShared(&Process->ProcessLock); + KeLeaveCriticalRegion(); + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Set success code */ + Status = STATUS_SUCCESS; + } + else + { + /* Avoid race conditions */ + Status = STATUS_PROCESS_IS_TERMINATING; + } + break; + + case ProcessDebugFlags: /* Check buffer length */ if (ProcessInformationLength != sizeof(ULONG)) @@ -1215,57 +1507,112 @@ /* Enter SEH for direct buffer read */ _SEH2_TRY { - Break = *(PULONG)ProcessInformation; + DebugFlags = *(PULONG)ProcessInformation; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Get exception code */ - Break = 0; Status = _SEH2_GetExceptionCode(); _SEH2_YIELD(break); } _SEH2_END; - /* Setting 'break on termination' requires the SeDebugPrivilege */ - if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) - { - Status = STATUS_PRIVILEGE_NOT_HELD; - break; - } - - /* Set or clear the flag */ - if (Break) - { - PspSetProcessFlag(Process, PSF_BREAK_ON_TERMINATION_BIT); + /* Set the mode */ + if (DebugFlags & ~1) + { + Status = STATUS_INVALID_PARAMETER; } else { - PspClearProcessFlag(Process, PSF_BREAK_ON_TERMINATION_BIT); - } - - break; - + if (DebugFlags & 1) + { + PspClearProcessFlag(Process, PSF_NO_DEBUG_INHERIT_BIT); + } + else + { + PspSetProcessFlag(Process, PSF_NO_DEBUG_INHERIT_BIT); + } + } + + /* Done */ + Status = STATUS_SUCCESS; + break; + + case ProcessEnableAlignmentFaultFixup: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + EnableFixup = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Set the mode */ + if (EnableFixup) + { + Process->DefaultHardErrorProcessing |= SEM_NOALIGNMENTFAULTEXCEPT; + } + else + { + Process->DefaultHardErrorProcessing &= ~SEM_NOALIGNMENTFAULTEXCEPT; + } + + /* Call Ke for the update */ + KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); + Status = STATUS_SUCCESS; + break; + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: + case ProcessUserModeIOPL: + case ProcessWx86Information: + DPRINT1("VDM/16-bit Request not implemented: %lx\n", ProcessInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessQuotaLimits: + DPRINT1("Quota Limits not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case ProcessWorkingSetWatch: - case ProcessUserModeIOPL: - case ProcessEnableAlignmentFaultFixup: - case ProcessAffinityMask: - DPRINT1("Not implemented: %lx\n", ProcessInformationClass); + DPRINT1("WS watch not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; - - /* Supposedly these are invalid...!? verify! */ - case ProcessBasicInformation: - case ProcessIoCounters: - case ProcessTimes: - case ProcessPooledUsageAndLimits: - case ProcessHandleCount: - case ProcessWow64Information: + + case ProcessDeviceMap: + DPRINT1("Device map not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessHandleTracing: + DPRINT1("Handle tracing not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessExecuteFlags: + DPRINT1("No execute support not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Anything else is invalid */ default: - DPRINT1("Unsupported or unimplemented: %lx\n", ProcessInformationClass); + DPRINT1("Invalid Server 2003 Info Class: %lx\n", ProcessInformationClass); Status = STATUS_INVALID_INFO_CLASS; } @@ -1434,6 +1781,7 @@ { /* Get the exception code */ Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END;

1 0

[ion] 54680: [NDK/RTL]: Implement, define, fix, and comment RtlSetUnhandledExceptionFilter.
by ion＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: ion Date: Sun Dec 18 01:50:11 2011 New Revision: 54680 URL: http://svn.reactos.org/svn/reactos?rev=54680&view=rev Log: [NDK/RTL]: Implement, define, fix, and comment RtlSetUnhandledExceptionFilter. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Dec 18 01:50:11 2011 @@ -604,10 +604,10 @@ ); NTSYSAPI -PVOID +VOID NTAPI RtlSetUnhandledExceptionFilter( - IN PVOID TopLevelExceptionFilter + IN PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Dec 18 01:50:11 2011 @@ -471,6 +471,15 @@ extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine; #endif /* NTOS_MODE_USER */ + +// +// Unhandled Exception Filter +// +typedef ULONG +(NTAPI *RTLP_UNHANDLED_EXCEPTION_FILTER)( + IN struct _EXCEPTION_POINTERS *ExceptionInfo +); +typedef RTLP_UNHANDLED_EXCEPTION_FILTER *PRTLP_UNHANDLED_EXCEPTION_FILTER; // // Callback for RTL Heap Enumeration Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=54… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Sun Dec 18 01:50:11 2011 @@ -14,6 +14,10 @@ #define NDEBUG #include <debug.h> + +/* GLOBALS *****************************************************************/ + +PRTLP_UNHANDLED_EXCEPTION_FILTER RtlpUnhandledExceptionFilter; /* FUNCTIONS ***************************************************************/ @@ -172,17 +176,18 @@ NTAPI RtlUnhandledExceptionFilter(IN struct _EXCEPTION_POINTERS* ExceptionInfo) { + /* This is used by the security cookie checks, and calso called externally */ UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } /* - * @unimplemented + * @implemented */ -PVOID +VOID NTAPI -RtlSetUnhandledExceptionFilter(IN PVOID TopLevelExceptionFilter) +RtlSetUnhandledExceptionFilter(IN PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter) { - UNIMPLEMENTED; - return NULL; + /* Set the filter which is used by the CriticalSection package */ + RtlpUnhandledExceptionFilter = RtlEncodePointer(TopLevelExceptionFilter); }

1 0

[rharabien] 54679: [WIN32K] - Fail if display name device is given to EnumerateDisplayDevices and index is not set to 0. Fixes hang in Display Settings -> Advanced -> Monitor.
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 00:22:50 2011 New Revision: 54679 URL: http://svn.reactos.org/svn/reactos?rev=54679&view=rev Log: [WIN32K] - Fail if display name device is given to EnumerateDisplayDevices and index is not set to 0. Fixes hang in Display Settings -> Advanced -> Monitor. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Dec 18 00:22:50 2011 @@ -382,6 +382,10 @@ pustrDevice = NULL; } + /* If name is given only iDevNum==0 gives results */ + if (pustrDevice && iDevNum != 0) + return FALSE; + /* Acquire global USER lock */ UserEnterShared();

1 0

[ekohl] 54678: [ADVAPI33/EVENTLOG] - Determine the event generation time in ReportEventA/W and use it. - Replace magic values by proper type size.
by ekohl＠svn.reactos.org 17 Dec '11

17 Dec '11

Author: ekohl Date: Sat Dec 17 23:47:28 2011 New Revision: 54678 URL: http://svn.reactos.org/svn/reactos?rev=54678&view=rev Log: [ADVAPI33/EVENTLOG] - Determine the event generation time in ReportEventA/W and use it. - Replace magic values by proper type size. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -463,20 +463,6 @@ uUCT.ll = uUCT.ll * 10000000 + u1970.ll; FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); FileTimeToSystemTime(&ftLocal, pSystemTime); -} - -VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, DWORD * pEventTime) -{ - SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; - union - { - FILETIME ft; - ULONGLONG ll; - } Time, u1970; - - SystemTimeToFileTime(pSystemTime, &Time.ft); - SystemTimeToFileTime(&st1970, &u1970.ft); - *pEventTime = (DWORD)((Time.ll - u1970.ll) / 10000000ull); } VOID PRINT_HEADER(PEVENTLOGHEADER header) Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -16,6 +16,7 @@ #include <windows.h> #include <netevent.h> #include <lpctypes.h> +#include <kefuncs.h> #include <lpcfuncs.h> #include <rtlfuncs.h> #include <obfuncs.h> @@ -168,6 +169,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, + DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -199,9 +201,6 @@ VOID EventTimeToSystemTime(DWORD EventTime, SYSTEMTIME * SystemTime); -VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, - DWORD * pEventTime); - /* eventsource.c */ VOID InitEventSourceList(VOID); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -870,18 +870,18 @@ { DWORD dwWritten; DWORD dwRead; - SYSTEMTIME st; EVENTLOGEOF EofRec; PEVENTLOGRECORD RecBuf; LARGE_INTEGER logFileSize; + LARGE_INTEGER SystemTime; ULONG RecOffSet; ULONG WriteOffSet; if (!Buffer) return FALSE; - GetSystemTime(&st); - SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &((PEVENTLOGRECORD) Buffer)->TimeWritten); EnterCriticalSection(&LogFile->cs); @@ -1125,6 +1125,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, + DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -1139,7 +1140,6 @@ { DWORD dwRecSize; PEVENTLOGRECORD pRec; - SYSTEMTIME SysTime; WCHAR *str; UINT i, pos; PBYTE Buffer; @@ -1148,8 +1148,8 @@ sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) + lstrlenW(SourceName) + 2) * sizeof(WCHAR); - if (dwRecSize % 4 != 0) - dwRecSize += 4 - (dwRecSize % 4); + if (dwRecSize % sizeof(DWORD) != 0) + dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); dwRecSize += dwSidLength; @@ -1160,10 +1160,10 @@ } dwRecSize += dwDataSize; - if (dwRecSize % 4 != 0) - dwRecSize += 4 - (dwRecSize % 4); - - dwRecSize += 4; + if (dwRecSize % sizeof(DWORD) != 0) + dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); + + dwRecSize += sizeof(DWORD); Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); @@ -1178,9 +1178,8 @@ pRec->Reserved = LOGFILE_SIGNATURE; pRec->RecordNumber = dwRecordNumber; - GetSystemTime(&SysTime); - SystemTimeToEventTime(&SysTime, &pRec->TimeGenerated); - SystemTimeToEventTime(&SysTime, &pRec->TimeWritten); + pRec->TimeGenerated = dwTime; + pRec->TimeWritten = dwTime; pRec->EventID = dwEventId; pRec->EventType = wType; @@ -1195,8 +1194,8 @@ pRec->UserSidOffset = pos; - if (pos % 4 != 0) - pos += 4 - (pos % 4); + if (pos % sizeof(DWORD) != 0) + pos += sizeof(DWORD) - (pos % sizeof(DWORD)); if (dwSidLength) { @@ -1223,8 +1222,8 @@ pos += dwDataSize; } - if (pos % 4 != 0) - pos += 4 - (pos % 4); + if (pos % sizeof(DWORD) != 0) + pos += sizeof(DWORD) - (pos % sizeof(DWORD)); *((PDWORD) (Buffer + pos)) = dwRecSize; @@ -1249,6 +1248,8 @@ DWORD lastRec; DWORD recSize; DWORD dwError; + DWORD dwTime; + LARGE_INTEGER SystemTime; if (!GetComputerNameW(szComputerName, &dwComputerNameLength)) { @@ -1261,9 +1262,13 @@ return; } + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &dwTime); + lastRec = LogfGetCurrentRecord(pEventSource->LogFile); logBuffer = LogfAllocAndBuildNewRecord(&recSize, + dwTime, lastRec, wType, wCategory, Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -109,6 +109,8 @@ DWORD dwRecSize; NTSTATUS Status; PLOGFILE SystemLog = NULL; + LARGE_INTEGER SystemTime; + ULONG Seconds; DPRINT("ProcessPortMessage() called\n"); @@ -145,7 +147,10 @@ Message = (PIO_ERROR_LOG_MESSAGE) & Request.Message; ulRecNum = SystemLog ? SystemLog->Header.CurrentRecordNumber : 0; - pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &Seconds); + + pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, Seconds, ulRecNum, Message->Type, Message->EntryData.EventCategory, Message->EntryData.ErrorCode, (WCHAR *) (((PBYTE) Message) + Message->DriverNameOffset), Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -496,6 +496,7 @@ if (UserSID) dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); LogBuffer = LogfAllocAndBuildNewRecord(&recSize, + Time, lastRec, EventType, EventCategory, Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -28,6 +28,7 @@ #include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sat Dec 17 23:47:28 2011 @@ -945,6 +945,8 @@ WORD i; CHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwSize; + LARGE_INTEGER SystemTime; + ULONG Seconds; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, @@ -974,10 +976,13 @@ GetComputerNameA(szComputerName, &dwSize); RtlInitAnsiString(&ComputerName, szComputerName); + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &Seconds); + RpcTryExcept { Status = ElfrReportEventA(hEventLog, - 0, /* FIXME: Time */ + Seconds, wType, wCategory, dwEventID, @@ -1046,6 +1051,8 @@ WORD i; WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwSize; + LARGE_INTEGER SystemTime; + ULONG Seconds; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, @@ -1075,10 +1082,13 @@ GetComputerNameW(szComputerName, &dwSize); RtlInitUnicodeString(&ComputerName, szComputerName); + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &Seconds); + RpcTryExcept { Status = ElfrReportEventW(hEventLog, - 0, /* FIXME: Time */ + Seconds, wType, wCategory, dwEventID,

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

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-diffs December 2011