gdkevents-win32.c: Avoid crash in SetTimer()

Since we only support a single GdkDisplay for Windows, make use of it to
ensure we always obtain a proper GdkDisplay to check whether a modal
operation is in progress.

This should fix issue #7147.

.gitlab-ci.yml

@@ -264,7 +264,7 @@ macos:
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
-vs2017-x64:
+vs2019-x64:
   # TODO: Uncomment this when ready to merge.
   # rules:
   #   - if: $CI_PROJECT_NAMESPACE == "GNOME"

.gitlab-ci/test-msvc.bat

@@ -1,7 +1,7 @@
 @echo on
 :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
 :: specified build architecture
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
 @echo on
 
 pip3 install --upgrade --user meson~=1.2 || goto :error

NEWS

@@ -1,4 +1,7 @@
-Overview of Changes in 4.17.0, xx-xx-xxxx
+Overview of Changes in 4.17.1, xx-xx-xxxx
+=========================================
+
+Overview of Changes in 4.17.0, 06-11-2024
 =========================================
 
 * GtkScrolledWindow
@@ -7,6 +10,9 @@ Overview of Changes in 4.17.0, xx-xx-xxxx
 * GtkFileChooser
  - Fix a crash in the portal code
 
+* GtkFontChoser
+ - Make the dialog more shrinkable
+
 * GtkPicture
  - Avoid unnecessary resizes
 
@@ -22,15 +28,26 @@ Overview of Changes in 4.17.0, xx-xx-xxxx
 * GtkStringList:
  - Add gtk_string_list_find
 
+* GtkApplication:
+ - Respect GDK_DEBUG=no-portals
+ - Set default window icon from app ID
+
 * GtkTextView:
  - Vertical and horizontal positioning of the textview is now quantized
    to the nearest device pixel. This should improve the perceived smoothness
    of scrolling with fractional scaling and font hinting.
  - Incorrect re-use of cached styling was fixed
+ - Fix some missing CSS invalidation
+ - Handle charsets in clipboard datatypes
+
+* Printing:
+ - Avoid warnings for avahi errors
+ - Fix a segfault in the print dialog setup code
 
 * Accessibility:
  - Always realize non-widget accessibles, to help webkit
  - Fix list view selection implementation
+ - Handle NULL values in more places
 
 * Gstreamer:
  - Make dmabufs works without GL
@@ -57,15 +74,22 @@ Overview of Changes in 4.17.0, xx-xx-xxxx
  - Use a viewporter for cursor image scaling
  - Improve cursor size handling
  - Use the system bell protocol if available
- - Fix possible deadlock with high-priority sources triggering Wayland roundtrips
+ - Fix possible deadlock with high-priority sources triggering roundtrips
 
 * Windows:
  - Improve the backend code
  - Fix some problems with WGL on NVidia
  - Many testsuite fixes for Windows compatibility
+ - Make all pixbuf loaders builtin in the gdk-pixbuf subproject
+ - Add GDK_DISABLE=aerosnap to disable aerosnap
+ - Improve clipboard handling
+ - Fix behavior or gdk_display_open() on Windows
+ - Numerous papercut fixes
+ - Require Windows 10
 
 * Macos:
  - Fix crashes when dragging libadwaita TabView tabs
+ - Require macOS 10.15
 
 * Tools and demos
  - gtk4-demo: Make demos standalone
@@ -83,6 +107,7 @@ Overview of Changes in 4.17.0, xx-xx-xxxx
  Brazilian Portuguese
  British English
  Galician
+ Lithuanian
  Romanian
  Slovenian
  Swedish

gdk/gdkconfig.h.win32

@@ -1,22 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.ac'
- */
-
-#ifndef __GDKCONFIG_H__
-#define __GDKCONFIG_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-
-#define GDK_WINDOWING_WIN32
-
-G_END_DECLS
-
-#endif  /* __GDKCONFIG_H__ */

gdk/gdkconfig.h.win32_vulkan

@@ -1,23 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.ac'
- */
-
-#ifndef __GDKCONFIG_H__
-#define __GDKCONFIG_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-
-#define GDK_WINDOWING_WIN32
-#define GDK_RENDERING_VULKAN
-
-G_END_DECLS
-
-#endif  /* __GDKCONFIG_H__ */

gdk/win32/gdkdisplay-win32.c

@@ -656,25 +656,17 @@ gdk_win32_display_get_name (GdkDisplay *display)
 static void
 gdk_win32_display_beep (GdkDisplay *display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-  if (!MessageBeep (-1))
-    Beep(1000, 50);
+  MessageBeep ((UINT)-1);
 }
 
 static void
 gdk_win32_display_flush (GdkDisplay * display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-
-  GdiFlush ();
 }
 
 static void
 gdk_win32_display_sync (GdkDisplay * display)
 {
-  g_return_if_fail (display == gdk_display_get_default());
-
-  GdiFlush ();
 }
 
 static void

gdk/win32/gdkevents-win32.c

@@ -1365,7 +1365,9 @@ modal_timer_proc (HWND     hwnd,
 		  DWORD    time)
 {
   int arbitrary_limit = 10;
-  GdkWin32Display *display = GDK_WIN32_DISPLAY (gdk_surface_get_display (GDK_SURFACE (id)));
+
+  /* todo: if we support multiple GdkDisplay's on Windows? */
+  GdkWin32Display *display = GDK_WIN32_DISPLAY (gdk_display_get_default ());
 
   while (display->display_surface_record->modal_operation_in_progress != GDK_WIN32_MODAL_OP_NONE &&
 	 g_main_context_pending (NULL) &&
@@ -3078,7 +3080,12 @@ gdk_event_translate (MSG *msg,
 
       /* Call modal timer immediate so that we repaint faster after a resize. */
       if (GDK_WIN32_DISPLAY (gdk_surface_get_display (surface))->display_surface_record->modal_operation_in_progress & GDK_WIN32_MODAL_OP_SIZEMOVE_MASK)
-	modal_timer_proc (0,0,0,0);
+        {
+          modal_timer_proc (msg->hwnd,
+                            msg->message,
+                            (UINT_PTR)surface,
+                            msg->time);
+        }
 
       /* Claim as handled, so that WM_SIZE and WM_MOVE are avoided */
       return_val = TRUE;

gsk/gskrendernodeparser.c

@@ -2638,11 +2638,11 @@ unpack_glyphs (PangoFont        *font,
         }
       else
         {
-          PangoRectangle ink_rect;
+          PangoRectangle rect;
 
-          pango_font_get_glyph_extents (font, gi->glyph, &ink_rect, NULL);
+          pango_font_get_glyph_extents (font, gi->glyph, NULL, &rect);
 
-          gi->geometry.width = ink_rect.width;
+          gi->geometry.width = rect.width;
         }
     }
 

gtk/ui/gtkfontchooserdialog.ui

@@ -2,8 +2,8 @@
 <interface domain="gtk40">
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Font</property>
-    <property name="default-width" translatable="yes">400</property>
-    <property name="default-height" translatable="yes">500</property>
+    <property name="default-width">400</property>
+    <property name="default-height">500</property>
     <style>
       <class name="fontchooser"/>
     </style>

meson.build

@@ -1,5 +1,5 @@
 project('gtk', 'c',
-        version: '4.17.0',
+        version: '4.17.1',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1',

testsuite/gsk/nodeparser/text.ref.node

@@ -1,6 +1,6 @@
 text {
   color: rgb(50,50,50);
   font: "Cantarell 14px";
-  glyphs: "N", 430 4.2002, 406 6.10352, 417 7, 772 4, 783 5, 783 5, 793 6 0 0 same-cluster;
+  glyphs: "Ntp", 417 7, 772 4, 783 5, 783 5, 793 6 0 0 same-cluster;
   offset: 0 32.0186;
 }

tools/gtk-builder-tool.c

@@ -46,7 +46,7 @@ usage (void)
              "  render       Take a screenshot of the file\n"
              "  screenshot   Take a screenshot of the file\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-image-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  relabel      Change the color state of the image without conversion\n"
              "  show         Show the image\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-path-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  render       Render the path as an image\n"
              "  info         Print information about the path\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput

tools/gtk-rendernode-tool.c

@@ -45,7 +45,7 @@ usage (void)
              "  show         Show the node\n"
              "  render       Take a screenshot of the node\n"
              "\n"));
-  exit (1);
+  exit (0);
 }
 
 static GLogWriterOutput