From 8aeb5d6f53375b79afaa248977f3e1c5d275b32f Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Tue, 31 Mar 2026 16:57:51 -0300 Subject: [PATCH] app, libgimpwidgets: More strcpy_s on Windows --- app/core/gimp-utils.c | 4 ++++ app/widgets/gimpdeviceinfo.c | 4 ++++ libgimpwidgets/gimpsizeentry.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index 9f6d40e0b8..17acc4c574 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -428,7 +428,11 @@ unescape_gstring (GString *string) { gchar buf[8]; char_str (l, buf); +#ifndef _UCRT strcpy (to, buf); +#else + strcpy_s (to, 8, buf); +#endif to += strlen (buf) - 1; from = end; } diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index e19c47548f..ba71dfcb99 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -795,7 +795,11 @@ gimp_device_info_pad_action_map_foreach (GimpPadActions *pad_actions, label = g_strdup (gimp_action_get_label (action)); accel_pos = g_utf8_strchr (label, -1, '_'); if (accel_pos) +#ifndef _UCRT strcpy (accel_pos, accel_pos + 1); +#else + strcpy_s (accel_pos, strlen (accel_pos), accel_pos + 1); +#endif gtk_pad_controller_set_action (controller, /* Action type enums are binary compatible */ diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index 58d21b920b..1fece92e3f 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -399,7 +399,11 @@ gimp_size_entry_new (gint number_of_fields, gchar *p; while ((p = strstr (short_format, "%n"))) +#ifndef _UCRT strcpy (p, "%a"); +#else + strcpy_s (p, strlen (p) + 1, "%a"); +#endif g_object_set (store, "short-format", short_format,