xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2025-12-06 07:12:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[XAM] Deferred xeXamContentCreate.

Browse source
This commit is contained in:
gibbed 2021-06-30 03:05:16 -05:00 committed by Rick Gibbed
parent e8fda5878c
commit 4498a28568
1 changed files with 86 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/xenia/kernel/xam/xam_content.cc
View file

@ -123,7 +123,6 @@ dword_result_t xeXamContentCreate(dword_t user_index, lpstring_t root_name,
lpdword_t license_mask_ptr, lpdword_t license_mask_ptr,
dword_t cache_size, qword_t content_size, dword_t cache_size, qword_t content_size,
lpvoid_t overlapped_ptr) { lpvoid_t overlapped_ptr) {
X_RESULT result = X_ERROR_INVALID_PARAMETER;
XCONTENT_AGGREGATE_DATA content_data; XCONTENT_AGGREGATE_DATA content_data;
if (content_data_size == sizeof(XCONTENT_DATA)) { if (content_data_size == sizeof(XCONTENT_DATA)) {
content_data = *content_data_ptr.as<XCONTENT_DATA*>(); content_data = *content_data_ptr.as<XCONTENT_DATA*>();
@ -131,10 +130,19 @@ dword_result_t xeXamContentCreate(dword_t user_index, lpstring_t root_name,
content_data = *content_data_ptr.as<XCONTENT_AGGREGATE_DATA*>(); content_data = *content_data_ptr.as<XCONTENT_AGGREGATE_DATA*>();
} else { } else {
assert_always(); assert_always();
return result; return X_ERROR_INVALID_PARAMETER;
} }
auto content_manager = kernel_state()->content_manager(); auto content_manager = kernel_state()->content_manager();
if (overlapped_ptr && disposition_ptr) {
*disposition_ptr = 0;
}
auto run = [content_manager, root_name, flags, content_data, disposition_ptr,
license_mask_ptr](uint32_t& extended_error,
uint32_t& length) -> X_RESULT {
X_RESULT result = X_ERROR_INVALID_PARAMETER;
bool create = false; bool create = false;
bool open = false; bool open = false;
switch (flags & 0xF) { switch (flags & 0xF) {
@ -191,8 +199,6 @@ dword_result_t xeXamContentCreate(dword_t user_index, lpstring_t root_name,
// 2 = opened // 2 = opened
uint32_t disposition = create ? 1 : 2; uint32_t disposition = create ? 1 : 2;
if (disposition_ptr) { if (disposition_ptr) {
// In case when overlapped_ptr exist we should clear disposition_ptr first
// however we're executing it immediately, so it's not required
*disposition_ptr = disposition; *disposition_ptr = disposition;
} }
@ -206,16 +212,17 @@ dword_result_t xeXamContentCreate(dword_t user_index, lpstring_t root_name,
*license_mask_ptr = 0; // Stub! *license_mask_ptr = 0; // Stub!
} }
if (overlapped_ptr) { extended_error = X_HRESULT_FROM_WIN32(result);
X_RESULT extended_error = X_HRESULT_FROM_WIN32(result); length = disposition;
if (int32_t(extended_error) < 0) {
result = X_ERROR_FUNCTION_FAILED;
}
kernel_state()->CompleteOverlappedImmediateEx(overlapped_ptr, result,
extended_error, disposition);
return X_ERROR_IO_PENDING;
} else {
return result; return result;
};
if (!overlapped_ptr) {
uint32_t extended_error, length;
return run(extended_error, length);
} else {
kernel_state()->CompleteOverlappedDeferredEx(run, overlapped_ptr);
return X_ERROR_IO_PENDING;
} }
} }