Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 31542: [FORMATTING] Fix indentation and move comments
by ekohl＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: ekohl Date: Wed Jan 2 01:15:10 2008 New Revision: 31542 URL: http://svn.reactos.org/svn/reactos?rev=31542&view=rev Log: [FORMATTING] Fix indentation and move comments Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Wed Jan 2 01:15:10 2008 @@ -18,416 +18,524 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <windows.h> // Header File For Windows -#include <math.h> // Header File For Windows Math Library -#include <GL/gl.h> // Header File For The OpenGL32 Library -#include <GL/glu.h> // Header File For The GLu32 Library +#include <windows.h> +#include <math.h> +#include <GL/gl.h> +#include <GL/glu.h> #include <tchar.h> #include "resource.h" #include "3dtext.h" -static HGLRC hRC; // Permanent Rendering Context -static HDC hDC; // Private GDI Device Context - -GLuint base; // Base Display List For The Font Set -GLfloat rot; // Used To Rotate The Text +static HGLRC hRC; // Permanent Rendering Context +static HDC hDC; // Private GDI Device Context + +GLuint base; // Base Display List For The Font Set +GLfloat rot; // Used To Rotate The Text #define APPNAME _T("3DText") HINSTANCE hInstance; BOOL fullscreen = FALSE; -GLvoid BuildFont(GLvoid) // Build Our Bitmap Font -{ - GLYPHMETRICSFLOAT gmf[256]; // Address Buffer For Font Storage - HFONT font; // Windows Font ID - - base = glGenLists(256); // Storage For 256 Characters - - font = CreateFont( -12, // Height Of Font - 0, // Width Of Font - 0, // Angle Of Escapement - 0, // Orientation Angle - FW_BOLD, // Font Weight - FALSE, // Italic - FALSE, // Underline - FALSE, // Strikeout - DEFAULT_CHARSET, // Character Set Identifier - OUT_TT_PRECIS, // Output Precision - CLIP_DEFAULT_PRECIS, // Clipping Precision - ANTIALIASED_QUALITY, // Output Quality - FF_DONTCARE|DEFAULT_PITCH, // Family And Pitch - _T("Tahoma")); // Font Name - - SelectObject(hDC, font); // Selects The Font We Created - - wglUseFontOutlines( hDC, // Select The Current DC - 0, // Starting Character - 255, // Number Of Display Lists To Build - base, // Starting Display Lists - 0.0f, // Deviation From The True Outlines - 0.2f, // Font Thickness In The Z Direction - WGL_FONT_POLYGONS, // Use Polygons, Not Lines - gmf); // Address Of Buffer To Recieve Data -} - -GLvoid KillFont(GLvoid) // Delete The Font -{ - glDeleteLists(base, 256); // Delete All 256 Characters -} - -GLvoid glPrint(LPTSTR text) // Custom GL "Print" Routine -{ - if (text == NULL) // If There's No Text - return; // Do Nothing - - glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits - glListBase(base); // Sets The Base Character to 32 - - glCallLists(_tcslen(text), -#ifdef UNICODE - GL_UNSIGNED_SHORT +// Build Our Bitmap Font +GLvoid BuildFont(GLvoid) +{ + // Address Buffer For Font Storage + GLYPHMETRICSFLOAT gmf[256]; + // Windows Font Handle + HFONT font; + + // Storage For 256 Characters + base = glGenLists(256); + + font = CreateFont(-12, + 0, // Width Of Font + 0, // Angle Of Escapement + 0, // Orientation Angle + FW_BOLD, // Font Weight + FALSE, // Italic + FALSE, // Underline + FALSE, // Strikeout + DEFAULT_CHARSET, // Character Set Identifier + OUT_TT_PRECIS, // Output Precision + CLIP_DEFAULT_PRECIS, // Clipping Precision + ANTIALIASED_QUALITY, // Output Quality + FF_DONTCARE|DEFAULT_PITCH, // Family And Pitch + _T("Tahoma")); // Font Name + + // Selects The Font We Created + SelectObject(hDC, font); + + wglUseFontOutlines(hDC, // Select The Current DC + 0, // Starting Character + 255, // Number Of Display Lists To Build + base, // Starting Display Lists + 0.0f, // Deviation From The True Outlines + 0.2f, // Font Thickness In The Z Direction + WGL_FONT_POLYGONS, // Use Polygons, Not Lines + gmf); // Address Of Buffer To Recieve Data +} + +// Delete The Font +GLvoid KillFont(GLvoid) +{ + // Delete all 256 characters + glDeleteLists(base, 256); +} + +// Custom GL "Print" Routine +GLvoid glPrint(LPTSTR text) +{ + // If there's no text, do nothing + if (text == NULL) + return; + + // Pushes The Display List Bits + glPushAttrib(GL_LIST_BIT); + + // Sets The Base Character to 32 + glListBase(base); + + // Draws The Display List Text + glCallLists(_tcslen(text), +#ifdef UNICODE + GL_UNSIGNED_SHORT, #else - GL_UNSIGNED_BYTE + GL_UNSIGNED_BYTE, #endif - , text); // Draws The Display List Text - - glPopAttrib(); // Pops The Display List Bits -} - -GLvoid InitGL(GLsizei Width, GLsizei Height) // Will Be Called Right After The GL Window Is Created -{ - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Clear The Background Color To Black - glClearDepth(1.0); // Enables Clearing Of The Depth Buffer - glDepthFunc(GL_LESS); // The Type Of Depth Test To Do - glEnable(GL_DEPTH_TEST); // Enables Depth Testing - glShadeModel(GL_SMOOTH); // Enables Smooth Color Shading - - glMatrixMode(GL_PROJECTION); // Select The Projection Matrix - glLoadIdentity(); // Reset The Projection Matrix - - // Calculate The Aspect Ratio Of The Window - gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f); - - glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix - - BuildFont(); // Build The Font - glEnable(GL_LIGHT0); // Enable Default Light (Quick And Dirty) - glEnable(GL_LIGHTING); // Enable Lighting - glEnable(GL_COLOR_MATERIAL); // Enable Coloring Of Material -} - -GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height) // Handles Window Resizing -{ - if (Height==0) // Is Window Too Small (Divide By Zero Error) - Height=1; // If So Make It One Pixel Tall - - // Reset The Current Viewport And Perspective Transformation - glViewport(0, 0, Width, Height); - - glMatrixMode(GL_PROJECTION); // Select The Projection Matrix - glLoadIdentity(); // Reset The Projection Matrix - - // Calculate The Aspect Ratio Of The Window - gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f); - glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix -} - -GLvoid DrawGLScene(GLvoid) // Handles Rendering -{ - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear The Screen And The Depth Buffer - glLoadIdentity(); // Reset The View - glTranslatef(0.0f,0.0f,-10.0f); // Move One Unit Into The Screen - glRotatef(rot,1.0f,0.0f,0.0f); // Rotate On The X Axis - glRotatef(rot*1.2f,0.0f,1.0f,0.0f); // Rotate On The Y Axis - glRotatef(rot*1.4f,0.0f,0.0f,1.0f); // Rotate On The Z Axis - glTranslatef(-3.5f,0.0f,0.0f); // Move To The Left Before Drawing - // Pulsing Colors Based On The Rotation - glColor3f( - (1.0f*(cos(rot/20.0f))), - (1.0f*(sin(rot/25.0f))), - (1.0f-0.5f*(cos(rot/17.0f)))); - glPrint(m_Text); // Print GL Text To The Screen - glColor3f(0.0f,0.0f,1.0f); // Make The Text Blue - rot+=0.1f; // Increase The Rotation Variable -} - -LRESULT CALLBACK WndProc( HWND hWnd, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - static POINT ptLast; - static POINT ptCursor; - static BOOL fFirstTime = TRUE; - RECT Screen; // Used Later On To Get The Size Of The Window - GLuint PixelFormat; // Pixel Format Storage - static PIXELFORMATDESCRIPTOR pfd= // Pixel Format Descriptor - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number (?) - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - 16, // Select A 16Bit Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored (?) - 0, // No Alpha Buffer - 0, // Shift Bit Ignored (?) - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored (?) - 16, // 16Bit Z-Buffer (Depth Buffer) - 0, // No Stencil Buffer - 0, // No Auxiliary Buffer (?) - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved (?) - 0, 0, 0 // Layer Masks Ignored (?) - }; - - switch (message) // Tells Windows We Want To Check The Message - { - case WM_CREATE: // Window Creation - hDC = GetDC(hWnd); // Gets A Device Context For The Window - PixelFormat = ChoosePixelFormat(hDC, &pfd); // Finds The Closest Match To The Pixel Format We Set Above - - if (!PixelFormat) // No Matching Pixel Format? - { - MessageBox(0,_TEXT("Can't Find A Suitable PixelFormat."),_TEXT("Error"),MB_OK|MB_ICONERROR); - PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit - break; // Prevents The Rest Of The Code From Running - } - - if(!SetPixelFormat(hDC,PixelFormat,&pfd)) // Can We Set The Pixel Mode? - { - MessageBox(0,_TEXT("Can't Set The PixelFormat."),_TEXT("Error"),MB_OK|MB_ICONERROR); - PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit - break; // Prevents The Rest Of The Code From Running - } - - hRC = wglCreateContext(hDC); // Grab A Rendering Context - if(!hRC) // Did We Get One? - { - MessageBox(0,_TEXT("Can't Create A GL Rendering Context."),_TEXT("Error"),MB_OK|MB_ICONERROR); - PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit - break; // Prevents The Rest Of The Code From Running - } - - if(!wglMakeCurrent(hDC, hRC)) // Can We Make The RC Active? - { - MessageBox(0,_TEXT("Can't Activate GLRC."),_TEXT("Error"),MB_OK|MB_ICONERROR); - PostQuitMessage(0); // This Sends A 'Message' Telling The Program To Quit - break; // Prevents The Rest Of The Code From Running - } - - GetClientRect(hWnd, &Screen); // Grab Screen Info For The Current Window - InitGL(Screen.right, Screen.bottom); // Initialize The GL Screen Using Screen Info - break; - - case WM_DESTROY: // Windows Being Destroyed - case WM_CLOSE: // Windows Being Closed - { - ChangeDisplaySettings(NULL, 0); // Disable Fullscreen Mode - KillFont(); // Deletes The Font Display List - - wglMakeCurrent(hDC,NULL); // Make The DC Current - wglDeleteContext(hRC); // Kill The RC - ReleaseDC(hWnd,hDC); // Free The DC - - PostQuitMessage(0); // Quit The Program - } - break; - case WM_PAINT: - { - DrawGLScene(); - SwapBuffers(hDC); - break; - } - case WM_NOTIFY: - case WM_SYSKEYDOWN: - PostMessage(hWnd, WM_CLOSE, 0, 0); - break; - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - { - // If we've got a parent then we must be a preview - if(GetParent(hWnd) != 0) - return 0; - - if(fFirstTime) - { - GetCursorPos(&ptLast); - fFirstTime = FALSE; - } - - GetCursorPos(&ptCursor); - - // if the mouse has moved more than 3 pixels then exit - if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) - PostMessage(hWnd, WM_CLOSE, 0, 0); - - ptLast = ptCursor; - - return 0; - } - case WM_SIZE: // Resizing The Screen - ReSizeGLScene(LOWORD(lParam),HIWORD(lParam)); // Resize To The New Window Size - break; - - default: - return (DefWindowProc(hWnd, message, wParam, lParam)); // Pass Windows Messages - } -return (0); -} - -void InitSaver(HWND hwndParent) -{ - WNDCLASS wc; - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = WndProc; - wc.lpszClassName = APPNAME; - RegisterClass(&wc); - - if (hwndParent != 0) - { - RECT rect; - GetClientRect(hwndParent, &rect); - CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_CHILD, - 0, 0, - rect.right, - rect.bottom, - hwndParent, 0, - hInstance, NULL); - fullscreen = FALSE; - } else { - HWND hwnd; - hwnd = CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ShowCursor(FALSE); - fullscreen = TRUE; - } + text); + + // Pops The Display List Bits + glPopAttrib(); +} + +// Will Be Called Right After The GL Window Is Created +GLvoid InitGL(GLsizei Width, GLsizei Height) +{ + // Clear The Background Color To Black + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + + // Enables Clearing Of The Depth Buffer + glClearDepth(1.0); + + // The Type Of Depth Test To Do + glDepthFunc(GL_LESS); + + // Enables Depth Testing + glEnable(GL_DEPTH_TEST); + + // Enables Smooth Color Shading + glShadeModel(GL_SMOOTH); + + // Select The Projection Matrix + glMatrixMode(GL_PROJECTION); + + // Reset The Projection Matrix + glLoadIdentity(); + + // Calculate The Aspect Ratio Of The Window + gluPerspective(45.0f, (GLfloat)Width / (GLfloat)Height, 0.1f, 100.0f); + + // Select The Modelview Matrix + glMatrixMode(GL_MODELVIEW); + + // Build The Font + BuildFont(); + + // Enable Default Light (Quick And Dirty) + glEnable(GL_LIGHT0); + + // Enable Lighting + glEnable(GL_LIGHTING); + + // Enable Coloring Of Material + glEnable(GL_COLOR_MATERIAL); +} + +// Handles Window Resizing +GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height) +{ + // Is Window Too Small (Divide By Zero Error) + if (Height == 0) + { + // If So Make It One Pixel Tall + Height = 1; + } + + // Reset The Current Viewport And Perspective Transformation + glViewport(0, 0, Width, Height); + + // Select The Projection Matrix + glMatrixMode(GL_PROJECTION); + + // Reset The Projection Matrix + glLoadIdentity(); + + // Calculate The Aspect Ratio Of The Window + gluPerspective(45.0f, (GLfloat)Width / (GLfloat)Height, 0.1f, 100.0f); + + // Select The Modelview Matrix + glMatrixMode(GL_MODELVIEW); +} + +// Handles Rendering +GLvoid DrawGLScene(GLvoid) +{ + // Clear The Screen And The Depth Buffer + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + // Reset The View + glLoadIdentity(); + + // Move One Unit Into The Screen + glTranslatef(0.0f, 0.0f, -10.0f); + + // Rotate On The X Axis + glRotatef(rot, 1.0f, 0.0f, 0.0f); + + // Rotate On The Y Axis + glRotatef(rot * 1.2f, 0.0f, 1.0f, 0.0f); + + // Rotate On The Z Axis + glRotatef(rot * 1.4f, 0.0f, 0.0f, 1.0f); + + // Move to the Left and Down before drawing + glTranslatef(-3.5f, 0.0f, 0.0f); + + // Pulsing Colors Based On The Rotation + glColor3f((1.0f * (cos(rot / 20.0f))), + (1.0f * (sin(rot / 25.0f))), + (1.0f - 0.5f * (cos(rot / 17.0f)))); + + // Print GL Text To The Screen + glPrint(m_Text); + + // Make The Text Blue + glColor3f(0.0f, 0.0f, 1.0f); + + // Increase The Rotation Variable + rot += 0.1f; +} + +LRESULT CALLBACK +WndProc(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + RECT Screen; // Used Later On To Get The Size Of The Window + GLuint PixelFormat; // Pixel Format Storage + static PIXELFORMATDESCRIPTOR pfd= // Pixel Format Descriptor + { + sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor + 1, // Version Number (?) + PFD_DRAW_TO_WINDOW | // Format Must Support Window + PFD_SUPPORT_OPENGL | // Format Must Support OpenGL + PFD_DOUBLEBUFFER, // Must Support Double Buffering + PFD_TYPE_RGBA, // Request An RGBA Format + 16, // Select A 16Bit Color Depth + 0, 0, 0, 0, 0, 0, // Color Bits Ignored (?) + 0, // No Alpha Buffer + 0, // Shift Bit Ignored (?) + 0, // No Accumulation Buffer + 0, 0, 0, 0, // Accumulation Bits Ignored (?) + 16, // 16Bit Z-Buffer (Depth Buffer) + 0, // No Stencil Buffer + 0, // No Auxiliary Buffer (?) + PFD_MAIN_PLANE, // Main Drawing Layer + 0, // Reserved (?) + 0, 0, 0 // Layer Masks Ignored (?) + }; + + switch (message) + { + case WM_CREATE: + // Gets A Device Context For The Window + hDC = GetDC(hWnd); + + // Finds The Closest Match To The Pixel Format We Set Above + PixelFormat = ChoosePixelFormat(hDC, &pfd); + + // No Matching Pixel Format? + if (!PixelFormat) + { + MessageBox(0, _TEXT("Can't Find A Suitable PixelFormat."), _TEXT("Error"),MB_OK | MB_ICONERROR); + + // This Sends A 'Message' Telling The Program To Quit + PostQuitMessage(0); + break; + } + + // Can We Set The Pixel Mode? + if (!SetPixelFormat(hDC, PixelFormat, &pfd)) + { + MessageBox(0, _TEXT("Can't Set The PixelFormat."), _TEXT("Error"), MB_OK | MB_ICONERROR); + + // This Sends A 'Message' Telling The Program To Quit + PostQuitMessage(0); + break; + } + + // Grab A Rendering Context + hRC = wglCreateContext(hDC); + + // Did We Get One? + if (!hRC) + { + MessageBox(0, _TEXT("Can't Create A GL Rendering Context."), _TEXT("Error"), MB_OK | MB_ICONERROR); + + // This Sends A 'Message' Telling The Program To Quit + PostQuitMessage(0); + break; + } + + // Can We Make The RC Active? + if (!wglMakeCurrent(hDC, hRC)) + { + MessageBox(0, _TEXT("Can't Activate GLRC."), _TEXT("Error"), MB_OK | MB_ICONERROR); + + // This Sends A 'Message' Telling The Program To Quit + PostQuitMessage(0); + break; + } + + // Grab Screen Info For The Current Window + GetClientRect(hWnd, &Screen); + + // Initialize The GL Screen Using Screen Info + InitGL(Screen.right, Screen.bottom); + break; + + case WM_DESTROY: + case WM_CLOSE: + // Disable Fullscreen Mode + ChangeDisplaySettings(NULL, 0); + + // Deletes The Font Display List + KillFont(); + + // Make The DC Current + wglMakeCurrent(hDC, NULL); + + // Kill The RC + wglDeleteContext(hRC); + + // Free The DC + ReleaseDC(hWnd, hDC); + + // Quit The Program + PostQuitMessage(0); + break; + + case WM_PAINT: + DrawGLScene(); + SwapBuffers(hDC); + break; + + case WM_NOTIFY: + case WM_SYSKEYDOWN: + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; + + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + // If we've got a parent then we must be a preview + if (GetParent(hWnd) != 0) + return 0; + + if (fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if (abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hWnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + return 0; + + case WM_SIZE: // Resizing The Screen + // Resize To The New Window Size + ReSizeGLScene(LOWORD(lParam), HIWORD(lParam)); + break; + + default: + // Pass Windows Messages + return DefWindowProc(hWnd, message, wParam, lParam); + } + + return 0; +} + +VOID InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ShowCursor(FALSE); + fullscreen = TRUE; + } } // -// Look for any options Windows has passed to us: +// Look for any options Windows has passed to us: // -// -a <hwnd> (set password) -// -s (screensave) -// -p <hwnd> (preview) -// -c <hwnd> (configure) +// -a <hwnd> (set password) +// -s (screensave) +// -p <hwnd> (preview) +// -c <hwnd> (configure) // VOID ParseCommandLine(LPTSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) { - TCHAR ch = *szCmdLine++; - - if(ch == _T('-') || ch == _T('/')) - ch = *szCmdLine++; - - if(ch >= _T('A') && ch <= _T('Z')) - ch += _T('a') - _T('A'); //convert to lower case - - *chOption = ch; - ch = *szCmdLine++; - - if(ch == _T(':')) - ch = *szCmdLine++; - - while(ch == _T(' ') || ch == _T('\t')) - ch = *szCmdLine++; - - if(isdigit(ch)) - { - unsigned int i = _ttoi(szCmdLine - 1); - *hwndParent = (HWND)i; - } - else - *hwndParent = NULL; -} + TCHAR ch = *szCmdLine++; + + if (ch == _T('-') || ch == _T('/')) + ch = *szCmdLine++; + + //convert to lower case + if (ch >= _T('A') && ch <= _T('Z')) + ch += _T('a') - _T('A'); + + *chOption = ch; + ch = *szCmdLine++; + + if (ch == _T(':')) + ch = *szCmdLine++; + + while (ch == _T(' ') || ch == _T('\t')) + ch = *szCmdLine++; + + if (_istdigit(ch)) + { + unsigned int i = _ttoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + { + *hwndParent = NULL; + } +} + // -// Dialogbox procedure for Configuration window +// Dialogbox procedure for Configuration window // BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) - { + switch (uMsg) + { case WM_INITDIALOG: - SetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text); - return TRUE; + SetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text); + return TRUE; + case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: - GetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text, MAX_PATH); - SaveSettings(); + GetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text, MAX_PATH); + SaveSettings(); EndDialog(hwnd, IDOK); - break; + break; + case IDCANCEL: EndDialog(hwnd, IDCANCEL); - break; + break; } - return FALSE; - case WM_CLOSE: - EndDialog(hwnd, 0); - break; + return FALSE; + + case WM_CLOSE: + EndDialog(hwnd, 0); + break; + default: return FALSE; - } - - return TRUE; -} - -void Configure(void) -{ - DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); -} - -int CALLBACK _tWinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPTSTR lpCmdLine, - int iCmdShow) -{ - HWND hwndParent = 0; - UCHAR chOption; - MSG Message; - - hInstance = hInst; - - ParseCommandLine(lpCmdLine, &chOption, &hwndParent); - - LoadSettings(); - - switch(chOption) - { - case 's': - InitSaver(0); - break; - - case 'p': - InitSaver(hwndParent); - break; - - case 'c': - default: - Configure(); - return 0; - } - - while (GetMessage(&Message, 0, 0, 0)) - DispatchMessage(&Message); - - return Message.wParam; -} - + } + + return TRUE; +} + +VOID Configure(VOID) +{ + DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); +} + +INT CALLBACK +_tWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPTSTR lpCmdLine, + INT iCmdShow) +{ + HWND hwndParent = 0; + UCHAR chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + LoadSettings(); + + switch (chOption) + { + case _T('s'): + InitSaver(0); + break; + + case _T('p'): + InitSaver(hwndParent); + break; + + case _T('c'): + default: + Configure(); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + return Message.wParam; +} +

1 0

[akorotaev] 31541: Make cache_manager_rewrite compilable again (but not linkable yet): - Use ULONG_PTR for arithmetics - Use aspace.c, verifier and virtual.c from trunk (they have just slight difference from branched ones) - Cast Interlocked* functions to avoid warnings - Fix DPRINTs trying to show non-existent variables
by akorotaev＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: akorotaev Date: Wed Jan 2 00:25:47 2008 New Revision: 31541 URL: http://svn.reactos.org/svn/reactos?rev=31541&view=rev Log: Make cache_manager_rewrite compilable again (but not linkable yet): - Use ULONG_PTR for arithmetics - Use aspace.c, verifier and virtual.c from trunk (they have just slight difference from branched ones) - Cast Interlocked* functions to avoid warnings - Fix DPRINTs trying to show non-existent variables Modified: branches/cache_manager_rewrite/cc/cacheman.c branches/cache_manager_rewrite/cc/mdl.c branches/cache_manager_rewrite/cc/pin.c branches/cache_manager_rewrite/mm/anonmem.c branches/cache_manager_rewrite/mm/aspace.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/pagefile.c branches/cache_manager_rewrite/mm/pageop.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/section.c branches/cache_manager_rewrite/mm/verifier.c branches/cache_manager_rewrite/mm/virtual.c Modified: branches/cache_manager_rewrite/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/cachem… ============================================================================== --- branches/cache_manager_rewrite/cc/cacheman.c (original) +++ branches/cache_manager_rewrite/cc/cacheman.c Wed Jan 2 00:25:47 2008 @@ -16,10 +16,11 @@ /* FUNCTIONS *****************************************************************/ -VOID NTAPI +BOOLEAN NTAPI CcInitializeCacheManager (VOID) { CcInitView (); + return TRUE; } /* Modified: branches/cache_manager_rewrite/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/mdl.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/mdl.c (original) +++ branches/cache_manager_rewrite/cc/mdl.c Wed Jan 2 00:25:47 2008 @@ -122,13 +122,16 @@ } /* Use slow path */ - CcMdlWriteCompleteDev (FileOffset, MdlChain, FileObject); + CcMdlWriteCompleteDev (FileObject, FileOffset, MdlChain); } -VOID STDCALL -CcMdlWriteCompleteDev (IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PFILE_OBJECT FileObject) +/* + * @unimplemented + */ +VOID NTAPI +CcMdlWriteCompleteDev (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { UNIMPLEMENTED; } Modified: branches/cache_manager_rewrite/cc/pin.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/pin.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/pin.c (original) +++ branches/cache_manager_rewrite/cc/pin.c Wed Jan 2 00:25:47 2008 @@ -45,8 +45,8 @@ PLIST_ENTRY entry; PCACHE_VIEW current = NULL; - DPRINT ("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Wait %d," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, piBcb, pBuffer); + DPRINT ("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, piBcb, pBuffer); ASSERT (FileObject); ASSERT (FileObject->SectionObjectPointer); Modified: branches/cache_manager_rewrite/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/anonme… ============================================================================== --- branches/cache_manager_rewrite/mm/anonmem.c (original) +++ branches/cache_manager_rewrite/mm/anonmem.c Wed Jan 2 00:25:47 2008 @@ -628,7 +628,7 @@ BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP(PBaseAddress + PRegionSize) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); /* @@ -899,7 +899,7 @@ *PRegionSize,FreeType); BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); - RegionSize = PAGE_ROUND_UP((*PBaseAddress) + (*PRegionSize)) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(*PBaseAddress) + (*PRegionSize)) - PAGE_ROUND_DOWN((*PBaseAddress)); Status = ObReferenceObjectByHandle(ProcessHandle, Modified: branches/cache_manager_rewrite/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/aspace… ============================================================================== --- branches/cache_manager_rewrite/mm/aspace.c (original) +++ branches/cache_manager_rewrite/mm/aspace.c Wed Jan 2 00:25:47 2008 @@ -21,7 +21,7 @@ /* GLOBALS ******************************************************************/ static MADDRESS_SPACE KernelAddressSpace; -FAST_MUTEX KernelAddressSpaceLock; +EX_PUSH_LOCK KernelAddressSpaceLock; /* FUNCTIONS *****************************************************************/ @@ -29,21 +29,13 @@ NTAPI MmLockAddressSpace(PMADDRESS_SPACE AddressSpace) { - /* - * Don't bother with locking if we are the first thread. - */ - if (KeGetCurrentThread() == NULL) - { - return; - } - if (AddressSpace->Process) { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&AddressSpace->Process->AddressCreationLock); + ExAcquirePushLockExclusive((PEX_PUSH_LOCK)&AddressSpace->Process->AddressCreationLock); } else { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&KernelAddressSpaceLock); + ExAcquirePushLockExclusive(&KernelAddressSpaceLock); } } @@ -51,20 +43,13 @@ NTAPI MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace) { - /* - * Don't bother locking if we are the first thread. - */ - if (KeGetCurrentThread() == NULL) - { - return; - } if (AddressSpace->Process) { - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&AddressSpace->Process->AddressCreationLock); + ExReleasePushLock((PEX_PUSH_LOCK)&AddressSpace->Process->AddressCreationLock); } else { - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&KernelAddressSpaceLock); + ExReleasePushLock(&KernelAddressSpaceLock); } } @@ -98,11 +83,11 @@ AddressSpace->MemoryAreaRoot = NULL; if (Process) { - ExInitializeFastMutex(&Process->AddressCreationLock); + ExInitializePushLock((PULONG_PTR)&Process->AddressCreationLock); } else { - ExInitializeFastMutex(&KernelAddressSpaceLock); + ExInitializePushLock((PULONG_PTR)&KernelAddressSpaceLock); } if (Process != NULL) { Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Wed Jan 2 00:25:47 2008 @@ -113,7 +113,7 @@ */ MiInitPageDirectoryMap(); - BaseAddress = (PVOID)KPCR_BASE; + BaseAddress = (PVOID)KIP0PCRADDRESS; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Modified: branches/cache_manager_rewrite/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pagefi… ============================================================================== --- branches/cache_manager_rewrite/mm/pagefile.c (original) +++ branches/cache_manager_rewrite/mm/pagefile.c Wed Jan 2 00:25:47 2008 @@ -35,6 +35,11 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName); + /* TYPES *********************************************************************/ @@ -740,16 +745,14 @@ } /* Load the diskdump driver. */ - ModuleObject = LdrGetModuleObject(&DiskDumpName); + Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); if (ModuleObject == NULL) { return(STATUS_OBJECT_NAME_NOT_FOUND); } RtlInitAnsiString(&ProcName, "DiskDumpFunctions"); - Status = LdrGetProcedureAddress(ModuleObject->DllBase, - &ProcName, - 0, - (PVOID*)&MmCoreDumpFunctions); + MmCoreDumpFunctions = MiFindExportedRoutineByName(ModuleObject->DllBase, + &ProcName); if (!NT_SUCCESS(Status)) { ObDereferenceObject(PageFile); Modified: branches/cache_manager_rewrite/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pageop… ============================================================================== --- branches/cache_manager_rewrite/mm/pageop.c (original) +++ branches/cache_manager_rewrite/mm/pageop.c Wed Jan 2 00:25:47 2008 @@ -48,7 +48,7 @@ } if (PageOp->MArea) { - InterlockedDecrementUL(&PageOp->MArea->PageOpCount); + (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); } PrevPageOp = MmPageOpHashTable[PageOp->Hash]; if (PrevPageOp == PageOp) @@ -258,7 +258,7 @@ MmPageOpHashTable[Hash] = PageOp; if (MArea) { - InterlockedIncrementUL(&MArea->PageOpCount); + (void)InterlockedIncrementUL(&MArea->PageOpCount); } KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Wed Jan 2 00:25:47 2008 @@ -528,7 +528,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } return; } Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Wed Jan 2 00:25:47 2008 @@ -1058,7 +1058,7 @@ &MemoryArea->Data.SectionData.RegionListHead, Address, &RegionBase); - DPRINT("SegmentOffset %x, SectionOffset %x, Address %x, StartingAddress %x\n", SegmentOffset, SectionOffset, Address, MemoryArea->StartingAddress); + DPRINT("SegmentOffset %x, Address %x, StartingAddress %x\n", SegmentOffset, Address, MemoryArea->StartingAddress); /* * Lock the segment */ @@ -1436,7 +1436,7 @@ PageOp[i]->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp[i]); } - DPRINT("%x %x %x %x Address 0x%.8X\n", *(PULONG)Address, Region->Protect, Attributes, MemoryArea->StartingAddress + SegmentOffset, Address); + DPRINT("%x %x %x %x Address 0x%.8X\n", *(PULONG)Address, Region->Protect, Attributes, (ULONG_PTR)MemoryArea->StartingAddress + SegmentOffset, Address); return(STATUS_SUCCESS); } else if (IS_SWAP_FROM_SSE(Entry)) Modified: branches/cache_manager_rewrite/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/verifi… ============================================================================== --- branches/cache_manager_rewrite/mm/verifier.c (original) +++ branches/cache_manager_rewrite/mm/verifier.c Wed Jan 2 00:25:47 2008 @@ -19,7 +19,7 @@ KMUTANT MmSystemLoadLock; ULONG MiActiveVerifierThunks; -extern LIST_ENTRY ModuleListHead; +extern LIST_ENTRY PsLoadedModuleList; /* PRIVATE FUNCTIONS *********************************************************/ @@ -32,8 +32,8 @@ PAGED_CODE(); /* Loop entries */ - NextEntry = ModuleListHead.Flink; - do + NextEntry = PsLoadedModuleList.Flink; + do { /* Get the loader entry */ LdrEntry = CONTAINING_RECORD(NextEntry, @@ -51,7 +51,7 @@ /* Move on */ NextEntry = NextEntry->Flink; - } while(NextEntry != &ModuleListHead); + } while(NextEntry != &PsLoadedModuleList); /* Return the entry */ return FoundEntry; @@ -164,7 +164,7 @@ if (!LdrEntry) return FALSE; /* Check if we're verifying or not */ - return (LdrEntry->Flags & LDRP_DRIVER_VERIFYING) ? TRUE: FALSE; + return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; } /* Modified: branches/cache_manager_rewrite/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/virtua… ============================================================================== --- branches/cache_manager_rewrite/mm/virtual.c (original) +++ branches/cache_manager_rewrite/mm/virtual.c Wed Jan 2 00:25:47 2008 @@ -19,9 +19,9 @@ NTSTATUS STDCALL NtFlushVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush, - OUT PULONG NumberOfBytesFlushed OPTIONAL) + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToFlush, + OUT PIO_STATUS_BLOCK IoStatusBlock) /* * FUNCTION: Flushes virtual memory to file * ARGUMENTS: @@ -33,241 +33,248 @@ * RETURNS: Status */ { - /* This should be implemented once we support network filesystems */ - DPRINT("NtFlushVirtualMemory is UNIMPLEMENTED\n"); - return(STATUS_SUCCESS); + /* This should be implemented once we support network filesystems */ + DPRINT("NtFlushVirtualMemory is UNIMPLEMENTED\n"); + return(STATUS_SUCCESS); } NTSTATUS STDCALL MiLockVirtualMemory(HANDLE ProcessHandle, - PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked, - PObReferenceObjectByHandle pObReferenceObjectByHandle, - PMmCreateMdl pMmCreateMdl, - PObDereferenceObject pObDereferenceObject, - PMmProbeAndLockPages pMmProbeAndLockPages, - PExFreePool pExFreePool) -{ - PEPROCESS Process; - NTSTATUS Status; - PMDL Mdl; - - Status = pObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - return(Status); - - Mdl = pMmCreateMdl(NULL, - BaseAddress, - NumberOfBytesToLock); - if (Mdl == NULL) - { - pObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - - pMmProbeAndLockPages(Mdl, - UserMode, - IoWriteAccess); - - pExFreePool(Mdl); - - pObDereferenceObject(Process); - - *NumberOfBytesLocked = NumberOfBytesToLock; - return(STATUS_SUCCESS); + PVOID BaseAddress, + ULONG NumberOfBytesToLock, + PULONG NumberOfBytesLocked, + PObReferenceObjectByHandle pObReferenceObjectByHandle, + PMmCreateMdl pMmCreateMdl, + PObDereferenceObject pObDereferenceObject, + PMmProbeAndLockPages pMmProbeAndLockPages, + PExFreePool pExFreePool) +{ + PEPROCESS Process; + NTSTATUS Status; + PMDL Mdl; + + Status = pObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + return(Status); + + Mdl = pMmCreateMdl(NULL, + BaseAddress, + NumberOfBytesToLock); + if (Mdl == NULL) + { + pObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + pMmProbeAndLockPages(Mdl, + UserMode, + IoWriteAccess); + + pExFreePool(Mdl); + + pObDereferenceObject(Process); + + *NumberOfBytesLocked = NumberOfBytesToLock; + return(STATUS_SUCCESS); } NTSTATUS STDCALL NtLockVirtualMemory(HANDLE ProcessHandle, - PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked) -{ - DPRINT("NtLockVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "NumberOfBytesToLock %d, NumberOfBytesLocked %x)\n", - ProcessHandle, - BaseAddress, - NumberOfBytesToLock, - NumberOfBytesLocked); - - return MiLockVirtualMemory(ProcessHandle, - BaseAddress, - NumberOfBytesToLock, - NumberOfBytesLocked, - ObReferenceObjectByHandle, - MmCreateMdl, - (PVOID)ObfDereferenceObject, - MmProbeAndLockPages, - ExFreePool); + PVOID BaseAddress, + ULONG NumberOfBytesToLock, + PULONG NumberOfBytesLocked) +{ + DPRINT("NtLockVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "NumberOfBytesToLock %d, NumberOfBytesLocked %x)\n", + ProcessHandle, + BaseAddress, + NumberOfBytesToLock, + NumberOfBytesLocked); + + return MiLockVirtualMemory(ProcessHandle, + BaseAddress, + NumberOfBytesToLock, + NumberOfBytesLocked, + ObReferenceObjectByHandle, + MmCreateMdl, + (PVOID)ObfDereferenceObject, + MmProbeAndLockPages, + ExFreePool); } NTSTATUS FASTCALL -MiQueryVirtualMemory (IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PEPROCESS Process; - MEMORY_AREA* MemoryArea; - PMADDRESS_SPACE AddressSpace; - - if (Address < MmSystemRangeStart) - { - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryVirtualMemory() = %x\n",Status); - return(Status); - } - AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; - } - else - { - AddressSpace = MmGetKernelAddressSpace(); - } - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - switch(VirtualMemoryInformationClass) - { - case MemoryBasicInformation: - { - PMEMORY_BASIC_INFORMATION Info = - (PMEMORY_BASIC_INFORMATION)VirtualMemoryInformation; +MiQueryVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID Address, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + OUT PVOID VirtualMemoryInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PEPROCESS Process; + MEMORY_AREA* MemoryArea; + PMADDRESS_SPACE AddressSpace; + + if (Address < MmSystemRangeStart) + { + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryVirtualMemory() = %x\n",Status); + return(Status); + } + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + } + else + { + AddressSpace = MmGetKernelAddressSpace(); + } + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); + switch(VirtualMemoryInformationClass) + { + case MemoryBasicInformation: + { + PMEMORY_BASIC_INFORMATION Info = + (PMEMORY_BASIC_INFORMATION)VirtualMemoryInformation; if (Length != sizeof(MEMORY_BASIC_INFORMATION)) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_INFO_LENGTH_MISMATCH); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + return(STATUS_INFO_LENGTH_MISMATCH); } if (MemoryArea == NULL) { - Info->Type = 0; - Info->State = MEM_FREE; - Info->Protect = PAGE_NOACCESS; - Info->AllocationProtect = 0; - Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - Info->AllocationBase = NULL; - Info->RegionSize = MmFindGapAtAddress(AddressSpace, Info->BaseAddress); - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - } + Info->Type = 0; + Info->State = MEM_FREE; + Info->Protect = PAGE_NOACCESS; + Info->AllocationProtect = 0; + Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); + Info->AllocationBase = NULL; + Info->RegionSize = MmFindGapAtAddress(AddressSpace, Info->BaseAddress); + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + } else - { - switch(MemoryArea->Type) - { - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - Status = MmQueryAnonMem(MemoryArea, Address, Info, - ResultLength); - break; - case MEMORY_AREA_SECTION_VIEW: - Status = MmQuerySectionView(MemoryArea, Address, Info, - ResultLength); - break; - case MEMORY_AREA_NO_ACCESS: - Info->Type = MEM_PRIVATE; - Info->State = MEM_RESERVE; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_SHARED_DATA: - Info->Type = MEM_PRIVATE; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_SYSTEM: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_KERNEL_STACK: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_PAGED_POOL: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - default: - DPRINT1("unhandled memory area type: 0x%x\n", MemoryArea->Type); - Status = STATUS_UNSUCCESSFUL; - *ResultLength = 0; - } - } + { + switch(MemoryArea->Type) + { + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + Status = MmQueryAnonMem(MemoryArea, Address, Info, + ResultLength); + break; + + case MEMORY_AREA_SECTION_VIEW: + Status = MmQuerySectionView(MemoryArea, Address, Info, + ResultLength); + break; + + case MEMORY_AREA_NO_ACCESS: + Info->Type = MEM_PRIVATE; + Info->State = MEM_RESERVE; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_SHARED_DATA: + Info->Type = MEM_PRIVATE; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_SYSTEM: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_KERNEL_STACK: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_PAGED_POOL: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + default: + DPRINT1("unhandled memory area type: 0x%x\n", MemoryArea->Type); + Status = STATUS_UNSUCCESSFUL; + *ResultLength = 0; + } + } break; - } - - default: - { + } + + default: + { Status = STATUS_INVALID_INFO_CLASS; *ResultLength = 0; break; - } - } - - MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ASSERT(Process); - ObDereferenceObject(Process); - } - - return Status; + } + } + + MmUnlockAddressSpace(AddressSpace); + if (Address < MmSystemRangeStart) + { + ASSERT(Process); + ObDereferenceObject(Process); + } + + return Status; } /* (tMk 2004.II.4) @@ -276,102 +283,102 @@ * */ NTSTATUS STDCALL -NtQueryVirtualMemory (IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG UnsafeResultLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - ULONG ResultLength = 0; - KPROCESSOR_MODE PreviousMode; - union - { - MEMORY_BASIC_INFORMATION BasicInfo; - } - VirtualMemoryInfo; - - DPRINT("NtQueryVirtualMemory(ProcessHandle %x, Address %x, " - "VirtualMemoryInformationClass %d, VirtualMemoryInformation %x, " - "Length %lu ResultLength %x)\n",ProcessHandle,Address, - VirtualMemoryInformationClass,VirtualMemoryInformation, - Length,ResultLength); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode && UnsafeResultLength != NULL) - { - _SEH_TRY - { - ProbeForWriteUlong(UnsafeResultLength); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - if (Address >= MmSystemRangeStart) - { - DPRINT1("Invalid parameter\n"); - return STATUS_INVALID_PARAMETER; - } - - Status = MiQueryVirtualMemory ( ProcessHandle, - Address, - VirtualMemoryInformationClass, - &VirtualMemoryInfo, - Length, - &ResultLength ); - - if (NT_SUCCESS(Status)) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - if (ResultLength > 0) +NtQueryVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID Address, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + OUT PVOID VirtualMemoryInformation, + IN ULONG Length, + OUT PULONG UnsafeResultLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG ResultLength = 0; + KPROCESSOR_MODE PreviousMode; + union + { + MEMORY_BASIC_INFORMATION BasicInfo; + } + VirtualMemoryInfo; + + DPRINT("NtQueryVirtualMemory(ProcessHandle %x, Address %x, " + "VirtualMemoryInformationClass %d, VirtualMemoryInformation %x, " + "Length %lu ResultLength %x)\n",ProcessHandle,Address, + VirtualMemoryInformationClass,VirtualMemoryInformation, + Length,ResultLength); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode && UnsafeResultLength != NULL) + { + _SEH_TRY + { + ProbeForWriteUlong(UnsafeResultLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + if (Address >= MmSystemRangeStart) + { + DPRINT1("Invalid parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + Status = MiQueryVirtualMemory(ProcessHandle, + Address, + VirtualMemoryInformationClass, + &VirtualMemoryInfo, + Length, + &ResultLength ); + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (ResultLength > 0) { - ProbeForWrite(VirtualMemoryInformation, - ResultLength, - 1); - RtlCopyMemory(VirtualMemoryInformation, - &VirtualMemoryInfo, - ResultLength); + ProbeForWrite(VirtualMemoryInformation, + ResultLength, + 1); + RtlCopyMemory(VirtualMemoryInformation, + &VirtualMemoryInfo, + ResultLength); } - if (UnsafeResultLength != NULL) + if (UnsafeResultLength != NULL) { - *UnsafeResultLength = ResultLength; + *UnsafeResultLength = ResultLength; } } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - if (ResultLength > 0) - { - RtlCopyMemory(VirtualMemoryInformation, - &VirtualMemoryInfo, - ResultLength); - } - - if (UnsafeResultLength != NULL) - { - *UnsafeResultLength = ResultLength; - } - } - } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + if (ResultLength > 0) + { + RtlCopyMemory(VirtualMemoryInformation, + &VirtualMemoryInfo, + ResultLength); + } + + if (UnsafeResultLength != NULL) + { + *UnsafeResultLength = ResultLength; + } + } + } return(Status); } @@ -384,51 +391,51 @@ IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection OPTIONAL) { - PMEMORY_AREA MemoryArea; - PMADDRESS_SPACE AddressSpace; - ULONG OldAccessProtection_; - NTSTATUS Status; - - *NumberOfBytesToProtect = - PAGE_ROUND_UP((*BaseAddress) + (*NumberOfBytesToProtect)) - - PAGE_ROUND_DOWN(*BaseAddress); - *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - - AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); - if (MemoryArea == NULL) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_UNSUCCESSFUL; - } - - if (OldAccessProtection == NULL) - OldAccessProtection = &OldAccessProtection_; - - if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) - { - Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); - } - else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); - } - else - { - /* FIXME: Should we return failure or success in this case? */ - Status = STATUS_CONFLICTING_ADDRESSES; - } - - MmUnlockAddressSpace(AddressSpace); - - return Status; + PMEMORY_AREA MemoryArea; + PMADDRESS_SPACE AddressSpace; + ULONG OldAccessProtection_; + NTSTATUS Status; + + *NumberOfBytesToProtect = + PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - + PAGE_ROUND_DOWN(*BaseAddress); + *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); + + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; + + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); + if (MemoryArea == NULL) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_UNSUCCESSFUL; + } + + if (OldAccessProtection == NULL) + OldAccessProtection = &OldAccessProtection_; + + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) + { + Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); + } + else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); + } + else + { + /* FIXME: Should we return failure or success in this case? */ + Status = STATUS_CONFLICTING_ADDRESSES; + } + + MmUnlockAddressSpace(AddressSpace); + + return Status; } @@ -444,100 +451,100 @@ IN ULONG NewAccessProtection, OUT PULONG UnsafeOldAccessProtection) { - PEPROCESS Process; - ULONG OldAccessProtection; - PVOID BaseAddress = NULL; - ULONG NumberOfBytesToProtect = 0; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWritePointer(UnsafeBaseAddress); - ProbeForWriteUlong(UnsafeNumberOfBytesToProtect); - ProbeForWriteUlong(UnsafeOldAccessProtection); - - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 >= MmUserProbeAddress) - { - /* Don't allow to change the protection of a kernel mode address */ - return STATUS_INVALID_PARAMETER_2; - } - - /* (tMk 2004.II.5) in Microsoft SDK I read: - * 'if this parameter is NULL or does not point to a valid variable, the function fails' - */ - if(UnsafeOldAccessProtection == NULL) - { - return(STATUS_INVALID_PARAMETER); - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtProtectVirtualMemory() = %x\n",Status); - return(Status); - } - - Status = MiProtectVirtualMemory(Process, - &BaseAddress, - &NumberOfBytesToProtect, - NewAccessProtection, - &OldAccessProtection); - - ObDereferenceObject(Process); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - - return(Status); + PEPROCESS Process; + ULONG OldAccessProtection; + PVOID BaseAddress = NULL; + ULONG NumberOfBytesToProtect = 0; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWritePointer(UnsafeBaseAddress); + ProbeForWriteUlong(UnsafeNumberOfBytesToProtect); + ProbeForWriteUlong(UnsafeOldAccessProtection); + + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 >= MmUserProbeAddress) + { + /* Don't allow to change the protection of a kernel mode address */ + return STATUS_INVALID_PARAMETER_2; + } + + /* (tMk 2004.II.5) in Microsoft SDK I read: + * 'if this parameter is NULL or does not point to a valid variable, the function fails' + */ + if(UnsafeOldAccessProtection == NULL) + { + return(STATUS_INVALID_PARAMETER); + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtProtectVirtualMemory() = %x\n",Status); + return(Status); + } + + Status = MiProtectVirtualMemory(Process, + &BaseAddress, + &NumberOfBytesToProtect, + NewAccessProtection, + &OldAccessProtection); + + ObDereferenceObject(Process); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + + return(Status); } @@ -554,150 +561,153 @@ IN ULONG NumberOfBytesToRead, OUT PULONG NumberOfBytesRead OPTIONAL) { - PMDL Mdl; - PVOID SystemAddress; - KPROCESSOR_MODE PreviousMode; - PEPROCESS Process, CurrentProcess; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("NtReadVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "Buffer %x, NumberOfBytesToRead %d)\n",ProcessHandle,BaseAddress, - Buffer,NumberOfBytesToRead); - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 >= MmUserProbeAddress) - { - /* Don't allow to read from kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - if ((ULONG_PTR)Buffer + NumberOfBytesToRead - 1 < (ULONG_PTR)Buffer || - (ULONG_PTR)Buffer + NumberOfBytesToRead - 1 >= MmUserProbeAddress) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_READ, - NULL, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - CurrentProcess = PsGetCurrentProcess(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - if(NumberOfBytesRead != NULL) - { - ProbeForWriteUlong(NumberOfBytesRead); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - - if (Process == CurrentProcess) - { - _SEH_TRY - { - RtlCopyMemory(Buffer, BaseAddress, NumberOfBytesToRead); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - Mdl = MmCreateMdl(NULL, - Buffer, - NumberOfBytesToRead); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - _SEH_TRY - { - MmProbeAndLockPages(Mdl, - PreviousMode, - IoWriteAccess); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - KeAttachProcess(&Process->Pcb); - - SystemAddress = MmGetSystemAddressForMdl(Mdl); - - Status = STATUS_SUCCESS; - _SEH_TRY { - Status = STATUS_PARTIAL_COPY; - RtlCopyMemory(SystemAddress, BaseAddress, NumberOfBytesToRead); - Status = STATUS_SUCCESS; - } _SEH_HANDLE { - if(Status != STATUS_PARTIAL_COPY) - Status = _SEH_GetExceptionCode(); - } _SEH_END; - - KeDetachProcess(); - - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - } - ExFreePool(Mdl); - } - - ObDereferenceObject(Process); - - if((NT_SUCCESS(Status) || Status == STATUS_PARTIAL_COPY) && - NumberOfBytesRead != NULL) - { - _SEH_TRY - { - *NumberOfBytesRead = NumberOfBytesToRead; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return(Status); + PMDL Mdl; + PVOID SystemAddress; + KPROCESSOR_MODE PreviousMode; + PEPROCESS Process, CurrentProcess; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + DPRINT("NtReadVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "Buffer %x, NumberOfBytesToRead %d)\n",ProcessHandle,BaseAddress, + Buffer,NumberOfBytesToRead); + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 >= MmUserProbeAddress) + { + /* Don't allow to read from kernel space */ + return STATUS_ACCESS_VIOLATION; + } + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + if ((ULONG_PTR)Buffer + NumberOfBytesToRead - 1 < (ULONG_PTR)Buffer || + (ULONG_PTR)Buffer + NumberOfBytesToRead - 1 >= MmUserProbeAddress) + { + /* Don't allow to write into kernel space */ + return STATUS_ACCESS_VIOLATION; + } + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_READ, + NULL, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + CurrentProcess = PsGetCurrentProcess(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + if(NumberOfBytesRead != NULL) + { + ProbeForWriteUlong(NumberOfBytesRead); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + + if (Process == CurrentProcess) + { + _SEH_TRY + { + RtlCopyMemory(Buffer, BaseAddress, NumberOfBytesToRead); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + Mdl = MmCreateMdl(NULL, + Buffer, + NumberOfBytesToRead); + if(Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + _SEH_TRY + { + MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + KeAttachProcess(&Process->Pcb); + + SystemAddress = MmGetSystemAddressForMdl(Mdl); + + Status = STATUS_SUCCESS; + _SEH_TRY + { + Status = STATUS_PARTIAL_COPY; + RtlCopyMemory(SystemAddress, BaseAddress, NumberOfBytesToRead); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + if(Status != STATUS_PARTIAL_COPY) + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + KeDetachProcess(); + + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + } + ExFreePool(Mdl); + } + + ObDereferenceObject(Process); + + if ((NT_SUCCESS(Status) || Status == STATUS_PARTIAL_COPY) && + NumberOfBytesRead != NULL) + { + _SEH_TRY + { + *NumberOfBytesRead = NumberOfBytesToRead; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return(Status); } /* (tMk 2004.II.05) @@ -710,49 +720,49 @@ ULONG NumberOfBytesToUnlock, PULONG NumberOfBytesUnlocked OPTIONAL) { - // AG [08-20-03] : I have *no* idea if this is correct, I just used the - // other functions as a template and made a few intelligent guesses... - - NTSTATUS Status; - PMDL Mdl; - PEPROCESS Process; - - DPRINT("NtUnlockVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "NumberOfBytesToUnlock %d), NumberOfBytesUnlocked %x\n",ProcessHandle,BaseAddress, - NumberOfBytesToUnlock, NumberOfBytesUnlocked); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Mdl = MmCreateMdl(NULL, - BaseAddress, - NumberOfBytesToUnlock); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - - ObDereferenceObject(Process); - - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - ExFreePool(Mdl); - - *NumberOfBytesUnlocked = NumberOfBytesToUnlock; - - return(STATUS_SUCCESS); + // AG [08-20-03] : I have *no* idea if this is correct, I just used the + // other functions as a template and made a few intelligent guesses... + + NTSTATUS Status; + PMDL Mdl; + PEPROCESS Process; + + DPRINT("NtUnlockVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "NumberOfBytesToUnlock %d), NumberOfBytesUnlocked %x\n",ProcessHandle,BaseAddress, + NumberOfBytesToUnlock, NumberOfBytesUnlocked); + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + Mdl = MmCreateMdl(NULL, + BaseAddress, + NumberOfBytesToUnlock); + if(Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + ObDereferenceObject(Process); + + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + ExFreePool(Mdl); + + *NumberOfBytesUnlocked = NumberOfBytesToUnlock; + + return(STATUS_SUCCESS); } @@ -769,166 +779,164 @@ IN ULONG NumberOfBytesToWrite, OUT PULONG NumberOfBytesWritten OPTIONAL) { - PMDL Mdl; - PVOID SystemAddress; - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - NTSTATUS CopyStatus, Status = STATUS_SUCCESS; - - DPRINT("NtWriteVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "Buffer %x, NumberOfBytesToWrite %d)\n",ProcessHandle,BaseAddress, - Buffer,NumberOfBytesToWrite); - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - if ((ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 < (ULONG_PTR)Buffer || - (ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) - { - /* Don't allow to read from kernel space */ - return STATUS_ACCESS_VIOLATION; - } - if (NumberOfBytesWritten != NULL) - { - _SEH_TRY - { - ProbeForWriteUlong(NumberOfBytesWritten); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - CopyStatus = STATUS_SUCCESS; - - /* Write memory */ - if (Process == PsGetCurrentProcess()) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); - } - _SEH_HANDLE - { - CopyStatus = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); - } - } - else - { - /* Create MDL describing the source buffer. */ - Mdl = MmCreateMdl(NULL, - Buffer, - NumberOfBytesToWrite); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - _SEH_TRY - { - /* Map the MDL. */ - MmProbeAndLockPages(Mdl, - UserMode, - IoReadAccess); - } - _SEH_HANDLE - { - CopyStatus = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (NT_SUCCESS(CopyStatus)) - { - /* Copy memory from the mapped MDL into the target buffer. */ - KeAttachProcess(&Process->Pcb); - - SystemAddress = MmGetSystemAddressForMdl(Mdl); - if (PreviousMode != KernelMode) - { - _SEH_TRY + PMDL Mdl; + PVOID SystemAddress; + PEPROCESS Process; + KPROCESSOR_MODE PreviousMode; + NTSTATUS CopyStatus, Status = STATUS_SUCCESS; + + DPRINT("NtWriteVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "Buffer %x, NumberOfBytesToWrite %d)\n",ProcessHandle,BaseAddress, + Buffer,NumberOfBytesToWrite); + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) + { + /* Don't allow to write into kernel space */ + return STATUS_ACCESS_VIOLATION; + } + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + if ((ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 < (ULONG_PTR)Buffer || + (ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) + { + /* Don't allow to read from kernel space */ + return STATUS_ACCESS_VIOLATION; + } + if (NumberOfBytesWritten != NULL) + { + _SEH_TRY + { + ProbeForWriteUlong(NumberOfBytesWritten); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + CopyStatus = STATUS_SUCCESS; + + /* Write memory */ + if (Process == PsGetCurrentProcess()) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); + } + _SEH_HANDLE + { + CopyStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); + } + } + else + { + /* Create MDL describing the source buffer. */ + Mdl = MmCreateMdl(NULL, + Buffer, + NumberOfBytesToWrite); + if (Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + _SEH_TRY + { + /* Map the MDL. */ + MmProbeAndLockPages(Mdl, UserMode, IoReadAccess); + } + _SEH_HANDLE + { + CopyStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (NT_SUCCESS(CopyStatus)) + { + /* Copy memory from the mapped MDL into the target buffer. */ + KeAttachProcess(&Process->Pcb); + + SystemAddress = MmGetSystemAddressForMdl(Mdl); + if (PreviousMode != KernelMode) + { + _SEH_TRY { - memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); + memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); } - _SEH_HANDLE + _SEH_HANDLE { - CopyStatus = _SEH_GetExceptionCode(); + CopyStatus = _SEH_GetExceptionCode(); } - _SEH_END; - } - else - { - memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); - } - - KeDetachProcess(); - } - - /* Free the MDL. */ - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - ExFreePool(Mdl); - } - ObDereferenceObject(Process); - - if (NT_SUCCESS(CopyStatus) && NumberOfBytesWritten != NULL) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - *NumberOfBytesWritten = NumberOfBytesToWrite; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - *NumberOfBytesWritten = NumberOfBytesToWrite; - } - } - - return(NT_SUCCESS(CopyStatus) ? Status : CopyStatus); + _SEH_END; + } + else + { + memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); + } + + KeDetachProcess(); + } + + /* Free the MDL. */ + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + ExFreePool(Mdl); + } + ObDereferenceObject(Process); + + if (NT_SUCCESS(CopyStatus) && NumberOfBytesWritten != NULL) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + *NumberOfBytesWritten = NumberOfBytesToWrite; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + *NumberOfBytesWritten = NumberOfBytesToWrite; + } + } + + return(NT_SUCCESS(CopyStatus) ? Status : CopyStatus); } /* @@ -937,12 +945,12 @@ PVOID STDCALL -MmGetVirtualForPhysical ( +MmGetVirtualForPhysical( IN PHYSICAL_ADDRESS PhysicalAddress ) { - UNIMPLEMENTED; - return 0; + UNIMPLEMENTED; + return 0; } /* FUNCTION: @@ -950,19 +958,19 @@ * @unimplemented */ PVOID STDCALL -MmSecureVirtualMemory (PVOID Address, - SIZE_T Length, - ULONG Mode) -{ - /* Only works for user space */ - if (MmHighestUserAddress < Address) - { - return NULL; - } - - UNIMPLEMENTED; - - return 0; +MmSecureVirtualMemory(PVOID Address, + SIZE_T Length, + ULONG Mode) +{ + /* Only works for user space */ + if (MmHighestUserAddress < Address) + { + return NULL; + } + + UNIMPLEMENTED; + + return 0; } @@ -973,12 +981,12 @@ VOID STDCALL MmUnsecureVirtualMemory(PVOID SecureMem) { - if (NULL == SecureMem) - { - return; - } - - UNIMPLEMENTED; + if (NULL == SecureMem) + { + return; + } + + UNIMPLEMENTED; } @@ -986,34 +994,34 @@ * @implemented */ VOID STDCALL -ProbeForRead (IN CONST VOID *Address, +ProbeForRead(IN CONST VOID *Address, + IN ULONG Length, + IN ULONG Alignment) +{ + if (Length != 0) + { + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + + if (((ULONG_PTR)Address & (Alignment - 1)) != 0) + { + ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); + } + else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || + (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) + { + ExRaiseStatus (STATUS_ACCESS_VIOLATION); + } + } +} + + +/* + * @implemented + */ +VOID STDCALL +ProbeForWrite(IN PVOID Address, IN ULONG Length, IN ULONG Alignment) -{ - if (Length != 0) - { - ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); - - if (((ULONG_PTR)Address & (Alignment - 1)) != 0) - { - ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); - } - else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) - { - ExRaiseStatus (STATUS_ACCESS_VIOLATION); - } - } -} - - -/* - * @implemented - */ -VOID STDCALL -ProbeForWrite (IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment) { volatile CHAR *Current; PCHAR Last;

1 0

[fireball] 31540: - Implement a helper registry key opening function to reduce code size. - http://www.tech-archive.net/Archive/Development/microsoft.public.development.device.drivers/2004-10/1623.html
by fireball＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: fireball Date: Wed Jan 2 00:01:28 2008 New Revision: 31540 URL: http://svn.reactos.org/svn/reactos?rev=31540&view=rev Log: - Implement a helper registry key opening function to reduce code size. - http://www.tech-archive.net/Archive/Development/microsoft.public.developmen… Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Wed Jan 2 00:01:28 2008 @@ -556,8 +556,14 @@ NTSTATUS IopInitializePnpServices( IN PDEVICE_NODE DeviceNode, - IN BOOLEAN BootDrivers) -; + IN BOOLEAN BootDrivers); + +NTSTATUS +IopOpenRegistryKeyEx( + PHANDLE KeyHandle, + HANDLE ParentKey, + PUNICODE_STRING Name, + ACCESS_MASK DesiredAccess); // // Initialization Routines Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jan 2 00:01:28 2008 @@ -3303,6 +3303,30 @@ } } +NTSTATUS +IopOpenRegistryKeyEx(PHANDLE KeyHandle, + HANDLE ParentKey, + PUNICODE_STRING Name, + ACCESS_MASK DesiredAccess) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + PAGED_CODE(); + + *KeyHandle = NULL; + + InitializeObjectAttributes(&ObjectAttributes, + Name, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + ParentKey, + NULL); + + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); + + return Status; +} + static NTSTATUS INIT_FUNCTION NTAPI PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath)

