* win32-nat.c (has_detach_ability, set_process_privilege):
Cast the result of GetProcAddress to (void *) to avoid a compilation warning.
This commit is contained in:
parent
5851ab761b
commit
308a880866
3 changed files with 26 additions and 18 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2009-01-09 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
|
* win32-nat.c (has_detach_ability, set_process_privilege):
|
||||||
|
Cast the result of GetProcAddress to (void *) to avoid
|
||||||
|
a compilation warning.
|
||||||
|
|
||||||
2009-01-09 Joel Brobecker <brobecker@adacore.com>
|
2009-01-09 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
* win32-nat.c (CONTEXT_EXTENDED_REGISTERS): Define to 0 if not
|
* win32-nat.c (CONTEXT_EXTENDED_REGISTERS): Define to 0 if not
|
||||||
|
|
|
@ -1600,11 +1600,11 @@ has_detach_ability (void)
|
||||||
if (kernel32)
|
if (kernel32)
|
||||||
{
|
{
|
||||||
if (!kernel32_DebugSetProcessKillOnExit)
|
if (!kernel32_DebugSetProcessKillOnExit)
|
||||||
kernel32_DebugSetProcessKillOnExit = GetProcAddress (kernel32,
|
kernel32_DebugSetProcessKillOnExit =
|
||||||
"DebugSetProcessKillOnExit");
|
(void *) GetProcAddress (kernel32, "DebugSetProcessKillOnExit");
|
||||||
if (!kernel32_DebugActiveProcessStop)
|
if (!kernel32_DebugActiveProcessStop)
|
||||||
kernel32_DebugActiveProcessStop = GetProcAddress (kernel32,
|
kernel32_DebugActiveProcessStop =
|
||||||
"DebugActiveProcessStop");
|
(void *) GetProcAddress (kernel32, "DebugActiveProcessStop");
|
||||||
if (kernel32_DebugSetProcessKillOnExit
|
if (kernel32_DebugSetProcessKillOnExit
|
||||||
&& kernel32_DebugActiveProcessStop)
|
&& kernel32_DebugActiveProcessStop)
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1641,13 +1641,14 @@ set_process_privilege (const char *privilege, BOOL enable)
|
||||||
if (!(advapi32 = LoadLibrary ("advapi32.dll")))
|
if (!(advapi32 = LoadLibrary ("advapi32.dll")))
|
||||||
goto out;
|
goto out;
|
||||||
if (!OpenProcessToken)
|
if (!OpenProcessToken)
|
||||||
OpenProcessToken = GetProcAddress (advapi32, "OpenProcessToken");
|
OpenProcessToken =
|
||||||
|
(void *) GetProcAddress (advapi32, "OpenProcessToken");
|
||||||
if (!LookupPrivilegeValue)
|
if (!LookupPrivilegeValue)
|
||||||
LookupPrivilegeValue = GetProcAddress (advapi32,
|
LookupPrivilegeValue =
|
||||||
"LookupPrivilegeValueA");
|
(void *) GetProcAddress (advapi32, "LookupPrivilegeValueA");
|
||||||
if (!AdjustTokenPrivileges)
|
if (!AdjustTokenPrivileges)
|
||||||
AdjustTokenPrivileges = GetProcAddress (advapi32,
|
AdjustTokenPrivileges =
|
||||||
"AdjustTokenPrivileges");
|
(void *) GetProcAddress (advapi32, "AdjustTokenPrivileges");
|
||||||
if (!OpenProcessToken || !LookupPrivilegeValue || !AdjustTokenPrivileges)
|
if (!OpenProcessToken || !LookupPrivilegeValue || !AdjustTokenPrivileges)
|
||||||
{
|
{
|
||||||
advapi32 = NULL;
|
advapi32 = NULL;
|
||||||
|
|
|
@ -1600,11 +1600,11 @@ has_detach_ability (void)
|
||||||
if (kernel32)
|
if (kernel32)
|
||||||
{
|
{
|
||||||
if (!kernel32_DebugSetProcessKillOnExit)
|
if (!kernel32_DebugSetProcessKillOnExit)
|
||||||
kernel32_DebugSetProcessKillOnExit = GetProcAddress (kernel32,
|
kernel32_DebugSetProcessKillOnExit =
|
||||||
"DebugSetProcessKillOnExit");
|
(void *) GetProcAddress (kernel32, "DebugSetProcessKillOnExit");
|
||||||
if (!kernel32_DebugActiveProcessStop)
|
if (!kernel32_DebugActiveProcessStop)
|
||||||
kernel32_DebugActiveProcessStop = GetProcAddress (kernel32,
|
kernel32_DebugActiveProcessStop =
|
||||||
"DebugActiveProcessStop");
|
(void *) GetProcAddress (kernel32, "DebugActiveProcessStop");
|
||||||
if (kernel32_DebugSetProcessKillOnExit
|
if (kernel32_DebugSetProcessKillOnExit
|
||||||
&& kernel32_DebugActiveProcessStop)
|
&& kernel32_DebugActiveProcessStop)
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1641,13 +1641,14 @@ set_process_privilege (const char *privilege, BOOL enable)
|
||||||
if (!(advapi32 = LoadLibrary ("advapi32.dll")))
|
if (!(advapi32 = LoadLibrary ("advapi32.dll")))
|
||||||
goto out;
|
goto out;
|
||||||
if (!OpenProcessToken)
|
if (!OpenProcessToken)
|
||||||
OpenProcessToken = GetProcAddress (advapi32, "OpenProcessToken");
|
OpenProcessToken =
|
||||||
|
(void *) GetProcAddress (advapi32, "OpenProcessToken");
|
||||||
if (!LookupPrivilegeValue)
|
if (!LookupPrivilegeValue)
|
||||||
LookupPrivilegeValue = GetProcAddress (advapi32,
|
LookupPrivilegeValue =
|
||||||
"LookupPrivilegeValueA");
|
(void *) GetProcAddress (advapi32, "LookupPrivilegeValueA");
|
||||||
if (!AdjustTokenPrivileges)
|
if (!AdjustTokenPrivileges)
|
||||||
AdjustTokenPrivileges = GetProcAddress (advapi32,
|
AdjustTokenPrivileges =
|
||||||
"AdjustTokenPrivileges");
|
(void *) GetProcAddress (advapi32, "AdjustTokenPrivileges");
|
||||||
if (!OpenProcessToken || !LookupPrivilegeValue || !AdjustTokenPrivileges)
|
if (!OpenProcessToken || !LookupPrivilegeValue || !AdjustTokenPrivileges)
|
||||||
{
|
{
|
||||||
advapi32 = NULL;
|
advapi32 = NULL;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue