From 98a44aa47d8287c8780ce9d3f11035121b9e793f Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Thu, 10 Jun 2021 12:22:22 +0200 Subject: [PATCH] Removed unused dwBytesRead variable and unused argument from XB_InitializeObjectAttributes macro --- src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp | 1 - src/core/kernel/common/ob.h | 2 +- src/core/kernel/exports/EmuKrnlOb.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp index e4b0bc575..0ae8ed219 100644 --- a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp +++ b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp @@ -152,7 +152,6 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) else { // load from file LPDIRECTSOUND8 pThis_tmp = zeroptr; HANDLE hFile; - DWORD dwBytesRead; // using xbox::NtCreateFile() directly instead of Host CreateFile(); OBJECT_ATTRIBUTES obj; diff --git a/src/core/kernel/common/ob.h b/src/core/kernel/common/ob.h index a63a1251e..d6b60b526 100644 --- a/src/core/kernel/common/ob.h +++ b/src/core/kernel/common/ob.h @@ -75,7 +75,7 @@ ntstatus_xt ObpReferenceObjectByName( OUT PVOID *ReturnedObject ); -#define XB_InitializeObjectAttributes(p, n, a, r, s){\ +#define XB_InitializeObjectAttributes(p, n, a, r){\ (p)->RootDirectory = r; \ (p)->Attributes = a; \ (p)->ObjectName = n; \ diff --git a/src/core/kernel/exports/EmuKrnlOb.cpp b/src/core/kernel/exports/EmuKrnlOb.cpp index 65c43370d..08b84cf17 100644 --- a/src/core/kernel/exports/EmuKrnlOb.cpp +++ b/src/core/kernel/exports/EmuKrnlOb.cpp @@ -82,7 +82,7 @@ xbox::boolean_xt xbox::ObpCreatePermanentDirectoryObject( LOG_FUNC_END; OBJECT_ATTRIBUTES ObjectAttributes; - XB_InitializeObjectAttributes(&ObjectAttributes, DirectoryName, OBJ_PERMANENT, NULL, NULL); + XB_InitializeObjectAttributes(&ObjectAttributes, DirectoryName, OBJ_PERMANENT, NULL); HANDLE Handle; NTSTATUS status = NtCreateDirectoryObject(&Handle, &ObjectAttributes);