Fixed FileMonitor, Window, Thread, and Audio on Windows.

Fixed Directory for Windows.
2024-07-01 19:16:45 -07:00 · 2024-06-29 23:38:27 -07:00
11 changed files with 158 additions and 58 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,8 +164,6 @@ set(EHS_SOURCES
        include/ehs/io/mdl/MdlCodec.h
        include/ehs/io/UsbBase.h
        src/io/UsbBase.cpp
-        include/ehs/io/Usb_LNX.h
-        src/io/Usb_LNX.cpp
        include/ehs/db/DbTable.h
        include/ehs/db/DbObject.h
        include/ehs/db/DbVar.h
@@ -177,8 +175,6 @@ set(EHS_SOURCES
        src/db/DbTable.cpp
        include/ehs/io/BaseDirectory.h
        src/io/BaseDirectory.cpp
-        include/ehs/io/Directory_LNX.h
-        src/io/Directory_LNX.cpp
        include/ehs/io/Directory.h
 )

@@ -196,6 +192,7 @@ if (IS_OS_WINDOWS)
            src/io/Window_W32.cpp include/ehs/io/Window_W32.h
            src/io/COM.cpp include/ehs/io/COM.h
            src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
+            src/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
    )
 elseif (IS_OS_LINUX)
    list(APPEND EHS_SOURCES
@@ -210,6 +207,8 @@ elseif (IS_OS_LINUX)
            src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h
            src/system/FileSystem.cpp include/ehs/system/FileSystem.h
            src/system/User.cpp include/ehs/system/User.h
+            src/io/Directory_LNX.cpp include/ehs/io/Directory_LNX.h
+            src/io/Usb_LNX.cpp include/ehs/io/Usb_LNX.h
    )

    set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System")
--- a/include/ehs/io/Directory_W32.h
+++ b/include/ehs/io/Directory_W32.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "BaseDirectory.h"
+
+namespace ehs
+{
+    class Directory : public BaseDirectory
+    {
+    public:
+        static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+        static void CreateRecursive(Str_8 dir);
+
+        static void Create(const Str_8 &dir);
+    };
+}
--- a/src/io/Directory_LNX.cpp
+++ b/src/io/Directory_LNX.cpp
@@ -13,14 +13,14 @@ namespace ehs

 		if (!dir.Size())
 		{
-			EHS_LOG_INT(LogType::WARN, 2, "The given directory was empty.");
+			EHS_LOG_INT(LogType::WARN, 1, "The given directory was empty.");
 			return result;
 		}

 		DIR* hdl = opendir(dir);
 		if (!hdl)
 		{
-			EHS_LOG_INT(LogType::ERR, 3, "Failed to open directory, \"" + dir + "\".");
+			EHS_LOG_INT(LogType::ERR, 2, "Failed to open directory, \"" + dir + "\".");
 			return result;
 		}

@@ -31,7 +31,7 @@ namespace ehs

 		if (closedir(hdl) == -1)
 		{
-			EHS_LOG_INT(LogType::ERR, 4, "Failed to close directory, \"" + dir + "\".");
+			EHS_LOG_INT(LogType::ERR, 3, "Failed to close directory, \"" + dir + "\".");
 			return result;
 		}

