Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[weiden] 29941: Fix console painting bugs
by weiden＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: weiden Date: Sun Oct 28 23:52:21 2007 New Revision: 29941 URL: http://svn.reactos.org/svn/reactos?rev=29941&view=rev Log: Fix console painting bugs Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Oct 28 23:52:21 2007 @@ -61,7 +61,7 @@ #define PM_DESTROY_CONSOLE (WM_APP + 2) #define CURSOR_BLINK_TIME 500 -#define DEFAULT_ATTRIB (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY) +#define DEFAULT_ATTRIB (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) static BOOL ConsInitialized = FALSE; static HWND NotifyWnd; @@ -115,6 +115,8 @@ RGB(255, 255, 255) }; +#define GuiConsoleRGBFromAttribute(GuiData, Attribute) ((GuiData)->Colors[(Attribute) & 0xF]) + /* FUNCTIONS *****************************************************************/ static VOID FASTCALL @@ -777,31 +779,6 @@ return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create); } -static COLORREF FASTCALL -GuiConsoleRGBFromAttribute(BYTE Attribute) -{ - int Red = (Attribute & 0x04 ? (Attribute & 0x08 ? 0xff : 0x80) : 0x00); - int Green = (Attribute & 0x02 ? (Attribute & 0x08 ? 0xff : 0x80) : 0x00); - int Blue = (Attribute & 0x01 ? (Attribute & 0x08 ? 0xff : 0x80) : 0x00); - - return RGB(Red, Green, Blue); -} - -static VOID FASTCALL -GuiConsoleSetTextColors(HDC Dc, BYTE Attribute, PCSRSS_SCREEN_BUFFER Buff, COLORREF TextColor, COLORREF BkColor) -{ - if (Attribute != Buff->DefaultAttrib) - { - SetTextColor(Dc, GuiConsoleRGBFromAttribute(Attribute & 0x0f)); - SetBkColor(Dc, GuiConsoleRGBFromAttribute((Attribute & 0xf0) >> 4)); - } - else - { - SetTextColor(Dc, TextColor); - SetBkColor(Dc, BkColor); - } -} - static VOID FASTCALL GuiConsoleGetLogicalCursorPos(PCSRSS_SCREEN_BUFFER Buff, ULONG *CursorX, ULONG *CursorY) { @@ -905,11 +882,8 @@ RightChar = (rc->right + (GuiData->CharWidth - 1)) / GuiData->CharWidth - 1; LastAttribute = Buff->Buffer[(TopLine * Buff->MaxX + LeftChar) * 2 + 1]; - GuiConsoleSetTextColors(hDC, - LastAttribute, - Buff, - GuiData->ScreenText, - GuiData->ScreenBackground); + SetTextColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute)); + SetBkColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute >> 4)); EnterCriticalSection(&Buff->Header.Lock); @@ -948,11 +922,8 @@ Attribute = *(From + 1); if (Attribute != LastAttribute) { - GuiConsoleSetTextColors(hDC, - Attribute, - Buff, - GuiData->ScreenText, - GuiData->ScreenBackground); + SetTextColor(hDC, GuiConsoleRGBFromAttribute(GuiData, Attribute)); + SetBkColor(hDC, GuiConsoleRGBFromAttribute(GuiData, Attribute >> 4)); LastAttribute = Attribute; } } @@ -992,7 +963,7 @@ if (*From != DEFAULT_ATTRIB) { - CursorBrush = CreateSolidBrush(GuiConsoleRGBFromAttribute(*From)); + CursorBrush = CreateSolidBrush(GuiConsoleRGBFromAttribute(GuiData, *From)); } else { @@ -1253,8 +1224,8 @@ if (Console->ActiveBuffer == Buff) { - GuiData->ScreenText = GuiConsoleRGBFromAttribute(Buff->DefaultAttrib & 0x0f); - GuiData->ScreenBackground = GuiConsoleRGBFromAttribute((Buff->DefaultAttrib & 0xf0) >> 4); + GuiData->ScreenText = GuiConsoleRGBFromAttribute(GuiData, Buff->DefaultAttrib); + GuiData->ScreenBackground = GuiConsoleRGBFromAttribute(GuiData, Buff->DefaultAttrib >> 4); } return TRUE;

1 0

[jimtabor] 29940: Use DC object member hHmgr instead of hSelf. hSelf is used for MemoryDC and SaveDC.
by jimtabor＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: jimtabor Date: Sun Oct 28 23:50:31 2007 New Revision: 29940 URL: http://svn.reactos.org/svn/reactos?rev=29940&view=rev Log: Use DC object member hHmgr instead of hSelf. hSelf is used for MemoryDC and SaveDC. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Sun Oct 28 23:50:31 2007 @@ -59,10 +59,10 @@ typedef struct _DC { - HGDIOBJ hHmgr; - PVOID pvEntry; - ULONG lucExcLock; - ULONG Tid; + HGDIOBJ hHmgr; // Handle for this DC object. +// PVOID pvEntry; +// ULONG lucExcLock; +// ULONG Tid; DHPDEV PDev; INT DC_Type; @@ -70,7 +70,7 @@ PDC_ATTR pDc_Attr; DC_ATTR Dc_Attr; - HDC hSelf; + HDC hSelf; // Used only for MemoryDC & SaveDC. HDC hNext; HSURF FillPatternSurfaces[HS_DDI_MAX]; PGDIINFO GDIInfo; Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Sun Oct 28 23:50:31 2007 @@ -43,7 +43,7 @@ HWND hWnd; PWINDOW_OBJECT Window; - hWnd = IntWindowFromDC(dc->hSelf); + hWnd = IntWindowFromDC((HDC) dc->hHmgr); Window = UserGetWindowObject(hWnd); if(!Window) return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Oct 28 23:50:31 2007 @@ -2409,6 +2409,7 @@ NewDC->DriverName.Buffer = Buf; } + NewDC->hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->w.xformWorld2Wnd.eM12 = 0.0f; NewDC->w.xformWorld2Wnd.eM21 = 0.0f; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Sun Oct 28 23:50:31 2007 @@ -87,7 +87,7 @@ BOOL Ret = FALSE; KeEnterCriticalRegion(); { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)dc->hSelf); + INT Index = GDI_HANDLE_GET_INDEX(dc->hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & ~1); DC_ATTR lDc_AttrData;

1 0

[dreimer] 29939: And another nice Patch by Pierre Schweitzer. - Improved sample text display (using bold font) - Centered sample text in rect - Continued code cleanup
by dreimer＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: dreimer Date: Sun Oct 28 23:43:08 2007 New Revision: 29939 URL: http://svn.reactos.org/svn/reactos?rev=29939&view=rev Log: And another nice Patch by Pierre Schweitzer. - Improved sample text display (using bold font) - Centered sample text in rect - Continued code cleanup Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Oct 28 23:43:08 2007 @@ -10,7 +10,7 @@ COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Schriftfarbe", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Oct 28 23:43:08 2007 @@ -10,7 +10,7 @@ COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Font Color", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Oct 28 23:43:08 2007 @@ -10,7 +10,7 @@ COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 58, 120, 36 + CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 58, 120, 36 CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sun Oct 28 23:43:08 2007 @@ -12,7 +12,7 @@ COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Oct 28 23:43:08 2007 @@ -124,12 +124,14 @@ DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { static HICON hIcon; + static HFONT hFont; switch (Msg) { case WM_INITDIALOG: { WCHAR Path[MAX_PATH]; + LOGFONT lf; hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), @@ -140,6 +142,12 @@ if(hIcon) SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); + lf.lfWeight = FW_BOLD; + hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, + lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf.lfOutPrecision, + lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfFaceName); + for(UINT i = 0; i < sizeof(Colors) / sizeof(char *); i++) { SendDlgItemMessage(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); @@ -192,55 +200,29 @@ PathInfo.hwndOwner = Dlg; PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; - if (wParam == ID_BROWSEMGW) + if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) { HINSTANCE hDLL; ILCREATEFROMPATHW ILCreateFromPathW; Control = ID_MGWDIR; PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; + if (wParam == ID_BROWSEOBJ) + { + Control = ID_OBJDIR; + PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; + } + else if (wParam == ID_BROWSEOUT) + { + Control = ID_OUTDIR; + PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; + } hDLL = LoadLibrary(L"shell32.dll"); if (hDLL) { ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); if (ILCreateFromPathW) { - GetDlgItemText(Dlg, ID_MGWDIR, path, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(path); - } - FreeLibrary(hDLL); - } - } - if (wParam == ID_BROWSEOBJ) - { - HINSTANCE hDLL; - ILCREATEFROMPATHW ILCreateFromPathW; - Control = ID_OBJDIR; - PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; - hDLL = LoadLibrary(L"shell32.dll"); - if (hDLL) - { - ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); - if (ILCreateFromPathW) - { - GetDlgItemText(Dlg, ID_OBJDIR, path, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(path); - } - FreeLibrary(hDLL); - } - } - if (wParam == ID_BROWSEOUT) - { - HINSTANCE hDLL; - ILCREATEFROMPATHW ILCreateFromPathW; - Control = ID_OUTDIR; - PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:"; - hDLL = LoadLibrary(L"shell32.dll"); - if (hDLL) - { - ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); - if (ILCreateFromPathW) - { - GetDlgItemText(Dlg, ID_OUTDIR, path, MAX_PATH); + GetDlgItemText(Dlg, Control, path, MAX_PATH); PathInfo.pidlRoot = ILCreateFromPathW(path); } FreeLibrary(hDLL); @@ -254,36 +236,34 @@ case ID_STRIP: case ID_USECCACHE: case ID_SHOWBUILDTIME: + case ID_OTHEROBJ: + case ID_OTHEROUT: { EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + if ((wParam != ID_OTHEROBJ) && (wParam != ID_OTHEROUT)) + break; + } + case ID_SAVELOGS: + { + BOOL WriteLogSet; + INT Dialog1, Dialog2; + Dialog1 = ID_BROWSE; + Dialog2 = ID_LOGDIR; + WriteLogSet = SendDlgItemMessage(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED; + if (wParam == ID_OTHEROBJ) + { + Dialog1 = ID_BROWSEOBJ; + Dialog2 = ID_OBJDIR; + } + else if (wParam == ID_OTHEROUT) + { + Dialog1 = ID_BROWSEOUT; + Dialog2 = ID_OUTDIR; + } + EnableWindow(GetDlgItem(Dlg, Dialog1), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, Dialog2), WriteLogSet); break; } - case ID_SAVELOGS: - { - BOOL WriteLogSet; - WriteLogSet = SendDlgItemMessage(Dlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED; - EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); - break; - } - case ID_OTHEROBJ: - { - BOOL WriteLogSet; - WriteLogSet = SendDlgItemMessage(Dlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED; - EnableWindow(GetDlgItem(Dlg, ID_BROWSEOBJ), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_OBJDIR), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - break; - } - case ID_OTHEROUT: - { - BOOL WriteLogSet; - WriteLogSet = SendDlgItemMessage(Dlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED; - EnableWindow(GetDlgItem(Dlg, ID_BROWSEOUT), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_OUTDIR), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - break; - } } } @@ -292,8 +272,10 @@ case WM_CTLCOLORSTATIC: { + HFONT hFontOld; if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { + hFontOld = SelectObject((HDC)wParam, hFont); SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Oct 28 23:43:08 2007 @@ -1,4 +1,3 @@ ToDo: - Load old settings - Improve Save button status (disabled if no changes, even if user played with param) -- Improve font preview (having a bold could be better)

1 0

