backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 21:03:54 +08:00
Code Issues Projects Releases Wiki Activity

Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders

Browse Source 
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
This commit is contained in:
Nick Bolton
2014-03-17 14:34:13 +00:00
parent 407378fbc5
commit 1b5cdecc60
10 changed files with 311 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/integtests/platform/MSWindowsKeyStateTests.cpp
View File

@@ -40,8 +40,7 @@ class CMSWindowsKeyStateTests : public ::testing::Test
protected:
virtual void SetUp()
{
// load synwinhk.dll
m_hookLibrary = m_hookLibraryLoader.openHookLibrary("synwinhk");
m_hook.loadLibrary();
m_screensaver = new CMSWindowsScreenSaver();
}
@@ -53,7 +52,7 @@ protected:
CMSWindowsDesks* newDesks(IEventQueue* eventQueue)
{
return new CMSWindowsDesks(
true, false, m_hookLibrary, m_screensaver, eventQueue,
true, false, m_hook.getInstance(), m_screensaver, eventQueue,
new TMethodJob<CMSWindowsKeyStateTests>(
this, &CMSWindowsKeyStateTests::updateKeysCB), false);
}
@@ -65,9 +64,8 @@ protected:
private:
void updateKeysCB(void*) { }
HINSTANCE m_hookLibrary;
IScreenSaver* m_screensaver;
CMSWindowsHookLibraryLoader m_hookLibraryLoader;
CMSWindowsHook m_hook;
};
TEST_F(CMSWindowsKeyStateTests, disable_nonWin95OS_eventQueueNotUsed)