--- a/src/io/Directory_W32.cpp
+++ b/src/io/Directory_W32.cpp
@@ -0,0 +1,87 @@
+#include "ehs/io/Directory_W32.h"
+#include "ehs/UTF.h"
+#include "ehs/Log.h"
+
+namespace ehs
+{
+    Array<Str_8> GetAllFiles(const Str_8 &dir)
+    {
+        Array<Str_8> result;
+
+		if (!dir.Size())
+		{
+			EHS_LOG_INT(LogType::WARN, 1, "The given directory was empty.");
+			return result;
+		}
+
+        WIN32_FIND_DATAW fData;
+        HANDLE hFind = FindFirstFileW(UTF::To_16(dir) + L"\\*", &fData);
+
+        if (hFind == INVALID_HANDLE_VALUE)
+        {
+			EHS_LOG_INT(LogType::ERR, 2, "Failed to open directory, \"" + dir + "\".");
+            return result;
+        }
+
+        do
+        {
+            Str_8 fName = UTF::To_8(fData.cFileName);
+            if (fName == "." || fName == "..")
+                continue;
+
+            result.Push(fName);
+        }
+        while (FindNextFileW(hFind, &fData) != 0);
+
+        if (!FindClose(hFind))
+        {
+			EHS_LOG_INT(LogType::ERR, 3, "Failed to close directory, \"" + dir + "\".");
+            return result;
+        }
+
+        EHS_LOG_SUCCESS();
+
+        return result;
+    }
+
+    void CreateRecursive(Str_8 dir)
+    {
+        dir = dir.ReplaceAll("\\", "/");
+
+        const Vector<Str_8> dirs = dir.Split("/");
+
+        for (UInt_64 i = 0; i < dirs.Size(); ++i)
+        {
+            const Str_8 final = (Str_8&&)dirs[i];
+            for (UInt_64 x = 0; x < i; ++x)
+                dirs[i] += dirs[x] + "/";
+
+            dirs[i] += final;
+
+            if (!CreateDirectoryW(UTF::To_16(dirs[i]), nullptr))
+            {
+                if (const DWORD code = GetLastError(); code != ERROR_ALREADY_EXISTS)
+                {
+                    EHS_LOG_INT(LogType::ERR, 1, "Failed to create directory, \"" + dirs[i] + "\" with error #" + Str_8::FromNum(code) + ".");
+                    return;
+                }
+            }
+        }
+
+        EHS_LOG_SUCCESS();
+    }
+
+    void Create(const Str_8 &dir)
+    {
+		if (!CreateDirectoryW(UTF::To_16(dir), nullptr))
+		{
+			if (const DWORD code = GetLastError(); code != ERROR_ALREADY_EXISTS)
+			{
+				EHS_LOG_INT(LogType::ERR, 1, "Failed to create directory, \"" + dir + "\" with error #" + Str_8::FromNum(code) + ".");
+				return;
+			}
+		}
+
+		EHS_LOG_SUCCESS();
+    }
+}
--- a/src/io/FileMonitor_W32.cpp
+++ b/src/io/FileMonitor_W32.cpp
@@ -16,7 +16,7 @@ namespace ehs
 	}

 	FileMonitor::FileMonitor()
-		: hdl(nullptr), time{}
+		: hdl(INVALID_HANDLE_VALUE), time{}
 	{
 	}

@@ -93,7 +93,7 @@ namespace ehs
 		if (!CloseHandle(hdl))
 			EHS_LOG_INT(LogType::ERR, 0, "Failed to close file at file path, \"" + filePath + "\", with error #" + GetLastError() + ".");

-		hdl = nullptr;
+		hdl = INVALID_HANDLE_VALUE;
 	}

 	UInt_8 FileMonitor::Poll()
--- a/src/io/UsbBase.cpp
+++ b/src/io/UsbBase.cpp
@@ -1,8 +1,6 @@
 #include "ehs/io/UsbBase.h"
 #include "ehs/Util.h"

