[idd] helper: use CWindow helper to avoid global state

This commit is contained in:
Quantum
2025-09-13 15:04:03 -04:00
committed by Geoffrey McRae
parent 9d48e70983
commit 94550e09b4
4 changed files with 86 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
#include <Windows.h>
#include <Windows.h>
#include <wrl.h>
#include <UserEnv.h>
@@ -11,6 +11,7 @@ using namespace Microsoft::WRL::Wrappers::HandleTraits;
#include "CDebug.h"
#include "VersionInfo.h"
#include "CPipeClient.h"
#include "CWindow.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof*(x))
#define SVCNAME L"Looking Glass (IDD Helper)"
@@ -31,11 +32,6 @@ static std::wstring l_exitEventName;
static void Launch();
LRESULT CALLBACK DummyWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd, msg, wParam, lParam);
}
int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nShowCmd)
{
g_debug.Init("looking-glass-iddhelper");
@@ -80,24 +76,13 @@ int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _
return EXIT_FAILURE;
}
WNDCLASSEX wx = {};
wx.cbSize = sizeof(WNDCLASSEX);
wx.lpfnWndProc = DummyWndProc;
wx.hInstance = hInstance;
wx.lpszClassName = L"DUMMY_CLASS";
wx.hIcon = LoadIcon(NULL, IDI_APPLICATION);
wx.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
wx.hCursor = LoadCursor(NULL, IDC_ARROW);
wx.hbrBackground = (HBRUSH)COLOR_APPWORKSPACE;
ATOM aclass;
if (!(aclass = RegisterClassEx(&wx)))
if (!CWindow::registerClass())
{
DEBUG_ERROR("Failed to register message window class");
return EXIT_FAILURE;
}
HWND msgWnd = CreateWindowEx(0, MAKEINTATOM(aclass), NULL,
0, 0, 0, 0, 0, NULL, NULL, hInstance, NULL);
CWindow window;
bool running = g_pipe.Init();
while (running)
@@ -128,7 +113,6 @@ int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _
}
g_pipe.DeInit();
DestroyWindow(msgWnd);
return EXIT_SUCCESS;
}