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

Style fixes.

This commit is contained in:
Ben Vanik 2015-08-08 16:40:14 -07:00
parent a92566dfc5
commit 0686227d23
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/kernel/kernel_state.cc
View File

@ -99,10 +99,6 @@ KernelState::~KernelState() {
dispatch_thread_->Wait(0, 0, 0, nullptr); dispatch_thread_->Wait(0, 0, 0, nullptr);
} }
if (process_info_block_address_) {
memory_->SystemHeapFree(process_info_block_address_);
}
executable_module_.reset(); executable_module_.reset();
user_modules_.clear(); user_modules_.clear();
kernel_modules_.clear(); kernel_modules_.clear();
@ -115,6 +111,10 @@ KernelState::~KernelState() {
delete dispatcher_; delete dispatcher_;
if (process_info_block_address_) {
memory_->SystemHeapFree(process_info_block_address_);
}
assert_true(shared_kernel_state_ == this); assert_true(shared_kernel_state_ == this);
shared_kernel_state_ = nullptr; shared_kernel_state_ = nullptr;
} }

2
src/xenia/kernel/objects/xuser_module.cc
View File

@ -588,7 +588,7 @@ void XUserModule::Dump() {
} }
} }
} }
float total_count = static_cast<float>(import_info_count) * 100.0f; float total_count = static_cast<float>(import_info_count) / 100.0f;
printf(" Total: %4llu\n", import_info_count); printf(" Total: %4llu\n", import_info_count);
printf(" Known: %3d%% (%d known, %d unknown)\n", printf(" Known: %3d%% (%d known, %d unknown)\n",
static_cast<int>(known_count / total_count), known_count, static_cast<int>(known_count / total_count), known_count,

4
src/xenia/kernel/xobject.h
View File

@ -208,8 +208,8 @@ template <typename T>
class object_ref { class object_ref {
public: public:
object_ref() noexcept : value_(nullptr) {} object_ref() noexcept : value_(nullptr) {}
object_ref(nullptr_t) noexcept : value_(nullptr) { object_ref(nullptr_t) noexcept // NOLINT(runtime/explicit)
} // NOLINT(runtime/explicit) : value_(nullptr) {}
object_ref& operator=(nullptr_t) noexcept { object_ref& operator=(nullptr_t) noexcept {
reset(); reset();
return (*this); return (*this);

30
src/xenia/ui/file_picker_win.cc
View File

@ -36,9 +36,11 @@ 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),
(int)OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)}, static_cast<int>(
OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler))},
{&__uuidof(IFileDialogControlEvents), {&__uuidof(IFileDialogControlEvents),
(int)OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)}, static_cast<int>(
OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler))},
{0}, {0},
}; };
return QISearch(this, qit, riid, ppv); return QISearch(this, qit, riid, ppv);
@ -53,33 +55,33 @@ class CDialogEventHandler : public IFileDialogEvents,
} }
// IFileDialogEvents methods // IFileDialogEvents methods
IFACEMETHODIMP OnFileOk(IFileDialog*) { return S_OK; }; IFACEMETHODIMP OnFileOk(IFileDialog*) { return S_OK; }
IFACEMETHODIMP OnFolderChange(IFileDialog*) { return S_OK; }; IFACEMETHODIMP OnFolderChange(IFileDialog*) { return S_OK; }
IFACEMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) { return S_OK; }; IFACEMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) { return S_OK; }
IFACEMETHODIMP OnHelp(IFileDialog*) { return S_OK; }; IFACEMETHODIMP OnHelp(IFileDialog*) { return S_OK; }
IFACEMETHODIMP OnSelectionChange(IFileDialog*) { return S_OK; }; IFACEMETHODIMP OnSelectionChange(IFileDialog*) { return S_OK; }
IFACEMETHODIMP OnShareViolation(IFileDialog*, IShellItem*, IFACEMETHODIMP OnShareViolation(IFileDialog*, IShellItem*,
FDE_SHAREVIOLATION_RESPONSE*) { FDE_SHAREVIOLATION_RESPONSE*) {
return S_OK; return S_OK;
}; }
IFACEMETHODIMP OnTypeChange(IFileDialog* pfd) { return S_OK; }; IFACEMETHODIMP OnTypeChange(IFileDialog* pfd) { return S_OK; }
IFACEMETHODIMP OnOverwrite(IFileDialog*, IShellItem*, IFACEMETHODIMP OnOverwrite(IFileDialog*, IShellItem*,
FDE_OVERWRITE_RESPONSE*) { FDE_OVERWRITE_RESPONSE*) {
return S_OK; return S_OK;
}; }
// IFileDialogControlEvents methods // IFileDialogControlEvents methods
IFACEMETHODIMP OnItemSelected(IFileDialogCustomize* pfdc, DWORD dwIDCtl, IFACEMETHODIMP OnItemSelected(IFileDialogCustomize* pfdc, DWORD dwIDCtl,
DWORD dwIDItem) { DWORD dwIDItem) {
return S_OK; return S_OK;
}; }
IFACEMETHODIMP OnButtonClicked(IFileDialogCustomize*, DWORD) { return S_OK; }; IFACEMETHODIMP OnButtonClicked(IFileDialogCustomize*, DWORD) { return S_OK; }
IFACEMETHODIMP OnCheckButtonToggled(IFileDialogCustomize*, DWORD, BOOL) { IFACEMETHODIMP OnCheckButtonToggled(IFileDialogCustomize*, DWORD, BOOL) {
return S_OK; return S_OK;
}; }
IFACEMETHODIMP OnControlActivating(IFileDialogCustomize*, DWORD) { IFACEMETHODIMP OnControlActivating(IFileDialogCustomize*, DWORD) {
return S_OK; return S_OK;
}; }
CDialogEventHandler() : _cRef(1) {} CDialogEventHandler() : _cRef(1) {}

2
third_party/elemental-forms vendored

@ -1 +1 @@
Subproject commit 2c5b58821f4fd94d890d2d3126bee6169232e52c Subproject commit 5da70a8d7663a6c360436b9ba168a96ad145f45d