ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2018-08-25 23:26:32 +03:00
parent dba8ab4eed de43afbb54
commit 110d4724f9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/hid/xinput/xinput_input_driver.cc
View File

@ -26,10 +26,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
}
#pragma warning(pop) #pragma warning(pop)

6
src/xenia/ui/file_picker_win.cc
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);