Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 29907: try to fix linux build
by tkreuzer＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: tkreuzer Date: Sat Oct 27 05:41:23 2007 New Revision: 29907 URL: http://svn.reactos.org/svn/reactos?rev=29907&view=rev Log: try to fix linux build 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 Sat Oct 27 05:41:23 2007 @@ -20,8 +20,8 @@ #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 <gl/gl.h> // Header File For The OpenGL32 Library +#include <gl/glu.h> // Header File For The GLu32 Library #include <tchar.h> #include "resource.h"

1 0

[mpiulachs] 29906: forgot to commit this file. Add 3dtext to the build
by mpiulachs＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: mpiulachs Date: Sat Oct 27 04:11:32 2007 New Revision: 29906 URL: http://svn.reactos.org/svn/reactos?rev=29906&view=rev Log: forgot to commit this file. Add 3dtext to the build Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Sat Oct 27 04:11:32 2007 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="3dtext"> + <xi:include href="3dtext/3dtext.rbuild" /> + </directory> <directory name="cylfrac"> <xi:include href="cylfrac/cylfrac.rbuild" /> </directory>

1 0

[mpiulachs] 29905: Update/Fix spanish localizations
by mpiulachs＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: mpiulachs Date: Sat Oct 27 02:46:23 2007 New Revision: 29905 URL: http://svn.reactos.org/svn/reactos?rev=29905&view=rev Log: Update/Fix spanish localizations Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc (contents, props changed) trunk/reactos/base/system/userinit/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc Sat Oct 27 02:46:23 2007 @@ -1,13 +1,13 @@ -/* - * Spanish language file by Javier Remacha <2007-09-21> - */ -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -/* String Tables */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAPTION "Instalación de ReactOS" - IDS_TEXT "¡No puedes instalar ReactOS directamente desde este CD!\n\nPor favor reinicia tu computadora desde este CD para proceder a instalar ReactOS." -END - -/* EOF */ +/* + * Spanish language file by Javier Remacha <2007-09-21> + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Instalación de ReactOS" + IDS_TEXT "¡No puede instalar ReactOS directamente desde este CD!\n\nPor favor, reinicie su equipo sin retirar este CD para proceder con la instalación de ReactOS." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/reactos/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/es-ES.rc (original) +++ trunk/reactos/base/system/userinit/lang/es-ES.rc Sat Oct 27 02:46:23 2007 @@ -7,6 +7,6 @@ STRINGTABLE DISCARDABLE { -STRING_USERINIT_FAIL, "Userinit falló al empezar la capa(shell)!\n" +STRING_USERINIT_FAIL, "Userinit no pudo iniciar el shell con éxito!\n" } Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Sat Oct 27 02:46:23 2007 @@ -33,22 +33,22 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "V&ista previa",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Esperar",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 + LTEXT "minutos", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "E&nergía...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -60,7 +60,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -72,10 +72,10 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element:", 8, 5, 160, 50, 9 + LTEXT "Elemento:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Tamaño", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -85,10 +85,10 @@ LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Fuente:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Tamaño Fuente:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 @@ -97,8 +97,8 @@ AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 137, 220, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,8 +133,8 @@ IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Deshabilitado", ID_MENU_DISABLED + MENUITEM "Seleccionado", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU @@ -142,18 +142,18 @@ POPUP "" BEGIN MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Primario", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Identificar", ID_MENU_IDENTIFY + MENUITEM "P&ropiedades", ID_MENU_PROPERTIES END END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Multiples Monitores)" + IDS_UNKNOWNMONITOR "(Monitor Desconocido)" + IDS_ADVANCEDTITLEFMT "%s y %s" END STRINGTABLE @@ -178,30 +178,30 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_BACKGROUND_COMDLG_FILTER "Imágenes (*.bmp;*.dib)\0*.bmp;*.dib\0" IDS_SUPPORTED_EXT "*.bmp;*.dib" END STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" + IDS_INACTWIN "Ventana Inactiva" + IDS_ACTWIN "Ventana Activa" IDS_WINTEXT "Window Text" IDS_MESSBOX "Message Box" IDS_MESSTEXT "Message Text" - IDS_BUTTEXT "OK" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ELEMENT_1 "Desktop" + IDS_BUTTEXT "Aceptar" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "Escritorio" IDS_ELEMENT_2 "Caption of inactive windows" IDS_ELEMENT_3 "Border of inactive windows" IDS_ELEMENT_4 "Caption of active windows" IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_6 "Menú" IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_8 "Ventanas" IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title"

1 0

