From 149de7162493055b24f2b5643ec11d45b76a4826 Mon Sep 17 00:00:00 2001 From: Alan McGovern Date: Fri, 23 Nov 2012 15:38:34 -0500 Subject: Fix broken function pointer declarations on windows Both flashing a window and setting the window opacity were using incorrect declarations for function pointers. They were missing the WINAPI annotation as defined in windows.h. As a result, the stack could be corrupted when these functions were invoked. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=689235 (cherry picked from commit 5637ef1f97ee46666c97707ed7f6bae459007163) --- gdk/win32/gdkwindow-win32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gdk/win32') diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 92b88392f9..5d1b1535e9 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -27,6 +27,7 @@ #include "config.h" #include +#include #include "gdk.h" #include "gdkwindowimpl.h" @@ -1533,7 +1534,7 @@ gdk_win32_window_set_urgency_hint (GdkWindow *window, gboolean urgent) { FLASHWINFO flashwinfo; - typedef BOOL (*PFN_FlashWindowEx) (FLASHWINFO*); + typedef BOOL (WINAPI *PFN_FlashWindowEx) (FLASHWINFO*); PFN_FlashWindowEx flashWindowEx = NULL; g_return_if_fail (GDK_IS_WINDOW (window)); @@ -3264,7 +3265,7 @@ gdk_win32_window_set_opacity (GdkWindow *window, gdouble opacity) { LONG exstyle; - typedef BOOL (*PFN_SetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD); + typedef BOOL (WINAPI *PFN_SetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD); PFN_SetLayeredWindowAttributes setLayeredWindowAttributes = NULL; g_return_if_fail (GDK_IS_WINDOW (window)); -- cgit v1.2.1