mirror of
https://github.com/reactos/reactos.git
synced 2024-10-04 00:13:57 +00:00
addendum to r73180 (aka, fix the build)
svn path=/trunk/; revision=73183
This commit is contained in:
parent
813cc3f137
commit
c707b2d936
|
@ -26,10 +26,10 @@ CreateAppPathRegKey(const WCHAR* Name)
|
||||||
wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
|
wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
|
||||||
wcscat(Buffer, L"IEXPLORE.EXE");
|
wcscat(Buffer, L"IEXPLORE.EXE");
|
||||||
Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_READ, &RegistryKey);
|
Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_READ, &RegistryKey);
|
||||||
if (Result != ERROR_SUCCESS) trace("Could not open iexplore.exe key. Status: %d\n", Result);
|
if (Result != ERROR_SUCCESS) trace("Could not open iexplore.exe key. Status: %lu\n", Result);
|
||||||
if (Result) goto end;
|
if (Result) goto end;
|
||||||
Result = RegQueryValueExW(RegistryKey, NULL, NULL, NULL, (LPBYTE)KeyValue, &Length);
|
Result = RegQueryValueExW(RegistryKey, NULL, NULL, NULL, (LPBYTE)KeyValue, &Length);
|
||||||
if (Result != ERROR_SUCCESS) trace("Could not read iexplore.exe key. Status: %d\n", Result);
|
if (Result != ERROR_SUCCESS) trace("Could not read iexplore.exe key. Status: %lu\n", Result);
|
||||||
if (Result) goto end;
|
if (Result) goto end;
|
||||||
RegCloseKey(RegistryKey);
|
RegCloseKey(RegistryKey);
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ CreateAppPathRegKey(const WCHAR* Name)
|
||||||
wcscat(Buffer, Name);
|
wcscat(Buffer, Name);
|
||||||
Result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, NULL,
|
Result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, NULL,
|
||||||
0, KEY_WRITE, NULL, &RegistryKey, &Disposition);
|
0, KEY_WRITE, NULL, &RegistryKey, &Disposition);
|
||||||
if (Result != ERROR_SUCCESS) trace("Could not create test key. Status: %d\n", Result);
|
if (Result != ERROR_SUCCESS) trace("Could not create test key. Status: %lu\n", Result);
|
||||||
if (Result) goto end;
|
if (Result) goto end;
|
||||||
Result = RegSetValueW(RegistryKey, NULL, REG_SZ, KeyValue, 0);
|
Result = RegSetValueW(RegistryKey, NULL, REG_SZ, KeyValue, 0);
|
||||||
if (Result != ERROR_SUCCESS) trace("Could not set value of the test key. Status: %d\n", Result);
|
if (Result != ERROR_SUCCESS) trace("Could not set value of the test key. Status: %lu\n", Result);
|
||||||
if (Result) goto end;
|
if (Result) goto end;
|
||||||
RegCloseKey(RegistryKey);
|
RegCloseKey(RegistryKey);
|
||||||
end:
|
end:
|
||||||
|
@ -57,7 +57,7 @@ DeleteAppPathRegKey(const WCHAR* Name)
|
||||||
wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
|
wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
|
||||||
wcscat(Buffer, Name);
|
wcscat(Buffer, Name);
|
||||||
Result = RegDeleteKeyW(HKEY_LOCAL_MACHINE, Buffer);
|
Result = RegDeleteKeyW(HKEY_LOCAL_MACHINE, Buffer);
|
||||||
if (Result != ERROR_SUCCESS) trace("Could not remove the test key. Status: %d\n", Result);
|
if (Result != ERROR_SUCCESS) trace("Could not remove the test key. Status: %lu\n", Result);
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
|
@ -74,11 +74,11 @@ TestShellExecuteEx(const WCHAR* Name, BOOL ExpectedResult)
|
||||||
ShellExecInfo.lpFile = Name;
|
ShellExecInfo.lpFile = Name;
|
||||||
ShellExecInfo.lpDirectory = NULL;
|
ShellExecInfo.lpDirectory = NULL;
|
||||||
Result = ShellExecuteExW(&ShellExecInfo);
|
Result = ShellExecuteExW(&ShellExecInfo);
|
||||||
ok(Result == ExpectedResult, "ShellExecuteEx lpFile %s failed. Error: %d\n", wine_dbgstr_w(Name), GetLastError());
|
ok(Result == ExpectedResult, "ShellExecuteEx lpFile %s failed. Error: %lu\n", wine_dbgstr_w(Name), GetLastError());
|
||||||
if (ShellExecInfo.hProcess)
|
if (ShellExecInfo.hProcess)
|
||||||
{
|
{
|
||||||
Result = TerminateProcess(ShellExecInfo.hProcess, 0);
|
Result = TerminateProcess(ShellExecInfo.hProcess, 0);
|
||||||
if (!Result) trace("Terminate process failed. Error: %d\n", GetLastError());
|
if (!Result) trace("Terminate process failed. Error: %lu\n", GetLastError());
|
||||||
WaitForSingleObject(ShellExecInfo.hProcess, INFINITE);
|
WaitForSingleObject(ShellExecInfo.hProcess, INFINITE);
|
||||||
CloseHandle(ShellExecInfo.hProcess);
|
CloseHandle(ShellExecInfo.hProcess);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue