Merge branch 'master' of https://github.com/faha223/xemu into device_…

…emulation

config_spec.yml

@@ -29,6 +29,27 @@ input:
     port3: string
     port4_driver: string
     port4: string
+  peripherals:
+    port1:
+      peripheral_type_0: integer
+      peripheral_param_0: string
+      peripheral_type_1: integer
+      peripheral_param_1: string
+    port2:
+      peripheral_type_0: integer
+      peripheral_param_0: string
+      peripheral_type_1: integer
+      peripheral_param_1: string
+    port3:
+      peripheral_type_0: integer
+      peripheral_param_0: string
+      peripheral_type_1: integer
+      peripheral_param_1: string
+    port4:
+      peripheral_type_0: integer
+      peripheral_param_0: string
+      peripheral_type_1: integer
+      peripheral_param_1: string
   gamecontrollerdb_path: string
   auto_bind:
     type: bool

data/meson.build

@@ -3,6 +3,7 @@ pfiles = [
   'controller_mask.png',
   'controller_mask_s.png',
   'fight_stick_mask.png',
+  'xmu_mask.png',
   'logo_sdf.png',
   'xemu_64x64.png',
   'abxy.ttf',

ui/meson.build

@@ -47,7 +47,7 @@ endif
 xemu_ss.add(when: 'CONFIG_LINUX', if_true: [gtk, files('xemu-os-utils-linux.c')])
 xemu_ss.add(when: 'CONFIG_WIN32', if_true: files('xemu-os-utils-windows.c'))
 xemu_ss.add(when: 'CONFIG_DARWIN', if_true: files('xemu-os-utils-macos.m'))
-xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, httplib)
+xemu_ss.add(imgui, implot, stb_image, noc, sdl, opengl, openssl, fa, fpng, json, httplib, fatx)
 
 softmmu_ss.add_all(xemu_ss)
 

ui/thirdparty/fatx/fatx.c

@@ -0,0 +1,51 @@
+#include "fatx.h"
+
+#include "qemu/bswap.h"
+
+#define FATX_SIGNATURE 0x58544146
+
+// This is from libfatx
+#pragma pack(1)
+struct fatx_superblock {
+    uint32_t signature;
+    uint32_t volume_id;
+    uint32_t sectors_per_cluster;
+    uint32_t root_cluster;
+    uint16_t unknown1;
+    uint8_t padding[4078];
+};
+#pragma pack()
+
+bool create_fatx_image(const char *filename, unsigned int size)
+{
+    unsigned int empty_fat = cpu_to_le32(0xfffffff8);
+    unsigned char zero = 0;
+
+    FILE *fp = qemu_fopen(filename, "wb");
+    if (fp != NULL) {
+        struct fatx_superblock superblock;
+        memset(&superblock, 0xff, sizeof(struct fatx_superblock));
+
+        superblock.signature = cpu_to_le32(FATX_SIGNATURE);
+        superblock.sectors_per_cluster = cpu_to_le32(4);
+        superblock.volume_id = (uint32_t)rand();
+        superblock.root_cluster = cpu_to_le32(1);
+        superblock.unknown1 = 0;
+
+        // Write the fatx superblock.
+        fwrite(&superblock, sizeof(superblock), 1, fp);
+
+        // Write the FAT
+        fwrite(&empty_fat, sizeof(empty_fat), 1, fp);
+
+        fseek(fp, size - sizeof(unsigned char), SEEK_SET);
+        fwrite(&zero, sizeof(unsigned char), 1, fp);
+
+        fflush(fp);
+        fclose(fp);
+
+        return true;
+    }
+
+    return false;
+}

ui/thirdparty/fatx/fatx.h

@@ -0,0 +1,16 @@
+#ifndef FATX_H
+#define FATX_H
+
+#include "qemu/osdep.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool create_fatx_image(const char *filename, unsigned int size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

ui/thirdparty/meson.build

@@ -62,3 +62,6 @@ fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
 
 json = declare_dependency(include_directories: 'json')
 httplib = declare_dependency(include_directories: 'httplib')
+
+libfatx = static_library('fatx', sources: 'fatx/fatx.c')
+fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)

ui/thirdparty/noc_file_dialog/noc_file_dialog.h

@@ -285,6 +285,9 @@ const char *noc_file_dialog_open(int flags,
     ofn.lpstrInitialDir = initialDir;
     ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
 
+    if (flags & NOC_FILE_DIALOG_OVERWRITE_CONFIRMATION)
+        ofn.Flags |= OFN_OVERWRITEPROMPT;
+
     if (flags & NOC_FILE_DIALOG_OPEN) {
         ret = GetOpenFileNameW(&ofn);
     } else {