Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 57962: [WIN32K] Fix crash, when running out of paged pool. Found by r3ddr4g0n.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 21 22:40:05 2012 New Revision: 57962 URL: http://svn.reactos.org/svn/reactos?rev=57962&view=rev Log: [WIN32K] Fix crash, when running out of paged pool. Found by r3ddr4g0n. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Dec 21 22:40:05 2012 @@ -1237,6 +1237,11 @@ } pobj = GDIOBJ_AllocateObject(objt, cjSize, fl); + if (!pobj) + { + return NULL; + } + if (!GDIOBJ_hInsertObject(pobj, GDI_OBJ_HMGR_POWNED)) { GDIOBJ_vFreeObject(pobj);

11 years, 9 months

[hbelusca] 57961: [SYSSETUP] In fact, French translation wasn't so improved...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 21 22:25:28 2012 New Revision: 57961 URL: http://svn.reactos.org/svn/reactos?rev=57961&view=rev Log: [SYSSETUP] In fact, French translation wasn't so improved... Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Fri Dec 21 22:25:28 2012 @@ -92,7 +92,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "La localisation systÃ¨me correspond Ã la langue souhaitÃ©e pour les applications. Elle contrÃ´le la maniÃ¨re dont les nombres, devises et dates sont affichÃ©s.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "La localisation systÃ¨me correspond Ã la langue souhaitÃ©e pour les applications. Elle contrÃ´le la maniÃ¨re dont les nombres, monnaies et dates sont affichÃ©s.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation systÃ¨me, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8

11 years, 9 months

[hbelusca] 57960: [SYSSETUP] Improve French translation and correct some mistakes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 20 21:28:54 2012 New Revision: 57960 URL: http://svn.reactos.org/svn/reactos?rev=57960&view=rev Log: [SYSSETUP] Improve French translation and correct some mistakes. Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Thu Dec 20 21:28:54 2012 @@ -70,7 +70,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Entrez un nom pour votre ordinateur de 15 caractÃ¨res ou moins. Si vous Ãªtes sur un rÃ©seau, le nom saisi doit Ãªtre unique.", + LTEXT "Entrez un nom pour votre ordinateur d'au plus 15 caractÃ¨res. Si vous Ãªtes sur un rÃ©seau, le nom saisi doit Ãªtre unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Nom de l'ordinateur :", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE @@ -92,7 +92,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "La localisation systÃ¨me correspond Ã la langue souhaitÃ©e pour les applications. Elle contrÃ´le la maniÃ¨re dont les nombres, monnaies et dates sont affichÃ©es.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "La localisation systÃ¨me correspond Ã la langue souhaitÃ©e pour les applications. Elle contrÃ´le la maniÃ¨re dont les nombres, devises et dates sont affichÃ©s.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation systÃ¨me, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8 @@ -173,7 +173,7 @@ IDS_ACKTITLE "Remerciements" IDS_ACKSUBTITLE "Les Ã©paules sur lesquelles repose ReactOS et informations sur la licence" IDS_OWNERTITLE "Personnalisez votre logiciel" - IDS_OWNERSUBTITLE "L'installation utilise ces information sur vous pour personnaliser ReactOS." + IDS_OWNERSUBTITLE "L'installation utilise ces informations sur vous pour personnaliser ReactOS." IDS_COMPUTERTITLE "Nom de l'ordinateur et mot de passe Administrateur" IDS_COMPUTERSUBTITLE "Vous devez fournir un nom et un mot de passe Administrateur pour votre ordinateur." IDS_LOCALETITLE "Options rÃ©gionales" @@ -209,24 +209,24 @@ STRINGTABLE BEGIN - IDS_GAMES "Jeux" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" - IDS_CMT_SPIDER "Spider Solitaire" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "Outils systÃ¨me" - IDS_CMT_CHARMAP "Table des CaractÃ¨res" - IDS_CMT_KBSWITCH "SÃ©lecteur de configuration clavier" + IDS_GAMES "Jeux" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Outils systÃ¨me" + IDS_CMT_CHARMAP "Table des CaractÃ¨res" + IDS_CMT_KBSWITCH "SÃ©lecteur de configuration clavier" IDS_CMT_DXDIAG "Lancer le prorgramme de diagnostic ReactX" END STRINGTABLE BEGIN - IDS_SYS_ACCESSIBILITY "AccessibilitÃ©" - IDS_CMT_MAGNIFY "Loupe" + IDS_SYS_ACCESSIBILITY "AccessibilitÃ©" + IDS_CMT_MAGNIFY "Loupe" END STRINGTABLE @@ -239,14 +239,14 @@ STRINGTABLE BEGIN - IDS_REACTOS_SETUP "Installation de ReactOS" + IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." - IDS_LOADLIBRARY_FAILED "Ãchec de LoadLibrary : " - IDS_GETPROCADDR_FAILED "Ãchec de GetProcAddr : " + IDS_LOADLIBRARY_FAILED "Ãchec de LoadLibrary : " + IDS_GETPROCADDR_FAILED "Ãchec de GetProcAddr : " IDS_REGSVR_FAILED "Ãchec de DllRegisterServer : " - IDS_DLLINSTALL_FAILED "Ãchec de DllInstall : " - IDS_TIMEOUT "DÃ©lai dÃ©passÃ© lors de l'enregistrement" + IDS_DLLINSTALL_FAILED "Ãchec de DllInstall : " + IDS_TIMEOUT "DÃ©lai dÃ©passÃ© lors de l'enregistrement" IDS_REASON_UNKNOWN "" END

11 years, 9 months

