From 6ae308260330bc2a775b145c882052bbf1f69ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Thu, 14 Mar 2019 09:18:09 +0000 Subject: [PATCH] Fix UAC manifest RC file CREATEPROCESS_MANIFEST_RESOURCE_ID is a macro defined in winbase.h, so we need an include to resolve that macro to its value, 1. Without that it stays as a literal CREATEPROCESS_MANIFEST_RESOURCE_ID, and ends up in the .exe file as-is, and Windows can't find it by that name, resulting in UAC manifest not working and gtk-update-icon-cache bringing up UAC prompt. --- gdk/win32/gdkevents-win32.c | 6 ++++++ gtk/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index ac91fa64cb..6b373e8d84 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2781,11 +2781,17 @@ gdk_event_translate (MSG *msg, event->scroll.window = window; if (msg->message == WM_MOUSEWHEEL) + { event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ? GDK_SCROLL_UP : GDK_SCROLL_DOWN; + event->scroll.delta_y = (gdouble) GET_WHEEL_DELTA_WPARAM (msg->wParam) / 120.0; + } else if (msg->message == WM_MOUSEHWHEEL) + { event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ? GDK_SCROLL_RIGHT : GDK_SCROLL_LEFT; + event->scroll.delta_x = (gdouble) GET_WHEEL_DELTA_WPARAM (msg->wParam) / 120.0; + } event->scroll.time = _gdk_win32_get_next_tick (msg->time); event->scroll.x = (gint16) point.x; event->scroll.y = (gint16) point.y; diff --git a/gtk/Makefile.am b/gtk/Makefile.am index f53e01c2de..61389f1cfb 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1125,7 +1125,7 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST): echo '' ) >$@ $(GTK_UPDATE_ICON_CACHE_RC): - (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ + (echo -e '#include \nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) $(WINDRES) --input $< --output $@ --output-format=coff