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

Preliminary support for MSYS/MinGW builds. Doesn't yet build 

CSynergyHook as a DLL and does not compile or link in the
resources for the binaries.
This commit is contained in:
crs 2004-04-11 19:15:09 +00:00
parent 530be3ff9d
commit bf2879724f
20 changed files with 386 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/launcher/launcher.rc
View File

@ -7,7 +7,10 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include "winres.h"
#if !defined(IDC_STATIC)
#define IDC_STATIC (-1)
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS

5
cmd/synergyc/synergyc.rc
View File

@ -7,7 +7,10 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include "winres.h"
#if !defined(IDC_STATIC)
#define IDC_STATIC (-1)
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS

4
cmd/synergys/synergys.cpp
View File

@ -692,8 +692,8 @@ parse(int argc, const char* const* argv)
ARG->m_name = ARCH->getHostName(); ARG->m_name = ARCH->getHostName();
// parse options // parse options
int i; int i = 1;
for (i = 1; i < argc; ++i) { for (; i < argc; ++i) {
if (isArg(i, argc, argv, "-d", "--debug", 1)) { if (isArg(i, argc, argv, "-d", "--debug", 1)) {
// change logging level // change logging level
ARG->m_logFilter = argv[++i]; ARG->m_logFilter = argv[++i];

5
cmd/synergys/synergys.rc
View File

@ -7,7 +7,10 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include "winres.h"
#if !defined(IDC_STATIC)
#define IDC_STATIC (-1)
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS

2
configure.in
View File

@ -32,7 +32,7 @@ ARCH_LIBS=""
ARCH_CFLAGS="" ARCH_CFLAGS=""
AC_CANONICAL_HOST AC_CANONICAL_HOST
case $host in case $host in
*-*-windows*) *-*-mingw32* | *-*-windows*)
acx_host_arch="WIN32" acx_host_arch="WIN32"
acx_host_winapi="MSWINDOWS" acx_host_winapi="MSWINDOWS"
ARCH_CFLAGS="$ARCH_CFLAGS -DSYSAPI_WIN32=1 -DWINAPI_MSWINDOWS=1" ARCH_CFLAGS="$ARCH_CFLAGS -DSYSAPI_WIN32=1 -DWINAPI_MSWINDOWS=1"

4
lib/arch/CArchDaemonWindows.cpp
View File

@ -277,7 +277,7 @@ CArchDaemonWindows::daemonize(const char* name, DaemonFunc func)
FreeLibrary(kernel); FreeLibrary(kernel);
throw XArchDaemonFailed(new XArchEvalWindows(err)); throw XArchDaemonFailed(new XArchEvalWindows(err));
} }
if (RegisterServiceProcess(NULL, 1) == 0) { if (RegisterServiceProcess(0, 1) == 0) {
// RegisterServiceProcess failed // RegisterServiceProcess failed
DWORD err = GetLastError(); DWORD err = GetLastError();
FreeLibrary(kernel); FreeLibrary(kernel);
@ -590,7 +590,7 @@ CArchDaemonWindows::serviceMain(DWORD argc, LPTSTR* argvIn)
// register our service handler function // register our service handler function
m_statusHandle = RegisterServiceCtrlHandler(argv[0], m_statusHandle = RegisterServiceCtrlHandler(argv[0],
&CArchDaemonWindows::serviceHandlerEntry); &CArchDaemonWindows::serviceHandlerEntry);
if (m_statusHandle == NULL) { if (m_statusHandle == 0) {
// cannot start as service // cannot start as service
m_daemonResult = -1; m_daemonResult = -1;
ARCH->closeCondVar(m_serviceCondVar); ARCH->closeCondVar(m_serviceCondVar);

6
lib/arch/CArchMultithreadWindows.cpp
View File

@ -12,7 +12,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#if !defined(_MT) #if defined(_MSC_VER) && !defined(_MT)
# error multithreading compile option is required # error multithreading compile option is required
#endif #endif
@ -415,12 +415,12 @@ CArchMultithreadWindows::setPriorityOfThread(CArchThread thread, int n)
assert(thread != NULL); assert(thread != NULL);
size_t index; size_t index;
if (n > 0 && s_pBase < n) { if (n > 0 && s_pBase < (size_t)n) {
// lowest priority // lowest priority
index = 0; index = 0;
} }
else { else {
index = s_pBase - n; index = (size_t)((int)s_pBase - n);
if (index > s_pMax) { if (index > s_pMax) {
// highest priority // highest priority
index = s_pMax; index = s_pMax;

3
lib/arch/CArchNetworkWinsock.cpp
View File

@ -15,6 +15,7 @@
#include "CArchNetworkWinsock.h" #include "CArchNetworkWinsock.h"
#include "CArch.h" #include "CArch.h"
#include "CArchMultithreadWindows.h"
#include "IArchMultithread.h" #include "IArchMultithread.h"
#include "XArchWindows.h" #include "XArchWindows.h"
#include <malloc.h> #include <malloc.h>
@ -578,7 +579,7 @@ CArchNetworkWinsock::throwErrorOnSocket(CArchSocket s)
void void
CArchNetworkWinsock::setBlockingOnSocket(SOCKET s, bool blocking) CArchNetworkWinsock::setBlockingOnSocket(SOCKET s, bool blocking)
{ {
assert(s != NULL); assert(s != 0);
int flag = blocking ? 0 : 1; int flag = blocking ? 0 : 1;
if (ioctl_winsock(s, FIONBIO, &flag) == SOCKET_ERROR) { if (ioctl_winsock(s, FIONBIO, &flag) == SOCKET_ERROR) {

1
lib/arch/CArchStringWindows.cpp
View File

@ -16,6 +16,7 @@
#include "CArchStringWindows.h" #include "CArchStringWindows.h"
#include <windows.h> #include <windows.h>
#include <stdio.h>
#include "CMultibyte.cpp" #include "CMultibyte.cpp"

5
lib/arch/CArchTaskBarWindows.cpp
View File

@ -13,6 +13,7 @@
*/ */
#include "CArchTaskBarWindows.h" #include "CArchTaskBarWindows.h"
#include "CArchMiscWindows.h"
#include "IArchTaskBarReceiver.h" #include "IArchTaskBarReceiver.h"
#include "CArch.h" #include "CArch.h"
#include "XArch.h" #include "XArch.h"
@ -464,7 +465,7 @@ CArchTaskBarWindows::threadMainLoop()
// handle failure // handle failure
if (m_hwnd == NULL) { if (m_hwnd == NULL) {
UnregisterClass((LPCTSTR)windowClass, s_appInstance); UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass), s_appInstance);
return; return;
} }
@ -480,7 +481,7 @@ CArchTaskBarWindows::threadMainLoop()
// clean up // clean up
removeAllIcons(); removeAllIcons();
DestroyWindow(m_hwnd); DestroyWindow(m_hwnd);
UnregisterClass((LPCTSTR)windowClass, s_appInstance); UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass), s_appInstance);
} }
void* void*

2
lib/arch/CMultibyte.cpp
View File

@ -17,7 +17,7 @@
#include "common.h" #include "common.h"
#if (HAVE_MBSINIT && HAVE_MBRTOWC && HAVE_WCRTOMB) || SYSAPI_WIN32 #if (HAVE_MBSINIT && HAVE_MBRTOWC && HAVE_WCRTOMB) || defined(_MSC_VER)
#include "CMultibyteOS.cpp" #include "CMultibyteOS.cpp"
#else #else
#include "CMultibyteEmu.cpp" #include "CMultibyteEmu.cpp"

1
lib/arch/XArchWindows.cpp
View File

@ -13,6 +13,7 @@
*/ */
#include "XArchWindows.h" #include "XArchWindows.h"
#include "CArchNetworkWinsock.h"
// //
// XArchEvalWindows // XArchEvalWindows

150
lib/arch/arch.dsp
View File

@ -91,12 +91,76 @@ SOURCE=.\CArch.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\CArchImpl.cpp SOURCE=.\CArchConsoleWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchDaemonWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchFileWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchLogWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchMiscWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchMultithreadWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchNetworkWinsock.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchSleepWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchStringWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchTaskBarWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CArchTimeWindows.cpp
# End Source File
# Begin Source File
SOURCE=.\CMultibyte.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CMultibyteEmu.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CMultibyteOS.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\vsnprintf.cpp
# PROP Exclude_From_Build 1
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\XArch.cpp SOURCE=.\XArch.cpp
# End Source File # End Source File
# Begin Source File
SOURCE=.\XArchWindows.cpp
# End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
@ -202,89 +266,5 @@ SOURCE=.\XArch.h
SOURCE=.\XArchWindows.h SOURCE=.\XArchWindows.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Included Files"
# PROP Default_Filter "inc"
# Begin Source File
SOURCE=.\CArchConsoleWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchDaemonWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchFileWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchLogWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchMiscWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchMultithreadWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchNetworkWinsock.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchSleepWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchStringWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchTaskBarWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CArchTimeWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CMultibyte.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CMultibyteEmu.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\CMultibyteOS.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\vsnprintf.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=.\XArchWindows.cpp
# PROP Exclude_From_Build 1
# End Source File
# End Group
# End Target # End Target
# End Project # End Project

1
lib/common/common.h
View File

@ -48,6 +48,7 @@
// VC++ has built-in sized types // VC++ has built-in sized types
#if defined(_MSC_VER) #if defined(_MSC_VER)
# include <wchar.h>
# define TYPE_OF_SIZE_1 __int8 # define TYPE_OF_SIZE_1 __int8
# define TYPE_OF_SIZE_2 __int16 # define TYPE_OF_SIZE_2 __int16
# define TYPE_OF_SIZE_4 __int32 # define TYPE_OF_SIZE_4 __int32

5
lib/platform/CMSWindowsDesks.cpp
View File

@ -387,7 +387,8 @@ void
CMSWindowsDesks::destroyClass(ATOM windowClass) const CMSWindowsDesks::destroyClass(ATOM windowClass) const
{ {
if (windowClass != 0) { if (windowClass != 0) {
UnregisterClass((LPCTSTR)windowClass, CMSWindowsScreen::getInstance()); UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass),
CMSWindowsScreen::getInstance());
} }
} }
@ -397,7 +398,7 @@ CMSWindowsDesks::createWindow(ATOM windowClass, const char* name) const
HWND window = CreateWindowEx(WS_EX_TOPMOST | HWND window = CreateWindowEx(WS_EX_TOPMOST |
WS_EX_TRANSPARENT | WS_EX_TRANSPARENT |
WS_EX_TOOLWINDOW, WS_EX_TOOLWINDOW,
(LPCTSTR)windowClass, reinterpret_cast<LPCTSTR>(windowClass),
name, name,
WS_POPUP, WS_POPUP,
0, 0, 1, 1, 0, 0, 1, 1,

515
lib/platform/CMSWindowsKeyState.cpp
View File

@ -315,262 +315,262 @@ const char* CMSWindowsKeyState::s_vkToName[] =
// map virtual keys to synergy key enumeration // map virtual keys to synergy key enumeration
const KeyID CMSWindowsKeyState::s_virtualKey[][2] = const KeyID CMSWindowsKeyState::s_virtualKey[][2] =
{ {
/* 0x00 */ kKeyNone, kKeyNone, // reserved /* 0x00 */ { kKeyNone, kKeyNone }, // reserved
/* 0x01 */ kKeyNone, kKeyNone, // VK_LBUTTON /* 0x01 */ { kKeyNone, kKeyNone }, // VK_LBUTTON
/* 0x02 */ kKeyNone, kKeyNone, // VK_RBUTTON /* 0x02 */ { kKeyNone, kKeyNone }, // VK_RBUTTON
/* 0x03 */ kKeyNone, kKeyBreak, // VK_CANCEL /* 0x03 */ { kKeyNone, kKeyBreak }, // VK_CANCEL
/* 0x04 */ kKeyNone, kKeyNone, // VK_MBUTTON /* 0x04 */ { kKeyNone, kKeyNone }, // VK_MBUTTON
/* 0x05 */ kKeyNone, kKeyNone, // undefined /* 0x05 */ { kKeyNone, kKeyNone }, // undefined
/* 0x06 */ kKeyNone, kKeyNone, // undefined /* 0x06 */ { kKeyNone, kKeyNone }, // undefined
/* 0x07 */ kKeyNone, kKeyNone, // undefined /* 0x07 */ { kKeyNone, kKeyNone }, // undefined
/* 0x08 */ kKeyBackSpace, kKeyNone, // VK_BACK /* 0x08 */ { kKeyBackSpace, kKeyNone }, // VK_BACK
/* 0x09 */ kKeyTab, kKeyNone, // VK_TAB /* 0x09 */ { kKeyTab, kKeyNone }, // VK_TAB
/* 0x0a */ kKeyNone, kKeyNone, // undefined /* 0x0a */ { kKeyNone, kKeyNone }, // undefined
/* 0x0b */ kKeyNone, kKeyNone, // undefined /* 0x0b */ { kKeyNone, kKeyNone }, // undefined
/* 0x0c */ kKeyClear, kKeyClear, // VK_CLEAR /* 0x0c */ { kKeyClear, kKeyClear }, // VK_CLEAR
/* 0x0d */ kKeyReturn, kKeyKP_Enter, // VK_RETURN /* 0x0d */ { kKeyReturn, kKeyKP_Enter }, // VK_RETURN
/* 0x0e */ kKeyNone, kKeyNone, // undefined /* 0x0e */ { kKeyNone, kKeyNone }, // undefined
/* 0x0f */ kKeyNone, kKeyNone, // undefined /* 0x0f */ { kKeyNone, kKeyNone }, // undefined
/* 0x10 */ kKeyShift_L, kKeyShift_R, // VK_SHIFT /* 0x10 */ { kKeyShift_L, kKeyShift_R }, // VK_SHIFT
/* 0x11 */ kKeyControl_L, kKeyControl_R, // VK_CONTROL /* 0x11 */ { kKeyControl_L, kKeyControl_R },// VK_CONTROL
/* 0x12 */ kKeyAlt_L, kKeyAlt_R, // VK_MENU /* 0x12 */ { kKeyAlt_L, kKeyAlt_R }, // VK_MENU
/* 0x13 */ kKeyPause, kKeyNone, // VK_PAUSE /* 0x13 */ { kKeyPause, kKeyNone }, // VK_PAUSE
/* 0x14 */ kKeyCapsLock, kKeyNone, // VK_CAPITAL /* 0x14 */ { kKeyCapsLock, kKeyNone }, // VK_CAPITAL
/* 0x15 */ kKeyNone, kKeyNone, // VK_KANA /* 0x15 */ { kKeyNone, kKeyNone }, // VK_KANA
/* 0x16 */ kKeyNone, kKeyNone, // VK_HANGUL /* 0x16 */ { kKeyNone, kKeyNone }, // VK_HANGUL
/* 0x17 */ kKeyNone, kKeyNone, // VK_JUNJA /* 0x17 */ { kKeyNone, kKeyNone }, // VK_JUNJA
/* 0x18 */ kKeyNone, kKeyNone, // VK_FINAL /* 0x18 */ { kKeyNone, kKeyNone }, // VK_FINAL
/* 0x19 */ kKeyZenkaku, kKeyNone, // VK_KANJI /* 0x19 */ { kKeyZenkaku, kKeyNone }, // VK_KANJI
/* 0x1a */ kKeyNone, kKeyNone, // undefined /* 0x1a */ { kKeyNone, kKeyNone }, // undefined
/* 0x1b */ kKeyEscape, kKeyNone, // VK_ESCAPE /* 0x1b */ { kKeyEscape, kKeyNone }, // VK_ESCAPE
/* 0x1c */ kKeyNone, kKeyNone, // VK_CONVERT /* 0x1c */ { kKeyNone, kKeyNone }, // VK_CONVERT
/* 0x1d */ kKeyNone, kKeyNone, // VK_NONCONVERT /* 0x1d */ { kKeyNone, kKeyNone }, // VK_NONCONVERT
/* 0x1e */ kKeyNone, kKeyNone, // VK_ACCEPT /* 0x1e */ { kKeyNone, kKeyNone }, // VK_ACCEPT
/* 0x1f */ kKeyNone, kKeyNone, // VK_MODECHANGE /* 0x1f */ { kKeyNone, kKeyNone }, // VK_MODECHANGE
/* 0x20 */ kKeyNone, kKeyNone, // VK_SPACE /* 0x20 */ { kKeyNone, kKeyNone }, // VK_SPACE
/* 0x21 */ kKeyKP_PageUp, kKeyPageUp, // VK_PRIOR /* 0x21 */ { kKeyKP_PageUp, kKeyPageUp }, // VK_PRIOR
/* 0x22 */ kKeyKP_PageDown, kKeyPageDown, // VK_NEXT /* 0x22 */ { kKeyKP_PageDown, kKeyPageDown }, // VK_NEXT
/* 0x23 */ kKeyKP_End, kKeyEnd, // VK_END /* 0x23 */ { kKeyKP_End, kKeyEnd }, // VK_END
/* 0x24 */ kKeyKP_Home, kKeyHome, // VK_HOME /* 0x24 */ { kKeyKP_Home, kKeyHome }, // VK_HOME
/* 0x25 */ kKeyKP_Left, kKeyLeft, // VK_LEFT /* 0x25 */ { kKeyKP_Left, kKeyLeft }, // VK_LEFT
/* 0x26 */ kKeyKP_Up, kKeyUp, // VK_UP /* 0x26 */ { kKeyKP_Up, kKeyUp }, // VK_UP
/* 0x27 */ kKeyKP_Right, kKeyRight, // VK_RIGHT /* 0x27 */ { kKeyKP_Right, kKeyRight }, // VK_RIGHT
/* 0x28 */ kKeyKP_Down, kKeyDown, // VK_DOWN /* 0x28 */ { kKeyKP_Down, kKeyDown }, // VK_DOWN
/* 0x29 */ kKeySelect, kKeySelect, // VK_SELECT /* 0x29 */ { kKeySelect, kKeySelect }, // VK_SELECT
/* 0x2a */ kKeyNone, kKeyNone, // VK_PRINT /* 0x2a */ { kKeyNone, kKeyNone }, // VK_PRINT
/* 0x2b */ kKeyExecute, kKeyExecute, // VK_EXECUTE /* 0x2b */ { kKeyExecute, kKeyExecute }, // VK_EXECUTE
/* 0x2c */ kKeyPrint, kKeyPrint, // VK_SNAPSHOT /* 0x2c */ { kKeyPrint, kKeyPrint }, // VK_SNAPSHOT
/* 0x2d */ kKeyKP_Insert, kKeyInsert, // VK_INSERT /* 0x2d */ { kKeyKP_Insert, kKeyInsert }, // VK_INSERT
/* 0x2e */ kKeyKP_Delete, kKeyDelete, // VK_DELETE /* 0x2e */ { kKeyKP_Delete, kKeyDelete }, // VK_DELETE
/* 0x2f */ kKeyHelp, kKeyHelp, // VK_HELP /* 0x2f */ { kKeyHelp, kKeyHelp }, // VK_HELP
/* 0x30 */ kKeyNone, kKeyNone, // VK_0 /* 0x30 */ { kKeyNone, kKeyNone }, // VK_0
/* 0x31 */ kKeyNone, kKeyNone, // VK_1 /* 0x31 */ { kKeyNone, kKeyNone }, // VK_1
/* 0x32 */ kKeyNone, kKeyNone, // VK_2 /* 0x32 */ { kKeyNone, kKeyNone }, // VK_2
/* 0x33 */ kKeyNone, kKeyNone, // VK_3 /* 0x33 */ { kKeyNone, kKeyNone }, // VK_3
/* 0x34 */ kKeyNone, kKeyNone, // VK_4 /* 0x34 */ { kKeyNone, kKeyNone }, // VK_4
/* 0x35 */ kKeyNone, kKeyNone, // VK_5 /* 0x35 */ { kKeyNone, kKeyNone }, // VK_5
/* 0x36 */ kKeyNone, kKeyNone, // VK_6 /* 0x36 */ { kKeyNone, kKeyNone }, // VK_6
/* 0x37 */ kKeyNone, kKeyNone, // VK_7 /* 0x37 */ { kKeyNone, kKeyNone }, // VK_7
/* 0x38 */ kKeyNone, kKeyNone, // VK_8 /* 0x38 */ { kKeyNone, kKeyNone }, // VK_8
/* 0x39 */ kKeyNone, kKeyNone, // VK_9 /* 0x39 */ { kKeyNone, kKeyNone }, // VK_9
/* 0x3a */ kKeyNone, kKeyNone, // undefined /* 0x3a */ { kKeyNone, kKeyNone }, // undefined
/* 0x3b */ kKeyNone, kKeyNone, // undefined /* 0x3b */ { kKeyNone, kKeyNone }, // undefined
/* 0x3c */ kKeyNone, kKeyNone, // undefined /* 0x3c */ { kKeyNone, kKeyNone }, // undefined
/* 0x3d */ kKeyNone, kKeyNone, // undefined /* 0x3d */ { kKeyNone, kKeyNone }, // undefined
/* 0x3e */ kKeyNone, kKeyNone, // undefined /* 0x3e */ { kKeyNone, kKeyNone }, // undefined
/* 0x3f */ kKeyNone, kKeyNone, // undefined /* 0x3f */ { kKeyNone, kKeyNone }, // undefined
/* 0x40 */ kKeyNone, kKeyNone, // undefined /* 0x40 */ { kKeyNone, kKeyNone }, // undefined
/* 0x41 */ kKeyNone, kKeyNone, // VK_A /* 0x41 */ { kKeyNone, kKeyNone }, // VK_A
/* 0x42 */ kKeyNone, kKeyNone, // VK_B /* 0x42 */ { kKeyNone, kKeyNone }, // VK_B
/* 0x43 */ kKeyNone, kKeyNone, // VK_C /* 0x43 */ { kKeyNone, kKeyNone }, // VK_C
/* 0x44 */ kKeyNone, kKeyNone, // VK_D /* 0x44 */ { kKeyNone, kKeyNone }, // VK_D
/* 0x45 */ kKeyNone, kKeyNone, // VK_E /* 0x45 */ { kKeyNone, kKeyNone }, // VK_E
/* 0x46 */ kKeyNone, kKeyNone, // VK_F /* 0x46 */ { kKeyNone, kKeyNone }, // VK_F
/* 0x47 */ kKeyNone, kKeyNone, // VK_G /* 0x47 */ { kKeyNone, kKeyNone }, // VK_G
/* 0x48 */ kKeyNone, kKeyNone, // VK_H /* 0x48 */ { kKeyNone, kKeyNone }, // VK_H
/* 0x49 */ kKeyNone, kKeyNone, // VK_I /* 0x49 */ { kKeyNone, kKeyNone }, // VK_I
/* 0x4a */ kKeyNone, kKeyNone, // VK_J /* 0x4a */ { kKeyNone, kKeyNone }, // VK_J
/* 0x4b */ kKeyNone, kKeyNone, // VK_K /* 0x4b */ { kKeyNone, kKeyNone }, // VK_K
/* 0x4c */ kKeyNone, kKeyNone, // VK_L /* 0x4c */ { kKeyNone, kKeyNone }, // VK_L
/* 0x4d */ kKeyNone, kKeyNone, // VK_M /* 0x4d */ { kKeyNone, kKeyNone }, // VK_M
/* 0x4e */ kKeyNone, kKeyNone, // VK_N /* 0x4e */ { kKeyNone, kKeyNone }, // VK_N
/* 0x4f */ kKeyNone, kKeyNone, // VK_O /* 0x4f */ { kKeyNone, kKeyNone }, // VK_O
/* 0x50 */ kKeyNone, kKeyNone, // VK_P /* 0x50 */ { kKeyNone, kKeyNone }, // VK_P
/* 0x51 */ kKeyNone, kKeyNone, // VK_Q /* 0x51 */ { kKeyNone, kKeyNone }, // VK_Q
/* 0x52 */ kKeyNone, kKeyNone, // VK_R /* 0x52 */ { kKeyNone, kKeyNone }, // VK_R
/* 0x53 */ kKeyNone, kKeyNone, // VK_S /* 0x53 */ { kKeyNone, kKeyNone }, // VK_S
/* 0x54 */ kKeyNone, kKeyNone, // VK_T /* 0x54 */ { kKeyNone, kKeyNone }, // VK_T
/* 0x55 */ kKeyNone, kKeyNone, // VK_U /* 0x55 */ { kKeyNone, kKeyNone }, // VK_U
/* 0x56 */ kKeyNone, kKeyNone, // VK_V /* 0x56 */ { kKeyNone, kKeyNone }, // VK_V
/* 0x57 */ kKeyNone, kKeyNone, // VK_W /* 0x57 */ { kKeyNone, kKeyNone }, // VK_W
/* 0x58 */ kKeyNone, kKeyNone, // VK_X /* 0x58 */ { kKeyNone, kKeyNone }, // VK_X
/* 0x59 */ kKeyNone, kKeyNone, // VK_Y /* 0x59 */ { kKeyNone, kKeyNone }, // VK_Y
/* 0x5a */ kKeyNone, kKeyNone, // VK_Z /* 0x5a */ { kKeyNone, kKeyNone }, // VK_Z
/* 0x5b */ kKeyNone, kKeySuper_L, // VK_LWIN /* 0x5b */ { kKeyNone, kKeySuper_L }, // VK_LWIN
/* 0x5c */ kKeyNone, kKeySuper_R, // VK_RWIN /* 0x5c */ { kKeyNone, kKeySuper_R }, // VK_RWIN
/* 0x5d */ kKeyMenu, kKeyMenu, // VK_APPS /* 0x5d */ { kKeyMenu, kKeyMenu }, // VK_APPS
/* 0x5e */ kKeyNone, kKeyNone, // undefined /* 0x5e */ { kKeyNone, kKeyNone }, // undefined
/* 0x5f */ kKeyNone, kKeyNone, // undefined /* 0x5f */ { kKeyNone, kKeyNone }, // undefined
/* 0x60 */ kKeyKP_0, kKeyNone, // VK_NUMPAD0 /* 0x60 */ { kKeyKP_0, kKeyNone }, // VK_NUMPAD0
/* 0x61 */ kKeyKP_1, kKeyNone, // VK_NUMPAD1 /* 0x61 */ { kKeyKP_1, kKeyNone }, // VK_NUMPAD1
/* 0x62 */ kKeyKP_2, kKeyNone, // VK_NUMPAD2 /* 0x62 */ { kKeyKP_2, kKeyNone }, // VK_NUMPAD2
/* 0x63 */ kKeyKP_3, kKeyNone, // VK_NUMPAD3 /* 0x63 */ { kKeyKP_3, kKeyNone }, // VK_NUMPAD3
/* 0x64 */ kKeyKP_4, kKeyNone, // VK_NUMPAD4 /* 0x64 */ { kKeyKP_4, kKeyNone }, // VK_NUMPAD4
/* 0x65 */ kKeyKP_5, kKeyNone, // VK_NUMPAD5 /* 0x65 */ { kKeyKP_5, kKeyNone }, // VK_NUMPAD5
/* 0x66 */ kKeyKP_6, kKeyNone, // VK_NUMPAD6 /* 0x66 */ { kKeyKP_6, kKeyNone }, // VK_NUMPAD6
/* 0x67 */ kKeyKP_7, kKeyNone, // VK_NUMPAD7 /* 0x67 */ { kKeyKP_7, kKeyNone }, // VK_NUMPAD7
/* 0x68 */ kKeyKP_8, kKeyNone, // VK_NUMPAD8 /* 0x68 */ { kKeyKP_8, kKeyNone }, // VK_NUMPAD8
/* 0x69 */ kKeyKP_9, kKeyNone, // VK_NUMPAD9 /* 0x69 */ { kKeyKP_9, kKeyNone }, // VK_NUMPAD9
/* 0x6a */ kKeyKP_Multiply, kKeyNone, // VK_MULTIPLY /* 0x6a */ { kKeyKP_Multiply, kKeyNone }, // VK_MULTIPLY
/* 0x6b */ kKeyKP_Add, kKeyNone, // VK_ADD /* 0x6b */ { kKeyKP_Add, kKeyNone }, // VK_ADD
/* 0x6c */ kKeyKP_Separator,kKeyKP_Separator,// VK_SEPARATOR /* 0x6c */ { kKeyKP_Separator, kKeyKP_Separator },// VK_SEPARATOR
/* 0x6d */ kKeyKP_Subtract, kKeyNone, // VK_SUBTRACT /* 0x6d */ { kKeyKP_Subtract, kKeyNone }, // VK_SUBTRACT
/* 0x6e */ kKeyKP_Decimal, kKeyNone, // VK_DECIMAL /* 0x6e */ { kKeyKP_Decimal, kKeyNone }, // VK_DECIMAL
/* 0x6f */ kKeyNone, kKeyKP_Divide, // VK_DIVIDE /* 0x6f */ { kKeyNone, kKeyKP_Divide },// VK_DIVIDE
/* 0x70 */ kKeyF1, kKeyNone, // VK_F1 /* 0x70 */ { kKeyF1, kKeyNone }, // VK_F1
/* 0x71 */ kKeyF2, kKeyNone, // VK_F2 /* 0x71 */ { kKeyF2, kKeyNone }, // VK_F2
/* 0x72 */ kKeyF3, kKeyNone, // VK_F3 /* 0x72 */ { kKeyF3, kKeyNone }, // VK_F3
/* 0x73 */ kKeyF4, kKeyNone, // VK_F4 /* 0x73 */ { kKeyF4, kKeyNone }, // VK_F4
/* 0x74 */ kKeyF5, kKeyNone, // VK_F5 /* 0x74 */ { kKeyF5, kKeyNone }, // VK_F5
/* 0x75 */ kKeyF6, kKeyNone, // VK_F6 /* 0x75 */ { kKeyF6, kKeyNone }, // VK_F6
/* 0x76 */ kKeyF7, kKeyNone, // VK_F7 /* 0x76 */ { kKeyF7, kKeyNone }, // VK_F7
/* 0x77 */ kKeyF8, kKeyNone, // VK_F8 /* 0x77 */ { kKeyF8, kKeyNone }, // VK_F8
/* 0x78 */ kKeyF9, kKeyNone, // VK_F9 /* 0x78 */ { kKeyF9, kKeyNone }, // VK_F9
/* 0x79 */ kKeyF10, kKeyNone, // VK_F10 /* 0x79 */ { kKeyF10, kKeyNone }, // VK_F10
/* 0x7a */ kKeyF11, kKeyNone, // VK_F11 /* 0x7a */ { kKeyF11, kKeyNone }, // VK_F11
/* 0x7b */ kKeyF12, kKeyNone, // VK_F12 /* 0x7b */ { kKeyF12, kKeyNone }, // VK_F12
/* 0x7c */ kKeyF13, kKeyF13, // VK_F13 /* 0x7c */ { kKeyF13, kKeyF13 }, // VK_F13
/* 0x7d */ kKeyF14, kKeyF14, // VK_F14 /* 0x7d */ { kKeyF14, kKeyF14 }, // VK_F14
/* 0x7e */ kKeyF15, kKeyF15, // VK_F15 /* 0x7e */ { kKeyF15, kKeyF15 }, // VK_F15
/* 0x7f */ kKeyF16, kKeyF16, // VK_F16 /* 0x7f */ { kKeyF16, kKeyF16 }, // VK_F16
/* 0x80 */ kKeyF17, kKeyF17, // VK_F17 /* 0x80 */ { kKeyF17, kKeyF17 }, // VK_F17
/* 0x81 */ kKeyF18, kKeyF18, // VK_F18 /* 0x81 */ { kKeyF18, kKeyF18 }, // VK_F18
/* 0x82 */ kKeyF19, kKeyF19, // VK_F19 /* 0x82 */ { kKeyF19, kKeyF19 }, // VK_F19
/* 0x83 */ kKeyF20, kKeyF20, // VK_F20 /* 0x83 */ { kKeyF20, kKeyF20 }, // VK_F20
/* 0x84 */ kKeyF21, kKeyF21, // VK_F21 /* 0x84 */ { kKeyF21, kKeyF21 }, // VK_F21
/* 0x85 */ kKeyF22, kKeyF22, // VK_F22 /* 0x85 */ { kKeyF22, kKeyF22 }, // VK_F22
/* 0x86 */ kKeyF23, kKeyF23, // VK_F23 /* 0x86 */ { kKeyF23, kKeyF23 }, // VK_F23
/* 0x87 */ kKeyF24, kKeyF24, // VK_F24 /* 0x87 */ { kKeyF24, kKeyF24 }, // VK_F24
/* 0x88 */ kKeyNone, kKeyNone, // unassigned /* 0x88 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x89 */ kKeyNone, kKeyNone, // unassigned /* 0x89 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8a */ kKeyNone, kKeyNone, // unassigned /* 0x8a */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8b */ kKeyNone, kKeyNone, // unassigned /* 0x8b */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8c */ kKeyNone, kKeyNone, // unassigned /* 0x8c */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8d */ kKeyNone, kKeyNone, // unassigned /* 0x8d */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8e */ kKeyNone, kKeyNone, // unassigned /* 0x8e */ { kKeyNone, kKeyNone }, // unassigned
/* 0x8f */ kKeyNone, kKeyNone, // unassigned /* 0x8f */ { kKeyNone, kKeyNone }, // unassigned
/* 0x90 */ kKeyNumLock, kKeyNumLock, // VK_NUMLOCK /* 0x90 */ { kKeyNumLock, kKeyNumLock }, // VK_NUMLOCK
/* 0x91 */ kKeyScrollLock, kKeyNone, // VK_SCROLL /* 0x91 */ { kKeyScrollLock, kKeyNone }, // VK_SCROLL
/* 0x92 */ kKeyNone, kKeyNone, // unassigned /* 0x92 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x93 */ kKeyNone, kKeyNone, // unassigned /* 0x93 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x94 */ kKeyNone, kKeyNone, // unassigned /* 0x94 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x95 */ kKeyNone, kKeyNone, // unassigned /* 0x95 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x96 */ kKeyNone, kKeyNone, // unassigned /* 0x96 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x97 */ kKeyNone, kKeyNone, // unassigned /* 0x97 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x98 */ kKeyNone, kKeyNone, // unassigned /* 0x98 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x99 */ kKeyNone, kKeyNone, // unassigned /* 0x99 */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9a */ kKeyNone, kKeyNone, // unassigned /* 0x9a */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9b */ kKeyNone, kKeyNone, // unassigned /* 0x9b */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9c */ kKeyNone, kKeyNone, // unassigned /* 0x9c */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9d */ kKeyNone, kKeyNone, // unassigned /* 0x9d */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9e */ kKeyNone, kKeyNone, // unassigned /* 0x9e */ { kKeyNone, kKeyNone }, // unassigned
/* 0x9f */ kKeyNone, kKeyNone, // unassigned /* 0x9f */ { kKeyNone, kKeyNone }, // unassigned
/* 0xa0 */ kKeyShift_L, kKeyShift_L, // VK_LSHIFT /* 0xa0 */ { kKeyShift_L, kKeyShift_L }, // VK_LSHIFT
/* 0xa1 */ kKeyShift_R, kKeyShift_R, // VK_RSHIFT /* 0xa1 */ { kKeyShift_R, kKeyShift_R }, // VK_RSHIFT
/* 0xa2 */ kKeyControl_L, kKeyControl_L, // VK_LCONTROL /* 0xa2 */ { kKeyControl_L, kKeyControl_L },// VK_LCONTROL
/* 0xa3 */ kKeyControl_R, kKeyControl_R, // VK_RCONTROL /* 0xa3 */ { kKeyControl_R, kKeyControl_R },// VK_RCONTROL
/* 0xa4 */ kKeyAlt_L, kKeyAlt_L, // VK_LMENU /* 0xa4 */ { kKeyAlt_L, kKeyAlt_L }, // VK_LMENU
/* 0xa5 */ kKeyAlt_R, kKeyAlt_R, // VK_RMENU /* 0xa5 */ { kKeyAlt_R, kKeyAlt_R }, // VK_RMENU
/* 0xa6 */ kKeyNone, kKeyWWWBack, // VK_BROWSER_BACK /* 0xa6 */ { kKeyNone, kKeyWWWBack }, // VK_BROWSER_BACK
/* 0xa7 */ kKeyNone, kKeyWWWForward, // VK_BROWSER_FORWARD /* 0xa7 */ { kKeyNone, kKeyWWWForward },// VK_BROWSER_FORWARD
/* 0xa8 */ kKeyNone, kKeyWWWRefresh, // VK_BROWSER_REFRESH /* 0xa8 */ { kKeyNone, kKeyWWWRefresh },// VK_BROWSER_REFRESH
/* 0xa9 */ kKeyNone, kKeyWWWStop, // VK_BROWSER_STOP /* 0xa9 */ { kKeyNone, kKeyWWWStop }, // VK_BROWSER_STOP
/* 0xaa */ kKeyNone, kKeyWWWSearch, // VK_BROWSER_SEARCH /* 0xaa */ { kKeyNone, kKeyWWWSearch },// VK_BROWSER_SEARCH
/* 0xab */ kKeyNone, kKeyWWWFavorites, // VK_BROWSER_FAVORITES /* 0xab */ { kKeyNone, kKeyWWWFavorites },// VK_BROWSER_FAVORITES
/* 0xac */ kKeyNone, kKeyWWWHome, // VK_BROWSER_HOME /* 0xac */ { kKeyNone, kKeyWWWHome }, // VK_BROWSER_HOME
/* 0xad */ kKeyNone, kKeyAudioMute, // VK_VOLUME_MUTE /* 0xad */ { kKeyNone, kKeyAudioMute },// VK_VOLUME_MUTE
/* 0xae */ kKeyNone, kKeyAudioDown, // VK_VOLUME_DOWN /* 0xae */ { kKeyNone, kKeyAudioDown },// VK_VOLUME_DOWN
/* 0xaf */ kKeyNone, kKeyAudioUp, // VK_VOLUME_UP /* 0xaf */ { kKeyNone, kKeyAudioUp }, // VK_VOLUME_UP
/* 0xb0 */ kKeyNone, kKeyAudioNext, // VK_MEDIA_NEXT_TRACK /* 0xb0 */ { kKeyNone, kKeyAudioNext },// VK_MEDIA_NEXT_TRACK
/* 0xb1 */ kKeyNone, kKeyAudioPrev, // VK_MEDIA_PREV_TRACK /* 0xb1 */ { kKeyNone, kKeyAudioPrev },// VK_MEDIA_PREV_TRACK
/* 0xb2 */ kKeyNone, kKeyAudioStop, // VK_MEDIA_STOP /* 0xb2 */ { kKeyNone, kKeyAudioStop },// VK_MEDIA_STOP
/* 0xb3 */ kKeyNone, kKeyAudioPlay, // VK_MEDIA_PLAY_PAUSE /* 0xb3 */ { kKeyNone, kKeyAudioPlay },// VK_MEDIA_PLAY_PAUSE
/* 0xb4 */ kKeyNone, kKeyAppMail, // VK_LAUNCH_MAIL /* 0xb4 */ { kKeyNone, kKeyAppMail }, // VK_LAUNCH_MAIL
/* 0xb5 */ kKeyNone, kKeyAppMedia, // VK_LAUNCH_MEDIA_SELECT /* 0xb5 */ { kKeyNone, kKeyAppMedia }, // VK_LAUNCH_MEDIA_SELECT
/* 0xb6 */ kKeyNone, kKeyAppUser1, // VK_LAUNCH_APP1 /* 0xb6 */ { kKeyNone, kKeyAppUser1 }, // VK_LAUNCH_APP1
/* 0xb7 */ kKeyNone, kKeyAppUser2, // VK_LAUNCH_APP2 /* 0xb7 */ { kKeyNone, kKeyAppUser2 }, // VK_LAUNCH_APP2
/* 0xb8 */ kKeyNone, kKeyNone, // unassigned /* 0xb8 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xb9 */ kKeyNone, kKeyNone, // unassigned /* 0xb9 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xba */ kKeyNone, kKeyNone, // OEM specific /* 0xba */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xbb */ kKeyNone, kKeyNone, // OEM specific /* 0xbb */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xbc */ kKeyNone, kKeyNone, // OEM specific /* 0xbc */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xbd */ kKeyNone, kKeyNone, // OEM specific /* 0xbd */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xbe */ kKeyNone, kKeyNone, // OEM specific /* 0xbe */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xbf */ kKeyNone, kKeyNone, // OEM specific /* 0xbf */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xc0 */ kKeyNone, kKeyNone, // OEM specific /* 0xc0 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xc1 */ kKeyNone, kKeyNone, // unassigned /* 0xc1 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc2 */ kKeyNone, kKeyNone, // unassigned /* 0xc2 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc3 */ kKeyNone, kKeyNone, // unassigned /* 0xc3 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc4 */ kKeyNone, kKeyNone, // unassigned /* 0xc4 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc5 */ kKeyNone, kKeyNone, // unassigned /* 0xc5 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc6 */ kKeyNone, kKeyNone, // unassigned /* 0xc6 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc7 */ kKeyNone, kKeyNone, // unassigned /* 0xc7 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc8 */ kKeyNone, kKeyNone, // unassigned /* 0xc8 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xc9 */ kKeyNone, kKeyNone, // unassigned /* 0xc9 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xca */ kKeyNone, kKeyNone, // unassigned /* 0xca */ { kKeyNone, kKeyNone }, // unassigned
/* 0xcb */ kKeyNone, kKeyNone, // unassigned /* 0xcb */ { kKeyNone, kKeyNone }, // unassigned
/* 0xcc */ kKeyNone, kKeyNone, // unassigned /* 0xcc */ { kKeyNone, kKeyNone }, // unassigned
/* 0xcd */ kKeyNone, kKeyNone, // unassigned /* 0xcd */ { kKeyNone, kKeyNone }, // unassigned
/* 0xce */ kKeyNone, kKeyNone, // unassigned /* 0xce */ { kKeyNone, kKeyNone }, // unassigned
/* 0xcf */ kKeyNone, kKeyNone, // unassigned /* 0xcf */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd0 */ kKeyNone, kKeyNone, // unassigned /* 0xd0 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd1 */ kKeyNone, kKeyNone, // unassigned /* 0xd1 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd2 */ kKeyNone, kKeyNone, // unassigned /* 0xd2 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd3 */ kKeyNone, kKeyNone, // unassigned /* 0xd3 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd4 */ kKeyNone, kKeyNone, // unassigned /* 0xd4 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd5 */ kKeyNone, kKeyNone, // unassigned /* 0xd5 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd6 */ kKeyNone, kKeyNone, // unassigned /* 0xd6 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd7 */ kKeyNone, kKeyNone, // unassigned /* 0xd7 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd8 */ kKeyNone, kKeyNone, // unassigned /* 0xd8 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xd9 */ kKeyNone, kKeyNone, // unassigned /* 0xd9 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xda */ kKeyNone, kKeyNone, // unassigned /* 0xda */ { kKeyNone, kKeyNone }, // unassigned
/* 0xdb */ kKeyNone, kKeyNone, // OEM specific /* 0xdb */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xdc */ kKeyNone, kKeyNone, // OEM specific /* 0xdc */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xdd */ kKeyNone, kKeyNone, // OEM specific /* 0xdd */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xde */ kKeyNone, kKeyNone, // OEM specific /* 0xde */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xdf */ kKeyNone, kKeyNone, // OEM specific /* 0xdf */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe0 */ kKeyNone, kKeyNone, // OEM specific /* 0xe0 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe1 */ kKeyNone, kKeyNone, // OEM specific /* 0xe1 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe2 */ kKeyNone, kKeyNone, // OEM specific /* 0xe2 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe3 */ kKeyNone, kKeyNone, // OEM specific /* 0xe3 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe4 */ kKeyNone, kKeyNone, // OEM specific /* 0xe4 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe5 */ kKeyNone, kKeyNone, // unassigned /* 0xe5 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xe6 */ kKeyNone, kKeyNone, // OEM specific /* 0xe6 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xe7 */ kKeyNone, kKeyNone, // unassigned /* 0xe7 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xe8 */ kKeyNone, kKeyNone, // unassigned /* 0xe8 */ { kKeyNone, kKeyNone }, // unassigned
/* 0xe9 */ kKeyNone, kKeyNone, // OEM specific /* 0xe9 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xea */ kKeyNone, kKeyNone, // OEM specific /* 0xea */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xeb */ kKeyNone, kKeyNone, // OEM specific /* 0xeb */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xec */ kKeyNone, kKeyNone, // OEM specific /* 0xec */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xed */ kKeyNone, kKeyNone, // OEM specific /* 0xed */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xee */ kKeyNone, kKeyNone, // OEM specific /* 0xee */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xef */ kKeyNone, kKeyNone, // OEM specific /* 0xef */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf0 */ kKeyNone, kKeyNone, // OEM specific /* 0xf0 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf1 */ kKeyNone, kKeyNone, // OEM specific /* 0xf1 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf2 */ kKeyNone, kKeyNone, // OEM specific /* 0xf2 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf3 */ kKeyNone, kKeyNone, // OEM specific /* 0xf3 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf4 */ kKeyNone, kKeyNone, // OEM specific /* 0xf4 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf5 */ kKeyNone, kKeyNone, // OEM specific /* 0xf5 */ { kKeyNone, kKeyNone }, // OEM specific
/* 0xf6 */ kKeyNone, kKeyNone, // VK_ATTN /* 0xf6 */ { kKeyNone, kKeyNone }, // VK_ATTN
/* 0xf7 */ kKeyNone, kKeyNone, // VK_CRSEL /* 0xf7 */ { kKeyNone, kKeyNone }, // VK_CRSEL
/* 0xf8 */ kKeyNone, kKeyNone, // VK_EXSEL /* 0xf8 */ { kKeyNone, kKeyNone }, // VK_EXSEL
/* 0xf9 */ kKeyNone, kKeyNone, // VK_EREOF /* 0xf9 */ { kKeyNone, kKeyNone }, // VK_EREOF
/* 0xfa */ kKeyNone, kKeyNone, // VK_PLAY /* 0xfa */ { kKeyNone, kKeyNone }, // VK_PLAY
/* 0xfb */ kKeyNone, kKeyNone, // VK_ZOOM /* 0xfb */ { kKeyNone, kKeyNone }, // VK_ZOOM
/* 0xfc */ kKeyNone, kKeyNone, // reserved /* 0xfc */ { kKeyNone, kKeyNone }, // reserved
/* 0xfd */ kKeyNone, kKeyNone, // VK_PA1 /* 0xfd */ { kKeyNone, kKeyNone }, // VK_PA1
/* 0xfe */ kKeyNone, kKeyNone, // VK_OEM_CLEAR /* 0xfe */ { kKeyNone, kKeyNone }, // VK_OEM_CLEAR
/* 0xff */ kKeyNone, kKeyNone // reserved /* 0xff */ { kKeyNone, kKeyNone } // reserved
}; };
// map special KeyID keys to virtual key codes plus whether or not // map special KeyID keys to virtual key codes plus whether or not
@ -1561,7 +1561,8 @@ CMSWindowsKeyState::mapCharacter(Keystrokes& keys,
// first check the easy way. if that doesn't work // first check the easy way. if that doesn't work
// then see if it's a dead key. // then see if it's a dead key.
unsigned char uc = static_cast<unsigned char>(c); unsigned char uc = static_cast<unsigned char>(c);
if (CharLower((LPTSTR)uc) != CharUpper((LPTSTR)uc) || if (CharLower(reinterpret_cast<LPTSTR>(uc)) !=
CharUpper(reinterpret_cast<LPTSTR>(uc)) ||
(MapVirtualKeyEx(virtualKey, 2, hkl) & 0x80000000lu) != 0) { (MapVirtualKeyEx(virtualKey, 2, hkl) & 0x80000000lu) != 0) {
LOG((CLOG_DEBUG2 "flip shift")); LOG((CLOG_DEBUG2 "flip shift"));
desiredMask ^= KeyModifierShift; desiredMask ^= KeyModifierShift;

17
lib/platform/CMSWindowsScreen.cpp
View File

@ -32,15 +32,19 @@
#include "CArch.h" #include "CArch.h"
#include "CArchMiscWindows.h" #include "CArchMiscWindows.h"
#include <string.h> #include <string.h>
#include <pbt.h>
// //
// add backwards compatible multihead support (and suppress bogus warning) // add backwards compatible multihead support (and suppress bogus warning).
// this isn't supported on MinGW yet AFAICT.
// //
#if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4706) // assignment within conditional #pragma warning(disable: 4706) // assignment within conditional
#define COMPILE_MULTIMON_STUBS #define COMPILE_MULTIMON_STUBS
#include <multimon.h> #include <multimon.h>
#pragma warning(pop) #pragma warning(pop)
#endif
// X button stuff // X button stuff
#if !defined(WM_XBUTTONDOWN) #if !defined(WM_XBUTTONDOWN)
@ -60,6 +64,11 @@
#define VK_XBUTTON2 0x06 #define VK_XBUTTON2 0x06
#endif #endif
// WM_POWERBROADCAST stuff
#if !defined(PBT_APMRESUMEAUTOMATIC)
#define PBT_APMRESUMEAUTOMATIC 0x0012
#endif
// //
// CMSWindowsScreen // CMSWindowsScreen
// //
@ -73,7 +82,6 @@ CMSWindowsScreen::CMSWindowsScreen(bool isPrimary,
m_is95Family(CArchMiscWindows::isWindows95Family()), m_is95Family(CArchMiscWindows::isWindows95Family()),
m_isOnScreen(m_isPrimary), m_isOnScreen(m_isPrimary),
m_class(0), m_class(0),
m_window(NULL),
m_x(0), m_y(0), m_x(0), m_y(0),
m_w(0), m_h(0), m_w(0), m_h(0),
m_xCenter(0), m_yCenter(0), m_xCenter(0), m_yCenter(0),
@ -86,6 +94,7 @@ CMSWindowsScreen::CMSWindowsScreen(bool isPrimary,
m_fixTimer(NULL), m_fixTimer(NULL),
m_screensaver(NULL), m_screensaver(NULL),
m_screensaverNotify(false), m_screensaverNotify(false),
m_window(NULL),
m_nextClipboardWindow(NULL), m_nextClipboardWindow(NULL),
m_ownClipboard(false), m_ownClipboard(false),
m_desks(NULL), m_desks(NULL),
@ -600,7 +609,7 @@ void
CMSWindowsScreen::destroyClass(ATOM windowClass) const CMSWindowsScreen::destroyClass(ATOM windowClass) const
{ {
if (windowClass != 0) { if (windowClass != 0) {
UnregisterClass((LPCTSTR)windowClass, s_instance); UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass), s_instance);
} }
} }
@ -610,7 +619,7 @@ CMSWindowsScreen::createWindow(ATOM windowClass, const char* name) const
HWND window = CreateWindowEx(WS_EX_TOPMOST | HWND window = CreateWindowEx(WS_EX_TOPMOST |
WS_EX_TRANSPARENT | WS_EX_TRANSPARENT |
WS_EX_TOOLWINDOW, WS_EX_TOOLWINDOW,
(LPCTSTR)windowClass, reinterpret_cast<LPCTSTR>(windowClass),
name, name,
WS_POPUP, WS_POPUP,
0, 0, 1, 1, 0, 0, 1, 1,

4
lib/platform/CMSWindowsScreenSaver.cpp
View File

@ -42,8 +42,8 @@ CMSWindowsScreenSaver::CMSWindowsScreenSaver() :
m_wasSecure(false), m_wasSecure(false),
m_wasSecureAnInt(false), m_wasSecureAnInt(false),
m_process(NULL), m_process(NULL),
m_threadID(0), m_watch(NULL),
m_watch(NULL) m_threadID(0)
{ {
// detect OS // detect OS
m_is95Family = false; m_is95Family = false;

17
lib/platform/CSynergyHook.cpp
View File

@ -70,8 +70,10 @@ typedef struct tagMOUSEHOOKSTRUCTWin2000 {
// globals // globals
// //
#if defined(_MSC_VER)
#pragma comment(linker, "-section:shared,rws") #pragma comment(linker, "-section:shared,rws")
#pragma data_seg("shared") #pragma data_seg("shared")
#endif
// all data in this shared section *must* be initialized // all data in this shared section *must* be initialized
static HINSTANCE g_hinstance = NULL; static HINSTANCE g_hinstance = NULL;
@ -99,13 +101,17 @@ static BYTE g_deadKeyState[256] = { 0 };
static DWORD g_hookThread = 0; static DWORD g_hookThread = 0;
static DWORD g_attachedThread = 0; static DWORD g_attachedThread = 0;
#if defined(_MSC_VER)
#pragma data_seg() #pragma data_seg()
#endif
// keep linker quiet about floating point stuff. we don't use any // keep linker quiet about floating point stuff. we don't use any
// floating point operations but our includes may define some // floating point operations but our includes may define some
// (unused) floating point values. // (unused) floating point values.
#ifndef _DEBUG #ifndef _DEBUG
extern "C" int _fltused=0; extern "C" {
int _fltused=0;
}
#endif #endif
@ -554,6 +560,9 @@ mouseHook(int code, WPARAM wParam, LPARAM lParam)
w = static_cast<SInt16>(HIWORD(info2k->mouseData)); w = static_cast<SInt16>(HIWORD(info2k->mouseData));
break; break;
} }
default:
break;
} }
} }
@ -601,7 +610,7 @@ getMessageHook(int code, WPARAM wParam, LPARAM lParam)
return CallNextHookEx(g_getMessage, code, wParam, lParam); return CallNextHookEx(g_getMessage, code, wParam, lParam);
} }
#if (_WIN32_WINNT >= 0x0400) && !NO_LOWLEVEL_HOOKS #if (_WIN32_WINNT >= 0x0400) && defined(_MSC_VER) && !NO_LOWLEVEL_HOOKS
// //
// low-level keyboard hook -- this allows us to capture and handle // low-level keyboard hook -- this allows us to capture and handle
@ -693,6 +702,7 @@ getWheelSupport()
} }
// not modern. see if we've got old-style support. // not modern. see if we've got old-style support.
#if defined(MSH_WHEELSUPPORT)
UINT wheelSupportMsg = RegisterWindowMessage(MSH_WHEELSUPPORT); UINT wheelSupportMsg = RegisterWindowMessage(MSH_WHEELSUPPORT);
HWND wheelSupportWindow = FindWindow(MSH_WHEELMODULE_CLASS, HWND wheelSupportWindow = FindWindow(MSH_WHEELMODULE_CLASS,
MSH_WHEELMODULE_TITLE); MSH_WHEELMODULE_TITLE);
@ -704,6 +714,7 @@ getWheelSupport()
} }
} }
} }
#endif
// assume modern. we don't do anything special in this case // assume modern. we don't do anything special in this case
// except respond to WM_MOUSEWHEEL messages. GetSystemMetrics() // except respond to WM_MOUSEWHEEL messages. GetSystemMetrics()
@ -830,7 +841,7 @@ install()
} }
// install low-level hooks. we require that they both get installed. // install low-level hooks. we require that they both get installed.
#if (_WIN32_WINNT >= 0x0400) && !NO_LOWLEVEL_HOOKS #if (_WIN32_WINNT >= 0x0400) && defined(_MSC_VER) && !NO_LOWLEVEL_HOOKS
g_mouseLL = SetWindowsHookEx(WH_MOUSE_LL, g_mouseLL = SetWindowsHookEx(WH_MOUSE_LL,
&mouseLLHook, &mouseLLHook,
g_hinstance, g_hinstance,

7
lib/synergy/CProtocolUtil.cpp
View File

@ -209,11 +209,8 @@ CProtocolUtil::vreadf(IStream* stream, const char* fmt, va_list args)
const bool useFixed = (len <= sizeof(buffer)); const bool useFixed = (len <= sizeof(buffer));
// allocate a buffer to read the data // allocate a buffer to read the data
UInt8* sBuffer; UInt8* sBuffer = buffer;
if (useFixed) { if (!useFixed) {
sBuffer = buffer;
}
else {
sBuffer = new UInt8[len]; sBuffer = new UInt8[len];
} }