mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-25 12:58:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[c-host] fix build under windows

Browse source
This commit is contained in:
Geoffrey McRae 2019-05-09 22:13:31 +10:00
parent e7345b9711
commit 63314941f6
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
a12-162-g22f9fa3938+1 a12-163-ge7345b9711+1

15
c-host/platform/Windows/src/platform.c
View file

@ -110,6 +110,8 @@ static BOOL WINAPI CtrlHandler(DWORD dwCtrlType)
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
{ {
int result = 0;
// convert the command line to the standard argc and argv // convert the command line to the standard argc and argv
LPWSTR * wargv = CommandLineToArgvW(GetCommandLineW(), &app.argc); LPWSTR * wargv = CommandLineToArgvW(GetCommandLineW(), &app.argc);
app.argv = malloc(sizeof(char *) * app.argc); app.argv = malloc(sizeof(char *) * app.argc);
@ -151,7 +153,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{ {
DEBUG_ERROR("Failed to register message window class"); DEBUG_ERROR("Failed to register message window class");
result = -1; result = -1;
goto finish_shmem; goto finish;
} }
app.messageWnd = CreateWindowEx(0, "DUMMY_CLASS", "DUMMY_NAME", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); app.messageWnd = CreateWindowEx(0, "DUMMY_CLASS", "DUMMY_NAME", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
@ -161,7 +163,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{ {
DEBUG_ERROR("Failed to create the main application thread"); DEBUG_ERROR("Failed to create the main application thread");
result = -1; result = -1;
goto finish_shmem; goto finish;
} }
while(true) while(true)
@ -192,10 +194,12 @@ shutdown:
DEBUG_ERROR("Failed to join the main application thread"); DEBUG_ERROR("Failed to join the main application thread");
result = -1; result = -1;
} }
finish_shmem:
os_shmemUnmap();
CloseHandle(app.shmemHandle);
finish: finish:
os_shmemUnmap();
if (app.shmemHandle != INVALID_HANDLE_VALUE)
CloseHandle(app.shmemHandle);
for(int i = 0; i < app.argc; ++i) for(int i = 0; i < app.argc; ++i)
free(app.argv[i]); free(app.argv[i]);
@ -206,7 +210,6 @@ finish:
bool app_init() bool app_init()
{ {
int result = 0;
HDEVINFO deviceInfoSet; HDEVINFO deviceInfoSet;
PSP_DEVICE_INTERFACE_DETAIL_DATA infData = NULL; PSP_DEVICE_INTERFACE_DETAIL_DATA infData = NULL;
SP_DEVICE_INTERFACE_DATA deviceInterfaceData; SP_DEVICE_INTERFACE_DATA deviceInterfaceData;