Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[janderwald] 22693: * add ReactOS Console configuration DLL

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 29 22:10:15 2006 New Revision: 22693 URL: http://svn.reactos.org/svn/reactos?rev=22693&view=rev Log: * add ReactOS Console configuration DLL Added: trunk/reactos/dll/win32/console/ (with props) trunk/reactos/dll/win32/console/colors.c (with props) trunk/reactos/dll/win32/console/console.c (with props) trunk/reactos/dll/win32/console/console.def (with props) trunk/reactos/dll/win32/console/console.h (with props) trunk/reactos/dll/win32/console/console.rbuild (with props) trunk/reactos/dll/win32/console/console.rc (with props) trunk/reactos/dll/win32/console/en.rc (with props) trunk/reactos/dll/win32/console/font.c (with props) trunk/reactos/dll/win32/console/layout.c (with props) trunk/reactos/dll/win32/console/options.c (with props) trunk/reactos/dll/win32/console/resource.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=226… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Jun 29 22:10:15 2006 @@ -19,6 +19,7 @@ <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> <property name="BASEADDRESS_MAIN" value="0x64f40000" /> <property name="BASEADDRESS_INTL" value="0x64fb0000" /> + <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> Propchange: trunk/reactos/dll/win32/console/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 29 22:10:15 2006 @@ -1,0 +1,11 @@ +*.coff +*.dll +*.d +*.a +*.o +*.sym +*.map +*.tmp +*.gch +GNUmakefile +*.vcproj Added: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (added) +++ trunk/reactos/dll/win32/console/colors.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,37 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/colors.c + * PURPOSE: displays colors dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +ColorsProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/colors.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/colors.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (added) +++ trunk/reactos/dll/win32/console/console.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,171 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/console.c + * PURPOSE: initialization of DLL + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "resource.h" +#include "console.h" + +#define NUM_APPLETS (1) + +LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FontProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK LayoutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ColorsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, InitApplet} +}; + +static void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + +/* Property Sheet Callback */ +int CALLBACK +PropSheetProc( + HWND hwndDlg, + UINT uMsg, + LPARAM lParam +) +{ + UNREFERENCED_PARAMETER(hwndDlg) + switch(uMsg) + { + case PSCB_BUTTONPRESSED: + switch(lParam) + { + case PSBTN_OK: /* OK */ + break; + case PSBTN_CANCEL: /* Cancel */ + break; + case PSBTN_APPLYNOW: /* Apply now */ + break; + case PSBTN_FINISH: /* Close */ + break; + default: + return FALSE; + } + break; + + case PSCB_INITIALIZED: + break; + } + return TRUE; +} + +/* First Applet */ +LONG APIENTRY +InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +{ + PROPSHEETPAGE psp[5]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + INT i=0; + + UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + + memset(Caption, 0x0, sizeof(Caption)); + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszCaption = Caption; + psh.nPages = 4; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; + + InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet( + HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + int i = (int)lParam1; + + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + } + case CPL_DBLCLK: + { + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; + } + } + return FALSE; +} + + +BOOLEAN +WINAPI +DllMain( + HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved) + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} + Propchange: trunk/reactos/dll/win32/console/console.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/console.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/console.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.def (added) +++ trunk/reactos/dll/win32/console/console.def Thu Jun 29 22:10:15 2006 @@ -1,0 +1,6 @@ +LIBRARY console.dll + +EXPORTS +CPlApplet@16 + +; EOF Propchange: trunk/reactos/dll/win32/console/console.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (added) +++ trunk/reactos/dll/win32/console/console.h Thu Jun 29 22:10:15 2006 @@ -1,0 +1,12 @@ +#ifndef CONSOLE_H__ +#define CONSOLE_H__ + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +#endif /* CONSOLE_H__ */ Propchange: trunk/reactos/dll/win32/console/console.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (added) +++ trunk/reactos/dll/win32/console/console.rbuild Thu Jun 29 22:10:15 2006 @@ -1,0 +1,19 @@ +<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll"> + <importlibrary definition="console.def" /> + <include base="console">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>console.c</file> + <file>options.c</file> + <file>font.c</file> + <file>layout.c</file> + <file>colors.c</file> + <file>console.rc</file> +</module> Propchange: trunk/reactos/dll/win32/console/console.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rc (added) +++ trunk/reactos/dll/win32/console/console.rc Thu Jun 29 22:10:15 2006 @@ -1,0 +1,20 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/console.rc + * PURPOSE: main resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel Console Applet\0" +#define REACTOS_STR_INTERNAL_NAME "powercfg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" +#include <reactos/version.rc> + +#include "en.rc" Propchange: trunk/reactos/dll/win32/console/console.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/console.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (added) +++ trunk/reactos/dll/win32/console/en.rc Thu Jun 29 22:10:15 2006 @@ -1,0 +1,71 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/en.rc + * PURPOSE: English resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Options" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +GROUPBOX "Cursor Size", -1, 15, 15, 120, 70 +CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", 0x50010009, 25, 25, 90, 10 +CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", 0x50010009, 25, 40, 90, 10 +CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", 0x50010009, 25, 55, 90, 10 +GROUPBOX "Display Options", -1, 140, 15, 100, 70 +CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", 0x50010009, 150, 35, 70, 10 +CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", 0x50010009, 150, 50, 70, 10 +GROUPBOX "Command History:", -1, 15, 90, 120, 70 +LTEXT "&Buffer Size", -1, 25, 100, 60, 15 +EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 +LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15 +EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 +CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 + + +GROUPBOX "Edit Options", -1, 140, 90, 100, 70 +CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15 +CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15 +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Font" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Layout" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 220, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Colors" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN +LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configures console properties." +END Propchange: trunk/reactos/dll/win32/console/en.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/en.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (added) +++ trunk/reactos/dll/win32/console/font.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,38 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/font.c + * PURPOSE: displays font dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +FontProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/font.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/font.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (added) +++ trunk/reactos/dll/win32/console/layout.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,37 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/layout.c + * PURPOSE: displays layout dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +LayoutProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/layout.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/layout.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (added) +++ trunk/reactos/dll/win32/console/options.c Thu Jun 29 22:10:15 2006 @@ -1,0 +1,38 @@ +/* $Id$ + * + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/options.c + * PURPOSE: displays options dialog + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + */ + + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include "resource.h" + + +INT_PTR +CALLBACK +OptionsProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + + default: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/win32/console/options.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/console/options.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/resource… ============================================================================== --- trunk/reactos/dll/win32/console/resource.h (added) +++ trunk/reactos/dll/win32/console/resource.h Thu Jun 29 22:10:15 2006 @@ -1,0 +1,26 @@ +#ifndef RESOURCE_H__ +#define RESOURCE_H__ + +#define IDC_CPLICON 40 +#define IDS_CPLNAME 41 +#define IDS_CPLDESCRIPTION 42 + +#define IDD_PROPPAGEOPTIONS 100 +#define IDD_PROPPAGEFONT 101 +#define IDD_PROPPAGELAYOUT 102 +#define IDD_PROPPAGECOLORS 103 + +#define IDC_CHECK_QUICK_EDIT 200 +#define IDC_CHECK_INSERT_MODE 201 +#define IDC_CHECK_DISCARD_DUPLICATES 202 +#define IDC_EDIT_BUFFER_SIZE 203 +#define IDC_UPDOWN_BUFFER_SIZE 204 +#define IDC_EDIT_NUM_BUFFER 205 +#define IDC_UPDOWN_NUM_BUFFER 206 +#define IDC_RADIO_SMALL_CURSOR 207 +#define IDC_RADIO_MEDIUM_CURSOR 208 +#define IDC_RADIO_LARGE_CURSOR 209 +#define IDC_RADIO_DISPLAY_WINDOW 210 +#define IDC_RADIO_DISPLAY_FULL 211 + +#endif Propchange: trunk/reactos/dll/win32/console/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Thu Jun 29 22:10:15 2006 @@ -28,6 +28,9 @@ <directory name="cfgmgr32"> <xi:include href="cfgmgr32/cfgmgr32.rbuild" /> </directory> +<directory name="console"> + <xi:include href="console/console.rbuild" /> +</directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.rbuild" /> </directory>

