diff options
| author | Alan McGovern <alan@xamarin.com> | 2012-11-23 15:38:34 -0500 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2012-11-29 15:07:42 +0100 |
| commit | 149de7162493055b24f2b5643ec11d45b76a4826 (patch) | |
| tree | 708ef5a00909669f9f4162d682bea7d9e684142f /gdk/win32 | |
| parent | 709f12b9ac827f64e1c61729e99d0c87157c7044 (diff) | |
| download | gtk+-149de7162493055b24f2b5643ec11d45b76a4826.tar.gz | |
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)
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 <stdlib.h> +#include <windows.h> #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)); |