Fix warnings when building on newer Windows 10 SDK versions.

This commit is contained in:
gibbed 2018-08-25 14:23:09 -05:00
parent ba7dc6b2d7
commit de43afbb54
2 changed files with 11 additions and 5 deletions

View File

@ -22,10 +22,18 @@ namespace xinput {
XInputInputDriver::XInputInputDriver(xe::ui::Window* window) XInputInputDriver::XInputInputDriver(xe::ui::Window* window)
: InputDriver(window) { : InputDriver(window) {
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
// TODO(gibbed): Is this necessary?
XInputEnable(TRUE); XInputEnable(TRUE);
#endif
} }
XInputInputDriver::~XInputInputDriver() { XInputEnable(FALSE); } XInputInputDriver::~XInputInputDriver() {
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
// TODO(gibbed): Is this necessary?
XInputEnable(FALSE);
#endif
}
X_STATUS XInputInputDriver::Setup() { return X_STATUS_SUCCESS; } X_STATUS XInputInputDriver::Setup() { return X_STATUS_SUCCESS; }

View File

@ -36,11 +36,9 @@ class CDialogEventHandler : public IFileDialogEvents,
IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) { IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) {
static const QITAB qit[] = { static const QITAB qit[] = {
{&__uuidof(IFileDialogEvents), {&__uuidof(IFileDialogEvents),
static_cast<int>( OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)},
OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler))},
{&__uuidof(IFileDialogControlEvents), {&__uuidof(IFileDialogControlEvents),
static_cast<int>( OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)},
OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler))},
{0}, {0},
}; };
return QISearch(this, qit, riid, ppv); return QISearch(this, qit, riid, ppv);