From 72861fcd7f6b1d2a85ffc7db36d19e7a298fa151 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Mon, 25 Jul 2022 22:09:14 +0200
Subject: [PATCH] Update Dockerfile to use latest wut version

---
 Dockerfile      | 10 +++++-----
 src/FileUtils.h | 23 -----------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2352f72..152ebc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM wiiuenv/devkitppc:20220507
+FROM wiiuenv/devkitppc:20220724
 
-COPY --from=wiiuenv/libfunctionpatcher:20220507 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/wiiumodulesystem:20220512 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/libromfs_wiiu:20220414 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/libcontentredirection:20220414 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libfunctionpatcher:20220724 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/wiiumodulesystem:20220724 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libromfs_wiiu:20220724 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libcontentredirection:20220724 /artifacts $DEVKITPRO
 
 WORKDIR project
diff --git a/src/FileUtils.h b/src/FileUtils.h
index a9f1119..1110f9b 100644
--- a/src/FileUtils.h
+++ b/src/FileUtils.h
@@ -38,29 +38,6 @@ static inline FSErrorFlag isForceRealFunction(FSErrorFlag flag) {
 
 void clearFSLayer();
 
-struct WUT_PACKED FSCmdBlockBody { //! FSAsyncResult object used for this command.
-
-    WUT_UNKNOWN_BYTES(0x96C);
-    FSAsyncResult asyncResult;
-};
-WUT_CHECK_OFFSET(FSCmdBlockBody, 0x96C, asyncResult);
-WUT_CHECK_SIZE(FSCmdBlockBody, 0x96C + 0x28);
-
-struct WUT_PACKED FSClientBody {
-    WUT_UNKNOWN_BYTES(0x1448);
-    void *fsm;
-    WUT_UNKNOWN_BYTES(0x15E8 - 0x1448 - 0x04);
-    uint32_t lastError;
-    BOOL isLastErrorWithoutVolume;
-    WUT_UNKNOWN_BYTES(0x161C - 0x15E8 - 0x4 - 0x4);
-    FSClient *client;
-};
-WUT_CHECK_OFFSET(FSClientBody, 0x1448, fsm);
-WUT_CHECK_OFFSET(FSClientBody, 0x15E8, lastError);
-WUT_CHECK_OFFSET(FSClientBody, 0x15EC, isLastErrorWithoutVolume);
-WUT_CHECK_OFFSET(FSClientBody, 0x161C, client);
-WUT_CHECK_SIZE(FSClientBody, 0x161C + 0x4);
-
 std::string getFullPathForClient(FSClient *pClient, char *path);
 
 void setWorkingDir(FSClient *client, const char *path);