1 0

[fireball] 31539: - Move ENUM_ROOT to internal/io.h, so that io/driver.c can use it too. - Rewrite IopAttachFilterDrivers() to get rid of dangerous strings operations.
by fireball＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: fireball Date: Tue Jan 1 23:44:09 2008 New Revision: 31539 URL: http://svn.reactos.org/svn/reactos?rev=31539&view=rev Log: - Move ENUM_ROOT to internal/io.h, so that io/driver.c can use it too. - Rewrite IopAttachFilterDrivers() to get rid of dangerous strings operations. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Tue Jan 1 23:44:09 2008 @@ -45,6 +45,11 @@ #else #define IOTRACE(x, ...) DPRINT(__VA_ARGS__); #endif + +// +// Registry path to the enumeration root key +// +#define ENUM_ROOT L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum" // // Returns the type of METHOD_ used in this IOCTL Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Jan 1 23:44:09 2008 @@ -571,16 +571,45 @@ PDEVICE_NODE DeviceNode, BOOLEAN Lower) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; - PWCHAR KeyBuffer; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; + OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Class; WCHAR ClassBuffer[40]; + UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); + HANDLE EnumRootKey, SubKey; NTSTATUS Status; + /* Open enumeration root key */ + InitializeObjectAttributes(&ObjectAttributes, + &EnumRoot, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + return Status; + } + + /* Open subkey */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceNode->InstancePath, + OBJ_CASE_INSENSITIVE, + EnumRootKey, + NULL); + Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + ZwClose(EnumRootKey); + return Status; + } + /* * First load the device filters */ - QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback; if (Lower) QueryTable[0].Name = L"LowerFilters"; @@ -588,15 +617,9 @@ QueryTable[0].Name = L"UpperFilters"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; - KeyBuffer = ExAllocatePool( - PagedPool, - (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); - wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); - RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, - KeyBuffer, + RTL_REGISTRY_HANDLE, + (PWSTR)SubKey, QueryTable, DeviceNode, NULL); @@ -604,7 +627,6 @@ /* * Now get the class GUID */ - Class.Length = 0; Class.MaximumLength = 40 * sizeof(WCHAR); Class.Buffer = ClassBuffer; @@ -614,13 +636,15 @@ QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED | RTL_QUERY_REGISTRY_DIRECT; Status = RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, - KeyBuffer, + RTL_REGISTRY_HANDLE, + (PWSTR)SubKey, QueryTable, DeviceNode, NULL); - ExFreePool(KeyBuffer); + /* Close handles */ + ZwClose(SubKey); + ZwClose(EnumRootKey); /* * Load the class filter driver @@ -628,6 +652,34 @@ if (NT_SUCCESS(Status)) { + UNICODE_STRING ControlClass = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); + InitializeObjectAttributes(&ObjectAttributes, + &ControlClass, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + return Status; + } + + /* Open subkey */ + InitializeObjectAttributes(&ObjectAttributes, + &Class, + OBJ_CASE_INSENSITIVE, + EnumRootKey, + NULL); + Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + ZwClose(EnumRootKey); + return Status; + } + QueryTable[0].QueryRoutine = IopAttachFilterDriversCallback; if (Lower) QueryTable[0].Name = L"LowerFilters"; @@ -636,18 +688,16 @@ QueryTable[0].EntryContext = NULL; QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; - KeyBuffer = ExAllocatePool(PagedPool, (58 * sizeof(WCHAR)) + Class.Length); - wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class\\"); - wcscat(KeyBuffer, ClassBuffer); - RtlQueryRegistryValues( - RTL_REGISTRY_ABSOLUTE, - KeyBuffer, + RTL_REGISTRY_HANDLE, + (PWSTR)SubKey, QueryTable, DeviceNode, NULL); - ExFreePool(KeyBuffer); + /* Clean up */ + ZwClose(SubKey); + ZwClose(EnumRootKey); } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Jan 1 23:44:09 2008 @@ -18,8 +18,6 @@ //#define ENABLE_ACPI /* GLOBALS *******************************************************************/ - -#define ENUM_ROOT L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum" PDEVICE_NODE IopRootDeviceNode; KSPIN_LOCK IopDeviceTreeLock;

