Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 28050: add a NULL pointer check See issue #2508 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jul 31 01:04:38 2007 New Revision: 28050 URL: http://svn.reactos.org/svn/reactos?rev=28050&view=rev Log: add a NULL pointer check See issue #2508 for more details. Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Tue Jul 31 01:04:38 2007 @@ -512,7 +512,7 @@ HKEY hRootKey; HKEY hKey = NULL; LPNMTVDISPINFO ptvdi; - LONG lResult; + LONG lResult = ERROR_SUCCESS; TCHAR szBuffer[MAX_PATH]; ptvdi = (LPNMTVDISPINFO) lParam; @@ -531,7 +531,7 @@ { lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); } - return lResult == ERROR_SUCCESS; + return lResult; } } default: Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Tue Jul 31 01:04:38 2007 @@ -1606,6 +1606,9 @@ LPTSTR lpNewSubKey = NULL; LONG Ret = 0; + if (!lpSubKey) + return Ret; + s = _tcsrchr(lpSubKey, _T('\\')); if (s) {

17 years, 4 months

[cwittich] 28049: Norwegian translation for msgina and mmc path by Frode Lillerud (frode at enkelt dot no) See issue #2507 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jul 30 22:28:55 2007 New Revision: 28049 URL: http://svn.reactos.org/svn/reactos?rev=28049&view=rev Log: Norwegian translation for msgina and mmc path by Frode Lillerud (frode at enkelt dot no) See issue #2507 for more details. Added: trunk/reactos/base/applications/mmc/lang/nb_NO.rc trunk/reactos/dll/win32/msgina/lang/nb-NO.rc Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/dll/win32/msgina/msgina.rc Added: trunk/reactos/base/applications/mmc/lang/nb_NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/nb_NO.rc (added) +++ trunk/reactos/base/applications/mmc/lang/nb_NO.rc Mon Jul 30 22:28:55 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Avslutt\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om ReactOS Management Console...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Management Console" + IDS_CONSOLETITLE "Konsoll%1!u!" +END Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Mon Jul 30 22:28:55 2007 @@ -3,11 +3,14 @@ #include "resource.h" #include "lang/bg-BG.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" #include "lang/fr-FR.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" + + Added: trunk/reactos/dll/win32/msgina/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/nb-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/nb-NO.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/nb-NO.rc Mon Jul 30 22:28:55 2007 @@ -1,0 +1,56 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vent litt..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Velkommen til ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Trykk Control-Alt-Delete knappene",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Logg på ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt",IDCANCEL,115,122,50,14 + PUSHBUTTON "Avslutt",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Brukernavn:",IDC_STATIC,36,75,40,8 + LTEXT "Passord:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "ReactOS-sikkerhet" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Avbryt",IDCANCEL,170,95,70,14 + PUSHBUTTON "Logg av...",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Avslutt...",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Hva vil du gjøre?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Lås datamaskinen...",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Velkommen!" + IDS_LOCKEDSAS "Datamaskinen er låst" + IDS_PRESSCTRLALTDELETE "Trykk Control+Alt+Delete for å logge på." + IDS_ASKFORUSER "Brukernavn: " + IDS_ASKFORPASSWORD "Passord: " + IDS_FORCELOGOFF "Dette vil logge av gjeldende bruker, alle ulagrede data vil gå tapt. Fortsette?" +END Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Mon Jul 30 22:28:55 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" +#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

17 years, 4 months

[dreimer] 28048: Update all set /P to be the way Colin did them.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jul 30 20:48:13 2007 New Revision: 28048 URL: http://svn.reactos.org/svn/reactos?rev=28048&view=rev Log: Update all set /P to be the way Colin did them. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 20:48:13 2007 @@ -6,7 +6,7 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -::@echo off +@echo off title ReactOS Build Configurator @@ -92,7 +92,7 @@ echo *** update to the most recent one? You need to reset all your *** cho *** previously made settings. *** echo. - SET /P XY=(yes), (no) + SET /P XY="(yes), (no)" if /I "%XY%"=="yes" del "%ROSBEBASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" | goto :OK if /I "%XY%"=="no" goto :NOK goto :NOK @@ -113,7 +113,7 @@ echo. echo Right now grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P X= (), (xbox) +SET /P X="(), (xbox)" sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild" cls @@ -139,7 +139,7 @@ echo. echo Right now grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P Y= (0), (1), (2), (3), (4), (5) +SET /P Y="(0), (1), (2), (3), (4), (5)" sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild" cls @@ -148,7 +148,7 @@ echo. echo Right now grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P Z= (0), (1) +SET /P Z="(0), (1)" sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild" cls @@ -157,7 +157,7 @@ echo. echo Right now grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P A= (0), (1) +SET /P A="(0), (1)" sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild" cls @@ -167,7 +167,7 @@ echo. echo Right now grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P B= (0), (1) +SET /P B="(0), (1)" sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild" cls @@ -177,7 +177,7 @@ echo. echo Right now grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P C= (0), (1) +SET /P C="(0), (1)" sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild" cls @@ -189,7 +189,7 @@ echo. echo Right now grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P D= (0), (1) +SET /P D="(0), (1)" sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild" cls @@ -198,7 +198,7 @@ echo. echo Right now grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P E= (0), (1) +SET /P E="(0), (1)" sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild" cls @@ -212,7 +212,7 @@ echo. echo Right now grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P F= (0), (1) +SET /P F="(0), (1)" sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild" :: Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Jul 30 20:48:13 2007 @@ -83,7 +83,7 @@ ) :UP2 -SET /P XY=(yes), (no) +SET /P XY="(yes), (no)" if /I "%XY%"=="yes" %ROSBEBASEDIR%\ssvn update if /I "%XY%"=="no" goto :ExitSVN