18 years, 5 months

[ion] 22692: - Fix the last two Ob reference counting bugs: - Don't de-reference the object when duplicating it (not sure why this was left there). This fixes all the "misbehaving object: Event" messages in the console and fixes those regressions. - Don't reference the object when doing a lookup (not sure why this was there either). This made it impossible to kill named objects, since ObpDeleteNameCheck did a lookup before killing them, and the lookup ended up adding a reference. - Cm still need

by ion＠svn.reactos.org

Author: ion Date: Thu Jun 29 22:07:53 2006 New Revision: 22692 URL: http://svn.reactos.org/svn/reactos?rev=22692&view=rev Log: - Fix the last two Ob reference counting bugs: - Don't de-reference the object when duplicating it (not sure why this was left there). This fixes all the "misbehaving object: Event" messages in the console and fixes those regressions. - Don't reference the object when doing a lookup (not sure why this was there either). This made it impossible to kill named objects, since ObpDeleteNameCheck did a lookup before killing them, and the lookup ended up adding a reference. - Cm still needs fixing! Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.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 (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Thu Jun 29 22:07:53 2006 @@ -2329,12 +2329,28 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindNextForwardRunClear( + IN PRTL_BITMAP BitMapHeader, + IN ULONG FromIndex, + IN PULONG StartingRunIndex +); + +NTSYSAPI VOID NTAPI RtlInitializeBitMap( IN PRTL_BITMAP BitMapHeader, IN PULONG BitMapBuffer, IN ULONG SizeOfBitMap +); + +NTSYSAPI +ULONG +NTAPI +RtlNumberOfSetBits( + IN PRTL_BITMAP BitMapHeader ); NTSYSAPI Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Jun 29 22:07:53 2006 @@ -220,9 +220,6 @@ /* Save the found object */ FoundObject = CurrentEntry->Object; if (!FoundObject) goto Quickie; - - /* Add a reference to the object */ - ObReferenceObject(FoundObject); } /* Check if the directory was unlocked (which means we locked it) */ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 22:07:53 2006 @@ -1382,7 +1382,6 @@ } /* Now create the handle */ - ObDereferenceObject(SourceObject); NewHandle = ExCreateHandle(HandleTable, &NewHandleEntry); if (!NewHandle) { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 29 22:07:53 2006 @@ -102,6 +102,7 @@ /* Check if we were inserted in a directory */ if (Directory) { + /* We were, so dereference the directory and the object as well */ ObDereferenceObject(Directory); ObDereferenceObject(Object); } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 22:07:53 2006 @@ -88,7 +88,7 @@ /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (Header->PointerCount <= Header->HandleCount) + if (Header->PointerCount < Header->HandleCount) { DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return; @@ -98,7 +98,7 @@ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - if(Header->HandleCount) + if (Header->HandleCount) { DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return;

18 years, 5 months

