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

Added experimental x64 build option for VS2008

Browse Source
This commit is contained in:
sveith
2009-04-07 22:36:07 +00:00
parent 5c89bc4b17
commit bf6da57cbd
10 changed files with 797 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/launcher/CHotkeyOptions.cpp
View File

@@ -559,7 +559,7 @@ CHotkeyOptions::CConditionDialog::doModal(HWND parent,
s_lastGoodCondition = NULL;
}
int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_CONDITION),
parent, dlgProc);
parent, (DLGPROC) dlgProc);
condition = s_condition;
delete s_lastGoodCondition;
@@ -579,8 +579,8 @@ CHotkeyOptions::CConditionDialog::doInit(HWND hwnd)
{
// subclass edit control
HWND child = getItem(hwnd, IDC_HOTKEY_CONDITION_HOTKEY);
s_editWndProc = (WNDPROC)GetWindowLong(child, GWL_WNDPROC);
SetWindowLong(child, GWL_WNDPROC, (LONG)editProc);
s_editWndProc = (WNDPROC)GetWindowLongPtr(child, GWLP_WNDPROC);
SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR) editProc);
// fill control
fillHotkey(hwnd);
@@ -944,7 +944,7 @@ CHotkeyOptions::CActionDialog::doModal(HWND parent, CConfig* config,
}
int n = DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_ACTION),
parent, dlgProc);
parent, (DLGPROC) dlgProc);
onActivate = s_onActivate;
action = s_action;
@@ -960,8 +960,8 @@ CHotkeyOptions::CActionDialog::doInit(HWND hwnd)
{
// subclass edit control
HWND child = getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY);
s_editWndProc = (WNDPROC)GetWindowLong(child, GWL_WNDPROC);
SetWindowLong(child, GWL_WNDPROC, (LONG)editProc);
s_editWndProc = (WNDPROC)GetWindowLongPtr(child, GWLP_WNDPROC);
SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR)editProc);
setWindowText(getItem(hwnd, IDC_HOTKEY_ACTION_HOTKEY), "");
fillHotkey(hwnd);
@@ -1734,7 +1734,7 @@ CHotkeyOptions::CScreensDialog::doModal(HWND parent, CConfig* config,
s_config = config;
s_action = action;
DialogBox(s_instance, MAKEINTRESOURCE(IDD_HOTKEY_SCREENS),
parent, dlgProc);
parent, (DLGPROC) dlgProc);
s_config = NULL;
s_action = NULL;
}

7
cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
View File

@@ -325,14 +325,13 @@ CMSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
if (msg == WM_INITDIALOG) {
self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>(
reinterpret_cast<void*>(lParam));
SetWindowLong(hwnd, GWL_USERDATA, lParam);
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) lParam);
}
else {
// get the extra window data and forward the call
LONG data = GetWindowLong(hwnd, GWL_USERDATA);
LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (data != 0) {
self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>(
reinterpret_cast<void*>(data));
self = (CMSWindowsClientTaskBarReceiver*) data;
}
}

8
cmd/synergyc/synergyc.cpp
View File

@@ -713,7 +713,13 @@ parse(int argc, const char* const* argv)
}
// identify system
LOG((CLOG_INFO "Synergy client %s on %s", kVersion, ARCH->getOSName().c_str()));
LOG((CLOG_INFO "%s Client on %s %s", kAppVersion, ARCH->getOSName().c_str(), ARCH->getPlatformName().c_str()));
#ifdef WIN32
#ifdef _AMD64_
LOG((CLOG_WARN "This is an experimental x64 build of %s. Use it at your own risk.", kApplication));
#endif
#endif
}

6
cmd/synergys/synergys.cpp
View File

@@ -1040,6 +1040,12 @@ parse(int argc, const char* const* argv)
// identify system
LOG((CLOG_INFO "%s Server on %s %s", kAppVersion, ARCH->getOSName().c_str(), ARCH->getPlatformName().c_str()));
#ifdef WIN32
#ifdef _AMD64_
LOG((CLOG_WARN "This is an experimental x64 build of %s. Use it at your own risk.", kApplication));
#endif
#endif
}
static