https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec621270a17aef6c97827b...
commit ec621270a17aef6c97827b28fefa11e987a06335 Author: Mark Jansen mark.jansen@reactos.org AuthorDate: Sat Oct 13 17:10:09 2018 +0200 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Fri Oct 19 23:13:51 2018 +0200
[GFLAGS] Move common code to a shared location. --- .../rosapps/applications/cmdutils/gflags/gflags.c | 47 +++++++-- .../rosapps/applications/cmdutils/gflags/gflags.h | 6 +- .../applications/cmdutils/gflags/pageheap.c | 111 ++++++--------------- 3 files changed, 77 insertions(+), 87 deletions(-)
diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.c b/modules/rosapps/applications/cmdutils/gflags/gflags.c index b0751a091f..ac2af7a8e9 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.c +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.c @@ -10,14 +10,47 @@
static BOOL UsePageHeap = FALSE;
+const WCHAR ImageExecOptionsString[] = L"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options";
-DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) +BOOL OpenImageFileExecOptions(IN REGSAM SamDesired, IN OPTIONAL PCWSTR ImageName, OUT HKEY* Key) { + LONG Ret; + HKEY HandleKey, HandleSubKey; + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"OpenIFEO: RegOpenKeyEx failed (%d)\n", Ret); + return FALSE; + } + + if (ImageName == NULL) + { + *Key = HandleKey; + return TRUE; + } + + Ret = RegCreateKeyExW(HandleKey, ImageName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); + CloseHandle(HandleKey); + + if (Ret != ERROR_SUCCESS) + { + wprintf(L"OpenIFEO: RegCreateKeyEx failed (%d)\n", Ret); + return FALSE; + } + *Key = HandleSubKey; + return TRUE; +} + + +DWORD ReadSZFlagsFromRegistry(HKEY SubKey, PWSTR Value) +{ + WCHAR Buffer[20] = { 0 }; DWORD Len, Flags, Type;
- Len = MaxLen; + Len = sizeof(Buffer) - sizeof(WCHAR); Flags = 0; - if (RegQueryValueEx(SubKey, Value, NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) + if (RegQueryValueExW(SubKey, Value, NULL, &Type, (BYTE*)Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) { Flags = wcstoul(Buffer, NULL, 16); } @@ -67,10 +100,10 @@ int wmain(int argc, LPWSTR argv[]) if (!ParseCmdline(argc, argv)) { wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" - L"\timage.exe:\tImage you want to deal with\n" - L"\t/enable:\tenable page heap for the image\n" - L"\t/disable:\tdisable page heap for the image\n" - L"\t/full:\t\tactivate full debug page heap\n"); + L" image.exe: Image you want to deal with\n" + L" /enable: enable page heap for the image\n" + L" /disable: disable page heap for the image\n" + L" /full: activate full debug page heap\n"); return 1; }
diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.h b/modules/rosapps/applications/cmdutils/gflags/gflags.h index 740f6a77c7..37674b67c7 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.h +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.h @@ -13,7 +13,10 @@ #include <winreg.h> #include <stdio.h> #include <stdlib.h> +#include <pstypes.h>
+extern +const WCHAR ImageExecOptionsString[];
/* Option specific commandline parsing */ BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); @@ -22,5 +25,6 @@ BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); INT PageHeap_Execute();
/* Common functions */ -DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen); +DWORD ReadSZFlagsFromRegistry(HKEY SubKey, PWSTR Value); +BOOL OpenImageFileExecOptions(IN REGSAM SamDesired, IN OPTIONAL PCWSTR ImageName, OUT HKEY* Key);
diff --git a/modules/rosapps/applications/cmdutils/gflags/pageheap.c b/modules/rosapps/applications/cmdutils/gflags/pageheap.c index 33d11b1c27..e5289176c6 100644 --- a/modules/rosapps/applications/cmdutils/gflags/pageheap.c +++ b/modules/rosapps/applications/cmdutils/gflags/pageheap.c @@ -11,63 +11,34 @@ static BOOL Set = FALSE; static BOOL Unset = FALSE; static BOOL Full = FALSE; static PWSTR Image = NULL; -static WCHAR ImageExecOptionsString[] = L"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options";
static VOID ModifyStatus(VOID) { LONG Ret; - DWORD MaxLen, GlobalFlags; - PVOID Buffer; - HKEY HandleKey, HandleSubKey; + DWORD GlobalFlags; + HKEY IFEOKey; + WCHAR Buffer[11];
- Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) + if (!OpenImageFileExecOptions(KEY_WRITE | KEY_READ, Image, &IFEOKey)) { - wprintf(L"MS: RegOpenKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegCreateKeyEx(HandleKey, Image, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegCreateKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); - return; - } - - MaxLen = max(MaxLen, 11 * sizeof(WCHAR)); - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"MS: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); return; }
- GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); + GlobalFlags = ReadSZFlagsFromRegistry(IFEOKey, L"GlobalFlag"); if (Set) { - GlobalFlags |= 0x02000000; + GlobalFlags |= FLG_HEAP_PAGE_ALLOCS; } else { - GlobalFlags &= ~0x02000000; + GlobalFlags &= ~FLG_HEAP_PAGE_ALLOCS; }
if (GlobalFlags != 0) { wsprintf(Buffer, L"0x%08x", GlobalFlags); - Ret = RegSetValueEx(HandleSubKey, L"GlobalFlag", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + Ret = RegSetValueExW(IFEOKey, L"GlobalFlag", 0, REG_SZ, (BYTE*)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -75,7 +46,7 @@ static VOID ModifyStatus(VOID) } else { - Ret = RegDeleteValue(HandleSubKey, L"GlobalFlag"); + Ret = RegDeleteValueW(IFEOKey, L"GlobalFlag"); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); @@ -84,7 +55,7 @@ static VOID ModifyStatus(VOID)
if (Unset) { - Ret = RegDeleteValue(HandleSubKey, L"PageHeapFlags"); + Ret = RegDeleteValueW(IFEOKey, L"PageHeapFlags"); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); @@ -94,7 +65,7 @@ static VOID ModifyStatus(VOID) { DWORD PageHeapFlags;
- PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + PageHeapFlags = ReadSZFlagsFromRegistry(IFEOKey, L"PageHeapFlags"); PageHeapFlags &= ~3;
if (Full) @@ -104,7 +75,7 @@ static VOID ModifyStatus(VOID) PageHeapFlags |= 2;
wsprintf(Buffer, L"0x%x", PageHeapFlags); - Ret = RegSetValueEx(HandleSubKey, L"PageHeapFlags", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + Ret = RegSetValueExW(IFEOKey, L"PageHeapFlags", 0, REG_SZ, (BYTE*)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -116,24 +87,27 @@ static VOID ModifyStatus(VOID) DWORD Type, VerifierFlags, Len;
VerifierFlags = 0; - Len = MaxLen; - if (RegQueryValueEx(HandleSubKey, L"VerifierFlags", NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && + Len = VerifierFlags; + if (RegQueryValueExW(IFEOKey, L"VerifierFlags", NULL, &Type, (BYTE *)&VerifierFlags, &Len) == ERROR_SUCCESS && Type == REG_DWORD && Len == sizeof(DWORD)) { - VerifierFlags = ((DWORD *)Buffer)[0]; - VerifierFlags &= ~0x8001; + VerifierFlags &= ~0x8001; /* RTL_VRF_FLG_FAST_FILL_HEAP | RTL_VRF_FLG_FULL_PAGE_HEAP */ + } + else + { + VerifierFlags = 0; }
if (Full) { - VerifierFlags |= 1; + VerifierFlags |= 1; /* RTL_VRF_FLG_FULL_PAGE_HEAP */ } else { - VerifierFlags |= 0x8000; + VerifierFlags |= 0x8000; /* RTL_VRF_FLG_FAST_FILL_HEAP */ }
- Ret = RegSetValueEx(HandleSubKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); + Ret = RegSetValueExW(IFEOKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -144,44 +118,26 @@ static VOID ModifyStatus(VOID) wprintf(L"\t%s: page heap %s\n", Image, (Set ? L"enabled" : L"disabled"));
HeapFree(GetProcessHeap(), 0, Buffer); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); + RegCloseKey(IFEOKey); }
static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) { LONG Ret; BOOL Handled; - DWORD MaxLen, GlobalFlags; + DWORD GlobalFlags; HKEY HandleSubKey; - PVOID Buffer;
- Ret = RegOpenKeyEx(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); + Ret = RegOpenKeyExW(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); if (Ret != ERROR_SUCCESS) { wprintf(L"DII: RegOpenKeyEx failed (%d)\n", Ret); return FALSE; }
- Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DII: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - return FALSE; - } - - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"DII: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - return FALSE; - } - Handled = FALSE; - GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); - if (GlobalFlags & 0x02000000) + GlobalFlags = ReadSZFlagsFromRegistry(HandleSubKey, L"GlobalFlag"); + if (GlobalFlags & FLG_HEAP_PAGE_ALLOCS) { DWORD PageHeapFlags;
@@ -199,7 +155,7 @@ static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) wprintf(L"Page heap is enabled for %s with flags (", SubKey); }
- PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + PageHeapFlags = ReadSZFlagsFromRegistry(HandleSubKey, L"PageHeapFlags"); if (PageHeapFlags & 0x1) { wprintf(L"full "); @@ -215,7 +171,6 @@ static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) Handled = TRUE; }
- HeapFree(GetProcessHeap(), 0, Buffer); RegCloseKey(HandleSubKey);
return Handled; @@ -229,14 +184,12 @@ static VOID DisplayStatus(VOID) TCHAR * SubKey; BOOL Header;
- Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) + if (!OpenImageFileExecOptions(KEY_READ, NULL, &HandleKey)) { - wprintf(L"DS: RegOpenKeyEx failed (%d)\n", Ret); return; }
- Ret = RegQueryInfoKey(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); + Ret = RegQueryInfoKeyW(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); if (Ret != ERROR_SUCCESS) { wprintf(L"DS: RegQueryInfoKey failed (%d)\n", Ret); @@ -245,7 +198,7 @@ static VOID DisplayStatus(VOID) }
++MaxLen; // NULL-char - SubKey = HeapAlloc(GetProcessHeap(), 0, MaxLen * sizeof(TCHAR)); + SubKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MaxLen * sizeof(WCHAR)); if (SubKey == NULL) { wprintf(L"DS: HeapAlloc failed\n"); @@ -258,7 +211,7 @@ static VOID DisplayStatus(VOID) Header = FALSE; do { - Ret = RegEnumKey(HandleKey, Index, SubKey, MaxLen); + Ret = RegEnumKeyW(HandleKey, Index, SubKey, MaxLen); if (Ret != ERROR_NO_MORE_ITEMS) { if (Image == NULL || wcscmp(SubKey, Image) == 0)
-
Mark Jansen