Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32076: ZeroMemory the batchfile path
by cwittich＠svn.reactos.org 01 Feb '08

01 Feb '08

Author: cwittich Date: Fri Feb 1 23:30:51 2008 New Revision: 32076 URL: http://svn.reactos.org/svn/reactos?rev=32076&view=rev Log: ZeroMemory the batchfile path Modified: trunk/reactos/base/shell/cmd/batch.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Fri Feb 1 23:30:51 2008 @@ -269,6 +269,7 @@ cmd_free (bc->raw_params); } + ZeroMemory(bc->BatchFilePath, sizeof(bc->BatchFilePath)); bc->hBatchFile = hFile; tmp = _tcsrchr(fullname, '\\'); _tcsncpy(bc->BatchFilePath, fullname, ((_tcslen(fullname) - _tcslen(tmp)) + 1));

1 0

[fireball] 32075: - Filip Navara: Take into account non-fast/non-hash indices in CmPrepareHive. - Apply similar changes to freeldr's registry importing function.
by fireball＠svn.reactos.org 01 Feb '08

01 Feb '08

Author: fireball Date: Fri Feb 1 21:53:43 2008 New Revision: 32075 URL: http://svn.reactos.org/svn/reactos?rev=32075&view=rev Log: - Filip Navara: Take into account non-fast/non-hash indices in CmPrepareHive. - Apply similar changes to freeldr's registry importing function. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/lib/cmlib/cminit.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Fri Feb 1 21:53:43 2008 @@ -121,103 +121,135 @@ return TRUE; } - static BOOLEAN RegImportSubKey(PHHIVE Hive, - PCM_KEY_NODE KeyCell, - FRLDRHKEY ParentKey) -{ - PCM_KEY_FAST_INDEX HashCell; - PCM_KEY_NODE SubKeyCell; - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE ValueCell = NULL; - PWCHAR wName; - FRLDRHKEY SubKey; - LONG Error; - ULONG i; - - - DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); - DbgPrint((DPRINT_REGISTRY, "KeyCell->Signature: %x\n", KeyCell->Signature)); - if (KeyCell->Signature != CM_KEY_NODE_SIGNATURE) - { - DbgPrint((DPRINT_REGISTRY, "Invalid key cell Signature!\n")); - return FALSE; - } - - if (KeyCell->Flags & KEY_COMP_NAME) - { - wName = MmHeapAlloc ((KeyCell->NameLength + 1) * sizeof(WCHAR)); - for (i = 0; i < KeyCell->NameLength; i++) - { - wName[i] = ((PCHAR)KeyCell->Name)[i]; - } - wName[KeyCell->NameLength] = 0; - } - else - { - wName = MmHeapAlloc (KeyCell->NameLength + sizeof(WCHAR)); - memcpy (wName, - KeyCell->Name, - KeyCell->NameLength); - wName[KeyCell->NameLength/sizeof(WCHAR)] = 0; - } - - DbgPrint((DPRINT_REGISTRY, "KeyName: '%S'\n", wName)); - - /* Create new sub key */ - Error = RegCreateKey (ParentKey, - wName, - &SubKey); - MmHeapFree (wName); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_REGISTRY, "RegCreateKey() failed!\n")); - return FALSE; - } - DbgPrint((DPRINT_REGISTRY, "Subkeys: %u\n", KeyCell->SubKeyCounts)); - DbgPrint((DPRINT_REGISTRY, "Values: %u\n", KeyCell->ValueList.Count)); - - /* Enumerate and add values */ - if (KeyCell->ValueList.Count > 0) - { - ValueListCell = (PVALUE_LIST_CELL) HvGetCell (Hive, KeyCell->ValueList.List); - DbgPrint((DPRINT_REGISTRY, "ValueListCell: %x\n", ValueListCell)); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - DbgPrint((DPRINT_REGISTRY, "ValueOffset[%d]: %x\n", i, ValueListCell->ValueOffset[i])); - - ValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, ValueListCell->ValueOffset[i]); - - DbgPrint((DPRINT_REGISTRY, "ValueCell[%d]: %x\n", i, ValueCell)); - - if (!RegImportValue(Hive, ValueCell, SubKey)) - return FALSE; - } - } - - /* Enumerate and add subkeys */ - if (KeyCell->SubKeyCounts[Stable] > 0) - { - HashCell = (PCM_KEY_FAST_INDEX) HvGetCell (Hive, KeyCell->SubKeyLists[Stable]); - DbgPrint((DPRINT_REGISTRY, "HashCell: %x\n", HashCell)); - DbgPrint((DPRINT_REGISTRY, "SubKeyCounts: %x\n", KeyCell->SubKeyCounts)); - - for (i = 0; i < KeyCell->SubKeyCounts[Stable]; i++) - { - DbgPrint((DPRINT_REGISTRY, "Cell[%d]: %x\n", i, HashCell->List[i].Cell)); - - SubKeyCell = (PCM_KEY_NODE) HvGetCell (Hive, HashCell->List[i].Cell); - - DbgPrint((DPRINT_REGISTRY, "SubKeyCell[%d]: %x\n", i, SubKeyCell)); - - if (!RegImportSubKey(Hive, SubKeyCell, SubKey)) - return FALSE; - } - } - - return TRUE; + PCM_KEY_NODE KeyCell, + FRLDRHKEY ParentKey); + +static BOOLEAN +RegImportIndexSubKey(PHHIVE Hive, + PCM_KEY_INDEX IndexCell, + FRLDRHKEY ParentKey) +{ + ULONG i; + + DbgPrint((DPRINT_REGISTRY, "IndexCell: %x\n", IndexCell)); + + /* Enumerate and add subkeys */ + if (IndexCell->Signature == CM_KEY_INDEX_ROOT || + IndexCell->Signature == CM_KEY_INDEX_LEAF) + { + for (i = 0; i < IndexCell->Count; i++) + { + PCM_KEY_INDEX SubIndexCell = HvGetCell(Hive, IndexCell->List[i]); + if (!RegImportIndexSubKey(Hive, SubIndexCell, ParentKey)) + return FALSE; + } + } + else if (IndexCell->Signature == CM_KEY_FAST_LEAF || + IndexCell->Signature == CM_KEY_HASH_LEAF) + { + PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; + for (i = 0; i < HashCell->Count; i++) + { + PCM_KEY_NODE SubKeyCell = HvGetCell(Hive, HashCell->List[i].Cell); + if (!RegImportSubKey(Hive, SubKeyCell, ParentKey)) + return FALSE; + } + } + else + { + ASSERT(FALSE); + } + + return TRUE; +} + + +static BOOLEAN +RegImportSubKey(PHHIVE Hive, + PCM_KEY_NODE KeyCell, + FRLDRHKEY ParentKey) +{ + PCM_KEY_INDEX IndexCell; + PVALUE_LIST_CELL ValueListCell; + PCM_KEY_VALUE ValueCell = NULL; + PWCHAR wName; + FRLDRHKEY SubKey; + LONG Error; + ULONG i; + + + DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); + DbgPrint((DPRINT_REGISTRY, "KeyCell->Signature: %x\n", KeyCell->Signature)); + if (KeyCell->Signature != CM_KEY_NODE_SIGNATURE) + { + DbgPrint((DPRINT_REGISTRY, "Invalid key cell Signature!\n")); + return FALSE; + } + + if (KeyCell->Flags & KEY_COMP_NAME) + { + wName = MmHeapAlloc ((KeyCell->NameLength + 1) * sizeof(WCHAR)); + for (i = 0; i < KeyCell->NameLength; i++) + { + wName[i] = ((PCHAR)KeyCell->Name)[i]; + } + wName[KeyCell->NameLength] = 0; + } + else + { + wName = MmHeapAlloc (KeyCell->NameLength + sizeof(WCHAR)); + memcpy (wName, + KeyCell->Name, + KeyCell->NameLength); + wName[KeyCell->NameLength/sizeof(WCHAR)] = 0; + } + + DbgPrint((DPRINT_REGISTRY, "KeyName: '%S'\n", wName)); + + /* Create new sub key */ + Error = RegCreateKey (ParentKey, + wName, + &SubKey); + MmHeapFree (wName); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_REGISTRY, "RegCreateKey() failed!\n")); + return FALSE; + } + DbgPrint((DPRINT_REGISTRY, "Subkeys: %u\n", KeyCell->SubKeyCounts)); + DbgPrint((DPRINT_REGISTRY, "Values: %u\n", KeyCell->ValueList.Count)); + + /* Enumerate and add values */ + if (KeyCell->ValueList.Count > 0) + { + ValueListCell = (PVALUE_LIST_CELL) HvGetCell (Hive, KeyCell->ValueList.List); + DbgPrint((DPRINT_REGISTRY, "ValueListCell: %x\n", ValueListCell)); + + for (i = 0; i < KeyCell->ValueList.Count; i++) + { + DbgPrint((DPRINT_REGISTRY, "ValueOffset[%d]: %x\n", i, ValueListCell->ValueOffset[i])); + + ValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, ValueListCell->ValueOffset[i]); + + DbgPrint((DPRINT_REGISTRY, "ValueCell[%d]: %x\n", i, ValueCell)); + + if (!RegImportValue(Hive, ValueCell, SubKey)) + return FALSE; + } + } + + /* Enumerate and add subkeys */ + if (KeyCell->SubKeyCounts[Stable] > 0) + { + IndexCell = HvGetCell (Hive, KeyCell->SubKeyLists[Stable]); + + if (!RegImportIndexSubKey(Hive, IndexCell, SubKey)) + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=320… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c (original) +++ trunk/reactos/lib/cmlib/cminit.c Fri Feb 1 21:53:43 2008 @@ -65,11 +65,47 @@ static VOID CMAPI CmpPrepareKey( PHHIVE RegistryHive, + PCM_KEY_NODE KeyCell); + +static VOID CMAPI +CmpPrepareIndexOfKeys( + PHHIVE RegistryHive, + PCM_KEY_INDEX IndexCell) +{ + ULONG i; + + if (IndexCell->Signature == CM_KEY_INDEX_ROOT || + IndexCell->Signature == CM_KEY_INDEX_LEAF) + { + for (i = 0; i < IndexCell->Count; i++) + { + PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); + CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); + } + } + else if (IndexCell->Signature == CM_KEY_FAST_LEAF || + IndexCell->Signature == CM_KEY_HASH_LEAF) + { + PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; + for (i = 0; i < HashCell->Count; i++) + { + PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); + CmpPrepareKey(RegistryHive, SubKeyCell); + } + } + else + { + DbgPrint("IndexCell->Signature %x\n", IndexCell->Signature); + ASSERT(FALSE); + } +} + +static VOID CMAPI +CmpPrepareKey( + PHHIVE RegistryHive, PCM_KEY_NODE KeyCell) { - PCM_KEY_NODE SubKeyCell; - PCM_KEY_FAST_INDEX HashCell; - ULONG i; + PCM_KEY_INDEX IndexCell; ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); @@ -79,13 +115,8 @@ /* Enumerate and add subkeys */ if (KeyCell->SubKeyCounts[Stable] > 0) { - HashCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); - - for (i = 0; i < KeyCell->SubKeyCounts[Stable]; i++) - { - SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); - CmpPrepareKey(RegistryHive, SubKeyCell); - } + IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); + CmpPrepareIndexOfKeys(RegistryHive, IndexCell); } }

