Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 06:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove much Win9x-specific stuff from the scrnsave library and make it more compatible to the MS version of the library

Browse source 
- 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.

svn path=/trunk/; revision=32437
This commit is contained in:
Colin Finck 2008-02-20 21:43:41 +00:00
parent 793ebfdd18
commit cfe2ae5fcf
35 changed files with 311 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rosapps/applications/screensavers/blankscr/blankscr.rbuild
View file

@ -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>

1
rosapps/applications/screensavers/blankscr/lang/bg-BG.rc
View file

@ -3,6 +3,5 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Blank"
IDS_TITLE "Çà"
IDS_TEXT "Íÿìà âúçìîæíîñò çà íàñòðîéêè."
END

3
rosapps/applications/screensavers/blankscr/lang/de-DE.rc
View file

@ -2,7 +2,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Blank"
IDS_TITLE "Über"
IDS_DESCRIPTION "Schwarzer Bildschirm"
IDS_TEXT "Keinerlei Einstellungen notwendig."
END

3
rosapps/applications/screensavers/blankscr/lang/en-US.rc
View file

@ -2,7 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Blank"
IDS_TITLE "About"
IDS_DESCRIPTION "Blank screen"
IDS_TEXT "No options need to be set."
END

1
rosapps/applications/screensavers/blankscr/lang/es-ES.rc
View file

@ -3,6 +3,5 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "En blanco"
IDS_TITLE "Acerca de"
IDS_TEXT "Ninguna opción necesita ser configurada."
END

1
rosapps/applications/screensavers/blankscr/lang/fr-FR.rc
View file

@ -3,6 +3,5 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Vide"
IDS_TITLE "À propos de"
IDS_TEXT "Il n'y a aucune option à définir."
END

1
rosapps/applications/screensavers/blankscr/lang/lt-LT.rc
View file

@ -12,6 +12,5 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Tuðèias"
IDS_TITLE "Apie"
IDS_TEXT "Nëra keièiamø parametrø."
END

1
rosapps/applications/screensavers/blankscr/lang/nl-NL.rc
View file

@ -3,6 +3,5 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Blank"
IDS_TITLE "Informatie"
IDS_TEXT "Geen dingen om in te stellen."
END

1
rosapps/applications/screensavers/blankscr/lang/pl-PL.rc
View file

@ -10,6 +10,5 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Puste"
IDS_TITLE "O programie"
IDS_TEXT "Brak opcji do ustawiania."
END

1
rosapps/applications/screensavers/blankscr/lang/sk-SK.rc
View file

@ -7,6 +7,5 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Blank"
IDS_TITLE "Čo je ..."
IDS_TEXT "Nie sú potrebné žiadne nastavenia."
END

1
rosapps/applications/screensavers/blankscr/lang/uk-UA.rc
View file

@ -11,6 +11,5 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
BEGIN
IDS_DESCRIPTION "Ïîðîæíüî"
IDS_TITLE "Ïðî"
IDS_TEXT "Öÿ çàñòàâêà íå ìຠíàëàøòîâóâàíèõ ïàðàìåòð³â."
END

3
rosapps/applications/screensavers/blankscr/resource.h
View file

@ -1,4 +1 @@
#define IDS_DESCRIPTION 1
#define IDS_TITLE 2
#define IDS_TEXT 3

41
rosapps/applications/screensavers/blankscr/scrnsave.c
View file

@ -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;
}

2
rosapps/applications/screensavers/blankscr/scrnsave.def
View file

@ -1,7 +1,5 @@
NAME blankscr.SCR
DESCRIPTION 'Blank screen saver'
EXPORTS
ScreenSaverProc
ScreenSaverConfigureDialog

2
rosapps/applications/screensavers/blankscr/scrnsave.rc
View file

@ -1,4 +1,5 @@
#include <windows.h>
#include <scrnsave.h>
#include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@ -7,7 +8,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#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"