[hbelusca] 57959: [FONTS] - Update RedHat Liberation Fonts to 2.00.1 - Update and add some DejaVu Fonts to 2.33 - Update GNU FreeFonts to revision 20120503 - Update Tahoma and Symbol Fonts to Wine ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 20 20:21:56 2012 New Revision: 57959 URL: http://svn.reactos.org/svn/reactos?rev=57959&view=rev Log: [FONTS] - Update RedHat Liberation Fonts to 2.00.1 - Update and add some DejaVu Fonts to 2.33 - Update GNU FreeFonts to revision 20120503 - Update Tahoma and Symbol Fonts to Wine HEAD - Sort the fonts documentation files to dedicated directories Added: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf (with props) trunk/reactos/media/fonts/DejaVuSansCondensed.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf (with props) trunk/reactos/media/fonts/FreeSans.ttf (with props) trunk/reactos/media/fonts/FreeSansBold.ttf (with props) trunk/reactos/media/fonts/FreeSansBoldOblique.ttf (with props) trunk/reactos/media/fonts/FreeSansOblique.ttf (with props) trunk/reactos/media/fonts/FreeSerif.ttf (with props) trunk/reactos/media/fonts/FreeSerifBold.ttf (with props) trunk/reactos/media/fonts/FreeSerifBoldItalic.ttf (with props) trunk/reactos/media/fonts/FreeSerifItalic.ttf (with props) trunk/reactos/media/fonts/doc/DejaVu/ (with props) trunk/reactos/media/fonts/doc/DejaVu/AUTHORS.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu/BUGS.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_BUGS.txt trunk/reactos/media/fonts/doc/DejaVu/LICENSE.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_LICENSE.txt trunk/reactos/media/fonts/doc/DejaVu/NEWS.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu/README.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu/langcover-sans.txt (with props) trunk/reactos/media/fonts/doc/DejaVu/langcover.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu/status.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu/unicover-sans.txt (with props) trunk/reactos/media/fonts/doc/DejaVu/unicover.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/doc/FreeFont/ (with props) trunk/reactos/media/fonts/doc/FreeFont/AUTHORS.txt - copied, changed from r57952, trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt trunk/reactos/media/fonts/doc/FreeFont/COPYING.txt - copied unchanged from r57952, trunk/reactos/media/fonts/doc/FreeFont_COPYING.txt trunk/reactos/media/fonts/doc/FreeFont/CREDITS.txt - copied, changed from r57952, trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt trunk/reactos/media/fonts/doc/FreeFont/ChangeLog.txt - copied, changed from r57952, trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt trunk/reactos/media/fonts/doc/FreeFont/README.txt - copied, changed from r57952, trunk/reactos/media/fonts/doc/FreeFont_readme.txt trunk/reactos/media/fonts/doc/Liberation/ (with props) trunk/reactos/media/fonts/doc/Liberation/AUTHORS.txt (with props) trunk/reactos/media/fonts/doc/Liberation/ChangeLog.txt (with props) trunk/reactos/media/fonts/doc/Liberation/LICENSE.txt (with props) trunk/reactos/media/fonts/doc/Liberation/README.txt (with props) trunk/reactos/media/fonts/doc/Liberation/TODO.txt (with props) Removed: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_BUGS.txt trunk/reactos/media/fonts/doc/DejaVu_LICENSE.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt trunk/reactos/media/fonts/doc/FreeFont_COPYING.txt trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt trunk/reactos/media/fonts/doc/FreeFont_readme.txt trunk/reactos/media/fonts/doc/LICENSE_DejaVu.txt Modified: trunk/reactos/media/fonts/CMakeLists.txt trunk/reactos/media/fonts/FreeMono.ttf trunk/reactos/media/fonts/FreeMonoBold.ttf trunk/reactos/media/fonts/FreeMonoBoldOblique.ttf trunk/reactos/media/fonts/FreeMonoOblique.ttf trunk/reactos/media/fonts/LiberationMono-Bold.ttf trunk/reactos/media/fonts/LiberationMono-BoldItalic.ttf trunk/reactos/media/fonts/LiberationMono-Italic.ttf trunk/reactos/media/fonts/LiberationMono-Regular.ttf trunk/reactos/media/fonts/LiberationSans-Bold.ttf trunk/reactos/media/fonts/LiberationSans-BoldItalic.ttf trunk/reactos/media/fonts/LiberationSans-Italic.ttf trunk/reactos/media/fonts/LiberationSans-Regular.ttf trunk/reactos/media/fonts/LiberationSerif-Bold.ttf trunk/reactos/media/fonts/LiberationSerif-BoldItalic.ttf trunk/reactos/media/fonts/LiberationSerif-Italic.ttf trunk/reactos/media/fonts/LiberationSerif-Regular.ttf trunk/reactos/media/fonts/symbol.ttf trunk/reactos/media/fonts/tahoma.ttf trunk/reactos/media/fonts/tahomabd.ttf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… Added: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/FreeMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMono.ttf?r… Modified: trunk/reactos/media/fonts/FreeMonoBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoBold.t… Modified: trunk/reactos/media/fonts/FreeMonoBoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoBoldOb… Modified: trunk/reactos/media/fonts/FreeMonoOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoObliqu… Added: trunk/reactos/media/fonts/FreeSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSans.ttf?r… Added: trunk/reactos/media/fonts/FreeSansBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSansBold.t… Added: trunk/reactos/media/fonts/FreeSansBoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSansBoldOb… Added: trunk/reactos/media/fonts/FreeSansOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSansObliqu… Added: trunk/reactos/media/fonts/FreeSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSerif.ttf?… Added: trunk/reactos/media/fonts/FreeSerifBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSerifBold.… Added: trunk/reactos/media/fonts/FreeSerifBoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSerifBoldI… Added: trunk/reactos/media/fonts/FreeSerifItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeSerifItali… Modified: trunk/reactos/media/fonts/LiberationMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationMono-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationMono… Modified: trunk/reactos/media/fonts/LiberationSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSans-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSans… Modified: trunk/reactos/media/fonts/LiberationSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Modified: trunk/reactos/media/fonts/LiberationSerif-Regular.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/LiberationSeri… Added: trunk/reactos/media/fonts/doc/DejaVu/langcover-sans.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/lan… Added: trunk/reactos/media/fonts/doc/DejaVu/unicover-sans.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu/uni… Removed: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Removed: trunk/reactos/media/fonts/doc/DejaVu_BUGS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_BUG… Removed: trunk/reactos/media/fonts/doc/DejaVu_LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_LIC… Removed: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Removed: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Removed: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Removed: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Removed: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni… Copied: trunk/reactos/media/fonts/doc/FreeFont/AUTHORS.txt (from r57952, trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont/A… Copied: trunk/reactos/media/fonts/doc/FreeFont/CREDITS.txt (from r57952, trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont/C… Copied: trunk/reactos/media/fonts/doc/FreeFont/ChangeLog.txt (from r57952, trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont/C… Copied: trunk/reactos/media/fonts/doc/FreeFont/README.txt (from r57952, trunk/reactos/media/fonts/doc/FreeFont_readme.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont/R… Removed: trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_A… Removed: trunk/reactos/media/fonts/doc/FreeFont_COPYING.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Removed: trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Removed: trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Removed: trunk/reactos/media/fonts/doc/FreeFont_readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_r… Removed: trunk/reactos/media/fonts/doc/LICENSE_DejaVu.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/LICENSE_De… Added: trunk/reactos/media/fonts/doc/Liberation/AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Liberation… Added: trunk/reactos/media/fonts/doc/Liberation/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Liberation… Added: trunk/reactos/media/fonts/doc/Liberation/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Liberation… Added: trunk/reactos/media/fonts/doc/Liberation/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Liberation… Added: trunk/reactos/media/fonts/doc/Liberation/TODO.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Liberation… Modified: trunk/reactos/media/fonts/symbol.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/symbol.ttf?rev… Modified: trunk/reactos/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahoma.ttf?rev… Modified: trunk/reactos/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahomabd.ttf?r…

11 years, 9 months

[tkreuzer] 57958: [NTOSKRNL] - Use 2 seperate SEH blocks in PsSuspendThread(). This way we don't leak the rundown protection, and don't keep a terminating thread suspended, when KeSuspendThread() t...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 20 14:58:02 2012 New Revision: 57958 URL: http://svn.reactos.org/svn/reactos?rev=57958&view=rev Log: [NTOSKRNL] - Use 2 seperate SEH blocks in PsSuspendThread(). This way we don't leak the rundown protection, and don't keep a terminating thread suspended, when KeSuspendThread() throws an exception. Also only catch STATUS_SUSPEND_COUNT_EXCEEDED exceptions in the SEH filter. Modified: trunk/reactos/ntoskrnl/ps/state.c Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/state.c [iso-8859-1] Thu Dec 20 14:58:02 2012 @@ -45,73 +45,78 @@ NTSTATUS NTAPI -PsSuspendThread(IN PETHREAD Thread, - OUT PULONG PreviousCount OPTIONAL) +PsSuspendThread( + IN PETHREAD Thread, + OUT PULONG PreviousCount OPTIONAL) { NTSTATUS Status; ULONG OldCount = 0; PAGED_CODE(); - /* Guard with SEH because KeSuspendThread can raise an exception */ - _SEH2_TRY - { - /* Check if we're suspending ourselves */ - if (Thread == PsGetCurrentThread()) + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Check if we're suspending ourselves */ + if (Thread == PsGetCurrentThread()) + { + /* Guard with SEH because KeSuspendThread can raise an exception */ + _SEH2_TRY { /* Do the suspend */ OldCount = KeSuspendThread(&Thread->Tcb); - - /* We are done */ - Status = STATUS_SUCCESS; - } - else - { - /* Acquire rundown */ - if (ExAcquireRundownProtection(&Thread->RundownProtect)) + } + _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_SUSPEND_COUNT_EXCEEDED) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + /* Acquire rundown protection */ + if (ExAcquireRundownProtection(&Thread->RundownProtect)) + { + /* Make sure the thread isn't terminating */ + if (Thread->Terminated) { - /* Make sure the thread isn't terminating */ - if (Thread->Terminated) - { - /* Fail */ - Status = STATUS_THREAD_IS_TERMINATING; - } - else - { - /* Otherwise, do the suspend */ - OldCount = KeSuspendThread(&Thread->Tcb); - - /* Check if it terminated during the suspend */ - if (Thread->Terminated) - { - /* Wake it back up and fail */ - KeForceResumeThread(&Thread->Tcb); - Status = STATUS_THREAD_IS_TERMINATING; - OldCount = 0; - } - } - - /* Release rundown protection */ - ExReleaseRundownProtection(&Thread->RundownProtect); - - /* We are done */ - Status = STATUS_SUCCESS; + /* Fail */ + Status = STATUS_THREAD_IS_TERMINATING; } else { - /* Thread is terminating */ - Status = STATUS_THREAD_IS_TERMINATING; + /* Guard with SEH because KeSuspendThread can raise an exception */ + _SEH2_TRY + { + /* Do the suspend */ + OldCount = KeSuspendThread(&Thread->Tcb); + } + _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_SUSPEND_COUNT_EXCEEDED) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Check if it was terminated during the suspend */ + if (Thread->Terminated) + { + /* Wake it back up and fail */ + KeForceResumeThread(&Thread->Tcb); + Status = STATUS_THREAD_IS_TERMINATING; + OldCount = 0; + } } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - - /* Don't fail if we merely couldn't write the handle back */ - if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; - } - _SEH2_END; + + /* Release rundown protection */ + ExReleaseRundownProtection(&Thread->RundownProtect); + } + else + { + /* Thread is terminating */ + Status = STATUS_THREAD_IS_TERMINATING; + } + } /* Write back the previous count */ if (PreviousCount) *PreviousCount = OldCount;

11 years, 9 months

