Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use vector instead of array, and proper referencing #196

Closed
wants to merge 2 commits into from
Closed

Use vector instead of array, and proper referencing #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec1d1da
Use vector instead of array, and proper referencing
tophyr Apr 27, 2024
63103eb
Set up a DebugAsan build configuration
tophyr Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" "DebugAsan")

if(CMAKE_CXX_BYTE_ORDER STREQUAL "BIG_ENDIAN")
message(STATUS "Big Endian system detected.")
add_definitions("-DOUTRAGE_BIG_ENDIAN")
Expand Down Expand Up @@ -83,6 +85,9 @@ if(WIN32)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc /RTC1 /W3 /nologo /c /Zi /TP /errorReport:prompt")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /FD /EHsc /W3 /nologo /c /Zi /TP /errorReport:prompt")

# default cmake options set -fsanitize and other clang/gcc-style parameters, even for windows. override them with normal debug + /fsanitize
set(CMAKE_CXX_FLAGS_DEBUGASAN "${CMAKE_CXX_FLAGS_DEBUG} /fsanitize=address")

set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
set(CMAKE_MODULE_LINKER_FLAGS "/SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
add_definitions(-DIS_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
Expand Down Expand Up @@ -187,7 +192,7 @@ if(UNIX)
add_subdirectory(scripts)
endif()

# set default cmake build type to Debug (None Debug Release RelWithDebInfo MinSizeRel)
# set default cmake build type to Debug (Debug Release DebugAsan)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug")
endif()
162 changes: 71 additions & 91 deletions win32/winapp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@

#define OEAPP_INTERNAL_MODULE

#include <vector>

#include "Application.h"
#include "AppConsole.h"
#include "mono.h"
Expand All @@ -172,12 +174,13 @@

/* Main Windows Procedure for this OS object
*/
const int MAX_WIN32APPS = 4;
constexpr int MAX_WIN32APPS = 4;

static struct tAppNodes {
struct tAppNodes {
HWND hWnd;
oeWin32Application *app;
} Win32_AppObjects[MAX_WIN32APPS];
};
static std::vector<tAppNodes> Win32_AppObjects;

// system mouse info.
short w32_msewhl_delta = 0; // -val = up, pos val = down, 0 = no change.
Expand All @@ -200,7 +203,6 @@ extern LRESULT WINAPI MyConProc(HWND hWnd, UINT msg, UINT wParam, LPARAM lParam)
extern void con_Defer();

bool oeWin32Application::os_initialized = false;
bool oeWin32Application::first_time = true;

// this is the app's window proc.
LRESULT WINAPI MyWndProc(HWND hWnd, UINT msg, UINT wParam, LPARAM lParam);
Expand All @@ -210,15 +212,6 @@ oeWin32Application::oeWin32Application(const char *name, unsigned flags, HInstan
WNDCLASS wc;
RECT rect;

if (oeWin32Application::first_time) {
int i;
for (i = 0; i < MAX_WIN32APPS; i++) {
Win32_AppObjects[i].hWnd = NULL;
Win32_AppObjects[i].app = NULL;
}
oeWin32Application::first_time = false;
}

HICON dicon = ExtractIcon((HINSTANCE)hinst, "descent 3.exe", 0);
wc.hCursor = NULL;
wc.hIcon = dicon;
Expand Down Expand Up @@ -628,96 +621,83 @@ void oeWin32Application::delay(float secs) {
}

LRESULT WINAPI MyWndProc(HWND hWnd, UINT msg, UINT wParam, LPARAM lParam) {
int i = -1;
bool force_default = false;

for (i = 0; i < MAX_WIN32APPS; i++)
if (Win32_AppObjects[i].hWnd == hWnd)
break;

if (i == MAX_WIN32APPS)
i = -1;
auto appobj = std::find_if(Win32_AppObjects.begin(), Win32_AppObjects.end(),
[=](auto const &obj) { return obj.hWnd == hWnd; });

switch (msg) {
LPCREATESTRUCT lpCreateStruct;
case WM_CREATE:
// here we store the this pointer to the app object this instance belongs to.
lpCreateStruct = (LPCREATESTRUCT)lParam;
for (i = 0; i < MAX_WIN32APPS; i++)
if (Win32_AppObjects[i].hWnd == NULL)
break;
if (i == MAX_WIN32APPS)
debug_break();
Win32_AppObjects[i].hWnd = hWnd;
Win32_AppObjects[i].app = (oeWin32Application *)lpCreateStruct->lpCreateParams;

Win32_AppObjects[i].app->clear_handlers();

force_default = true;
break;

case WM_DESTROY:
// get window handle and clear it.
if (i == MAX_WIN32APPS)
debug_break();
Win32_AppObjects[i].hWnd = NULL;
Win32_AppObjects[i].app = NULL;
i = -1;
break;

case WM_SYSCOMMAND: {
// bypass screen saver and system menu.
unsigned int maskedWParam = wParam & 0xFFF0;
if (maskedWParam == SC_SCREENSAVE || maskedWParam == SC_MONITORPOWER)
return 0;
if (maskedWParam == SC_KEYMENU)
return 0;

// handle the close button
if (maskedWParam == SC_CLOSE) {
exit(1);
return 0;
}
} break;

case WM_SYSKEYDOWN:
case WM_SYSKEYUP:
if (lParam & 0x20000000)
return 0;
break;

case WM_POWERBROADCAST: // Won't allow OS to suspend operation for now.
mprintf((0, "WM_POWERBROADCAST=%u,%d\n", wParam, lParam));
if (wParam == PBT_APMQUERYSUSPEND) {
return BROADCAST_QUERY_DENY;
}
break;

case WM_MOUSEWHEEL:
case 0xcc41:
if (w32_mouseman_hack) {
if (msg != 0xcc41) {
case WM_CREATE: {
// here we store the this pointer to the app object this instance belongs to.
LPCREATESTRUCT lpCreateStruct = (LPCREATESTRUCT)lParam;
if (Win32_AppObjects.size() == MAX_WIN32APPS)
debug_break();
auto app = static_cast<oeWin32Application *>(lpCreateStruct->lpCreateParams);
app->clear_handlers();

Win32_AppObjects.push_back({hWnd, app});
// because we modified the vector, we must reset appobj, but we want this first time to use DefWindowProc
appobj = Win32_AppObjects.end();
} break;

case WM_DESTROY: {
// get window handle and clear it.
if (appobj == Win32_AppObjects.end())
debug_break();
appobj = Win32_AppObjects.erase(appobj);
} break;
case WM_SYSCOMMAND: {
// bypass screen saver and system menu.
unsigned int maskedWParam = wParam & 0xFFF0;
if (maskedWParam == SC_SCREENSAVE || maskedWParam == SC_MONITORPOWER)
return 0;
if (maskedWParam == SC_KEYMENU)
return 0;

// handle the close button
if (maskedWParam == SC_CLOSE) {
exit(1);
return 0;
}
} break;

case WM_SYSKEYDOWN:
// FALLTHROUGH
case WM_SYSKEYUP: {
if (lParam & 0x20000000)
return 0;
} break;

case WM_POWERBROADCAST: {
// Won't allow OS to suspend operation for now.
mprintf((0, "WM_POWERBROADCAST=%u,%d\n", wParam, lParam));
if (wParam == PBT_APMQUERYSUSPEND) {
return BROADCAST_QUERY_DENY;
}
} break;

case WM_MOUSEWHEEL:
// FALLTHROUGH
case 0xcc41: {
if (w32_mouseman_hack) {
if (msg != 0xcc41) {
w32_msewhl_delta = HIWORD(wParam);
} else {
w32_msewhl_delta = (short)(wParam);
}
} else if (msg == WM_MOUSEWHEEL) {
w32_msewhl_delta = HIWORD(wParam);
} else {
w32_msewhl_delta = (short)(wParam);
}
} else if (msg == WM_MOUSEWHEEL) {
w32_msewhl_delta = HIWORD(wParam);
}
break;
} break;
}

oeWin32Application *winapp = Win32_AppObjects[i].app;

// if this window not on list, then run default window proc.
if (i == -1 || winapp == NULL || force_default)
if (appobj == Win32_AppObjects.end())
return DefWindowProc(hWnd, msg, wParam, lParam);

if (!winapp->run_handler((HWnd)hWnd, (unsigned)msg, (unsigned)wParam, (long)lParam))
if (!appobj->app->run_handler((HWnd)hWnd, (unsigned)msg, (unsigned)wParam, (long)lParam))
return 0;

// run user defined window procedure.
return (LRESULT)winapp->WndProc((HWnd)hWnd, (unsigned)msg, (unsigned)wParam, (long)lParam);
return (LRESULT)appobj->app->WndProc((HWnd)hWnd, (unsigned)msg, (unsigned)wParam, (long)lParam);
}

// detect if application can handle what we want of it.
Expand Down