Maarten Lankhorst : winex11.drv/explorer: Add CDECL to exported functions.

Alexandre Julliard julliard at winehq.org
Wed Dec 17 09:39:49 CST 2008


Module: wine
Branch: master
Commit: d6bc9fc9f3ed14b3b023fc5c9dff72f8baf27fa9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d6bc9fc9f3ed14b3b023fc5c9dff72f8baf27fa9

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Tue Dec 16 14:59:00 2008 +0100

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 c8b202c..d6b2888 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 17d3b07..ddeb223 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 a74c621..480d245 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 37f3551..9be95bb 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




More information about the wine-cvs mailing list