Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[cfinck] 32437: - Remove much Win9x-specific stuff from the scrnsave library and make it more compatible to the MS version of the library - Change the 3dtext screensaver to use the library - Reduce the amount of code in the blankscr screensaver to a minimum - Remove unneeded resources from both screensavers - Indentation fixes, MSVC build and warning fixes, small translation fixes, etc. for both screensavers and the library See issue #2966 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 21 00:43:41 2008 New Revision: 32437 URL: http://svn.reactos.org/svn/reactos?rev=32437&view=rev Log: - Remove much Win9x-specific stuff from the scrnsave library and make it more compatible to the MS version of the library - Change the 3dtext screensaver to use the library - Reduce the amount of code in the blankscr screensaver to a minimum - Remove unneeded resources from both screensavers - Indentation fixes, MSVC build and warning fixes, small translation fixes, etc. for both screensavers and the library See issue #2966 for more details. Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.def (with props) Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc trunk/reactos/base/applications/screensavers/3dtext/lang/el-GR.rc trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/3dtext/lang/it-IT.rc trunk/reactos/base/applications/screensavers/3dtext/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/3dtext/lang/ru-RU.rc trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/3dtext/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/3dtext/resource.h trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/include/psdk/scrnsave.h trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild trunk/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc trunk/rosapps/applications/screensavers/blankscr/lang/de-DE.rc trunk/rosapps/applications/screensavers/blankscr/lang/en-US.rc trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc trunk/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc trunk/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc trunk/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc trunk/rosapps/applications/screensavers/blankscr/resource.h trunk/rosapps/applications/screensavers/blankscr/scrnsave.c trunk/rosapps/applications/screensavers/blankscr/scrnsave.def trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc 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 Thu Feb 21 00:43:41 2008 @@ -19,6 +19,7 @@ */ #include <windows.h> +#include <scrnsave.h> #include <math.h> #include <GL/gl.h> #include <GL/glu.h> @@ -27,11 +28,11 @@ #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 GLfloat extentX = 0.0f; GLfloat extentY = 0.0f; @@ -47,7 +48,7 @@ GLYPHMETRICSFLOAT gmf[256]; // Windows Font Handle HFONT font; - int i; + size_t i; TCHAR c; GLfloat cellOriginX = 0.0f; GLfloat stringOriginX; @@ -58,31 +59,31 @@ 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 + 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 + 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 // Calculate the string extent for (i = 0; i < _tcslen(m_Text); i++) @@ -231,9 +232,9 @@ 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)))); + glColor3f((1.0f * (GLfloat)(cos(rot / 20.0f))), + (1.0f * (GLfloat)(sin(rot / 25.0f))), + (1.0f - 0.5f * (GLfloat)(cos(rot / 17.0f)))); // Print GL Text To The Screen glPrint(m_Text); @@ -246,41 +247,37 @@ } 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 +ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + 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 (?) + 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: + LoadSettings(); + // Gets A Device Context For The Window hDC = GetDC(hWnd); @@ -338,7 +335,6 @@ break; case WM_DESTROY: - case WM_CLOSE: // Disable Fullscreen Mode ChangeDisplaySettings(NULL, 0); @@ -353,9 +349,6 @@ // Free The DC ReleaseDC(hWnd, hDC); - - // Quit The Program - PostQuitMessage(0); break; case WM_PAINT: @@ -363,157 +356,48 @@ 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); + // Pass Windows Messages to the default screensaver window procedure + return DefScreenSaverProc(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: -// -// -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++; - - //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 // -BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_INITDIALOG: - SetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text); + LoadSettings(); + SetDlgItemText(hDlg, IDC_MESSAGE_TEXT, m_Text); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - GetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text, MAX_PATH); + GetDlgItemText(hDlg, IDC_MESSAGE_TEXT, m_Text, MAX_PATH); SaveSettings(); - EndDialog(hwnd, IDOK); - break; + + /* Fall through */ case IDCANCEL: - EndDialog(hwnd, IDCANCEL); + EndDialog(hDlg, IDCANCEL); break; } return FALSE; case WM_CLOSE: - EndDialog(hwnd, 0); + EndDialog(hDlg, 0); break; default: @@ -523,46 +407,7 @@ 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; -} - +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +{ + return TRUE; +} Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.def (added) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.def Thu Feb 21 00:43:41 2008 @@ -1,0 +1,5 @@ +NAME 3dtext.scr + +EXPORTS + ScreenSaverProc + ScreenSaverConfigureDialog Propchange: trunk/reactos/base/applications/screensavers/3dtext/3dtext.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild Thu Feb 21 00:43:41 2008 @@ -1,7 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="true"> - <define name="__USE_W32API" /> +<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr" unicode="yes"> + <importlibrary definition="3dtext.def" /> + <library>scrnsave</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/bg-BG.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME| DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Íàñòðîéêè íà åêðàííèÿ ïðåäïàçèòåë ""Òðèìåðåí òåêñò""." FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ DEFPUSHBUTTON "Äîáðå",IDOK,216,7,50,14 PUSHBUTTON "Îòêàç",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Ñîáñòâåí òåêñò",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Ñîáñòâåí òåêñò",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Åêðàíåí ïðåäïàçèòåë ""Òðèìåðåí òåêñò""." - IDS_TITLE "Çà" - IDS_TEXT "Íÿìà íóæäà îò íàñòðîéêè." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc Thu Feb 21 00:43:41 2008 @@ -1,19 +1,17 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "3D Text Bildschirmschoner Einstellungen" +CAPTION "3D-Text Bildschirmschoner-Einstellungen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Eigener Text",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Eigener Text:",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "3D Text Bildschirmschoner" - IDS_TITLE "Über" - IDS_TEXT "Keine Einstellungen nötig." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/el-GR.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ñõèìßóåéò ÊåéìÝíïõ 3Ä" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "¢êõñï",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "ÐñïóáñìïóìÝíï êåßìåíï:",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "ÐñïóáñìïóìÝíï êåßìåíï:",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Ðñïöýëáîç ïèüíçò ìå êåßìåíï 3Ä" - IDS_TITLE "Ðåñß" - IDS_TEXT "ÁõôÞ ç ðñïöýëáîç ïèüíçò äå äéáèÝôåé åðéëïãÝò ôéò ïðïßåò ìðïñåßôå íá ïñßóåôå." END Modified: 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 (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/en-US.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Text Screensaver Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ 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,65,8 + LTEXT "Custom text",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "3D Text ScreenSaver" - IDS_TITLE "About" - IDS_TEXT "No options need to be set." END Modified: 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 (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuración del Salvapantallas Texto en 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ 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,65,8 + LTEXT "Texto personalizado",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Salvapantallas Texto en 3D" - IDS_TITLE "Acerca de.." - IDS_TEXT "Ninguna opción necesita ser configurada." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètres de l'écran de veille Texte 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Texte personnalisé",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Texte personnalisé",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Écran de veille Texte 3D" - IDS_TITLE "À propos de" - IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/it-IT.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni del salvaschermo 'Testo 3D'" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Annulla",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Testo personalizzato",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Testo personalizzato",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Salvaschermo 'Testo 3D'" - IDS_TITLE "Informazioni" - IDS_TEXT "Nessuna impostazione da effettuare." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/lt-LT.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/lt-LT.rc Thu Feb 21 00:43:41 2008 @@ -9,7 +9,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 136, 58 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 136, 58 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ekrano uþsklandos nustatymai" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -17,12 +17,10 @@ DEFPUSHBUTTON "OK",IDOK,14,38,50,14 PUSHBUTTON "Atðaukti",IDCANCEL,72,38,50,14 EDITTEXT IDC_MESSAGE_TEXT,6,18,122,14,ES_AUTOHSCROLL - LTEXT "Pasirinktas tekstas",IDC_STATIC_TEXT,7,7,65,8 + LTEXT "Pasirinktas tekstas",IDC_STATIC,7,7,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "3D tekstas" - IDS_TITLE "Apie" - IDS_TEXT "Nëra keièiamø parametrø." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc Thu Feb 21 00:43:41 2008 @@ -7,7 +7,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Text Screensaver Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -15,12 +15,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Anuluj",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "W³asny tekst",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "W³asny tekst",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Wygaszacz ekranu Tekst 3d" - IDS_TITLE "O programie" - IDS_TEXT "Brak opcji." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/ru-RU.rc Thu Feb 21 00:43:41 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ïàðàìåòðû çàñòàâêè" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -8,12 +8,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Îòìåíà",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Äðóãîé òåêñò",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Äðóãîé òåêñò",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Çàñòàâêà 3D-òåêñò" - IDS_TITLE "Î ïðîãðàììå" - IDS_TEXT "Ýòà çàñòàâêà íå èìååò íàñòðàèâàåìûõ ïàðàìåòðîâ." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc Thu Feb 21 00:43:41 2008 @@ -4,7 +4,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenie etrièa obrazovky 3D text" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -12,12 +12,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Zrui",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "¼ubovo¾ný text",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "¼ubovo¾ný text",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "3D text - etriè obrazovky" - IDS_TITLE "Èo je ..." - IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/uk-UA.rc Thu Feb 21 00:43:41 2008 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_CONFIG DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ïàðàìåòðû çàñòàâêè ""Îá'ºìíèé òåêñò""" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -16,12 +16,10 @@ DEFPUSHBUTTON "OK",IDOK,216,7,50,14 PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,216,24,50,14 EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL - LTEXT "Òåêñò",IDC_STATIC_TEXT,18,17,65,8 + LTEXT "Òåêñò",IDC_STATIC,18,17,65,8 END STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Çàñòàâêà ""Îá'ºìíèé òåêñò""" - IDS_TITLE "Ïðî" - IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." END Modified: 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 (original) +++ trunk/reactos/base/applications/screensavers/3dtext/resource.h Thu Feb 21 00:43:41 2008 @@ -1,23 +1,2 @@ -//{{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 +#define IDC_STATIC -1 +#define IDC_MESSAGE_TEXT 1001 Modified: 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 (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Thu Feb 21 00:43:41 2008 @@ -1,13 +1,13 @@ #include <windows.h> +#include <scrnsave.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" - +#define REACTOS_STR_INTERNAL_NAME "3dtext\0" +#define REACTOS_STR_ORIGINAL_FILENAME "3dtext.scr\0" #include <reactos/version.rc> #include "lang/bg-BG.rc" @@ -19,6 +19,6 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" Modified: trunk/reactos/include/psdk/scrnsave.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/scrnsave.h?re… ============================================================================== --- trunk/reactos/include/psdk/scrnsave.h (original) +++ trunk/reactos/include/psdk/scrnsave.h Thu Feb 21 00:43:41 2008 @@ -1,78 +1,70 @@ /* - Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> + * PROJECT: ReactOS Screen Saver Library + * LICENSE: GPL v2 or any later version + * FILE: include/psdk/scrnsave.h + * PURPOSE: Header file for the library + * PROGRAMMERS: Anders Norlander <anorland(a)hem2.passagen.se> + * Colin Finck <mail(a)colinfinck.de> + */ - This library is (hopefully) compatible with Microsoft's - screen saver library. - - This is public domain software. - - */ #ifndef _SCRNSAVE_H #define _SCRNSAVE_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { #endif -/* configure dialog identifier */ -#define DLG_SCRNSAVECONFIGURE 2003 +#define idsIsPassword 1000 +#define idsIniFile 1001 +#define idsScreenSaver 1002 +#define idsPassword 1003 +#define idsDifferentPW 1004 +#define idsChangePW 1005 +#define idsBadOldPW 1006 +#define idsAppName 1007 +#define idsNoHelpMemory 1008 +#define idsHelpFile 1009 +#define idsDefKeyword 1010 -#define idsIsPassword 1000 -#define idsIniFile 1001 -#define idsScreenSaver 1002 -#define idsPassword 1003 -#define idsDifferentPW 1004 -#define idsChangePW 1005 -#define idsBadOldPW 1006 -#define idsAppName 1007 -#define idsNoHelpMemory 1008 -#define idsHelpFile 1009 -#define idsDefKeyword 1010 +// If you add a configuration dialog for your screen saver, it must have this dialog ID. +#define DLG_SCRNSAVECONFIGURE 2003 -#define IDS_DESCRIPTION 1 -#define ID_APP 100 +#define IDS_DESCRIPTION 1 +#define ID_APP 100 -#define WS_GT (WS_GROUP | WS_TABSTOP) -#define SCRM_VERIFYPW WM_APP -#define MAXFILELEN 13 -#define TITLEBARNAMELEN 40 -#define APPNAMEBUFFERLEN 40 -#define BUFFLEN 255 +#define WS_GT (WS_GROUP | WS_TABSTOP) +#define MAXFILELEN 13 +#define TITLEBARNAMELEN 40 +#define APPNAMEBUFFERLEN 40 +#define BUFFLEN 255 -#ifndef RC_INVOKED +// The dialog procedure of the screen saver configure dialog (if any) +// If you don't have a configuration dialog, just implement a procedure that always returns FALSE. +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -/* functions provided by the aothor of the screen saver */ -BOOL WINAPI ScreenSaverConfigureDialog(HWND,UINT,WPARAM,LPARAM); -BOOL WINAPI RegisterDialogClasses(HANDLE); -LONG WINAPI ScreenSaverProc(HWND,UINT,WPARAM,LPARAM); +// Use this function if you want to register special classes before opening the configuration dialog. +// Return TRUE here if the classes were registered successfully and the configuration dialog shall be opened. +// If you return FALSE, no configuration dialog will be opened. +BOOL WINAPI RegisterDialogClasses(HANDLE hInst); -/* Change name of function if we are using UNICODE */ -#ifdef UNICODE -#define DefScreenSaverProc DefScreenSaverProcW -#endif +// The screen saver window procedure +LRESULT WINAPI ScreenSaverProc(HWND, UINT uMsg, WPARAM wParam, LPARAM lParam); -/* default screen saver proc; call instead of DefWindowProc */ -LONG WINAPI DefScreenSaverProc(HWND,UINT,WPARAM,LPARAM); +// The window procedure, which handles default tasks for screen savers. +// Use this instead of DefWindowProc. +LRESULT WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); -/* change password */ -void WINAPI ScreenSaverChangePassword(HWND); - -/* globals that may be used by screen saver */ -extern HINSTANCE hMainInstance; -extern HWND hMainWindow; -extern BOOL fChildPreview; -extern TCHAR szName[]; -extern TCHAR szAppName[]; -extern TCHAR szIniFile[]; -extern TCHAR szScreenSaver[]; -extern TCHAR szHelpFile[]; -extern TCHAR szNoHelpMemory[]; -extern UINT MyHelpMessage; - -#endif /* RC_INVOKED */ +// These globals are defined in the screen saver library. +extern HINSTANCE hMainInstance; +extern HWND hMainWindow; +extern BOOL fChildPreview; +extern TCHAR szName[]; +extern TCHAR szAppName[]; +extern TCHAR szIniFile[]; +extern TCHAR szScreenSaver[]; +extern TCHAR szHelpFile[]; +extern TCHAR szNoHelpMemory[]; +extern UINT MyHelpMessage; #ifdef __cplusplus } Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c Thu Feb 21 00:43:41 2008 @@ -1,21 +1,20 @@ /* - Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> - - This library is (hopefully) compatible with Microsoft's - screen saver library. - - This is public domain software. - + * PROJECT: ReactOS Screen Saver Library + * LICENSE: GPL v2 or any later version + * FILE: lib/sdk/scrnsave/scrnsave.c + * PURPOSE: Library for writing screen savers, compatible with MS' scrnsave.lib + * PROGRAMMERS: Anders Norlander <anorland(a)hem2.passagen.se> + * Colin Finck <mail(a)colinfinck.de> */ #include <windows.h> +#include <tchar.h> #include <scrnsave.h> -#include <regstr.h> - -/* screen saver window class */ + +// Screen Saver window class #define CLASS_SCRNSAVE TEXT("WindowsScreenSaverClass") -/* globals */ +// Globals HWND hMainWindow = NULL; BOOL fChildPreview = FALSE; HINSTANCE hMainInstance; @@ -27,45 +26,21 @@ TCHAR szNoHelpMemory[BUFFLEN]; UINT MyHelpMessage; -/* local house keeping */ -static HINSTANCE hPwdLib = NULL; +// Local house keeping static POINT pt_orig; -static BOOL checking_pwd = FALSE; -static BOOL closing = FALSE; -static BOOL w95 = FALSE; - -typedef BOOL (WINAPI *VERIFYPWDPROC)(HWND); -typedef DWORD (WINAPI *CHPWDPROC)(LPCTSTR, HWND, DWORD, PVOID); -static VERIFYPWDPROC VerifyScreenSavePwd = NULL; - -/* function names */ -#define szVerifyPassword "VerifyScreenSavePwd" - -#ifdef UNICODE -#define szPwdChangePassword "PwdChangePasswordW" -#else -#define szPwdChangePassword "PwdChangePasswordA" -#endif - -static void TerminateScreenSaver(HWND hWnd); -static BOOL RegisterClasses(void); -static LRESULT WINAPI SysScreenSaverProc(HWND,UINT,WPARAM,LPARAM); -static int LaunchScreenSaver(HWND hParent); -static void LaunchConfig(void); - -static int ISSPACE(char c) + +static int ISSPACE(TCHAR c) { return (c == ' ' || c == '\t'); } #define ISNUM(c) ((c) >= '0' && c <= '9') -static unsigned long -_toul(const char *s) +static unsigned long _toul(const TCHAR *s) { unsigned long res; unsigned long n; - const char *p; + const TCHAR *p; for (p = s; *p; p++) if (!ISNUM(*p)) @@ -80,204 +55,18 @@ return res; } -/* screen saver entry point */ -int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, - LPSTR CmdLine, int nCmdShow) -{ - LPSTR p; - OSVERSIONINFO vi; - - /* initialize */ - hMainInstance = hInst; - - vi.dwOSVersionInfoSize = sizeof(vi); - GetVersionEx(&vi); - /* check if we are going to check for passwords */ - if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - { - HKEY hKey; - /* we are using windows 95 */ - w95 = TRUE; - if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == - ERROR_SUCCESS) - { - DWORD check_pwd; - DWORD size = sizeof(DWORD); - DWORD type; - LONG res; - - res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, - NULL, &type, (PBYTE) &check_pwd, &size); - - if (check_pwd && res == ERROR_SUCCESS) - { - hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); - if (hPwdLib) - VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); - } - - RegCloseKey(hKey); - } - } - - /* parse arguments */ - for (p = CmdLine; *p; p++) - { - switch (*p) - { - case 'S': - case 's': - /* start screen saver */ - return LaunchScreenSaver(NULL); - - case 'P': - case 'p': - { - /* start screen saver in preview window */ - HWND hParent; - fChildPreview = TRUE; - - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - - if (hParent && IsWindow(hParent)) - return LaunchScreenSaver(hParent); - } - return 0; - - case 'C': - case 'c': - /* display configure dialog */ - LaunchConfig(); - return 0; - - case 'A': - case 'a': - { - /* change screen saver password */ - HWND hParent; - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - - if (!hParent || !IsWindow(hParent)) - hParent = GetForegroundWindow(); - - ScreenSaverChangePassword(hParent); - } - return 0; - - case '-': - case '/': - case ' ': - default: - break; - } - } - - LaunchConfig(); - - return 0; -} - -static void LaunchConfig(void) -{ - /* FIXME: should this be called */ - RegisterDialogClasses(hMainInstance); - - /* display configure dialog */ - DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), - GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); -} - -static int LaunchScreenSaver(HWND hParent) -{ - BOOL foo; - UINT style; - RECT rc; - MSG msg; - - /* don't allow other tasks to get into the foreground */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); - - msg.wParam = 0; - - /* register classes, both user defined and classes used by screen saver - library */ - if (!RegisterClasses()) - { - MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); - goto restore; - } - - /* a slightly different approach needs to be used when displaying - in a preview window */ - if (hParent) - { - style = WS_CHILD; - GetClientRect(hParent, &rc); - } - else - { - style = WS_POPUP; - rc.right = GetSystemMetrics(SM_CXSCREEN); - rc.bottom = GetSystemMetrics(SM_CYSCREEN); - style |= WS_VISIBLE; - } - - /* create main screen saver window */ - hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, - TEXT("SCREENSAVER"), style, - 0, 0, rc.right, rc.bottom, hParent, NULL, - hMainInstance, NULL); - - /* display window and start pumping messages */ - if (hMainWindow) - { - UpdateWindow(hMainWindow); - ShowWindow(hMainWindow, SW_SHOW); - - while (GetMessage(&msg, NULL, 0, 0) == TRUE) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - -restore: - /* restore system */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); - - FreeLibrary(hPwdLib); - return msg.wParam; -} - -/* this function takes care of *must* do tasks, like terminating - screen saver */ -static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) +// This function takes care of *must* do tasks, like terminating screen saver +static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { case WM_CREATE: - if (!fChildPreview) - SetCursor(NULL); - /* mouse is not supposed to move from this position */ + // Mouse is not supposed to move from this position GetCursorPos(&pt_orig); break; case WM_DESTROY: PostQuitMessage(0); - break; - - case WM_TIMER: - if (closing) - return 0; - break; - - case WM_PAINT: - if (closing) - return DefWindowProc(hWnd, msg, wParam, lParam); break; case WM_SYSCOMMAND: @@ -287,64 +76,32 @@ { case SC_CLOSE: case SC_SCREENSAVE: - case SC_NEXTWINDOW: - case SC_PREVWINDOW: return FALSE; } } break; - - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_KEYDOWN: - case WM_SYSKEYDOWN: + } + + return ScreenSaverProc(hWnd, uMsg, wParam, lParam); +} + +LRESULT WINAPI DefScreenSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + // Don't do any special processing when in preview mode + if (fChildPreview) + return DefWindowProc(hWnd, uMsg, wParam, lParam); + + switch (uMsg) + { case WM_NCACTIVATE: case WM_ACTIVATE: case WM_ACTIVATEAPP: - if (closing) - return DefWindowProc(hWnd, msg, wParam, lParam); - - break; - } - - return ScreenSaverProc(hWnd, msg, wParam, lParam); -} - -LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - /* don't do any special processing when in preview mode */ - if (fChildPreview || closing) - return DefWindowProc(hWnd, msg, wParam, lParam); - - switch (msg) - { - case WM_CLOSE: - TerminateScreenSaver(hWnd); - /* do NOT pass this to DefWindowProc; it will terminate even if - an invalid password was given. - */ - return 0; - - case SCRM_VERIFYPW: - /* verify password or return TRUE if password checking is turned off */ - if (VerifyScreenSavePwd) - return VerifyScreenSavePwd(hWnd); - else - return TRUE; - - case WM_SETCURSOR: - if (checking_pwd) - break; - SetCursor(NULL); - return TRUE; - - case WM_NCACTIVATE: - case WM_ACTIVATE: - case WM_ACTIVATEAPP: - if (wParam != FALSE) - break; + if (!wParam) + { + // wParam is FALSE, so the screensaver is losing the focus. + PostMessage(hWnd, WM_CLOSE, 0, 0); + } + break; case WM_MOUSEMOVE: { @@ -352,86 +109,141 @@ GetCursorPos(&pt); if (pt.x == pt_orig.x && pt.y == pt_orig.y) break; + + // Fall through } case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: case WM_MBUTTONDOWN: case WM_KEYDOWN: - case WM_SYSKEYDOWN: - /* try to terminate screen saver */ - if (!checking_pwd) - PostMessage(hWnd, WM_CLOSE, 0, 0); - break; - } - - return DefWindowProc(hWnd, msg, wParam, lParam); -} - -static void TerminateScreenSaver(HWND hWnd) -{ - /* don't allow recursion */ - if (checking_pwd || closing) - return; - - /* verify password */ - if (VerifyScreenSavePwd) - { - checking_pwd = TRUE; - closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); - checking_pwd = FALSE; - } - else - closing = TRUE; - - /* are we closing? */ - if (closing) - { - DestroyWindow(hWnd); - } - else - GetCursorPos(&pt_orig); /* if not: get new mouse position */ -} - -/* - Register screen saver window class and call user - supplied hook. - */ -static BOOL RegisterClasses(void) -{ - WNDCLASS cls; - ZeroMemory(&cls, sizeof(cls)); - cls.hCursor = NULL; - cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); - cls.lpszMenuName = NULL; + case WM_KEYUP: + // Send a WM_CLOSE to close the screen saver (allows the screensaver author to do clean-up tasks) + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; + + case WM_SETCURSOR: + SetCursor(NULL); + return TRUE; + } + + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + +// Registers the screen saver window class +static BOOL RegisterScreenSaverClass(void) +{ + WNDCLASS cls = {0,}; + + cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); cls.lpszClassName = CLASS_SCRNSAVE; - cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); + cls.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); cls.hInstance = hMainInstance; cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; - cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; - cls.cbWndExtra = 0; - cls.cbClsExtra = 0; - - if (!RegisterClass(&cls)) - return FALSE; - - return RegisterDialogClasses(hMainInstance); -} - -void WINAPI ScreenSaverChangePassword(HWND hParent) -{ - /* load Master Password Router (MPR) */ - HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); - - if (hMpr) - { - CHPWDPROC ChangePassword; - ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); - - /* change password for screen saver provider */ - if (ChangePassword) - ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); - - FreeLibrary(hMpr); - } -} + cls.lpfnWndProc = (WNDPROC)SysScreenSaverProc; + + return RegisterClass(&cls) != 0; +} + +static void LaunchConfig(void) +{ + // Only show the dialog if the RegisterDialogClasses function succeeded. + // This is the same behaviour as MS' scrnsave.lib. + if( RegisterDialogClasses(hMainInstance) ) + DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); +} + +static int LaunchScreenSaver(HWND hParent) +{ + UINT style; + RECT rc; + MSG msg; + + if (!RegisterScreenSaverClass()) + { + MessageBox(NULL, TEXT("RegisterClass() failed"), NULL, MB_ICONHAND); + return 1; + } + + // A slightly different approach needs to be used when displaying in a preview window + if (hParent) + { + style = WS_CHILD; + GetClientRect(hParent, &rc); + } + else + { + style = WS_POPUP; + rc.right = GetSystemMetrics(SM_CXSCREEN); + rc.bottom = GetSystemMetrics(SM_CYSCREEN); + style |= WS_VISIBLE; + } + + // Create the main screen saver window + hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, + TEXT("SCREENSAVER"), style, + 0, 0, rc.right, rc.bottom, hParent, NULL, + hMainInstance, NULL); + + // Display window and start pumping messages + if (hMainWindow) + { + ShowWindow(hMainWindow, SW_SHOW); + + while (GetMessage(&msg, NULL, 0, 0)) + DispatchMessage(&msg); + } + + return msg.wParam; +} + +// Screen Saver entry point +int APIENTRY _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR CmdLine, int nCmdShow) +{ + LPTSTR p; + + hMainInstance = hInst; + + // Parse the arguments + for (p = CmdLine; *p; p++) + { + switch (*p) + { + case 'S': + case 's': + // Start the screen saver + return LaunchScreenSaver(NULL); + + case 'P': + case 'p': + { + // Start the screen saver in preview mode + HWND hParent; + fChildPreview = TRUE; + + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + + if (hParent && IsWindow(hParent)) + return LaunchScreenSaver(hParent); + } + return 0; + + case 'C': + case 'c': + // Display the configuration dialog + LaunchConfig(); + return 0; + + case '-': + case '/': + case ' ': + default: + break; + } + } + + LaunchConfig(); + + return 0; +} Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Thu Feb 21 00:43:41 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="scrnsave" type="staticlibrary"> - <file>scrnsave.c</file> -</module> + <module name="scrnsave" type="staticlibrary" unicode="yes"> + <file>scrnsave.c</file> + </module> </group> Modified: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild (original) +++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild Thu Feb 21 00:43:41 2008 @@ -1,15 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr"> +<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="yes"> <importlibrary definition="scrnsave.def" /> <library>scrnsave</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> - <library>opengl32</library> - <library>glu32</library> - <library>advapi32</library> - <library>shell32</library> <file>scrnsave.c</file> <file>scrnsave.rc</file> Modified: trunk/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/bg-BG.rc Thu Feb 21 00:43:41 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Blank" - IDS_TITLE "Çà" IDS_TEXT "Íÿìà âúçìîæíîñò çà íàñòðîéêè." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/de-DE.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/de-DE.rc Thu Feb 21 00:43:41 2008 @@ -2,7 +2,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Blank" - IDS_TITLE "Über" + IDS_DESCRIPTION "Schwarzer Bildschirm" IDS_TEXT "Keinerlei Einstellungen notwendig." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/en-US.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/en-US.rc Thu Feb 21 00:43:41 2008 @@ -2,7 +2,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Blank" - IDS_TITLE "About" + IDS_DESCRIPTION "Blank screen" IDS_TEXT "No options need to be set." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/es-ES.rc Thu Feb 21 00:43:41 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "En blanco" - IDS_TITLE "Acerca de" IDS_TEXT "Ninguna opción necesita ser configurada." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/fr-FR.rc Thu Feb 21 00:43:41 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Vide" - IDS_TITLE "À propos de" IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/lt-LT.rc Thu Feb 21 00:43:41 2008 @@ -12,6 +12,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Tuðèias" - IDS_TITLE "Apie" IDS_TEXT "Nëra keièiamø parametrø." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/nl-NL.rc Thu Feb 21 00:43:41 2008 @@ -3,6 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Blank" - IDS_TITLE "Informatie" IDS_TEXT "Geen dingen om in te stellen." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/pl-PL.rc Thu Feb 21 00:43:41 2008 @@ -10,6 +10,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Puste" - IDS_TITLE "O programie" IDS_TEXT "Brak opcji do ustawiania." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/sk-SK.rc Thu Feb 21 00:43:41 2008 @@ -7,6 +7,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Blank" - IDS_TITLE "Èo je ..." IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc Thu Feb 21 00:43:41 2008 @@ -11,6 +11,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Ïîðîæíüî" - IDS_TITLE "Ïðî" IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." END Modified: trunk/rosapps/applications/screensavers/blankscr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/resource.h (original) +++ trunk/rosapps/applications/screensavers/blankscr/resource.h Thu Feb 21 00:43:41 2008 @@ -1,4 +1,1 @@ - -#define IDS_DESCRIPTION 1 -#define IDS_TITLE 2 #define IDS_TEXT 3 Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.c (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.c Thu Feb 21 00:43:41 2008 @@ -21,38 +21,27 @@ #include <scrnsave.h> #include "resource.h" -LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - static HDC hdc; - static RECT rc; - - switch(message) - { - case WM_CREATE: - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_ERASEBKGND: - hdc = GetDC(hwnd); - GetClientRect (hwnd, &rc); - FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH)); - ReleaseDC(hwnd,hdc); - break; - case WM_PAINT: - break; - default: - return DefScreenSaverProc(hwnd, message, wParam, lParam); - } - return 0; +LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return DefScreenSaverProc(hwnd, uMsg, wParam, lParam); } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { return FALSE; } +// This function is only called one time before opening the configuration dialog. +// Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. BOOL WINAPI RegisterDialogClasses(HANDLE hInst) { - return TRUE; + TCHAR szMessage[256]; + TCHAR szTitle[25]; + + LoadString(hInst, IDS_TEXT, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + LoadString(hInst, IDS_DESCRIPTION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + + MessageBox(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); + + return FALSE; } Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.def (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.def Thu Feb 21 00:43:41 2008 @@ -1,6 +1,4 @@ NAME blankscr.SCR - -DESCRIPTION 'Blank screen saver' EXPORTS ScreenSaverProc Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc Thu Feb 21 00:43:41 2008 @@ -1,4 +1,5 @@ #include <windows.h> +#include <scrnsave.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -7,7 +8,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Default ScreenSaver\0" #define REACTOS_STR_INTERNAL_NAME "scrnsave\0" #define REACTOS_STR_ORIGINAL_FILENAME "scrnsave.scr\0" - #include <reactos/version.rc> #include "lang/bg-BG.rc"

16 years, 10 months

[janderwald] 32436: - fix a few issues to make it compilable with current RosBE - does not yet link

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 20 23:58:39 2008 New Revision: 32436 URL: http://svn.reactos.org/svn/reactos?rev=32436&view=rev Log: - fix a few issues to make it compilable with current RosBE - does not yet link Added: trunk/rosapps/fraginator/fraginator.rbuild (with props) Modified: trunk/rosapps/fraginator/Defragment.cpp trunk/rosapps/fraginator/DriveVolume.cpp trunk/rosapps/fraginator/Fraginator.cpp trunk/rosapps/fraginator/Fraginator.h trunk/rosapps/fraginator/MainDialog.cpp trunk/rosapps/fraginator/MainDialog.h trunk/rosapps/fraginator/ReportDialog.h trunk/rosapps/fraginator/Unfrag.cpp trunk/rosapps/fraginator/Unfrag.h Modified: trunk/rosapps/fraginator/Defragment.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Defragment.cpp?… ============================================================================== --- trunk/rosapps/fraginator/Defragment.cpp (original) +++ trunk/rosapps/fraginator/Defragment.cpp Wed Feb 20 23:58:39 2008 @@ -78,7 +78,6 @@ return (1); } - Defragment::Defragment (wstring Name, DefragType DefragMethod) { Method = DefragMethod; @@ -245,7 +244,7 @@ Info = Volume.GetDBFile (j); - Report.FilesFragments += max (1, Info.Fragments.size()); // add 1 fragment even for 0 bytes/0 cluster files + Report.FilesFragments += max ((size_t)1, Info.Fragments.size()); // add 1 fragment even for 0 bytes/0 cluster files if (Info.Attributes.Process == 0) continue; Modified: trunk/rosapps/fraginator/DriveVolume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/DriveVolume.cpp… ============================================================================== --- trunk/rosapps/fraginator/DriveVolume.cpp (original) +++ trunk/rosapps/fraginator/DriveVolume.cpp Wed Feb 20 23:58:39 2008 @@ -55,7 +55,7 @@ FILE_SHARE_READ | FILE_SHARE_WRITE, // share type NULL, // security descriptor OPEN_EXISTING, // open type - NULL, // attributes (none) + 0, // attributes (none) NULL // template ); @@ -222,7 +222,7 @@ NULL ); - DWORD LastError = GetLastError (); + //DWORD LastError = GetLastError (); if (Result == FALSE) { @@ -422,7 +422,7 @@ { uint64 TotalClusters = 0; - for (int i = 0; i < Info.Fragments.size(); i++) + for (size_t i = 0; i < Info.Fragments.size(); i++) { TotalClusters += Info.Fragments[i].Length; } @@ -597,9 +597,9 @@ Extents = Retrieval->ExtentCount; // Ok, we have the info. Now translate it. hrmrmr - int i; + Info.Fragments.clear (); - for (i = 0; i < Extents; i++) + for (uint64 i = 0; i < Extents; i++) { Extent Add; Modified: trunk/rosapps/fraginator/Fraginator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.cpp?… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.cpp (original) +++ trunk/rosapps/fraginator/Fraginator.cpp Wed Feb 20 23:58:39 2008 @@ -4,6 +4,7 @@ *****************************************************************************/ +#define NDEBUG #include "Fraginator.h" #include "Mutex.h" @@ -11,14 +12,15 @@ #include "Defragment.h" #include "MainDialog.h" #include "resource.h" +#ifdef _MSC_VER #include <crtdbg.h> - +#endif HINSTANCE GlobalHInstance = NULL; Defragment *Defrag = NULL; - -int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd) +INT WINAPI +wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd) { INITCOMMONCONTROLSEX InitControls; @@ -56,3 +58,4 @@ return (0); } + Modified: trunk/rosapps/fraginator/Fraginator.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.h?re… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.h (original) +++ trunk/rosapps/fraginator/Fraginator.h Wed Feb 20 23:58:39 2008 @@ -10,7 +10,7 @@ #include "unfrag.h" -#include <CommCtrl.h> +#include <commctrl.h> int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd); @@ -20,5 +20,6 @@ extern HINSTANCE GlobalHInstance; extern Defragment *Defrag; +extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd); -#endif // FRAGINATOR_H +#endif // FRAGINATOR_H Modified: trunk/rosapps/fraginator/MainDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/MainDialog.cpp?… ============================================================================== --- trunk/rosapps/fraginator/MainDialog.cpp (original) +++ trunk/rosapps/fraginator/MainDialog.cpp Wed Feb 20 23:58:39 2008 @@ -21,7 +21,7 @@ LRESULT PriIdleID; -void InitDialog (HWND Dlg); +static void InitDialog (HWND Dlg); void UpdateDefragInfo (HWND Dlg); void UpdatePriority (HWND Dlg); wstring GetDefaultTitle (void); @@ -35,7 +35,7 @@ // Make internal list DWORD DriveMask; HWND DlgItem; - int d; + size_t d; // Clear out wisecracks line for now SetDlgItemText (Dlg, IDC_WISECRACKS, L"\"Defrag, baby!\""); Modified: trunk/rosapps/fraginator/MainDialog.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/MainDialog.h?re… ============================================================================== --- trunk/rosapps/fraginator/MainDialog.h (original) +++ trunk/rosapps/fraginator/MainDialog.h Wed Feb 20 23:58:39 2008 @@ -11,4 +11,4 @@ INT_PTR CALLBACK MainDialogProc (HWND Dlg, UINT Msg, WPARAM WParam, LPARAM LParam); -#endif // MAINDIALOG_H +#endif // MAINDIALOG_H Modified: trunk/rosapps/fraginator/ReportDialog.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/ReportDialog.h?… ============================================================================== --- trunk/rosapps/fraginator/ReportDialog.h (original) +++ trunk/rosapps/fraginator/ReportDialog.h Wed Feb 20 23:58:39 2008 @@ -15,4 +15,4 @@ INT_PTR CALLBACK ReportDialogProc (HWND Dlg, UINT Msg, WPARAM WParam, LPARAM LParam); -#endif // REPORTDIALOG_H +#endif // REPORTDIALOG_H Modified: trunk/rosapps/fraginator/Unfrag.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Unfrag.cpp?rev=… ============================================================================== --- trunk/rosapps/fraginator/Unfrag.cpp (original) +++ trunk/rosapps/fraginator/Unfrag.cpp Wed Feb 20 23:58:39 2008 @@ -49,7 +49,7 @@ { wchar_t Temp[128]; int TempLen; - wchar_t *p = NULL; + //wchar_t *p = NULL; int AddCommas = 0; wchar_t *StrPosResult = NULL; wchar_t *StrPosOrig = NULL; Modified: trunk/rosapps/fraginator/Unfrag.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Unfrag.h?rev=32… ============================================================================== --- trunk/rosapps/fraginator/Unfrag.h (original) +++ trunk/rosapps/fraginator/Unfrag.h Wed Feb 20 23:58:39 2008 @@ -10,8 +10,9 @@ // Blah blah blah your template name is too long ... SO WHAT +#ifdef _MSC_VER #pragma warning (disable: 4786) - +#endif // I forget what this disables #ifdef __ICL @@ -20,17 +21,19 @@ // Hello Mr. Platform SDK, please let us use Windows 2000 only features +#if 0 #ifndef WINVER #define WINVER 0x0500 #define _WIN32_WINNT 0x0500 #endif - +#endif #include <windows.h> #include <string> #include <stdio.h> #include <stdlib.h> - +//#include <initguid.h> +#include <winioctl.h> #define APPNAME_CLI L"Unfrag" #define APPNAME_GUI L"Fraginator" Added: trunk/rosapps/fraginator/fraginator.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/fraginator.rbui… ============================================================================== --- trunk/rosapps/fraginator/fraginator.rbuild (added) +++ trunk/rosapps/fraginator/fraginator.rbuild Wed Feb 20 23:58:39 2008 @@ -1,0 +1,33 @@ +<?xml version="1.0"?> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes"> + <include base="frag">.</include> + <define name="__USE_W32API" /> + <define name="WINVER">0x0501</define> + <define name="_WIN32_IE">0x0600</define> + <library>kernel32</library> + <library>advapi32</library> + <library>ntdll</library> + <library>comctl32</library> + <library>msvcrt</library> + <file>Fraginator.cpp</file> + <file>MainDialog.cpp</file> + <file>Defragment.cpp</file> + <file>DriveVolume.cpp</file> + <file>ReportDialog.cpp</file> + <file>Unfrag.cpp</file> + </module> + + <module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes"> + <include base="unfrag">.</include> + <define name="__USE_W32API" /> + <define name="WINVER">0x0501</define> + <define name="_WIN32_IE">0x0600</define> + <library>kernel32</library> + <library>advapi32</library> + <library>ntdll</library> + <file>Unfrag.cpp</file> + <file>Defragment.cpp</file> + <file>DriveVolume.cpp</file> + </module> +</group> Propchange: trunk/rosapps/fraginator/fraginator.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 10 months

[jimtabor] 32435: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): CLeanup win32k. Remove xpstubs.c.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 20 23:53:36 2008 New Revision: 32435 URL: http://svn.reactos.org/svn/reactos?rev=32435&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): CLeanup win32k. Remove xpstubs.c. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Wed Feb 20 23:53:36 2008 @@ -11,43 +11,32 @@ */ /* - * @implemented - * + * @unimplemented */ -INT +int STDCALL -SetDIBitsToDevice( - HDC hDC, - int XDest, - int YDest, - DWORD Width, - DWORD Height, - int XSrc, - int YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *lpbmi, - UINT ColorUse) +SetDIBits(HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) { - return NtGdiSetDIBitsToDeviceInternal(hDC, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)Bits, - (LPBITMAPINFO)lpbmi, - ColorUse, - lpbmi->bmiHeader.biSizeImage, - lpbmi->bmiHeader.biSize, - FALSE, - NULL); + /* FIXME share memory */ + return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); } +HBITMAP +STDCALL +CreateDIBitmap(HDC hDc, + const BITMAPINFOHEADER *Header, + DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, + UINT ColorUse) +{ + /* FIMXE we need do more thing in user mode */ + return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); +} /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Feb 20 23:53:36 2008 @@ -47,20 +47,41 @@ } /* - * @unimplemented - */ -int -STDCALL -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - /* FIXME share memory */ - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); + * @implemented + * + */ +INT +STDCALL +SetDIBitsToDevice( + HDC hDC, + int XDest, + int YDest, + DWORD Width, + DWORD Height, + int XSrc, + int YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *lpbmi, + UINT ColorUse) +{ + return NtGdiSetDIBitsToDeviceInternal(hDC, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + (LPBYTE)Bits, + (LPBITMAPINFO)lpbmi, + ColorUse, + lpbmi->bmiHeader.biSizeImage, + lpbmi->bmiHeader.biSize, + FALSE, + NULL); } /* @@ -1770,17 +1791,6 @@ } -HBITMAP -STDCALL -CreateDIBitmap(HDC hDc, - const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) -{ - /* FIMXE we need do more thing in user mode */ - return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); -} - /* * @unimplemented */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Wed Feb 20 23:53:36 2008 @@ -2986,4 +2986,12 @@ return FALSE; } - +BOOL +STDCALL +EngControlSprites( + IN WNDOBJ *pwo, + IN FLONG fl) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/xpstubs.c Wed Feb 20 23:53:36 2008 @@ -1,20 +1,0 @@ -/* - * Stubs for unimplemented WIN32K.SYS exports that are only available - * in Windows XP and beyond ( i.e. a low priority for us right now ) - */ - -#include <w32k.h> - -#define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); } -#define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) - -BOOL -STDCALL -EngControlSprites( - IN WNDOBJ *pwo, - IN FLONG fl) -{ - UNIMPLEMENTED; - return FALSE; -} - Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Wed Feb 20 23:53:36 2008 @@ -170,7 +170,6 @@ </directory> <directory name="stubs"> <file>stubs.c</file> - <file>xpstubs.c</file> </directory> </module> <module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true">

16 years, 10 months

[frik85] 32434: peoplemap lang update

by frik85＠svn.reactos.org

Author: frik85 Date: Wed Feb 20 23:16:40 2008 New Revision: 32434 URL: http://svn.reactos.org/svn/reactos?rev=32434&view=rev Log: peoplemap lang update Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php Wed Feb 20 23:16:40 2008 @@ -1,4 +1,4 @@ -<?php +ï»¿<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GPL v2 or any later version @@ -13,41 +13,41 @@ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS People Map'; $peoplemap_langres["title"] = "Mapa de Usuarios de ReactOS"; - $peoplemap_langres["intro"] = "El siguiente mapa muestra la localización de los distintos usuarios y desarrolladores de ReactOS."; + $peoplemap_langres["intro"] = "El siguiente mapa muestra la localizaciÃ³n de los distintos usuarios y desarrolladores de ReactOS."; $peoplemap_langres["filter"] = "Filtrar por grupos de usuarios"; $peoplemap_langres["filter_intro"] = "Haz click en la casilla situada al lado de un grupo de usuarios para visualizarlos en el mapa o quitarlos."; - $peoplemap_langres["add"] = "Buscar un usuario y añadirlo al mapa"; + $peoplemap_langres["add"] = "Buscar un usuario y aÃ±adirlo al mapa"; $peoplemap_langres["add_username"] = "Nombre de usuario"; $peoplemap_langres["add_fullname"] = "Nombre completo"; - $peoplemap_langres["mylocation"] = "Mi ubicación en el mapa"; - $peoplemap_langres["mylocation_login"] = "Debes iniciar sesión para situarte en el mapa."; - $peoplemap_langres["mylocation_login_page"] = "Página de Inicio de Sesión."; - $peoplemap_langres["mylocation_intro"] = "Aquí puedes situarte en el mapa. Tienes varias posibilidades para ello:"; - $peoplemap_langres["mylocation_marker_intro"] = "Usa un marcador y arrastralo a tu ubicación sobre el mapa."; + $peoplemap_langres["mylocation"] = "Mi ubicaciÃ³n en el mapa"; + $peoplemap_langres["mylocation_login"] = "Debes iniciar sesiÃ³n para situarte en el mapa."; + $peoplemap_langres["mylocation_login_page"] = "PÃ¡gina de Inicio de SesiÃ³n."; + $peoplemap_langres["mylocation_intro"] = "AquÃ puedes situarte en el mapa. Tienes varias posibilidades para ello:"; + $peoplemap_langres["mylocation_marker_intro"] = "Usa un marcador y arrastralo a tu ubicaciÃ³n sobre el mapa."; $peoplemap_langres["mylocation_marker_button"] = "Usa un marcador"; - $peoplemap_langres["mylocation_marker_save_intro"] = "Haz click en este botón para guardar tu ubicación."; - $peoplemap_langres["mylocation_marker_save_button"] = "Guardar mi ubicación"; + $peoplemap_langres["mylocation_marker_save_intro"] = "Haz click en este botÃ³n para guardar tu ubicaciÃ³n."; + $peoplemap_langres["mylocation_marker_save_button"] = "Guardar mi ubicaciÃ³n"; $peoplemap_langres["mylocation_marker_cancel"] = "Cancelar"; - $peoplemap_langres["mylocation_coordinates_intro"] = "Introduce las coordenaddas en grados decimales:"; + $peoplemap_langres["mylocation_coordinates_intro"] = "Introduce las coordenadas en grados decimales:"; $peoplemap_langres["mylocation_coordinates_button"] = "Fijar"; - $peoplemap_langres["mylocation_coordinates_invalid"] = "¡Las coordenadas no son válidas!"; - $peoplemap_langres["mylocation_delete_intro"] = "Con el siguiente botón, puedes eliminar tu posición en el mapa."; - $peoplemap_langres["mylocation_delete_button"] = "Eliminar mi ubicación"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "Â¡Las coordenadas no son vÃ¡lidas!"; + $peoplemap_langres["mylocation_delete_intro"] = "Con el siguiente botÃ³n, puedes eliminar tu posiciÃ³n en el mapa."; + $peoplemap_langres["mylocation_delete_button"] = "Eliminar mi ubicaciÃ³n"; $peoplemap_langres["latitude"] = "Latitud"; $peoplemap_langres["longitude"] = "Longitud"; $peoplemap_langres["removefrommap"] = "Eliminar al usuario del mapa"; $peoplemap_langres["minquerylength"] = "Introduce al menos 3 caracteres."; - $peoplemap_langres["nousers"] = "¡No se encontró ningún usuario con esos datos!"; - $peoplemap_langres["activatejs"] = "¡Debes activar JavaScript para usar el Mapa de Usuarios!"; + $peoplemap_langres["nousers"] = "Â¡No se encontrÃ³ ningÃºn usuario con esos datos!"; + $peoplemap_langres["activatejs"] = "Â¡Debes activar JavaScript para usar el Mapa de Usuarios!"; $peoplemap_langres["unsupportedbrowser"] = "Tu navegador no soporta el Mapa de Usuarios."; $peoplemap_langres["count1"] = "Mostrando "; $peoplemap_langres["count2"] = " de "; - $peoplemap_langres["count3"] = " usuarios con datos de ubicación (de "; + $peoplemap_langres["count3"] = " usuarios con datos de ubicaciÃ³n (de "; $peoplemap_langres["count4"] = " usuarios en total)"; $peoplemap_langres["icons"] = "Icono a utilizar:"; ?>

