summaryrefslogtreecommitdiff
path: root/frontends/windows
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/windows')
-rw-r--r--frontends/windows/Makefile2
-rw-r--r--frontends/windows/cookies.c3
-rw-r--r--frontends/windows/corewindow.c9
-rw-r--r--frontends/windows/corewindow.h5
-rw-r--r--frontends/windows/download.c1
-rw-r--r--frontends/windows/global_history.c3
-rw-r--r--frontends/windows/hotlist.c3
-rw-r--r--frontends/windows/local_history.c3
-rw-r--r--frontends/windows/main.c1
-rw-r--r--frontends/windows/prefs.c1
-rw-r--r--frontends/windows/res/installer.nsi8
-rw-r--r--frontends/windows/window.c8
-rw-r--r--frontends/windows/window.h1
13 files changed, 23 insertions, 25 deletions
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 4e74edd7a..524f716fe 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -90,7 +90,7 @@ $(OBJROOT)/messages-en: $(MESSAGES_TARGET)/en/Messages
$(VQ)echo " MSGCP: $< $@"
$(Q)$(INSTALL) -m 644 -T $< $@
-netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
+netsurf-installer.exe: $(EXETARGET) $(POSTEXES) $(WIN_RES_INS_OBJ)
$(VQ)echo "MAKENSIS: $@"
$(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT) -DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ) -DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@ $(FRONTEND_RESOURCES_DIR)/installer.nsi
diff --git a/frontends/windows/cookies.c b/frontends/windows/cookies.c
index ee754bc3f..e83e83c10 100644
--- a/frontends/windows/cookies.c
+++ b/frontends/windows/cookies.c
@@ -154,8 +154,7 @@ static nserror nsw32_cookie_init(HINSTANCE hInstance)
return res;
}
- res = cookie_manager_init(ncwin->core.cb_table,
- (struct core_window *)ncwin);
+ res = cookie_manager_init((struct core_window *)ncwin);
if (res != NSERROR_OK) {
free(ncwin);
return res;
diff --git a/frontends/windows/corewindow.c b/frontends/windows/corewindow.c
index 7d6dc69b0..c7e241d21 100644
--- a/frontends/windows/corewindow.c
+++ b/frontends/windows/corewindow.c
@@ -503,15 +503,17 @@ nsw32_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
}
-struct core_window_callback_table nsw32_cw_cb_table = {
+struct core_window_table nsw32_cw_cb_table = {
.invalidate = nsw32_cw_invalidate_area,
- .update_size = nsw32_cw_update_size,
+ .set_extent = nsw32_cw_update_size,
.set_scroll = nsw32_cw_set_scroll,
.get_scroll = nsw32_cw_get_scroll,
- .get_window_dimensions = nsw32_cw_get_window_dimensions,
+ .get_dimensions = nsw32_cw_get_window_dimensions,
.drag_status = nsw32_cw_drag_status
};
+struct core_window_table *win32_core_window_table = &nsw32_cw_cb_table;
+
/* exported function documented nsw32/corewindow.h */
nserror
nsw32_corewindow_init(HINSTANCE hInstance,
@@ -521,7 +523,6 @@ nsw32_corewindow_init(HINSTANCE hInstance,
DWORD dwStyle;
/* setup the core window callback table */
- nsw32_cw->cb_table = &nsw32_cw_cb_table;
nsw32_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* start with the content area being as small as possible */
diff --git a/frontends/windows/corewindow.h b/frontends/windows/corewindow.h
index cffae3cbd..53f47fd89 100644
--- a/frontends/windows/corewindow.h
+++ b/frontends/windows/corewindow.h
@@ -21,6 +21,8 @@
#include "netsurf/core_window.h"
+extern struct core_window_table *win32_core_window_table;
+
/**
* nsw32 core window state
*/
@@ -39,9 +41,6 @@ struct nsw32_corewindow {
/** drag status set by core */
core_window_drag_status drag_status;
-
- /** table of callbacks for core window operations */
- struct core_window_callback_table *cb_table;
/**
* callback to draw on drawable area of nsw32 core window
diff --git a/frontends/windows/download.c b/frontends/windows/download.c
index f0163cef7..cfd2bbbb7 100644
--- a/frontends/windows/download.c
+++ b/frontends/windows/download.c
@@ -169,6 +169,7 @@ nsws_download_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
case IDOK:
if (download1->downloaded != download1->size)
return TRUE;
+ fallthrough;
case IDCANCEL:
nsws_download_clear_data(download1);
diff --git a/frontends/windows/global_history.c b/frontends/windows/global_history.c
index dcc75ba21..5a53426a3 100644
--- a/frontends/windows/global_history.c
+++ b/frontends/windows/global_history.c
@@ -143,8 +143,7 @@ static nserror nsw32_global_history_init(HINSTANCE hInstance)
return res;
}
- res = global_history_init(ncwin->core.cb_table,
- (struct core_window *)ncwin);
+ res = global_history_init((struct core_window *)ncwin);
if (res != NSERROR_OK) {
free(ncwin);
return res;
diff --git a/frontends/windows/hotlist.c b/frontends/windows/hotlist.c
index e8dd90b34..3f05b79fd 100644
--- a/frontends/windows/hotlist.c
+++ b/frontends/windows/hotlist.c
@@ -147,8 +147,7 @@ static nserror nsw32_hotlist_init(HINSTANCE hInstance)
return res;
}
- res = hotlist_manager_init(ncwin->core.cb_table,
- (struct core_window *)ncwin);
+ res = hotlist_manager_init((struct core_window *)ncwin);
if (res != NSERROR_OK) {
free(ncwin);
return res;
diff --git a/frontends/windows/local_history.c b/frontends/windows/local_history.c
index 823901b69..a8e055aec 100644
--- a/frontends/windows/local_history.c
+++ b/frontends/windows/local_history.c
@@ -160,8 +160,7 @@ nsw32_local_history_init(HINSTANCE hInstance,
return res;
}
- res = local_history_init(ncwin->core.cb_table,
- (struct core_window *)ncwin,
+ res = local_history_init((struct core_window *)ncwin,
bw,
&ncwin->session);
if (res != NSERROR_OK) {
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index c051f446c..561ebe848 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -390,6 +390,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
struct netsurf_table win32_table = {
.misc = &win32_misc_table,
.window = win32_window_table,
+ .corewindow = win32_core_window_table,
.clipboard = win32_clipboard_table,
.download = win32_download_table,
.fetch = win32_fetch_table,
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 37f558477..d6855f5da 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -277,6 +277,7 @@ static BOOL CALLBACK options_appearance_dialog_handler(HWND hwnd,
}
break;
}
+ break;
case WM_COMMAND:
diff --git a/frontends/windows/res/installer.nsi b/frontends/windows/res/installer.nsi
index 7a03192f5..2f8b757d8 100644
--- a/frontends/windows/res/installer.nsi
+++ b/frontends/windows/res/installer.nsi
@@ -13,16 +13,16 @@
!define VERSIONMAJOR 3
!endif
!ifndef VERSIONMINOR
- !define VERSIONMINOR 10
+ !define VERSIONMINOR 11
!endif
!ifndef VERSIONBUILD
!define VERSIONBUILD 0
!endif
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
-!define HELPURL "http://www.netsurf-browser.org/" # "Support Information" link
-!define UPDATEURL "http://www.netsurf-browser.org/" # "Product Updates" link
-!define ABOUTURL "http://www.netsurf-browser.org/" # "Publisher" link
+!define HELPURL "https://www.netsurf-browser.org/" # "Support Information" link
+!define UPDATEURL "https://www.netsurf-browser.org/" # "Product Updates" link
+!define ABOUTURL "https://www.netsurf-browser.org/" # "Publisher" link
# This is the size (in kB) of all the files copied into "Program Files"
!define INSTALLSIZE 9000
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index 750c57703..00e5a7e05 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -432,7 +432,7 @@ nsws_window_urlbar_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
NSLOG(netsurf, INFO, "Destroyed font object");
DeleteObject(hFont);
}
-
+ fallthrough;
case WM_NCDESTROY:
/* remove properties if window is being destroyed */
@@ -1250,17 +1250,17 @@ nsws_window_command(HWND hwnd,
case IDM_HELP_CONTENTS:
nsws_window_go(hwnd,
- "http://www.netsurf-browser.org/documentation/");
+ "https://www.netsurf-browser.org/documentation/");
break;
case IDM_HELP_GUIDE:
nsws_window_go(hwnd,
- "http://www.netsurf-browser.org/documentation/guide");
+ "https://www.netsurf-browser.org/documentation/guide");
break;
case IDM_HELP_INFO:
nsws_window_go(hwnd,
- "http://www.netsurf-browser.org/documentation/info");
+ "https://www.netsurf-browser.org/documentation/info");
break;
case IDM_HELP_ABOUT:
diff --git a/frontends/windows/window.h b/frontends/windows/window.h
index 5f4349427..97be710f3 100644
--- a/frontends/windows/window.h
+++ b/frontends/windows/window.h
@@ -26,7 +26,6 @@ extern struct gui_window_table *win32_window_table;
struct browser_mouse {
struct gui_window *gui;
- struct box *box;
double pressed_x;
double pressed_y;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 19:58:24 +0000