From 16b11e7238dea2c74a713b6f601d5f506bdaadcf Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 10 May 2014 10:22:10 +0100 Subject: ensure operations tables are registered as early as possible. --- windows/main.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'windows') diff --git a/windows/main.c b/windows/main.c index 1fa713664..7cd6339d7 100644 --- a/windows/main.c +++ b/windows/main.c @@ -103,8 +103,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) nserror ret; const char *addr; nsurl *url; - nserror error; - struct gui_table win32_gui_table = { + struct netsurf_table win32_table = { .browser = win32_browser_table, .window = win32_window_table, .clipboard = win32_clipboard_table, @@ -115,6 +114,11 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) }; win32_fetch_table->get_resource_url = gui_get_resource_url; + ret = netsurf_register(&win32_table); + if (ret != NSERROR_OK) { + die("NetSurf operation table registration failed"); + } + if (SLEN(lpcli) > 0) { argvw = CommandLineToArgvW(GetCommandLineW(), &argc); } @@ -160,7 +164,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* common initialisation */ messages = filepath_find(respaths, "messages"); - ret = netsurf_init(messages, &win32_gui_table); + ret = netsurf_init(messages); free(messages); if (ret != NSERROR_OK) { free(options_file_location); @@ -187,9 +191,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) LOG(("calling browser_window_create")); - error = nsurl_create(addr, &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, + ret = nsurl_create(addr, &url); + if (ret == NSERROR_OK) { + ret = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -197,8 +201,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) nsurl_unref(url); } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); + if (ret != NSERROR_OK) { + warn_user(messages_get_errorcode(ret), 0); } else { netsurf_main_loop(); } -- cgit v1.2.3