[tretiakov] 22691: Fix thread synchronization, use critical sections. Rewrite some functions (optimize).

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Jun 29 21:36:04 2006 New Revision: 22691 URL: http://svn.reactos.org/svn/reactos?rev=22691&view=rev Log: Fix thread synchronization, use critical sections. Rewrite some functions (optimize). Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.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 (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Thu Jun 29 21:36:04 2006 @@ -22,7 +22,10 @@ HANDLE MyHeap = NULL; PLOGFILE SystemLog = NULL; PLOGFILE ApplicationLog = NULL; +PLOGFILE SecurityLog = NULL; BOOL onLiveCD = FALSE; // On livecd events will go to debug output only + +extern CRITICAL_SECTION LogListCs; VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) { @@ -65,6 +68,8 @@ return 1; } + InitializeCriticalSection(&LogListCs); + /* This will be fixed in near future */ @@ -103,7 +108,9 @@ StartServiceCtrlDispatcher(ServiceTable); + LogfClose(SystemLog); + DeleteCriticalSection(&LogListCs); HeapDestroy(MyHeap); return 0; 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 (original) +++ trunk/reactos/base/services/eventlog/file.c Thu Jun 29 21:36:04 2006 @@ -8,7 +8,8 @@ #include "eventlog.h" -PLOGFILE _LogListHead = NULL; +PLOGFILE LogListHead = NULL; +CRITICAL_SECTION LogListCs; extern HANDLE MyHeap; BOOL LogfInitializeNew(PLOGFILE LogFile) @@ -292,107 +293,118 @@ return; } -PLOGFILE LogfListHead() -{ - return _LogListHead; -} - PLOGFILE LogfListItemByName(WCHAR *Name) { - PLOGFILE Item; - Item = LogfListHead(); - while(Item) - { + PLOGFILE Item, Ret = NULL; + + EnterCriticalSection(&LogListCs); + + for(Item = LogListHead; Item; Item = (PLOGFILE)Item->Next) if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) - return Item; - Item = (PLOGFILE)Item->Next; - } - return NULL; + { + Ret = Item; + break; + } + + LeaveCriticalSection(&LogListCs); + return Ret; } /* index starting from 1 */ INT LogfListItemIndexByName(WCHAR *Name) { PLOGFILE Item; - INT i = 1; - - Item = LogfListHead(); - - while(Item) - { + INT ret = 0, i = 1; + + EnterCriticalSection(&LogListCs); + + for(Item = LogListHead; Item; i++, Item = (PLOGFILE)Item->Next) if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) - return i; - Item = (PLOGFILE)Item->Next; - i++; - } - - return 0; + { + ret = i; + break; + } + + LeaveCriticalSection(&LogListCs); + return ret; } /* index starting from 1 */ PLOGFILE LogfListItemByIndex(INT Index) { INT i = 1; - PLOGFILE Item; - Item = LogfListHead(); - while(Item) + PLOGFILE Item = LogListHead; + + EnterCriticalSection(&LogListCs); + for(; Item && i<Index; Item = (PLOGFILE)Item->Next, i++); + LeaveCriticalSection(&LogListCs); + + return Item; +} + +INT LogfListItemCount() +{ + PLOGFILE Item = LogListHead; + INT i = 0; + + EnterCriticalSection(&LogListCs); + while(Item) { - if(i == Index) - return Item; - i++; - Item = (PLOGFILE)Item->Next; - } - return NULL; -} - -INT LogfListItemCount() -{ - PLOGFILE Item = NULL; - INT i = 1; - Item = LogfListHead(); - if(Item) - { - while(Item->Next) - { - i++; - Item = (PLOGFILE) Item->Next; - } - return i; - } - else return 0; + i++; + Item = (PLOGFILE) Item->Next; + } + LeaveCriticalSection(&LogListCs); + + return i; } VOID LogfListAddItem(PLOGFILE Item) { - PLOGFILE List; - - List = LogfListHead(); - - if(List) + EnterCriticalSection(&LogListCs); + + if(LogListHead) { + PLOGFILE List = LogListHead; + while(List->Next) List = (PLOGFILE)List->Next; + Item->Prev = (PVOID)List; Item->Next = NULL; - InterlockedExchange((PLONG)&List->Next, (LONG)Item); - } - else { + List->Next = Item; + } + else + { Item->Next = NULL; Item->Prev = NULL; - InterlockedExchange((PLONG)&_LogListHead, (LONG)Item); - } + LogListHead = Item; + } + + LeaveCriticalSection(&LogListCs); } VOID LogfListRemoveItem(PLOGFILE Item) { - if(Item->Prev) + PLOGFILE prev = (PLOGFILE)Item->Prev; + PLOGFILE next = (PLOGFILE)Item->Next; + + EnterCriticalSection(&LogListCs); + + if(prev && next) { - InterlockedExchange((PLONG)&((PLOGFILE)Item->Prev)->Next, - (LONG)Item->Next); - } - else { - InterlockedExchange((PLONG)&_LogListHead, (LONG)Item->Next); - } + prev->Next = next; + next->Prev = prev; + } + else if(next) + { + LogListHead = next; + next->Prev = NULL; + } + else if(prev) prev->Next = NULL; + else LogListHead = NULL; + + LeaveCriticalSection(&LogListCs); + } BOOL LogfReadEvent(PLOGFILE LogFile, @@ -562,7 +574,7 @@ ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber) -/* Returns NULL if nothing found. */ +/* Returns 0 if nothing found. */ { DWORD i; for(i = 0; i < LogFile->OffsetInfoNext; i++)

18 years, 5 months

[turner] 22690: Unicode fixes and error checking.

by turner＠svn.reactos.org

Author: turner Date: Thu Jun 29 19:08:10 2006 New Revision: 22690 URL: http://svn.reactos.org/svn/reactos?rev=22690&view=rev Log: Unicode fixes and error checking. Modified: trunk/reactos/base/shell/cmd/batch.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jun 29 19:08:10 2006 @@ -275,8 +275,17 @@ // // Allocate enough memory to hold the params and copy them over without modifications // - bc->raw_params = malloc(_tcslen(param)); - _tcscpy(bc->raw_params,param); + bc->raw_params = malloc((_tcslen(param)+1) * sizeof(TCHAR)); + if (bc->raw_params != NULL) + { + memset (bc->raw_params, 0, _tcslen(bc->raw_params) * sizeof(TCHAR)); + _tcscpy(bc->raw_params,param); + } + else + { + error_out_of_memory(); + return FALSE; + } #ifdef _DEBUG DebugPrintf (_T("Batch: returns TRUE\n"));

18 years, 5 months

[janderwald] 22689: * fix building of win32k_test

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 29 18:39:53 2006 New Revision: 22689 URL: http://svn.reactos.org/svn/reactos?rev=22689&view=rev Log: * fix building of win32k_test Modified: trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/te… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/tests/win32k.rbuild Thu Jun 29 18:39:53 2006 @@ -14,6 +14,8 @@ <library>regtests</library> <library>win32k_base</library> <library>pseh</library> + <library>freetype</library> + <library>ntoskrnl</library> <file>setup.c</file> <xi:include href="stubs.rbuild" /> </module>

18 years, 5 months