16 years, 10 months

[frik85] 32433: * add spanish language to peoplemap (translator: Javier Fernandez aka Elhoir)

by frik85＠svn.reactos.org

Author: frik85 Date: Wed Feb 20 22:55:39 2008 New Revision: 32433 URL: http://svn.reactos.org/svn/reactos?rev=32433&view=rev Log: * add spanish language to peoplemap (translator: Javier Fernandez aka Elhoir) Added: trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Added: trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php Wed Feb 20 22:55:39 2008 @@ -1,0 +1,53 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/lang/es.inc.php + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Javier Fernandez +*/ + + /**** English resources (charset=utf-8) ****/ + $peoplemap_langres["language"] = "Idioma"; + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS People Map'; + $peoplemap_langres["title"] = "Mapa de Usuarios de ReactOS"; + $peoplemap_langres["intro"] = "El siguiente mapa muestra la localización de los distintos usuarios y desarrolladores de ReactOS."; + + $peoplemap_langres["filter"] = "Filtrar por grupos de usuarios"; + $peoplemap_langres["filter_intro"] = "Haz click en la casilla situada al lado de un grupo de usuarios para visualizarlos en el mapa o quitarlos."; + + $peoplemap_langres["add"] = "Buscar un usuario y añadirlo al mapa"; + $peoplemap_langres["add_username"] = "Nombre de usuario"; + $peoplemap_langres["add_fullname"] = "Nombre completo"; + + $peoplemap_langres["mylocation"] = "Mi ubicación en el mapa"; + $peoplemap_langres["mylocation_login"] = "Debes iniciar sesión para situarte en el mapa."; + $peoplemap_langres["mylocation_login_page"] = "Página de Inicio de Sesión."; + $peoplemap_langres["mylocation_intro"] = "Aquí puedes situarte en el mapa. Tienes varias posibilidades para ello:"; + $peoplemap_langres["mylocation_marker_intro"] = "Usa un marcador y arrastralo a tu ubicación sobre el mapa."; + $peoplemap_langres["mylocation_marker_button"] = "Usa un marcador"; + $peoplemap_langres["mylocation_marker_save_intro"] = "Haz click en este botón para guardar tu ubicación."; + $peoplemap_langres["mylocation_marker_save_button"] = "Guardar mi ubicación"; + $peoplemap_langres["mylocation_marker_cancel"] = "Cancelar"; + $peoplemap_langres["mylocation_coordinates_intro"] = "Introduce las coordenaddas en grados decimales:"; + $peoplemap_langres["mylocation_coordinates_button"] = "Fijar"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "¡Las coordenadas no son válidas!"; + $peoplemap_langres["mylocation_delete_intro"] = "Con el siguiente botón, puedes eliminar tu posición en el mapa."; + $peoplemap_langres["mylocation_delete_button"] = "Eliminar mi ubicación"; + + $peoplemap_langres["latitude"] = "Latitud"; + $peoplemap_langres["longitude"] = "Longitud"; + $peoplemap_langres["removefrommap"] = "Eliminar al usuario del mapa"; + $peoplemap_langres["minquerylength"] = "Introduce al menos 3 caracteres."; + $peoplemap_langres["nousers"] = "¡No se encontró ningún usuario con esos datos!"; + $peoplemap_langres["activatejs"] = "¡Debes activar JavaScript para usar el Mapa de Usuarios!"; + $peoplemap_langres["unsupportedbrowser"] = "Tu navegador no soporta el Mapa de Usuarios."; + + $peoplemap_langres["count1"] = "Mostrando "; + $peoplemap_langres["count2"] = " de "; + $peoplemap_langres["count3"] = " usuarios con datos de ubicación (de "; + $peoplemap_langres["count4"] = " usuarios en total)"; + $peoplemap_langres["icons"] = "Icono a utilizar:"; +?> Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Wed Feb 20 22:55:39 2008 @@ -10,6 +10,7 @@ // The language names have to be saved in an UTF-8 file without the Byte-Order-Mark $peoplemap_languages = array( "en" => "English", - "de" => "Deutsch (German)" + "de" => "Deutsch (German)", + "es" => "EspaÃ±ol (Spanish)", ); ?>

16 years, 10 months

[janderwald] 32432: - fix compilation with msvc

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 20 22:13:52 2008 New Revision: 32432 URL: http://svn.reactos.org/svn/reactos?rev=32432&view=rev Log: - fix compilation with msvc Modified: trunk/rosapps/fraginator/DriveVolume.cpp Modified: trunk/rosapps/fraginator/DriveVolume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/DriveVolume.cpp… ============================================================================== --- trunk/rosapps/fraginator/DriveVolume.cpp (original) +++ trunk/rosapps/fraginator/DriveVolume.cpp Wed Feb 20 22:13:52 2008 @@ -48,7 +48,7 @@ RootPath = Name.c_str(); RootPath += L"\\"; - Handle = CreateFile + Handle = CreateFileW ( FileName, MAXIMUM_ALLOWED, // access @@ -71,7 +71,7 @@ BOOL Result; ReturnVal = true; - Result = GetVolumeInformation + Result = GetVolumeInformationW ( RootPath.c_str(), VolName, @@ -140,7 +140,7 @@ DWORD FreeClusters; DWORD TotalClusters; - Result = GetDiskFreeSpace + Result = GetDiskFreeSpaceW ( RootPath.c_str(), &SectorsPerCluster, @@ -155,7 +155,7 @@ VolInfo.ClusterSize = SectorsPerCluster * BytesPerSector; - Result = GetDiskFreeSpaceEx + Result = GetDiskFreeSpaceExW ( RootPath.c_str(), (PULARGE_INTEGER)&nan, @@ -367,7 +367,7 @@ bool DriveVolume::ScanDirectory (wstring DirPrefix, ScanCallback Callback, void *UserData) { - WIN32_FIND_DATA FindData; + WIN32_FIND_DATAW FindData; HANDLE FindHandle; wstring SearchString; uint32 DirIndice; @@ -377,7 +377,7 @@ SearchString = DirPrefix; SearchString += L"*.*"; ZeroMemory (&FindData, sizeof (FindData)); - FindHandle = FindFirstFile (SearchString.c_str(), &FindData); + FindHandle = FindFirstFileW (SearchString.c_str(), &FindData); if (FindHandle == INVALID_HANDLE_VALUE) return (false); @@ -460,7 +460,7 @@ ScanDirectory (Dir, Callback, UserData); } - } while (FindNextFile (FindHandle, &FindData) == TRUE); + } while (FindNextFileW (FindHandle, &FindData) == TRUE); FindClose (FindHandle); return (false); @@ -497,7 +497,7 @@ FullName = GetDBDir (Info.DirIndice) + Info.Name; - Handle = CreateFile + Handle = CreateFileW ( FullName.c_str(), 0, //GENERIC_READ, @@ -688,7 +688,7 @@ */ // Open file - FileHandle = CreateFile + FileHandle = CreateFileW ( FullName.c_str (), GENERIC_READ,

16 years, 10 months

[dchapyshev] 32431: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 20 17:19:56 2008 New Revision: 32431 URL: http://svn.reactos.org/svn/reactos?rev=32431&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Feb 20 17:19:56 2008 @@ -1675,11 +1675,11 @@ {STRING_FORMATUNKNOWN, "¥¨§¢¥áâë©"}, {STRING_KB, - "KB"}, + ""}, {STRING_MB, - "MB"}, + ""}, {STRING_GB, - "GB"}, + ""}, {0, 0} };

16 years, 10 months

[tkreuzer] 32430: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - move bad ntuser syscalls in ntuser.h to the bottom - sort win32k export list alphabetically - remove Win32kInitialize and NtGdiGetAspectRatioFilterEx by myself: - add missing exports to win32k.def (all from xp)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 20 06:01:46 2008 New Revision: 32430 URL: http://svn.reactos.org/svn/reactos?rev=32430&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - move bad ntuser syscalls in ntuser.h to the bottom - sort win32k export list alphabetically - remove Win32kInitialize and NtGdiGetAspectRatioFilterEx by myself: - add missing exports to win32k.def (all from xp) Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/win32k.def Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Feb 20 06:01:46 2008 @@ -70,12 +70,6 @@ CONST BITMAPINFO * bmi, UINT Usage ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetAspectRatioFilterEx(HDC hDC, - LPSIZE AspectRatio); /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Feb 20 06:01:46 2008 @@ -249,14 +249,6 @@ DWORD NTAPI -NtUserBuildMenuItemList( - HMENU hMenu, - PVOID Buffer, - ULONG nBufSize, - DWORD Reserved); - -DWORD -NTAPI NtUserCalcMenuBar( DWORD dwUnknown1, DWORD dwUnknown2, @@ -306,28 +298,9 @@ UINT uIDEnableItem, UINT uEnable); -UINT -NTAPI -NtUserEnumClipboardFormats( - UINT format); - -DWORD -NTAPI -NtUserInsertMenuItem( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - LPCMENUITEMINFOW lpmii); - BOOL NTAPI NtUserEndMenu(VOID); - -UINT NTAPI -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags); BOOL NTAPI @@ -365,14 +338,6 @@ UINT uItemHilite, UINT uHilite); -BOOL -NTAPI -NtUserMenuInfo( - HMENU hmenu, - PROSMENUINFO lpmi, - BOOL fsog -); - int NTAPI NtUserMenuItemFromPoint( @@ -380,16 +345,6 @@ HMENU hMenu, DWORD X, DWORD Y); - -BOOL -NTAPI -NtUserMenuItemInfo( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - PROSMENUITEMINFO lpmii, - BOOL fsog -); BOOL NTAPI @@ -454,32 +409,6 @@ int y, HWND hwnd, LPTPMPARAMS lptpm); - -ULONG NTAPI -NtUserGetSystemMetrics(ULONG Index); - -ULONG_PTR NTAPI -NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); - -LONG NTAPI -NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); - -BOOL NTAPI -NtUserGetWindowRect(HWND hWnd, LPRECT Rect); - -BOOL NTAPI -NtUserGetClientRect(HWND hWnd, LPRECT Rect); - -HANDLE NTAPI -NtUserGetProp(HWND hWnd, ATOM Atom); - -BOOL NTAPI -NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); - -NTSTATUS -NTAPI -NtUserAcquireOrReleaseInputOwnership( - BOOLEAN Release); HKL NTAPI @@ -771,12 +700,6 @@ int nWidth, int nHeight); -HANDLE -NTAPI -NtUserCreateCursorIconHandle( - PICONINFO IconInfo, - BOOL Indirect); - HDESK NTAPI NtUserCreateDesktop( @@ -993,7 +916,7 @@ LPCRECT lprcClip, MONITORENUMPROC lpfnEnum, LPARAM dwData );*/ - +/* FIXME: The call below is ros-specific and should be rewritten to use the same params as the correct call above. */ INT NTAPI NtUserEnumDisplayMonitors( @@ -1282,11 +1205,6 @@ NtUserGetKeyState( DWORD Unknown0); -BOOL -NTAPI -NtUserGetLastInputInfo( - PLASTINPUTINFO plii); - DWORD NTAPI NtUserGetLayeredWindowAttributes( @@ -1313,12 +1231,6 @@ HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax); - -BOOL -NTAPI -NtUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo); DWORD NTAPI @@ -1396,13 +1308,6 @@ HWND hWnd, LONG idObject, PSCROLLBARINFO psbi); - -BOOL -NTAPI -NtUserGetScrollInfo( - HWND hwnd, - int fnBar, - LPSCROLLINFO lpsi); HDESK NTAPI @@ -1525,14 +1430,6 @@ BOOL NTAPI -NtUserKillSystemTimer -( - HWND hWnd, - UINT_PTR uIDEvent -); - -BOOL -NTAPI NtUserKillTimer ( HWND hWnd, @@ -1589,13 +1486,6 @@ DWORD dwUnknown2, DWORD dwUnknown3); -BOOL -NTAPI -NtUserGetMinMaxInfo( - HWND hwnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage); - DWORD NTAPI NtUserMNDragLeave(VOID); @@ -1611,25 +1501,6 @@ NtUserModifyUserStartupInfoFlags( DWORD Unknown0, DWORD Unknown1); - -HMONITOR -NTAPI -NtUserMonitorFromPoint( - IN POINT point, - IN DWORD dwFlags); - -HMONITOR -NTAPI -NtUserMonitorFromRect( - IN LPCRECT pRect, - IN DWORD dwFlags); - -HMONITOR -NTAPI -NtUserMonitorFromWindow( - IN HWND hWnd, - IN DWORD dwFlags); - BOOL NTAPI @@ -1844,24 +1715,6 @@ DWORD dwUnknown1, DWORD dwUnknown2); -/* FIXME: These flag constans aren't what Windows uses. */ -#define REGISTERCLASS_ANSI 2 -#define REGISTERCLASS_ALL (REGISTERCLASS_ANSI) - -RTL_ATOM NTAPI -NtUserRegisterClassEx( - CONST WNDCLASSEXW* lpwcx, - PUNICODE_STRING ClassName, - PUNICODE_STRING MenuName, - WNDPROC wpExtra, - DWORD Flags, - HMENU hMenu); - -UINT -NTAPI -NtUserRegisterClipboardFormat( - PUNICODE_STRING format); - BOOL NTAPI NtUserRegisterHotKey(HWND hWnd, @@ -1951,54 +1804,9 @@ LPINPUT pInput, INT cbSize); -typedef struct tagNTUSERSENDMESSAGEINFO -{ - BOOL HandledByKernel; - BOOL Ansi; - WNDPROC Proc; -} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; - -LRESULT NTAPI -NtUserSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - PNTUSERSENDMESSAGEINFO Info); - -BOOL -NTAPI -NtUserSendMessageCallback( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData); - -LRESULT NTAPI -NtUserSendMessageTimeout(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - UINT uFlags, - UINT uTimeout, - ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO Info); - -BOOL -NTAPI -NtUserSendNotifyMessage( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); - HWND NTAPI NtUserSetActiveWindow(HWND Wnd); -HWND NTAPI -NtUserGetActiveWindow(VOID); - DWORD NTAPI NtUserSetAppImeLevel( @@ -2007,9 +1815,6 @@ HWND NTAPI NtUserSetCapture(HWND Wnd); - -HWND NTAPI -NtUserGetCapture(VOID); ULONG_PTR NTAPI NtUserSetClassLong( @@ -2186,10 +1991,6 @@ NtUserSetShellWindowEx( HWND hwndShell, HWND hwndShellListView); - -HWND -NTAPI -NtUserGetShellWindow(); DWORD NTAPI @@ -2535,30 +2336,6 @@ NTAPI NtUserYieldTask(VOID); -DWORD NTAPI -NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); - -DWORD NTAPI -NtUserGetQueueStatus(BOOL ClearChanges); - -HWND NTAPI -NtUserGetWindow(HWND hWnd, UINT Relationship); - -HWND NTAPI -NtUserGetLastActivePopup(HWND hWnd); - -typedef struct _WNDPROC_INFO -{ - WNDPROC WindowProc; - BOOL IsUnicode; -} WNDPROC_INFO, *PWNDPROC_INFO; - -BOOL NTAPI -NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo); - -VOID NTAPI -NtUserManualGuiCheck(LONG Check); - #define NtUserGetDCBrushColor(hbr) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR) @@ -2570,20 +2347,6 @@ #define NtUserSetDCPenColor(hbr, crColor) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR) - -typedef struct _SETSCROLLBARINFO -{ - int nTrackPos; - int reserved; - DWORD rgstate[CCHILDREN_SCROLLBAR+1]; -} SETSCROLLBARINFO, *PSETSCROLLBARINFO; - -BOOL -NTAPI -NtUserSetScrollBarInfo( - HWND hwnd, - LONG idObject, - SETSCROLLBARINFO *info); /* lParam of DDE messages */ typedef struct tagKMDDEEXECUTEDATA @@ -2607,6 +2370,273 @@ } Value; } KMDDELPARAM, *PKMDDELPARAM; + + + + +/* NtUserBad +* ReactOS-specific NtUser calls which shouldn't exist. + */ + + +NTSTATUS +NTAPI +NtUserAcquireOrReleaseInputOwnership( + BOOLEAN Release); + +DWORD +NTAPI +NtUserBuildMenuItemList( + HMENU hMenu, + PVOID Buffer, + ULONG nBufSize, + DWORD Reserved); + +HANDLE +NTAPI +NtUserCreateCursorIconHandle( + PICONINFO IconInfo, + BOOL Indirect); + + +typedef struct _WNDPROC_INFO +{ + WNDPROC WindowProc; + BOOL IsUnicode; +} WNDPROC_INFO, *PWNDPROC_INFO; + +BOOL +NTAPI +NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInfo); + + +UINT +NTAPI +NtUserEnumClipboardFormats( + UINT format); + +HWND +NTAPI +NtUserGetActiveWindow(VOID); + +HWND +NTAPI +NtUserGetCapture(VOID); + +ULONG_PTR +NTAPI +NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); + +BOOL +NTAPI +NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); + +BOOL +NTAPI +NtUserGetClientRect(HWND hWnd, LPRECT Rect); + +UINT +NTAPI +NtUserGetMenuDefaultItem( + HMENU hMenu, + UINT fByPos, + UINT gmdiFlags); + +HWND +NTAPI +NtUserGetLastActivePopup(HWND hWnd); + +BOOL +NTAPI +NtUserGetLastInputInfo( + PLASTINPUTINFO plii); + +BOOL +NTAPI +NtUserGetMinMaxInfo( + HWND hwnd, + MINMAXINFO *MinMaxInfo, + BOOL SendMessage); + +BOOL +NTAPI +NtUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo); + +HANDLE +NTAPI +NtUserGetProp(HWND hWnd, ATOM Atom); + +DWORD +NTAPI +NtUserGetQueueStatus(BOOL ClearChanges); + +BOOL +NTAPI +NtUserGetScrollInfo( + HWND hwnd, + int fnBar, + LPSCROLLINFO lpsi); + +HWND +NTAPI +NtUserGetShellWindow(); + +ULONG +NTAPI +NtUserGetSystemMetrics(ULONG Index); + +HWND +NTAPI +NtUserGetWindow(HWND hWnd, UINT Relationship); + +LONG +NTAPI +NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); + +BOOL +NTAPI +NtUserGetWindowRect(HWND hWnd, LPRECT Rect); + +DWORD +NTAPI +NtUserGetWindowThreadProcessId(HWND hWnd, LPDWORD UnsafePid); + +DWORD +NTAPI +NtUserInsertMenuItem( + HMENU hMenu, + UINT uItem, + BOOL fByPosition, + LPCMENUITEMINFOW lpmii); + +BOOL +NTAPI +NtUserKillSystemTimer(HWND hWnd, UINT_PTR uIDEvent); + +VOID +NTAPI +NtUserManualGuiCheck(LONG Check); + +BOOL +NTAPI +NtUserMenuInfo( + HMENU hmenu, + PROSMENUINFO lpmi, + BOOL fsog +); + +BOOL +NTAPI +NtUserMenuItemInfo( + HMENU hMenu, + UINT uItem, + BOOL fByPosition, + PROSMENUITEMINFO lpmii, + BOOL fsog +); + +HMONITOR +NTAPI +NtUserMonitorFromPoint( + IN POINT point, + IN DWORD dwFlags); + +HMONITOR +NTAPI +NtUserMonitorFromRect( + IN LPCRECT pRect, + IN DWORD dwFlags); + +HMONITOR +NTAPI +NtUserMonitorFromWindow( + IN HWND hWnd, + IN DWORD dwFlags); + + +/* FIXME: These flag constans aren't what Windows uses. */ +#define REGISTERCLASS_ANSI 2 +#define REGISTERCLASS_ALL (REGISTERCLASS_ANSI) + +RTL_ATOM +NTAPI +NtUserRegisterClassEx( + CONST WNDCLASSEXW* lpwcx, + PUNICODE_STRING ClassName, + PUNICODE_STRING MenuName, + WNDPROC wpExtra, + DWORD Flags, + HMENU hMenu); + + +UINT +NTAPI +NtUserRegisterClipboardFormat( + PUNICODE_STRING format); + + +typedef struct tagNTUSERSENDMESSAGEINFO +{ + BOOL HandledByKernel; + BOOL Ansi; + WNDPROC Proc; +} NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; + +LRESULT NTAPI +NtUserSendMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + PNTUSERSENDMESSAGEINFO Info); + +BOOL +NTAPI +NtUserSendMessageCallback( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC lpCallBack, + ULONG_PTR dwData); + +LRESULT NTAPI +NtUserSendMessageTimeout(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uFlags, + UINT uTimeout, + ULONG_PTR *uResult, + PNTUSERSENDMESSAGEINFO Info); + + +BOOL +NTAPI +NtUserSendNotifyMessage( + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + + +typedef struct _SETSCROLLBARINFO +{ + int nTrackPos; + int reserved; + DWORD rgstate[CCHILDREN_SCROLLBAR+1]; +} SETSCROLLBARINFO, *PSETSCROLLBARINFO; + +BOOL +NTAPI +NtUserSetScrollBarInfo( + HWND hwnd, + LONG idObject, + SETSCROLLBARINFO *info); + + + #endif /* __WIN32K_NTUSER_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Wed Feb 20 06:01:46 2008 @@ -527,11 +527,4 @@ return STATUS_SUCCESS; } - -BOOLEAN STDCALL -Win32kInitialize (VOID) -{ - return TRUE; -} - /* EOF */ 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 Wed Feb 20 06:01:46 2008 @@ -1111,6 +1111,14 @@ return TRUE; } +BOOL FASTCALL +IntGetAspectRatioFilter(PDC pDC, + LPSIZE AspectRatio) +{ + UNIMPLEMENTED; + return FALSE; +} + BOOL STDCALL NtGdiGetDCPoint( HDC hDC, UINT iPoint, PPOINTL Point) { @@ -1157,6 +1165,10 @@ Ret = IntGdiGetDCOrgEx(dc, &SafePoint); break; case GdiGetAspectRatioFilter: + Ret = IntGetAspectRatioFilter(dc, &Size); + SafePoint.x = Size.cx; + SafePoint.y = Size.cy; + break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); Ret = FALSE; @@ -3339,15 +3351,6 @@ return DCB_DISABLE; /* bounding rectangle always empty */ } -BOOL -STDCALL -NtGdiGetAspectRatioFilterEx(HDC hDC, - LPSIZE AspectRatio) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @implemented */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Feb 20 06:01:46 2008 @@ -719,7 +719,6 @@ NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 NtGdiCreateDIBitmap 6 -NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.def (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.def Wed Feb 20 06:01:46 2008 @@ -2,23 +2,30 @@ ; ; win32k.def ; -; ReactOS win32k.sys +; ReactOS win32k.sys exports +; +; Currently all exports from windows xp are listed, sorted by name ; LIBRARY win32k EXPORTS +;BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 BRUSHOBJ_pvGetRbrush@4 BRUSHOBJ_ulGetBrushColor@4 CLIPOBJ_bEnum@12 CLIPOBJ_cEnumStart@20 CLIPOBJ_ppoGetPath@4 -EngAlphaBlend@28 EngAcquireSemaphore@4 EngAllocMem@12 +EngAllocPrivateUserMem@12 +;EngAllocSectionMem EngAllocUserMem@8 +EngAlphaBlend@28 EngAssociateSurface@12 EngBitBlt@44 +;EngBugCheckEx@20 EngCheckAbort@4 +;EngClearEvent@4 EngComputeGlyphSet@12 EngControlSprites@8 EngCopyBits@24 @@ -37,6 +44,7 @@ EngDeleteClip@4 EngDeleteDriverObj@12 EngDeleteEvent@4 +;EngDeleteFile@4 EngDeletePalette@4 EngDeletePath@4 EngDeleteSafeSemaphore@4 @@ -45,13 +53,21 @@ EngDeleteWnd@4 EngDeviceIoControl@28 EngDitherColor@16 +EngDxIoctl@12 EngEnumForms@24 EngEraseSurface@12 +;EngFileIoControl +;EngFileWrite EngFillPath@28 EngFindImageProcAddress@8 EngFindResource@16 +;EngFntCacheAlloc@8 +;EngFntCacheFault@8 +;EngFntCacheLookUp@8 EngFreeMem@4 EngFreeModule@4 +EngFreePrivateUserMem@8 +;EngFreeSectionMem EngFreeUserMem@4 EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage EngGetCurrentProcessId@0 @@ -64,33 +80,45 @@ EngGetPrinter@20 EngGetPrinterData@24 EngGetPrinterDataFileName@4 +;EngGetPrinterDriver@24 EngGetProcessHandle@0 +;EngGetTickCount EngGetType1FontList@24 EngGradientFill@40 +;EngHangNotification@8 EngInitializeSafeSemaphore@4 +;EngIsSemaphoreOwned@4 +;EngIsSemaphoreOwnedByCurrentThread@4 EngLineTo@36 EngLoadImage@4 EngLoadModule@4 EngLoadModuleForWrite@8 +EngLockDirectDrawSurface@4 EngLockDriverObj@4 EngLockSurface@4 +;EngLpkInstalled@0 EngMapEvent@20 EngMapFontFile@12 +;EngMapFontFileFD@12 EngMapModule@8 +;EngMapSection EngMarkBandingSurface@4 EngModifySurface@32 EngMovePointer@16 EngMulDiv@12 EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN EngMultiByteToWideChar@20 +;EngNineGrid EngPaint@20 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite +;EngQueryDeviceAttribute@24 EngQueryLocalTime@4 EngQueryPalette@16 EngQueryPerformanceCounter@4 EngQueryPerformanceFrequency@4 EngQuerySystemAttribute@8 +;EngReadStateEvent@4 EngReleaseSemaphore@4 EngRestoreFloatingPointState@4 EngSaveFloatingPointState@8 @@ -102,16 +130,19 @@ EngSetPrinterData@20 EngSort@16 EngStretchBlt@44 +;EngStretchBltROP@52 EngStrokeAndFillPath@40 EngStrokePath@32 EngTextOut@40 EngTransparentBlt@32 EngUnicodeToMultiByteN(a)20=ntoskrnl.RtlUnicodeToMultiByteN EngUnloadImage@4 +EngUnlockDirectDrawSurface@4 EngUnlockDriverObj@4 EngUnlockSurface@4 EngUnmapEvent@4 EngUnmapFontFile@4 +;EngUnmapFontFileFD@4 EngUnsecureMem@4 EngWaitForSingleObject@8 EngWideCharToMultiByte@20 @@ -145,12 +176,18 @@ FLOATOBJ_SubLong@8 FONTOBJ_cGetAllGlyphHandles@8 FONTOBJ_cGetGlyphs@20 +;FONTOBJ_pQueryGlyphAttrs@8 +;FONTOBJ_pfdg@4 FONTOBJ_pifi@4 +;FONTOBJ_pjOpenTypeTablePointer@12 FONTOBJ_pvTrueTypeFontFile@8 +;FONTOBJ_pwszFontFilePaths@4 FONTOBJ_pxoGetXform@4 FONTOBJ_vGetInfo@12 +HeapVidMemAllocAligned@20 HT_ComputeRGBGammaTable@24 HT_Get8BPPFormatPalette@16 +;HT_Get8BPPMaskPalette@24 PALOBJ_cGetColors@16 PATHOBJ_bCloseFigure@4 PATHOBJ_bEnum@8 @@ -170,9 +207,13 @@ RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN STROBJ_bEnum@12 +;STROBJ_bEnumPositionsOnly@12 +;STROBJ_bGetAdvanceWidths@16 STROBJ_dwGetCodePage@4 +;STROBJ_fxBreakExtra@4 +;STROBJ_fxCharacterExtra@4 STROBJ_vEnumStart@4 -Win32kInitialize@0 +VidMemFree@8 WNDOBJ_bEnum@12 WNDOBJ_cEnumStart@16 WNDOBJ_vSetConsumer@8 @@ -180,18 +221,14 @@ XFORMOBJ_iGetFloatObjXform@8 XFORMOBJ_iGetXform@8 XLATEOBJ_cGetPalette@16 +;XLATEOBJ_hGetColorTransform@4 XLATEOBJ_iXlate@8 XLATEOBJ_piVector@4 _abnormal_termination=NTOSKRNL._abnormal_termination _except_handler2=NTOSKRNL._except_handler2 _global_unwind2=NTOSKRNL._global_unwind2 +;_itoa@12 +;_itow@12 _local_unwind2=NTOSKRNL._local_unwind2 -EngLockDirectDrawSurface@4 -EngUnlockDirectDrawSurface@4 -EngDxIoctl@12 -EngAllocPrivateUserMem@12 -HeapVidMemAllocAligned@20 -VidMemFree@8 -EngFreePrivateUserMem@8 ;EOF

16 years, 10 months

[dreimer] 32429: Bug 3090: Czech translation for cacls, more & find by radekliska@gmail.com Usetup Polish Translation Update by Olaf Siejka

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 20 01:55:36 2008 New Revision: 32429 URL: http://svn.reactos.org/svn/reactos?rev=32429&view=rev Log: Bug 3090: Czech translation for cacls, more & find by radekliska(a)gmail.com Usetup Polish Translation Update by Olaf Siejka Added: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/setup/usetup/lang/pl-PL.h Added: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cacls/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS CACLS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cacls/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Zobrazí nebo zmìní seznamy øízení pøístupu (ACL) k souborùm\n\n\ +CACLS názvu [/T] [/E] [/C] [/G uivatel:oprávnìní [...]] [/R uivatel [...]]\n\ + [/P uivatel:oprávnìní [...]] [/D uivatel [...]]\n\ + názvu_soubori Zobrazí ACL.\n\ + /T Zmìní ACL urèených souborù\n\ + v aktuálním adresáøi a vech podadresáøích.\n\ + /E Místo nahrazení ACL jej upraví.\n\ + /C Pøi chybých odmítnutí pøístupu pokraèuje.\n\ + /G uivatel:oprávnìní Udìlí urèenému uivateli pøístupová oprávnìní.\n\ + Oprávnìní mùe být: R Èíst\n\ + W Zapisovat\n\ + C Mìnit (zapisovat)\n\ + F Úplné øízení\n\ + /R uivatel Odvolá pøístupová oprávnìní urèeného uivatele\n\ + (platné pouze s parametrem /E).\n\ + /P uivatel:oprávnìní Nahradí pøístupová oprávnìní urèeného uivatele.\n\ + Oprávnìní mùe být: N ádné\n\ + R Èíst\n\ + W Zapisovat\n\ + C Mìnit (zapisovat)\n\ + F Úplné øízení\n\ + /D uivatel Odepøe pøístup urèenému uivateli.\n\ +Pro urèení více ne jednoho souboru mohou být v pøíkazu pouity zástupné znaky.\n\ +V pøíkazu mùete urèit více ne jednoho uivatele.\n\n\ +Zkratky:\n\ + CI - Dìdit kontejner.\n\ + ACE bude dìdìno adresáøi.\n\ + OI - Dìdit objekt.\n\ + ACE bude dìdìno soubory.\n\ + IO - Pouze dìdit.\n\ + ACE se nepouije na aktuální adresáø èi soubor.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(zvlátní pøístup:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Added: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS FIND + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cmdutils/find/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Zobrazí vechny øádky souboru obsahující hledaný øetìzec.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"øetìzec\" [ soubor... ]\n\ + /C Zobrazí poèet øádkù obsahující øetìzec.\n\ + /I Ignoruje velikost písmen.\n\ + /N Èísluje zobrazené øádky, zaèíná od 1.\n\ + /V Zobrazí vechny øádky, které NEobsahují zadaný øetìec." + +IDS_NO_SUCH_FILE, "FIND: Soubor %s nebyl nalezen.\n" + +IDS_CANNOT_OPEN, "FIND: Soubor %s nelze otevøít!\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Added: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc Wed Feb 20 01:55:36 2008 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS MORE + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/cmdutils/more/lang/cs-CZ.rc + * PURPOSE: Czech Language File for PROJECT + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-02-17 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "Zobrazí výstup po jednotlivých stránkách na obrazovku.\n\n\ + MORE < [Jednotka:][Cesta]Název souboru\n\ + Pøíkaz | MORE \n\ + MORE [Jednotka:][Cesta]Název souboru\n\n\ + [Jednotka:][Cesta]Název souboru Soubor, jeho obsah bude zobrazen.\n\ + Pøíkaz\t\t Pøíkaz, jeho výstup bude zobrazen.\n\n\ + Pøi výzvì ""-- Pokraèovat --"" lze stisknout libovolnou klávesu\n\ + pro zobrazení dalí stránky.\n" + + IDS_CONTINUE, " -- Pokraèovat (100%) -- " + IDS_FILE_ACCESS, "Nelze získat pøístup k souboru %s." +END Propchange: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Wed Feb 20 01:55:36 2008 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Feb 20 01:55:36 2008 @@ -1675,13 +1675,13 @@ {STRING_UNPSPACE, " Miejsce poza partycjami %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "MB (maks. %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nowa (Niesformatowana)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Nieu¾yte"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "Nieznane"}, {STRING_KB, "KB"}, {STRING_MB,

16 years, 10 months

[tkreuzer] 32428: Remove typecasts PBITMAPOBJ <-> PSURFOBJ. Use GDIOBJ_ShareLockObj / _UnlockObjByPtr instead of Eng(Un)LockSurface as BITMAPOBJ_Un/LockObj. Add BASEOBJECT to the BITMAPOBJ structure.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 20 01:21:39 2008 New Revision: 32428 URL: http://svn.reactos.org/svn/reactos?rev=32428&view=rev Log: Remove typecasts PBITMAPOBJ <-> PSURFOBJ. Use GDIOBJ_ShareLockObj / _UnlockObjByPtr instead of Eng(Un)LockSurface as BITMAPOBJ_Un/LockObj. Add BASEOBJECT to the BITMAPOBJ structure. Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c Wed Feb 20 01:21:39 2008 @@ -47,7 +47,7 @@ RECT_ENUM RectEnum; BOOL EnumMore; BLTINFO BltInfo; - BITMAPOBJ *DestObj = NULL; + BITMAPOBJ *DestObj; BITMAPOBJ *SourceObj; ASSERT(Dest != NULL && Source != NULL && DestRect != NULL && SourcePoint != NULL); @@ -57,11 +57,13 @@ MouseSafetyOnDrawStart(Source, SourcePoint->x, SourcePoint->y, (SourcePoint->x + abs(DestRect->right - DestRect->left)), (SourcePoint->y + abs(DestRect->bottom - DestRect->top))); + + DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); if (Dest != Source) - { - DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); + { BITMAPOBJ_LockBitmapBits(DestObj); - } + } + MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, @@ -76,17 +78,16 @@ if(Dest->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - /* FIXME: Remove typecast. */ - if (((BITMAPOBJ*)Dest)->flHooks & HOOK_COPYBITS) + if (DestObj->flHooks & HOOK_COPYBITS) { ret = GDIDEVFUNCS(Dest).CopyBits( Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -98,17 +99,16 @@ if(Source->iType!=STYPE_BITMAP) { /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - /* FIXME: Remove typecast. */ - if (((BITMAPOBJ*)Source)->flHooks & HOOK_COPYBITS) + if (SourceObj->flHooks & HOOK_COPYBITS) { ret = GDIDEVFUNCS(Source).CopyBits( Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -123,9 +123,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -157,9 +157,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -176,9 +176,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { - BITMAPOBJ_UnlockBitmapBits(DestObj); - } + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -214,9 +214,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); @@ -225,9 +225,9 @@ MouseSafetyOnDrawEnd(Dest); if (Dest != Source) - { + { BITMAPOBJ_UnlockBitmapBits(DestObj); - } + } MouseSafetyOnDrawEnd(Source); BITMAPOBJ_UnlockBitmapBits(SourceObj); Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c Wed Feb 20 01:21:39 2008 @@ -25,11 +25,11 @@ BOOL STDCALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, - SURFOBJ *DestObj, + SURFOBJ *DestSurf, RECTL *DestRect, BOOL ReadOnly, POINTL *Translate, - SURFOBJ **OutputObj) + SURFOBJ **OutputSurf) { LONG Exchange; SIZEL BitmapSize; @@ -51,22 +51,22 @@ DestRect->bottom = Exchange; } - if (NULL != DestObj && STYPE_BITMAP != DestObj->iType && - (NULL == DestObj->pvScan0 || 0 == DestObj->lDelta)) + if (NULL != DestSurf && STYPE_BITMAP != DestSurf->iType && + (NULL == DestSurf->pvScan0 || 0 == DestSurf->lDelta)) { /* Driver needs to support DrvCopyBits, else we can't do anything */ - /* FIXME: Remove typecast! */ - if (!(((BITMAPOBJ*)DestObj)->flHooks & HOOK_COPYBITS)) - { + BITMAPOBJ *DestBmp = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + if (!(DestBmp->flHooks & HOOK_COPYBITS)) + { return FALSE; - } + } /* Allocate a temporary bitmap */ BitmapSize.cx = DestRect->right - DestRect->left; BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat)); + Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestSurf->iBitmapFormat)); EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, - DestObj->iBitmapFormat, + DestSurf->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); if (!EnterLeave->OutputBitmap) @@ -75,7 +75,7 @@ return FALSE; } - *OutputObj = EngLockSurface((HSURF)EnterLeave->OutputBitmap); + *OutputSurf = EngLockSurface((HSURF)EnterLeave->OutputBitmap); EnterLeave->DestRect.left = 0; EnterLeave->DestRect.top = 0; @@ -89,35 +89,35 @@ ClippedDestRect.left -= SrcPoint.x; SrcPoint.x = 0; } - if (DestObj->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) - { - ClippedDestRect.right = ClippedDestRect.left + DestObj->sizlBitmap.cx - SrcPoint.x; + if (DestSurf->sizlBitmap.cx < SrcPoint.x + ClippedDestRect.right - ClippedDestRect.left) + { + ClippedDestRect.right = ClippedDestRect.left + DestSurf->sizlBitmap.cx - SrcPoint.x; } if (SrcPoint.y < 0) { ClippedDestRect.top -= SrcPoint.y; SrcPoint.y = 0; } - if (DestObj->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) - { - ClippedDestRect.bottom = ClippedDestRect.top + DestObj->sizlBitmap.cy - SrcPoint.y; + if (DestSurf->sizlBitmap.cy < SrcPoint.y + ClippedDestRect.bottom - ClippedDestRect.top) + { + ClippedDestRect.bottom = ClippedDestRect.top + DestSurf->sizlBitmap.cy - SrcPoint.y; } EnterLeave->TrivialClipObj = EngCreateClip(); EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; - if (ClippedDestRect.left < (*OutputObj)->sizlBitmap.cx && + if (ClippedDestRect.left < (*OutputSurf)->sizlBitmap.cx && 0 <= ClippedDestRect.right && - SrcPoint.x < DestObj->sizlBitmap.cx && - ClippedDestRect.top <= (*OutputObj)->sizlBitmap.cy && + SrcPoint.x < DestSurf->sizlBitmap.cx && + ClippedDestRect.top <= (*OutputSurf)->sizlBitmap.cy && 0 <= ClippedDestRect.bottom && - SrcPoint.y < DestObj->sizlBitmap.cy && - ! GDIDEVFUNCS(DestObj).CopyBits( - *OutputObj, DestObj, + SrcPoint.y < DestSurf->sizlBitmap.cy && + ! GDIDEVFUNCS(DestSurf).CopyBits( + *OutputSurf, DestSurf, EnterLeave->TrivialClipObj, NULL, &ClippedDestRect, &SrcPoint)) { EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*OutputObj)->pvBits); - EngUnlockSurface(*OutputObj); + EngFreeMem((*OutputSurf)->pvBits); + EngUnlockSurface(*OutputSurf); EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); return FALSE; } @@ -132,25 +132,28 @@ { Translate->x = 0; Translate->y = 0; - *OutputObj = DestObj; - } - - if (NULL != *OutputObj - && 0 != (((BITMAPOBJ*) *OutputObj)->flHooks & HOOK_SYNCHRONIZE)) - { - if (NULL != GDIDEVFUNCS(*OutputObj).SynchronizeSurface) - { - GDIDEVFUNCS(*OutputObj).SynchronizeSurface(*OutputObj, DestRect, 0); - } - else if (STYPE_BITMAP == (*OutputObj)->iType - && NULL != GDIDEVFUNCS(*OutputObj).Synchronize) - { - GDIDEVFUNCS(*OutputObj).Synchronize((*OutputObj)->dhpdev, DestRect); - } - } - - EnterLeave->DestObj = DestObj; - EnterLeave->OutputObj = *OutputObj; + *OutputSurf = DestSurf; + } + + if (NULL != *OutputSurf) + { + BITMAPOBJ* OutputBmp = CONTAINING_RECORD(*OutputSurf, BITMAPOBJ, SurfObj); + if (0 != (OutputBmp->flHooks & HOOK_SYNCHRONIZE)) + { + if (NULL != GDIDEVFUNCS(*OutputSurf).SynchronizeSurface) + { + GDIDEVFUNCS(*OutputSurf).SynchronizeSurface(*OutputSurf, DestRect, 0); + } + else if (STYPE_BITMAP == (*OutputSurf)->iType + && NULL != GDIDEVFUNCS(*OutputSurf).Synchronize) + { + GDIDEVFUNCS(*OutputSurf).Synchronize((*OutputSurf)->dhpdev, DestRect); + } + } + } + + EnterLeave->DestObj = DestSurf; + EnterLeave->OutputObj = *OutputSurf; EnterLeave->ReadOnly = ReadOnly; return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Wed Feb 20 01:21:39 2008 @@ -575,7 +575,10 @@ EngUnlockSurface(IN SURFOBJ *Surface) { if (Surface != NULL) - GDIOBJ_UnlockObjByPtr(GdiHandleTable, Surface); + { + BITMAPOBJ *bmp = CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); + GDIOBJ_UnlockObjByPtr(GdiHandleTable, bmp); + } } Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Wed Feb 20 01:21:39 2008 @@ -5,10 +5,7 @@ /* GDI logical bitmap object */ typedef struct _BITMAPOBJ { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; + BASEOBJECT BaseObject; SURFOBJ SurfObj; FLONG flHooks; @@ -34,8 +31,11 @@ #define BITMAPOBJ_FreeBitmap(hBMObj) \ GDIOBJ_FreeObj(GdiHandleTable, (HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) /* NOTE: Use shared locks! */ -#define BITMAPOBJ_LockBitmap(hBMObj) (PBITMAPOBJ)EngLockSurface((HSURF)hBMObj) -#define BITMAPOBJ_UnlockBitmap(pBMObj) EngUnlockSurface(&pBMObj->SurfObj) +#define BITMAPOBJ_LockBitmap(hBMObj) \ + ((PBITMAPOBJ) GDIOBJ_ShareLockObj (GdiHandleTable, (HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_UnlockBitmap(pBMObj) \ + GDIOBJ_UnlockObjByPtr (GdiHandleTable, pBMObj) + BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Wed Feb 20 01:21:39 2008 @@ -928,7 +928,6 @@ #ifdef GDI_DEBUG CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS); #endif - Object = Entry->KernelData; } else { @@ -943,8 +942,8 @@ DelayExecution(); continue; } - Object = Entry->KernelData; } + Object = Entry->KernelData; } else {

16 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008