From 1e8113e6e3a1c02e69ffa23e508b0f69ecbc1e79 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Sun, 23 Oct 2005 11:55:49 +0000 Subject: [PATCH] _MAX_PATH > MAXPATH Shortcut to winemine, but commented out as winemine is broken. svn path=/trunk/; revision=18702 --- reactos/lib/syssetup/install.c | 11 +++++------ reactos/lib/syssetup/resource.h | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c index e3a819924e5..2fd930eaf35 100644 --- a/reactos/lib/syssetup/install.c +++ b/reactos/lib/syssetup/install.c @@ -400,7 +400,7 @@ InstallReactOS (HINSTANCE hInstance) { TCHAR sAccessories[256]; TCHAR sGames[256]; - TCHAR Sys[_MAX_PATH]; + TCHAR Sys[MAX_PATH]; # if 0 @@ -449,16 +449,15 @@ InstallReactOS (HINSTANCE hInstance) CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); } - if(!GetSystemDirectory(Sys, _MAX_PATH)) - Sys[0] = L'\0'; /* create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) { - if (Sys[0] != L'\0') { + if(GetSystemDirectory(Sys, MAX_PATH)) { if((_taccess(_tcscat(Sys, _T("\\sol.exe")), 0 )) != -1) CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); - - /* winemine etc .... */ + /* winemine is broken + if((_taccess(_tcscat(Sys, _T("\\winemine.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("winemine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); */ } } diff --git a/reactos/lib/syssetup/resource.h b/reactos/lib/syssetup/resource.h index 626a076f388..5eabe5ad885 100644 --- a/reactos/lib/syssetup/resource.h +++ b/reactos/lib/syssetup/resource.h @@ -20,20 +20,20 @@ #define RESOURCE_H #define IDB_WATERMARK 100 -#define IDB_HEADER 101 +#define IDB_HEADER 101 -#define IDC_STATIC -1 +#define IDC_STATIC -1 #define IDD_WELCOMEPAGE 1000 #define IDC_WELCOMETITLE 1001 -#define IDD_ACKPAGE 1010 +#define IDD_ACKPAGE 1010 #define IDC_PROJECTS 1011 -#define IDC_VIEWGPL 1012 +#define IDC_VIEWGPL 1012 #define IDD_OWNERPAGE 1020 #define IDC_OWNERNAME 1021 -#define IDC_OWNERORGANIZATION 1022 +#define IDC_OWNERORGANIZATION 1022 #define IDD_COMPUTERPAGE 1030 #define IDC_COMPUTERNAME 1031 @@ -59,11 +59,11 @@ #define IDC_FINISHTITLE 1071 -#define IDD_RESTART 2000 -#define IDC_RESTART_PROGRESS 2001 +#define IDD_RESTART 2000 +#define IDC_RESTART_PROGRESS 2001 -#define IDD_GPL 2100 -#define IDC_GPL_TEXT 2101 +#define IDD_GPL 2100 +#define IDC_GPL_TEXT 2101 #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 @@ -94,7 +94,8 @@ #define IDS_CMT_NOTEPAD 3213 #define IDS_CMT_REGEDIT 3214 #define IDS_CMT_SOLITAIRE 3215 +#define IDS_CMT_WINEMINE 3216 -#define IDR_GPL 4000 +#define IDR_GPL 4000 #endif /* RESOURCE_H */