80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Explicitly initialize COM library in main and opengl threads, hopefully fixing filedialog issues.

Browse Source
This commit is contained in:
ts-korhonen
2021-06-17 19:15:35 +03:00
parent a389e2988a
commit ed86f69c85
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/win.c
View File

@@ -417,6 +417,9 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
SetCurrentProcessExplicitAppUserModelID(AppID); SetCurrentProcessExplicitAppUserModelID(AppID);
/* Initialize the COM library for the main thread. */
CoInitializeEx(NULL, COINIT_MULTITHREADED);
/* Check if Windows supports UTF-8 */ /* Check if Windows supports UTF-8 */
if (GetACP() == CP_UTF8) if (GetACP() == CP_UTF8)
acp_utf8 = 1; acp_utf8 = 1;
@@ -465,6 +468,9 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
/* Handle our GUI. */ /* Handle our GUI. */
i = ui_init(nCmdShow); i = ui_init(nCmdShow);
/* Uninitialize COM before exit. */
CoUninitialize();
free(argbuf); free(argbuf);
free(argv); free(argv);
return(i); return(i);

5
src/win/win_opengl.c
View File

@@ -468,6 +468,9 @@ static void __stdcall opengl_debugmsg_callback(GLenum source, GLenum type, GLuin
*/ */
static void opengl_main(void* param) static void opengl_main(void* param)
{ {
/* Initialize COM library for this thread before SDL does so. */
CoInitializeEx(NULL, COINIT_MULTITHREADED);
SDL_InitSubSystem(SDL_INIT_VIDEO); SDL_InitSubSystem(SDL_INIT_VIDEO);
SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); /* Is this actually doing anything...? */ SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); /* Is this actually doing anything...? */
@@ -788,6 +791,8 @@ static void opengl_main(void* param)
SDL_DestroyWindow(window); SDL_DestroyWindow(window);
window = NULL; window = NULL;
CoUninitialize();
} }
static void opengl_blit(int x, int y, int y1, int y2, int w, int h) static void opengl_blit(int x, int y, int y1, int y2, int w, int h)