Merge branch 'master' into d3d12

2018-10-22 23:15:07 +03:00
parent 729406dee2 1ae9b8263d
commit abdb37464d
7 changed files with 61 additions and 42 deletions
--- a/src/xenia/ui/file_picker_win.cc
+++ b/src/xenia/ui/file_picker_win.cc
@@ -36,9 +36,9 @@ class CDialogEventHandler : public IFileDialogEvents,
  IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) {
    static const QITAB qit[] = {
        {&__uuidof(IFileDialogEvents),
-         OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)},
+         (int)OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)},
        {&__uuidof(IFileDialogControlEvents),
-         OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)},
+         (int)OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)},
        {0},
    };
    return QISearch(this, qit, riid, ppv);