[hbelusca] 57957: [REGEDIT] Improve the look of the "Go" button (at the right of the address bar).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 20 14:10:38 2012 New Revision: 57957 URL: http://svn.reactos.org/svn/reactos?rev=57957&view=rev Log: [REGEDIT] Improve the look of the "Go" button (at the right of the address bar). Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Thu Dec 20 14:10:38 2012 @@ -42,7 +42,7 @@ { HDWP hdwp = BeginDeferWindowPos(3); RECT rt, rs, rb; - const int tHeight = 18; + const int tHeight = 22; SetRect(&rt, 0, 0, cx, cy); cy = 0; if (hStatusBar != NULL) @@ -52,8 +52,8 @@ } GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb); cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - 2*tHeight, rt.top, 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); @@ -385,7 +385,7 @@ g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); - g_pChildWnd->hAddressBtnWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Button", L"Â»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON, + g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"Â»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_TEXT | BS_CENTER | BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);

11 years, 9 months

[hbelusca] 57956: [REGEDIT] Improve the overall look (a little part was committed by accident in r57955).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 20 02:13:53 2012 New Revision: 57956 URL: http://svn.reactos.org/svn/reactos?rev=57956&view=rev Log: [REGEDIT] Improve the overall look (a little part was committed by accident in r57955). Modified: trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Thu Dec 20 02:13:53 2012 @@ -639,7 +639,7 @@ /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, id, hInst, NULL); /* Initialize the image list, and add items to the control. */

11 years, 9 months

[hbelusca] 57955: [REGEDIT] Improve the way sorting is done.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 20 02:02:38 2012 New Revision: 57955 URL: http://svn.reactos.org/svn/reactos?rev=57955&view=rev Log: [REGEDIT] Improve the way sorting is done. Modified: trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Thu Dec 20 02:02:38 2012 @@ -37,12 +37,17 @@ size_t val_len; } LINE_INFO, *PLINE_INFO; +typedef struct tagSORT_INFO +{ + INT iSortingColumn; + BOOL bSortAscending; +} SORT_INFO, *PSORT_INFO; + /******************************************************************************* * Global and Local Variables: */ -static DWORD g_columnToSort = ~0UL; -static BOOL g_invertSort = FALSE; +static INT g_iSortedColumn = 0; #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1) static const int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 }; @@ -281,14 +286,15 @@ /* Create the image list. */ if ((himl = ImageList_Create(CX_ICON, CY_ICON, ILC_MASK, 0, NUM_ICONS)) == NULL) + { return FALSE; + } hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_BIN)); Image_Bin = ImageList_AddIcon(himl, hico); hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_STRING)); Image_String = ImageList_AddIcon(himl, hico); - /* Fail if not all of the images were added. */ if (ImageList_GetImageCount(himl) < NUM_ICONS) @@ -374,54 +380,49 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { + PSORT_INFO pSortInfo = (PSORT_INFO)lParamSort; LINE_INFO *l, *r; DWORD dw1, dw2; DWORDLONG qw1, qw2; - UNREFERENCED_PARAMETER(lParamSort); l = (LINE_INFO*)lParam1; r = (LINE_INFO*)lParam2; - if (g_columnToSort == ~0UL) - g_columnToSort = 0; - - if (g_columnToSort == 1 && l->dwValType != r->dwValType) + if (pSortInfo->iSortingColumn == 1 && l->dwValType != r->dwValType) { /* Sort by type */ - - if (g_invertSort) + if (pSortInfo->bSortAscending) + return ((int)l->dwValType - (int)r->dwValType); + else return ((int)r->dwValType - (int)l->dwValType); + } + if (pSortInfo->iSortingColumn == 2) + { + /* Sort by value */ + if (l->dwValType != r->dwValType) + { + if (pSortInfo->bSortAscending) + return ((int)l->dwValType - (int)r->dwValType); + else + return ((int)r->dwValType - (int)l->dwValType); + } + + if (l->val == NULL && r->val == NULL) + return 0; + + if (pSortInfo->bSortAscending) + { + if (l->val == NULL) + return -1; + if (r->val == NULL) + return 1; + } else - return ((int)l->dwValType - (int)r->dwValType); - } - if (g_columnToSort == 2) - { - /* Sort by value */ - - if (l->dwValType != r->dwValType) - { - if (g_invertSort) - return ((int)r->dwValType - (int)l->dwValType); - else - return ((int)l->dwValType - (int)r->dwValType); - } - - if (r->val == NULL && l->val == NULL) - return 0; - - if (g_invertSort) - { + { + if (l->val == NULL) + return 1; if (r->val == NULL) return -1; - if (l->val == NULL) - return 1; - } - else - { - if (r->val == NULL) - return 1; - if (l->val == NULL) - return -1; } switch(l->dwValType) @@ -430,42 +431,42 @@ { dw1 = *(DWORD*)l->val; dw2 = *(DWORD*)r->val; - if (g_invertSort) + if (pSortInfo->bSortAscending) + // return (dw1 > dw2 ? 1 : -1); + return ((int)dw1 - (int)dw2); + else // return (dw1 > dw2 ? -1 : 1); return ((int)dw2 - (int)dw1); - else - // return (dw1 > dw2 ? 1 : -1); - return ((int)dw1 - (int)dw2); } case REG_QWORD: { qw1 = *(DWORDLONG*)l->val; qw2 = *(DWORDLONG*)r->val; - if (g_invertSort) + if (pSortInfo->bSortAscending) + // return (qw1 > qw2 ? 1 : -1); + return ((int)qw1 - (int)qw2); + else // return (qw1 > qw2 ? -1 : 1); return ((int)qw2 - (int)qw1); + } + + default: + { + INT nCompare = 0; + + if (pSortInfo->bSortAscending) + { + nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len)); + if (nCompare == 0) + nCompare = l->val_len - r->val_len; + } else - // return (qw1 > qw2 ? 1 : -1); - return ((int)qw1 - (int)qw2); - } - - default: - { - INT nCompare = 0; - - if (g_invertSort) { nCompare = memcmp(r->val, l->val, min(r->val_len, l->val_len)); if (nCompare == 0) nCompare = r->val_len - l->val_len; } - else - { - nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len)); - if (nCompare == 0) - nCompare = l->val_len - r->val_len; - } return nCompare; } @@ -473,12 +474,77 @@ } /* Sort by name */ - return (g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name)); + return (pSortInfo->bSortAscending ? StrCmpLogicalW(l->name, r->name) : StrCmpLogicalW(r->name, l->name)); +} + +static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn) +{ + if ( (GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) && + (iSortingColumn >= 0) ) + { + BOOL bSortAscending; + SORT_INFO SortInfo; + + HWND hHeader = ListView_GetHeader(hListView); + HDITEM hColumn = {0}; + + /* If we are sorting according to another column, uninitialize the old one */ + if ( (iSortedColumn >= 0) && (iSortingColumn != iSortedColumn) ) + { + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, iSortedColumn, &hColumn); + hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN); + Header_SetItem(hHeader, iSortedColumn, &hColumn); + } + + /* Get the sorting state of the new column */ + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, iSortingColumn, &hColumn); + + /* + * Check whether we are sorting the list because the user clicked + * on a column, or because we are refreshing the list: + * + * iSortedColumn >= 0 - User clicked on a column; holds the + * old sorting column index. + * iSortedColumn < 0 - List being refreshed. + */ + if (iSortedColumn >= 0) + { + /* Invert the sorting direction */ + bSortAscending = ((hColumn.fmt & HDF_SORTUP) == 0); + } + else + { + /* + * If the sorting state of the column is uninitialized, + * initialize it by default to ascending sorting. + */ + if ((hColumn.fmt & (HDF_SORTUP | HDF_SORTDOWN)) == 0) + hColumn.fmt |= HDF_SORTUP; + + /* Keep the same sorting direction */ + bSortAscending = ((hColumn.fmt & HDF_SORTUP) != 0); + } + + /* Set the new column sorting state */ + hColumn.fmt &= ~(bSortAscending ? HDF_SORTDOWN : HDF_SORTUP ); + hColumn.fmt |= (bSortAscending ? HDF_SORTUP : HDF_SORTDOWN); + Header_SetItem(hHeader, iSortingColumn, &hColumn); + + /* Sort the list */ + SortInfo.iSortingColumn = iSortingColumn; + SortInfo.bSortAscending = bSortAscending; + return ListView_SortItems(hListView, CompareFunc, (LPARAM)&SortInfo); + } + else + return TRUE; } BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) { NMLVDISPINFO* Info; + int iSortingColumn; UNREFERENCED_PARAMETER(wParam); *Result = TRUE; switch (((LPNMHDR)lParam)->code) @@ -487,15 +553,9 @@ OnGetDispInfo((NMLVDISPINFO*)lParam); return TRUE; case LVN_COLUMNCLICK: - if (g_columnToSort == (DWORD)((LPNMLISTVIEW)lParam)->iSubItem) - g_invertSort = !g_invertSort; - else - { - g_columnToSort = ((LPNMLISTVIEW)lParam)->iSubItem; - g_invertSort = FALSE; - } - - (void)ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd); + iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem; + (void)ListView_Sort(hWnd, iSortingColumn, g_iSortedColumn); + g_iSortedColumn = iSortingColumn; return TRUE; case NM_DBLCLK: case NM_RETURN: @@ -568,21 +628,20 @@ return FALSE; } - HWND CreateListView(HWND hwndParent, HMENU id) { RECT rcClient; HWND hwndLV; - /* Get the dimensions of the parent window's client area, and create the list view control. */ + /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEW, L"List View", - WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS | LVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, id, hInst, NULL); if (!hwndLV) return NULL; - /* Initialize the image list, and add items to the control. */ + /* Initialize the image list, and add items to the control. */ if (!CreateListColumns(hwndLV)) goto fail; if (!InitListViewImageLists(hwndLV)) goto fail; @@ -627,7 +686,6 @@ SendMessageW(hwndLV, WM_SETREDRAW, FALSE, 0); DestroyListView(hwndLV); - g_columnToSort = ~0UL; (void)ListView_DeleteAllItems(hwndLV); if(!hKey) return FALSE; @@ -669,11 +727,12 @@ HeapFree(GetProcessHeap(), 0, ValBuf); HeapFree(GetProcessHeap(), 0, ValName); } + RegCloseKey(hNewKey); + if(!AddedDefault) { AddEntryToList(hwndLV, L"", REG_SZ, NULL, 0, 0, FALSE); } - ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); c = ListView_GetItemCount(hwndLV); for(i = 0; i < c; i++) { @@ -682,7 +741,7 @@ ListView_SetItemState(hwndLV, iListViewSelect, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); - RegCloseKey(hNewKey); + (void)ListView_Sort(hwndLV, g_iSortedColumn, -1); SendMessageW(hwndLV, WM_SETREDRAW, TRUE, 0); return TRUE;