[weiden] 29938: optimize FrameRgn for simple rectangular regions
by weiden＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: weiden Date: Sun Oct 28 23:07:28 2007 New Revision: 29938 URL: http://svn.reactos.org/svn/reactos?rev=29938&view=rev Log: optimize FrameRgn for simple rectangular regions Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Sun Oct 28 23:07:28 2007 @@ -1755,6 +1755,77 @@ REGION_UnionRegion(rgn, rgn, &region); } +BOOL FASTCALL REGION_CreateSimpleFrameRgn(PROSRGNDATA rgn, INT x, INT y) +{ + RECT rc[4]; + PRECT prc; + + if (x != 0 || y != 0) + { + prc = rc; + + if (rgn->rdh.rcBound.bottom - rgn->rdh.rcBound.top > y * 2 && + rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2) + { + if (y != 0) + { + /* top rectangle */ + prc->left = rgn->rdh.rcBound.left; + prc->top = rgn->rdh.rcBound.top; + prc->right = rgn->rdh.rcBound.right; + prc->bottom = prc->top + y; + prc++; + } + + if (x != 0) + { + /* left rectangle */ + prc->left = rgn->rdh.rcBound.left; + prc->top = rgn->rdh.rcBound.top + y; + prc->right = prc->left + x; + prc->bottom = rgn->rdh.rcBound.bottom - y; + prc++; + + /* right rectangle */ + prc->left = rgn->rdh.rcBound.right - x; + prc->top = rgn->rdh.rcBound.top + y; + prc->right = rgn->rdh.rcBound.right; + prc->bottom = rgn->rdh.rcBound.bottom - y; + prc++; + } + + if (y != 0) + { + /* bottom rectangle */ + prc->left = rgn->rdh.rcBound.left; + prc->top = rgn->rdh.rcBound.bottom - y; + prc->right = rgn->rdh.rcBound.right; + prc->bottom = rgn->rdh.rcBound.bottom; + prc++; + } + } + + if (prc != rc) + { + /* The frame results in a complex region. rcBounds remains + the same, though. */ + rgn->rdh.nCount = (DWORD)(prc - rc); + ASSERT(rgn->rdh.nCount > 1); + rgn->rdh.nRgnSize = rgn->rdh.nCount * sizeof(RECT); + rgn->Buffer = ExAllocatePoolWithTag( PagedPool, rgn->rdh.nRgnSize, TAG_REGION); + if (!rgn->Buffer) + { + rgn->rdh.nRgnSize = 0; + return FALSE; + } + + COPY_RECTS(rgn->Buffer, rc, rgn->rdh.nCount); + } + } + + return TRUE; +} + BOOL FASTCALL REGION_CreateFrameRgn(HRGN hDest, HRGN hSrc, INT x, INT y) { PROSRGNDATA srcObj, destObj; @@ -1784,57 +1855,70 @@ return FALSE; } - /* Original region moved to right */ - rc = (PRECT)srcObj->Buffer; - for (i = 0; i < srcObj->rdh.nCount; i++) + if (srcObj->rdh.iType == SIMPLEREGION) { - rc->left += x; - rc->right += x; - rc++; + if (!REGION_CreateSimpleFrameRgn(destObj, x, y)) + { + EMPTY_REGION(destObj); + RGNDATA_UnlockRgn(destObj); + RGNDATA_UnlockRgn(srcObj); + return FALSE; + } } - REGION_IntersectRegion(destObj, destObj, srcObj); - - /* Original region moved to left */ - rc = (PRECT)srcObj->Buffer; - for (i = 0; i < srcObj->rdh.nCount; i++) + else { - rc->left -= 2 * x; - rc->right -= 2 * x; - rc++; + /* Original region moved to right */ + rc = (PRECT)srcObj->Buffer; + for (i = 0; i < srcObj->rdh.nCount; i++) + { + rc->left += x; + rc->right += x; + rc++; + } + REGION_IntersectRegion(destObj, destObj, srcObj); + + /* Original region moved to left */ + rc = (PRECT)srcObj->Buffer; + for (i = 0; i < srcObj->rdh.nCount; i++) + { + rc->left -= 2 * x; + rc->right -= 2 * x; + rc++; + } + REGION_IntersectRegion(destObj, destObj, srcObj); + + /* Original region moved down */ + rc = (PRECT)srcObj->Buffer; + for (i = 0; i < srcObj->rdh.nCount; i++) + { + rc->left += x; + rc->right += x; + rc->top += y; + rc->bottom += y; + rc++; + } + REGION_IntersectRegion(destObj, destObj, srcObj); + + /* Original region moved up */ + rc = (PRECT)srcObj->Buffer; + for (i = 0; i < srcObj->rdh.nCount; i++) + { + rc->top -= 2 * y; + rc->bottom -= 2 * y; + rc++; + } + REGION_IntersectRegion(destObj, destObj, srcObj); + + /* Restore the original region */ + rc = (PRECT)srcObj->Buffer; + for (i = 0; i < srcObj->rdh.nCount; i++) + { + rc->top += y; + rc->bottom += y; + rc++; + } + REGION_SubtractRegion(destObj, srcObj, destObj); } - REGION_IntersectRegion(destObj, destObj, srcObj); - - /* Original region moved down */ - rc = (PRECT)srcObj->Buffer; - for (i = 0; i < srcObj->rdh.nCount; i++) - { - rc->left += x; - rc->right += x; - rc->top += y; - rc->bottom += y; - rc++; - } - REGION_IntersectRegion(destObj, destObj, srcObj); - - /* Original region moved up */ - rc = (PRECT)srcObj->Buffer; - for (i = 0; i < srcObj->rdh.nCount; i++) - { - rc->top -= 2 * y; - rc->bottom -= 2 * y; - rc++; - } - REGION_IntersectRegion(destObj, destObj, srcObj); - - /* Restore the original region */ - rc = (PRECT)srcObj->Buffer; - for (i = 0; i < srcObj->rdh.nCount; i++) - { - rc->top += y; - rc->bottom += y; - rc++; - } - REGION_SubtractRegion(destObj, srcObj, destObj); RGNDATA_UnlockRgn(destObj); RGNDATA_UnlockRgn(srcObj);

1 0

[dreimer] 29937: Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos
by dreimer＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: dreimer Date: Sun Oct 28 21:49:01 2007 New Revision: 29937 URL: http://svn.reactos.org/svn/reactos?rev=29937&view=rev Log: Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Oct 28 21:49:01 2007 @@ -44,7 +44,7 @@ ) dir /b 2>nul|findstr "." >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos + svn checkout svn://svn.reactos.org/reactos/trunk/reactos . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED )

1 0