1 0

[peterw] 32074: - Make dp0 give the directory the batch was run from instead of the current directory.
by peterw＠svn.reactos.org 01 Feb '08

01 Feb '08

Author: peterw Date: Fri Feb 1 17:15:41 2008 New Revision: 32074 URL: http://svn.reactos.org/svn/reactos?rev=32074&view=rev Log: - Make dp0 give the directory the batch was run from instead of the current directory. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Fri Feb 1 17:15:41 2008 @@ -220,6 +220,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) { HANDLE hFile; + LPTSTR tmp; SetLastError(0); hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | @@ -269,6 +270,8 @@ } bc->hBatchFile = hFile; + tmp = _tcsrchr(fullname, '\\'); + _tcsncpy(bc->BatchFilePath, fullname, ((_tcslen(fullname) - _tcslen(tmp)) + 1)); SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Fri Feb 1 17:15:41 2008 @@ -12,6 +12,7 @@ struct tagBATCHCONTEXT *prev; LPWIN32_FIND_DATA ffind; HANDLE hBatchFile; + TCHAR BatchFilePath[MAX_PATH]; LPTSTR forproto; LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Fri Feb 1 17:15:41 2008 @@ -1300,11 +1300,8 @@ if ( varNameLen ) *varNameLen = 4; varName += 2; - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; - GetCurrentDirectory(MAX_PATH, ret); - } - return ret; + return bc->BatchFilePath; + } case _T('0'): case _T('1'): case _T('2'):