11 years, 9 months

[tkreuzer] 57954: [NTOSKRNL] - Add some missing return value checks - Add some annotations - Fix format specifiers - Fix variable scope conflicts - Fix possible closing of a NULL handle - Use ObClo...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 19 23:49:13 2012 New Revision: 57954 URL: http://svn.reactos.org/svn/reactos?rev=57954&view=rev Log: [NTOSKRNL] - Add some missing return value checks - Add some annotations - Fix format specifiers - Fix variable scope conflicts - Fix possible closing of a NULL handle - Use ObCloseHandle instead of ZwClose Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -154,9 +154,10 @@ DPRINT("Pulling zero pages for %08x%08x-%08x%08x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, End.u.HighPart, End.u.LowPart); + while (FileOffset.QuadPart < End.QuadPart) { - PVOID Address; + PVOID CurrentAddress; ULONG_PTR Entry; if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page))) @@ -169,14 +170,14 @@ if (Entry == 0) { MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); - Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; + CurrentAddress = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmReferencePage(Page); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, Address); + MmCreateVirtualMapping(NULL, CurrentAddress, PAGE_READWRITE, &Page, 1); + MmInsertRmap(Page, NULL, CurrentAddress); } else { Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -102,11 +102,12 @@ NTSTATUS NTAPI -MmNotPresentFaultCachePage(PMMSUPPORT AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required) +MmNotPresentFaultCachePage ( + _In_ PMMSUPPORT AddressSpace, + _In_ MEMORY_AREA* MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required) { NTSTATUS Status; PVOID PAddress; @@ -317,11 +318,12 @@ NTSTATUS NTAPI -MiCowCacheSectionPage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required) +MiCowCacheSectionPage ( + _In_ PMMSUPPORT AddressSpace, + _In_ PMEMORY_AREA MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required) { PMM_SECTION_SEGMENT Segment; PFN_NUMBER NewPage, OldPage; @@ -422,8 +424,8 @@ DPRINT("Allocated page %x\n", NewPage); - /* Unshare the old page */ - MmDeleteRmap(OldPage, Process, PAddress); + /* Unshare the old page */ + MmDeleteRmap(OldPage, Process, PAddress); /* Copy the old page */ DPRINT("Copying\n"); @@ -474,10 +476,13 @@ */ +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI -MmpFaultWorker(PWORK_QUEUE_WITH_CONTEXT WorkItem) +MmpFaultWorker(PVOID Parameter) { + PWORK_QUEUE_WITH_CONTEXT WorkItem = Parameter; + DPRINT("Calling work\n"); WorkItem->Status = WorkItem->Required->DoAcquisition(WorkItem->AddressSpace, WorkItem->MemoryArea, @@ -622,7 +627,7 @@ KeInitializeEvent(&Context.Wait, NotificationEvent, FALSE); ExInitializeWorkItem(&Context.WorkItem, - (PWORKER_THREAD_ROUTINE)MmpFaultWorker, + MmpFaultWorker, &Context); DPRINT("Queue work item\n"); Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -71,6 +71,7 @@ nothing, including freeing the mdls. */ +_Function_class_(IO_COMPLETION_ROUTINE) NTSTATUS NTAPI MiSimpleReadComplete(PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -251,13 +251,16 @@ MiFreeSegmentPage(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset); -NTSTATUS -NTAPI -MiCowCacheSectionPage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required); +_Success_(1) +_When_(return==STATUS_MORE_PROCESSING_REQUIRED, _At_(Required->DoAcquisition, _Post_notnull_)) +NTSTATUS +NTAPI +MiCowCacheSectionPage ( + _In_ PMMSUPPORT AddressSpace, + _In_ PMEMORY_AREA MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required); NTSTATUS NTAPI @@ -344,13 +347,16 @@ NTAPI MmUnmapCacheViewInSystemSpace(PVOID Address); -NTSTATUS -NTAPI -MmNotPresentFaultCachePage(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - BOOLEAN Locked, - PMM_REQUIRED_RESOURCES Required); +_Success_(1) +_When_(return==STATUS_MORE_PROCESSING_REQUIRED, _At_(Required->DoAcquisition, _Post_notnull_)) +NTSTATUS +NTAPI +MmNotPresentFaultCachePage ( + _In_ PMMSUPPORT AddressSpace, + _In_ MEMORY_AREA* MemoryArea, + _In_ PVOID Address, + _In_ BOOLEAN Locked, + _Inout_ PMM_REQUIRED_RESOURCES Required); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -64,6 +64,7 @@ extern KSPIN_LOCK MiSectionPageTableLock; +_Function_class_(RTL_GENERIC_ALLOCATE_ROUTINE) static PVOID NTAPI @@ -75,6 +76,7 @@ return Result; } +_Function_class_(RTL_GENERIC_FREE_ROUTINE) static VOID NTAPI @@ -84,6 +86,7 @@ ExFreePoolWithTag(Data, 'MmPt'); } +_Function_class_(RTL_GENERIC_COMPARE_ROUTINE) static RTL_GENERIC_COMPARE_RESULTS NTAPI @@ -341,7 +344,7 @@ { Segment = PageTable->Segment; Offset->QuadPart = PageTable->FileOffset.QuadPart + - (RawOffset << PAGE_SHIFT); + ((ULONG64)RawOffset << PAGE_SHIFT); } return Segment; Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5795… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -242,6 +242,7 @@ { PINTERNAL_BCB iBcb = Bcb; + IoStatus->Status = STATUS_SUCCESS; if (--iBcb->RefCount == 0) { IoStatus->Information = 0; Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -67,7 +67,12 @@ /* Convert it to Unicode */ RtlInitEmptyUnicodeString(&KeyName, Buffer, sizeof(Buffer)); - RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle); + return Status; + } /* Create the key */ ParentHandle = KeyHandle; @@ -221,7 +226,7 @@ { /* EISA */ case EisaAdapter: - + /* Fixup information */ Interface = Eisa; Bus = CmpTypeCount[EisaAdapter]++; @@ -229,7 +234,7 @@ /* Turbo-channel */ case TcAdapter: - + /* Fixup information */ Interface = TurboChannel; Bus = CmpTypeCount[TurboChannel]++; @@ -237,7 +242,7 @@ /* ISA, PCI, etc busses */ case MultiFunctionAdapter: - + /* Check if we have an identifier */ if (Component->Identifier) { @@ -252,7 +257,7 @@ break; } } - + /* Fix up information */ Interface = CmpMultifunctionTypes[i].InterfaceType; Bus = CmpMultifunctionTypes[i].Count++; @@ -261,7 +266,7 @@ /* SCSI Bus */ case ScsiAdapter: - + /* Fix up */ Interface = Internal; Bus = CmpTypeCount[ScsiAdapter]++; @@ -274,7 +279,7 @@ break; } } - + /* Dump information on the component */ /* Setup the hardware node */ @@ -285,7 +290,7 @@ Bus, DeviceIndexTable); if (!NT_SUCCESS(Status)) return Status; - + /* Check for children */ if (CurrentEntry->Child) { @@ -301,12 +306,12 @@ return Status; } } - + /* Get to the next entry */ NtClose(NewHandle); CurrentEntry = CurrentEntry->Sibling; } - + /* We're done */ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -35,6 +35,7 @@ /* FUNCTIONS *****************************************************************/ +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpDelayCloseDpcRoutine(IN PKDPC Dpc, @@ -49,6 +50,7 @@ ExQueueWorkItem(&CmpDelayCloseWorkItem, DelayedWorkQueue); } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpDelayCloseWorker(IN PVOID Context) @@ -188,21 +190,22 @@ INIT_FUNCTION CmpInitializeDelayedCloseTable(VOID) { - + /* Setup the delayed close lock */ KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); - + /* Setup the work item */ ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); - + /* Setup the list head */ InitializeListHead(&CmpDelayedLRUListHead); - + /* Setup the DPC and its timer */ KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); KeInitializeTimer(&CmpDelayCloseTimer); } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpDelayDerefKCBDpcRoutine(IN PKDPC Dpc, @@ -217,6 +220,7 @@ ExQueueWorkItem(&CmpDelayDerefKCBWorkItem, DelayedWorkQueue); } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpDelayDerefKCBWorker(IN PVOID Context) @@ -236,22 +240,22 @@ { /* Grab an entry */ Entry = (PVOID)RemoveHeadList(&CmpDelayDerefKCBListHead); - + /* We can release the lock now */ KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); - + /* Now grab the actual entry */ Entry = CONTAINING_RECORD(Entry, CM_DELAY_DEREF_KCB_ITEM, ListEntry); Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; - + /* Dereference and free */ CmpDereferenceKeyControlBlock(Entry->Kcb); CmpFreeDelayItem(Entry); - + /* Lock the list again */ KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); } - + /* We're done */ CmpDelayDerefKCBWorkItemActive = FALSE; KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); @@ -332,7 +336,7 @@ { LARGE_INTEGER Timeout; PAGED_CODE(); - + /* Set the worker active */ CmpDelayCloseWorkItemActive = TRUE; @@ -424,36 +428,36 @@ PCM_DELAYED_CLOSE_ENTRY Entry; ULONG NewRefCount, OldRefCount; PAGED_CODE(); - + /* Sanity checks */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); if (Kcb->DelayedCloseIndex == CmpDelayedCloseSize) ASSERT(FALSE); - + /* Get the entry and lock the table */ Entry = Kcb->DelayCloseEntry; ASSERT(Entry); KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); - + /* Remove the entry */ RemoveEntryList(&Entry->DelayedLRUList); - + /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); - + /* Free the entry */ CmpFreeDelayItem(Entry); - + /* Reduce the number of elements */ InterlockedDecrement((PLONG)&CmpDelayedCloseElements); - + /* Sanity check */ if (!Kcb->InDelayClose) ASSERT(FALSE); - + /* Get the previous reference count */ OldRefCount = *(PLONG)&Kcb->InDelayClose; ASSERT(OldRefCount == 1); - + /* Write the new one */ NewRefCount = 0; if (InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, @@ -463,10 +467,10 @@ /* Sanity check */ ASSERT(FALSE); } - + /* Remove the link to the entry */ Kcb->DelayCloseEntry = NULL; - + /* Set new delay size and remove the delete flag */ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; } Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -116,31 +116,31 @@ ASSERT(Function && Cookie); Callback = ExAllocatePoolWithTag(PagedPool, - sizeof(REGISTRY_CALLBACK), - 'bcMC'); - if (Callback != NULL) + sizeof(REGISTRY_CALLBACK), + 'bcMC'); + if (Callback == NULL) { - /* initialize the callback */ - ExInitializeRundownProtection(&Callback->RundownRef); - Callback->Function = Function; - Callback->Context = Context; - Callback->PendingDelete = FALSE; - - /* add it to the callback list and receive a cookie for the callback */ - ExAcquireFastMutex(&CmiCallbackLock); - - /* FIXME - to receive a unique cookie we'll just return the pointer to the - callback object */ - Callback->Cookie.QuadPart = (ULONG_PTR)Callback; - InsertTailList(&CmiCallbackHead, &Callback->ListEntry); - - ExReleaseFastMutex(&CmiCallbackLock); - - *Cookie = Callback->Cookie; - return STATUS_SUCCESS; + return STATUS_INSUFFICIENT_RESOURCES; } - return STATUS_INSUFFICIENT_RESOURCES; + /* initialize the callback */ + ExInitializeRundownProtection(&Callback->RundownRef); + Callback->Function = Function; + Callback->Context = Context; + Callback->PendingDelete = FALSE; + + /* add it to the callback list and receive a cookie for the callback */ + ExAcquireFastMutex(&CmiCallbackLock); + + /* FIXME - to receive a unique cookie we'll just return the pointer to the + callback object */ + Callback->Cookie.QuadPart = (ULONG_PTR)Callback; + InsertTailList(&CmiCallbackHead, &Callback->ListEntry); + + ExReleaseFastMutex(&CmiCallbackLock); + + *Cookie = Callback->Cookie; + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -38,13 +38,13 @@ NTSTATUS Status; PLIST_ENTRY NextEntry; PCMHIVE CmHive; - BOOLEAN Result; + BOOLEAN Result; ULONG HiveCount = CmpLazyFlushHiveCount; /* Set Defaults */ *Error = FALSE; *DirtyCount = 0; - + /* Don't do anything if we're not supposed to */ if (CmpNoWrite) return TRUE; @@ -66,7 +66,7 @@ { /* Great sucess! */ Result = TRUE; - + /* Ignore clean or volatile hves */ if (!(CmHive->Hive.DirtyCount) || (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) @@ -100,7 +100,7 @@ /* Try the next one */ NextEntry = NextEntry->Flink; } - + /* Check if we've flushed everything */ if (NextEntry == &CmpHiveListHead) { @@ -112,12 +112,13 @@ /* We need to be called again */ Result = TRUE; } - + /* Unlock the list and return the result */ ExReleasePushLock(&CmpHiveListHeadLock); return Result; } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpEnableLazyFlushDpcRoutine(IN PKDPC Dpc, @@ -129,6 +130,7 @@ CmpHoldLazyFlush = FALSE; } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI CmpLazyFlushDpcRoutine(IN PKDPC Dpc, @@ -150,7 +152,7 @@ { LARGE_INTEGER DueTime; PAGED_CODE(); - + /* Check if we should set the lazy flush timer */ if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) { @@ -161,6 +163,7 @@ } } +_Function_class_(WORKER_THREAD_ROUTINE) VOID NTAPI CmpLazyFlushWorker(IN PVOID Parameter) @@ -171,7 +174,7 @@ /* Don't do anything if lazy flushing isn't enabled yet */ if (CmpHoldLazyFlush) return; - + /* Check if we are forcing a flush */ ForceFlush = CmpForceForceFlush; if (ForceFlush) @@ -185,7 +188,7 @@ CmpLockRegistry(); InterlockedIncrement(&CmpFlushStarveWriters); } - + /* Flush the next hive */ MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); if (!MoreWork) @@ -200,7 +203,7 @@ /* Not pending anymore, release the registry lock */ CmpLazyFlushPending = FALSE; CmpUnlockRegistry(); - + /* Check if we need to flush another hive */ if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); } @@ -209,15 +212,15 @@ NTAPI CmpCmdInit(IN BOOLEAN SetupBoot) { - LARGE_INTEGER DueTime; - PAGED_CODE(); - + LARGE_INTEGER DueTime; + PAGED_CODE(); + /* Setup the lazy DPC */ KeInitializeDpc(&CmpLazyFlushDpc, CmpLazyFlushDpcRoutine, NULL); - + /* Setup the lazy timer */ KeInitializeTimer(&CmpLazyFlushTimer); - + /* Setup the lazy worker */ ExInitializeWorkItem(&CmpLazyWorkItem, CmpLazyFlushWorker, NULL); @@ -226,7 +229,7 @@ CmpEnableLazyFlushDpcRoutine, NULL); KeInitializeTimer(&CmpEnableLazyFlushTimer); - + /* Enable lazy flushing after 10 minutes */ DueTime.QuadPart = Int32x32To64(600, -10 * 1000 * 1000); KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc); @@ -234,10 +237,10 @@ /* Setup flush variables */ CmpNoWrite = CmpMiniNTBoot; CmpWasSetupBoot = SetupBoot; - + /* Testing: Force Lazy Flushing */ CmpHoldLazyFlush = FALSE; - + /* Setup the hive list */ CmpInitializeHiveList(SetupBoot); } Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -433,7 +433,10 @@ } /* Everything went fine, so return a pointer to the Object */ - if (NT_SUCCESS(Status)) *CallbackObject = Callback; + if (NT_SUCCESS(Status)) + { + *CallbackObject = Callback; + } return Status; } Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -51,6 +51,7 @@ /* FUNCTIONS *****************************************************************/ +_IRQL_requires_max_(APC_LEVEL) BOOLEAN INIT_FUNCTION NTAPI @@ -116,6 +117,7 @@ } } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpReleaseOrWaitForKeyedEvent( @@ -203,6 +205,7 @@ return STATUS_SUCCESS; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpWaitForKeyedEvent( @@ -219,6 +222,7 @@ FALSE); } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI ExpReleaseKeyedEvent( @@ -235,6 +239,7 @@ TRUE); } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtCreateKeyedEvent( @@ -311,6 +316,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtOpenKeyedEvent( @@ -359,6 +365,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtWaitForKeyedEvent( @@ -401,6 +408,7 @@ return Status; } +_IRQL_requires_max_(APC_LEVEL) NTSTATUS NTAPI NtReleaseKeyedEvent( Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -209,7 +209,7 @@ HANDLE KeyHandle; ULONG ValueLength; WCHAR ValueBuffer[20]; - HANDLE UserKey = NULL; + HANDLE UserKey; NTSTATUS Status; PAGED_CODE(); @@ -231,6 +231,7 @@ L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\Nls\\Language"); RtlInitUnicodeString(&ValueName, L"Default"); + UserKey = NULL; } /* Initailize the object attributes */ @@ -286,7 +287,10 @@ } /* Close the user key */ - ZwClose(UserKey); + if (UserKey) + { + ObCloseHandle(UserKey, KernelMode); + } /* Check for success */ if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -133,6 +133,7 @@ KeFlushQueuedDpcs(); } +_Function_class_(KDEFERRED_ROUTINE) VOID NTAPI ExpTimerDpcRoutine(IN PKDPC Dpc, @@ -355,7 +356,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -445,7 +447,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -500,7 +503,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } @@ -629,9 +633,9 @@ (PVOID*)&Timer, NULL); - /* + /* * Tell the user we don't support Wake Timers... - * when we have the ability to use/detect the Power Management + * when we have the ability to use/detect the Power Management * functionality required to support them, make this check dependent * on the actual PM capabilities */ @@ -740,7 +744,8 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - + /* Do nothing */ + (void)0; } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -841,8 +841,8 @@ { extern ULONGLONG BootCyclesEnd, BootCycles; BootCyclesEnd = __rdtsc(); - DbgPrint("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); - DbgPrint("Interrupts: %d System Calls: %d Context Switches: %d\n", + DbgPrint("Boot took %I64u cycles!\n", BootCyclesEnd - BootCycles); + DbgPrint("Interrupts: %u System Calls: %u Context Switches: %u\n", KeGetCurrentPrcb()->InterruptCount, KeGetCurrentPrcb()->KeSystemCalls, KeGetContextSwitches(KeGetCurrentPrcb())); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Dec 19 23:49:13 2012 @@ -237,10 +237,12 @@ * The input image path isn't freed on error. */ -NTSTATUS FASTCALL +NTSTATUS +FASTCALL IopNormalizeImagePath( - IN OUT PUNICODE_STRING ImagePath, - IN PUNICODE_STRING ServiceName) + _Inout_ _When_(return>=0, _At_(ImagePath->Buffer, _Post_notnull_ __drv_allocatesMem(Mem))) + PUNICODE_STRING ImagePath, + _In_ PUNICODE_STRING ServiceName) { UNICODE_STRING InputImagePath;