-#include <unistd.h>
-
 namespace ehs
 {
    UsbBase::UsbBase()
--- a/src/io/Window_W32.cpp
+++ b/src/io/Window_W32.cpp
@@ -108,10 +108,11 @@ namespace ehs
 					if (!keyboard)
 					{
 						UInt_32 bufferSize;
-						GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, NULL, &bufferSize);
+						GetRawInputDeviceInfoW(raw->header.hDevice, RIDI_DEVICENAME, nullptr, &bufferSize);
+
 						Char_16* deviceName = new Char_16[bufferSize];

-						if (GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
+						if (GetRawInputDeviceInfoW(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
 						{
 							EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve device name.");
 							return 0;
@@ -134,10 +135,11 @@ namespace ehs
 					if (!mouse)
 					{
 						UInt_32 bufferSize;
-						GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, nullptr, &bufferSize);
+						GetRawInputDeviceInfoW(raw->header.hDevice, RIDI_DEVICENAME, nullptr, &bufferSize);
+
 						Char_16* deviceName = new Char_16[bufferSize];

-						if (GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
+						if (GetRawInputDeviceInfoW(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
 						{
 							EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve device name.");
 							return 0;
--- a/src/io/Window_XCB.cpp
+++ b/src/io/Window_XCB.cpp
@@ -187,8 +187,6 @@ namespace ehs

    	QueryPrimaryDevices();

-    	xcb_map_window(server, hdl);
-
 		xcb_flush(server);

 		created = true;
--- a/src/io/audio/Audio.cpp
+++ b/src/io/audio/Audio.cpp
@@ -407,13 +407,13 @@ namespace ehs
 			case DataType::SINT_8:
 				return ((SInt_8 *)data)[sampleIndex];
 			case DataType::SINT_16:
-				return (SInt_8)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
 			case DataType::FLOAT:
-				return (SInt_8)(((float*)data)[sampleIndex] * (float)EHS_SINT_8_MAX);
+				return (SInt_8)(((double *)data)[sampleIndex] * (double)EHS_SINT_8_MAX);
 			case DataType::SINT_32:
-				return (SInt_8)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
 			case DataType::SINT_64:
-				return (SInt_8)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
 			default:
 				return 0;
 		}
@@ -424,15 +424,15 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_16)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)((SInt_8*)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_16:
 				return ((SInt_16 *)data)[sampleIndex];
 			case DataType::FLOAT:
-				return (SInt_16)(((float*)data)[sampleIndex] * (float)EHS_SINT_16_MAX);
+				return (SInt_16)(((double *)data)[sampleIndex] * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_32:
-				return (SInt_16)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_64:
-				return (SInt_16)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
 			default:
 				return 0;
 		}
@@ -462,15 +462,15 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_32)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)((SInt_8 *)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
 			case DataType::SINT_16:
-				return (SInt_32)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
 			case DataType::FLOAT:
-				return (SInt_32)(((float*)data)[sampleIndex] * (float)EHS_SINT_32_MAX);
+				return (SInt_32)(((double *)data)[sampleIndex] * (double)EHS_SINT_32_MAX);
 			case DataType::SINT_32:
 				return ((SInt_32 *)data)[sampleIndex];
 			case DataType::SINT_64:
-				return (SInt_32)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
 			default:
 				return 0;
 		}
@@ -481,13 +481,13 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_64)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)((SInt_8 *)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_16:
-				return (SInt_64)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::FLOAT:
-				return (SInt_64)(((float*)data)[sampleIndex] * (float)EHS_SINT_64_MAX);
+				return (SInt_64)(((double *)data)[sampleIndex] * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_32:
-				return (SInt_64)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_64:
 				return ((SInt_64 *)data)[sampleIndex];
 			default:
@@ -502,13 +502,13 @@ namespace ehs
 			case DataType::SINT_8:
 				return *(SInt_8*)peak;
 			case DataType::SINT_16:
-				return (SInt_8)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
 			case DataType::FLOAT:
-				return (SInt_8)(*(float*)peak * (float)EHS_SINT_8_MAX);
+				return (SInt_8)(*(double *)peak * (double)EHS_SINT_8_MAX);
 			case DataType::SINT_32:
-				return (SInt_8)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
 			case DataType::SINT_64:
-				return (SInt_8)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX);
+				return (SInt_8)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
 			default:
 				return 0;
 		}
@@ -519,15 +519,15 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_16)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_16:
 				return *(SInt_16*)peak;
 			case DataType::FLOAT:
-				return (SInt_16)(*(float*)peak * (float)EHS_SINT_16_MAX);
+				return (SInt_16)(*(double*)peak * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_32:
-				return (SInt_16)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
 			case DataType::SINT_64:
-				return (SInt_16)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX);
+				return (SInt_16)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
 			default:
 				return 0;
 		}
@@ -557,15 +557,15 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_32)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
 			case DataType::SINT_16:
-				return (SInt_32)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
 			case DataType::FLOAT:
-				return (SInt_32)(*(float*)peak * (float)EHS_SINT_32_MAX);
+				return (SInt_32)(*(double *)peak * (double)EHS_SINT_32_MAX);
 			case DataType::SINT_32:
 				return *(SInt_32 *)peak;
 			case DataType::SINT_64:
-				return (SInt_32)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX);
+				return (SInt_32)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
 			default:
 				return 0;
 		}
@@ -576,13 +576,13 @@ namespace ehs
 		switch (dataType)
 		{
 			case DataType::SINT_8:
-				return (SInt_64)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_16:
-				return (SInt_64)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::FLOAT:
-				return (SInt_64)(*(float*)peak * (float)EHS_SINT_64_MAX);
+				return (SInt_64)(*(double *)peak * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_32:
-				return (SInt_64)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX);
+				return (SInt_64)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
 			case DataType::SINT_64:
 				return *(SInt_64 *)peak;
 			default:
--- a/src/system/Thread.cpp
+++ b/src/system/Thread.cpp
@@ -75,7 +75,7 @@ namespace ehs
 		if (hdl == EHS_INVALID_THREAD)
 			return false;

-		#if defined(EHS_WINDOWS)
+		#if defined(EHS_OS_WINDOWS)
 			unsigned int r = WaitForSingleObject(hdl, timeout);
 			if (r == WAIT_ABANDONED)
 			{
Author	SHA1	Message	Date
Karutoh	e2e5a1b8db	Fixed FileMonitor, Window, Thread, and Audio on Windows. All checks were successful Build & Release / Windows-AMD64-Build (push) Successful in 1m25s Details Build & Release / Linux-AMD64-Build (push) Successful in 1m38s Details Build & Release / Linux-AARCH64-Build (push) Successful in 3m36s Details	2024-07-01 19:16:45 -07:00
Karutoh	2a2296685e	Fixed Directory for Windows. All checks were successful Build & Release / Windows-AMD64-Build (push) Successful in 1m41s Details Build & Release / Linux-AMD64-Build (push) Successful in 1m56s Details Build & Release / Linux-AARCH64-Build (push) Successful in 3m48s Details	2024-06-29 23:38:27 -07:00