Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If zero time is specified, don't try to sleep when using a timer.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-10 23:38:17 +00:00
parent 8774540e37
commit 364faf634e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/msw/utils.cpp
View File

@@ -870,7 +870,7 @@ bool wxShell(const wxString& command)
return wxExecute(cmd, wxEXEC_SYNC) == 0;
}
// Shutdown or reboot the PC
// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
#ifdef __WIN32__
@@ -878,28 +878,28 @@ bool wxShutdown(wxShutdownFlags wFlags)
if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
{
// Get a token for this process.
HANDLE hToken;
// Get a token for this process.
HANDLE hToken;
bOK = ::OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
&hToken) != 0;
#ifndef __WXWINE__
if ( bOK )
{
TOKEN_PRIVILEGES tkp;
TOKEN_PRIVILEGES tkp;
// Get the LUID for the shutdown privilege.
// Get the LUID for the shutdown privilege.
::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,
&tkp.Privileges[0].Luid);
&tkp.Privileges[0].Luid);
tkp.PrivilegeCount = 1; // one privilege to set
tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
tkp.PrivilegeCount = 1; // one privilege to set
tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
// Get the shutdown privilege for this process.
// Get the shutdown privilege for this process.
::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,
(PTOKEN_PRIVILEGES)NULL, 0);
(PTOKEN_PRIVILEGES)NULL, 0);
// Cannot test the return value of AdjustTokenPrivileges.
// Cannot test the return value of AdjustTokenPrivileges.
bOK = ::GetLastError() == ERROR_SUCCESS;
}
#endif
@@ -923,7 +923,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
return FALSE;
}
bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0;
bOK = ::ExitWindowsEx(EWX_SHUTDOWN | EWX_FORCE | EWX_REBOOT, 0) != 0;
}
return bOK;
@@ -1104,6 +1104,8 @@ void wxUsleep(unsigned long milliseconds)
#else // !Win32
if (gs_inTimer)
return;
if (miliseconds <= 0)
return;
wxTheSleepTimer = new wxSleepTimer;
gs_inTimer = TRUE;
@@ -1122,6 +1124,8 @@ void wxSleep(int nSecs)
{
if (gs_inTimer)
return;
if (nSecs <= 0)
return;
wxTheSleepTimer = new wxSleepTimer;
gs_inTimer = TRUE;