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

Fix NtWaitForMultipleObjectsEx definition

This commit is contained in:
Dr. Chat 2015-11-28 14:41:41 -06:00 committed by Ben Vanik
parent 87cdce1440
commit b8d4f26e46
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/xam/xam_net.cc
View File

@ -266,7 +266,7 @@ dword_result_t NetDll_WSAWaitForMultipleEvents(
return ~0u; return ~0u;
} }
xe::be<uint64_t> timeout_wait = (uint64_t)timeout; uint64_t timeout_wait = (uint64_t)timeout;
X_STATUS result = 0; X_STATUS result = 0;
do { do {

5
src/xenia/kernel/xboxkrnl/xboxkrnl_threading.cc
View File

@ -923,8 +923,7 @@ DECLARE_XBOXKRNL_EXPORT(KeWaitForMultipleObjects, ExportTag::kImplemented |
ExportTag::kThreading | ExportTag::kThreading |
ExportTag::kBlocking); ExportTag::kBlocking);
dword_result_t NtWaitForMultipleObjectsEx(dword_t count, dword_result_t NtWaitForMultipleObjectsEx(dword_t count, lpdword_t handles,
pointer_t<xe::be<uint32_t>> handles,
dword_t wait_type, dword_t wait_mode, dword_t wait_type, dword_t wait_mode,
dword_t alertable, dword_t alertable,
lpqword_t timeout_ptr) { lpqword_t timeout_ptr) {
@ -939,7 +938,7 @@ dword_result_t NtWaitForMultipleObjectsEx(dword_t count,
if (!object) { if (!object) {
return X_STATUS_INVALID_PARAMETER; return X_STATUS_INVALID_PARAMETER;
} }
objects[n] = std::move(object); objects.push_back(std::move(object));
} }
uint64_t timeout = timeout_ptr ? uint64_t(*timeout_ptr) : 0; uint64_t timeout = timeout_ptr ? uint64_t(*timeout_ptr) : 0;

8
src/xenia/kernel/xboxkrnl/xboxkrnl_threading.h
View File

@ -20,10 +20,10 @@ namespace xboxkrnl {
dword_result_t NtSetEvent(dword_t handle, lpdword_t previous_state_ptr); dword_result_t NtSetEvent(dword_t handle, lpdword_t previous_state_ptr);
dword_result_t NtClearEvent(dword_t handle); dword_result_t NtClearEvent(dword_t handle);
dword_result_t NtWaitForMultipleObjectsEx( dword_result_t NtWaitForMultipleObjectsEx(dword_t count, lpdword_t handles,
dword_t count, pointer_t<xe::be<uint32_t>> handles, dword_t wait_type, dword_t wait_type, dword_t wait_mode,
dword_t wait_mode, dword_t alertable, dword_t alertable,
pointer_t<xe::be<uint64_t>> timeout_ptr); lpqword_t timeout_ptr);
} // namespace xboxkrnl } // namespace xboxkrnl
} // namespace kernel } // namespace kernel