1 0

[cwittich] 32073: fix a bug in goto a stubs for setlocal and endlocal (our default is delayed expansion)
by cwittich＠svn.reactos.org 01 Feb '08

01 Feb '08

Author: cwittich Date: Fri Feb 1 12:49:58 2008 New Revision: 32073 URL: http://svn.reactos.org/svn/reactos?rev=32073&view=rev Log: fix a bug in goto a stubs for setlocal and endlocal (our default is delayed expansion) Added: trunk/reactos/base/shell/cmd/setlocal.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/goto.c Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Fri Feb 1 12:49:58 2008 @@ -361,6 +361,9 @@ /* Prototypes for SET.C */ INT cmd_set (LPTSTR, LPTSTR); +/* Prototypes for SETLOCAL.C */ +INT cmd_setlocal (LPTSTR, LPTSTR); +INT cmd_endlocal (LPTSTR, LPTSTR); /* Prototypes for START.C */ INT cmd_start (LPTSTR, LPTSTR); Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Fri Feb 1 12:49:58 2008 @@ -54,6 +54,7 @@ <file>replace.c</file> <file>screen.c</file> <file>set.c</file> + <file>setlocal.c</file> <file>shift.c</file> <file>start.c</file> <file>strtoclr.c</file> Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c Fri Feb 1 12:49:58 2008 @@ -100,6 +100,8 @@ {_T("echoerr."), CMD_HIDE, CommandEchoerr}, {_T("echoserr"), 0, CommandEchoserr}, + {_T("endlocal"), 0, cmd_endlocal}, + #ifdef INCLUDE_CMD_DEL {_T("erase"), 0, CommandDelete}, #endif @@ -191,6 +193,8 @@ #ifdef INCLUDE_CMD_SET {_T("set"), 0, cmd_set}, #endif + + {_T("setlocal"), 0, cmd_setlocal}, {_T("shift"), CMD_BATCHONLY, cmd_shift}, Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c (original) +++ trunk/reactos/base/shell/cmd/goto.c Fri Feb 1 12:49:58 2008 @@ -39,7 +39,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - LPTSTR tmp; + LPTSTR tmp, tmp2; LONG lNewPosHigh = 0; #ifdef _DEBUG @@ -119,8 +119,9 @@ pos++; } + tmp2 = param; /* use whole label name */ - if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++param) == 0))) + if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++tmp2) == 0))) return 0; } Added: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/setlocal.c (added) +++ trunk/reactos/base/shell/cmd/setlocal.c Fri Feb 1 12:49:58 2008 @@ -1,0 +1,27 @@ +/* + * GOTO.C - goto internal batch command. + * + * History: + * + * 1 Feb 2008 (Christoph von Wittich) + * started. +*/ + +#include <precomp.h> + + +/* unimplemented */ + +/* our current default is delayedexpansion */ + +INT cmd_setlocal (LPTSTR cmd, LPTSTR param) +{ + return 0; +} + +/* endlocal doesn't take any params */ +INT cmd_endlocal (LPTSTR cmd, LPTSTR param) +{ + return 0; +} + Propchange: trunk/reactos/base/shell/cmd/setlocal.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sgasiorek] 32072: Polish resource changes: - change Wine to ReactOS in "Run" dialog - insert and translate IDS_RESTART
by sgasiorek＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: sgasiorek Date: Fri Feb 1 02:17:24 2008 New Revision: 32072 URL: http://svn.reactos.org/svn/reactos?rev=32072&view=rev Log: Polish resource changes: - change Wine to ReactOS in "Run" dialog - insert and translate IDS_RESTART Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Fri Feb 1 02:17:24 2008 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Wyloguj..." IDS_SHUTDOWN "Zamknij system..." + IDS_RESTART "Uruchom ponownie..." IDS_LAUNCH "Uruchom..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Szukaj..." Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Fri Feb 1 02:17:24 2008 @@ -159,7 +159,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a Wine otworzy go dla ciebie.", 12289, 36, 11, 182, 18 + LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18 LTEXT "&Otwórz:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP

1 0

[tkreuzer] 32071: fix definitions of WM_MOUSEWHEEL and WM_MOUSELAST
by tkreuzer＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: tkreuzer Date: Fri Feb 1 00:29:03 2008 New Revision: 32071 URL: http://svn.reactos.org/svn/reactos?rev=32071&view=rev Log: fix definitions of WM_MOUSEWHEEL and WM_MOUSELAST Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Fri Feb 1 00:29:03 2008 @@ -1685,6 +1685,7 @@ #define WM_KEYLAST 264 #define WM_SYNCPAINT 136 #define WM_MOUSEACTIVATE 33 +#define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 #define WM_LBUTTONDOWN 513 #define WM_LBUTTONUP 514 @@ -1695,13 +1696,20 @@ #define WM_MBUTTONDOWN 519 #define WM_MBUTTONUP 520 #define WM_MBUTTONDBLCLK 521 +#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) #define WM_MOUSEWHEEL 522 -#define WM_MOUSEFIRST 512 +#endif #if (_WIN32_WINNT >= 0x0500) #define WM_XBUTTONDOWN 523 #define WM_XBUTTONUP 524 #define WM_XBUTTONDBLCLK 525 +#endif +#if (_WIN32_WINNT >= 0x0500) #define WM_MOUSELAST 525 +#elif (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) +#define WM_MOUSELAST 522 +#else +#define WM_MOUSELAST 521 #endif #define WM_MOUSEHOVER 0x2A1 #define WM_MOUSELEAVE 0x2A3