[mpiulachs] 29904: Very simple OpenGL 3D text screensaver similar to the windows one. Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver Not added to reactos.dff for now because opengl seems to be broken again See issue #2755 for more details.
by mpiulachs＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: mpiulachs Date: Sat Oct 27 02:34:42 2007 New Revision: 29904 URL: http://svn.reactos.org/svn/reactos?rev=29904&view=rev Log: Very simple OpenGL 3D text screensaver similar to the windows one. Original work by Jeff Molofee tutorials (http://nehe.gamedev.net) basically converted from C++ to C and adapted as a windows screensaver Not added to reactos.dff for now because opengl seems to be broken again See issue #2755 for more details. Added: trunk/reactos/base/applications/screensavers/3dtext/ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (with props) trunk/reactos/base/applications/screensavers/3dtext/3dtext.h (with props) trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/ trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/resource.h (with props) trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/settings.c (with props) Added: 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 (added) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Sat Oct 27 02:34:42 2007 @@ -1,0 +1,426 @@ +/* + * Copyright 2000 Jeff Molofee http://nehe.gamedev.net/ (Original code) + * Copyright 2006 Eric Kohl + * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) - minor modifications , converted to screensaver + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * 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 <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 + +#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 + ANSI_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 + "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(char *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(strlen(text), GL_UNSIGNED_BYTE, 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,"Can't Find A Suitable PixelFormat.","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,"Can't Set The PixelFormat.","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,"Can't Create A GL Rendering Context.","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,"Can't Activate GLRC.","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; + } +} + +void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +{ + int ch; + + if (!strlen(szCmdLine)) + return; + + ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; + + *chOption = ch; + + if (ch == 's' || ch == 'c') + return; + + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = atoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = 0; +} + +// +// Dialogbox procedure for Configuration window +// +BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + SetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text); + return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + GetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text, MAX_PATH); + SaveSettings(); + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + 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 WINAPI WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent = 0; + int chOption = 0; + 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; +} + Propchange: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.h (added) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.h Sat Oct 27 02:34:42 2007 @@ -1,0 +1,26 @@ +/* + * 3D Text OpenGL Screensaver (3dtext.h) + * + * Copyright 2007 Marc Piulachs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +////////////////////////////////////////////////////////////////// + +TCHAR m_Text[MAX_PATH]; + +void LoadSettings(); +void SaveSettings(); Propchange: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild (added) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild Sat Oct 27 02:34:42 2007 @@ -1,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>opengl32</library> + <library>glu32</library> + <library>advapi32</library> + + <file>3dtext.c</file> + <file>settings.c</file> + <file>rsrc.rc</file> + + <metadata description="3D text OpenGL screensaver" /> +</module> Propchange: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc Sat Oct 27 02:34:42 2007 @@ -1,0 +1,19 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_CONFIG DIALOGEX 0, 0, 273, 178 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D Text Screensaver Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "Custom text",IDC_STATIC_TEXT,18,17,40,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D Text ScreenSaver" + IDS_TITLE "About" + IDS_TEXT "No options need to be set." +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc Sat Oct 27 02:34:42 2007 @@ -1,0 +1,19 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_CONFIG DIALOGEX 0, 0, 273, 178 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D Text Screensaver Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,216,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "Texto personalizado",IDC_STATIC_TEXT,18,17,40,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D Text ScreenSaver" + IDS_TITLE "Acerca de.." + IDS_TEXT "No options need to be set." +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/resource.h (added) +++ trunk/reactos/base/applications/screensavers/3dtext/resource.h Sat Oct 27 02:34:42 2007 @@ -1,0 +1,23 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by en-US.rc +// +#define IDD_CONFIG 9 +#define IDD_DIALOG1 101 +#define IDC_MESSAGE_TEXT 1001 +#define IDC_STATIC_TEXT 1002 + +#define IDS_DESCRIPTION 1 +#define IDS_TITLE 2 +#define IDS_TEXT 3 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Propchange: trunk/reactos/base/applications/screensavers/3dtext/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Sat Oct 27 02:34:42 2007 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "OpenGL 3DText ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "ss3dtext\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ss3dtext.scr\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" +#include "lang/es-ES.rc" Propchange: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/screensavers/3dtext/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/settings.c (added) +++ trunk/reactos/base/applications/screensavers/3dtext/settings.c Sat Oct 27 02:34:42 2007 @@ -1,0 +1,55 @@ +/* + * 3D Text OpenGL Screensaver (settings.c) + * + * Copyright 2007 Marc Piulachs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +////////////////////////////////////////////////////////////////// + +#include <windows.h> +#include <tchar.h> +#include "3dtext.h" + +TCHAR m_Text[MAX_PATH]; + +void LoadSettings() +{ + HKEY hkey; + DWORD len = MAX_PATH; + + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, + _T(""), 0, KEY_READ, NULL, &hkey, NULL); + + if(RegQueryValueEx(hkey, _T("DisplayString"), 0, 0, (LPBYTE)m_Text, &len) != ERROR_SUCCESS) + { + strcpy(m_Text , "ReactOS Rocks!"); + } + + RegCloseKey(hkey); +} + +void SaveSettings() +{ + HKEY hkey; + + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, + _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); + + RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (BYTE *)&m_Text, sizeof (m_Text)); + + RegCloseKey(hkey); +} Propchange: trunk/reactos/base/applications/screensavers/3dtext/settings.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 29903: UserScrollDC: 2nd try to fix the invalidated region. desk.cpl looks ok now and in my tests all worked like on XP, also fix the returned invalidated rect (don't use NtGdiGetClipBox) NtUserScrollDC: return the region type NtUserScrollwindowEx: fix the default clip region
by tkreuzer＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: tkreuzer Date: Sat Oct 27 02:08:53 2007 New Revision: 29903 URL: http://svn.reactos.org/svn/reactos?rev=29903&view=rev Log: UserScrollDC: 2nd try to fix the invalidated region. desk.cpl looks ok now and in my tests all worked like on XP, also fix the returned invalidated rect (don't use NtGdiGetClipBox) NtUserScrollDC: return the region type NtUserScrollwindowEx: fix the default clip region Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Sat Oct 27 02:08:53 2007 @@ -141,6 +141,7 @@ void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn); INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect); BOOL FASTCALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc); +INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); #define UnsafeIntCreateRectRgnIndirect(prc) \ NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Sat Oct 27 02:08:53 2007 @@ -1131,10 +1131,11 @@ const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) { PDC pDC; - RECT rcClip, rcSrc, rcDst; + RECT rcScroll, rcClip, rcSrc, rcDst; INT Result; IntGdiGetClipBox(hDC, &rcClip); + rcScroll = rcClip; if (prcClip) { IntGdiIntersectRect(&rcClip, &rcClip, prcClip); @@ -1142,6 +1143,7 @@ if (prcScroll) { + rcScroll = *prcScroll; IntGdiIntersectRect(&rcSrc, &rcClip, prcScroll); } else @@ -1174,38 +1176,37 @@ hrgnVisible = pDC->w.hVisRgn; // pDC->w.hGCClipRgn? DC_UnlockDc(pDC); - /* Begin with the source rect */ + /* Begin with the shifted and then clipped scroll rect */ + rcDst = rcScroll; + IntGdiOffsetRect(&rcDst, dx, dy); + IntGdiIntersectRect(&rcDst, &rcDst, &rcClip); if (hrgnUpdate) { hrgnOwn = hrgnUpdate; - if (!NtGdiSetRectRgn(hrgnOwn, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom)) + if (!NtGdiSetRectRgn(hrgnOwn, rcDst.left, rcDst.top, rcDst.right, rcDst.bottom)) { return ERROR; } } else { - hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcSrc); - } - - /* Substract the dest rect */ - hrgnTmp = UnsafeIntCreateRectRgnIndirect(&rcDst); - NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); - - /* Add the part of the dest that wasn't visible in source */ - NtGdiSetRectRgn(hrgnTmp, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom); - Result = NtGdiCombineRgn(hrgnTmp, hrgnTmp, hrgnVisible, RGN_DIFF); - if (Result != NULLREGION && Result != ERROR) - { - NtGdiOffsetRgn(hrgnTmp, dx, dy); - NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_OR); - } + hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcDst); + } + + /* Add the source rect */ + hrgnTmp = UnsafeIntCreateRectRgnIndirect(&rcSrc); + NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_OR); + + /* Substract the part of the dest that was visible in source */ + NtGdiCombineRgn(hrgnTmp, hrgnTmp, hrgnVisible, RGN_AND); + NtGdiOffsetRgn(hrgnTmp, dx, dy); + Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); NtGdiDeleteObject(hrgnTmp); if (prcUpdate) { - NtGdiGetRgnBox(hrgnOwn, prcUpdate); + IntGdiGetRgnBox(hrgnOwn, prcUpdate); } if (!hrgnUpdate) @@ -1236,6 +1237,7 @@ DECLARE_RETURN(DWORD); RECT rcScroll, rcClip, rcUpdate; NTSTATUS Status = STATUS_SUCCESS; + DWORD Result; DPRINT("Enter NtUserScrollDC\n"); UserEnterExclusive(); @@ -1268,13 +1270,14 @@ RETURN(FALSE); } - if (UserScrollDC(hDC, dx, dy, - prcUnsafeScroll? &rcScroll : 0, - prcUnsafeClip? &rcClip : 0, hrgnUpdate, - prcUnsafeUpdate? &rcUpdate : NULL) == ERROR) + Result = UserScrollDC(hDC, dx, dy, + prcUnsafeScroll? &rcScroll : 0, + prcUnsafeClip? &rcClip : 0, hrgnUpdate, + prcUnsafeUpdate? &rcUpdate : NULL); + if(Result == ERROR) { /* FIXME: SetLastError? */ - RETURN(FALSE); + RETURN(Result); } if (prcUnsafeUpdate) @@ -1296,7 +1299,7 @@ } } - RETURN(TRUE); + RETURN(Result); CLEANUP: DPRINT("Leave NtUserScrollDC, ret=%i\n",_ret_); @@ -1336,23 +1339,23 @@ } UserRefObjectCo(Window, &Ref); - IntGetClientRect(Window, &rcScroll); + IntGetClientRect(Window, &rcClip); _SEH_TRY { if (prcUnsafeScroll) { ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); - IntGdiIntersectRect(&rcScroll, &rcScroll, prcUnsafeScroll); - } + IntGdiIntersectRect(&rcScroll, &rcClip, prcUnsafeScroll); + } + else + rcScroll = rcClip; if (prcUnsafeClip) { ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); - IntGdiIntersectRect(&rcClip, &rcScroll, prcUnsafeClip); - } - else - rcClip = rcScroll; + IntGdiIntersectRect(&rcClip, &rcClip, prcUnsafeClip); + } } _SEH_HANDLE { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Sat Oct 27 02:08:53 2007 @@ -540,7 +540,7 @@ pReg->rdh.iType = (1 == pReg->rdh.nCount ? SIMPLEREGION : COMPLEXREGION); } - +// FIXME: This seems to be wrong /*********************************************************************** * REGION_CropAndOffsetRegion */ @@ -2410,6 +2410,25 @@ } INT STDCALL +IntGdiGetRgnBox(HRGN hRgn, + LPRECT pRect) +{ + PROSRGNDATA Rgn; + DWORD ret; + + if (!(Rgn = RGNDATA_LockRgn(hRgn))) + { + return ERROR; + } + + ret = UnsafeIntGetRgnBox(Rgn, pRect); + RGNDATA_UnlockRgn(Rgn); + + return ret; +} + + +INT STDCALL NtGdiGetRgnBox(HRGN hRgn, LPRECT pRect) {

