rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed heap to stack allocation in an oft-called function for 

data that's never used outside the function.
This commit is contained in:
crs 2003-02-16 19:50:36 +00:00
parent 3351a66f51
commit 60fdb1f529
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/platform/CMSWindowsScreen.cpp
View File

@ -26,6 +26,8 @@
#include "CStringUtil.h" #include "CStringUtil.h"
#include "CArchMiscWindows.h" #include "CArchMiscWindows.h"
#include <cstring> #include <cstring>
#include <malloc.h>
#include <tchar.h>
// //
// add backwards compatible multihead support (and suppress bogus warning) // add backwards compatible multihead support (and suppress bogus warning)
@ -726,10 +728,9 @@ CMSWindowsScreen::getDesktopName(HDESK desk) const
else { else {
DWORD size; DWORD size;
GetUserObjectInformation(desk, UOI_NAME, NULL, 0, &size); GetUserObjectInformation(desk, UOI_NAME, NULL, 0, &size);
TCHAR* name = new TCHAR[size / sizeof(TCHAR) + 1]; TCHAR* name = (TCHAR*)alloca(size + sizeof(TCHAR));
GetUserObjectInformation(desk, UOI_NAME, name, size, &size); GetUserObjectInformation(desk, UOI_NAME, name, size, &size);
CString result(name); CString result(name);
delete[] name;
return result; return result;
} }
} }
@ -737,7 +738,22 @@ CMSWindowsScreen::getDesktopName(HDESK desk) const
bool bool
CMSWindowsScreen::isCurrentDesktop(HDESK desk) const CMSWindowsScreen::isCurrentDesktop(HDESK desk) const
{ {
return CStringUtil::CaselessCmp::equal(getDesktopName(desk), m_deskName); // don't allocate space for current desktop name on heap since
// we do this a lot and we never save the name.
TCHAR* name;
if (desk == NULL) {
name = _T("");
}
else if (m_is95Family) {
name = _T("desktop");
}
else {
DWORD size;
GetUserObjectInformation(desk, UOI_NAME, NULL, 0, &size);
name = (TCHAR*)alloca(size + sizeof(TCHAR));
GetUserObjectInformation(desk, UOI_NAME, name, size, &size);
}
return (_tcsicmp(name, m_deskName.c_str()) == 0);
} }
LRESULT CALLBACK LRESULT CALLBACK