[fireball] 29936: - It seems Alex's code was half-right, the cache tables still have to be zeroed out. - Rename "Ncb" functions to "NameControlBlock" functions. - Finish implementing CmpGetNameControlBlock and fix some bugs in it. - Fix CmpDereferenceNameControlBlockWithLock. - Fix bugs in CmpCreateKeyControlBlock and other style changes. - Add new macros for NCB lock acquire/release (based on the KCB macros). - The code doesn't seem to crash anymore, it just dies in the ASSERTs Alex added for u
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:46:09 2007 New Revision: 29936 URL: http://svn.reactos.org/svn/reactos?rev=29936&view=rev Log: - It seems Alex's code was half-right, the cache tables still have to be zeroed out. - Rename "Ncb" functions to "NameControlBlock" functions. - Finish implementing CmpGetNameControlBlock and fix some bugs in it. - Fix CmpDereferenceNameControlBlockWithLock. - Fix bugs in CmpCreateKeyControlBlock and other style changes. - Add new macros for NCB lock acquire/release (based on the KCB macros). - The code doesn't seem to crash anymore, it just dies in the ASSERTs Alex added for unimplemented code -- it would seem all the bugs are now fixed (or the code is behaving properly). Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Sun Oct 28 21:46:09 2007 @@ -221,6 +221,15 @@ } // +// Exclusively acquires an NCB by key +// +#define CmpAcquireNcbLockExclusiveByKey(k) \ +{ \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} + +// // Releases an exlusively or shared acquired NCB // #define CmpReleaseNcbLock(k) \ @@ -228,3 +237,12 @@ ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ (k)->ConvKey).Lock); \ } + +// +// Releases an exlusively or shared acquired NCB by key +// +#define CmpReleaseNcbLockByKey(k) \ +{ \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Sun Oct 28 21:46:09 2007 @@ -110,6 +110,9 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); } + /* Zero out the table */ + RtlZeroMemory(CmpCacheTable, Length); + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { @@ -128,6 +131,9 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); } + /* Zero out the table */ + RtlZeroMemory(CmpNameCacheTable, Length); + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { @@ -272,18 +278,17 @@ return NULL; } -// FIXME: NEEDS COMPLETION PCM_NAME_CONTROL_BLOCK NTAPI -CmpGetNcb(IN PUNICODE_STRING NodeName) +CmpGetNameControlBlock(IN PUNICODE_STRING NodeName) { PCM_NAME_CONTROL_BLOCK Ncb = NULL; ULONG ConvKey = 0; PWCHAR p, pp; ULONG i; - BOOLEAN IsCompressed = TRUE, Found; + BOOLEAN IsCompressed = TRUE, Found = FALSE; PCM_NAME_HASH HashEntry; - ULONG Length; + ULONG Length, NcbSize; /* Loop the name */ p = NodeName->Buffer; @@ -312,6 +317,9 @@ IsCompressed = FALSE; } } + + /* Lock the NCB entry */ + CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Get the hash entry */ HashEntry = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; @@ -352,21 +360,74 @@ } /* Next chars */ - //*p++; - //*pp++; + p++; + pp++; } } /* Check if we found a name */ if (Found) { - + /* Reference it */ + Ncb->RefCount++; } } /* Go to the next hash */ HashEntry = HashEntry->NextHash; } + + /* Check if we didn't find it */ + if (!Found) + { + /* Allocate one */ + NcbSize = FIELD_OFFSET(CM_NAME_CONTROL_BLOCK, Name) + Length; + Ncb = ExAllocatePoolWithTag(PagedPool, NcbSize, TAG_CM); + if (!Ncb) + { + /* Release the lock and fail */ + CmpReleaseNcbLockByKey(ConvKey); + return NULL; + } + + /* Clear it out */ + RtlZeroMemory(Ncb, NcbSize); + + /* Check if the name was compressed */ + if (IsCompressed) + { + /* Copy the compressed name */ + Ncb->Compressed = TRUE; + for (i = 0; i < Length; i++) + { + /* Copy Unicode to ANSI */ + ((PCHAR)Ncb->Name)[i] = (CHAR)RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + else + { + /* Copy the name directly */ + Ncb->Compressed = FALSE; + for (i = 0; i < Length; i++) + { + /* Copy each unicode character */ + Ncb->Name[i] = RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + + /* Setup the rest of the NCB */ + Ncb->ConvKey = ConvKey; + Ncb->RefCount++; + Ncb->NameLength = Length; + + /* Insert the name in the hash table */ + HashEntry = &Ncb->NameHash; + HashEntry->NextHash = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; + GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry = HashEntry; + } + + /* Release NCB lock */ + CmpReleaseNcbLockByKey(ConvKey); /* Return the NCB found */ return Ncb; @@ -446,9 +507,9 @@ VOID NTAPI -CmpDereferenceNcbWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) -{ - PCM_NAME_HASH Current, Next; +CmpDereferenceNameControlBlockWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) +{ + PCM_NAME_HASH Current, *Next; /* Lock the NCB */ CmpAcquireNcbLockExclusive(Ncb); @@ -457,20 +518,24 @@ if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ - Next = GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; + Next = &GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; while (TRUE) { /* Check the current entry */ - Current = Next; + Current = *Next; ASSERT(Current != NULL); - if (Current == &Ncb->NameHash) break; + if (Current == &Ncb->NameHash) + { + /* Unlink it */ + *Next = Current->NextHash; + break; + } /* Get to the next one */ - Next = Current->NextHash; - } - - /* Found it, now unlink it and free it */ - Current->NextHash = Next->NextHash; + Next = &Current->NextHash; + } + + /* Found it, now free it */ ExFreePool(Ncb); } @@ -705,7 +770,7 @@ CmpCleanUpKcbValueCache(Kcb); /* Reference the NCB */ - CmpDereferenceNcbWithLock(Kcb->NameBlock); + CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); /* Check if we have an index hint block and free it */ if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); @@ -957,12 +1022,16 @@ BOOLEAN IsFake, HashLock; PWCHAR p; - /* Make sure we own this hive */ - ASSERT(FALSE); - if (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread()) return NULL; + /* Make sure we own this hive in case it's being unloaded */ + if ((Hive->HiveFlags & HIVE_IS_UNLOADING) && + (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread())) + { + /* Fail */ + return NULL; + } /* Check if this is a fake KCB */ - IsFake = (BOOLEAN)(Flags & CMP_CREATE_FAKE_KCB); + IsFake = Flags & CMP_CREATE_FAKE_KCB ? TRUE : FALSE; /* If we have a parent, use its ConvKey */ if (Parent) ConvKey = Parent->ConvKey; @@ -986,7 +1055,7 @@ for (i = 0; i < NodeName.Length; i += sizeof(WCHAR)) { /* Make sure it's a valid character */ - if ((*p != OBJ_NAME_PATH_SEPARATOR) && (*p)) + if (*p != OBJ_NAME_PATH_SEPARATOR) { /* Add this key to the hash */ ConvKey = 37 * ConvKey + RtlUpcaseUnicodeChar(*p); @@ -1010,9 +1079,10 @@ Kcb->KeyCell = Index; Kcb->ConvKey = ConvKey; Kcb->DelayedCloseIndex = CmpDelayedCloseSize; + Kcb->InDelayClose = 0; /* Check if we have two hash entires */ - HashLock = (BOOLEAN)(Flags & CMP_LOCK_HASHES_FOR_KCB); + HashLock = Flags & CMP_LOCK_HASHES_FOR_KCB ? TRUE : FALSE; if (HashLock) { /* Not yet implemented */ @@ -1054,8 +1124,8 @@ CM_KCB_SUBKEY_HINT))) { /* Calculate the index hint */ - Kcb->SubKeyCount = Node->SubKeyCounts[0] + - Node->SubKeyCounts[1]; + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; /* Cached information is now valid */ Kcb->ExtFlags &= ~CM_KCB_INVALID_CACHED_INFO; @@ -1100,7 +1170,7 @@ if (Kcb) { /* Get the NCB */ - Kcb->NameBlock = CmpGetNcb(&NodeName); + Kcb->NameBlock = CmpGetNameControlBlock(&NodeName); if (Kcb->NameBlock) { /* Fill it out */ @@ -1114,8 +1184,8 @@ if (IsFake) Kcb->ExtFlags |= CM_KCB_KEY_NON_EXIST; /* Setup the other data */ - Kcb->SubKeyCount = Node->SubKeyCounts[0] + - Node->SubKeyCounts[1]; + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; Kcb->KcbLastWriteTime = Node->LastWriteTime; Kcb->KcbMaxNameLen = (USHORT)Node->MaxNameLen; Kcb->KcbMaxValueNameLen = (USHORT)Node->MaxValueNameLen; @@ -1133,6 +1203,9 @@ } } } + + /* Sanity check */ + ASSERT((!Kcb) || (Kcb->Delete == FALSE)); /* Check if we had locked the hashes */ if (HashLock)

1 0

[fireball] 29935: - Ugh, a few more leftovers... Hopefully nothing is forgotten now.
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:36:09 2007 New Revision: 29935 URL: http://svn.reactos.org/svn/reactos?rev=29935&view=rev Log: - Ugh, a few more leftovers... Hopefully nothing is forgotten now. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Sun Oct 28 21:36:09 2007 @@ -77,8 +77,8 @@ OUT PVOID Buffer, IN SIZE_T BufferLength) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; LARGE_INTEGER _FileOffset; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -97,8 +97,8 @@ IN PVOID Buffer, IN SIZE_T BufferLength) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; LARGE_INTEGER _FileOffset; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -116,8 +116,8 @@ IN ULONG FileSize, IN ULONG OldFileSize) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; FILE_END_OF_FILE_INFORMATION EndOfFileInfo; FILE_ALLOCATION_INFORMATION FileAllocationInfo; IO_STATUS_BLOCK IoStatusBlock; @@ -149,8 +149,8 @@ IN OUT PLARGE_INTEGER FileOffset, IN ULONG Length) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status;

1 0

[fireball] 29934: Forgot one file..
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:23:40 2007 New Revision: 29934 URL: http://svn.reactos.org/svn/reactos?rev=29934&view=rev Log: Forgot one file.. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (with props) Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Sun Oct 28 21:23:40 2007 @@ -1,0 +1,159 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmwraprs.c + * PURPOSE: Configuration Manager - Wrappers for Hive Operations + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateEvent(IN EVENT_TYPE EventType, + OUT PHANDLE EventHandle, + OUT PKEVENT *Event) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Create the event */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateEvent(EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + EventType, + FALSE); + if (!NT_SUCCESS(Status)) return Status; + + /* Get a pointer to the object itself */ + Status = ObReferenceObjectByHandle(*EventHandle, + EVENT_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)Event, + NULL); + if (!NT_SUCCESS(Status)) ZwClose(*EventHandle); + + /* Return status */ + return Status; +} + +PVOID +NTAPI +CmpAllocate(IN ULONG Size, + IN BOOLEAN Paged, + IN ULONG Tag) +{ + return ExAllocatePoolWithTag(Paged ? PagedPool : NonPagedPool, + Size, + Tag); +} + +VOID +NTAPI +CmpFree(IN PVOID Ptr, + IN ULONG Quota) +{ + ExFreePool(Ptr); +} + +BOOLEAN +NTAPI +CmpFileRead(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN PULONG FileOffset, + OUT PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = *FileOffset; + Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileWrite(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN PULONG FileOffset, + IN PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = *FileOffset; + Status = ZwWriteFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileSetSize(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONG FileSize, + IN ULONG OldFileSize) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + FILE_END_OF_FILE_INFORMATION EndOfFileInfo; + FILE_ALLOCATION_INFORMATION FileAllocationInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + EndOfFileInfo.EndOfFile.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &EndOfFileInfo, + sizeof(FILE_END_OF_FILE_INFORMATION), + FileEndOfFileInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + FileAllocationInfo.AllocationSize.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &FileAllocationInfo, + sizeof(FILE_ALLOCATION_INFORMATION), + FileAllocationInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + return TRUE; +} + +BOOLEAN +NTAPI +CmpFileFlush(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN OUT PLARGE_INTEGER FileOffset, + IN ULONG Length) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = ZwFlushBuffersFile(HiveHandle, &IoStatusBlock); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} Propchange: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 29933: - Fix code that tried to get a KCB from the alloc page. - Fix code that wasn't using CM_DELAY_ALLOC for delay allocation entries, but was using CM_DELAYED_CLOSE_ENTRY instead. - Fix definition of CM_DELAYED_CLOSE_ENTRY. - Fill out the CmpMachineHiveList. - Fix various callers of list-entry functions which were sending inverted parameters (entry instead of head) - Implement CmpInitializeDelayedCloseTable to do some work that CmpInitializeCache used to do. - Implement new locking
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:20:48 2007 New Revision: 29933 URL: http://svn.reactos.org/svn/reactos?rev=29933&view=rev Log: - Fix code that tried to get a KCB from the alloc page. - Fix code that wasn't using CM_DELAY_ALLOC for delay allocation entries, but was using CM_DELAYED_CLOSE_ENTRY instead. - Fix definition of CM_DELAYED_CLOSE_ENTRY. - Fill out the CmpMachineHiveList. - Fix various callers of list-entry functions which were sending inverted parameters (entry instead of head) - Implement CmpInitializeDelayedCloseTable to do some work that CmpInitializeCache used to do. - Implement new locking macro: CmpConvertKcbSharedToExclusive and use it. - Rename more functions to their real names, expanding "Kcb" to "KeyControlBlock" when necessary. - CmpInitializeCache: Calculate size based on hash table entries, not pointers to key hashes. The locks need to be initialized, not the whole structure zeroed out. - CmpFreeKeyControlBlock: Fix code that gets the KCB and removes it from the list -- it was missing. - CmpReferenceKeyControlBlock: * Use DelayedCloseIndex instead of "Delete". * Do not add + 1 to InterlockedIncrement's result - CmpDelayDerefKeyControlBlock: * Insert the entry at the tail, not the head. * Check if the worker is inactive, not if it's acvice. * Remove the KCB before freeing it. * Use DelayedCloseIndex, not delete. - CmpAllocateKeyControlBlock/CmpAllocateDelayItem: * Simplify and fix list lookup. * Simplify algorithm with a goto. - CmpDereferenceKeyControlBlockWithLock: * Make it actually decrement the reference count. * Use Delete flag instead of PrivateAlloc flag. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Sun Oct 28 21:20:48 2007 @@ -338,6 +338,15 @@ ULONG Reserved; PVOID AllocPage; } CM_ALLOC_PAGE, *PCM_ALLOC_PAGE; + +// +// Allocation Page Entry +// +typedef struct _CM_DELAY_ALLOC +{ + LIST_ENTRY ListEntry; + PCM_KEY_CONTROL_BLOCK Kcb; +} CM_DELAY_ALLOC, *PCM_DELAY_ALLOC; // // Delayed Close Entry @@ -574,7 +583,6 @@ { PWCHAR FileName; PWCHAR BaseName; - PWCHAR RegRootName; PCMHIVE CmHive; ULONG HHiveFlags; ULONG CmHiveFlags; @@ -582,7 +590,6 @@ BOOLEAN ThreadFinished; BOOLEAN ThreadStarted; BOOLEAN Allocate; - BOOLEAN WinPERequired; } HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; // @@ -853,8 +860,6 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); -/* NOTE: This function declaration is currently duplicated in both */ -/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI CmpOpenHiveFiles( @@ -919,7 +924,7 @@ VOID NTAPI -CmpDereferenceKcbWithLock( +CmpDereferenceKeyControlBlockWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively ); @@ -1285,7 +1290,7 @@ extern ULONG CmpConfigurationAreaSize; extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; extern UNICODE_STRING CmTypeName[]; -extern HIVE_LIST_ENTRY CmpMachineHiveList[5]; +extern HIVE_LIST_ENTRY CmpMachineHiveList[]; extern UNICODE_STRING CmSymbolicLinkValueName; extern UNICODE_STRING CmpSystemStartOptions; extern UNICODE_STRING CmpLoadOptions; Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Sun Oct 28 21:20:48 2007 @@ -200,6 +200,18 @@ } // +// Converts a KCB lock +// +FORCEINLINE +VOID +CmpConvertKcbSharedToExclusive(IN PCM_KEY_CONTROL_BLOCK k) +{ + ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); + CmpReleaseKcbLock(k); + CmpAcquireKcbLockExclusive(k); +} + +// // Exclusively acquires an NCB // #define CmpAcquireNcbLockExclusive(n) \ Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c Sun Oct 28 21:20:48 2007 @@ -38,7 +38,30 @@ EX_PUSH_LOCK CmpHiveListHeadLock, CmpLoadHiveLock; -HIVE_LIST_ENTRY CmpMachineHiveList[5]; +HIVE_LIST_ENTRY CmpMachineHiveList[] = +{ + { + L"HARDWARE", L"MACHINE\\", NULL, HIVE_VOLATILE, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SECURITY", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SOFTWARE", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SYSTEM", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"DEFAULT", L"USER\\.DEFAULT", NULL, 0, 1, NULL, FALSE, FALSE, FALSE + }, + { + L"SAM", L"MACHINE\\", NULL, HIVE_NOLAZYFLUSH, 0, NULL, FALSE, FALSE, FALSE + }, + { + NULL, NULL, 0, 0, 0, NULL, FALSE, FALSE, FALSE + } +}; UNICODE_STRING CmSymbolicLinkValueName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Sun Oct 28 21:20:48 2007 @@ -31,8 +31,6 @@ BOOLEAN CmSelfHeal, CmpSelfHeal; KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; - -HIVE_LIST_ENTRY CmpMachineHiveList[]; EX_PUSH_LOCK CmpLoadHiveLock; @@ -335,8 +333,8 @@ ValueName.Length); Quickie: - /* Free the buffers */ - RtlFreeUnicodeString(&ValueName); + /* Free the buffers */ + RtlFreeUnicodeString(&ValueName); /* Close the key and return */ NtClose(KeyHandle); Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Sun Oct 28 21:20:48 2007 @@ -71,39 +71,72 @@ ASSERT(CmpDelayCloseWorkItemActive); /* FIXME: TODO */ -} - -VOID -NTAPI -CmpInitializeCache(VOID) -{ - ULONG Length; - - /* Calculate length for the table */ - Length = CmpHashTableSize * sizeof(PCM_KEY_HASH); - - /* Allocate it */ - CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); - RtlZeroMemory(CmpCacheTable, Length); - - /* Calculate length for the name cache */ - Length = CmpHashTableSize * sizeof(PCM_NAME_HASH); - - /* Now allocate the name cache table */ - CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); - RtlZeroMemory(CmpNameCacheTable, Length); + ASSERT(FALSE); +} + +VOID +NTAPI +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); +} + +VOID +NTAPI +CmpInitializeCache(VOID) +{ + ULONG Length, i; + + /* Calculate length for the table */ + Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); + + /* Allocate it */ + CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); + } + + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpCacheTable[i].Lock); + } + + /* Calculate length for the name cache */ + Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); + + /* Now allocate the name cache table */ + CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpNameCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); + } + + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpNameCacheTable[i].Lock); + } + + /* Setup the delayed close table */ + CmpInitializeDelayedCloseTable(); } VOID @@ -153,6 +186,7 @@ ASSERT(CmpDelayDerefKCBWorkItemActive); /* FIXME: TODO */ + ASSERT(FALSE); } VOID @@ -340,7 +374,7 @@ VOID NTAPI -CmpRemoveKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpRemoveKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Make sure that the registry and KCB are utterly locked */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || @@ -352,7 +386,7 @@ VOID NTAPI -CmpFreeKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpFreeKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { ULONG i; PCM_ALLOC_PAGE AllocPage; @@ -367,43 +401,47 @@ { /* Free it from the pool */ ExFreePool(Kcb); - } - else - { - /* Acquire the private allocation lock */ - KeAcquireGuardedMutex(&CmpAllocBucketLock); - - /* Sanity check on lock ownership */ - ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == - KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive() == TRUE)); - - /* Remove us from the list */ - RemoveEntryList(&CmpFreeKCBListHead); - - /* Get the allocation page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Kcb & 0xFFFFF000); - - /* Sanity check */ - ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); - - /* Increase free count */ - if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) - { - /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE; i; i--) - { - /* Remove the entry - RemoveEntryList(& */ - } - - /* Free the page */ - ExFreePool(AllocPage); - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); - } + return; + } + + /* Acquire the private allocation lock */ + KeAcquireGuardedMutex(&CmpAllocBucketLock); + + /* Sanity check on lock ownership */ + ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == + KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Add us to the free list */ + InsertTailList(&CmpFreeKCBListHead, &Kcb->FreeListEntry); + + /* Get the allocation page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Kcb & 0xFFFFF000); + + /* Sanity check */ + ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); + + /* Increase free count */ + if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) + { + /* Loop all the entries */ + for (i = CM_KCBS_PER_PAGE; i; i--) + { + /* Get the KCB */ + Kcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); + + /* Remove the entry */ + RemoveEntryList(&Kcb->FreeListEntry); + } + + /* Free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); } VOID @@ -455,6 +493,7 @@ /* Get the entry and lock the table */ Entry = Kcb->DelayCloseEntry; + ASSERT(Entry); KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); /* Remove the entry */ @@ -487,12 +526,11 @@ /* Set new delay size and remove the delete flag */ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; - Kcb->Delete = FALSE; } BOOLEAN NTAPI -CmpReferenceKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpReferenceKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Check if this is the KCB's first reference */ if (Kcb->RefCount == 0) @@ -503,36 +541,36 @@ /* Convert it to exclusive */ if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) { - /* Set the delete flag */ - Kcb->Delete = TRUE; + /* Set the delayed close index so that we can be ignored */ + Kcb->DelayedCloseIndex = 1; /* Increase the reference count while we release the lock */ InterlockedIncrement((PLONG)&Kcb->RefCount); - - /* Sanity check, KCB should still be shared */ - ASSERT(CmpIsKcbLockedExclusive(Kcb) == FALSE); - - /* Release the current lock */ - CmpReleaseKcbLock(Kcb); - - /* Now acquire the lock in exclusive mode */ - CmpAcquireKcbLockExclusive(Kcb); + + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); /* Decrement the reference count; the lock is now held again */ InterlockedDecrement((PLONG)&Kcb->RefCount); - - /* Sanity check */ - ASSERT((Kcb->DelayedCloseIndex == CmpDelayedCloseSize) || - (Kcb->DelayedCloseIndex == 0)); - - /* Remove the delete flag */ - Kcb->Delete = FALSE; + + /* Check if we still control the index */ + if (Kcb->DelayedCloseIndex == 1) + { + /* Reset it */ + Kcb->DelayedCloseIndex = 0; + } + else + { + /* Sanity check */ + ASSERT((Kcb->DelayedCloseIndex == CmpDelayedCloseSize) || + (Kcb->DelayedCloseIndex == 0)); + } } } } /* Increase the reference count */ - if ((InterlockedIncrement((PLONG)&Kcb->RefCount) + 1) == 0) + if (InterlockedIncrement((PLONG)&Kcb->RefCount) == 0) { /* We've overflown to 64K references, bail out */ InterlockedDecrement((PLONG)&Kcb->RefCount); @@ -548,14 +586,8 @@ /* Convert it to exclusive */ if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) { - /* Sanity check, KCB should still be shared */ - ASSERT(CmpIsKcbLockedExclusive(Kcb) == FALSE); - - /* Release the current lock */ - CmpReleaseKcbLock(Kcb); - - /* Now acquire the lock in exclusive mode */ - CmpAcquireKcbLockExclusive(Kcb); + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); } } @@ -569,7 +601,7 @@ VOID NTAPI -CmpDelayDerefKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpDelayDerefKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { USHORT OldRefCount, NewRefCount; LARGE_INTEGER Timeout; @@ -596,10 +628,10 @@ KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); /* Insert the entry into the list */ - InsertHeadList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); + InsertTailList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); /* Check if we need to enable anything */ - if (CmpDelayDerefKCBWorkItemActive) + if (!CmpDelayDerefKCBWorkItemActive) { /* Yes, we have no work item, setup the interval */ Timeout.QuadPart = CmpDelayDerefKCBIntervalInSeconds * -10000000; @@ -651,7 +683,7 @@ } /* Dereference the KCB */ - CmpDelayDerefKcb(Kcb->ValueCache.RealKcb); + CmpDelayDerefKeyControlBlock(Kcb->ValueCache.RealKcb); Kcb->ExtFlags &= ~ CM_KCB_SYM_LINK_FOUND; } } @@ -680,15 +712,18 @@ /* Check if we were already deleted */ Parent = Kcb->ParentKcb; - if (!Kcb->Delete) CmpFreeKcb(Kcb); + if (!Kcb->Delete) CmpRemoveKeyControlBlock(Kcb); + + /* Free the KCB as well */ + CmpFreeKeyControlBlock(Kcb); /* Check if we have a parent */ if (Parent) { /* Dereference the parent */ - LockHeldExclusively ? CmpDereferenceKcbWithLock(Kcb, - LockHeldExclusively) : - CmpDelayDerefKcb(Kcb); + LockHeldExclusively ? + CmpDereferenceKeyControlBlockWithLock(Kcb,LockHeldExclusively) : + CmpDelayDerefKeyControlBlock(Kcb); } } @@ -748,8 +783,8 @@ OldRefCount); if (NewRefCount != OldRefCount) ASSERT(FALSE); - /* Remove the delete flag */ - Kcb->Delete = FALSE; + /* Reset the delayed close index */ + Kcb->DelayedCloseIndex = 0; /* Set up the close entry */ Kcb->DelayCloseEntry = Entry; @@ -778,9 +813,9 @@ PCM_KEY_CONTROL_BLOCK NTAPI -CmpAllocateKcb(VOID) -{ - PLIST_ENTRY ListHead, NextEntry; +CmpAllocateKeyControlBlock(VOID) +{ + PLIST_ENTRY NextEntry; PCM_KEY_CONTROL_BLOCK CurrentKcb; PCM_ALLOC_PAGE AllocPage; ULONG i; @@ -792,13 +827,12 @@ /* They are, acquire the bucket lock */ KeAcquireGuardedMutex(&CmpAllocBucketLock); - /* Loop the free KCB list */ - ListHead = &CmpFreeKCBListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) + /* See if there's something on the free KCB list */ +SearchKcbList: + if (!IsListEmpty(&CmpFreeKCBListHead)) { /* Remove the entry */ - RemoveEntryList(NextEntry); + NextEntry = RemoveHeadList(&CmpFreeKCBListHead); /* Get the KCB */ CurrentKcb = CONTAINING_RECORD(NextEntry, @@ -833,39 +867,20 @@ for (i = 0; i < CM_KCBS_PER_PAGE; i++) { /* Get this entry */ - CurrentKcb = (PCM_KEY_CONTROL_BLOCK)(AllocPage + 1); + CurrentKcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); /* Set it up */ CurrentKcb->PrivateAlloc = TRUE; CurrentKcb->DelayCloseEntry = NULL; - InsertHeadList(&CurrentKcb->FreeListEntry, - &CmpFreeKCBListHead); - } - - /* Get the KCB */ - CurrentKcb = CONTAINING_RECORD(NextEntry, - CM_KEY_CONTROL_BLOCK, - FreeListEntry); - - /* Get the allocation page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)CurrentKcb & 0xFFFFF000); - - /* Decrease the free count */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Make sure this KCB is privately allocated */ - ASSERT(CurrentKcb->PrivateAlloc == 1); - - /* Release the allocation lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); - - /* Return the KCB */ - return CurrentKcb; - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); + InsertHeadList(&CmpFreeKCBListHead, + &CurrentKcb->FreeListEntry); + } + + /* Now go back and search the list */ + goto SearchKcbList; + } } /* Allocate a KCB only */ @@ -885,33 +900,37 @@ VOID NTAPI -CmpDereferenceKcbWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, - IN BOOLEAN LockHeldExclusively) +CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) { /* Sanity check */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); - /* Check if we should do a direct delete */ - if (((CmpHoldLazyFlush) && - !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && - !(Kcb->Flags & KEY_SYM_LINK)) || - (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || - (Kcb->PrivateAlloc)) - { - /* Clean up the KCB*/ - CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); - } - else - { - /* Otherwise, use delayed close */ - CmpAddToDelayedClose(Kcb, LockHeldExclusively); - } -} - -VOID -NTAPI -CmpInitializeKcbKeyBodyList(IN PCM_KEY_CONTROL_BLOCK Kcb) + /* Check if this is the last reference */ + if (InterlockedDecrement((PLONG)&Kcb->RefCount) == 0) + { + /* Check if we should do a direct delete */ + if (((CmpHoldLazyFlush) && + !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && + !(Kcb->Flags & KEY_SYM_LINK)) || + (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || + (Kcb->Delete)) + { + /* Clean up the KCB*/ + CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); + } + else + { + /* Otherwise, use delayed close */ + CmpAddToDelayedClose(Kcb, LockHeldExclusively); + } + } +} + +VOID +NTAPI +InitializeKCBKeyBodyList(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Initialize the list */ InitializeListHead(&Kcb->KeyBodyListHead); @@ -939,6 +958,7 @@ PWCHAR p; /* Make sure we own this hive */ + ASSERT(FALSE); if (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread()) return NULL; /* Check if this is a fake KCB */ @@ -977,11 +997,11 @@ } /* Allocate the KCB */ - Kcb = CmpAllocateKcb(); + Kcb = CmpAllocateKeyControlBlock(); if (!Kcb) return NULL; /* Initailize the key list */ - CmpInitializeKcbKeyBodyList(Kcb); + InitializeKCBKeyBodyList(Kcb); /* Set it up */ Kcb->Delete = FALSE; @@ -1007,9 +1027,9 @@ ASSERT(!FoundKcb->Delete); /* Free the one we allocated and reference this one */ - CmpFreeKcb(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = FoundKcb; - if (!CmpReferenceKcb(Kcb)) + if (!CmpReferenceKeyControlBlock(Kcb)) { /* We got too many handles */ ASSERT(Kcb->RefCount + 1 != 0); @@ -1054,7 +1074,8 @@ if (Parent) { /* Reference the parent */ - if (((Parent->TotalLevels + 1) < 512) && (CmpReferenceKcb(Parent))) + if (((Parent->TotalLevels + 1) < 512) && + (CmpReferenceKeyControlBlock(Parent))) { /* Link it */ Kcb->ParentKcb = Parent; @@ -1063,8 +1084,8 @@ else { /* Remove the KCB and free it */ - CmpRemoveKcb(Kcb); - CmpFreeKcb(Kcb); + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } } @@ -1103,11 +1124,11 @@ else { /* Dereference the KCB */ - CmpDereferenceKcbWithLock(Parent, FALSE); + CmpDereferenceKeyControlBlockWithLock(Parent, FALSE); /* Remove the KCB and free it */ - CmpRemoveKcb(Kcb); - CmpFreeKcb(Kcb); + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } } Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Sun Oct 28 21:20:48 2007 @@ -55,7 +55,7 @@ NTAPI CmpAllocateDelayItem(VOID) { - PCM_DELAYED_CLOSE_ENTRY Entry; + PCM_DELAY_ALLOC Entry; PCM_ALLOC_PAGE AllocPage; ULONG i; PLIST_ENTRY NextEntry; @@ -63,70 +63,69 @@ /* Lock the allocation buckets */ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - while (TRUE) + + /* Look for an item on the free list */ +SearchList: + if (!IsListEmpty(&CmpFreeDelayItemsListHead)) { /* Get the current entry in the list */ - NextEntry = CmpFreeDelayItemsListHead.Flink; - - /* Check if we need to allocate an entry */ - if (((NextEntry) && (CmpFreeDelayItemsListHead.Blink) && - IsListEmpty(&CmpFreeDelayItemsListHead)) || - (!(NextEntry) && !(CmpFreeDelayItemsListHead.Blink))) + NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); + + /* Grab the item */ + Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); + + /* Clear the list */ + Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; + + /* Grab the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } + + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) { - /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - if (AllocPage) - { - /* Set default entries */ - AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - - /* Loop each entry */ - for (i = 0; i < CM_DELAYS_PER_PAGE; i++) - { - /* Get this entry and link it */ - Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); - InsertHeadList(&Entry->DelayedLRUList, - &CmpFreeDelayItemsListHead); - - /* Clear the KCB pointer */ - Entry->KeyControlBlock = NULL; - } - } - else - { - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return NULL; - } + /* Get this entry and link it */ + Entry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + InsertTailList(&CmpFreeDelayItemsListHead, + &Entry->ListEntry); + + /* Clear the KCB pointer */ + Entry->Kcb = NULL; } } - - /* Set the next item in the list */ - CmpFreeDelayItemsListHead.Flink = NextEntry->Flink; - NextEntry->Flink->Blink = &CmpFreeDelayItemsListHead; - NextEntry->Blink = NULL; - - /* Get the entry and the alloc page */ - Entry = CONTAINING_RECORD(NextEntry, - CM_DELAYED_CLOSE_ENTRY, - DelayedLRUList); - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; + else + { + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return NULL; + } + + /* Do the search again */ + goto SearchList; } VOID NTAPI CmpFreeDelayItem(PVOID Entry) { - PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; - PCM_DELAYED_CLOSE_ENTRY *AllocTable; + PCM_DELAY_ALLOC AllocEntry = (PCM_DELAY_ALLOC)Entry; PCM_ALLOC_PAGE AllocPage; ULONG i; PAGED_CODE(); @@ -135,7 +134,7 @@ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); /* Add the entry at the end */ - InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->ListEntry); /* Get the alloc page */ AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); @@ -145,12 +144,13 @@ if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) { /* Page is totally free now, loop each entry */ - AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; - for (i = CM_DELAYS_PER_PAGE; i; i--) + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) { /* Get the entry and unlink it */ - AllocEntry = AllocTable[i]; - RemoveEntryList(&AllocEntry->DelayedLRUList); + AllocEntry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + RemoveEntryList(&AllocEntry->ListEntry); } /* Now free the page */

1 0

[fireball] 29932: - Sync cmname.c, cmboot.c, cmconfig.c, cmindex.c, cmdata.c, cmparse.c, cmcheck.c, cmkcbncb.c with ReactOS Config trunk, and rename some functions to their NT counterparts. - Sync cm.h and cm_x.h with ReactOS Config trunk. - Sync CmpInitializeHive with ReactOS Config trunk. - Add cmsecach.c, cmse.c, cmvalue.c, cmhardwr.c, cmhook.c, cmcontrol.c from ReactOS Config Trunk. - Add cmwraprs.c from ReactOS Config Trunk and remove duplicated functions in cmhive.c. - Fix GCC compilation
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 19:54:05 2007 New Revision: 29932 URL: http://svn.reactos.org/svn/reactos?rev=29932&view=rev Log: - Sync cmname.c, cmboot.c, cmconfig.c, cmindex.c, cmdata.c, cmparse.c, cmcheck.c, cmkcbncb.c with ReactOS Config trunk, and rename some functions to their NT counterparts. - Sync cm.h and cm_x.h with ReactOS Config trunk. - Sync CmpInitializeHive with ReactOS Config trunk. - Add cmsecach.c, cmse.c, cmvalue.c, cmhardwr.c, cmhook.c, cmcontrol.c from ReactOS Config Trunk. - Add cmwraprs.c from ReactOS Config Trunk and remove duplicated functions in cmhive.c. - Fix GCC compilation errors (code was written in MSVC without ever attempting to compile in RosBE). Code now builds, but of course does not boot. - Fill ntapi.c with NT API Function Stubs for the registry system calls. - Sync code in cminit.c with ReactOS Config trunk, remove ACPI/Docking station code which is irrelevant to ReactOS, add reactos-specific hardware hive code, fix several missing functions and broken code in CmInitSystem1 (sync most of it from ReactOS config trunk). Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmboot.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcheck.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmconfig.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcontrl.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhook.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmparse.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmse.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmsecach.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmvalue.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/ branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/cmhardwr.c (with props) Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmboot.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcheck.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmconfig.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhook.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmparse.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmse.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmsecach.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmvalue.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007