Some work toward Issue 27 and Issue 319

This commit is contained in:
Nick Bolton 2010-05-31 21:30:29 +00:00
parent fea12827d4
commit f974d8d680
74 changed files with 4057 additions and 3756 deletions

View file

@ -86,7 +86,7 @@
//
CMSWindowsDesks::CMSWindowsDesks(
bool isPrimary, HINSTANCE hookLibrary,
bool isPrimary, bool noHooks, HINSTANCE hookLibrary,
const IScreenSaver* screensaver, IJob* updateKeys) :
m_isPrimary(isPrimary),
m_is95Family(CArchMiscWindows::isWindows95Family()),
@ -361,7 +361,7 @@ void
CMSWindowsDesks::queryHookLibrary(HINSTANCE hookLibrary)
{
// look up functions
if (m_isPrimary) {
if (m_isPrimary && !m_noHooks) {
m_install = (InstallFunc)GetProcAddress(hookLibrary, "install");
m_uninstall = (UninstallFunc)GetProcAddress(hookLibrary, "uninstall");
m_installScreensaver =
@ -736,7 +736,7 @@ CMSWindowsDesks::deskThread(void* vdesk)
continue;
case SYNERGY_MSG_SWITCH:
if (m_isPrimary) {
if (m_isPrimary && !m_noHooks) {
m_uninstall();
if (m_screensaverNotify) {
m_uninstallScreensaver();
@ -816,11 +816,13 @@ CMSWindowsDesks::deskThread(void* vdesk)
break;
case SYNERGY_MSG_SCREENSAVER:
if (msg.wParam != 0) {
m_installScreensaver();
}
else {
m_uninstallScreensaver();
if (!m_noHooks) {
if (msg.wParam != 0) {
m_installScreensaver();
}
else {
m_uninstallScreensaver();
}
}
break;