[STARFIELD] Change to use scrnsave library. Tidy up all now useless stuff. Tabs -> spaces. Single language link in support added. Noticable change: Multi Monitor support!!! TBD, some user configuration stuff maybe

svn path=/trunk/; revision=67455

rosapps/applications/screensavers/starfield/CMakeLists.txt

@@ -2,5 +2,6 @@
 add_executable(starfield screensaver.c starfield.rc)
 set_module_type(starfield win32gui UNICODE)
 set_target_properties(starfield PROPERTIES SUFFIX ".scr")
+target_link_libraries(starfield scrnsave)
 add_importlibs(starfield user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET starfield DESTINATION reactos/system32 FOR all)

rosapps/applications/screensavers/starfield/resource.h

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

rosapps/applications/screensavers/starfield/screensaver.c

@@ -2,6 +2,7 @@
  *  Copyright 2003 J Brown
  *  Copyright 2006 Eric Kohl
  *  Copyright 2007 Marc Piulachs (marc.piulachs@codexchange.net)
+ *  Copyright 2015 Daniel Reimer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +21,7 @@
 
 #include <windows.h>
 #include <tchar.h>
+#include <scrnsave.h>
 #include "resource.h"
 
 #define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min))
@@ -40,9 +42,6 @@ typedef struct star
     int m_nOldX, m_nOldY;
 } STAR;
 
-HINSTANCE hInstance;
-BOOL fullscreen = FALSE;
-
 STAR *stars;
 
 int m_nTotStars;
@@ -116,7 +115,6 @@ BOOL SetUpStars (int nNumStars)
             stars[i].m_nOldY = -1;
         } while ((stars[i].m_nXPos == 0) || (stars[i].m_nYPos == 0));
     }
-
     return TRUE;
 }
 
@@ -142,11 +140,8 @@ void SetDimensions (int nWidth, int nHeight)
     m_nCenterY = nHeight / 2;
 }
 
-LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	static POINT ptLast;
-	static POINT ptCursor;
-	static BOOL  fFirstTime = TRUE;
     static HDC pDC;
 
     switch (msg)
@@ -166,6 +161,7 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             HDC pDC = BeginPaint (hwnd, &PtStr);
             DrawStarField (pDC);
             EndPaint (hwnd, &PtStr);
+            SetUpStars(250);
             return (0);
         }
         break;
@@ -197,143 +193,28 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             return 0;
         }
         break;
-		// break out of screen-saver if any keyboard activity
+        default:
-		case WM_NOTIFY:
+            return DefScreenSaverProc(hwnd, msg, wParam, lParam);
-		case WM_SYSKEYDOWN:
-		{
-			PostMessage(hwnd, WM_CLOSE, 0, 0);
-			break;
     }
-		// break out of screen-saver if any mouse activity
-		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;
 }
-	}
 
-	return DefWindowProc(hwnd, msg, wParam, lParam);
+BOOL WINAPI ScreenSaverConfigureDialog(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam)
-}
-
-
-void InitSaver(HWND hwndParent)
 {
-	WNDCLASS wc;
+    return FALSE;
-	ZeroMemory(&wc, sizeof(wc));
-	wc.style            = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc      = WndProc;
-	wc.lpszClassName    = APPNAME;
-	wc.hbrBackground    = (HBRUSH)GetStockObject(BLACK_BRUSH);
-	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 = CreateWindowEx(WS_EX_TOPMOST,
-                          APPNAME,
-                          APPNAME,
-                          WS_VISIBLE | WS_POPUP,
-                          0, 0,
-                          GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-                          HWND_DESKTOP, 0,
-                          hInstance, NULL);
-
-    SetWindowPos(hwnd,
-                 0, 0, 0, 0, 0,
-                 SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
-
-		ShowCursor(FALSE);
-		fullscreen = TRUE;
 }
 
-    SetUpStars(250);
+BOOL WINAPI RegisterDialogClasses(HANDLE hmodule)
-}
-
-//
-//	Look for any options Windows has passed to us:
-//
-//	-a <hwnd>		(set password)
-//  -s				(screensave)
-//  -p <hwnd>		(preview)
-//  -c <hwnd>		(configure)
-//
-VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
-{
-	UCHAR ch = *szCmdLine++;
-
-	if(ch == '-' || ch == '/')
-		ch = *szCmdLine++;
-
-	if(ch >= 'A' && ch <= 'Z')
-		ch += 'a' - 'A';		//convert to lower case
-
-	*chOption = ch;
-	ch = *szCmdLine++;
-
-	if(ch == ':')
-		ch = *szCmdLine++;
-
-	while(ch == ' ' || ch == '\t')
-		ch = *szCmdLine++;
-
-	if(isdigit(ch))
-	{
-		unsigned int i = _wtoi(szCmdLine - 1);
-		*hwndParent = (HWND)i;
-	}
-	else
-		*hwndParent = NULL;
-}
-
-void Configure(void)
 {
     TCHAR szTitle[256];
     TCHAR szText[256];
 
-	LoadString(hInstance,
+    LoadString(hmodule,
             IDS_TITLE,
             szTitle,
             256);
 
-	LoadString(hInstance,
+    LoadString(hmodule,
             IDS_TEXT,
             szText,
             256);
@@ -342,44 +223,5 @@ void Configure(void)
             szText,
             szTitle,
             MB_OK | MB_ICONWARNING);
-}
+    return FALSE;
-
-int CALLBACK wWinMain (HINSTANCE hInst,
-                    HINSTANCE hPrev,
-                    LPWSTR lpCmdLine,
-                    int iCmdShow)
-{
-	HWND	hwndParent;
-	UINT	nPreviousState;
-	UCHAR	chOption;
-	MSG	Message;
-
-	hInstance = hInst;
-
-	ParseCommandLine(lpCmdLine, &chOption, &hwndParent);
-
-	SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0);
-
-	switch (chOption)
-	{
-		case 's':
-			InitSaver(0);
-			break;
-
-		case 'p':
-			InitSaver(hwndParent);
-			break;
-
-		case 'c':
-		default:
-			Configure();
-			return 0;
-	}
-
-	while (GetMessage(&Message, 0, 0, 0))
-		DispatchMessage(&Message);
-
-	SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0);
-
-	return Message.wParam;
 }

rosapps/applications/screensavers/starfield/starfield.rc

@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <scrnsave.h>
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -10,18 +11,44 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #include <reactos/version.rc>
 
+#include <reactos/manifest_exe.rc>
+
 /* UTF-8 */
 #pragma code_page(65001)
 
+#ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
     #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_LT_LT
     #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
     #include "lang/nl-NL.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
     #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
+#endif