[janderwald] 22688: * auto select items which are started automatically * read disabled autostart items

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 29 17:33:59 2006 New Revision: 22688 URL: http://svn.reactos.org/svn/reactos?rev=22688&view=rev Log: * auto select items which are started automatically * read disabled autostart items Modified: trunk/reactos/base/applications/msconfig/precomp.h trunk/reactos/base/applications/msconfig/startuppage.c Modified: trunk/reactos/base/applications/msconfig/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/precomp.h (original) +++ trunk/reactos/base/applications/msconfig/precomp.h Thu Jun 29 17:33:59 2006 @@ -3,6 +3,7 @@ #include <commctrl.h> #include <winuser.h> #include <tchar.h> +#include <stdio.h> #include "resource.h" #include "msconfig.h" Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Thu Jun 29 17:33:59 2006 @@ -14,6 +14,7 @@ HWND hStartupDialog; void GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ); +void GetDisabledAutostartEntriesFromRegistry (); INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -59,6 +60,9 @@ GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupreg")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupfolder")); + //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit //FIXME: Common Startup (startmenu) @@ -66,6 +70,83 @@ } return 0; +} + + + void +GetDisabledAutostartEntriesFromRegistry (TCHAR * szBasePath) +{ + HKEY hKey, hSubKey; + DWORD Index, SubIndex, dwValues, dwSubValues, retVal; + DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; + LV_ITEM item; + TCHAR* Data; + TCHAR szValueName[MAX_KEY_LENGTH]; + TCHAR szSubValueName[MAX_KEY_LENGTH]; + TCHAR szSubPath[MAX_KEY_LENGTH]; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBasePath, 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwValues, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) + { + dwValueLength = MAX_KEY_LENGTH; + dwDataLength = MAX_VALUE_NAME; + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); + if (Data == NULL) + break; + + retVal = RegEnumKeyEx(hKey, Index, szValueName, &dwValueLength, NULL, NULL, NULL, NULL); + _stprintf(szSubPath, _T("%s\\%s"), szBasePath, szValueName); + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = szValueName; + item.iItem = ListView_GetItemCount(hStartupListCtrl); + item.lParam = 0; + (void)ListView_InsertItem(hStartupListCtrl, &item); + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, szSubPath, 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &hSubKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hSubKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwSubValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for(SubIndex = 0; SubIndex < dwSubValues; SubIndex++) + { + dwValueLength = MAX_KEY_LENGTH; + dwDataLength = MAX_VALUE_NAME; + if(RegEnumValue(hSubKey, SubIndex, szSubValueName, &dwValueLength, NULL, NULL, (LPBYTE)Data, &dwDataLength) == ERROR_SUCCESS) + { + if (!_tcscmp(szSubValueName, _T("command"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 1; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (!_tcscmp(szSubValueName, _T("key")) || !_tcscmp(szSubValueName, _T("location"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 2; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (!_tcscmp(szSubValueName, _T("item"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 0; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + } + } + } + RegCloseKey(hSubKey); + HeapFree(GetProcessHeap(), 0, Data); + } + } + RegCloseKey(hKey); + } } void @@ -100,6 +181,7 @@ item.iItem = ListView_GetItemCount(hStartupListCtrl); item.lParam = 0; (void)ListView_InsertItem(hStartupListCtrl, &item); + ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE); if (dwType == REG_SZ) {

18 years, 5 months

[arty] 22687: Added method call interface, mmu translation methods.

by arty＠svn.reactos.org

Author: arty Date: Thu Jun 29 15:07:46 2006 New Revision: 22687 URL: http://svn.reactos.org/svn/reactos?rev=22687&view=rev Log: Added method call interface, mmu translation methods. Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Thu Jun 29 15:07:46 2006 @@ -14,12 +14,12 @@ claim 3 1 int int int int # release (virt size --) release 2 0 int int -# map (plo phi virt size mode --) -map 5 0 int int int int int -unmap 2 0 int int -modify 3 0 int int int -translate 4 1 int int int int int +# Declare the call-method BE function ++call-method 0 0 # Convenience functions that interact closely with OFW (written in BE asm) -dumpregs 0 0 -print_string 1 0 char* -print_number 1 0 int +# MMU Methods +@phys2virt!translate 4 1 int int int int&0 int +@virt2phys!translate 2 1 int int&1 int Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Thu Jun 29 15:07:46 2006 @@ -7,7 +7,7 @@ class ofw_wrappers { public: - int base, ctindex; + int base, ctindex, method_ctindex; std::string functions; std::string names; std::string calltable; @@ -15,6 +15,49 @@ std::string of_call; }; +class vartype { +public: + vartype( const std::string &typestr ) { + size_t amp = typestr.find('&'); + size_t col = typestr.find(':'); + if( amp != std::string::npos ) { + if( col > amp && col != std::string::npos ) + lit_value = typestr.substr(amp+1,col-amp+1); + else lit_value = typestr.substr(amp+1); + } + if( col != std::string::npos ) { + if( amp > col && amp != std::string::npos ) + len = typestr.substr(col+1,amp-col+1); + else len = typestr.substr(col+1); + } + + if( amp != std::string::npos && amp < col ) col = amp; + if( col == std::string::npos ) col = typestr.size(); + c_type = typestr.substr(0,col); + } + + vartype( const vartype &other ) + : c_type(other.c_type), + len(other.len), + lit_value(other.lit_value) { + } + + vartype &operator = ( const vartype &other ) { + c_type = other.c_type; + len = other.len; + lit_value = other.lit_value; + return *this; + } + + bool need_swap() const { + return c_type.find('*') != std::string::npos; + } + + std::string c_type; + std::string len; + std::string lit_value; +}; + std::string uppercase( const std::string &toucase ) { std::vector<char> ucase_work(toucase.size()); for( size_t i = 0; i < toucase.size(); i++ ) { @@ -37,45 +80,57 @@ return (x + (factor - 1)) & ~(factor - 1); } -std::string c_type( const std::string &intype ) { - size_t colon = intype.find(':'); - if( colon != std::string::npos ) return intype.substr(0,colon); - else if( intype.size() ) return intype; - else return "void"; -} - -std::string have_len( const std::string &intype ) { - size_t colon = intype.find(':'); - if( colon != std::string::npos ) return intype.substr(colon+1); - else return ""; -} - -bool need_swap( const std::string &intype ) { - return intype.find('*') != std::string::npos; -} - void populate_definition( ofw_wrappers &wrapper, const std::string &line ) { std::istringstream iss(line); - bool make_function = true; - std::string name, argtype, rettype, c_rettype; - std::vector<std::string> argtypes; - int args, rets, i, local_offset, total_stack; + bool make_function = true, method_call = false, make_stub = true, comma; + std::string name, nametext, argtype, rettype; + std::vector<vartype> argtypes; + int args, rets, i, local_offset, total_stack, userarg_start = 0; + size_t f; std::ostringstream function, ct_csource, le_stub, of_call; iss >> name >> args >> rets; if( !name.size() ) return; + + if( (f = name.find('!')) != std::string::npos ) { + nametext = name.substr(f+1); + name = name.substr(0,f); + } if( name[0] == '-' ) { name = name.substr(1); make_function = false; } + if( name[0] == '+' ) { + name = name.substr(1); + make_stub = false; + } + if( name[0] == '@' ) { + name = name.substr(1); + method_call = true; + make_function = false; + } + + if( !nametext.size() ) nametext = name; + + for( i = 1; i < (int)name.size(); i++ ) + if( name[i] == '-' ) name[i] = '_'; + + if( nametext == "call-method" ) + wrapper.method_ctindex = wrapper.ctindex; for( i = 0; i < args; i++ ) { iss >> argtype; - argtypes.push_back(argtype); + argtypes.push_back(vartype(argtype)); + } + + if( method_call ) { + userarg_start = 1; + args += 2; } iss >> rettype; + if( !rettype.size() ) rettype = "void"; local_offset = (3 + rets + args) * 4; total_stack = round_up(12 + local_offset, 16); @@ -118,25 +173,42 @@ << "\taddi %r1,%r1," << total_stack << "\n" << "\tblr\n"; - c_rettype = c_type(rettype); - - le_stub << c_rettype << " ofw_" << name << "("; - for( i = 0; i < args; i++ ) { - if( i ) le_stub << ","; - le_stub << c_type(argtypes[i]) << " arg" << i; + if( method_call ) { + argtypes.insert(argtypes.begin(),vartype("int")); + argtypes.insert(argtypes.begin(),vartype("char*")); + } + + le_stub << rettype << " ofw_" << name << "("; + + comma = false; + for( i = userarg_start; i < args; i++ ) { + if( !argtypes[i].lit_value.size() ) { + if( !comma ) comma = true; else le_stub << ","; + le_stub << argtypes[i].c_type << " arg" << i; + } } le_stub << ")"; of_call << le_stub.str() << ";\n"; le_stub << " {\n"; - if( c_rettype != "void" ) - le_stub << "\t" << c_rettype << " ret;\n"; + if( rettype != "void" ) + le_stub << "\t" << rettype << " ret;\n"; + + if( method_call ) { + le_stub << "\tchar arg0[" + << round_up(nametext.size()+1,8) + << "] = \"" << nametext << "\";\n"; + } for( i = 0; i < args; i++ ) { - if( need_swap(argtypes[i]) ) { + if( argtypes[i].lit_value.size() ) { + le_stub << "\t" << argtypes[i].c_type << " arg" << i << " = " + << argtypes[i].lit_value << ";\n"; + } + if( argtypes[i].need_swap() ) { le_stub << "\tint len" << i << " = "; - if( have_len(argtypes[i]).size() ) - le_stub << have_len(argtypes[i]) << ";\n"; + if( argtypes[i].len.size() ) + le_stub << argtypes[i].len << ";\n"; else { le_stub << "strlen(arg" << i << ");\n"; } @@ -148,11 +220,12 @@ } le_stub << "\t"; - if( c_rettype != "void" ) le_stub << "ret = (" << c_rettype << ")"; - - le_stub << "ofproxy(" << (wrapper.ctindex * 4); + if( rettype != "void" ) le_stub << "ret = (" << rettype << ")"; + + le_stub << "ofproxy(" << + (method_call ? (wrapper.method_ctindex * 4) : (wrapper.ctindex * 4)); - for( i = 0; i < 5; i++ ) { + for( i = 0; i < 6; i++ ) { if( i < args ) le_stub << ",(void *)arg" << i; else le_stub << ",NULL"; } @@ -160,7 +233,7 @@ le_stub << ");\n"; for( i = args-1; i >= 0; i-- ) { - if( need_swap(argtypes[i]) ) { + if( argtypes[i].need_swap() ) { le_stub << "\tle_swap(" << "arg" << i << "," << "arg" << i << "+len" << i << "," @@ -168,17 +241,21 @@ } } - if( c_rettype != "void" ) + if( rettype != "void" ) le_stub << "\treturn ret;\n"; le_stub << "}\n"; if( make_function ) wrapper.functions += function.str(); - wrapper.le_stubs += le_stub.str(); - wrapper.of_call += of_call.str(); - wrapper.names += name + "_ofw_name:\n\t.asciz \"" + name + "\"\n"; - wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; - wrapper.ctindex++; + if( make_stub ) { + wrapper.le_stubs += le_stub.str(); + wrapper.of_call += of_call.str(); + } + if( !method_call ) { + wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; + wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; + wrapper.ctindex++; + } } int main( int argc, char **argv ) { @@ -239,7 +316,7 @@ << "\t.long 0\n" << "\n/* Function Wrappers */\n\n" << wrappers.functions - << "\t/* Function Names */\n\n" + << "\n/* Function Names */\n\n" << wrappers.names << "\n/* Function Call Table for Freeldr */\n\n" << "ofw_functions:\n"

18 years, 5 months

[ion] 22686: - Cleanup the checks for mishbeaving objects a bit, and now quit the Dereference routine instead of doing the dereference. This has the advantage making console applications work again (note: this is NOT a fix. I'm just making the situation less bad until I fix ObDuplicateObject since that seems to be messing Events up, and until Cm gets fixed).

by ion＠svn.reactos.org

Author: ion Date: Thu Jun 29 09:20:16 2006 New Revision: 22686 URL: http://svn.reactos.org/svn/reactos?rev=22686&view=rev Log: - Cleanup the checks for mishbeaving objects a bit, and now quit the Dereference routine instead of doing the dereference. This has the advantage making console applications work again (note: this is NOT a fix. I'm just making the situation less bad until I fix ObDuplicateObject since that seems to be messing Events up, and until Cm gets fixed). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 09:20:16 2006 @@ -242,7 +242,7 @@ // // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD // - DPRINT("NOT CLOSING THE KEY\n"); + DPRINT1("NOT CLOSING THE KEY\n"); } else { Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 09:20:16 2006 @@ -90,27 +90,18 @@ if (Header->PointerCount <= Header->HandleCount) { - if (!wcscmp(Header->Type->Name.Buffer, L"Event")) - { - //KEBUGCHECK(0); - } DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + return; } /* Check whether the object can now be deleted. */ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - if (wcscmp(Header->Type->Name.Buffer, L"Key")) - { - if(Header->HandleCount) - { - DPRINT1("Unexpected misbehaving object: %wZ\n", &Header->Type->Name); - } - } - else - { - DPRINT1("Cm needs fixing!\n"); + if(Header->HandleCount) + { + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + return; } /* Check if we're at PASSIVE */

18 years, 5 months

[ion] 22685: - This patch finally enables closing handles for real, when NtClose is called. This means that File handles, processes, and all other NT Objects finally die (no more "file in use" and unkillable processes). On the other hand, this makes the registry code unhappy and unravelled a bug in ObDuplicateObject. - Booting/installing still works, but the system will possibly be unstable. However I'm choosing to commit this because it shows correct Ob behavior and will allow Art to fix Cm's r

by ion＠svn.reactos.org

Author: ion Date: Thu Jun 29 09:05:27 2006 New Revision: 22685 URL: http://svn.reactos.org/svn/reactos?rev=22685&view=rev Log: - This patch finally enables closing handles for real, when NtClose is called. This means that File handles, processes, and all other NT Objects finally die (no more "file in use" and unkillable processes). On the other hand, this makes the registry code unhappy and unravelled a bug in ObDuplicateObject. - Booting/installing still works, but the system will possibly be unstable. However I'm choosing to commit this because it shows correct Ob behavior and will allow Art to fix Cm's referencing properly. - Implement ObCheckObjectAccess and call it to perform access verification checks. - Properly create devices, processes and controllers with an extra reference count, so that when the code closes their handle they don't die. - Check for invalid uses of ObfDereferenceObject for our current debugging purposes. - Add SEH to NtQueryObject. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 29 09:05:27 2006 @@ -214,7 +214,7 @@ ); // -// Security descriptor cache functions +// Security functions // NTSTATUS NTAPI @@ -245,6 +245,16 @@ NTAPI ObpDereferenceCachedSecurityDescriptor( IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + +BOOLEAN +NTAPI +ObCheckObjectAccess( + IN PVOID Object, + IN OUT PACCESS_STATE AccessState, + IN BOOLEAN Unknown, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS ReturnedStatus ); // Modified: trunk/reactos/ntoskrnl/io/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/controller.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/controller.c (original) +++ trunk/reactos/ntoskrnl/io/controller.c Thu Jun 29 09:05:27 2006 @@ -100,8 +100,8 @@ Status = ObInsertObject(Controller, NULL, FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, + 1, + (PVOID*)&Controller, &Handle); if (!NT_SUCCESS(Status)) return NULL; Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Thu Jun 29 09:05:27 2006 @@ -566,8 +566,8 @@ Status = ObInsertObject(CreatedDeviceObject, NULL, FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, + 1, + (PVOID*)&CreatedDeviceObject, &TempHandle); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Jun 29 09:05:27 2006 @@ -455,7 +455,7 @@ PreviousMode, (PVOID*)&Directory, NULL); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* FIXME: TODO. UNIMPLEMENTED */ Status = STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 09:05:27 2006 @@ -237,7 +237,17 @@ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); /* Dereference the object as well */ - //ObDereferenceObject(Body); // FIXME: Needs sync changes in other code + if (!wcscmp(ObjectHeader->Type->Name.Buffer, L"Key")) + { + // + // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD + // + DPRINT("NOT CLOSING THE KEY\n"); + } + else + { + ObDereferenceObject(Body); + } /* Return to caller */ OBTRACE(OB_HANDLE_DEBUG, @@ -310,20 +320,16 @@ /* Check if we're opening an existing handle */ if (OpenReason == ObOpenHandle) { - /* - * FIXME: Do validation as described in Chapter 8 - * of Windows Internals 4th. - */ -#if 0 + /* Validate the caller's access to this object */ if (!ObCheckObjectAccess(Object, AccessState, TRUE, AccessMode, &Status)) { + /* Access was denied, so fail */ return Status; } -#endif } else if (OpenReason == ObCreateHandle) { @@ -982,7 +988,14 @@ /* Check if making the handle inheritable */ if (SetHandleInfo->Information.Inherit) { - /* Set the flag. FIXME: Need to check if this is allowed */ + /* Check if inheriting is not supported for this object */ + if (ObjectHeader->Type->TypeInfo.InvalidAttributes & OBJ_INHERIT) + { + /* Fail without changing anything */ + return FALSE; + } + + /* Set the flag */ HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; } else @@ -1757,7 +1770,7 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - if (Handle) ObDereferenceObject(Object); // FIXME: Needs sync changes + if (Handle) ObDereferenceObject(Object); /* Return */ OBTRACE(OB_HANDLE_DEBUG, Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jun 29 09:05:27 2006 @@ -946,10 +946,32 @@ POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; PVOID Object = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); - /* FIXME: Needs SEH */ + /* Check if the caller is from user mode */ + if (PreviousMode != KernelMode) + { + /* Protect validation with SEH */ + _SEH_TRY + { + /* Probe the input structure */ + ProbeForWrite(ObjectInformation, Length, sizeof(UCHAR)); + + /* If we have a result length, probe it too */ + if (ResultLength) ProbeForWriteUlong(ResultLength); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail if we raised an exception */ + if (!NT_SUCCESS(Status)) return Status; + } /* * Make sure this isn't a generic type query, since the caller doesn't @@ -1082,16 +1104,33 @@ /* Anything else */ default: + /* Fail it */ Status = STATUS_INVALID_INFO_CLASS; break; } - /* Derefernece the object if we had referenced it */ + /* Dereference the object if we had referenced it */ if (Object) ObDereferenceObject (Object); - /* Return the length and status */ - if (ResultLength) *ResultLength = InfoLength; + /* Check if the caller wanted the return length */ + if (ResultLength) + { + /* Protect the write to user mode */ + _SEH_TRY + { + /* Write the length */ + *ResultLength = Length; + } + _SEH_HANDLE + { + /* Otherwise, get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + /* Return status */ return Status; } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 09:05:27 2006 @@ -88,11 +88,30 @@ /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); + if (Header->PointerCount <= Header->HandleCount) + { + if (!wcscmp(Header->Type->Name.Buffer, L"Event")) + { + //KEBUGCHECK(0); + } + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + } + /* Check whether the object can now be deleted. */ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - ASSERT(!Header->HandleCount); + if (wcscmp(Header->Type->Name.Buffer, L"Key")) + { + if(Header->HandleCount) + { + DPRINT1("Unexpected misbehaving object: %wZ\n", &Header->Type->Name); + } + } + else + { + DPRINT1("Cm needs fixing!\n"); + } /* Check if we're at PASSIVE */ if (KeGetCurrentIrql() == PASSIVE_LEVEL) Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c Thu Jun 29 09:05:27 2006 @@ -15,7 +15,107 @@ #define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +/*++ +* @name ObCheckObjectAccess +* +* The ObAssignSecurity routine <FILLMEIN> +* +* @param Object +* <FILLMEIN> +* +* @param AccessState +* <FILLMEIN> +* +* @param Unknown +* <FILLMEIN> +* +* @param AccessMode +* <FILLMEIN> +* +* @param ReturnedStatus +* <FILLMEIN> +* +* @return TRUE if access was granted, FALSE otherwise. +* +* @remarks None. +* +*--*/ +BOOLEAN +NTAPI +ObCheckObjectAccess(IN PVOID Object, + IN OUT PACCESS_STATE AccessState, + IN BOOLEAN Unknown, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS ReturnedStatus) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + BOOLEAN SdAllocated; + NTSTATUS Status; + BOOLEAN Result; + ACCESS_MASK GrantedAccess; + PPRIVILEGE_SET Privileges = NULL; + PAGED_CODE(); + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + + /* Get security information */ + Status = ObGetObjectSecurity(Object, &SecurityDescriptor, &SdAllocated); + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + *ReturnedStatus = Status; + return FALSE; + } + else if (!SecurityDescriptor) + { + /* Otherwise, if we don't actually have an SD, return success */ + *ReturnedStatus = Status; + return TRUE; + } + + /* Lock the security context */ + SeLockSubjectContext(&AccessState->SubjectSecurityContext); + + /* Now do the entire access check */ + Result = SeAccessCheck(SecurityDescriptor, + &AccessState->SubjectSecurityContext, + TRUE, + AccessState->RemainingDesiredAccess, + AccessState->PreviouslyGrantedAccess, + &Privileges, + &ObjectType->TypeInfo.GenericMapping, + AccessMode, + &GrantedAccess, + ReturnedStatus); + if (Privileges) + { + /* We got privileges, append them to teh access state and free them */ + Status = SeAppendPrivileges(AccessState, Privileges); + SeFreePrivileges(Privileges); + } + + /* Check if access was granted */ + if (Result) + { + /* Update the access state */ + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | + MAXIMUM_ALLOWED); + AccessState->PreviouslyGrantedAccess |= GrantedAccess; + } + + /* We're done, unlock the context and release security */ + SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + return Result; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name ObAssignSecurity Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jun 29 09:05:27 2006 @@ -423,8 +423,8 @@ Status = ObInsertObject(Process, NULL, DesiredAccess, - 0, - NULL, + 1, + (PVOID*)&Process, &hProcess); if (NT_SUCCESS(Status)) {

18 years, 5 months

[arty] 22684: Fixed reference counting in CmiConnectHive and CmiDisconnectHive. No longer need hacks to check reference counts. Deleted a ton of wierd code. Fixed bug where we allocated uninitialized memory for child nodes we never populated. Now reference counting mirrors pointers exactly: - Hold one reference for the parent key pointer - Hold one reference for the list entry in the connected hive list

by arty＠svn.reactos.org

Author: arty Date: Thu Jun 29 07:48:43 2006 New Revision: 22684 URL: http://svn.reactos.org/svn/reactos?rev=22684&view=rev Log: Fixed reference counting in CmiConnectHive and CmiDisconnectHive. No longer need hacks to check reference counts. Deleted a ton of wierd code. Fixed bug where we allocated uninitialized memory for child nodes we never populated. Now reference counting mirrors pointers exactly: - Hold one reference for the parent key pointer - Hold one reference for the list entry in the connected hive list Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=22684… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu Jun 29 07:48:43 2006 @@ -358,6 +358,9 @@ /* Time stamp for the last access by the parse routine */ ULONG TimeStamp; + + /* List entry for connected hives */ + LIST_ENTRY HiveList; } KEY_OBJECT, *PKEY_OBJECT; /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c Thu Jun 29 07:48:43 2006 @@ -142,6 +142,8 @@ /* Acquire hive list lock exclusively */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + + DPRINT1("Adding new hive\n"); /* Add the new hive to the hive list */ InsertTailList(&CmiHiveListHead, &Hive->HiveList); @@ -195,7 +197,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1 ("CmiConnectHive(%wZ) failed (Status %lx)\n", &KeyName, Status); -// CmiRemoveRegistryHive(RegistryHive); return FALSE; } Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu Jun 29 07:48:43 2006 @@ -36,6 +36,7 @@ KTIMER CmiWorkerTimer; LIST_ENTRY CmiKeyObjectListHead; +LIST_ENTRY CmiConnectedHiveList; ULONG CmiTimer = 0; volatile BOOLEAN CmiHiveSyncEnabled = FALSE; @@ -385,6 +386,7 @@ /* Initialize the key object list */ InitializeListHead(&CmiKeyObjectListHead); + InitializeListHead(&CmiConnectedHiveList); /* Initialize the worker timer */ KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); @@ -694,92 +696,94 @@ return Status; } - NTSTATUS CmiConnectHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, IN PREGISTRY_HIVE RegistryHive) { - UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; - NTSTATUS Status; - PWSTR SubName; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - - DPRINT("CmiConnectHive(%p, %p) called.\n", - KeyObjectAttributes, RegistryHive); - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(KeyObjectAttributes, - KernelMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { + UNICODE_STRING RemainingPath; + PKEY_OBJECT ParentKey; + PKEY_OBJECT NewKey; + NTSTATUS Status; + PWSTR SubName; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + + DPRINT("CmiConnectHive(%p, %p) called.\n", + KeyObjectAttributes, RegistryHive); + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(KeyObjectAttributes, + KernelMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + + if (!NT_SUCCESS(Status)) + { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); return Status; - } - - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&ParentKey, - &RemainingPath, - CmiKeyType, - NULL, - NULL); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT ("RemainingPath %wZ\n", &RemainingPath); - - if ((RemainingPath.Buffer == NULL) || (RemainingPath.Buffer[0] == 0)) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_COLLISION; - } - - /* Ignore leading backslash */ - SubName = RemainingPath.Buffer; - if (*SubName == L'\\') - SubName++; - - /* If RemainingPath contains \ we must return error - because CmiConnectHive() can not create trees */ - if (wcschr (SubName, L'\\') != NULL) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - DPRINT("RemainingPath %wZ ParentKey %p\n", - &RemainingPath, ParentKey); - - Status = ObCreateObject(KernelMode, + } + + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&ParentKey, + &RemainingPath, CmiKeyType, NULL, - KernelMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID*)&NewKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return Status; - } + NULL); + /* Yields a new reference */ + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT ("RemainingPath %wZ\n", &RemainingPath); + + if ((RemainingPath.Buffer == NULL) || (RemainingPath.Buffer[0] == 0)) + { + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return STATUS_OBJECT_NAME_COLLISION; + } + + /* Ignore leading backslash */ + SubName = RemainingPath.Buffer; + if (*SubName == L'\\') + SubName++; + + /* If RemainingPath contains \ we must return error + because CmiConnectHive() can not create trees */ + if (wcschr (SubName, L'\\') != NULL) + { + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + DPRINT("RemainingPath %wZ ParentKey %p\n", + &RemainingPath, ParentKey); + + Status = ObCreateObject(KernelMode, + CmiKeyType, + NULL, + KernelMode, + NULL, + sizeof(KEY_OBJECT), + 0, + 0, + (PVOID*)&NewKey); + + if (!NT_SUCCESS(Status)) + { + DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return Status; + } DPRINT("Inserting Key into Object Tree\n"); Status = ObInsertObject((PVOID)NewKey, NULL, @@ -787,56 +791,42 @@ 0, NULL, NULL); -DPRINT("Status %x\n", Status); - NewKey->RegistryHive = RegistryHive; - NewKey->KeyCellOffset = RegistryHive->HiveHeader->RootKeyOffset; - NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); - NewKey->Flags = 0; - NewKey->NumberOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); - if (NewKey->KeyCell->NumberOfSubKeys != 0) - { - NewKey->SubKeys = ExAllocatePool(NonPagedPool, - NewKey->KeyCell->NumberOfSubKeys * sizeof(ULONG)); - if (NewKey->SubKeys == NULL) - { - DPRINT("ExAllocatePool() failed\n"); - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - NewKey->SubKeys = NULL; - } - - DPRINT ("SubName %S\n", SubName); - - Status = RtlpCreateUnicodeString(&NewKey->Name, - SubName, NonPagedPool); - RtlFreeUnicodeString(&RemainingPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); - if (NewKey->SubKeys != NULL) - { - ExFreePool (NewKey->SubKeys); - } - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - return STATUS_INSUFFICIENT_RESOURCES; - } - - CmiAddKeyToList (ParentKey, NewKey); - ObDereferenceObject (ParentKey); - - VERIFY_KEY_OBJECT(NewKey); - - /* Note: Do not dereference NewKey here! */ - - return STATUS_SUCCESS; + DPRINT("Status %x\n", Status); + NewKey->RegistryHive = RegistryHive; + NewKey->KeyCellOffset = RegistryHive->HiveHeader->RootKeyOffset; + NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); + NewKey->Flags = 0; + NewKey->NumberOfSubKeys = 0; + NewKey->SubKeys = NULL; + InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); + InsertTailList(&CmiConnectedHiveList, &NewKey->HiveList); + + DPRINT ("SubName %S\n", SubName); + + Status = RtlpCreateUnicodeString(&NewKey->Name, + SubName, NonPagedPool); + RtlFreeUnicodeString(&RemainingPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); + if (NewKey->SubKeys != NULL) + { + ExFreePool (NewKey->SubKeys); + } + ObDereferenceObject (NewKey); + ObDereferenceObject (ParentKey); + return STATUS_INSUFFICIENT_RESOURCES; + } + + CmiAddKeyToList (ParentKey, NewKey); + + VERIFY_KEY_OBJECT(NewKey); + + /* We're holding a pointer to the parent key .. We must keep it + * referenced */ + /* Note: Do not dereference NewKey here! */ + + return STATUS_SUCCESS; } @@ -845,9 +835,8 @@ OUT PREGISTRY_HIVE *RegistryHive) { PKEY_OBJECT KeyObject; - PREGISTRY_HIVE Hive; HANDLE KeyHandle; - NTSTATUS Status; + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; PLIST_ENTRY CurrentEntry; PKEY_OBJECT CurrentKey; @@ -875,68 +864,47 @@ (PVOID*)&KeyObject, NULL); ZwClose (KeyHandle); + if (!NT_SUCCESS(Status)) { DPRINT1 ("ObReferenceObjectByName() failed (Status %lx)\n", Status); return Status; } DPRINT ("KeyObject %p Hive %p\n", KeyObject, KeyObject->RegistryHive); - - if (!(KeyObject->KeyCell->Flags & REG_KEY_ROOT_CELL)) - { - DPRINT1 ("Key is not the Hive-Root-Key\n"); - ObDereferenceObject (KeyObject); - return STATUS_INVALID_PARAMETER; - } /* Acquire registry lock exclusively */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - CurrentEntry = CmiKeyObjectListHead.Flink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); - if (1 == ObGetObjectPointerCount(CurrentKey) && - !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) - { - ObDereferenceObject(CurrentKey); - CurrentEntry = CmiKeyObjectListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; - } + /* Find out if we represent a connected hive. */ + for( CurrentEntry = CmiConnectedHiveList.Flink; + CurrentEntry != &CmiConnectedHiveList; + CurrentEntry = CurrentEntry->Flink ) { + CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, HiveList); + if( CurrentKey == KeyObject ) { + /* Remove the connected hive from the connected hive list */ + RemoveEntryList(CurrentEntry); + /* found ourselves in the connected hive list */ + *RegistryHive = KeyObject->RegistryHive; + Status = STATUS_SUCCESS; + + /* Release references captured in CmiConnectHive */ + ObDereferenceObject (KeyObject->ParentKey); + ObDereferenceObject (KeyObject); + break; + } } - - if (ObGetObjectHandleCount (KeyObject) != 0 || - ObGetObjectPointerCount (KeyObject) != 2) - { - DPRINT1 ("Hive is still in use (hc %d, rc %d)\n", ObGetObjectHandleCount (KeyObject), ObGetObjectPointerCount (KeyObject)); - ObDereferenceObject (KeyObject); - - /* Release registry lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - return STATUS_UNSUCCESSFUL; - } - - Hive = KeyObject->RegistryHive; - - /* Dereference KeyObject twice to delete it */ - ObDereferenceObject (KeyObject); - ObDereferenceObject (KeyObject); - - *RegistryHive = Hive; - + /* Release registry lock */ ExReleaseResourceLite (&CmiRegistryLock); KeLeaveCriticalRegion(); + /* Release reference above */ + ObDereferenceObject (KeyObject); + DPRINT ("CmiDisconnectHive() done\n"); - return STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Jun 29 07:48:43 2006 @@ -462,7 +462,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT("CmiObjectParse: %s\n", FoundObject->Name); + //DPRINT("CmiObjectParse: %s\n", FoundObject->Name); *Path = EndPtr; @@ -492,9 +492,9 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - //if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - // DPRINT1("Key not found in parent list ???\n"); + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); } RemoveEntryList(&KeyObject->ListEntry); @@ -526,7 +526,7 @@ if (KeyObject->NumberOfSubKeys) { - //KEBUGCHECK(REGISTRY_ERROR); + KEBUGCHECK(REGISTRY_ERROR); } if (KeyObject->SizeOfSubKeys)

18 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
60
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 June 2006