1 0

[pschweitzer] 31538: Updated NTFS header : - Separate a field into two distinct fields. One will be used when mounting volume - Added comment to unusedX fields that are used anyway when mounting volume
by pschweitzer＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: pschweitzer Date: Tue Jan 1 22:26:26 2008 New Revision: 31538 URL: http://svn.reactos.org/svn/reactos?rev=31538&view=rev Log: Updated NTFS header : - Separate a field into two distinct fields. One will be used when mounting volume - Added comment to unusedX fields that are used anyway when mounting volume Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Tue Jan 1 22:26:26 2008 @@ -24,12 +24,13 @@ { USHORT BytesPerSector; // 0x0B UCHAR SectorsPerCluster; // 0x0D - UCHAR Unused0[7]; // 0x0E + UCHAR Unused0[7]; // 0x0E, checked when volume is mounted UCHAR MediaId; // 0x15 UCHAR Unused1[2]; // 0x16 USHORT SectorsPerTrack; // 0x18 USHORT Heads; // 0x1A - UCHAR Unused2[8]; // 0x1C + UCHAR Unused2[4]; // 0x1C + UCHAR Unused3[4]; // 0x20, checked when volume is mounted } BIOS_PARAMETERS_BLOCK, *PBIOS_PARAMETERS_BLOCK; typedef struct _EXTENDED_BIOS_PARAMETERS_BLOCK @@ -39,9 +40,9 @@ ULONGLONG MftLocation; // 0x30 ULONGLONG MftMirrLocation; // 0x38 CHAR ClustersPerMftRecord; // 0x40 - UCHAR Unused3[3]; // 0x41 + UCHAR Unused4[3]; // 0x41 CHAR ClustersPerIndexRecord; // 0x44 - UCHAR Unused4[3]; // 0x45 + UCHAR Unused5[3]; // 0x45 ULONGLONG SerialNumber; // 0x48 UCHAR Checksum[4]; // 0x50 } EXTENDED_BIOS_PARAMETERS_BLOCK, *PEXTENDED_BIOS_PARAMETERS_BLOCK;

1 0

[greatlrd] 31537: adding documentations for DxEngGetDCState
by greatlrd＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: greatlrd Date: Tue Jan 1 22:15:22 2008 New Revision: 31537 URL: http://svn.reactos.org/svn/reactos?rev=31537&view=rev Log: adding documentations for DxEngGetDCState Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 22:15:22 2008 @@ -399,14 +399,31 @@ return FALSE; } -/************************************************************************/ -/* DxEngGetDCState */ -/************************************************************************/ -/* Note type 0 = N/A */ -/* Note type 1 = Is DC full screen */ -/* Note type 2 = Get Complexity of visiable region. */ -/* Note type 3 = Get Driver hdev, which is pPDev. */ - + + +/*++ +* @name DxEngGetDCState +* @implemented +* +* The function DxEngGetDCState getting sate +* if it DC full screen / Get Complexity of visiable region or +* Get Driver hdev, which is pPDev +* +* @param HDC hdc +* The hdc +* +* @param DWORD type +* value 1 = Is DC full screen +* value 2 = Get Complexity of visiable region. +* value 3 = Get Driver hdev, which is pPDev. +* +* @return +* return one of the type value +* +* @remarks. +* we do not have type 2 implement yet +* +*--*/ DWORD DxEngGetDCState(HDC hDC, DWORD type) @@ -425,12 +442,14 @@ UNIMPLEMENTED; break; case 3: - { // Return HDEV of this DC. + { + /* Return HDEV of this DC. */ retVal = (DWORD) pDC->pPDev; break; } default: - UNIMPLEMENTED; + /* if it does not found a type it wanted we return 0 as value */ + DPRINT1("warning did not found type %d\n",type); break; } DC_UnlockDc(pDC);

1 0

[pschweitzer] 31536: [FORMATTING] Fix indentation
by pschweitzer＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: pschweitzer Date: Tue Jan 1 21:55:52 2008 New Revision: 31536 URL: http://svn.reactos.org/svn/reactos?rev=31536&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Tue Jan 1 21:55:52 2008 @@ -54,64 +54,64 @@ Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); + return(Status); + } + + if (DiskGeometry.MediaType == FixedMedia) + { + /* We have found a hard disk */ + Size = sizeof(PARTITION_INFORMATION); + Status = NtfsDeviceIoControl(DeviceToMount, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartitionInfo, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) { DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); return(Status); } - if (DiskGeometry.MediaType == FixedMedia) + if (PartitionInfo.PartitionType != PARTITION_IFS) { - /* We have found a hard disk */ - Size = sizeof(PARTITION_INFORMATION); - Status = NtfsDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtfsDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); - } - - if (PartitionInfo.PartitionType != PARTITION_IFS) - { - DPRINT1("Invalid partition type\n"); - return(STATUS_UNRECOGNIZED_VOLUME); - } + DPRINT1("Invalid partition type\n"); + return(STATUS_UNRECOGNIZED_VOLUME); } + } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + DiskGeometry.BytesPerSector); if (BootSector == NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Status = NtfsReadSectors (DeviceToMount, + 0, + 1, + DiskGeometry.BytesPerSector, + (PVOID)BootSector, + TRUE); + if (NT_SUCCESS(Status)) + { + DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); + if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) { - return(STATUS_INSUFFICIENT_RESOURCES); + Status = STATUS_UNRECOGNIZED_VOLUME; } - - Status = NtfsReadSectors (DeviceToMount, - 0, - 1, - DiskGeometry.BytesPerSector, - (PVOID)BootSector, - TRUE); - if (NT_SUCCESS(Status)) - { - DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); - if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - } + } ExFreePool(BootSector); @@ -137,37 +137,37 @@ Size = sizeof(DISK_GEOMETRY); Status = NtfsDeviceIoControl(DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsDeviceIoControl() failed (Status %lx)\n", Status); - return(Status); - } + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsDeviceIoControl() failed (Status %lx)\n", Status); + return(Status); + } DPRINT("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + DiskGeometry.BytesPerSector); if (BootSector == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } + { + return(STATUS_INSUFFICIENT_RESOURCES); + } Status = NtfsReadSectors(DeviceObject, - 0, /* Partition boot sector */ - 1, - DiskGeometry.BytesPerSector, - (PVOID)BootSector, - TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePool(BootSector); - return Status; - } + 0, /* Partition boot sector */ + 1, + DiskGeometry.BytesPerSector, + (PVOID)BootSector, + TRUE); + if (!NT_SUCCESS(Status)) + { + ExFreePool(BootSector); + return Status; + } /* Read data from the bootsector */ NtfsInfo->BytesPerSector = BootSector->BPB.BytesPerSector; @@ -202,39 +202,39 @@ ExFreePool(BootSector); MftRecord = ExAllocatePool(NonPagedPool, - NtfsInfo->BytesPerFileRecord); + NtfsInfo->BytesPerFileRecord); if (MftRecord == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + { + return STATUS_INSUFFICIENT_RESOURCES; + } Status = NtfsReadSectors(DeviceObject, - NtfsInfo->MftStart.u.LowPart * NtfsInfo->SectorsPerCluster, - NtfsInfo->BytesPerFileRecord / NtfsInfo->BytesPerSector, - NtfsInfo->BytesPerSector, - (PVOID)MftRecord, - TRUE); - if (!NT_SUCCESS(Status)) - { - ExFreePool (MftRecord); - return Status; - } + NtfsInfo->MftStart.u.LowPart * NtfsInfo->SectorsPerCluster, + NtfsInfo->BytesPerFileRecord / NtfsInfo->BytesPerSector, + NtfsInfo->BytesPerSector, + (PVOID)MftRecord, + TRUE); + if (!NT_SUCCESS(Status)) + { + ExFreePool (MftRecord); + return Status; + } VolumeRecord = ExAllocatePool(NonPagedPool, NtfsInfo->BytesPerFileRecord); if (VolumeRecord == NULL) - { - ExFreePool (MftRecord); - return STATUS_INSUFFICIENT_RESOURCES; - } + { + ExFreePool (MftRecord); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Read Volume File (MFT index 3) */ DeviceExt->StorageDevice = DeviceObject; Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord); if (!NT_SUCCESS(Status)) - { - ExFreePool (MftRecord); - return Status; - } + { + ExFreePool (MftRecord); + return Status; + } #ifndef NDEBUG DbgPrint("\n\n"); @@ -253,32 +253,32 @@ DPRINT("Attribute %p\n", Attribute); if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { - DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); - NtfsInfo->VolumeLabelLength = - min (((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); - RtlCopyMemory (NtfsInfo->VolumeLabel, - (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset), - NtfsInfo->VolumeLabelLength); - } + { + DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); + NtfsInfo->VolumeLabelLength = + min (((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength, MAXIMUM_VOLUME_LABEL_LENGTH); + RtlCopyMemory (NtfsInfo->VolumeLabel, + (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset), + NtfsInfo->VolumeLabelLength); + } else - { - NtfsInfo->VolumeLabelLength = 0; - } + { + NtfsInfo->VolumeLabelLength = 0; + } /* Get volume information */ Attribute = FindAttribute (VolumeRecord, AttributeVolumeInformation, NULL); DPRINT("Attribute %p\n", Attribute); if (Attribute != NULL && ((PRESIDENT_ATTRIBUTE)Attribute)->ValueLength != 0) - { - DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); - VolumeInfo = (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset); - - NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; - NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; - NtfsInfo->Flags = VolumeInfo->Flags; - } + { + DPRINT("Data length %lu\n", AttributeDataLength (Attribute)); + VolumeInfo = (PVOID)((ULONG_PTR)Attribute + ((PRESIDENT_ATTRIBUTE)Attribute)->ValueOffset); + + NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; + NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; + NtfsInfo->Flags = VolumeInfo->Flags; + } ExFreePool (MftRecord); @@ -288,7 +288,7 @@ static NTSTATUS NtfsMountVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PDEVICE_EXTENSION DeviceExt = NULL; PDEVICE_OBJECT NewDeviceObject = NULL; @@ -302,10 +302,10 @@ DPRINT1("NtfsMountVolume() called\n"); if (DeviceObject != NtfsGlobalData->DeviceObject) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto ByeBye; - } + { + Status = STATUS_INVALID_DEVICE_REQUEST; + goto ByeBye; + } Stack = IoGetCurrentIrpStackLocation(Irp); DeviceToMount = Stack->Parameters.MountVolume.DeviceObject; @@ -313,28 +313,28 @@ Status = NtfsHasFileSystem(DeviceToMount); if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } + { + goto ByeBye; + } Status = IoCreateDevice(NtfsGlobalData->DriverObject, - sizeof(DEVICE_EXTENSION), - NULL, - FILE_DEVICE_FILE_SYSTEM, -// FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &NewDeviceObject); + sizeof(DEVICE_EXTENSION), + NULL, + FILE_DEVICE_FILE_SYSTEM, +// FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &NewDeviceObject); if (!NT_SUCCESS(Status)) goto ByeBye; NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; DeviceExt = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(DeviceExt, - sizeof(DEVICE_EXTENSION)); + sizeof(DEVICE_EXTENSION)); Status = NtfsGetVolumeData(DeviceToMount, - DeviceExt); + DeviceExt); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -348,26 +348,26 @@ NewDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL, - DeviceExt->StorageDevice); + DeviceExt->StorageDevice); Fcb = NtfsCreateFCB(NULL); if (Fcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } Ccb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(CCB), - TAG_CCB); + sizeof(CCB), + TAG_CCB); if (Ccb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } RtlZeroMemory(Ccb, - sizeof(CCB)); + sizeof(CCB)); DeviceExt->StreamFileObject->FsContext = Fcb; DeviceExt->StreamFileObject->FsContext2 = Ccb; @@ -388,12 +388,12 @@ // Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE; #ifdef ROS_USE_CC_AND_FS Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, - CACHEPAGESIZE(DeviceExt)); + CACHEPAGESIZE(DeviceExt)); if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); - goto ByeBye; - } + { + DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); + goto ByeBye; + } #else CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), @@ -413,24 +413,24 @@ /* Get volume label */ NewDeviceObject->Vpb->VolumeLabelLength = DeviceExt->NtfsInfo.VolumeLabelLength; RtlCopyMemory (NewDeviceObject->Vpb->VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabel, - DeviceExt->NtfsInfo.VolumeLabelLength); + DeviceExt->NtfsInfo.VolumeLabel, + DeviceExt->NtfsInfo.VolumeLabelLength); Status = STATUS_SUCCESS; ByeBye: if (!NT_SUCCESS(Status)) - { - /* Cleanup */ - if (DeviceExt && DeviceExt->StreamFileObject) - ObDereferenceObject(DeviceExt->StreamFileObject); - if (Fcb) - ExFreePool(Fcb); - if (Ccb) - ExFreePool(Ccb); - if (NewDeviceObject) - IoDeleteDevice(NewDeviceObject); - } + { + /* Cleanup */ + if (DeviceExt && DeviceExt->StreamFileObject) + ObDereferenceObject(DeviceExt->StreamFileObject); + if (Fcb) + ExFreePool(Fcb); + if (Ccb) + ExFreePool(Ccb); + if (NewDeviceObject) + IoDeleteDevice(NewDeviceObject); + } DPRINT("NtfsMountVolume() done (Status: %lx)\n", Status); @@ -440,7 +440,7 @@ static NTSTATUS NtfsVerifyVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { DPRINT1("NtfsVerifyVolume() called\n"); @@ -450,7 +450,7 @@ NTSTATUS STDCALL NtfsFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION Stack; NTSTATUS Status; @@ -460,27 +460,27 @@ Stack = IoGetCurrentIrpStackLocation(Irp); switch (Stack->MinorFunction) - { - case IRP_MN_USER_FS_REQUEST: - DPRINT("NTFS: IRP_MN_USER_FS_REQUEST\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("NTFS: IRP_MN_MOUNT_VOLUME\n"); - Status = NtfsMountVolume(DeviceObject, Irp); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT1("NTFS: IRP_MN_VERIFY_VOLUME\n"); - Status = NtfsVerifyVolume(DeviceObject, Irp); - break; - - default: - DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } + { + case IRP_MN_USER_FS_REQUEST: + DPRINT("NTFS: IRP_MN_USER_FS_REQUEST\n"); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case IRP_MN_MOUNT_VOLUME: + DPRINT("NTFS: IRP_MN_MOUNT_VOLUME\n"); + Status = NtfsMountVolume(DeviceObject, Irp); + break; + + case IRP_MN_VERIFY_VOLUME: + DPRINT1("NTFS: IRP_MN_VERIFY_VOLUME\n"); + Status = NtfsVerifyVolume(DeviceObject, Irp); + break; + + default: + DPRINT("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0;

