[ros-diffs] [gedmurphy] 22157: - Temperarly add the screenshot app to the start menu - Remove the existance checks for the games as they're part of ROS now.

Author: gedmurphy
Date: Thu Jun  1 23:34:33 2006
New Revision: 22157

URL: http://svn.reactos.ru/svn/reactos?rev=22157&view=rev
Log:
- Temperarly add the screenshot app to the start menu
- Remove the existance checks for the games as they're part of ROS now.

Modified:
    trunk/reactos/dll/win32/syssetup/install.c
    trunk/reactos/dll/win32/syssetup/resource.h
    trunk/reactos/dll/win32/syssetup/syssetup_En.rc

Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/install.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c (original)
+++ trunk/reactos/dll/win32/syssetup/install.c Thu Jun  1 23:34:33 2006
@@ -373,8 +373,6 @@
 {
   TCHAR sAccessories[256];
   TCHAR sGames[256];
-  TCHAR Sys[MAX_PATH];
-  TCHAR GamePath[MAX_PATH];
     
 
 # if 0
@@ -421,29 +419,23 @@
   CreateShortcut(CSIDL_ADMINTOOLS, NULL, _T("Services.lnk"),
_T("servman.exe"), IDS_CMT_SERVMAN);
 
   /* create and fill Accessories subfolder */
-  if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) {
+  if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) 
+  {
 	CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"),
_T("calc.exe"), IDS_CMT_CALC);
 	CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"),
_T("cmd.exe"), IDS_CMT_CMD);
     CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"),
_T("notepad.exe"), IDS_CMT_NOTEPAD);
     CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"),
_T("explorer.exe"), IDS_CMT_EXPLORER);
     CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"),
_T("regedit.exe"), IDS_CMT_REGEDIT);
     CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"),
_T("wordpad.exe"), IDS_CMT_WORDPAD);
+    CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("SnapShot.lnk"),
_T("screenshot.exe"), IDS_CMT_SCREENSHOT);
   }
 
 
   /* create Games subfolder and fill if the exe is available */
-  if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) {
-	if(GetSystemDirectory(Sys, MAX_PATH)) {
-	  /* copy system dir */	
-	  _tcscpy(GamePath, Sys);
-	  /* concatonate full file path and check for existance */
-   	  if((_taccess(_tcscat(GamePath, _T("\\sol.exe")), 0 )) != -1)
-        CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"),
_T("sol.exe"), IDS_CMT_SOLITAIRE);
-      
-	  _tcscpy(GamePath, Sys);
-      if((_taccess(_tcscat(GamePath, _T("\\winemine.exe")), 0 )) != -1)
-        CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"),
_T("winemine.exe"), IDS_CMT_WINEMINE);
-	}
+  if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) 
+  {
+    CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"),
_T("sol.exe"), IDS_CMT_SOLITAIRE);
+    CreateShortcut(CSIDL_PROGRAMS, sGames, _T("WineMine.lnk"),
_T("winemine.exe"), IDS_CMT_WINEMINE);
   }
 
   CoUninitialize();

Modified: trunk/reactos/dll/win32/syssetup/resource.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/resource…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/resource.h (original)
+++ trunk/reactos/dll/win32/syssetup/resource.h Thu Jun  1 23:34:33 2006
@@ -99,6 +99,7 @@
 #define IDS_CMT_GETFIREFOX		3219
 #define IDS_CMT_SERVMAN 		3220
 #define IDS_CMT_WORDPAD 		3221
+#define IDS_CMT_SCREENSHOT 		3222
 
 #define IDS_REACTOS_SETUP		3300
 #define IDS_UNKNOWN_ERROR		3301

Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original)
+++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Thu Jun  1 23:34:33 2006
@@ -196,6 +196,7 @@
     IDS_CMT_NOTEPAD     "Launch Text Editor"
     IDS_CMT_REGEDIT     "Launch Registry Editor"
     IDS_CMT_WORDPAD     "Launch Document Editor"
+    IDS_CMT_SCREENSHOT  "Take screenshot"
 END
 
 STRINGTABLE
@@ -207,14 +208,14 @@
 
 STRINGTABLE
 BEGIN
-    IDS_REACTOS_SETUP		"ReactOS Setup"
+    IDS_REACTOS_SETUP		    "ReactOS Setup"
     IDS_UNKNOWN_ERROR           "Unknown error"
-    IDS_REGISTERING_COMPONENTS	"Registering components..."
-    IDS_LOADLIBRARY_FAILED	"LoadLibrary failed: "
-    IDS_GETPROCADDR_FAILED	"GetProcAddr failed: "
+    IDS_REGISTERING_COMPONENTS  "Registering components..."
+    IDS_LOADLIBRARY_FAILED	    "LoadLibrary failed: "
+    IDS_GETPROCADDR_FAILED	    "GetProcAddr failed: "
     IDS_REGSVR_FAILED           "DllRegisterServer failed: "
-    IDS_DLLINSTALL_FAILED	"DllInstall failed: "
-    IDS_TIMEOUT			"Timeout during registration"
+    IDS_DLLINSTALL_FAILED	    "DllInstall failed: "
+    IDS_TIMEOUT			        "Timeout during registration"
     IDS_REASON_UNKNOWN          ""
 END