Merge branch 'master' into d3d12

This commit is contained in:
gibbed 2018-11-29 12:39:13 -06:00
commit 6824905b78
1 changed files with 1 additions and 1 deletions

View File

@ -396,7 +396,7 @@ dword_result_t XamEnumerate(dword_t handle, dword_t flags, lpvoid_t buffer,
kernel_state()->CompleteOverlappedImmediateEx( kernel_state()->CompleteOverlappedImmediateEx(
overlapped, overlapped,
result == X_ERROR_SUCCESS ? X_ERROR_SUCCESS : X_ERROR_FUNCTION_FAILED, result == X_ERROR_SUCCESS ? X_ERROR_SUCCESS : X_ERROR_FUNCTION_FAILED,
X_RESULT_FROM_WIN32(result), X_HRESULT_FROM_WIN32(result),
result == X_ERROR_SUCCESS ? item_count : 0); result == X_ERROR_SUCCESS ? item_count : 0);
return X_ERROR_IO_PENDING; return X_ERROR_IO_PENDING;
} else { } else {