SilverMoonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Projects 1 Releases 6 Wiki Activity

Fixed the Logging system to actually be able to handle errors. Database is also fixed to use directories.

Browse Source
This commit is contained in:
Karutoh
2024-04-23 22:29:49 -07:00
parent 2734cc00fb
commit f030ac62ae
61 changed files with 884 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/io/Window_W32.cpp
View File

@@ -95,7 +95,7 @@ namespace ehs
if (GetRawInputData((HRAWINPUT)lParam, RID_INPUT, data, &dwSize, sizeof(RAWINPUTHEADER)) != dwSize)
{
EHS_LOG_INT("Error", 0, "Getting raw input returned incorrect size.");
EHS_LOG_INT(LogType::ERR, 0, "Getting raw input returned incorrect size.");
delete[] data;
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
@@ -113,7 +113,7 @@ namespace ehs
if (GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
{
EHS_LOG_INT("Error", 0, "Failed to retrieve device name.");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve device name.");
return 0;
}
@@ -139,7 +139,7 @@ namespace ehs
if (GetRawInputDeviceInfo(raw->header.hDevice, RIDI_DEVICENAME, deviceName, &bufferSize) < 0)
{
EHS_LOG_INT("Error", 1, "Failed to retrieve device name.");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve device name.");
return 0;
}
@@ -202,7 +202,7 @@ namespace ehs
if (win->cursorConstrained)
{
if (!ClipCursor(nullptr))
EHS_LOG_INT("Error", 0, "Failed to free cursor after losing focus with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to free cursor after losing focus with error #" + Str_8::FromNum(GetLastError()) + ".");
}
win->ih.ResetAllStates();
@@ -220,7 +220,7 @@ namespace ehs
if (!GetClientRect(win->GetHdl(), &client))
{
EHS_LOG_INT("Error", 0, "Failed to retrieve client scale with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve client scale with error #" + Str_8::FromNum(GetLastError()) + ".");
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
@@ -228,7 +228,7 @@ namespace ehs
if (!ClientToScreen(win->GetHdl(), &pos))
{
EHS_LOG_INT("Error", 1, "Failed to retrieve client's absolute position with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve client's absolute position with error #" + Str_8::FromNum(GetLastError()) + ".");
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
@@ -239,7 +239,7 @@ namespace ehs
if (!ClientToScreen(win->GetHdl(), &scale))
{
EHS_LOG_INT("Error", 2, "Failed to retrieve client's absolute scale with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 2, "Failed to retrieve client's absolute scale with error #" + Str_8::FromNum(GetLastError()) + ".");
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
@@ -248,7 +248,7 @@ namespace ehs
if (!ClipCursor(&client))
{
EHS_LOG_INT("Error", 3, "Failed to confine cursor with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 3, "Failed to confine cursor with error #" + Str_8::FromNum(GetLastError()) + ".");
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
}
@@ -347,7 +347,7 @@ namespace ehs
wcex.lpszClassName = title;
if (!RegisterClassExW(&wcex))
EHS_LOG_INT("Error", 0, "Failed to register window.");
EHS_LOG_INT(LogType::ERR, 0, "Failed to register window.");
hdl = CreateWindowExW(
0,
@@ -362,7 +362,7 @@ namespace ehs
if (!hdl)
{
EHS_LOG_INT("Error", 1, "Failed to create window.");
EHS_LOG_INT(LogType::ERR, 1, "Failed to create window.");
return;
}
@@ -391,7 +391,7 @@ namespace ehs
if (RegisterRawInputDevices(rid, 2, sizeof(rid[0])) == false)
{
EHS_LOG_INT("Error", 2, "Failed to register raw input devices.");
EHS_LOG_INT(LogType::ERR, 2, "Failed to register raw input devices.");
return;
}
@@ -434,7 +434,7 @@ namespace ehs
void Window::SetTitle_32(const Str_32& title)
{
if (!SetWindowTextW(hdl, UTF::To_16(title)))
EHS_LOG_INT("Error", 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
}
Str_32 Window::GetTitle_32() const
@@ -445,7 +445,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -459,7 +459,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -471,7 +471,7 @@ namespace ehs
void Window::SetTitle_16(const Str_16& title)
{
if (!SetWindowTextW(hdl, title))
EHS_LOG_INT("Error", 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
}
Str_16 Window::GetTitle_16() const
@@ -482,7 +482,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -496,7 +496,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -508,7 +508,7 @@ namespace ehs
void Window::SetTitle_8(const Str_8& title)
{
if (!SetWindowTextW(hdl, UTF::To_16(title)))
EHS_LOG_INT("Error", 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to set window title with error #" + Str_8::FromNum(GetLastError()) + ".");
}
Str_8 Window::GetTitle_8() const
@@ -519,7 +519,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -533,7 +533,7 @@ namespace ehs
DWORD err = GetLastError();
if (err)
{
EHS_LOG_INT("Error", 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve the window's title length with error #" + Str_8::FromNum(err) + ".");
return {};
}
@@ -547,7 +547,7 @@ namespace ehs
Handle icon = LoadImageW(nullptr, UTF::To_16(filePath), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE);
if (!icon)
{
EHS_LOG_INT("Error", 0, "Failed to load icon at file path, \"" + filePath + "\" with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to load icon at file path, \"" + filePath + "\" with error #" + Str_8::FromNum(GetLastError()) + ".");
return;
}
@@ -634,7 +634,7 @@ namespace ehs
RECT rect = {};
if (!GetClientRect(hdl, &rect))
EHS_LOG_INT("Error", 0, "Failed to retrieve client size with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve client size with error #" + Str_8::FromNum(GetLastError()) + ".");
return {(UInt_32)rect.right, (UInt_32)rect.bottom};
}
@@ -677,7 +677,7 @@ namespace ehs
if (!GetClientRect(GetHdl(), &client))
{
EHS_LOG_INT("Error", 0, "Failed to retrieve client scale with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 0, "Failed to retrieve client scale with error #" + Str_8::FromNum(GetLastError()) + ".");
return;
}
@@ -685,7 +685,7 @@ namespace ehs
if (!ClientToScreen(GetHdl(), &pos))
{
EHS_LOG_INT("Error", 1, "Failed to retrieve client's absolute position with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 1, "Failed to retrieve client's absolute position with error #" + Str_8::FromNum(GetLastError()) + ".");
return;
}
@@ -696,7 +696,7 @@ namespace ehs
if (!ClientToScreen(GetHdl(), &scale))
{
EHS_LOG_INT("Error", 2, "Failed to retrieve client's absolute scale with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 2, "Failed to retrieve client's absolute scale with error #" + Str_8::FromNum(GetLastError()) + ".");
return;
}
@@ -705,7 +705,7 @@ namespace ehs
if (!ClipCursor(&client))
{
EHS_LOG_INT("Error", 3, "Failed to confine cursor with error #" + Str_8::FromNum(GetLastError()) + ".");
EHS_LOG_INT(LogType::ERR, 3, "Failed to confine cursor with error #" + Str_8::FromNum(GetLastError()) + ".");
return;
}
}