1 0

[fireball] 29902: - Define LIST_ENTRY functions as part of host headers, instead of mkhive-specific defines. - Use CM_KEY_CONTROL_BLOCK when communicating with new CM implementation ("config"). CM now builds a dummy KCB so that the functions in "config" can go around their business with KCB without needing to know what a ros-specific PKEY_OBJECT is.
by fireball＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: fireball Date: Sat Oct 27 00:59:42 2007 New Revision: 29902 URL: http://svn.reactos.org/svn/reactos?rev=29902&view=rev Log: - Define LIST_ENTRY functions as part of host headers, instead of mkhive-specific defines. - Use CM_KEY_CONTROL_BLOCK when communicating with new CM implementation ("config"). CM now builds a dummy KCB so that the functions in "config" can go around their business with KCB without needing to know what a ros-specific PKEY_OBJECT is. Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmvalche.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Sat Oct 27 00:59:42 2007 @@ -120,6 +120,102 @@ } UNICODE_STRING, *PUNICODE_STRING; #include <host/poppack.h> +// +// List Functions +// +static inline +VOID +InitializeListHead( + IN PLIST_ENTRY ListHead + ) +{ + ListHead->Flink = ListHead->Blink = ListHead; +} + +static inline +VOID +InsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry + ) +{ + PLIST_ENTRY OldFlink; + OldFlink = ListHead->Flink; + Entry->Flink = OldFlink; + Entry->Blink = ListHead; + OldFlink->Blink = Entry; + ListHead->Flink = Entry; +} + +static inline +VOID +InsertTailList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry + ) +{ + PLIST_ENTRY OldBlink; + OldBlink = ListHead->Blink; + Entry->Flink = ListHead; + Entry->Blink = OldBlink; + OldBlink->Flink = Entry; + ListHead->Blink = Entry; +} + +BOOLEAN +static inline +IsListEmpty( + IN const LIST_ENTRY * ListHead + ) +{ + return (BOOLEAN)(ListHead->Flink == ListHead); +} + +static inline +BOOLEAN +RemoveEntryList( + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (BOOLEAN)(OldFlink == OldBlink); +} + +static inline +PLIST_ENTRY +RemoveHeadList( + IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Flink; + PLIST_ENTRY Entry; + + Entry = ListHead->Flink; + Flink = Entry->Flink; + ListHead->Flink = Flink; + Flink->Blink = ListHead; + return Entry; +} + +static inline +PLIST_ENTRY +RemoveTailList( + IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Blink; + PLIST_ENTRY Entry; + + Entry = ListHead->Blink; + Blink = Entry->Blink; + ListHead->Blink = Blink; + Blink->Flink = ListHead; + return Entry; +} + typedef const UNICODE_STRING *PCUNICODE_STRING; #define NT_SUCCESS(x) ((x)>=0) Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=29902… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat Oct 27 00:59:42 2007 @@ -114,6 +114,51 @@ CACHED_CHILD_LIST ValueCache; } KEY_OBJECT, *PKEY_OBJECT; +// +// Key Control Block (KCB) for old Cm (just so it can talk to New CM) +// +typedef struct _CM_KEY_CONTROL_BLOCK +{ + USHORT RefCount; + USHORT Flags; + ULONG ExtFlags:8; + ULONG PrivateAlloc:1; + ULONG Delete:1; + ULONG DelayedCloseIndex:12; + ULONG TotalLevels:10; + union + { + //CM_KEY_HASH KeyHash; + struct + { + ULONG ConvKey; + PVOID NextHash; + PHHIVE KeyHive; + HCELL_INDEX KeyCell; + }; + }; + struct _CM_KEY_CONTROL_BLOCK *ParentKcb; + PVOID NameBlock; + PVOID CachedSecurity; + CACHED_CHILD_LIST ValueCache; + PVOID IndexHint; + ULONG HashKey; + ULONG SubKeyCount; + union + { + LIST_ENTRY KeyBodyListHead; + LIST_ENTRY FreeListEntry; + }; + PVOID KeyBodyArray[4]; + PVOID DelayCloseEntry; + LARGE_INTEGER KcbLastWriteTime; + USHORT KcbMaxNameLen; + USHORT KcbMaxValueNameLen; + ULONG KcbMaxValueDataLen; + ULONG InDelayClose; +} CM_KEY_CONTROL_BLOCK, *PCM_KEY_CONTROL_BLOCK; + + /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ #define CmiDirectoryIndex(CellIndex)(CellIndex & 0xffc000000) /* Bits 21-12 (middle 10 bits) of the cell index is the table index */ @@ -222,12 +267,12 @@ NTSTATUS NTAPI -CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, +CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN UNICODE_STRING ValueName); NTSTATUS NTAPI -CmQueryValueKey(IN PKEY_OBJECT KeyObject, +CmQueryValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN UNICODE_STRING ValueName, IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, IN PVOID KeyValueInformation, @@ -236,7 +281,7 @@ NTSTATUS NTAPI -CmEnumerateValueKey(IN PKEY_OBJECT KeyObject, +CmEnumerateValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Index, IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, IN PVOID KeyValueInformation, @@ -245,7 +290,7 @@ NTSTATUS NTAPI -CmSetValueKey(IN PKEY_OBJECT KeyObject, +CmSetValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PUNICODE_STRING ValueName, IN ULONG Type, IN PVOID Data, @@ -253,7 +298,7 @@ NTSTATUS NTAPI -CmQueryKey(IN PKEY_OBJECT KeyObject, +CmQueryKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN KEY_INFORMATION_CLASS KeyInformationClass, IN PVOID KeyInformation, IN ULONG Length, @@ -261,7 +306,7 @@ NTSTATUS NTAPI -CmEnumerateKey(IN PKEY_OBJECT KeyObject, +CmEnumerateKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Index, IN KEY_INFORMATION_CLASS KeyInformationClass, IN PVOID KeyInformation, @@ -270,7 +315,7 @@ NTSTATUS NTAPI -CmDeleteKey(IN PKEY_OBJECT KeyObject); +CmDeleteKey(IN PCM_KEY_CONTROL_BLOCK Kcb); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, @@ -317,8 +362,6 @@ IN PUNICODE_STRING Name ); -/* NOTE: This function declaration is currently duplicated in both */ -/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ HCELL_INDEX NTAPI CmpFindSubKeyByName( @@ -342,8 +385,6 @@ IN PVOID ParseContext ); -/* NOTE: This function declaration is currently duplicated in both */ -/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat Oct 27 00:59:42 2007 @@ -24,7 +24,6 @@ /* GLOBALS ******************************************************************/ extern POBJECT_TYPE CmpKeyObjectType; - static BOOLEAN CmiRegistryInitialized = FALSE; /* FUNCTIONS ****************************************************************/ @@ -709,8 +708,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmDeleteKey(KeyObject); + Status = CmDeleteKey(&DummyKcb); /* Remove the keep-alive reference */ ObDereferenceObject(KeyObject); @@ -773,8 +777,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmEnumerateKey(KeyObject, + Status = CmEnumerateKey(&DummyKcb, Index, KeyInformationClass, KeyInformation, @@ -836,8 +845,13 @@ &EnumerateValueKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmEnumerateValueKey(KeyObject, + Status = CmEnumerateValueKey(&DummyKcb, Index, KeyValueInformationClass, KeyValueInformation, @@ -897,8 +911,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmQueryKey(KeyObject, + Status = CmQueryKey(&DummyKcb, KeyInformationClass, KeyInformation, Length, @@ -957,8 +976,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmQueryValueKey(KeyObject, + Status = CmQueryValueKey(&DummyKcb, *ValueName, KeyValueInformationClass, KeyValueInformation, @@ -1021,8 +1045,13 @@ Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmSetValueKey(KeyObject, + Status = CmSetValueKey(&DummyKcb, ValueName, Type, Data, @@ -1071,8 +1100,13 @@ &DeleteValueKeyInfo); if (NT_SUCCESS(Status)) { + /* HACK: Setup the Dummy KCB */ + CM_KEY_CONTROL_BLOCK DummyKcb = {0}; + DummyKcb.KeyHive = &KeyObject->RegistryHive->Hive; + DummyKcb.KeyCell = KeyObject->KeyCellOffset; + /* Call the internal API */ - Status = CmDeleteValueKey(KeyObject, *ValueName); + Status = CmDeleteValueKey(&DummyKcb, *ValueName); /* Do the post callback */ PostOperationInfo.Object = (PVOID)KeyObject; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat Oct 27 00:59:42 2007 @@ -710,7 +710,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpFindValueByNameFromCache( - IN PKEY_OBJECT KeyObject, + IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, @@ -722,7 +722,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpQueryKeyValueData( - IN PKEY_OBJECT KeyObject, + IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCM_CACHED_VALUE *CachedValue, IN PCM_KEY_VALUE ValueKey, IN BOOLEAN ValueIsCached, @@ -736,7 +736,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpGetValueListFromCache( - IN PKEY_OBJECT KeyObject, + IN PCM_KEY_CONTROL_BLOCK Kcb, OUT PCELL_DATA *CellData, OUT BOOLEAN *IndexIsCached, OUT PHCELL_INDEX ValueListToRelease @@ -745,7 +745,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpGetValueKeyFromCache( - IN PKEY_OBJECT KeyObject, + IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCELL_DATA CellData, IN ULONG Index, OUT PCM_CACHED_VALUE **CachedValue, @@ -979,7 +979,7 @@ #if 0 IN PCM_KEY_BODY KeyObject, #else - IN PKEY_OBJECT KeyObject, + IN PVOID KeyObject, #endif IN ULONG Flags ); Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sat Oct 27 00:59:42 2007 @@ -216,7 +216,7 @@ NTSTATUS NTAPI -CmSetValueKey(IN PKEY_OBJECT KeyObject, +CmSetValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PUNICODE_STRING ValueName, IN ULONG Type, IN PVOID Data, @@ -235,11 +235,11 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get pointer to key cell */ - Parent = KeyObject->KeyCell; - Hive = &KeyObject->RegistryHive->Hive; - Cell = KeyObject->KeyCellOffset; + Hive = Kcb->KeyHive; + Cell = Kcb->KeyCell; /* Prepare to scan the key node */ + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Cell); Count = Parent->ValueList.Count; Found = FALSE; if (Count > 0) @@ -343,7 +343,7 @@ NTSTATUS NTAPI -CmDeleteValueKey(IN PKEY_OBJECT KeyObject, +CmDeleteValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN UNICODE_STRING ValueName) { NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; @@ -360,8 +360,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive and the cell index */ - Hive = &KeyObject->RegistryHive->Hive; - Cell = KeyObject->KeyCellOffset; + Hive = Kcb->KeyHive; + Cell = Kcb->KeyCell; /* Get the parent key node */ Parent = (PCM_KEY_NODE)HvGetCell(Hive, Cell); @@ -458,7 +458,7 @@ NTSTATUS NTAPI -CmQueryValueKey(IN PKEY_OBJECT KeyObject, +CmQueryValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN UNICODE_STRING ValueName, IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, IN PVOID KeyValueInformation, @@ -480,10 +480,10 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive */ - Hive = &KeyObject->RegistryHive->Hive; + Hive = Kcb->KeyHive; /* Find the key value */ - Result = CmpFindValueByNameFromCache(KeyObject, + Result = CmpFindValueByNameFromCache(Kcb, &ValueName, &CachedValue, &Index, @@ -496,7 +496,7 @@ ASSERT(ValueData != NULL); /* Query the information requested */ - Result = CmpQueryKeyValueData(KeyObject, + Result = CmpQueryKeyValueData(Kcb, CachedValue, ValueData, ValueCached, @@ -523,7 +523,7 @@ NTSTATUS NTAPI -CmEnumerateValueKey(IN PKEY_OBJECT KeyObject, +CmEnumerateValueKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Index, IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, IN PVOID KeyValueInformation, @@ -546,8 +546,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive and parent */ - Hive = &KeyObject->RegistryHive->Hive; - Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + Hive = Kcb->KeyHive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); if (!Parent) { /* Fail */ @@ -556,17 +556,17 @@ } /* Make sure the index is valid */ - //if (Index >= KeyObject->ValueCache.Count) - if (Index >= KeyObject->KeyCell->ValueList.Count) + //if (Index >= Kcb->ValueCache.Count) + if (Index >= Parent->ValueList.Count) { /* Release the cell and fail */ - HvReleaseCell(Hive, KeyObject->KeyCellOffset); + HvReleaseCell(Hive, Kcb->KeyCell); Status = STATUS_NO_MORE_ENTRIES; goto Quickie; } /* Find the value list */ - Result = CmpGetValueListFromCache(KeyObject, + Result = CmpGetValueListFromCache(Kcb, &CellData, &IndexIsCached, &CellToRelease); @@ -581,7 +581,7 @@ } /* Now get the key value */ - Result = CmpGetValueKeyFromCache(KeyObject, + Result = CmpGetValueKeyFromCache(Kcb, CellData, Index, &CachedValue, @@ -600,7 +600,7 @@ } /* Query the information requested */ - Result = CmpQueryKeyValueData(KeyObject, + Result = CmpQueryKeyValueData(Kcb, CachedValue, ValueData, ValueIsCached, @@ -615,7 +615,7 @@ if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); /* Release the parent cell */ - HvReleaseCell(Hive, KeyObject->KeyCellOffset); + HvReleaseCell(Hive, Kcb->KeyCell); /* If we have a cell to release, do so */ if (CellToRelease2 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease2); @@ -852,7 +852,7 @@ NTSTATUS NTAPI -CmQueryKey(IN PKEY_OBJECT KeyObject, +CmQueryKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN KEY_INFORMATION_CLASS KeyInformationClass, IN PVOID KeyInformation, IN ULONG Length, @@ -867,8 +867,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive and parent */ - Hive = &KeyObject->RegistryHive->Hive; - Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + Hive = Kcb->KeyHive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); if (!Parent) { /* Fail */ @@ -921,7 +921,7 @@ NTSTATUS NTAPI -CmEnumerateKey(IN PKEY_OBJECT KeyObject, +CmEnumerateKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Index, IN KEY_INFORMATION_CLASS KeyInformationClass, IN PVOID KeyInformation, @@ -938,8 +938,8 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive and parent */ - Hive = &KeyObject->RegistryHive->Hive; - Parent = (PCM_KEY_NODE)HvGetCell(Hive, KeyObject->KeyCellOffset); + Hive = Kcb->KeyHive; + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); if (!Parent) { /* Fail */ @@ -951,7 +951,7 @@ ChildCell = CmpFindSubKeyByNumber(Hive, Parent, Index); /* Release the parent cell */ - HvReleaseCell(Hive, KeyObject->KeyCellOffset); + HvReleaseCell(Hive, Kcb->KeyCell); /* Check if we found the child */ if (ChildCell == HCELL_NIL) @@ -987,7 +987,7 @@ NTSTATUS NTAPI -CmDeleteKey(IN PKEY_OBJECT KeyObject) +CmDeleteKey(IN PCM_KEY_CONTROL_BLOCK Kcb) { NTSTATUS Status; PHHIVE Hive; @@ -999,23 +999,23 @@ ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Get the hive and node */ - Hive = &KeyObject->RegistryHive->Hive; - Cell = KeyObject->KeyCellOffset; - - /* Check if we have no parent */ - if (!KeyObject->ParentKey) - { - /* This is an attempt to delete \Registry itself! */ - Status = STATUS_CANNOT_DELETE; - goto Quickie; - } - + Hive = Kcb->KeyHive; + Cell = Kcb->KeyCell; + /* Get the key node */ Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!Node) { /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Check if we have no parent */ + if (!Node->Parent) + { + /* This is an attempt to delete \Registry itself! */ + Status = STATUS_CANNOT_DELETE; goto Quickie; } @@ -1042,26 +1042,26 @@ } /* Clear the cell */ - KeyObject->KeyCellOffset = HCELL_NIL; + Kcb->KeyCell = HCELL_NIL; } } else { /* Fail */ Status = STATUS_CANNOT_DELETE; + } + + /* Make sure we're file-backed */ + if (!(IsNoFileHive((PEREGISTRY_HIVE)Kcb->KeyHive)) || + !(IsNoFileHive((PEREGISTRY_HIVE)Kcb->ParentKcb->KeyHive))) + { + /* Sync up the hives */ + CmiSyncHives(); } Quickie: /* Release the cell */ HvReleaseCell(Hive, Cell); - - /* Make sure we're file-backed */ - if (!(IsNoFileHive(KeyObject->RegistryHive)) || - !(IsNoFileHive(KeyObject->ParentKey->RegistryHive))) - { - /* Sync up the hives */ - CmiSyncHives(); - } /* Release hive lock */ ExReleaseResourceLite(&CmpRegistryLock); Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Sat Oct 27 00:59:42 2007 @@ -42,7 +42,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI -CmpGetValueListFromCache(IN PKEY_OBJECT KeyObject, +CmpGetValueListFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, OUT PCELL_DATA *CellData, OUT BOOLEAN *IndexIsCached, OUT PHCELL_INDEX ValueListToRelease) @@ -50,17 +50,19 @@ PHHIVE Hive; PCACHED_CHILD_LIST ChildList; HCELL_INDEX CellToRelease; + PCM_KEY_NODE KeyNode; /* Set defaults */ *ValueListToRelease = HCELL_NIL; *IndexIsCached = FALSE; /* Get the hive */ - Hive = &KeyObject->RegistryHive->Hive; + Hive = Kcb->KeyHive; + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); /* Get the child value cache */ - //ChildList = &KeyObject->ValueCache; - ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + //ChildList = &Kcb->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the value is cached */ if (CmpIsValueCached(ChildList->ValueList)) @@ -87,7 +89,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI -CmpGetValueKeyFromCache(IN PKEY_OBJECT KeyObject, +CmpGetValueKeyFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCELL_DATA CellData, IN ULONG Index, OUT PCM_CACHED_VALUE **CachedValue, @@ -106,7 +108,7 @@ *ValueIsCached = FALSE; /* Get the hive */ - Hive = &KeyObject->RegistryHive->Hive; + Hive = Kcb->KeyHive; /* Check if the index was cached */ if (IndexIsCached) @@ -133,7 +135,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI -CmpGetValueDataFromCache(IN PKEY_OBJECT KeyObject, +CmpGetValueDataFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCM_CACHED_VALUE *CachedValue, IN PCELL_DATA ValueKey, IN BOOLEAN ValueIsCached, @@ -154,7 +156,7 @@ *CellToRelease = HCELL_NIL; /* Get the hive */ - Hive = &KeyObject->RegistryHive->Hive; + Hive = Kcb->KeyHive; /* Check it the value is cached */ if (ValueIsCached) @@ -185,7 +187,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI -CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, +CmpFindValueByNameFromCache(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, @@ -203,21 +205,25 @@ BOOLEAN IndexIsCached; ULONG i = 0; HCELL_INDEX Cell = HCELL_NIL; + PCM_KEY_NODE KeyNode; /* Set defaults */ *CellToRelease = HCELL_NIL; *Value = NULL; - /* Get the hive and child list */ - Hive = &KeyObject->RegistryHive->Hive; - //ChildList = &KeyObject->ValueCache; - ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + /* Get the hive */ + Hive = Kcb->KeyHive; + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); + + /* Get the child value cache */ + //ChildList = &Kcb->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the child list has any entries */ if (ChildList->Count != 0) { /* Get the value list associated to this child list */ - SearchResult = CmpGetValueListFromCache(KeyObject, + SearchResult = CmpGetValueListFromCache(Kcb, &CellData, &IndexIsCached, &Cell); @@ -238,7 +244,7 @@ } /* Get the key value for this index */ - SearchResult = CmpGetValueKeyFromCache(KeyObject, + SearchResult = CmpGetValueKeyFromCache(Kcb, CellData, i, CachedValue, @@ -307,7 +313,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI -CmpQueryKeyValueData(IN PKEY_OBJECT KeyObject, +CmpQueryKeyValueData(IN PCM_KEY_CONTROL_BLOCK Kcb, IN PCM_CACHED_VALUE *CachedValue, IN PCM_KEY_VALUE ValueKey, IN BOOLEAN ValueIsCached, @@ -328,7 +334,7 @@ VALUE_SEARCH_RETURN_TYPE Result = SearchSuccess; /* Get the hive and cell data */ - Hive = &KeyObject->RegistryHive->Hive; + Hive = Kcb->KeyHive; CellData = (PCELL_DATA)ValueKey; /* Check if the value is compressed */ @@ -492,7 +498,7 @@ else { /* Otherwise, we must retrieve it from the value cache */ - Result = CmpGetValueDataFromCache(KeyObject, + Result = CmpGetValueDataFromCache(Kcb, CachedValue, CellData, ValueIsCached, @@ -587,7 +593,7 @@ else { /* Otherwise, we must retrieve it from the value cache */ - Result = CmpGetValueDataFromCache(KeyObject, + Result = CmpGetValueDataFromCache(Kcb, CachedValue, CellData, ValueIsCached, Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h (original) +++ trunk/reactos/tools/mkhive/registry.h Sat Oct 27 00:59:42 2007 @@ -63,121 +63,6 @@ #define ERROR_MORE_DATA 234L #define ERROR_NO_MORE_ITEMS 259L -/* - * VOID - * InitializeListHead ( - * PLIST_ENTRY ListHead - * ); - * - * FUNCTION: Initializes a double linked list - * ARGUMENTS: - * ListHead = Caller supplied storage for the head of the list - */ -#define InitializeListHead(ListHead) \ -{ \ - (ListHead)->Flink = (ListHead); \ - (ListHead)->Blink = (ListHead); \ -} - - -/* - * VOID - * InsertHeadList ( - * PLIST_ENTRY ListHead, - * PLIST_ENTRY Entry - * ); - * - * FUNCTION: Inserts an entry in a double linked list - * ARGUMENTS: - * ListHead = Head of the list - * Entry = Entry to insert - */ -#define InsertHeadList(ListHead, ListEntry) \ -{ \ - PLIST_ENTRY OldFlink; \ - OldFlink = (ListHead)->Flink; \ - (ListEntry)->Flink = OldFlink; \ - (ListEntry)->Blink = (ListHead); \ - OldFlink->Blink = (ListEntry); \ - (ListHead)->Flink = (ListEntry); \ - assert((ListEntry) != NULL); \ - assert((ListEntry)->Blink!=NULL); \ - assert((ListEntry)->Blink->Flink == (ListEntry)); \ - assert((ListEntry)->Flink != NULL); \ - assert((ListEntry)->Flink->Blink == (ListEntry)); \ -} - - -/* - * VOID - * InsertTailList ( - * PLIST_ENTRY ListHead, - * PLIST_ENTRY Entry - * ); - * - * FUNCTION: - * Inserts an entry in a double linked list - * - * ARGUMENTS: - * ListHead = Head of the list - * Entry = Entry to insert - */ -#define InsertTailList(ListHead, ListEntry) \ -{ \ - PLIST_ENTRY OldBlink; \ - OldBlink = (ListHead)->Blink; \ - (ListEntry)->Flink = (ListHead); \ - (ListEntry)->Blink = OldBlink; \ - OldBlink->Flink = (ListEntry); \ - (ListHead)->Blink = (ListEntry); \ - assert((ListEntry) != NULL); \ - assert((ListEntry)->Blink != NULL); \ - assert((ListEntry)->Blink->Flink == (ListEntry)); \ - assert((ListEntry)->Flink != NULL); \ - assert((ListEntry)->Flink->Blink == (ListEntry)); \ -} - -/* - *VOID - *RemoveEntryList ( - * PLIST_ENTRY Entry - * ); - * - * FUNCTION: - * Removes an entry from a double linked list - * - * ARGUMENTS: - * ListEntry = Entry to remove - */ -#define RemoveEntryList(ListEntry) \ -{ \ - PLIST_ENTRY OldFlink; \ - PLIST_ENTRY OldBlink; \ - assert((ListEntry) != NULL); \ - assert((ListEntry)->Blink!=NULL); \ - assert((ListEntry)->Blink->Flink == (ListEntry)); \ - assert((ListEntry)->Flink != NULL); \ - assert((ListEntry)->Flink->Blink == (ListEntry)); \ - OldFlink = (ListEntry)->Flink; \ - OldBlink = (ListEntry)->Blink; \ - OldFlink->Blink = OldBlink; \ - OldBlink->Flink = OldFlink; \ - (ListEntry)->Flink = NULL; \ - (ListEntry)->Blink = NULL; \ -} - -/* - * PURPOSE: Returns the base address structure if the caller knows the - * address of a field within the structure - * ARGUMENTS: - * Address = address of the field - * Type = Type of the whole structure - * Field = Name of the field whose address is none - */ -#define CONTAINING_RECORD(address, type, field) \ - ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) - - #define REG_NONE 0 #define REG_SZ 1 #define REG_EXPAND_SZ 2 @@ -241,3 +126,4 @@ /* EOF */ +