11 years, 9 months

[tkreuzer] 57953: [CSQ] Formatting, add annotations, use doxygen style comments, no functional change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 19 23:33:57 2012 New Revision: 57953 URL: http://svn.reactos.org/svn/reactos?rev=57953&view=rev Log: [CSQ] Formatting, add annotations, use doxygen style comments, no functional change Modified: trunk/reactos/lib/drivers/csq/csq.c Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Wed Dec 19 23:33:57 2012 @@ -30,13 +30,13 @@ #include <ntifs.h> -static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -/* - * FUNCTION: Cancel routine that is installed on any IRP that this library manages - * ARGUMENTS: - * [Called back by the system] - * NOTES: +/*! + * @brief Cancel routine that is installed on any IRP that this library manages + * + * @param DeviceObject + * @param Irp + * + * @note * - We assume that Irp->Tail.Overlay.DriverContext[3] has either a IO_CSQ * or an IO_CSQ_IRP_CONTEXT in it, but we have to figure out which it is * - By the time this routine executes, the I/O Manager has already cleared @@ -46,135 +46,152 @@ * system * - May be called at high IRQL */ -{ - PIO_CSQ Csq; - KIRQL Irql; - - /* First things first: */ - IoReleaseCancelSpinLock(Irp->CancelIrql); - - /* We could either get a context or just a csq */ - Csq = (PIO_CSQ)Irp->Tail.Overlay.DriverContext[3]; - - if(Csq->Type == IO_TYPE_CSQ_IRP_CONTEXT) - { - PIO_CSQ_IRP_CONTEXT Context = (PIO_CSQ_IRP_CONTEXT)Csq; - Csq = Context->Csq; - - /* clean up context while we're here */ - Context->Irp = NULL; - } - - /* Now that we have our CSQ, complete the IRP */ - Csq->CsqAcquireLock(Csq, &Irql); - Csq->CsqRemoveIrp(Csq, Irp); - Csq->CsqReleaseLock(Csq, Irql); - - Csq->CsqCompleteCanceledIrp(Csq, Irp); -} - - -NTSTATUS NTAPI IoCsqInitialize(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP CsqInsertIrp, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) -/* - * FUNCTION: Set up a CSQ struct to initialize the queue - * ARGUMENTS: - * Csq: Caller-allocated non-paged space for our IO_CSQ to be initialized - * CsqInsertIrp: Insert routine - * CsqRemoveIrp: Remove routine - * CsqPeekNextIrp: Routine to paeek at the next IRP in queue - * CsqAcquireLock: Acquire the queue's lock - * CsqReleaseLock: Release the queue's lock - * CsqCompleteCanceledIrp: Routine to complete IRPs when they are canceled - * RETURNS: +_Function_class_(DRIVER_CANCEL) +static +VOID +NTAPI +IopCsqCancelRoutine( + _Inout_ PDEVICE_OBJECT DeviceObject, + _Inout_ _IRQL_uses_cancel_ PIRP Irp) +{ + PIO_CSQ Csq; + KIRQL Irql; + + /* First things first: */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* We could either get a context or just a csq */ + Csq = (PIO_CSQ)Irp->Tail.Overlay.DriverContext[3]; + + if(Csq->Type == IO_TYPE_CSQ_IRP_CONTEXT) + { + PIO_CSQ_IRP_CONTEXT Context = (PIO_CSQ_IRP_CONTEXT)Csq; + Csq = Context->Csq; + + /* clean up context while we're here */ + Context->Irp = NULL; + } + + /* Now that we have our CSQ, complete the IRP */ + Csq->CsqAcquireLock(Csq, &Irql); + Csq->CsqRemoveIrp(Csq, Irp); + Csq->CsqReleaseLock(Csq, Irql); + + Csq->CsqCompleteCanceledIrp(Csq, Irp); +} + + +/*! + * @brief Set up a CSQ struct to initialize the queue + * + * @param Csq - Caller-allocated non-paged space for our IO_CSQ to be initialized + * @param CsqInsertIrp - Insert routine + * @param CsqRemoveIrp - Remove routine + * @param CsqPeekNextIrp - Routine to paeek at the next IRP in queue + * @param CsqAcquireLock - Acquire the queue's lock + * @param CsqReleaseLock - Release the queue's lock + * @param CsqCompleteCanceledIrp - Routine to complete IRPs when they are canceled + * + * @return * - STATUS_SUCCESS in all cases - * NOTES: + * + * @note * - Csq must be non-paged, as the queue is manipulated with a held spinlock */ -{ - Csq->Type = IO_TYPE_CSQ; - Csq->CsqInsertIrp = CsqInsertIrp; - Csq->CsqRemoveIrp = CsqRemoveIrp; - Csq->CsqPeekNextIrp = CsqPeekNextIrp; - Csq->CsqAcquireLock = CsqAcquireLock; - Csq->CsqReleaseLock = CsqReleaseLock; - Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; - Csq->ReservePointer = NULL; - - return STATUS_SUCCESS; -} - - -NTSTATUS NTAPI IoCsqInitializeEx(PIO_CSQ Csq, - PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, - PIO_CSQ_REMOVE_IRP CsqRemoveIrp, - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, - PIO_CSQ_RELEASE_LOCK CsqReleaseLock, - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) -/* - * FUNCTION: Set up a CSQ struct to initialize the queue (extended version) - * ARGUMENTS: - * Csq: Caller-allocated non-paged space for our IO_CSQ to be initialized - * CsqInsertIrpEx: Extended insert routine - * CsqRemoveIrp: Remove routine - * CsqPeekNextIrp: Routine to paeek at the next IRP in queue - * CsqAcquireLock: Acquire the queue's lock - * CsqReleaseLock: Release the queue's lock - * CsqCompleteCanceledIrp: Routine to complete IRPs when they are canceled - * RETURNS: +NTSTATUS +NTAPI +IoCsqInitialize( + _Out_ PIO_CSQ Csq, + _In_ PIO_CSQ_INSERT_IRP CsqInsertIrp, + _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, + _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, + _In_ PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, + _In_ PIO_CSQ_RELEASE_LOCK CsqReleaseLock, + _In_ PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) +{ + Csq->Type = IO_TYPE_CSQ; + Csq->CsqInsertIrp = CsqInsertIrp; + Csq->CsqRemoveIrp = CsqRemoveIrp; + Csq->CsqPeekNextIrp = CsqPeekNextIrp; + Csq->CsqAcquireLock = CsqAcquireLock; + Csq->CsqReleaseLock = CsqReleaseLock; + Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; + Csq->ReservePointer = NULL; + + return STATUS_SUCCESS; +} + + +/*! + * @brief Set up a CSQ struct to initialize the queue (extended version) + * + * @param Csq - Caller-allocated non-paged space for our IO_CSQ to be initialized + * @param CsqInsertIrpEx - Extended insert routine + * @param CsqRemoveIrp - Remove routine + * @param CsqPeekNextIrp - Routine to paeek at the next IRP in queue + * @param CsqAcquireLock - Acquire the queue's lock + * @param CsqReleaseLock - Release the queue's lock + * @param CsqCompleteCanceledIrp - Routine to complete IRPs when they are canceled + * + * @return * - STATUS_SUCCESS in all cases - * NOTES: + * @note * - Csq must be non-paged, as the queue is manipulated with a held spinlock */ -{ - Csq->Type = IO_TYPE_CSQ_EX; - Csq->CsqInsertIrp = (PIO_CSQ_INSERT_IRP)CsqInsertIrpEx; - Csq->CsqRemoveIrp = CsqRemoveIrp; - Csq->CsqPeekNextIrp = CsqPeekNextIrp; - Csq->CsqAcquireLock = CsqAcquireLock; - Csq->CsqReleaseLock = CsqReleaseLock; - Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; - Csq->ReservePointer = NULL; - - return STATUS_SUCCESS; -} - - -VOID NTAPI IoCsqInsertIrp(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context) -/* - * FUNCTION: Insert an IRP into the CSQ - * ARGUMENTS: - * Csq: Pointer to the initialized CSQ - * Irp: Pointer to the IRP to queue - * Context: Context record to track the IRP while queued - * NOTES: +NTSTATUS +NTAPI +IoCsqInitializeEx( + _Out_ PIO_CSQ Csq, + _In_ PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, + _In_ PIO_CSQ_REMOVE_IRP CsqRemoveIrp, + _In_ PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp, + _In_ PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock, + _In_ PIO_CSQ_RELEASE_LOCK CsqReleaseLock, + _In_ PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp) +{ + Csq->Type = IO_TYPE_CSQ_EX; + Csq->CsqInsertIrp = (PIO_CSQ_INSERT_IRP)CsqInsertIrpEx; + Csq->CsqRemoveIrp = CsqRemoveIrp; + Csq->CsqPeekNextIrp = CsqPeekNextIrp; + Csq->CsqAcquireLock = CsqAcquireLock; + Csq->CsqReleaseLock = CsqReleaseLock; + Csq->CsqCompleteCanceledIrp = CsqCompleteCanceledIrp; + Csq->ReservePointer = NULL; + + return STATUS_SUCCESS; +} + + +/*! + * @brief Insert an IRP into the CSQ + * + * @param Csq - Pointer to the initialized CSQ + * @param Irp - Pointer to the IRP to queue + * @param Context - Context record to track the IRP while queued + * + * @return * - Just passes through to IoCsqInsertIrpEx, with no InsertContext */ -{ - IoCsqInsertIrpEx(Csq, Irp, Context, 0); -} - - -NTSTATUS NTAPI IoCsqInsertIrpEx(PIO_CSQ Csq, - PIRP Irp, - PIO_CSQ_IRP_CONTEXT Context, - PVOID InsertContext) -/* - * FUNCTION: Insert an IRP into the CSQ, with additional tracking context - * ARGUMENTS: - * Csq: Pointer to the initialized CSQ - * Irp: Pointer to the IRP to queue - * Context: Context record to track the IRP while queued - * InsertContext: additional data that is passed through to CsqInsertIrpEx - * NOTES: +VOID +NTAPI +IoCsqInsertIrp( + _Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context) +{ + IoCsqInsertIrpEx(Csq, Irp, Context, 0); +} + + +/*! + * @brief Insert an IRP into the CSQ, with additional tracking context + * + * @param Csq - Pointer to the initialized CSQ + * @param Irp - Pointer to the IRP to queue + * @param Context - Context record to track the IRP while queued + * @param InsertContext - additional data that is passed through to CsqInsertIrpEx + * + * @note * - Passes the additional context through to the driver-supplied callback, * which can be used with more sophistocated queues * - Marks the IRP pending in all cases @@ -183,205 +200,222 @@ * I'm sure I have gotten the details wrong on a fine point or two, but * basically this works with the MS-supplied samples. */ -{ - NTSTATUS Retval = STATUS_SUCCESS; - KIRQL Irql; - - Csq->CsqAcquireLock(Csq, &Irql); - - do - { - /* mark all irps pending -- says so in the cancel sample */ - IoMarkIrpPending(Irp); - - /* set up the context if we have one */ - if(Context) - { - Context->Type = IO_TYPE_CSQ_IRP_CONTEXT; - Context->Irp = Irp; - Context->Csq = Csq; - Irp->Tail.Overlay.DriverContext[3] = Context; - } - else - Irp->Tail.Overlay.DriverContext[3] = Csq; - - /* - * NOTE! This is very sensitive to order. If you set the cancel routine - * *before* you queue the IRP, our cancel routine will get called back for - * an IRP that isn't in its queue. - * - * There are three possibilities: - * 1) We get an IRP, we queue it, and it is valid the whole way - * 2) We get an IRP, and the IO manager cancels it before we're done here - * 3) We get an IRP, queue it, and the IO manager cancels it. - * - * #2 is is a booger. - * - * When the IO manger receives a request to cancel an IRP, it sets the cancel - * bit in the IRP's control byte to TRUE. Then, it looks to see if a cancel - * routine is set. If it isn't, the IO manager just returns to the caller. - * If there *is* a routine, it gets called. - * - * If we test for cancel first and then set the cancel routine, there is a spot - * between test and set that the IO manager can cancel us without our knowledge, - * so we miss a cancel request. That is bad. - * - * If we set a routine first and then test for cancel, we race with our completion - * routine: We set the routine, the IO Manager sets cancel, we test cancel and find - * it is TRUE. Meanwhile the IO manager has called our cancel routine already, so - * we can't complete the IRP because it'll rip it out from under the cancel routine. - * - * The IO manager does us a favor though: it nulls out the cancel routine in the IRP - * before calling it. Therefore, if we test to see if the cancel routine is NULL - * (after we have just set it), that means our own cancel routine is already working - * on the IRP, and we can just return quietly. Otherwise, we have to de-queue the - * IRP and cancel it ourselves. - * - * We have to go through all of this mess because this API guarantees that we will - * never return having left a canceled IRP in the queue. - */ - - /* Step 1: Queue the IRP */ - if(Csq->Type == IO_TYPE_CSQ) - Csq->CsqInsertIrp(Csq, Irp); - else - { - PIO_CSQ_INSERT_IRP_EX pCsqInsertIrpEx = (PIO_CSQ_INSERT_IRP_EX)Csq->CsqInsertIrp; - Retval = pCsqInsertIrpEx(Csq, Irp, InsertContext); - if(Retval != STATUS_SUCCESS) - break; - } - - /* Step 2: Set our cancel routine */ - (void)IoSetCancelRoutine(Irp, IopCsqCancelRoutine); - - /* Step 3: Deal with an IRP that is already canceled */ - if(!Irp->Cancel) - break; - - /* - * Since we're canceled, see if our cancel routine is already running - * If this is NULL, the IO Manager has already called our cancel routine - */ - if(!IoSetCancelRoutine(Irp, NULL)) - break; - - /* OK, looks like we have to de-queue and complete this ourselves */ - Csq->CsqRemoveIrp(Csq, Irp); - Csq->CsqCompleteCanceledIrp(Csq, Irp); - - if(Context) - Context->Irp = NULL; - } - while(0); - - Csq->CsqReleaseLock(Csq, Irql); - - return Retval; -} - - -PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq, - PIO_CSQ_IRP_CONTEXT Context) -/* - * FUNCTION: Remove anb IRP from the queue - * ARGUMENTS: - * Csq: Queue to remove the IRP from - * Context: Context record containing the IRP to be dequeued - * RETURNS: +NTSTATUS +NTAPI +IoCsqInsertIrpEx( + _Inout_ PIO_CSQ Csq, + _Inout_ PIRP Irp, + _Out_opt_ PIO_CSQ_IRP_CONTEXT Context, + _In_opt_ PVOID InsertContext) +{ + NTSTATUS Retval = STATUS_SUCCESS; + KIRQL Irql; + + Csq->CsqAcquireLock(Csq, &Irql); + + do + { + /* mark all irps pending -- says so in the cancel sample */ + IoMarkIrpPending(Irp); + + /* set up the context if we have one */ + if(Context) + { + Context->Type = IO_TYPE_CSQ_IRP_CONTEXT; + Context->Irp = Irp; + Context->Csq = Csq; + Irp->Tail.Overlay.DriverContext[3] = Context; + } + else + Irp->Tail.Overlay.DriverContext[3] = Csq; + + /* + * NOTE! This is very sensitive to order. If you set the cancel routine + * *before* you queue the IRP, our cancel routine will get called back for + * an IRP that isn't in its queue. + * + * There are three possibilities: + * 1) We get an IRP, we queue it, and it is valid the whole way + * 2) We get an IRP, and the IO manager cancels it before we're done here + * 3) We get an IRP, queue it, and the IO manager cancels it. + * + * #2 is is a booger. + * + * When the IO manger receives a request to cancel an IRP, it sets the cancel + * bit in the IRP's control byte to TRUE. Then, it looks to see if a cancel + * routine is set. If it isn't, the IO manager just returns to the caller. + * If there *is* a routine, it gets called. + * + * If we test for cancel first and then set the cancel routine, there is a spot + * between test and set that the IO manager can cancel us without our knowledge, + * so we miss a cancel request. That is bad. + * + * If we set a routine first and then test for cancel, we race with our completion + * routine: We set the routine, the IO Manager sets cancel, we test cancel and find + * it is TRUE. Meanwhile the IO manager has called our cancel routine already, so + * we can't complete the IRP because it'll rip it out from under the cancel routine. + * + * The IO manager does us a favor though: it nulls out the cancel routine in the IRP + * before calling it. Therefore, if we test to see if the cancel routine is NULL + * (after we have just set it), that means our own cancel routine is already working + * on the IRP, and we can just return quietly. Otherwise, we have to de-queue the + * IRP and cancel it ourselves. + * + * We have to go through all of this mess because this API guarantees that we will + * never return having left a canceled IRP in the queue. + */ + + /* Step 1: Queue the IRP */ + if(Csq->Type == IO_TYPE_CSQ) + Csq->CsqInsertIrp(Csq, Irp); + else + { + PIO_CSQ_INSERT_IRP_EX pCsqInsertIrpEx = (PIO_CSQ_INSERT_IRP_EX)Csq->CsqInsertIrp; + Retval = pCsqInsertIrpEx(Csq, Irp, InsertContext); + if(Retval != STATUS_SUCCESS) + break; + } + + /* Step 2: Set our cancel routine */ + (void)IoSetCancelRoutine(Irp, IopCsqCancelRoutine); + + /* Step 3: Deal with an IRP that is already canceled */ + if(!Irp->Cancel) + break; + + /* + * Since we're canceled, see if our cancel routine is already running + * If this is NULL, the IO Manager has already called our cancel routine + */ + if(!IoSetCancelRoutine(Irp, NULL)) + break; + + /* OK, looks like we have to de-queue and complete this ourselves */ + Csq->CsqRemoveIrp(Csq, Irp); + Csq->CsqCompleteCanceledIrp(Csq, Irp); + + if(Context) + Context->Irp = NULL; + } + while(0); + + Csq->CsqReleaseLock(Csq, Irql); + + return Retval; +} + + +/*! + * @brief Remove anb IRP from the queue + * + * @param Csq - Queue to remove the IRP from + * @param Context - Context record containing the IRP to be dequeued + * + * @return * - Pointer to an IRP if we found it - * NOTES: + * + * @note * - Don't forget that we can be canceled any time up to the point * where we unset our cancel routine */ -{ - KIRQL Irql; - PIRP Irp = NULL; - - Csq->CsqAcquireLock(Csq, &Irql); - - do - { - /* It's possible that this IRP could have been canceled */ - Irp = Context->Irp; - - if(!Irp) - break; - - /* Unset the cancel routine and see if it has already been canceled */ - if(!IoSetCancelRoutine(Irp, NULL)) - { - /* - * already gone, return NULL --> NOTE that we cannot touch this IRP *or* the context, - * since the context is being simultaneously twiddled by the cancel routine - */ - Irp = NULL; - break; - } - - /* This IRP is valid and is ours. Dequeue it, fix it up, and return */ - Csq->CsqRemoveIrp(Csq, Irp); - - Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) - Context->Irp = NULL; - } - while(0); - - Csq->CsqReleaseLock(Csq, Irql); - - return Irp; -} - -PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, - PVOID PeekContext) -/* - * FUNCTION: IoCsqRemoveNextIrp - Removes the next IRP from the queue - * ARGUMENTS: - * Csq: Queue to remove the IRP from - * PeekContext: Identifier of the IRP to be removed - * RETURNS: +PIRP +NTAPI +IoCsqRemoveIrp( + _Inout_ PIO_CSQ Csq, + _Inout_ PIO_CSQ_IRP_CONTEXT Context) +{ + KIRQL Irql; + PIRP Irp = NULL; + + Csq->CsqAcquireLock(Csq, &Irql); + + do + { + /* It's possible that this IRP could have been canceled */ + Irp = Context->Irp; + + if(!Irp) + break; + + /* Unset the cancel routine and see if it has already been canceled */ + if(!IoSetCancelRoutine(Irp, NULL)) + { + /* + * already gone, return NULL --> NOTE that we cannot touch this IRP *or* the context, + * since the context is being simultaneously twiddled by the cancel routine + */ + Irp = NULL; + break; + } + + /* This IRP is valid and is ours. Dequeue it, fix it up, and return */ + Csq->CsqRemoveIrp(Csq, Irp); + + Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); + + if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + Context->Irp = NULL; + } + while(0); + + Csq->CsqReleaseLock(Csq, Irql); + + return Irp; +} + +/*! + * @brief IoCsqRemoveNextIrp - Removes the next IRP from the queue + * + * @param Csq - Queue to remove the IRP from + * @param PeekContext - Identifier of the IRP to be removed + * + * @return * Pointer to the IRP that was removed, or NULL if one * could not be found - * NOTES: + * + * @note * - This function is sensitive to yet another race condition. * The basic idea is that we have to return the first IRP that * we get that matches the PeekContext >that is not already canceled<. * Therefore, we have to do a trick similar to the one done in Insert * above. */ -{ - KIRQL Irql; - PIRP Irp = NULL; - PIO_CSQ_IRP_CONTEXT Context; - - Csq->CsqAcquireLock(Csq, &Irql); - - while((Irp = Csq->CsqPeekNextIrp(Csq, Irp, PeekContext))) - { - /* - * If the cancel routine is gone, we're already canceled, - * and are spinning on the queue lock in our own cancel - * routine. Move on to the next candidate. It'll get - * removed by the cance routine. - */ - if(!IoSetCancelRoutine(Irp, NULL)) - continue; - - Csq->CsqRemoveIrp(Csq, Irp); - - /* Unset the context stuff and return */ - Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) - Context->Irp = NULL; - - break; - } - - Csq->CsqReleaseLock(Csq, Irql); - - return Irp; -} - +PIRP +NTAPI +IoCsqRemoveNextIrp( + _Inout_ PIO_CSQ Csq, + _In_opt_ PVOID PeekContext) +{ + KIRQL Irql; + PIRP Irp = NULL; + PIO_CSQ_IRP_CONTEXT Context; + + Csq->CsqAcquireLock(Csq, &Irql); + + while((Irp = Csq->CsqPeekNextIrp(Csq, Irp, PeekContext))) + { + /* + * If the cancel routine is gone, we're already canceled, + * and are spinning on the queue lock in our own cancel + * routine. Move on to the next candidate. It'll get + * removed by the cance routine. + */ + if(!IoSetCancelRoutine(Irp, NULL)) + continue; + + Csq->CsqRemoveIrp(Csq, Irp); + + /* Unset the context stuff and return */ + Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); + + if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + Context->Irp = NULL; + + break; + } + + Csq->CsqReleaseLock(Csq, Irql); + + return Irp; +} +

11 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2012