From f77c414397aa4c54fa8b7cdec2b59ca85ece976f Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sat, 8 Sep 2007 19:04:47 +0000 Subject: [PATCH] - Set g_nMatrixSpeed to 10 as the default value (150 is higher than the maximum value). Same fix is also found in Version 3.0 of the original Matrix ScreenSaver. Under Windows NT, 2000 and XP up to SP1, this fix is not needed as the SetTimer behaviour is different there, but XP SP2 and Server 2003 have a different SetTimer behaviour (which now also applies to ReactOS). See http://msdn2.microsoft.com/en-us/library/ms644906.aspx for more details. - Remove all the MSVC stuff from the translation files to get them to compile with MSVC ^^ Sounds stupid, but the files include a non-existing "afxres.h", which lead to an error in MSVC. - Include in "settings.c" for malloc. - Use UCHAR values instead of int's for ParseCommandLine and chOption. MSVC has an assertion (ch >= 0 && ch <= 255) in the isdigit function, so negative values would lead to an error here. (for example, when no arguments are given and the variable contains lots of crap) We still need to "merge" the cool new stuff from Matrix 3.0 :-) svn path=/trunk/; revision=28955 --- .../screensavers/matrix/lang/bg-BG.rc | 114 ----------------- .../screensavers/matrix/lang/de-DE.rc | 118 +----------------- .../screensavers/matrix/lang/en-US.rc | 114 ----------------- .../screensavers/matrix/lang/fr-FR.rc | 114 ----------------- .../screensavers/matrix/lang/sk-SK.rc | 114 ----------------- .../screensavers/matrix/lang/th-TH.rc | 114 ----------------- .../screensavers/matrix/lang/uk-UA.rc | 114 ----------------- .../applications/screensavers/matrix/matrix.c | 4 +- .../screensavers/matrix/resource.h | 17 +-- .../applications/screensavers/matrix/rsrc.rc | 4 + .../screensavers/matrix/screensave.c | 26 ++-- .../screensavers/matrix/settings.c | 3 +- 12 files changed, 24 insertions(+), 832 deletions(-) diff --git a/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc b/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc index 7ba739f0ee6..2d165047045 100644 --- a/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc +++ b/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Bulgarian (BG) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Екранен предпазител Matrix" END - -#endif // Bulgarian (BG) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/de-DE.rc b/reactos/base/applications/screensavers/matrix/lang/de-DE.rc index c8ba32a8154..a3495518da1 100644 --- a/reactos/base/applications/screensavers/matrix/lang/de-DE.rc +++ b/reactos/base/applications/screensavers/matrix/lang/de-DE.rc @@ -1,34 +1,10 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Matrix ScreenSaver Konfiguration" +CAPTION "Matrix Bildschirmschoner-Konfiguration" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Dekodierung&sgeschwindigkeit",IDC_STATIC,7,7,133,36 @@ -70,97 +46,7 @@ BEGIN CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,143, 158, 75, 18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Matrix ScreenSaver" + IDS_DESCRIPTION "Matrix Bildschirmschoner" END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/en-US.rc b/reactos/base/applications/screensavers/matrix/lang/en-US.rc index 5b1a34acc30..2f9bb1ba08f 100644 --- a/reactos/base/applications/screensavers/matrix/lang/en-US.rc +++ b/reactos/base/applications/screensavers/matrix/lang/en-US.rc @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc b/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc index f7643f5f885..b4cb65e7ea6 100644 --- a/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc +++ b/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// French resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // French resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc b/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc index a4e94ebb679..4580a183522 100644 --- a/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc +++ b/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc @@ -6,33 +6,9 @@ * DATE OF TR: 25-07-2007 */ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -79,97 +55,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix - љetriи obrazovky" END - -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/th-TH.rc b/reactos/base/applications/screensavers/matrix/lang/th-TH.rc index 8dccdc85a94..9917d0770fe 100644 --- a/reactos/base/applications/screensavers/matrix/lang/th-TH.rc +++ b/reactos/base/applications/screensavers/matrix/lang/th-TH.rc @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Thai resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_THAI, SUBLANG_DEFAULT -#pragma code_page(874) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Matrix ScreenSaver" END - -#endif // Thai resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc b/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc index 7270020c2a9..3998a3216fb 100644 --- a/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc +++ b/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc @@ -1,30 +1,6 @@ -//Microsoft Developer Studio generated resource script. -// #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Ukrainian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -71,97 +47,7 @@ BEGIN 158,75,18 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_CONFIG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 176 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Заставка ""Матриця""" END - -#endif // Ukrainian resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/screensavers/matrix/matrix.c b/reactos/base/applications/screensavers/matrix/matrix.c index 00b37d12e26..aad0159a21a 100644 --- a/reactos/base/applications/screensavers/matrix/matrix.c +++ b/reactos/base/applications/screensavers/matrix/matrix.c @@ -304,7 +304,7 @@ LRESULT WINAPI MatrixWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) static POINT ptLast; static POINT ptCursor; static BOOL fFirstTime = TRUE; - + MATRIX *matrix = GetMatrix(hwnd); switch(msg) @@ -432,7 +432,7 @@ void InitScreenSaveClass(BOOL fPreview) wcx.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); wcx.lpszMenuName = 0; wcx.lpszClassName = APPNAME; - wcx.hIconSm = 0; + wcx.hIconSm = 0; if(fPreview) wcx.hCursor = LoadCursor(0, IDC_ARROW); diff --git a/reactos/base/applications/screensavers/matrix/resource.h b/reactos/base/applications/screensavers/matrix/resource.h index 163574a2ca7..01145362d22 100644 --- a/reactos/base/applications/screensavers/matrix/resource.h +++ b/reactos/base/applications/screensavers/matrix/resource.h @@ -1,7 +1,5 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by matrix.rc -// +#define IDC_STATIC -1 + #define IDS_DESCRIPTION 1 #define IDD_CONFIG 101 #define IDB_BITMAP1 104 @@ -22,14 +20,3 @@ #define IDC_COMBO2 1020 #define IDC_MSGSPEEDGRP 1021 #define IDC_ABOUT 1022 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1023 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/reactos/base/applications/screensavers/matrix/rsrc.rc b/reactos/base/applications/screensavers/matrix/rsrc.rc index 25464a47e98..358f08c25ff 100644 --- a/reactos/base/applications/screensavers/matrix/rsrc.rc +++ b/reactos/base/applications/screensavers/matrix/rsrc.rc @@ -3,6 +3,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" +IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" +IDI_ICON1 ICON DISCARDABLE "icon1.ico" + #include "lang/bg-BG.rc" #include "lang/en-US.rc" #include "lang/de-DE.rc" diff --git a/reactos/base/applications/screensavers/matrix/screensave.c b/reactos/base/applications/screensavers/matrix/screensave.c index 4f0e3aed625..2b4d4b3cb0a 100644 --- a/reactos/base/applications/screensavers/matrix/screensave.c +++ b/reactos/base/applications/screensavers/matrix/screensave.c @@ -21,13 +21,13 @@ //#pragma comment(linker, "/OPT:NOWIN98") // -// Added: Multimonitor support!! +// Added: Multimonitor support!! // HMONITOR (WINAPI * pfnEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); BOOL (WINAPI * pfnGetMonitorInfo)(HMONITOR, LPMONITORINFO); // -// Callback function for EnumDisplayMonitors API. Use this function +// Callback function for EnumDisplayMonitors API. Use this function // to kickstart a screen-saver window for each monitor in the system // BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, RECT *rcMonitor, LPARAM Param) @@ -100,9 +100,9 @@ BOOL ScreenSaver(HWND hwndParent) // -p (preview) // -c (configure) // -BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent) +VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) { - int ch = *szCmdLine++; + UCHAR ch = *szCmdLine++; if(ch == '-' || ch == '/') ch = *szCmdLine++; @@ -126,8 +126,6 @@ BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent) } else *hwndParent = NULL; - - return TRUE; } // @@ -135,8 +133,8 @@ BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent) // int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdShow) { - HWND hwndParent; - int chOption; + HWND hwndParent; + UCHAR chOption; // Make sure that only 1 instance runs at a time - // Win98 seems to want us to restart every 5 seconds!! @@ -151,12 +149,12 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdS switch(chOption) { - case 's': return ScreenSaver(NULL); // screen save - case 'p': return ScreenSaver(hwndParent); // preview in small window - case 'a': return ChangePassword(hwndParent); // ask for password - case 'c': return Configure(hwndParent); // configuration dialog - default: return Configure(hwndParent); // configuration dialog + case 's': return ScreenSaver(NULL); // screen save + case 'p': return ScreenSaver(hwndParent); // preview in small window + case 'a': return ChangePassword(hwndParent); // ask for password + case 'c': return Configure(hwndParent); // configuration dialog + default: return Configure(hwndParent); // configuration dialog } - return 0; + return 0; } diff --git a/reactos/base/applications/screensavers/matrix/settings.c b/reactos/base/applications/screensavers/matrix/settings.c index 87282ed64bb..c5a7aec7be3 100644 --- a/reactos/base/applications/screensavers/matrix/settings.c +++ b/reactos/base/applications/screensavers/matrix/settings.c @@ -3,6 +3,7 @@ // // Load/Save settings from registry // +#include #include #include #include "globals.h" @@ -14,7 +15,7 @@ int g_nNumMessages = 0; int g_nMessageSpeed = 5; TCHAR g_szFontName[512] = _T("Arial"); -int g_nMatrixSpeed = 150; +int g_nMatrixSpeed = 10; int g_nDensity = 32; int g_nFontSize = 12; BOOL g_fRandomizeMessages = FALSE;