Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some bugs in regedit

Browse source 
like alloca -> HeapAlloc + HeapFree

svn path=/trunk/; revision=18544
This commit is contained in:
Christoph von Wittich 2005-10-17 23:38:24 +00:00
parent 18d6c8993b
commit 25886dff5a
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/subsys/system/regedit/regproc.c
View file

@ -1620,17 +1620,26 @@ LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName)
{
LPCTSTR s;
LPTSTR lpNewSubKey;
LONG Ret = 0;
s = _tcsrchr(lpSubKey, '\\');
if (s)
{
s++;
lpNewSubKey = (LPTSTR) alloca((s - lpSubKey + _tcslen(lpNewName) + 1) * sizeof(TCHAR));
memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(TCHAR));
_tcscpy(lpNewSubKey + (s - lpSubKey), lpNewName);
lpNewName = lpNewSubKey;
lpNewSubKey = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (s - lpSubKey + _tcslen(lpNewName) + 1) * sizeof(TCHAR));
if (lpNewName != NULL) {
memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(TCHAR));
_tcscpy(lpNewSubKey + (s - lpSubKey), lpNewName);
lpNewName = lpNewSubKey;
}
}
return RegMoveKey(hKey, lpNewName, hKey, lpSubKey);
if (lpNewName != NULL) {
Ret = RegMoveKey(hKey, lpNewName, hKey, lpSubKey);
if (s) {
HeapFree(GetProcessHeap(), 0, lpNewSubKey);
}
}
return Ret;
}
LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue)

2
reactos/subsys/system/regedit/security.c
View file

@ -295,7 +295,7 @@ RegKeyEditPermissions(HWND hWndOwner,
LPCTSTR lpMachine,
LPCTSTR lpKeyName)
{
BOOL Result;
BOOL Result = FALSE;
LPWSTR Machine, KeyName;
HKEY hInfoKey;
LPREGKEYSECURITY RegKeySecurity;