Author: pschweitzer
Date: Tue Nov 6 02:01:37 2007
New Revision: 30208
URL: http://svn.reactos.org/svn/reactos?rev=30208&view=rev
Log:
Moved last hardcoded strings to RC files
Modified:
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
trunk/tools/RosBE-Windows/Tools/config/options.c
trunk/tools/RosBE-Windows/Tools/config/resources.h
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Tue Nov 6 02:01:37 2007
@@ -29,6 +29,7 @@
- Fixed various bugs (Pierre Schweitzer)
- Moved colors names to RC files (Pierre Schweitzer)
- Added a status bar to display status of previous settings (Pierre Schweitzer)
+ - Moved last hardcoded strings to RC files (Pierre Schweitzer)
- Fixed German RC File of Options.exe. (Daniel Reimer)
- Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more than one command to make. (Daniel Reimer)
- Fixed Russian RC File of options.exe (towerr)
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Tue Nov 6 02:01:37 2007
@@ -52,4 +52,8 @@
MSG_FILEFAILED, "rosbe-options.cmd konnte nicht erstellt werden!"
MSG_DIREFAILED, "Log directory konnte nicht erstellt werden!"
MSG_SETLOADSUC, "Previous settings loaded successfully"
+ MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:"
+ MSG_FINDMGWDIR, "Please choose the directory where MingW is located:"
+ MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:"
+ MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:"
END
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Tue Nov 6 02:01:37 2007
@@ -52,4 +52,8 @@
MSG_FILEFAILED, "Failed to create rosbe-options.cmd!"
MSG_DIREFAILED, "Failed to create log directory!"
MSG_SETLOADSUC, "Previous settings loaded successfully"
+ MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:"
+ MSG_FINDMGWDIR, "Please choose the directory where MingW is located:"
+ MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:"
+ MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:"
END
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Tue Nov 6 02:01:37 2007
@@ -52,4 +52,8 @@
MSG_FILEFAILED, "Impossible de créer rosbe-options.cmd !"
MSG_DIREFAILED, "Impossible de créer le répertoire pour le journal !"
MSG_SETLOADSUC, "Paramètres précédents chargés avec succès"
+ MSG_FINDLOGDIR, "Veuillez choisir le répertoire où seront stockés les journaux :"
+ MSG_FINDMGWDIR, "Veuillez sélectionner le répertoire où se situe MingW :"
+ MSG_FINDOBJDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OBJ :"
+ MSG_FINDOUTDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OUT :"
END
Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original)
+++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Tue Nov 6 02:01:37 2007
@@ -54,4 +54,8 @@
MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd"
MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!"
MSG_SETLOADSUC, "Previous settings loaded successfully"
+ MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:"
+ MSG_FINDMGWDIR, "Please choose the directory where MingW is located:"
+ MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:"
+ MSG_FINDOUTDIR, "Please choose the directory where you want to save OBJ Files to:"
END
Modified: trunk/tools/RosBE-Windows/Tools/config/options.c
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/options.c (original)
+++ trunk/tools/RosBE-Windows/Tools/config/options.c Tue Nov 6 02:01:37 2007
@@ -319,27 +319,28 @@
BROWSEINFO PathInfo;
LPITEMIDLIST pidl;
INT Control = ID_LOGDIR;
+ INT IDText = MSG_FINDLOGDIR;
WCHAR path[MAX_PATH];
+ WCHAR Text[512];
ZeroMemory(&PathInfo, sizeof(BROWSEINFO));
PathInfo.hwndOwner = Dlg;
- PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:";
if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT))
{
HINSTANCE hDLL;
ILCREATEFROMPATHW ILCreateFromPathW;
Control = ID_MGWDIR;
- PathInfo.lpszTitle = L"Please choose the directory where MingW is located:";
+ IDText = MSG_FINDMGWDIR;
if (wParam == ID_BROWSEOBJ)
{
Control = ID_OBJDIR;
- PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:";
+ IDText = MSG_FINDOBJDIR;
}
else if (wParam == ID_BROWSEOUT)
{
Control = ID_OUTDIR;
- PathInfo.lpszTitle = L"Please choose the directory where you want to save OBJ Files to:";
+ IDText = MSG_FINDOUTDIR;
}
hDLL = LoadLibrary(L"shell32.dll");
if (hDLL)
@@ -353,6 +354,8 @@
FreeLibrary(hDLL);
}
}
+ LoadString(hInstance, IDText, Text, 512);
+ PathInfo.lpszTitle = Text;
pidl = SHBrowseForFolder(&PathInfo);
if (pidl && SHGetPathFromIDList(pidl, path))
SetDlgItemText(Dlg, Control, path);
Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/resources.h (original)
+++ trunk/tools/RosBE-Windows/Tools/config/resources.h Tue Nov 6 02:01:37 2007
@@ -55,3 +55,7 @@
#define MSG_FILEFAILED 0x28
#define MSG_DIREFAILED 0x29
#define MSG_SETLOADSUC 0x2a
+#define MSG_FINDLOGDIR 0x2b
+#define MSG_FINDMGWDIR 0x2c
+#define MSG_FINDOBJDIR 0x2d
+#define MSG_FINDOUTDIR 0x2e
Author: cfinck
Date: Tue Nov 6 01:03:16 2007
New Revision: 30202
URL: http://svn.reactos.org/svn/reactos?rev=30202&view=rev
Log:
Copy one more header from RosBE-Windows' include directory to the source tree.
This should fix building of "rostests" under Unix-based hosts.
Added:
trunk/reactos/include/crt/sys/locking.h (with props)
Added: trunk/reactos/include/crt/sys/locking.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/locking.h?…
==============================================================================
--- trunk/reactos/include/crt/sys/locking.h (added)
+++ trunk/reactos/include/crt/sys/locking.h Tue Nov 6 01:03:16 2007
@@ -1,0 +1,31 @@
+/*
+ * locking.h
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is a part of the mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within the package.
+ *
+ * Constants for the mode parameter of the locking function.
+ *
+ */
+
+#ifndef _LOCKING_H_
+#define _LOCKING_H_
+
+/* All the headers include this file. */
+#include <_mingw.h>
+
+#define _LK_UNLCK 0 /* Unlock */
+#define _LK_LOCK 1 /* Lock */
+#define _LK_NBLCK 2 /* Non-blocking lock */
+#define _LK_RLCK 3 /* Lock for read only */
+#define _LK_NBRLCK 4 /* Non-blocking lock for read only */
+
+#ifndef NO_OLDNAMES
+#define LK_UNLCK _LK_UNLCK
+#define LK_LOCK _LK_LOCK
+#define LK_NBLCK _LK_NBLCK
+#define LK_RLCK _LK_RLCK
+#define LK_NBRLCK _LK_NBRLCK
+#endif /* Not NO_OLDNAMES */
+
+#endif /* Not _LOCKING_H_ */
Propchange: trunk/reactos/include/crt/sys/locking.h
------------------------------------------------------------------------------
svn:eol-style = native
Author: cfinck
Date: Mon Nov 5 23:38:32 2007
New Revision: 30201
URL: http://svn.reactos.org/svn/reactos?rev=30201&view=rev
Log:
Remove the "#define _TYPEDEFS64_H" line, which prevented the inclusion of the former typedefs64.h, so future generations are not confused :)
Modified:
trunk/reactos/include/host/typedefs.h
Modified: trunk/reactos/include/host/typedefs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re…
==============================================================================
--- trunk/reactos/include/host/typedefs.h (original)
+++ trunk/reactos/include/host/typedefs.h Mon Nov 5 23:38:32 2007
@@ -231,6 +231,5 @@
/* Prevent inclusion of some other headers */
#define __INTERNAL_DEBUG
#define RTL_H
-#define _TYPEDEFS64_H
-
-#endif
+
+#endif