1 0

[cwittich] 32070: handle call :Label fix goto :Label
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 23:55:05 2008 New Revision: 32070 URL: http://svn.reactos.org/svn/reactos?rev=32070&view=rev Log: handle call :Label fix goto :Label Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/goto.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 23:55:05 2008 @@ -273,6 +273,8 @@ bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; bc->bCmdBlock = -1; + bc->lCallPosition = 0; + bc->lCallPositionHigh = 0; bc->ffind = NULL; bc->forvar = _T('\0'); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Thu Jan 31 23:55:05 2008 @@ -24,6 +24,8 @@ TCHAR forvar; INT bCmdBlock; BOOL bExecuteBlock[MAX_PATH]; + LONG lCallPosition; /* store position where to return to after Call :Label */ + LONG lCallPositionHigh; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c (original) +++ trunk/reactos/base/shell/cmd/call.c Thu Jan 31 23:55:05 2008 @@ -53,6 +53,13 @@ return 0; } + if (*param == _T(':') && (bc)) + { + bc->lCallPosition = SetFilePointer(bc->hBatchFile, 0, &bc->lCallPositionHigh, FILE_CURRENT); + cmd_goto(_T("goto"), param); + return 0; + } + nErrorLevel = 0; n = (LPBATCH_CONTEXT)cmd_alloc (sizeof (BATCH_CONTEXT)); Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c (original) +++ trunk/reactos/base/shell/cmd/goto.c Thu Jan 31 23:55:05 2008 @@ -40,7 +40,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR tmp; - LONG lNewPosHigh; + LONG lNewPosHigh = 0; #ifdef _DEBUG DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); @@ -67,33 +67,40 @@ /* terminate label at first space char */ tmp = param+1; - while (!_istcntrl (*tmp) && !_istspace (*tmp) && (*tmp != _T(':'))) - tmp++; + while (!_istcntrl (*tmp) && !_istspace (*tmp) && (*tmp != _T(':'))) + tmp++; *(tmp) = _T('\0'); /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; - /* jump to end of the file */ - if ( _tcsicmp( param, _T(":eof"))==0) - { - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); - return 0; - } + /* jump to end of the file */ + if ( _tcsicmp( param, _T(":eof"))==0) + { + /* when lCallPosition != 0 we have to return to the caller */ + if (bc->lCallPosition == 0) + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); + else + { + SetFilePointer (bc->hBatchFile, (LONG)bc->lCallPosition, &bc->lCallPositionHigh, FILE_BEGIN); + bc->lCallPosition = 0; + bc->lCallPositionHigh = 0; + } + return 0; + } - /* jump to begin of the file */ - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); + /* jump to begin of the file */ + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); while (FileGetString (bc->hBatchFile, textline, sizeof(textline) / sizeof(textline[0]))) { - int pos; - int size; + int pos; + int size; /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; - - while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) + while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) tmp--; *(tmp + 1) = _T('\0'); @@ -101,20 +108,21 @@ tmp = textline; while (_istspace (*tmp)) tmp++; - - /* All space after leading space terminate the string */ - size = _tcslen(tmp) -1; - pos=0; - while (tmp+pos < tmp+size) - { - if (_istspace(tmp[pos])) - tmp[pos]=_T('\0'); - pos++; - } + + /* All space after leading space terminate the string */ + size = _tcslen(tmp) -1; + pos=0; + while (tmp+pos < tmp+size) + { + if (_istspace(tmp[pos])) + tmp[pos]=_T('\0'); + pos++; + } /* use whole label name */ - if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) + if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++param) == 0))) return 0; + } LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE);

1 0

[cwittich] 32069: handle %dp0
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 22:01:23 2008 New Revision: 32069 URL: http://svn.reactos.org/svn/reactos?rev=32069&view=rev Log: handle %dp0 Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Jan 31 22:01:23 2008 @@ -1293,6 +1293,18 @@ return NULL; switch ( *varName ) { + case _T('~'): + varName++; + if (_tcsncicmp(varName, _T("dp0"), 3) == 0) + { + if ( varNameLen ) + *varNameLen = 4; + varName += 2; + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + GetCurrentDirectory(MAX_PATH, ret); + } + return ret; case _T('0'): case _T('1'): case _T('2'): @@ -1411,7 +1423,7 @@ LPCTSTR tmp; BOOL bEchoThisLine; BOOL bModeSetA; - BOOL bIsBatch; + BOOL bIsBatch; do {

1 0

[cwittich] 32068: support else handle negative values in special envvars stdin, out, err can't be redirected for windows gui apps
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 20:59:02 2008 New Revision: 32068 URL: http://svn.reactos.org/svn/reactos?rev=32068&view=rev Log: support else handle negative values in special envvars stdin,out,err can't be redirected for windows gui apps Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 20:59:02 2008 @@ -458,10 +458,21 @@ { if (*first == _T(')')) { - bc->bCmdBlock--; + first++; + /* Strip leading spaces and trailing space/control chars */ + while(_istspace (*first)) + first++; + if ((_tcsncicmp (first, _T("else"), 4) == 0) && (_tcschr(first, _T('(')))) + { + bc->bExecuteBlock[bc->bCmdBlock] = !bc->bExecuteBlock[bc->bCmdBlock]; + } + else + { + bc->bCmdBlock--; + } continue; } - if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + if (bc->bCmdBlock < MAX_PATH) if (!bc->bExecuteBlock[bc->bCmdBlock]) { /* increase the bCmdBlock count when there is another conditon which opens a new bracket */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Jan 31 20:59:02 2008 @@ -811,9 +811,18 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, in); - return; + if (bc) + { + /* will fail for windows gui apps */ + num = 0; + bc->hBatchFile = INVALID_HANDLE_VALUE; + } + else + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, in); + return; + } } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) @@ -892,7 +901,7 @@ /* Now set up the end conditions... */ /* redirect STDOUT */ - if (out[0]) + if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (out[0])) { /* Final output to here */ HANDLE hFile; @@ -959,7 +968,7 @@ } /* redirect STDERR */ - if (err[0]) + if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (err[0])) { /* Final output to here */ HANDLE hFile; @@ -1165,15 +1174,23 @@ if (position) { position += 2; - Token = _tcstok(position, _T(",")); - while ((Token != NULL) && (i < 2)) + if (_tcschr(position, _T(',')) != NULL) { - StringPart[i] = _ttoi(Token); - i++; - Token = _tcstok (NULL, _T(",")); + Token = _tcstok(position, _T(",")); + while ((Token != NULL) && (i < 2)) + { + StringPart[i] = _ttoi(Token); + i++; + Token = _tcstok (NULL, _T(",")); + } + if (i > 0) + { + if (StringPart[1] < 0) + StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1]; + _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); + _tcscpy(ret, ReturnValue); + } } - _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); - _tcscpy(ret, ReturnValue); return ret; } else

1 0

[cwittich] 32067: don't print the new color value when echo is off
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 20:26:57 2008 New Revision: 32067 URL: http://svn.reactos.org/svn/reactos?rev=32067&view=rev Log: don't print the new color value when echo is off Modified: trunk/reactos/base/shell/cmd/color.c Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c (original) +++ trunk/reactos/base/shell/cmd/color.c Thu Jan 31 20:26:57 2008 @@ -113,8 +113,11 @@ return 1; } - LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, wColor); + if (((bc) && (bc->bEcho)) || !bc) + { + LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, wColor); + } if ((wColor & 0xF) == (wColor &0xF0) >> 4) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs