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

Minor corrections to NtCreateFile, NtQueryDirectory.

This commit is contained in:
gibbed 2014-01-20 06:08:24 -08:00
parent c673d55c1e
commit 6d7b25a338
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/xenia/kernel/xboxkrnl_io.cc
View File

@ -66,7 +66,8 @@ SHIM_CALL NtCreateFile_shim(
Entry* entry; Entry* entry;
XFile* root_file = NULL; XFile* root_file = NULL;
if (attrs.root_directory != 0xFFFFFFFD) { // ObDosDevices if (attrs.root_directory != 0xFFFFFFFD && // ObDosDevices
attrs.root_directory != 0) {
result = state->object_table()->GetObject( result = state->object_table()->GetObject(
attrs.root_directory, (XObject**)&root_file); attrs.root_directory, (XObject**)&root_file);
XEASSERT(XSUCCEEDED(result)); XEASSERT(XSUCCEEDED(result));
@ -130,7 +131,7 @@ SHIM_CALL NtOpenFile_shim(
char* object_name = attrs.object_name.Duplicate(); char* object_name = attrs.object_name.Duplicate();
XELOGD( XELOGD(
"watNtOpenFile(%.8X, %.8X, %.8X(%s), %.8X, %d)", "NtOpenFile(%.8X, %.8X, %.8X(%s), %.8X, %d)",
handle_ptr, handle_ptr,
desired_access, desired_access,
object_attributes_ptr, object_attributes_ptr,
@ -512,11 +513,17 @@ SHIM_CALL NtQueryDirectoryFile_shim(
uint32_t file_info_ptr = SHIM_GET_ARG_32(5); uint32_t file_info_ptr = SHIM_GET_ARG_32(5);
uint32_t length = SHIM_GET_ARG_32(6); uint32_t length = SHIM_GET_ARG_32(6);
uint32_t file_name_ptr = SHIM_GET_ARG_32(7); uint32_t file_name_ptr = SHIM_GET_ARG_32(7);
uint64_t sp = ppc_state->r[1]; uint32_t sp = (uint32_t)ppc_state->r[1];
uint32_t restart_scan = SHIM_MEM_32(sp + 0x54); uint32_t restart_scan = SHIM_MEM_32(sp + 0x54);
char* file_name = NULL;
if (file_name_ptr != 0) {
X_ANSI_STRING xas(SHIM_MEM_BASE, file_name_ptr);
file_name = xas.Duplicate();
}
XELOGD( XELOGD(
"NtQueryDirectoryFile(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X, %d, %.8X, %d)", "NtQueryDirectoryFile(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X, %d, %.8X(%s), %d)",
file_handle, file_handle,
event_handle, event_handle,
apc_routine, apc_routine,
@ -525,22 +532,15 @@ SHIM_CALL NtQueryDirectoryFile_shim(
file_info_ptr, file_info_ptr,
length, length,
file_name_ptr, file_name_ptr,
!file_name ? "(null)" : file_name,
restart_scan); restart_scan);
if (length < 72) { if (length < 72) {
SHIM_SET_RETURN_32(X_STATUS_INFO_LENGTH_MISMATCH); SHIM_SET_RETURN_32(X_STATUS_INFO_LENGTH_MISMATCH);
xe_free(file_name);
return; return;
} }
const char* file_name = NULL;
if (file_name_ptr != 0) {
// it's a PANSI_STRING or whatever.
if (SHIM_MEM_16(file_name_ptr + 0) != 0 ||
SHIM_MEM_16(file_name_ptr + 2) != 0) {
file_name = (const char*)SHIM_MEM_ADDR(SHIM_MEM_32(file_name_ptr + 4));
}
}
X_STATUS result = X_STATUS_UNSUCCESSFUL; X_STATUS result = X_STATUS_UNSUCCESSFUL;
uint32_t info = 0; uint32_t info = 0;
@ -569,6 +569,7 @@ SHIM_CALL NtQueryDirectoryFile_shim(
file->Release(); file->Release();
} }
xe_free(file_name);
SHIM_SET_RETURN_32(result); SHIM_SET_RETURN_32(result);
} }

2
src/xenia/xbox.h
View File

@ -211,7 +211,7 @@ public:
buffer = 0; buffer = 0;
} }
char* Duplicate() { char* Duplicate() {
if (buffer == NULL) { if (buffer == NULL || length == 0) {
return NULL; return NULL;
} }
auto copy = (char*)xe_calloc(length+1); auto copy = (char*)xe_calloc(length+1);