17 years, 4 months

[cfinck] 28047: Revert w3seek's changes from r27978, mkhive segfaults with them on 64-bit systems

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 30 20:02:00 2007 New Revision: 28047 URL: http://svn.reactos.org/svn/reactos?rev=28047&view=rev Log: Revert w3seek's changes from r27978, mkhive segfaults with them on 64-bit systems Modified: trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h (original) +++ trunk/reactos/include/psdk/basetyps.h Mon Jul 30 20:02:00 2007 @@ -77,11 +77,7 @@ #include <guiddef.h> #ifndef _ERROR_STATUS_T_DEFINED -#if defined(__NO_LLP64__) -typedef unsigned int error_status_t; -#else typedef unsigned long error_status_t; -#endif #define _ERROR_STATUS_T_DEFINED #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Jul 30 20:02:00 2007 @@ -102,13 +102,8 @@ typedef short SHORT; #ifndef LONG_DEFINED #define LONG_DEFINED -#if defined(__NO_LLP64__) - typedef int LONG; - typedef unsigned int ULONG,*PULONG; -#else typedef long LONG; typedef unsigned long ULONG,*PULONG; -#endif #endif//LONG_DEFINED typedef char CCHAR, *PCCHAR; typedef unsigned char UCHAR,*PUCHAR; @@ -3849,10 +3844,9 @@ ULONG MaxIdleState; ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; +#endif typedef DWORD EXECUTION_STATE; -#endif - typedef enum _POWER_INFORMATION_LEVEL { SystemPowerPolicyAc, SystemPowerPolicyDc, Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=28… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Mon Jul 30 20:02:00 2007 @@ -33,7 +33,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES -D__NO_LLP64__ + -D__NO_CTYPE_INLINES $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild Mon Jul 30 20:02:00 2007 @@ -4,7 +4,6 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> - <define name="__NO_LLP64__" /> <pch>cmlib.h</pch> <library>rtl</library> <file>cminit.c</file> Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Mon Jul 30 20:02:00 2007 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ -D_NTSYSTEM_ -D__NO_LLP64__ \ + -D_NTOSKRNL_ -D_NTSYSTEM_ \ -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

17 years, 4 months

[weiden] 28046: Only return valid values from WM_NOTIFYFORMAT with NF_QUERY in DefWindowProc

by weiden＠svn.reactos.org

Author: weiden Date: Mon Jul 30 19:16:15 2007 New Revision: 28046 URL: http://svn.reactos.org/svn/reactos?rev=28046&view=rev Log: Only return valid values from WM_NOTIFYFORMAT with NF_QUERY in DefWindowProc Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Mon Jul 30 19:16:15 2007 @@ -1493,14 +1493,9 @@ case WM_NOTIFYFORMAT: { - if (IsWindowUnicode(hWnd)) - { - return(NFR_UNICODE); - } - else - { - return(NFR_ANSI); - } + if (lParam == NF_QUERY) + return IsWindowUnicode(hWnd) ? NFR_UNICODE : NFR_ANSI; + break; } case WM_SETICON:

17 years, 4 months

[tkreuzer] 28045: - implement NtUserHideCaret, make NtUserShowCaret prototype match XP ones. - update w32ksvc.db - update ntuser.h - remove implementations of ShowCaret and HideCaret from user32, redirectexports to nt functions - add macros for ShowCaret / HideCaret to user32p.h to resolve user32 internal references

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 19:08:14 2007 New Revision: 28045 URL: http://svn.reactos.org/svn/reactos?rev=28045&view=rev Log: - implement NtUserHideCaret, make NtUserShowCaret prototype match XP ones. - update w32ksvc.db - update ntuser.h - remove implementations of ShowCaret and HideCaret from user32, redirectexports to nt functions - add macros for ShowCaret / HideCaret to user32p.h to resolve user32 internal references Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Mon Jul 30 19:08:14 2007 @@ -119,8 +119,13 @@ #define NtUserShowCursor(bShow) \ NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) - - + +#define ShowCaret(hwnd) \ + NtUserShowCaret(hwnd) + +#define HideCaret(hwnd) \ + NtUserHideCaret(hwnd) + /* Internal Thread Data */ extern HINSTANCE User32Instance; Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Mon Jul 30 19:08:14 2007 @@ -387,7 +387,7 @@ GetWindowWord@8 GrayStringA@36 GrayStringW@36 -HideCaret@4 +HideCaret@4=NtUserHideCaret@4 HiliteMenuItem@16 IMPGetIMEA@8 IMPGetIMEW@8 @@ -662,7 +662,7 @@ SetWindowsHookExA@16 SetWindowsHookExW@16 SetWindowsHookW@8 -ShowCaret@4 +ShowCaret@4=NtUserShowCaret@4 ShowCursor@4 ShowOwnedPopups@8 ShowScrollBar@12 Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/caret.c (original) +++ trunk/reactos/dll/win32/user32/windows/caret.c Mon Jul 30 19:08:14 2007 @@ -107,16 +107,6 @@ * @implemented */ BOOL STDCALL -HideCaret(HWND hWnd) -{ - return NtUserShowCaret(hWnd, FALSE); -} - - -/* - * @implemented - */ -BOOL STDCALL SetCaretBlinkTime(UINT uMSeconds) { return NtUserSetCaretBlinkTime(uMSeconds); @@ -134,13 +124,4 @@ } -/* - * @implemented - */ -BOOL STDCALL -ShowCaret(HWND hWnd) -{ - return NtUserShowCaret(hWnd, TRUE); -} - /* EOF */ Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Mon Jul 30 19:08:14 2007 @@ -1867,8 +1867,12 @@ BOOL NTAPI NtUserShowCaret( - HWND hWnd, - BOOL bShow); + HWND hWnd); + +BOOL +NTAPI +NtUserHideCaret( + HWND hWnd); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c Mon Jul 30 19:08:14 2007 @@ -398,11 +398,9 @@ END_CLEANUP; } - - BOOL STDCALL -NtUserShowCaret(HWND hWnd OPTIONAL, BOOL bShow) +NtUserShowCaret(HWND hWnd OPTIONAL) { PWINDOW_OBJECT Window = NULL; USER_REFERENCE_ENTRY Ref; @@ -418,12 +416,9 @@ } if (Window) UserRefObjectCo(Window, &Ref); - - if (bShow) - ret = co_UserShowCaret(Window); - else - ret = co_UserHideCaret(Window); - + + ret = co_UserShowCaret(Window); + if (Window) UserDerefObjectCo(Window); RETURN(ret); @@ -433,3 +428,34 @@ UserLeave(); END_CLEANUP; } + +BOOL +STDCALL +NtUserHideCaret(HWND hWnd OPTIONAL) +{ + PWINDOW_OBJECT Window = NULL; + USER_REFERENCE_ENTRY Ref; + DECLARE_RETURN(BOOL); + BOOL ret; + + DPRINT("Enter NtUserHideCaret\n"); + UserEnterExclusive(); + + if(hWnd && !(Window = UserGetWindowObject(hWnd))) + { + RETURN(FALSE); + } + + if (Window) UserRefObjectCo(Window, &Ref); + + ret = co_UserHideCaret(Window); + + if (Window) UserDerefObjectCo(Window); + + RETURN(ret); + +CLEANUP: + DPRINT("Leave NtUserHideCaret, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Jul 30 19:08:14 2007 @@ -411,6 +411,7 @@ NtUserGetWindowLong 3 NtUserGetWindowRect 2 NtUserGetWOWClass 2 +NtUserHideCaret 1 NtUserHiliteMenuItem 4 NtUserImpersonateDdeClientWindow 2 NtUserInitializeClientPfnArrays 4 @@ -517,7 +518,7 @@ NtUserSetWindowStationUser 4 NtUserSetWindowWord 3 NtUserSetWinEventHook 8 -NtUserShowCaret 2 +NtUserShowCaret 1 NtUserShowScrollBar 3 NtUserShowWindow 2 NtUserShowWindowAsync 2

17 years, 4 months

[cfinck] 28044: - Uncomment the previously non-working "SET /P" statements - Get them to work by putting quotation marks around the arguments

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 30 19:04:48 2007 New Revision: 28044 URL: http://svn.reactos.org/svn/reactos?rev=28044&view=rev Log: - Uncomment the previously non-working "SET /P" statements - Get them to work by putting quotation marks around the arguments Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 19:04:48 2007 @@ -16,10 +16,10 @@ if "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? -:: SET /P XY=(yes), (no) -:: if /I "%XY%"=="yes" goto :CONT -:: if /I "%XY%"=="no" goto :NOK -:: goto :NOK + SET /P XY="(yes), (no)" + if /I "%XY%"=="yes" goto :CONT + if /I "%XY%"=="no" goto :NOK + goto :NOK :CONT if exist "config.rbuild" ( @@ -40,9 +40,9 @@ echo old config.rbuild will be deleted and will be updated with a recent, echo default one. You will need to reconfigure it to your wishes later. echo Continue? -:: SET /P XY=(yes), (no) -:: if /I "%XY%"=="yes" goto :CONT2 -:: if /I "%XY%"=="no" goto :NOK + SET /P XY="(yes), (no)" + if /I "%XY%"=="yes" goto :CONT2 + if /I "%XY%"=="no" goto :NOK :CONT2 del "%ROSBEBASEDIR%\*.rbuild" del "config.rbuild" @@ -71,7 +71,7 @@ echo. echo DID YOU UNDERSTAND? -SET /P XY=(yes), (no) +SET /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :OK if /I "%XY%"=="no" goto :NOK

17 years, 4 months

[hpoussin] 28043: Remove ExportDriver concept. If you want a driver which exports some functions, simply set it as kernelmodedriver and add a .def file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 30 17:18:35 2007 New Revision: 28043 URL: http://svn.reactos.org/svn/reactos?rev=28043&view=rev Log: Remove ExportDriver concept. If you want a driver which exports some functions, simply set it as kernelmodedriver and add a .def file Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/network/ndis/ndis.rbuild trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tdi/tdi.rbuild trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/drivers/video/videoprt/videoprt.rbuild trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild trunk/reactos/drivers/wmi/wmilib.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="ks" type="exportdriver" installbase="system32/drivers" installname="ks.sys" allowwarnings="true"> +<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" allowwarnings="true"> <include base="ks">.</include> <include base="ks">..</include> <include base="ks">../include</include> @@ -7,7 +7,7 @@ <define name="__USE_W32API" /> <define name="BUILDING_KS" /> <define name="_NTDDK_" /> - <define name="_COMDDK_" /> + <define name="_COMDDK_" /> <file>ks.rc</file> <file>allocators.c</file> <file>clocks.c</file> Modified: trunk/reactos/drivers/network/ndis/ndis.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.rbuild (original) +++ trunk/reactos/drivers/network/ndis/ndis.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="ndis" type="exportdriver" installbase="system32/drivers" installname="ndis.sys"> +<module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys"> <importlibrary definition="ndis.def"></importlibrary> <include base="ndis">include</include> <define name="NDIS_WRAPPER" /> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="tcpip" type="exportdriver" installbase="system32/drivers" installname="tcpip.sys"> +<module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys"> <importlibrary definition="tcpip.def"></importlibrary> <include base="tcpip">include</include> <include base="oskittcp">include</include> Modified: trunk/reactos/drivers/network/tdi/tdi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi.rb… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi.rbuild (original) +++ trunk/reactos/drivers/network/tdi/tdi.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="tdi" type="exportdriver" installbase="system32/drivers" installname="tdi.sys"> +<module name="tdi" type="kernelmodedriver" installbase="system32/drivers" installname="tdi.sys"> <importlibrary definition="misc/tdi.def"></importlibrary> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys"> +<module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="pciidex" type="exportdriver" installbase="system32/drivers" installname="pciidex.sys"> +<module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys"> <importlibrary definition="pciidex.def" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… ============================================================================== --- trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="diskdump" type="exportdriver" installbase="system32/drivers" installname="diskdump.sys"> +<module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="scsiport" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys"> +<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="_SCSIPORT_" /> Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="videoprt" type="exportdriver" installbase="system32/drivers" installname="videoprt.sys"> +<module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys"> <importlibrary definition="videoprt.def" /> <include base="videoprt">.</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="drmk" type="exportdriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true"> +<module name="drmk" type="kernelmodedriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true"> <include base="drmk">.</include> <include base="drmk">..</include> <include base="drmk">../include</include> Modified: trunk/reactos/drivers/wmi/wmilib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.rbuild?… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.rbuild (original) +++ trunk/reactos/drivers/wmi/wmilib.rbuild Mon Jul 30 17:18:35 2007 @@ -1,4 +1,4 @@ -<module name="wmilib" type="exportdriver" installbase="system32/drivers" installname="wmilib.sys"> +<module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys"> <importlibrary definition="wmilib.def" /> <include base="wmilib">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Mon Jul 30 17:18:35 2007 @@ -160,7 +160,7 @@ <file>xpstubs.c</file> </directory> </module> -<module name="win32k" type="exportdriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> +<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true"> <importlibrary definition="win32k.def" /> <library>win32k_base</library> <library>pseh</library> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jul 30 17:18:35 2007 @@ -226,7 +226,6 @@ handler = new MingwWin32OCXModuleHandler ( module ); break; case KernelModeDriver: - case ExportDriver: // maybe change this later handler = new MingwKernelModeDriverModuleHandler ( module ); break; case BootLoader: @@ -1626,7 +1625,19 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.GetTargetName () ); - if ( module.IsDLL () ) + if ( !module.IsDLL () ) + { + fprintf ( fMakefile, + "\t%s %s %s -o %s %s %s %s\n", + linker.c_str (), + linkerParameters.c_str (), + linkerScriptArgument.c_str (), + target.c_str (), + objectsMacro.c_str (), + libsMacro.c_str (), + GetLinkerMacro ().c_str () ); + } + else if ( module.HasImportLibrary () ) { string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); @@ -1661,6 +1672,12 @@ } else { + /* XXX: need to workaround binutils bug, which exports + * all functions in a dll if no .def file or an empty + * one has been provided... */ + /* See bug 1244 */ + //printf ( "%s will have all its functions exported\n", + // module.GetTargetName ().c_str () ); fprintf ( fMakefile, "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), @@ -1670,12 +1687,6 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - -#if 0 // causes crashes sometimes - fprintf ( fMakefile, - "\t${objcopy} -R .edata %s\n", - target.c_str () ); -#endif } GenerateBuildMapCode (); Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Jul 30 17:18:35 2007 @@ -43,7 +43,6 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: case NativeDLL: case NativeCUI: case Win32DLL: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Jul 30 17:18:35 2007 @@ -805,8 +805,6 @@ return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; - if ( attribute.value == "exportdriver" ) - return ExportDriver; if ( attribute.value == "kernelmodedriver" ) return KernelModeDriver; if ( attribute.value == "nativedll" ) @@ -881,7 +879,6 @@ return ".ocx"; case KernelModeDriver: case BootLoader: - case ExportDriver: return ".sys"; case BootSector: return ".o"; @@ -916,7 +913,6 @@ return "NtProcessStartup"; case KernelModeDLL: case KernelModeDriver: - case ExportDriver: return "DriverEntry@8"; case NativeDLL: return "DllMainCRTStartup@12"; @@ -978,7 +974,6 @@ return "0x00400000"; case KernelModeDLL: case KernelModeDriver: - case ExportDriver: return "0x00010000"; case BuildTool: case StaticLibrary: @@ -1014,12 +1009,11 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: case NativeDLL: case Win32DLL: case Win32OCX: + case KernelModeDriver: return true; - case KernelModeDriver: case NativeCUI: case Win32CUI: case Test: @@ -1053,7 +1047,6 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: case NativeDLL: case Win32DLL: case Win32OCX: @@ -1547,11 +1540,10 @@ switch ( type ) { case Win32DLL: - case Win32OCX: + case Win32OCX: return true; case Kernel: case KernelModeDLL: - case ExportDriver: case NativeDLL: case NativeCUI: case Win32CUI: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Jul 30 17:18:35 2007 @@ -270,7 +270,6 @@ Alias = 19, BootProgram = 20, Win32SCR = 21, - ExportDriver = 22, IdlHeader = 23, IsoRegTest = 24, LiveIsoRegTest = 25, @@ -322,7 +321,7 @@ bool allowWarnings; bool enabled; bool useHostStdlib; - bool isStartupLib; + bool isStartupLib; Module ( const Project& project, const XMLElement& moduleNode, @@ -346,7 +345,7 @@ void InvokeModule () const; void ProcessXML (); void GetSourceFilenames ( string_list& list, - bool includeGeneratedFiles ) const; + bool includeGeneratedFiles ) const; private: std::string GetDefaultModuleExtension () const; std::string GetDefaultModuleEntrypoint () const;

17 years, 4 months

[dreimer] 28042: Make output of "vol" command (more) compatible with windows (Bug 2255) from Coviti (coviti {at} gmail {dot} com)

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jul 30 17:16:42 2007 New Revision: 28042 URL: http://svn.reactos.org/svn/reactos?rev=28042&view=rev Log: Make output of "vol" command (more) compatible with windows (Bug 2255) from Coviti (coviti {at} gmail {dot} com) Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/nb-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc Mon Jul 30 17:16:42 2007 @@ -479,8 +479,8 @@ STRING_VERSION_HELP7, "\nReactOS Version programmiert von:\n" -STRING_VOL_HELP1, " Datenträger im Laufwerk %c: ist %s" -STRING_VOL_HELP2, " Datenträger im Laufwerk %c: hat keine Bezeichnung" +STRING_VOL_HELP1, " Datenträger im Laufwerk %c ist %s\n" +STRING_VOL_HELP2, " Datenträger im Laufwerk %c hat keine Bezeichnung.\n" STRING_VOL_HELP3, " Datenträger-Seriennummer: %04X-%04X\n" STRING_VOL_HELP4, "Zeigt die Laufwerksvolumebezeichnung und die Seriennummer an, falls diese existieren.\n\nVOL [drive:]" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc Mon Jul 30 17:16:42 2007 @@ -482,8 +482,8 @@ STRING_VERSION_HELP7, "\nReactOS version written by:\n" -STRING_VOL_HELP1, " Volume in drive %c: is %s" -STRING_VOL_HELP2, " Volume in drive %c: has no label" +STRING_VOL_HELP1, " Volume in drive %c is %s\n" +STRING_VOL_HELP2, " Volume in drive %c has no label.\n" STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc Mon Jul 30 17:16:42 2007 @@ -137,7 +137,7 @@ /T Sólo la muestra\n\n\ Escribe DATE sin parámetros para mostrar la fecha actual y establecer\n\ una nueva fecha. Pulsa INTRO para mantener la misma fecha.\n" - + STRING_DEL_HELP1, "Borra uno o mas archivos.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]atributos]] archivo ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]atributos]] archivo ...\n\ @@ -387,7 +387,7 @@ STRING_REN_HELP2, " %lu archivos renombrados.\n" STRING_REN_HELP3, " %lu archivos renombrados.\n" - + STRING_SHIFT_HELP, "Cambia la posición de los parámetros remplazables en un \n\ archivo por lotes.\n\n\ SHIFT [ABAJO]" @@ -481,8 +481,8 @@ STRING_VERSION_HELP7, "\nReactOS version escrita por:\n" -STRING_VOL_HELP1, " El volumen en la unidad %c: es %s" -STRING_VOL_HELP2, " El volumen en la unidad %c: no tiene etiqueta" +STRING_VOL_HELP1, " El volumen en la unidad %c es %s\n" +STRING_VOL_HELP2, " El volumen en la unidad %c no tiene etiqueta.\n" STRING_VOL_HELP3, " El número de serie del volumen es %04X-%04X\n" STRING_VOL_HELP4, "Muestra la etiqueta del volumen del disco y el número de serie si existen.\n\nVOL [unidad:]" @@ -595,7 +595,7 @@ STRING_ERROR_ERROR2, "Error de sintaxsis" STRING_FOR_ERROR1, "Falta 'in' para la declaración." STRING_FOR_ERROR2, "No se encontraron las parénteris." -STRING_FOR_ERROR3, "Falta 'do'." +STRING_FOR_ERROR3, "Falta 'do'." STRING_FOR_ERROR4, "No hay comando después de 'do'." STRING_FREE_ERROR1, "Unidad errónea." STRING_FREE_ERROR2, "Sin etiqueta" @@ -648,3 +648,4 @@ } + Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc Mon Jul 30 17:16:42 2007 @@ -142,7 +142,7 @@ Taper DATE sans paramètre pour afficher la date courante\n\ et une invite pour entrer la nouvelle date.\n\ Appuyer sur ENTREE pour conserver la même date." - + STRING_DEL_HELP1, "Efface un ou plusieurs fichiers.\n\n\ DEL [/N /P /T /Q /W /Y /Z] fichier ...\n\ DELETE [/N /P /T /Q /W /Y /Z] fichier ...\n\ @@ -481,8 +481,8 @@ STRING_VERSION_HELP7, "\nVersion ReactOS écrite par:\n" -STRING_VOL_HELP1, " Le nom de volume du lecteur %c: est %s\n" -STRING_VOL_HELP2, " Le volume dans le lecteur %c: n'a pas de nom\n" +STRING_VOL_HELP1, " Le nom de volume du lecteur %c est %s\n" +STRING_VOL_HELP2, " Le volume dans le lecteur %c n'a pas de nom\n" STRING_VOL_HELP3, " Le numéro de série du volume est %04X-%04X\n" STRING_VOL_HELP4, "Affiche le nom de volume et le numéro de série du disque s'ils existent.\n\nVOL [lecteur:]\n" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc Mon Jul 30 17:16:42 2007 @@ -130,7 +130,7 @@ /T Csak megjeleníti\n\n\ Írd be a DATE parancsot paraméter nélkül, hogy megjelenítse a rendszer dátumot és bekérjen egy újat.\n\ Nyomj ENTERT-t, ha nem akarsz változtatni.\n" - + STRING_DEL_HELP1, "Eltávolít egy vagy több állományt.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attribútumok]] állomány ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attribútumok]] állomány ...\n\ @@ -372,7 +372,7 @@ STRING_REN_HELP2, " %lu állomány átnevezve\n" STRING_REN_HELP3, " %lu állomány átnevezve\n" - + STRING_SHIFT_HELP, "Eltolja a helyettesíthetõ paraméterek pozícióját a batch állományban.\n\n\ SHIFT [DOWN]" @@ -466,7 +466,7 @@ STRING_VERSION_HELP7, "\nA ReactOS készítõi:\n" STRING_VOL_HELP1, " A (%c) meghajtóban lévõ kötet: %s\n" -STRING_VOL_HELP2, " A (%c) meghajtóban lévõ kötetnek nincs címkéje" +STRING_VOL_HELP2, " A (%c) meghajtóban lévõ kötetnek nincs címkéje\n" STRING_VOL_HELP3, " A kötet sorozatszáma %04X-%04X\n" STRING_VOL_HELP4, "A kötet címkéjének és sorozatszámának megjelenítése, ha léteznek.\n\nVOL [meghajtó:]" @@ -575,7 +575,7 @@ STRING_ERROR_ERROR2, "Szintaxis hiba" STRING_FOR_ERROR1, "az 'in' után hiányzik a feltétel." STRING_FOR_ERROR2, "nincs zárójel megadva." -STRING_FOR_ERROR3, "a 'do' hiányzik." +STRING_FOR_ERROR3, "a 'do' hiányzik." STRING_FOR_ERROR4, "nincs parancs a 'do' után." STRING_FREE_ERROR1, "Érvénytelen meghajtó" STRING_FREE_ERROR2, "nincs cimkézve" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc Mon Jul 30 17:16:42 2007 @@ -138,7 +138,7 @@ /T hanya menampilkan\n\n\ Ketik DATE tanpa parameter untuk menampilkan setelan tanggal saat ini dan\n\ meminta yang baru. Tekan ENTER untuk membiarkan tanggal tetap sama.\n" - + STRING_DEL_HELP1, "Menghapus satu atau lebih file.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -389,7 +389,7 @@ STRING_REN_HELP2, " %lu file diganti nama\n" STRING_REN_HELP3, " %lu file diganti nama\n" - + STRING_SHIFT_HELP, "Mengubah posisi parameter yang bisa diganti dalam file batch.\n\n\ SHIFT [DOWN]" @@ -480,8 +480,8 @@ STRING_VERSION_HELP7, "\nVersi ReactOS ditulis oleh:\n" -STRING_VOL_HELP1, " Volume dalam drive %c: adalah %s" -STRING_VOL_HELP2, " Volume dalam drive %c: tidak berlabel" +STRING_VOL_HELP1, " Volume dalam drive %c adalah %s\n" +STRING_VOL_HELP2, " Volume dalam drive %c tidak berlabel\n" STRING_VOL_HELP3, " Nomor Seri Volume adalah %04X-%04X\n" STRING_VOL_HELP4, "Menampilkan label dan nomor seri volume disk, jika ada.\n\nVOL [drive:]" @@ -597,7 +597,7 @@ STRING_ERROR_ERROR2, "Sintaks salah" STRING_FOR_ERROR1, "'in' kurang dalam pernyataan for." STRING_FOR_ERROR2, "tidak ada kurung ditemukan." -STRING_FOR_ERROR3, "'do' hilang." +STRING_FOR_ERROR3, "'do' hilang." STRING_FOR_ERROR4, "tidak ada perintah setelah 'do'." STRING_FREE_ERROR1, "Drive tidak benar" STRING_FREE_ERROR2, "tak berlabel" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc Mon Jul 30 17:16:42 2007 @@ -133,7 +133,7 @@ /T Visualizzazione\n\n\ Scrivi DATE senza parametri per visualizzare la data attuale e\n\ chiedere quella nuova. Premi ENTER per mantenerla inalterata.\n" - + STRING_DEL_HELP1, "Cancella uno o più file.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\ @@ -394,7 +394,7 @@ STRING_REN_HELP2, " %lu file rinominato\n" STRING_REN_HELP3, " %lu files rinominati\n" - + STRING_SHIFT_HELP, "Cambia la posizione dei parametri in un batch.\n\n\ SHIFT [DOWN]" @@ -488,8 +488,8 @@ STRING_VERSION_HELP7, "\nVersione ReactOS scritto da:\n" -STRING_VOL_HELP1, " Il Volume del disco %c: è %s" -STRING_VOL_HELP2, " Il Volume del disco %c: non ha etichetta" +STRING_VOL_HELP1, " Il Volume del disco %c è %s\n" +STRING_VOL_HELP2, " Il Volume del disco %c non ha etichetta\n" STRING_VOL_HELP3, " Il numero diserie del Volume è %04X-%04X\n" STRING_VOL_HELP4, "Visualizza l'etichetta del volume del disco e il numero di serie se disponibili.\n\n\ VOL [disco:]" @@ -603,7 +603,7 @@ STRING_ERROR_ERROR2, "Errore di sintassi" STRING_FOR_ERROR1, "'in' mancante nella istruzione for." STRING_FOR_ERROR2, "Parentesi mancanti." -STRING_FOR_ERROR3, "'do' mancante." +STRING_FOR_ERROR3, "'do' mancante." STRING_FOR_ERROR4, "nessuno comando dopo 'do'." STRING_FREE_ERROR1, "Disco non valido" STRING_FREE_ERROR2, "non etichettato" Modified: trunk/reactos/base/shell/cmd/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/nb-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/nb-NO.rc (original) +++ trunk/reactos/base/shell/cmd/lang/nb-NO.rc Mon Jul 30 17:16:42 2007 @@ -133,7 +133,7 @@ /T Vis bare\n\n\ Skriv DATO uten parametere for å vise gjeldende datoinnstillinger og\n\ spørsmål om ny dato. Trykk ENTER for å beholde samme dato.\n" - + STRING_DEL_HELP1, "Slett en eller flere filer.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributter]] fil ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributter]] fil ...\n\ @@ -381,7 +381,7 @@ STRING_REN_HELP2, " %lu fil endret navn\n" STRING_REN_HELP3, " %lu filer endret navn\n" - + STRING_SHIFT_HELP, "Endre posisjon for erstattelig parameter i et satsvis fil.\n\n\ SHIFT [NED]" @@ -473,10 +473,10 @@ STRING_VERSION_HELP7, "\nReactOS versjon skrevet av:\n" -STRING_VOL_HELP1, " Volumet i stasjon %c: er %s" -STRING_VOL_HELP2, " Volumet i stasjon %c: er uten navn" -STRING_VOL_HELP3, " Volumserienummer er %04X-%04X\n" -STRING_VOL_HELP4, "Viser volumets navn og serienummer, hvis det eksisterer.\n\nVOL [stasjon:]" +STRING_VOL_HELP1, " Volumet i stasjon %c er %s\n" +STRING_VOL_HELP2, " Volumet i stasjon %c har ingen navn.\n" +STRING_VOL_HELP3, " Volumet Serie nummer er %04X-%04X\n" +STRING_VOL_HELP4, "Vis disk volumet merke og serie nummer, hvis det eksisterer.\n\nVOL [stasjon:]" STRING_WINDOW_HELP1, "endre konsoll vindu aspekt\n\n\ WINDOW [/POS[=]venstre,topp,bredde,høyde]\n\ @@ -589,12 +589,12 @@ STRING_ERROR_ERROR2, "Syntaks feil" STRING_FOR_ERROR1, "'in' tapt i FOR kommando." STRING_FOR_ERROR2, "ingen brakett funnet." -STRING_FOR_ERROR3, "'do' mangler." -STRING_FOR_ERROR4, "ingen kommando etter 'do'." -STRING_FREE_ERROR1, "Ugyldig stasjon" -STRING_FREE_ERROR2, "umerket" -STRING_GOTO_ERROR1, "Ingen merke spesifisert for GOTO" -STRING_GOTO_ERROR2, "Merke '%s' ikke funnet\n" +STRING_FOR_ERROR3, "'gjøre' tapt." +STRING_FOR_ERROR4, "ingen kommando etter 'gjøre'." +STRING_FREE_ERROR1, "Ugyldig driver" +STRING_FREE_ERROR2, "utmerket" +STRING_GOTO_ERROR1, "Ingen merke spesifisert for GÅTIL" +STRING_GOTO_ERROR2, "merke '%s' ikke funnet\n" STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[Feil]\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc Mon Jul 30 17:16:42 2007 @@ -138,7 +138,7 @@ /T tylko wywietlenie\n\n\ Wpisz DATE bez ¿adnych parametrów by wywietliæ obecn¹ datê i\n\ zapytaæ o now¹. Naciniêcie ENTER od razu, pozostawia obecn¹.\n" - + STRING_DEL_HELP1, "Kasuje jeden lub wiêcej plików.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributy]] plik ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributy]] plik ...\n\ @@ -387,7 +387,7 @@ STRING_REN_HELP2, " zmieniono nazwê %lu pliku\n" STRING_REN_HELP3, " zmieniono nazwy %lu plików\n" - + STRING_SHIFT_HELP, "Zmienia pozycjê parametru w pliku wsadowym.\n\n\ SHIFT [DOWN]" @@ -479,8 +479,8 @@ STRING_VERSION_HELP7, "\nwersja ReactOS, napisana przez:\n" -STRING_VOL_HELP1, " Wolumin w napêdzie %c: ma etykietê: %s" -STRING_VOL_HELP2, " Wolumin w napêdzie %c: nie posiada etykiety" +STRING_VOL_HELP1, " Wolumin w napêdzie %c ma etykietê: %s" +STRING_VOL_HELP2, " Wolumin w napêdzie %c nie posiada etykiety.\n" STRING_VOL_HELP3, " Numer Seryjny Woluminu to: %04X-%04X\n" STRING_VOL_HELP4, "Wywietla etykietê woluminu w danym napêdzie(o ile istnieje) i jego numer seryjny.\n\nVOL [napêd:]" @@ -595,7 +595,7 @@ STRING_ERROR_ERROR2, "B³¹d sk³adni" STRING_FOR_ERROR1, "Brak 'in' dla twierdzenia." STRING_FOR_ERROR2, "Nawias nie zosta³ znaleziony." -STRING_FOR_ERROR3, "Brakuje 'do'." +STRING_FOR_ERROR3, "Brakuje 'do'." STRING_FOR_ERROR4, "Brak komendy po 'do'." STRING_FREE_ERROR1, "Nieprawid³owa litera napêdu" STRING_FREE_ERROR2, "brak" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc Mon Jul 30 17:16:42 2007 @@ -141,7 +141,7 @@ /T Íå çàïðàøèâàòü ââîä íîâîé äàòû\n\n\ Êîìàíäà DATE áåç ïàðàìåòðîâ îòîáðàæàåò òåêóùóþ äàòó è çàïðàøèâàåò ââîä\n\ íîâîé äàòû. Äëÿ ñîõðàíåíèÿ òåêóùåé äàòû íàæìèòå êëàâèøó ENTER.\n" - + STRING_DEL_HELP1, "Óäàëåíèå îäíîãî èëè íåñêîëüêèõ ôàéëîâ.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]àòðèáóòû]] èìåíà_ôàéëîâ ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]àòðèáóòû]] èìåíà_ôàéëîâ ...\n\ @@ -394,7 +394,7 @@ STRING_REN_HELP2, " %lu ôàéë ïåðåèìåíîâàí\n" STRING_REN_HELP3, " %lu ôàéëîâ ïåðåèìåíîâàíî\n" - + STRING_SHIFT_HELP, "Èçìåíåíèå ñîäåðæèìîãî (ñäâèã) ïîäñòàâëÿåìûõ ïàðàìåòðîâ äëÿ ïàêåòíîãî ôàéëà.\n\n\ SHIFT [DOWN]" @@ -487,8 +487,8 @@ STRING_VERSION_HELP7, "\nReactOS-âåðñèÿ íàïèñàíà:\n" -STRING_VOL_HELP1, " Òîì â óñòðîéñòâå %c: èìååò ìåòêó %s" -STRING_VOL_HELP2, " Òîì â óñòðîéñòâå %c: íå èìååò ìåòêè" +STRING_VOL_HELP1, " Òîì â óñòðîéñòâå %c èìååò ìåòêó %s\n" +STRING_VOL_HELP2, " Òîì â óñòðîéñòâå %c íå èìååò ìåòêè\n" STRING_VOL_HELP3, " Ñåðèéíûé íîìåð òîìà: %04X-%04X\n" STRING_VOL_HELP4, "Âûâîäèò ìåòêó òîìà è ñåðèéíûé íîìåð.\n\nVOL [äèñê:]" @@ -602,7 +602,7 @@ STRING_ERROR_ERROR2, "Ñèíòàêñè÷åñêàÿ îøèáêà" STRING_FOR_ERROR1, "'in' îòñóòñòâóåò â êîìàíäå for." STRING_FOR_ERROR2, "ñêîáîê íåîáíàðóæåíî." -STRING_FOR_ERROR3, "'do' îòñóòñâóåò." +STRING_FOR_ERROR3, "'do' îòñóòñâóåò." STRING_FOR_ERROR4, "íåò êîìàíäû ïîñëå 'do'." STRING_FREE_ERROR1, "Íåïðàâèëüíîå èìÿ äèñêà" STRING_FREE_ERROR2, "unlabeled" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Mon Jul 30 17:16:42 2007 @@ -141,7 +141,7 @@ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ a prompt for a new one. Press ENTER to keep the same date.\n" - + STRING_DEL_HELP1, "Deletes one or more files.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -390,7 +390,7 @@ STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" - + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -483,8 +483,8 @@ STRING_VERSION_HELP7, "\nReactOS version written by:\n" -STRING_VOL_HELP1, " Volume in drive %c: is %s" -STRING_VOL_HELP2, " Volume in drive %c: has no label" +STRING_VOL_HELP1, " Volume in drive %c is %s\n" +STRING_VOL_HELP2, " Volume in drive %c has no label.\n" STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" @@ -599,7 +599,7 @@ STRING_ERROR_ERROR2, "Syntax error" STRING_FOR_ERROR1, "'in' missing in for statement." STRING_FOR_ERROR2, "no brackets found." -STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR3, "'do' missing." STRING_FOR_ERROR4, "no command after 'do'." STRING_FREE_ERROR1, "Invalid drive" STRING_FREE_ERROR2, "unlabeled"

17 years, 4 months

[cfinck] 28041: Hardcode the path to our Bugzilla configuration file

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 30 14:34:09 2007 New Revision: 28041 URL: http://svn.reactos.org/svn/reactos?rev=28041&view=rev Log: Hardcode the path to our Bugzilla configuration file Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm Mon Jul 30 14:34:09 2007 @@ -407,13 +407,13 @@ my ($project, $localconfig, $datadir); if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { $project = $1; - $localconfig = "localconfig.$project"; $datadir = "data/$project"; } else { - $localconfig = "localconfig"; $datadir = "data"; } + $localconfig = "/web/reactos.org/config/bugzilla-config"; + # We have to return absolute paths for mod_perl. # That means that if you modify these paths, they must be absolute paths. return {

17 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007