1 0

[mpiulachs] 29901: Implement Infs.Always section parsing to syssetup. Thanks to hpoussin for his suggestions
by mpiulachs＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: mpiulachs Date: Fri Oct 26 20:19:52 2007 New Revision: 29901 URL: http://svn.reactos.org/svn/reactos?rev=29901&view=rev Log: Implement Infs.Always section parsing to syssetup. Thanks to hpoussin for his suggestions Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Fri Oct 26 20:19:52 2007 @@ -358,7 +358,7 @@ BOOL -ProcessSysSetupInf(VOID) +InstallSysSetupInfDevices(VOID) { INFCONTEXT InfContext; TCHAR LineBuffer[256]; @@ -392,7 +392,67 @@ return TRUE; } - +BOOL +InstallSysSetupInfComponents(VOID) +{ + INFCONTEXT InfContext; + TCHAR NameBuffer[256]; + TCHAR SectionBuffer[256]; + + if (!SetupFindFirstLine(hSysSetupInf, + _T("Infs.Always"), + NULL, + &InfContext)) + { + DPRINT("No Inf.Always section found\n"); + } + else + { + do + { + if (!SetupGetStringField(&InfContext, + 1, // Get the component name + NameBuffer, + sizeof(NameBuffer)/sizeof(NameBuffer[0]), + NULL)) + { + DebugPrint("Error while trying to get component name \n"); + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 2, // Get the component install section + SectionBuffer, + sizeof(SectionBuffer)/sizeof(SectionBuffer[0]), + NULL)) + { + DebugPrint("Error while trying to get component install section \n"); + return FALSE; + } + + DPRINT("Trying to execute install section '%S' from '%S' \n", SectionBuffer , NameBuffer); + + if (!SetupInstallFromInfSection(NULL, + hSysSetupInf, + SectionBuffer, + SPINST_ALL, + NULL, + NULL, + SP_COPY_NEWER, + NULL, + NULL, + NULL, + NULL)) + { + DebugPrint("Error while trying to install : %S (Error: %lu) \n", NameBuffer, GetLastError()); + return FALSE; + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + } + + return TRUE; +} static BOOL EnableUserModePnpManager(VOID) @@ -502,9 +562,16 @@ return FALSE; } - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); + if (!InstallSysSetupInfDevices()) + { + DebugPrint("InstallSysSetupInfDevices() failed!\n"); + SetupCloseInfFile(hSysSetupInf); + return FALSE; + } + + if(!InstallSysSetupInfComponents()) + { + DebugPrint("InstallSysSetupInfComponents() failed!\n"); SetupCloseInfFile(hSysSetupInf); return FALSE; }

1 0

[hpoussin] 29900: Add a SourceDiskFiles section in txtsetup.sif, instead of hardcoding a list of drivers in freeldr
by hpoussin＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: hpoussin Date: Fri Oct 26 19:32:04 2007 New Revision: 29900 URL: http://svn.reactos.org/svn/reactos?rev=29900&view=rev Log: Add a SourceDiskFiles section in txtsetup.sif, instead of hardcoding a list of drivers in freeldr Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Fri Oct 26 19:32:04 2007 @@ -10,6 +10,20 @@ 5 = media 6 = media\fonts 7 = bin + +[SourceDiskFiles] +;acpi.sys=,,,,,,x +;isapnp.sys=,,,,,,x +;pci.sys=,,,,,,x +scsiport.sys=,,,,,,x +class2.sys=,,,,,,x +cdrom.sys=,,,,,,x +cdfs.sys=,,,,,,x +disk.sys=,,,,,,x +floppy.sys=,,,,,,x +i8042prt.sys=,,,,,,x +kbdclass.sys=,,,,,,x +blue.sys=,,,,,,x [SourceFiles] ; <filename> = <directory_id> Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Fri Oct 26 19:32:04 2007 @@ -448,28 +448,6 @@ return; } -#if 0 - /* Load acpi.sys */ - if (!LoadDriver(SourcePath, "acpi.sys")) - return; -#endif - -#if 0 - /* Load isapnp.sys */ - if (!LoadDriver(SourcePath, "isapnp.sys")) - return; -#endif - -#if 0 - /* Load pci.sys */ - if (!LoadDriver(SourcePath, "pci.sys")) - return; -#endif - - /* Load scsiport.sys */ - if (!LoadDriver(SourcePath, "scsiport.sys")) - return; - /* Load atapi.sys (depends on hardware detection) */ if (!LoadDriver(SourcePath, "atapi.sys")) return; @@ -478,40 +456,30 @@ if (!LoadDriver(SourcePath, "buslogic.sys")) return; - /* Load class2.sys */ - if (!LoadDriver(SourcePath, "class2.sys")) - return; - - /* Load cdrom.sys */ - if (!LoadDriver(SourcePath, "cdrom.sys")) - return; - - /* Load cdfs.sys */ - if (!LoadDriver(SourcePath, "cdfs.sys")) - return; - - /* Load disk.sys */ - if (!LoadDriver(SourcePath, "disk.sys")) - return; - - /* Load floppy.sys */ - if (!LoadDriver(SourcePath, "floppy.sys")) - return; - /* Load vfatfs.sys (could be loaded by the setup prog!) */ if (!LoadDriver(SourcePath, "vfatfs.sys")) return; - - /* Load keyboard driver */ - if (!LoadDriver(SourcePath, "i8042prt.sys")) - return; - if (!LoadDriver(SourcePath, "kbdclass.sys")) - return; - - /* Load screen driver */ - if (!LoadDriver(SourcePath, "blue.sys")) - return; + /* Load additional files specified in txtsetup.inf */ + if (InfFindFirstLine(InfHandle, + "SourceDiskFiles", + NULL, + &InfContext)) + { + do + { + LPCSTR Media, DriverName; + if (InfGetDataField(&InfContext, 7, &Media) && + InfGetDataField(&InfContext, 0, &DriverName)) + { + if (strcmp(Media, "x") == 0) + { + if (!LoadDriver(SourcePath, DriverName)) + return; + } + } + } while (InfFindNextLine(&InfContext, &InfContext)); + } #ifdef USE_UI UiUnInitialize("Booting ReactOS...");

1 0

[peterw] 29899: - Fix typo.
by peterw＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: peterw Date: Fri Oct 26 16:50:57 2007 New Revision: 29899 URL: http://svn.reactos.org/svn/reactos?rev=29899&view=rev Log: - Fix typo. Modified: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefgcc.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Fri Oct 26 16:50:57 2007 @@ -30,7 +30,7 @@ goto :EOC :INTERACTIVE -set /p XY="Please enter a MinGW/GCC directory: " +set /p _1="Please enter a MinGW/GCC directory: " if "%_1%" == "" ( echo ERROR: You must enter a MinGW/GCC directory. goto :EOC

1 0

[peterw] 29898: - Forgot to remove these lines.
by peterw＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: peterw Date: Fri Oct 26 16:35:55 2007 New Revision: 29898 URL: http://svn.reactos.org/svn/reactos?rev=29898&view=rev Log: - Forgot to remove these lines. Modified: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefgcc.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Fri Oct 26 16:35:55 2007 @@ -9,10 +9,6 @@ @echo off title Change the current MinGW/GCC directory... - -if not defined _ROSBE_PREVIOUSMINGWPATH ( - set _ROSBE_PREVIOUSMINGWPATH=%_ROSBE_MINGWPATH% -) :: :: Parse the command line arguments. @@ -27,7 +23,6 @@ echo ERROR: The path specified doesn't seem to exist. goto :EOC ) -set _ROSBE_PREVIOUSMINGWPATH=%_ROSBE_MINGWPATH% set _ROSBE_MINGWPATH=%_1% echo Location: %_ROSBE_MINGWPATH% call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"

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