-/* $Id: ArgumentParser.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ArgumentParser.cpp,v 1.4 2001/01/13 23:53:46 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ArgumentParser.h,v 1.2 2001/01/13 23:53:46 narnaoud Exp $ */
+
// ArgumentParser.h: interface for the CArgumentParser class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: Completion.cpp,v 1.1 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: Completion.cpp,v 1.2 2001/01/13 23:54:07 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
const TCHAR * CCompletionList::Get(unsigned __int64 nIndex, BOOL& rblnIsKey)
{
ASSERT(nIndex < m_nCount);
- BOOL blnForward;
+ BOOL blnForward = FALSE;
CCompletionMatch *pNode = NULL;
- unsigned __int64 nRelativeIndex;
+ unsigned __int64 nRelativeIndex = 0;
if (m_pLastSearched)
{
-/* $Id: Completion.h,v 1.1 2001/01/10 01:25:29 narnaoud Exp $ */
+/* $Id: Completion.h,v 1.2 2001/01/13 23:54:07 narnaoud Exp $ */
// Completion.h - declaration for completion related functions
-#if !defined(PATTERN_H__INCLUDED_)
-#define PATTERN_H__INCLUDED_
+#if !defined(COMLPETION_H__INCLUDED_)
+#define COMPLETION_H__INCLUDED_
typedef const TCHAR * (*ReplaceCompletionCallback)(unsigned __int64& rnIndex, const BOOL *pblnForward,
const TCHAR *pchContext, const TCHAR *pchBegin);
-/* $Id: Console.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: Console.cpp,v 1.4 2001/01/13 23:54:07 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: Console.h,v 1.4 2001/01/13 23:54:07 narnaoud Exp $ */
+
// Console.h: interface for the CConsole class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: Pattern.cpp,v 1.1 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: Pattern.cpp,v 1.2 2001/01/13 23:54:40 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{
if (((*pszTry) == 0) && ((*pszPattern) == 0))
return TRUE;
+
+ if (((*pszTry) == 0) || ((*pszPattern) == 0))
+ return FALSE;
+
pszTry++;
pszPattern++;
}
- if(*pszPattern == _T('*'))
+ if (*pszPattern == _T('*'))
{
pszPattern++;
while (*pszTry)
-/* $Id: RegistryExplorer.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: RegistryExplorer.cpp,v 1.4 2001/01/13 23:54:40 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: RegistryExplorer.h,v 1.5 2001/01/13 23:53:23 narnaoud Exp $ */
#ifndef _REGISTRY_EXPLORER_H__INCLUDED
#define _REGISTRY_EXPLORER_H__INCLUDED
-#define CURRENT_VERSION _T("0.20")
+#define CURRENT_VERSION _T("0.20+")
#define EMAIL _T("registryexplorer@yahoo.com")
//#define __L(x) L ## x
-/* $Id: RegistryKey.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: RegistryKey.cpp,v 1.4 2001/01/13 23:54:40 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: RegistryKey.h,v 1.4 2001/01/13 23:54:41 narnaoud Exp $ */
+
// RegistryKey.h: interface for the CRegistryKey class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: RegistryTree.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: RegistryTree.cpp,v 1.4 2001/01/13 23:54:41 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
BOOL blnKeyDeleted = FALSE;
while ((nError = rKey.GetNextSubkeyName()) == ERROR_SUCCESS)
{
- if (blnRecursive)
- { // deltion is recursive, delete subkey subkeys
- CRegistryKey Subkey;
- // open subkey
- nError = rKey.OpenSubkey(DELETE,pszSubkeyName,Subkey);
- // delete subkey subkeys
- if (DeleteSubkeys(Subkey, PATTERN_MATCH_ALL, TRUE))
- {
- AddErrorDescription(_T("Cannot delete subkey(s) of key %s. Subkey deletion failed.\n"),Subkey.GetKeyName());
- return FALSE;
- }
- }
-
if (PatternMatch(pszKeyPattern,pszSubkeyName))
{
+ if (blnRecursive)
+ { // deltion is recursive, delete subkey subkeys
+ CRegistryKey Subkey;
+ // open subkey
+ nError = rKey.OpenSubkey(DELETE,pszSubkeyName,Subkey);
+ // delete subkey subkeys
+ if (DeleteSubkeys(Subkey, PATTERN_MATCH_ALL, TRUE))
+ {
+ AddErrorDescription(_T("Cannot delete subkey(s) of key %s. Subkey deletion failed.\n"),Subkey.GetKeyName());
+ return FALSE;
+ }
+ }
+
nError = rKey.DeleteSubkey(pszSubkeyName);
if (nError != ERROR_SUCCESS)
{
return FALSE;
}
blnKeyDeleted = TRUE;
+ rKey.InitSubkeyEnumeration(pszSubkeyName, dwMaxSubkeyNameLength); // reset iteration
}
}
-/* $Id: SecurityDescriptor.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: SecurityDescriptor.cpp,v 1.4 2001/01/13 23:54:41 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: SecurityDescriptor.h,v 1.3 2001/01/13 23:54:41 narnaoud Exp $ */
+
// SecurityDescriptor.h: interface for the CSecurityDescriptor class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommand.cpp,v 1.2 2000/10/24 20:17:41 narnaoud Exp $
+/* $Id: ShellCommand.cpp,v 1.3 2001/01/13 23:55:36 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommand.h,v 1.2 2001/01/13 23:55:36 narnaoud Exp $ */
+
// ShellCommand.h: interface for the CShellCommand class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandChangeKey.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandChangeKey.cpp,v 1.4 2001/01/13 23:55:36 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandChangeKey.h,v 1.2 2001/01/13 23:55:36 narnaoud Exp $ */
+
// ShellCommandChangeKey.h: interface for the CShellCommandChangeKey class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandConnect.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandConnect.cpp,v 1.4 2001/01/13 23:55:36 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandConnect.h,v 1.2 2001/01/13 23:55:36 narnaoud Exp $ */
+
// ShellCommandConnect.h: interface for the CShellCommandConnect class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandDACL.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandDACL.cpp,v 1.4 2001/01/13 23:55:36 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandDACL.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandDACL.h: interface for the CShellCommandDACL class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandDOKA.cpp,v 1.2 2000/10/24 20:17:41 narnaoud Exp $
+/* $Id: ShellCommandDOKA.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandDOKA.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandDOKA.h: interface for the CShellCommandDOKA class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandDeleteKey.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandDeleteKey.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
ASSERT(pch >= pchKey);
const TCHAR *pszPath;
- TCHAR *pszPattern = pch+1;
+ TCHAR *pszPattern = pch;
+ if (*pch == _T('\\'))
+ pszPattern++;
+
if (pch == pchKey)
{
pszPath = _T(".");
+/* $Id: ShellCommandDeleteKey.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandDeleteKey.h: interface for the CShellCommandDeleteKey class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandDeleteValue.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandDeleteValue.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "ph.h"
#include "ShellCommandDeleteValue.h"
#include "RegistryExplorer.h"
+#include "Pattern.h"
#define DV_CMD _T("DV")
#define DV_CMD_LENGTH COMMAND_LENGTH(DV_CMD)
int CShellCommandDeleteValue::Execute(CConsole &rConsole, CArgumentParser& rArguments)
{
- rArguments.ResetArgumentIteration();
- TCHAR *pszCommandItself = rArguments.GetNextArgument();
-
- TCHAR *pszParameter;
- TCHAR *pszValueFull = NULL;
- BOOL blnHelp = FALSE;
-// DWORD dwError;
-
- if ((_tcsnicmp(pszCommandItself,DV_CMD _T(".."),DV_CMD_LENGTH+2*sizeof(TCHAR)) == 0)||
- (_tcsnicmp(pszCommandItself,DV_CMD _T("\\"),DV_CMD_LENGTH+1*sizeof(TCHAR)) == 0))
- {
- pszValueFull = pszCommandItself + DV_CMD_LENGTH;
- }
- else if (_tcsnicmp(pszCommandItself,DV_CMD _T("/"),DV_CMD_LENGTH+1*sizeof(TCHAR)) == 0)
- {
- pszParameter = pszCommandItself + DV_CMD_LENGTH;
- goto CheckValueArgument;
- }
-
- while((pszParameter = rArguments.GetNextArgument()) != NULL)
- {
+ rArguments.ResetArgumentIteration();
+ TCHAR *pszCommandItself = rArguments.GetNextArgument();
+
+ TCHAR *pszParameter;
+ TCHAR *pszValueFull = NULL;
+ BOOL blnHelp = FALSE;
+
+ if ((_tcsnicmp(pszCommandItself,DV_CMD _T(".."),DV_CMD_LENGTH+2*sizeof(TCHAR)) == 0)||
+ (_tcsnicmp(pszCommandItself,DV_CMD _T("\\"),DV_CMD_LENGTH+1*sizeof(TCHAR)) == 0))
+ {
+ pszValueFull = pszCommandItself + DV_CMD_LENGTH;
+ }
+ else if (_tcsnicmp(pszCommandItself,DV_CMD _T("/"),DV_CMD_LENGTH+1*sizeof(TCHAR)) == 0)
+ {
+ pszParameter = pszCommandItself + DV_CMD_LENGTH;
+ goto CheckValueArgument;
+ }
+
+ while((pszParameter = rArguments.GetNextArgument()) != NULL)
+ {
CheckValueArgument:
- if ((_tcsicmp(pszParameter,_T("/?")) == 0)
- ||(_tcsicmp(pszParameter,_T("-?")) == 0))
- {
- blnHelp = TRUE;
- break;
- }
- else if (!pszValueFull)
- {
- pszValueFull = pszParameter;
- }
- else
- {
- rConsole.Write(_T("Bad parameter: "));
- rConsole.Write(pszParameter);
- rConsole.Write(_T("\n"));
- }
- }
+ if ((_tcsicmp(pszParameter,_T("/?")) == 0)
+ ||(_tcsicmp(pszParameter,_T("-?")) == 0))
+ {
+ blnHelp = TRUE;
+ break;
+ }
+ else if (!pszValueFull)
+ {
+ pszValueFull = pszParameter;
+ }
+ else
+ {
+ rConsole.Write(_T("Bad parameter: "));
+ rConsole.Write(pszParameter);
+ rConsole.Write(_T("\n"));
+ }
+ }
- CRegistryKey Key;
- TCHAR *pszValueName;
- const TCHAR *pszPath;
+ CRegistryKey Key;
+ TCHAR *pszValueNamePattern;
+ const TCHAR *pszPath;
- if (blnHelp)
- {
- rConsole.Write(GetHelpString());
- return 0;
- }
-
- if (pszValueFull)
- {
- if (_tcscmp(pszValueFull,_T("\\")) == 0)
- goto CommandNAonRoot;
-
- TCHAR *pchSep = _tcsrchr(pszValueFull,_T('\\'));
- pszValueName = pchSep?(pchSep+1):(pszValueFull);
- pszPath = pchSep?pszValueFull:_T(".");
-
- //if (_tcsrchr(pszValueName,_T('.')))
- //{
- // pszValueName = _T("");
- // pszPath = pszValueFull;
- //}
- //else
- if (pchSep)
- *pchSep = 0;
- }
- else
- {
- pszValueName = _T("");
- pszPath = _T(".");
- }
+ if (blnHelp)
+ {
+ rConsole.Write(GetHelpString());
+ return 0;
+ }
+
+ if (pszValueFull)
+ {
+ if (_tcscmp(pszValueFull,_T("\\")) == 0)
+ goto CommandNAonRoot;
+
+ TCHAR *pchSep = _tcsrchr(pszValueFull,_T('\\'));
+ pszValueNamePattern = pchSep?(pchSep+1):(pszValueFull);
+ pszPath = pchSep?pszValueFull:_T(".");
+
+ if (pchSep)
+ *pchSep = 0;
+ }
+ else
+ {
+ pszValueNamePattern = _T("");
+ pszPath = _T(".");
+ }
{
- size_t s = _tcslen(pszValueName);
- if (s && (pszValueName[0] == _T('\"'))&&(pszValueName[s-1] == _T('\"')))
+ size_t s = _tcslen(pszValueNamePattern);
+ if (s && (pszValueNamePattern[0] == _T('\"'))&&(pszValueNamePattern[s-1] == _T('\"')))
{
- pszValueName[s-1] = 0;
- pszValueName++;
+ pszValueNamePattern[s-1] = 0;
+ pszValueNamePattern++;
}
}
- if (!m_rTree.GetKey(pszPath,KEY_SET_VALUE,Key))
+ if (!m_rTree.GetKey(pszPath,KEY_QUERY_VALUE|KEY_SET_VALUE,Key))
{
rConsole.Write(m_rTree.GetLastErrorDescription());
- goto SkipCommand;
+ return 0;
}
- if (!Key.IsRoot())
- { // not root key ???
- LONG nError = Key.DeleteValue(pszValueName);
- if (nError != ERROR_SUCCESS)
- {
- char Buffer[254];
- _stprintf(Buffer,_T("Cannot delete value. Error is %u\n"),(unsigned int)nError);
- rConsole.Write(Buffer);
- }
- else
+ if (!Key.IsRoot())
+ { // not root key ???
+ TCHAR Buffer[254];
+ DWORD dwMaxValueNameLength;
+ LONG nError = Key.GetMaxValueNameLength(dwMaxValueNameLength);
+ if (nError != ERROR_SUCCESS)
{
- InvalidateCompletion();
+ _stprintf(Buffer,_T("Cannot query info about %s key. Error is %u\n"),Key.GetKeyName(),(unsigned int)nError);
+ rConsole.Write(Buffer);
+ return 0;
}
- } // if (pKey)
- else
- {
+
+ TCHAR *pszValueName = new TCHAR[dwMaxValueNameLength];
+ if (!pszValueName)
+ {
+ rConsole.Write("Out of memory.");
+ return 0;
+ }
+
+ Key.InitValueEnumeration(pszValueName,dwMaxValueNameLength,NULL,0,NULL);
+
+ while ((nError = Key.GetNextValue()) == ERROR_SUCCESS)
+ {
+ if (PatternMatch(pszValueNamePattern,pszValueName))
+ {
+ nError = Key.DeleteValue(pszValueName);
+ if (nError != ERROR_SUCCESS)
+ {
+ _stprintf(Buffer,_T("Cannot delete value. Error is %u\n"),(unsigned int)nError);
+ rConsole.Write(Buffer);
+ }
+ else
+ {
+ InvalidateCompletion();
+ }
+ Key.InitValueEnumeration(pszValueName,dwMaxValueNameLength,NULL,0,NULL); // reset iteration
+ }
+ }
+ } // if (pKey)
+ else
+ {
CommandNAonRoot:
- rConsole.Write(DV_CMD COMMAND_NA_ON_ROOT);
- }
+ rConsole.Write(DV_CMD COMMAND_NA_ON_ROOT);
+ }
-SkipCommand:
- // if (pTree)
- // delete pTree;
- return 0;
+ return 0;
}
const TCHAR * CShellCommandDeleteValue::GetHelpString()
return DV_CMD_SHORT_DESC
_T("Syntax: ") DV_CMD _T(" [<PATH>][<VALUE_NAME>] [/?]\n\n")
_T(" <PATH> - Optional relative path of key which value will be delete.\n")
- _T(" <VALUE_NAME> - Name of key's value. Default is key's default value.\n")
+ _T(" <VALUE_NAME> - Name pattern of key's value. Default is key's default value.\n")
_T(" /? - This help.\n\n");
}
+/* $Id: ShellCommandDeleteValue.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandDeleteValue.h: interface for the CShellCommandDeleteValue class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandDir.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandDir.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "ShellCommandDir.h"
#include "RegistryTree.h"
#include "RegistryKey.h"
+#include "Pattern.h"
// *** THIS SHOULD GO IN A MINGW/ROS HEADER (tchar.h ???) - Begin
#if 1 // #ifndef _ui64tot ???
rArguments.ResetArgumentIteration();
BOOL blnDo = TRUE,blnBadParameter, blnHelp = FALSE;
- const TCHAR *pszParameter;
- const TCHAR *pszCommandItself = rArguments.GetNextArgument();
- const TCHAR *pszKey = NULL;
+ TCHAR *pszParameter;
+ TCHAR *pszCommandItself = rArguments.GetNextArgument();
+ TCHAR *pszKey = NULL;
if ((_tcsnicmp(pszCommandItself,DIR_CMD _T(".."),DIR_CMD_LENGTH+2*sizeof(TCHAR)) == 0)||
(_tcsnicmp(pszCommandItself,DIR_CMD _T("\\"),DIR_CMD_LENGTH+1*sizeof(TCHAR)) == 0))
}
}
+ const TCHAR *pszPattern = PATTERN_MATCH_ALL;
+ const TCHAR *pszPath = _T(".");
+
+ if (pszKey)
+ {
+ pszPath = pszKey;
+
+ TCHAR *pch = pszKey;
+ while(*pch) // search end of string
+ pch++;
+
+ if (pch > pszKey) // last non-null char
+ pch--;
+
+ if (*pch != _T('\\'))
+ {
+ while ((pch > pszKey) && (*pch != _T('\\')))
+ pch--;
+
+ if (*pch == _T('\\'))
+ {
+ pszPattern = pch+1;
+
+ if (pch > pszKey)
+ {
+ ASSERT(*pch == _T('\\'));
+ *pch = 0;
+ }
+ else if (*pch == _T('\\'))
+ {
+ pszPath = _T("\\");
+ }
+ }
+ else
+ {
+ pszPattern = pszKey;
+ pszPath = _T(".");
+ }
+ }
+ }
+
CRegistryKey Key;
- if (!m_rTree.GetKey(pszKey?pszKey:_T("."),KEY_ENUMERATE_SUB_KEYS|KEY_QUERY_VALUE,Key))
+ if (!m_rTree.GetKey(pszPath,KEY_ENUMERATE_SUB_KEYS|KEY_QUERY_VALUE,Key))
{
const TCHAR *pszErrorMsg = m_rTree.GetLastErrorDescription();
rConsole.Write(pszErrorMsg);
Key.InitSubkeyEnumeration(pszSubkeyNameBuffer,dwMaxSubkeyNameLength);
while ((nError = Key.GetNextSubkeyName()) == ERROR_SUCCESS)
{
- rConsole.Write(_T("\t(KEY)\t\t\t\t"));
- rConsole.Write(pszSubkeyNameBuffer);
- rConsole.Write(_T("\\\n"));
- nTotalItems++;
+ if (PatternMatch(pszPattern,pszSubkeyNameBuffer))
+ {
+ rConsole.Write(_T("\t(KEY)\t\t\t\t"));
+ rConsole.Write(pszSubkeyNameBuffer);
+ rConsole.Write(_T("\\\n"));
+ nTotalItems++;
+ }
}
delete pszSubkeyNameBuffer;
unsigned int nTabs;
while((nError = Key.GetNextValue(&dwValueNameActualLength)) == ERROR_SUCCESS)
{
- rConsole.Write(_T("\t"));
- pszValueTypeName = CRegistryKey::GetValueTypeName(Type);
- nTabs = _tcslen(pszValueTypeName)/nTabSize;
- nTabs = (nTabs < 4)?(4-nTabs):1;
- rConsole.Write(pszValueTypeName);
- while(nTabs--)
+ if (PatternMatch(pszPattern,pchValueNameBuffer))
+ {
rConsole.Write(_T("\t"));
- rConsole.Write((dwValueNameActualLength == 0)?_T("(Default)"):pchValueNameBuffer);
- rConsole.Write(_T("\n"));
- nTotalItems++;
+ pszValueTypeName = CRegistryKey::GetValueTypeName(Type);
+ nTabs = _tcslen(pszValueTypeName)/nTabSize;
+ nTabs = (nTabs < 4)?(4-nTabs):1;
+ rConsole.Write(pszValueTypeName);
+ while(nTabs--)
+ rConsole.Write(_T("\t"));
+ rConsole.Write((dwValueNameActualLength == 0)?_T("(Default)"):pchValueNameBuffer);
+ rConsole.Write(_T("\n"));
+ nTotalItems++;
+ }
}
delete pchValueNameBuffer;
const TCHAR * CShellCommandDir::GetHelpString()
{
return DIR_CMD_SHORT_DESC
- _T("Syntax: ") DIR_CMD _T(" [<KEY>] [/?]\n\n")
- _T(" <KEY> - Optional relative path to the key on which command will be executed\n")
+ _T("Syntax: ") DIR_CMD _T(" [<PATH>\\][<PATTERN>] [/?]\n\n")
+ _T(" <PATH> - Optional relative path to the key on which command will be executed\n")
+ _T(" <PATTERN> - Optional pattern. Default is the all matching pattern.")
_T(" /? - This help.\n\n")
_T("Without parameters, command lists keys and values of current key.\n");
}
+/* $Id: ShellCommandDir.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandDir.h: interface for the CShellCommandDir class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandExit.cpp,v 1.2 2000/10/24 20:17:41 narnaoud Exp $
+/* $Id: ShellCommandExit.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandExit.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandExit.h: interface for the CShellCommandExit class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandHelp.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandHelp.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandHelp.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandHelp.h: interface for the CShellCommandHelp class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandNewKey.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandNewKey.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
ASSERT(pch >= pszNewKey);
const TCHAR *pszPath;
- TCHAR *pszSubkeyName = pch+1;
+ TCHAR *pszSubkeyName = pch;
+ if (*pch == _T('\\'))
+ pszSubkeyName++;
+
if (pch == pszNewKey)
{
pszPath = _T(".");
+/* $Id: ShellCommandNewKey.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandNewKey.h: interface for the CShellCommandNewKey class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandOwner.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandOwner.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandOwner.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandOwner.h: interface for the CShellCommandOwner class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandSACL.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandSACL.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandSACL.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandSACL.h: interface for the CShellCommandSACL class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandSetValue.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandSetValue.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandSetValue.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandSetValue.h: interface for the CShellCommandSetValue class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandValue.cpp,v 1.3 2001/01/10 01:25:29 narnaoud Exp $
+/* $Id: ShellCommandValue.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandValue.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandValue.h: interface for the CShellCommandValue class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandVersion.cpp,v 1.2 2000/10/24 20:17:42 narnaoud Exp $
+/* $Id: ShellCommandVersion.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandVersion.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandVersion.h: interface for the CShellCommandVersion class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: ShellCommandsLinkedList.cpp,v 1.2 2000/10/24 20:17:42 narnaoud Exp $
+/* $Id: ShellCommandsLinkedList.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: ShellCommandsLinkedList.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// ShellCommandsLinkedList.h: interface for the CShellCommandsLinkedList class.
//
//////////////////////////////////////////////////////////////////////
-/* $Id: TextHistory.cpp,v 1.2 2000/10/24 20:17:42 narnaoud Exp $
+/* $Id: TextHistory.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $
*
* regexpl - Console Registry Explorer
*
- * Copyright (C) 2000 Nedko Arnaoudov <nedkohome@atia.com>
+ * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+/* $Id: TextHistory.h,v 1.2 2001/01/13 23:55:37 narnaoud Exp $ */
+
// TextHistory.h: interface for the CTextHistory class.
//
//////////////////////////////////////////////////////////////////////
+/* $Id: ph.h,v 1.3 2001/01/13 23:54:40 narnaoud Exp $ */
+
// ph.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
projects / reactos.git / commitdiff