1 0

[jimtabor] 31535: Update DxEngGetDCState and fix retun val for HDEV.
by jimtabor＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: jimtabor Date: Tue Jan 1 21:50:42 2008 New Revision: 31535 URL: http://svn.reactos.org/svn/reactos?rev=31535&view=rev Log: Update DxEngGetDCState and fix retun val for HDEV. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Tue Jan 1 21:50:42 2008 @@ -402,10 +402,10 @@ /************************************************************************/ /* DxEngGetDCState */ /************************************************************************/ -/* Note type 0 = ? */ -/* Note type 1 = ? */ -/* Note type 2 = ? */ -/* Note type 3 = Get Driver hdev */ +/* Note type 0 = N/A */ +/* Note type 1 = Is DC full screen */ +/* Note type 2 = Get Complexity of visiable region. */ +/* Note type 3 = Get Driver hdev, which is pPDev. */ DWORD DxEngGetDCState(HDC hDC, @@ -419,15 +419,15 @@ switch (type) { case 1: - UNIMPLEMENTED; - return 0; + retVal = (DWORD) pDC->DC_Flags & DC_FLAG_FULLSCREEN; + break; case 2: UNIMPLEMENTED; - return 0; + break; case 3: - { - PGDIDEVICE GDIDevice = (PGDIDEVICE)pDC->pPDev; - retVal = (DWORD)GDIDevice->hPDev; + { // Return HDEV of this DC. + retVal = (DWORD) pDC->pPDev; + break; } default: UNIMPLEMENTED;

1 0

[hpoussin] 31534: Bugcheck if no miniport driver is available See issue #2899 for more details.
by hpoussin＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: hpoussin Date: Tue Jan 1 19:35:21 2008 New Revision: 31534 URL: http://svn.reactos.org/svn/reactos?rev=31534&view=rev Log: Bugcheck if no miniport driver is available See issue #2899 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c 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 Tue Jan 1 19:35:21 2008 @@ -16,28 +16,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * DC.C - Device context functions * */ #include <w32k.h> +#include <bugcodes.h> #define NDEBUG #include <debug.h> - -/* ROS Internal. Please deprecate */ -NTHALAPI -BOOLEAN -NTAPI -HalQueryDisplayOwnership( - VOID -); - -#ifndef OBJ_COLORSPACE -#define OBJ_COLORSPACE (14) -#endif static GDIDEVICE PrimarySurface; static KEVENT VideoDriverNeedsPreparation; @@ -740,8 +728,15 @@ { if (! IntPrepareDriverIfNeeded()) { - DPRINT1("Unable to prepare graphics driver, returning NULL ic\n"); - return NULL; + /* Here, we have two possibilities: + * a) return NULL, and hope that the caller + * won't call us in a loop + * b) bugcheck, but caller is unable to + * react on the problem + */ + /*DPRINT1("Unable to prepare graphics driver, returning NULL ic\n"); + return NULL;*/ + KeBugCheck(VIDEO_DRIVER_INIT_FAILURE); } } else @@ -2846,7 +2841,11 @@ return FALSE; } - IntPrepareDriverIfNeeded(); + if (!IntPrepareDriverIfNeeded()) + { + DPRINT1("IntPrepareDriverIfNeeded failed\n"); + return FALSE; + } /* * DriverFileNames may be a list of drivers in REG_SZ_MULTI format,

1 0

[dreimer] 31533: Fix typos in cmd. thx to amine for spotting.
by dreimer＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: dreimer Date: Tue Jan 1 15:29:19 2008 New Revision: 31533 URL: http://svn.reactos.org/svn/reactos?rev=31533&view=rev Log: Fix typos in cmd. thx to amine for spotting. Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc Tue Jan 1 15:29:19 2008 @@ -596,7 +596,7 @@ STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ Executes command.\n\ TIME Displays or sets the system time.\n\ -TIMER Allow the use of ten stopwaches.\n\ +TIMER Allow the use of ten stopwatches.\n\ TITLE Sets the window title for a CMD.EXE session.\n\ TYPE Displays the contents of a text file.\n\ VER Displays the ReactOS version.\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc Tue Jan 1 15:29:19 2008 @@ -408,21 +408,21 @@ STRING_TIMER_HELP2, "Eltelt: %02d%c%02d%c%02d%c%02d\n" -STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ +STRING_TIMER_HELP3, "allow the use of ten stopwatches.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON Stopper bekapcsolása\n\ OFF Stopper kikapcsolása\n\ /S Split time. Return stopwatch split\n\ time without changing its value\n\ /n Stopper azonosító megadása.\n\ - Stopwaches avaliable are 0 to 9\n\ + Stopwatches avaliable are 0 to 9\n\ If it is not specified default is 1\n\ /Fn Format for output\n\ n can be:\n\ 0 milliseconds\n\ 1 hh%cmm%css%cdd\n\n\ if none of ON, OFF or /S is specified the command\n\ -will toggle stopwach state\n\n" +will toggle stopwatch state\n\n" STRING_TYPE_HELP1, "Megjeleníti az állományok tartalmát.\n\n\ TYPE [meghajtó:][elérési_út]állománynév \n\

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs