From d6bc9fc9f3ed14b3b023fc5c9dff72f8baf27fa9 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 16 Dec 2008 14:59:00 +0100 Subject: [PATCH] winex11.drv/explorer: Add CDECL to exported functions. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/systray.c | 2 +- programs/explorer/desktop.c | 2 +- programs/explorer/systray.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c8b202c822b..d6b2888b85a 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -128,7 +128,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) * * Create the X11 desktop window for the desktop mode. */ -Window X11DRV_create_desktop( UINT width, UINT height ) +Window CDECL X11DRV_create_desktop( UINT width, UINT height ) { XSetWindowAttributes win_attr; Window win; diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 17d3b07de42..ddeb2234644 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -415,7 +415,7 @@ static BOOL delete_icon( struct tray_icon *icon ) * * Driver-side implementation of Shell_NotifyIcon. */ -int wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) +int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) { BOOL ret = FALSE; struct tray_icon *icon; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a74c621bfcb..480d2450c54 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -105,7 +105,7 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); HDESK desktop; unsigned long xwin = 0; - unsigned long (*create_desktop_func)(unsigned int, unsigned int); + unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 37f3551937e..9be95bb8d2c 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') -static int (*wine_notify_icon)(DWORD,NOTIFYICONDATAW *); +static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *); /* an individual systray icon, unpacked from the NOTIFYICONDATA and always in unicode */ struct icon