Skip to content

W
wine-cw
Commit f6524f7a authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

win32u: Don't use CDECL for user driver functions.

They are no longer used from PE code. Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1d0fbcc9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 253 additions and 253 deletions
dlls/wineandroid.drv/android.h
View file @ f6524f7a
...@@ -80,29 +80,29 @@ extern int ioctl_set_cursor( int id, int width, int height, ...@@ -80,29 +80,29 @@ extern int ioctl_set_cursor( int id, int width, int height,
* USER driver * USER driver
*/ */
extern INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN; extern INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN;
extern UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) DECLSPEC_HIDDEN; extern UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) DECLSPEC_HIDDEN;
extern SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) DECLSPEC_HIDDEN; extern SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN; extern void ANDROID_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN;
extern BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL ANDROID_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void ANDROID_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, extern DWORD ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN; extern void ANDROID_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, extern void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha,
DWORD flags ) DECLSPEC_HIDDEN; DWORD flags ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) DECLSPEC_HIDDEN; extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) DECLSPEC_HIDDEN; extern void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN; extern void ANDROID_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DECLSPEC_HIDDEN; extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DECLSPEC_HIDDEN;
extern UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN; extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN;
extern BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, extern BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect ) DECLSPEC_HIDDEN; const RECT *window_rect ) DECLSPEC_HIDDEN;
extern LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN;
extern BOOL CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, extern BOOL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN; RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN;
extern void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface ) DECLSPEC_HIDDEN; struct window_surface *surface ) DECLSPEC_HIDDEN;
......
dlls/wineandroid.drv/init.c
View file @ f6524f7a
...@@ -191,7 +191,7 @@ static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev ) ...@@ -191,7 +191,7 @@ static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev )
/*********************************************************************** /***********************************************************************
* ANDROID_ChangeDisplaySettingsEx * ANDROID_ChangeDisplaySettingsEx
*/ */
LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, LONG ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
HWND hwnd, DWORD flags, LPVOID lpvoid ) HWND hwnd, DWORD flags, LPVOID lpvoid )
{ {
FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid ); FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid );
...@@ -202,7 +202,7 @@ LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, ...@@ -202,7 +202,7 @@ LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
/*********************************************************************** /***********************************************************************
* ANDROID_UpdateDisplayDevices * ANDROID_UpdateDisplayDevices
*/ */
void CDECL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, void ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manager,
BOOL force, void *param ) BOOL force, void *param )
{ {
if (force || force_display_devices_refresh) if (force || force_display_devices_refresh)
...@@ -222,7 +222,7 @@ void CDECL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device ...@@ -222,7 +222,7 @@ void CDECL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device
/*********************************************************************** /***********************************************************************
* ANDROID_EnumDisplaySettingsEx * ANDROID_EnumDisplaySettingsEx
*/ */
BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags )
{ {
static const WCHAR dev_name[CCHDEVICENAME] = static const WCHAR dev_name[CCHDEVICENAME] =
{ 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 };
...@@ -261,7 +261,7 @@ BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devm ...@@ -261,7 +261,7 @@ BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devm
/********************************************************************** /**********************************************************************
* ANDROID_wine_get_wgl_driver * ANDROID_wine_get_wgl_driver
*/ */
static struct opengl_funcs * CDECL ANDROID_wine_get_wgl_driver( UINT version ) static struct opengl_funcs *ANDROID_wine_get_wgl_driver( UINT version )
{ {
return get_wgl_driver( version ); return get_wgl_driver( version );
} }
......
dlls/wineandroid.drv/keyboard.c
View file @ f6524f7a
...@@ -753,7 +753,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k ...@@ -753,7 +753,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k
/*********************************************************************** /***********************************************************************
* ANDROID_GetKeyNameText * ANDROID_GetKeyNameText
*/ */
INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size )
{ {
int scancode, vkey, len; int scancode, vkey, len;
const char *name; const char *name;
...@@ -813,7 +813,7 @@ INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) ...@@ -813,7 +813,7 @@ INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size )
/*********************************************************************** /***********************************************************************
* ANDROID_MapVirtualKeyEx * ANDROID_MapVirtualKeyEx
*/ */
UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl )
{ {
UINT ret = 0; UINT ret = 0;
const char *s; const char *s;
...@@ -881,7 +881,7 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) ...@@ -881,7 +881,7 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl )
/*********************************************************************** /***********************************************************************
* ANDROID_VkKeyScanEx * ANDROID_VkKeyScanEx
*/ */
SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl )
{ {
SHORT ret = -1; SHORT ret = -1;
if (ch < ARRAY_SIZE( char_vkey_map )) ret = char_vkey_map[ch]; if (ch < ARRAY_SIZE( char_vkey_map )) ret = char_vkey_map[ch];
......
dlls/wineandroid.drv/window.c
View file @ f6524f7a
...@@ -1201,7 +1201,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, ...@@ -1201,7 +1201,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp,
/*********************************************************************** /***********************************************************************
* ANDROID_MsgWaitForMultipleObjectsEx * ANDROID_MsgWaitForMultipleObjectsEx
*/ */
DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
DWORD timeout, DWORD mask, DWORD flags ) DWORD timeout, DWORD mask, DWORD flags )
{ {
if (GetCurrentThreadId() == desktop_tid) if (GetCurrentThreadId() == desktop_tid)
...@@ -1217,7 +1217,7 @@ DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *hand ...@@ -1217,7 +1217,7 @@ DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *hand
/********************************************************************** /**********************************************************************
* ANDROID_CreateWindow * ANDROID_CreateWindow
*/ */
BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) BOOL ANDROID_CreateWindow( HWND hwnd )
{ {
TRACE( "%p\n", hwnd ); TRACE( "%p\n", hwnd );
...@@ -1237,7 +1237,7 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) ...@@ -1237,7 +1237,7 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd )
/*********************************************************************** /***********************************************************************
* ANDROID_DestroyWindow * ANDROID_DestroyWindow
*/ */
void CDECL ANDROID_DestroyWindow( HWND hwnd ) void ANDROID_DestroyWindow( HWND hwnd )
{ {
struct android_win_data *data; struct android_win_data *data;
...@@ -1287,7 +1287,7 @@ static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rec ...@@ -1287,7 +1287,7 @@ static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rec
/*********************************************************************** /***********************************************************************
* ANDROID_WindowPosChanging * ANDROID_WindowPosChanging
*/ */
BOOL CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect,
struct window_surface **surface ) struct window_surface **surface )
{ {
...@@ -1342,7 +1342,7 @@ done: ...@@ -1342,7 +1342,7 @@ done:
/*********************************************************************** /***********************************************************************
* ANDROID_WindowPosChanged * ANDROID_WindowPosChanged
*/ */
void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface ) struct window_surface *surface )
...@@ -1380,7 +1380,7 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag ...@@ -1380,7 +1380,7 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
/*********************************************************************** /***********************************************************************
* ANDROID_ShowWindow * ANDROID_ShowWindow
*/ */
UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
{ {
if (!IsIconic( hwnd )) return swp; if (!IsIconic( hwnd )) return swp;
/* always hide icons off-screen */ /* always hide icons off-screen */
...@@ -1396,7 +1396,7 @@ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) ...@@ -1396,7 +1396,7 @@ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
/***************************************************************** /*****************************************************************
* ANDROID_SetParent * ANDROID_SetParent
*/ */
void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent )
{ {
struct android_win_data *data; struct android_win_data *data;
...@@ -1414,7 +1414,7 @@ void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) ...@@ -1414,7 +1414,7 @@ void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent )
/*********************************************************************** /***********************************************************************
* ANDROID_SetCapture * ANDROID_SetCapture
*/ */
void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags ) void ANDROID_SetCapture( HWND hwnd, UINT flags )
{ {
if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return;
ioctl_set_capture( hwnd ); ioctl_set_capture( hwnd );
...@@ -1424,7 +1424,7 @@ void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags ) ...@@ -1424,7 +1424,7 @@ void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags )
/*********************************************************************** /***********************************************************************
* ANDROID_SetCursor * ANDROID_SetCursor
*/ */
void CDECL ANDROID_SetCursor( HCURSOR handle ) void ANDROID_SetCursor( HCURSOR handle )
{ {
static HCURSOR last_cursor; static HCURSOR last_cursor;
static DWORD last_cursor_change; static DWORD last_cursor_change;
...@@ -1469,7 +1469,7 @@ void CDECL ANDROID_SetCursor( HCURSOR handle ) ...@@ -1469,7 +1469,7 @@ void CDECL ANDROID_SetCursor( HCURSOR handle )
/*********************************************************************** /***********************************************************************
* ANDROID_SetWindowStyle * ANDROID_SetWindowStyle
*/ */
void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style )
{ {
struct android_win_data *data; struct android_win_data *data;
DWORD changed = style->styleNew ^ style->styleOld; DWORD changed = style->styleNew ^ style->styleOld;
...@@ -1493,7 +1493,7 @@ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) ...@@ -1493,7 +1493,7 @@ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style )
/*********************************************************************** /***********************************************************************
* ANDROID_SetWindowRgn * ANDROID_SetWindowRgn
*/ */
void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
{ {
struct android_win_data *data; struct android_win_data *data;
...@@ -1509,7 +1509,7 @@ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) ...@@ -1509,7 +1509,7 @@ void CDECL ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
/*********************************************************************** /***********************************************************************
* ANDROID_SetLayeredWindowAttributes * ANDROID_SetLayeredWindowAttributes
*/ */
void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags )
{ {
struct android_win_data *data; struct android_win_data *data;
...@@ -1527,7 +1527,7 @@ void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alp ...@@ -1527,7 +1527,7 @@ void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alp
/***************************************************************************** /*****************************************************************************
* ANDROID_UpdateLayeredWindow * ANDROID_UpdateLayeredWindow
*/ */
BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, BOOL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect ) const RECT *window_rect )
{ {
struct window_surface *surface; struct window_surface *surface;
...@@ -1615,7 +1615,7 @@ done: ...@@ -1615,7 +1615,7 @@ done:
/********************************************************************** /**********************************************************************
* ANDROID_WindowMessage * ANDROID_WindowMessage
*/ */
LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
{ {
struct android_win_data *data; struct android_win_data *data;
......
dlls/winemac.drv/clipboard.c
View file @ f6524f7a
...@@ -2053,7 +2053,7 @@ done: ...@@ -2053,7 +2053,7 @@ done:
/************************************************************************** /**************************************************************************
* macdrv_UpdateClipboard * macdrv_UpdateClipboard
*/ */
void CDECL macdrv_UpdateClipboard(void) void macdrv_UpdateClipboard(void)
{ {
static ULONG last_update; static ULONG last_update;
ULONG now, end; ULONG now, end;
......
dlls/winemac.drv/display.c
View file @ f6524f7a
...@@ -44,7 +44,7 @@ struct display_mode_descriptor ...@@ -44,7 +44,7 @@ struct display_mode_descriptor
}; };
BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags);
static const char initial_mode_key[] = "Initial Display Mode"; static const char initial_mode_key[] = "Initial Display Mode";
static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0};
...@@ -827,7 +827,7 @@ static BOOL is_detached_mode(const DEVMODEW *mode) ...@@ -827,7 +827,7 @@ static BOOL is_detached_mode(const DEVMODEW *mode)
* ChangeDisplaySettingsEx (MACDRV.@) * ChangeDisplaySettingsEx (MACDRV.@)
* *
*/ */
LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode,
HWND hwnd, DWORD flags, LPVOID lpvoid) HWND hwnd, DWORD flags, LPVOID lpvoid)
{ {
WCHAR primary_adapter[CCHDEVICENAME]; WCHAR primary_adapter[CCHDEVICENAME];
...@@ -1031,8 +1031,7 @@ better: ...@@ -1031,8 +1031,7 @@ better:
* EnumDisplaySettingsEx (MACDRV.@) * EnumDisplaySettingsEx (MACDRV.@)
* *
*/ */
BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode, DWORD flags)
LPDEVMODEW devmode, DWORD flags)
{ {
static const WCHAR dev_name[CCHDEVICENAME] = static const WCHAR dev_name[CCHDEVICENAME] =
{ 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 }; { 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 };
...@@ -1233,7 +1232,7 @@ failed: ...@@ -1233,7 +1232,7 @@ failed:
/*********************************************************************** /***********************************************************************
* GetDeviceGammaRamp (MACDRV.@) * GetDeviceGammaRamp (MACDRV.@)
*/ */
BOOL CDECL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
DDGAMMARAMP *r = ramp; DDGAMMARAMP *r = ramp;
...@@ -1317,7 +1316,7 @@ done: ...@@ -1317,7 +1316,7 @@ done:
/*********************************************************************** /***********************************************************************
* SetDeviceGammaRamp (MACDRV.@) * SetDeviceGammaRamp (MACDRV.@)
*/ */
BOOL CDECL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp)
{ {
DDGAMMARAMP *r = ramp; DDGAMMARAMP *r = ramp;
struct macdrv_display *displays; struct macdrv_display *displays;
...@@ -1444,7 +1443,7 @@ void macdrv_displays_changed(const macdrv_event *event) ...@@ -1444,7 +1443,7 @@ void macdrv_displays_changed(const macdrv_event *event)
static BOOL force_display_devices_refresh; static BOOL force_display_devices_refresh;
void CDECL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager,
BOOL force, void *param ) BOOL force, void *param )
{ {
struct macdrv_adapter *adapters, *adapter; struct macdrv_adapter *adapters, *adapter;
......
dlls/winemac.drv/event.c
View file @ f6524f7a
...@@ -339,7 +339,7 @@ static int process_events(macdrv_event_queue queue, macdrv_event_mask mask) ...@@ -339,7 +339,7 @@ static int process_events(macdrv_event_queue queue, macdrv_event_mask mask)
/*********************************************************************** /***********************************************************************
* MsgWaitForMultipleObjectsEx (MACDRV.@) * MsgWaitForMultipleObjectsEx (MACDRV.@)
*/ */
DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, DWORD macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles,
DWORD timeout, DWORD mask, DWORD flags) DWORD timeout, DWORD mask, DWORD flags)
{ {
DWORD ret; DWORD ret;
......
dlls/winemac.drv/keyboard.c
View file @ f6524f7a
...@@ -1161,7 +1161,7 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke ...@@ -1161,7 +1161,7 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke
/*********************************************************************** /***********************************************************************
* ActivateKeyboardLayout (MACDRV.@) * ActivateKeyboardLayout (MACDRV.@)
*/ */
BOOL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
...@@ -1204,7 +1204,7 @@ BOOL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) ...@@ -1204,7 +1204,7 @@ BOOL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags)
/*********************************************************************** /***********************************************************************
* Beep (MACDRV.@) * Beep (MACDRV.@)
*/ */
void CDECL macdrv_Beep(void) void macdrv_Beep(void)
{ {
macdrv_beep(); macdrv_beep();
} }
...@@ -1213,7 +1213,7 @@ void CDECL macdrv_Beep(void) ...@@ -1213,7 +1213,7 @@ void CDECL macdrv_Beep(void)
/*********************************************************************** /***********************************************************************
* GetKeyNameText (MACDRV.@) * GetKeyNameText (MACDRV.@)
*/ */
INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size)
{ {
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
int scan, keyc; int scan, keyc;
...@@ -1299,7 +1299,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) ...@@ -1299,7 +1299,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size)
/*********************************************************************** /***********************************************************************
* GetKeyboardLayoutList (MACDRV.@) * GetKeyboardLayoutList (MACDRV.@)
*/ */
UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) UINT macdrv_GetKeyboardLayoutList(INT size, HKL *list)
{ {
int count = 0; int count = 0;
struct layout *layout; struct layout *layout;
...@@ -1331,7 +1331,7 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) ...@@ -1331,7 +1331,7 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list)
/*********************************************************************** /***********************************************************************
* MapVirtualKeyEx (MACDRV.@) * MapVirtualKeyEx (MACDRV.@)
*/ */
UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) UINT macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
{ {
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
UINT ret = 0; UINT ret = 0;
...@@ -1460,7 +1460,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) ...@@ -1460,7 +1460,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
/*********************************************************************** /***********************************************************************
* RegisterHotKey (MACDRV.@) * RegisterHotKey (MACDRV.@)
*/ */
BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) BOOL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey)
{ {
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
unsigned int keyc, modifiers = 0; unsigned int keyc, modifiers = 0;
...@@ -1519,7 +1519,7 @@ BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) ...@@ -1519,7 +1519,7 @@ BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey)
* virtual key to form a single character. * virtual key to form a single character.
* *
*/ */
INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) LPWSTR bufW, int bufW_size, UINT flags, HKL hkl)
{ {
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
...@@ -1704,7 +1704,7 @@ done: ...@@ -1704,7 +1704,7 @@ done:
/*********************************************************************** /***********************************************************************
* UnregisterHotKey (MACDRV.@) * UnregisterHotKey (MACDRV.@)
*/ */
void CDECL macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey) void macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey)
{ {
struct macdrv_thread_data *thread_data = macdrv_thread_data(); struct macdrv_thread_data *thread_data = macdrv_thread_data();
...@@ -1720,7 +1720,7 @@ void CDECL macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey) ...@@ -1720,7 +1720,7 @@ void CDECL macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey)
* *
* Note: Windows ignores HKL parameter and uses current active layout instead * Note: Windows ignores HKL parameter and uses current active layout instead
*/ */
SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) SHORT macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl)
{ {
struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); struct macdrv_thread_data *thread_data = macdrv_init_thread_data();
SHORT ret = -1; SHORT ret = -1;
......
dlls/winemac.drv/macdrv.h
View file @ f6524f7a
...@@ -124,58 +124,58 @@ static inline struct macdrv_thread_data *macdrv_thread_data(void) ...@@ -124,58 +124,58 @@ static inline struct macdrv_thread_data *macdrv_thread_data(void)
} }
extern BOOL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN; extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN;
extern void CDECL macdrv_Beep(void) DECLSPEC_HIDDEN; extern void macdrv_Beep(void) DECLSPEC_HIDDEN;
extern LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, extern LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode,
HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, extern BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode,
LPDEVMODEW devmode, DWORD flags) DECLSPEC_HIDDEN; LPDEVMODEW devmode, DWORD flags) DECLSPEC_HIDDEN;
extern void CDECL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, extern void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager,
BOOL force, void *param ) DECLSPEC_HIDDEN; BOOL force, void *param ) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN; extern BOOL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateDesktopWindow(HWND hwnd) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_CreateWindow(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL macdrv_CreateWindow(HWND hwnd) DECLSPEC_HIDDEN;
extern void CDECL macdrv_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetFocus(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_SetFocus(HWND hwnd) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, extern void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha,
DWORD flags) DECLSPEC_HIDDEN; DWORD flags) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) DECLSPEC_HIDDEN; extern void macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) DECLSPEC_HIDDEN; extern void macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) DECLSPEC_HIDDEN; extern void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) DECLSPEC_HIDDEN; extern void macdrv_SetWindowText(HWND hwnd, LPCWSTR text) DECLSPEC_HIDDEN;
extern UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) DECLSPEC_HIDDEN; extern UINT macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) DECLSPEC_HIDDEN;
extern LRESULT CDECL macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; extern LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, extern BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect) DECLSPEC_HIDDEN; const RECT *window_rect) DECLSPEC_HIDDEN;
extern LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, extern BOOL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
RECT *visible_rect, struct window_surface **surface) DECLSPEC_HIDDEN; RECT *visible_rect, struct window_surface **surface) DECLSPEC_HIDDEN;
extern void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, extern void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface) DECLSPEC_HIDDEN; struct window_surface *surface) DECLSPEC_HIDDEN;
extern void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) DECLSPEC_HIDDEN; extern void macdrv_DestroyCursorIcon(HCURSOR cursor) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN; extern BOOL macdrv_ClipCursor(LPCRECT clip) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) DECLSPEC_HIDDEN; extern BOOL macdrv_GetCursorPos(LPPOINT pos) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetCapture(HWND hwnd, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_SetCapture(HWND hwnd, UINT flags) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetCursor(HCURSOR cursor) DECLSPEC_HIDDEN; extern void macdrv_SetCursor(HCURSOR cursor) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_SetCursorPos(INT x, INT y) DECLSPEC_HIDDEN; extern BOOL macdrv_SetCursorPos(INT x, INT y) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) DECLSPEC_HIDDEN; extern BOOL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) DECLSPEC_HIDDEN;
extern void CDECL macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey) DECLSPEC_HIDDEN; extern void macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey) DECLSPEC_HIDDEN;
extern SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) DECLSPEC_HIDDEN; extern SHORT macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) DECLSPEC_HIDDEN;
extern UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) DECLSPEC_HIDDEN; extern UINT macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) DECLSPEC_HIDDEN;
extern INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, extern INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) DECLSPEC_HIDDEN; LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) DECLSPEC_HIDDEN;
extern UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) DECLSPEC_HIDDEN; extern UINT macdrv_GetKeyboardLayoutList(INT size, HKL *list) DECLSPEC_HIDDEN;
extern INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) DECLSPEC_HIDDEN; extern INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_param, extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_param,
UINT flags) DECLSPEC_HIDDEN; UINT flags) DECLSPEC_HIDDEN;
extern DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, extern DWORD macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles,
DWORD timeout, DWORD mask, DWORD flags) DECLSPEC_HIDDEN; DWORD timeout, DWORD mask, DWORD flags) DECLSPEC_HIDDEN;
extern void CDECL macdrv_ThreadDetach(void) DECLSPEC_HIDDEN; extern void macdrv_ThreadDetach(void) DECLSPEC_HIDDEN;
/* macdrv private window data */ /* macdrv private window data */
...@@ -240,7 +240,7 @@ extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_H ...@@ -240,7 +240,7 @@ extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_H
extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN;
extern void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN;
extern void macdrv_release_capture(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_release_capture(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN;
extern void CDECL macdrv_SetCapture(HWND hwnd, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_SetCapture(HWND hwnd, UINT flags) DECLSPEC_HIDDEN;
extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN;
extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN;
...@@ -250,7 +250,7 @@ extern HKL macdrv_get_hkl_from_source(TISInputSourceRef input_source) DECLSPEC_H ...@@ -250,7 +250,7 @@ extern HKL macdrv_get_hkl_from_source(TISInputSourceRef input_source) DECLSPEC_H
extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN;
extern void CDECL macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; extern void macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN;
extern void macdrv_init_clipboard(void) DECLSPEC_HIDDEN; extern void macdrv_init_clipboard(void) DECLSPEC_HIDDEN;
extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN;
extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN;
...@@ -263,8 +263,8 @@ extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN; ...@@ -263,8 +263,8 @@ extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN;
extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN;
extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN;
extern struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN;
extern const struct vulkan_funcs * CDECL macdrv_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; extern const struct vulkan_funcs *macdrv_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN;
extern void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, const RECT* old_client_rect) DECLSPEC_HIDDEN; extern void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, const RECT* old_client_rect) DECLSPEC_HIDDEN;
extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor, extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor,
......
dlls/winemac.drv/macdrv_main.c
View file @ f6524f7a
...@@ -313,7 +313,7 @@ static BOOL process_attach(void) ...@@ -313,7 +313,7 @@ static BOOL process_attach(void)
/*********************************************************************** /***********************************************************************
* ThreadDetach (MACDRV.@) * ThreadDetach (MACDRV.@)
*/ */
void CDECL macdrv_ThreadDetach(void) void macdrv_ThreadDetach(void)
{ {
struct macdrv_thread_data *data = macdrv_thread_data(); struct macdrv_thread_data *data = macdrv_thread_data();
...@@ -415,7 +415,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) ...@@ -415,7 +415,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
/*********************************************************************** /***********************************************************************
* SystemParametersInfo (MACDRV.@) * SystemParametersInfo (MACDRV.@)
*/ */
BOOL CDECL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags )
{ {
switch (action) switch (action)
{ {
......
dlls/winemac.drv/mouse.c
View file @ f6524f7a
...@@ -643,7 +643,7 @@ cleanup: ...@@ -643,7 +643,7 @@ cleanup:
/*********************************************************************** /***********************************************************************
* DestroyCursorIcon (MACDRV.@) * DestroyCursorIcon (MACDRV.@)
*/ */
void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) void macdrv_DestroyCursorIcon(HCURSOR cursor)
{ {
TRACE("cursor %p\n", cursor); TRACE("cursor %p\n", cursor);
...@@ -659,7 +659,7 @@ void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor) ...@@ -659,7 +659,7 @@ void CDECL macdrv_DestroyCursorIcon(HCURSOR cursor)
* *
* Set the cursor clipping rectangle. * Set the cursor clipping rectangle.
*/ */
BOOL CDECL macdrv_ClipCursor(LPCRECT clip) BOOL macdrv_ClipCursor(LPCRECT clip)
{ {
CGRect rect; CGRect rect;
...@@ -683,7 +683,7 @@ BOOL CDECL macdrv_ClipCursor(LPCRECT clip) ...@@ -683,7 +683,7 @@ BOOL CDECL macdrv_ClipCursor(LPCRECT clip)
/*********************************************************************** /***********************************************************************
* GetCursorPos (MACDRV.@) * GetCursorPos (MACDRV.@)
*/ */
BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) BOOL macdrv_GetCursorPos(LPPOINT pos)
{ {
CGPoint pt; CGPoint pt;
BOOL ret; BOOL ret;
...@@ -702,7 +702,7 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) ...@@ -702,7 +702,7 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos)
/*********************************************************************** /***********************************************************************
* SetCapture (MACDRV.@) * SetCapture (MACDRV.@)
*/ */
void CDECL macdrv_SetCapture(HWND hwnd, UINT flags) void macdrv_SetCapture(HWND hwnd, UINT flags)
{ {
struct macdrv_thread_data *thread_data = macdrv_thread_data(); struct macdrv_thread_data *thread_data = macdrv_thread_data();
HWND top = GetAncestor(hwnd, GA_ROOT); HWND top = GetAncestor(hwnd, GA_ROOT);
...@@ -720,7 +720,7 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) ...@@ -720,7 +720,7 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos)
/*********************************************************************** /***********************************************************************
* SetCursor (MACDRV.@) * SetCursor (MACDRV.@)
*/ */
void CDECL macdrv_SetCursor(HCURSOR cursor) void macdrv_SetCursor(HCURSOR cursor)
{ {
CFStringRef cursor_name = NULL; CFStringRef cursor_name = NULL;
CFArrayRef cursor_frames = NULL; CFArrayRef cursor_frames = NULL;
...@@ -813,7 +813,7 @@ done: ...@@ -813,7 +813,7 @@ done:
/*********************************************************************** /***********************************************************************
* SetCursorPos (MACDRV.@) * SetCursorPos (MACDRV.@)
*/ */
BOOL CDECL macdrv_SetCursorPos(INT x, INT y) BOOL macdrv_SetCursorPos(INT x, INT y)
{ {
BOOL ret = macdrv_set_cursor_position(CGPointMake(x, y)); BOOL ret = macdrv_set_cursor_position(CGPointMake(x, y));
if (ret) if (ret)
......
dlls/winemac.drv/opengl.c
View file @ f6524f7a
...@@ -4632,7 +4632,7 @@ static struct opengl_funcs opengl_funcs = ...@@ -4632,7 +4632,7 @@ static struct opengl_funcs opengl_funcs =
/********************************************************************** /**********************************************************************
* macdrv_wine_get_wgl_driver * macdrv_wine_get_wgl_driver
*/ */
struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(UINT version) struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version)
{ {
static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT; static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT;
......
dlls/winemac.drv/vulkan.c
View file @ f6524f7a
...@@ -650,7 +650,7 @@ static const struct vulkan_funcs *get_vulkan_driver(UINT version) ...@@ -650,7 +650,7 @@ static const struct vulkan_funcs *get_vulkan_driver(UINT version)
#endif /* SONAME_LIBMOLTENVK */ #endif /* SONAME_LIBMOLTENVK */
const struct vulkan_funcs * CDECL macdrv_wine_get_vulkan_driver(UINT version) const struct vulkan_funcs *macdrv_wine_get_vulkan_driver(UINT version)
{ {
return get_vulkan_driver( version ); return get_vulkan_driver( version );
} }
dlls/winemac.drv/window.c
View file @ f6524f7a
...@@ -1524,7 +1524,7 @@ static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, ...@@ -1524,7 +1524,7 @@ static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none,
/********************************************************************** /**********************************************************************
* CreateDesktopWindow (MACDRV.@) * CreateDesktopWindow (MACDRV.@)
*/ */
BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) BOOL macdrv_CreateDesktopWindow(HWND hwnd)
{ {
unsigned int width, height; unsigned int width, height;
...@@ -1594,7 +1594,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, ...@@ -1594,7 +1594,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp,
/********************************************************************** /**********************************************************************
* CreateWindow (MACDRV.@) * CreateWindow (MACDRV.@)
*/ */
BOOL CDECL macdrv_CreateWindow(HWND hwnd) BOOL macdrv_CreateWindow(HWND hwnd)
{ {
if (hwnd == GetDesktopWindow()) if (hwnd == GetDesktopWindow())
{ {
...@@ -1610,7 +1610,7 @@ BOOL CDECL macdrv_CreateWindow(HWND hwnd) ...@@ -1610,7 +1610,7 @@ BOOL CDECL macdrv_CreateWindow(HWND hwnd)
/*********************************************************************** /***********************************************************************
* DestroyWindow (MACDRV.@) * DestroyWindow (MACDRV.@)
*/ */
void CDECL macdrv_DestroyWindow(HWND hwnd) void macdrv_DestroyWindow(HWND hwnd)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
...@@ -1636,7 +1636,7 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) ...@@ -1636,7 +1636,7 @@ void CDECL macdrv_DestroyWindow(HWND hwnd)
* *
* Set the Mac focus. * Set the Mac focus.
*/ */
void CDECL macdrv_SetFocus(HWND hwnd) void macdrv_SetFocus(HWND hwnd)
{ {
struct macdrv_thread_data *thread_data = macdrv_thread_data(); struct macdrv_thread_data *thread_data = macdrv_thread_data();
...@@ -1653,7 +1653,7 @@ void CDECL macdrv_SetFocus(HWND hwnd) ...@@ -1653,7 +1653,7 @@ void CDECL macdrv_SetFocus(HWND hwnd)
* *
* Set transparency attributes for a layered window. * Set transparency attributes for a layered window.
*/ */
void CDECL macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWORD flags) void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWORD flags)
{ {
struct macdrv_win_data *data = get_win_data(hwnd); struct macdrv_win_data *data = get_win_data(hwnd);
...@@ -1681,7 +1681,7 @@ void CDECL macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha ...@@ -1681,7 +1681,7 @@ void CDECL macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha
/***************************************************************** /*****************************************************************
* SetParent (MACDRV.@) * SetParent (MACDRV.@)
*/ */
void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) void macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
...@@ -1715,7 +1715,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) ...@@ -1715,7 +1715,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent)
* *
* Assign specified region to window (for non-rectangular windows) * Assign specified region to window (for non-rectangular windows)
*/ */
void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) void macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
...@@ -1742,7 +1742,7 @@ void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) ...@@ -1742,7 +1742,7 @@ void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw)
* *
* Update the state of the Cocoa window to reflect a style change * Update the state of the Cocoa window to reflect a style change
*/ */
void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
...@@ -1776,7 +1776,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) ...@@ -1776,7 +1776,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style)
/***************************************************************** /*****************************************************************
* SetWindowText (MACDRV.@) * SetWindowText (MACDRV.@)
*/ */
void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) void macdrv_SetWindowText(HWND hwnd, LPCWSTR text)
{ {
macdrv_window win; macdrv_window win;
...@@ -1790,7 +1790,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) ...@@ -1790,7 +1790,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text)
/*********************************************************************** /***********************************************************************
* ShowWindow (MACDRV.@) * ShowWindow (MACDRV.@)
*/ */
UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) UINT macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp)
{ {
struct macdrv_thread_data *thread_data = macdrv_thread_data(); struct macdrv_thread_data *thread_data = macdrv_thread_data();
struct macdrv_win_data *data = get_win_data(hwnd); struct macdrv_win_data *data = get_win_data(hwnd);
...@@ -1837,7 +1837,7 @@ done: ...@@ -1837,7 +1837,7 @@ done:
* *
* Perform WM_SYSCOMMAND handling. * Perform WM_SYSCOMMAND handling.
*/ */
LRESULT CDECL macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
LRESULT ret = -1; LRESULT ret = -1;
...@@ -1872,7 +1872,7 @@ done: ...@@ -1872,7 +1872,7 @@ done:
/*********************************************************************** /***********************************************************************
* UpdateLayeredWindow (MACDRV.@) * UpdateLayeredWindow (MACDRV.@)
*/ */
BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect) const RECT *window_rect)
{ {
struct window_surface *surface; struct window_surface *surface;
...@@ -1982,7 +1982,7 @@ done: ...@@ -1982,7 +1982,7 @@ done:
/********************************************************************** /**********************************************************************
* WindowMessage (MACDRV.@) * WindowMessage (MACDRV.@)
*/ */
LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
{ {
struct macdrv_win_data *data; struct macdrv_win_data *data;
...@@ -2054,7 +2054,7 @@ static inline RECT get_surface_rect(const RECT *visible_rect) ...@@ -2054,7 +2054,7 @@ static inline RECT get_surface_rect(const RECT *visible_rect)
/*********************************************************************** /***********************************************************************
* WindowPosChanging (MACDRV.@) * WindowPosChanging (MACDRV.@)
*/ */
BOOL CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
RECT *visible_rect, struct window_surface **surface) RECT *visible_rect, struct window_surface **surface)
{ {
...@@ -2106,7 +2106,7 @@ done: ...@@ -2106,7 +2106,7 @@ done:
/*********************************************************************** /***********************************************************************
* WindowPosChanged (MACDRV.@) * WindowPosChanged (MACDRV.@)
*/ */
void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *window_rect, const RECT *client_rect,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface) struct window_surface *surface)
......
dlls/winex11.drv/clipboard.c
View file @ f6524f7a
...@@ -2074,7 +2074,7 @@ static DWORD WINAPI clipboard_thread( void *arg ) ...@@ -2074,7 +2074,7 @@ static DWORD WINAPI clipboard_thread( void *arg )
/************************************************************************** /**************************************************************************
* X11DRV_UpdateClipboard * X11DRV_UpdateClipboard
*/ */
void CDECL X11DRV_UpdateClipboard(void) void X11DRV_UpdateClipboard(void)
{ {
static ULONG last_update; static ULONG last_update;
ULONG now; ULONG now;
......
dlls/winex11.drv/display.c
View file @ f6524f7a
...@@ -241,7 +241,7 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) ...@@ -241,7 +241,7 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change)
static BOOL force_display_devices_refresh; static BOOL force_display_devices_refresh;
void CDECL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager,
BOOL force, void *param ) BOOL force, void *param )
{ {
struct x11drv_display_device_handler *handler; struct x11drv_display_device_handler *handler;
......
dlls/winex11.drv/event.c
View file @ f6524f7a
...@@ -475,7 +475,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X ...@@ -475,7 +475,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X
/*********************************************************************** /***********************************************************************
* MsgWaitForMultipleObjectsEx (X11DRV.@) * MsgWaitForMultipleObjectsEx (X11DRV.@)
*/ */
DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
DWORD timeout, DWORD mask, DWORD flags ) DWORD timeout, DWORD mask, DWORD flags )
{ {
DWORD ret; DWORD ret;
...@@ -1420,7 +1420,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) ...@@ -1420,7 +1420,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set )
* *
* Set the X focus. * Set the X focus.
*/ */
void CDECL X11DRV_SetFocus( HWND hwnd ) void X11DRV_SetFocus( HWND hwnd )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
......
dlls/winex11.drv/init.c
View file @ f6524f7a
...@@ -312,7 +312,7 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI ...@@ -312,7 +312,7 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI
/********************************************************************** /**********************************************************************
* X11DRV_wine_get_wgl_driver * X11DRV_wine_get_wgl_driver
*/ */
static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( UINT version ) static struct opengl_funcs *X11DRV_wine_get_wgl_driver( UINT version )
{ {
return get_glx_driver( version ); return get_glx_driver( version );
} }
...@@ -320,7 +320,7 @@ static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( UINT version ) ...@@ -320,7 +320,7 @@ static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( UINT version )
/********************************************************************** /**********************************************************************
* X11DRV_wine_get_vulkan_driver * X11DRV_wine_get_vulkan_driver
*/ */
static const struct vulkan_funcs * CDECL X11DRV_wine_get_vulkan_driver( UINT version ) static const struct vulkan_funcs *X11DRV_wine_get_vulkan_driver( UINT version )
{ {
return get_vulkan_driver( version ); return get_vulkan_driver( version );
} }
......
dlls/winex11.drv/keyboard.c
View file @ f6524f7a
...@@ -1853,7 +1853,7 @@ static BOOL match_x11_keyboard_layout(HKL hkl) ...@@ -1853,7 +1853,7 @@ static BOOL match_x11_keyboard_layout(HKL hkl)
/*********************************************************************** /***********************************************************************
* ActivateKeyboardLayout (X11DRV.@) * ActivateKeyboardLayout (X11DRV.@)
*/ */
BOOL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
{ {
FIXME("%p, %04x: semi-stub!\n", hkl, flags); FIXME("%p, %04x: semi-stub!\n", hkl, flags);
...@@ -1898,7 +1898,7 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event ) ...@@ -1898,7 +1898,7 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
* *
* Note: Windows ignores HKL parameter and uses current active layout instead * Note: Windows ignores HKL parameter and uses current active layout instead
*/ */
SHORT CDECL X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl) SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl )
{ {
Display *display = thread_init_display(); Display *display = thread_init_display();
KeyCode keycode; KeyCode keycode;
...@@ -1980,7 +1980,7 @@ SHORT CDECL X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl) ...@@ -1980,7 +1980,7 @@ SHORT CDECL X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl)
/*********************************************************************** /***********************************************************************
* MapVirtualKeyEx (X11DRV.@) * MapVirtualKeyEx (X11DRV.@)
*/ */
UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl )
{ {
UINT ret = 0; UINT ret = 0;
int keyc; int keyc;
...@@ -2124,7 +2124,7 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) ...@@ -2124,7 +2124,7 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
/*********************************************************************** /***********************************************************************
* GetKeyNameText (X11DRV.@) * GetKeyNameText (X11DRV.@)
*/ */
INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize )
{ {
Display *display = thread_init_display(); Display *display = thread_init_display();
int vkey, ansi, scanCode; int vkey, ansi, scanCode;
...@@ -2337,8 +2337,8 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym) ...@@ -2337,8 +2337,8 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym)
* FIXME : should do the above (return 2 for non matching deadchar+char combinations) * FIXME : should do the above (return 2 for non matching deadchar+char combinations)
* *
*/ */
INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) LPWSTR bufW, int bufW_size, UINT flags, HKL hkl )
{ {
Display *display = thread_init_display(); Display *display = thread_init_display();
XKeyEvent e; XKeyEvent e;
...@@ -2639,7 +2639,7 @@ found: ...@@ -2639,7 +2639,7 @@ found:
/*********************************************************************** /***********************************************************************
* Beep (X11DRV.@) * Beep (X11DRV.@)
*/ */
void CDECL X11DRV_Beep(void) void X11DRV_Beep(void)
{ {
XBell(gdi_display, 0); XBell(gdi_display, 0);
} }
dlls/winex11.drv/mouse.c
View file @ f6524f7a
...@@ -1451,7 +1451,7 @@ static Cursor create_cursor( HANDLE handle ) ...@@ -1451,7 +1451,7 @@ static Cursor create_cursor( HANDLE handle )
/*********************************************************************** /***********************************************************************
* DestroyCursorIcon (X11DRV.@) * DestroyCursorIcon (X11DRV.@)
*/ */
void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) void X11DRV_DestroyCursorIcon( HCURSOR handle )
{ {
Cursor cursor; Cursor cursor;
...@@ -1466,7 +1466,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) ...@@ -1466,7 +1466,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle )
/*********************************************************************** /***********************************************************************
* SetCursor (X11DRV.@) * SetCursor (X11DRV.@)
*/ */
void CDECL X11DRV_SetCursor( HCURSOR handle ) void X11DRV_SetCursor( HCURSOR handle )
{ {
if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle ||
GetTickCount() - last_cursor_change > 100) GetTickCount() - last_cursor_change > 100)
...@@ -1479,7 +1479,7 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) ...@@ -1479,7 +1479,7 @@ void CDECL X11DRV_SetCursor( HCURSOR handle )
/*********************************************************************** /***********************************************************************
* SetCursorPos (X11DRV.@) * SetCursorPos (X11DRV.@)
*/ */
BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) BOOL X11DRV_SetCursorPos( INT x, INT y )
{ {
struct x11drv_thread_data *data = x11drv_init_thread_data(); struct x11drv_thread_data *data = x11drv_init_thread_data();
POINT pos = virtual_screen_to_root( x, y ); POINT pos = virtual_screen_to_root( x, y );
...@@ -1514,7 +1514,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) ...@@ -1514,7 +1514,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y )
/*********************************************************************** /***********************************************************************
* GetCursorPos (X11DRV.@) * GetCursorPos (X11DRV.@)
*/ */
BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) BOOL X11DRV_GetCursorPos(LPPOINT pos)
{ {
Display *display = thread_init_display(); Display *display = thread_init_display();
Window root, child; Window root, child;
...@@ -1535,7 +1535,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) ...@@ -1535,7 +1535,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos)
/*********************************************************************** /***********************************************************************
* ClipCursor (X11DRV.@) * ClipCursor (X11DRV.@)
*/ */
BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) BOOL X11DRV_ClipCursor( LPCRECT clip )
{ {
RECT virtual_rect = get_virtual_screen_rect(); RECT virtual_rect = get_virtual_screen_rect();
......
dlls/winex11.drv/settings.c
View file @ f6524f7a
...@@ -467,7 +467,7 @@ static DWORD get_display_depth(ULONG_PTR display_id) ...@@ -467,7 +467,7 @@ static DWORD get_display_depth(ULONG_PTR display_id)
* EnumDisplaySettingsEx (X11DRV.@) * EnumDisplaySettingsEx (X11DRV.@)
* *
*/ */
BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags)
{ {
static const WCHAR dev_name[CCHDEVICENAME] = static const WCHAR dev_name[CCHDEVICENAME] =
{ 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 };
...@@ -931,7 +931,7 @@ static BOOL all_detached_settings(const struct x11drv_display_setting *displays, ...@@ -931,7 +931,7 @@ static BOOL all_detached_settings(const struct x11drv_display_setting *displays,
* ChangeDisplaySettingsEx (X11DRV.@) * ChangeDisplaySettingsEx (X11DRV.@)
* *
*/ */
LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
HWND hwnd, DWORD flags, LPVOID lpvoid ) HWND hwnd, DWORD flags, LPVOID lpvoid )
{ {
struct x11drv_display_setting *displays; struct x11drv_display_setting *displays;
......
dlls/winex11.drv/window.c
View file @ f6524f7a
...@@ -1709,7 +1709,7 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO ...@@ -1709,7 +1709,7 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO
/***************************************************************** /*****************************************************************
* SetWindowText (X11DRV.@) * SetWindowText (X11DRV.@)
*/ */
void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
{ {
Window win; Window win;
...@@ -1726,7 +1726,7 @@ void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) ...@@ -1726,7 +1726,7 @@ void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text )
* *
* Update the X state of a window to reflect a style change * Update the X state of a window to reflect a style change
*/ */
void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
DWORD changed = style->styleNew ^ style->styleOld; DWORD changed = style->styleNew ^ style->styleOld;
...@@ -1752,7 +1752,7 @@ done: ...@@ -1752,7 +1752,7 @@ done:
/*********************************************************************** /***********************************************************************
* DestroyWindow (X11DRV.@) * DestroyWindow (X11DRV.@)
*/ */
void CDECL X11DRV_DestroyWindow( HWND hwnd ) void X11DRV_DestroyWindow( HWND hwnd )
{ {
struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_thread_data *thread_data = x11drv_thread_data();
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -1813,7 +1813,7 @@ BOOL create_desktop_win_data( Window win ) ...@@ -1813,7 +1813,7 @@ BOOL create_desktop_win_data( Window win )
/********************************************************************** /**********************************************************************
* CreateDesktopWindow (X11DRV.@) * CreateDesktopWindow (X11DRV.@)
*/ */
BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) BOOL X11DRV_CreateDesktopWindow( HWND hwnd )
{ {
unsigned int width, height; unsigned int width, height;
...@@ -1892,7 +1892,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, ...@@ -1892,7 +1892,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp,
/********************************************************************** /**********************************************************************
* CreateWindow (X11DRV.@) * CreateWindow (X11DRV.@)
*/ */
BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) BOOL X11DRV_CreateWindow( HWND hwnd )
{ {
if (hwnd == GetDesktopWindow()) if (hwnd == GetDesktopWindow())
{ {
...@@ -2144,7 +2144,7 @@ XIC X11DRV_get_ic( HWND hwnd ) ...@@ -2144,7 +2144,7 @@ XIC X11DRV_get_ic( HWND hwnd )
/*********************************************************************** /***********************************************************************
* X11DRV_GetDC (X11DRV.@) * X11DRV_GetDC (X11DRV.@)
*/ */
void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
const RECT *top_rect, DWORD flags ) const RECT *top_rect, DWORD flags )
{ {
struct x11drv_escape_set_drawable escape; struct x11drv_escape_set_drawable escape;
...@@ -2192,7 +2192,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, ...@@ -2192,7 +2192,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
/*********************************************************************** /***********************************************************************
* X11DRV_ReleaseDC (X11DRV.@) * X11DRV_ReleaseDC (X11DRV.@)
*/ */
void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) void X11DRV_ReleaseDC( HWND hwnd, HDC hdc )
{ {
struct x11drv_escape_set_drawable escape; struct x11drv_escape_set_drawable escape;
...@@ -2208,7 +2208,7 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) ...@@ -2208,7 +2208,7 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc )
/************************************************************************* /*************************************************************************
* ScrollDC (X11DRV.@) * ScrollDC (X11DRV.@)
*/ */
BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
{ {
RECT rect; RECT rect;
BOOL ret; BOOL ret;
...@@ -2243,7 +2243,7 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) ...@@ -2243,7 +2243,7 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
/*********************************************************************** /***********************************************************************
* SetCapture (X11DRV.@) * SetCapture (X11DRV.@)
*/ */
void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) void X11DRV_SetCapture( HWND hwnd, UINT flags )
{ {
struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_thread_data *thread_data = x11drv_thread_data();
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -2278,7 +2278,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) ...@@ -2278,7 +2278,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags )
/***************************************************************** /*****************************************************************
* SetParent (X11DRV.@) * SetParent (X11DRV.@)
*/ */
void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -2329,7 +2329,7 @@ static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rec ...@@ -2329,7 +2329,7 @@ static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rec
/*********************************************************************** /***********************************************************************
* WindowPosChanging (X11DRV.@) * WindowPosChanging (X11DRV.@)
*/ */
BOOL CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect,
struct window_surface **surface ) struct window_surface **surface )
{ {
...@@ -2395,7 +2395,7 @@ done: ...@@ -2395,7 +2395,7 @@ done:
/*********************************************************************** /***********************************************************************
* WindowPosChanged (X11DRV.@) * WindowPosChanged (X11DRV.@)
*/ */
void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *rectWindow, const RECT *rectClient, const RECT *rectWindow, const RECT *rectClient,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface ) struct window_surface *surface )
...@@ -2561,7 +2561,7 @@ static BOOL hide_icon( struct x11drv_win_data *data ) ...@@ -2561,7 +2561,7 @@ static BOOL hide_icon( struct x11drv_win_data *data )
/*********************************************************************** /***********************************************************************
* ShowWindow (X11DRV.@) * ShowWindow (X11DRV.@)
*/ */
UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
{ {
int x, y; int x, y;
unsigned int width, height, border, depth; unsigned int width, height, border, depth;
...@@ -2615,7 +2615,7 @@ done: ...@@ -2615,7 +2615,7 @@ done:
* first time). Complete the X11 driver-specific initialisation * first time). Complete the X11 driver-specific initialisation
* and set the window hints. * and set the window hints.
*/ */
void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) void X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -2638,7 +2638,7 @@ done: ...@@ -2638,7 +2638,7 @@ done:
* *
* Assign specified region to window (for non-rectangular windows) * Assign specified region to window (for non-rectangular windows)
*/ */
void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) void X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -2659,7 +2659,7 @@ void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) ...@@ -2659,7 +2659,7 @@ void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
* *
* Set transparency attributes for a layered window. * Set transparency attributes for a layered window.
*/ */
void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags )
{ {
struct x11drv_win_data *data = get_win_data( hwnd ); struct x11drv_win_data *data = get_win_data( hwnd );
...@@ -2703,7 +2703,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph ...@@ -2703,7 +2703,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph
/***************************************************************************** /*****************************************************************************
* UpdateLayeredWindow (X11DRV.@) * UpdateLayeredWindow (X11DRV.@)
*/ */
BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect ) const RECT *window_rect )
{ {
struct window_surface *surface; struct window_surface *surface;
...@@ -2832,7 +2832,7 @@ static void taskbar_delete_tab( HWND hwnd ) ...@@ -2832,7 +2832,7 @@ static void taskbar_delete_tab( HWND hwnd )
/********************************************************************** /**********************************************************************
* X11DRV_WindowMessage (X11DRV.@) * X11DRV_WindowMessage (X11DRV.@)
*/ */
LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
...@@ -2930,7 +2930,7 @@ static LRESULT start_screensaver(void) ...@@ -2930,7 +2930,7 @@ static LRESULT start_screensaver(void)
* *
* Perform WM_SYSCOMMAND handling. * Perform WM_SYSCOMMAND handling.
*/ */
LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )
{ {
WPARAM hittest = wparam & 0x0f; WPARAM hittest = wparam & 0x0f;
int dir; int dir;
...@@ -2999,7 +2999,7 @@ failed: ...@@ -2999,7 +2999,7 @@ failed:
return -1; return -1;
} }
void CDECL X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) void X11DRV_FlashWindowEx( FLASHWINFO *pfinfo )
{ {
struct x11drv_win_data *data = get_win_data( pfinfo->hwnd ); struct x11drv_win_data *data = get_win_data( pfinfo->hwnd );
XEvent xev; XEvent xev;
......
dlls/winex11.drv/x11drv.h
View file @ f6524f7a
...@@ -193,56 +193,56 @@ extern BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; ...@@ -193,56 +193,56 @@ extern BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_ActivateKeyboardLayout( HKL hkl, UINT flags ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ActivateKeyboardLayout( HKL hkl, UINT flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_Beep(void) DECLSPEC_HIDDEN; extern void X11DRV_Beep(void) DECLSPEC_HIDDEN;
extern INT CDECL X11DRV_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN; extern INT X11DRV_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSPEC_HIDDEN;
extern UINT CDECL X11DRV_MapVirtualKeyEx( UINT code, UINT map_type, HKL hkl ) DECLSPEC_HIDDEN; extern UINT X11DRV_MapVirtualKeyEx( UINT code, UINT map_type, HKL hkl ) DECLSPEC_HIDDEN;
extern INT CDECL X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, extern INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
LPWSTR bufW, int bufW_size, UINT flags, HKL hkl ) DECLSPEC_HIDDEN; LPWSTR bufW, int bufW_size, UINT flags, HKL hkl ) DECLSPEC_HIDDEN;
extern SHORT CDECL X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) DECLSPEC_HIDDEN; extern SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) DECLSPEC_HIDDEN; extern void X11DRV_DestroyCursorIcon( HCURSOR handle ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN; extern void X11DRV_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetCursorPos( INT x, INT y ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN;
extern LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, extern LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, extern BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode,
DWORD flags ) DECLSPEC_HIDDEN; DWORD flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, extern void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager,
BOOL force, void *param ) DECLSPEC_HIDDEN; BOOL force, void *param ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void X11DRV_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) DECLSPEC_HIDDEN; extern void X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
const RECT *top_rect, DWORD flags ) DECLSPEC_HIDDEN; const RECT *top_rect, DWORD flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) DECLSPEC_HIDDEN; extern void X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN; extern void X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, extern void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha,
DWORD flags ) DECLSPEC_HIDDEN; DWORD flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) DECLSPEC_HIDDEN; extern void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) DECLSPEC_HIDDEN; extern void X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) DECLSPEC_HIDDEN; extern void X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DECLSPEC_HIDDEN; extern void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) DECLSPEC_HIDDEN; extern void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) DECLSPEC_HIDDEN;
extern UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN; extern UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) DECLSPEC_HIDDEN;
extern LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_UpdateClipboard(void) DECLSPEC_HIDDEN; extern void X11DRV_UpdateClipboard(void) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, extern BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info,
const RECT *window_rect ) DECLSPEC_HIDDEN; const RECT *window_rect ) DECLSPEC_HIDDEN;
extern LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; extern LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, extern BOOL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect,
struct window_surface **surface ) DECLSPEC_HIDDEN; struct window_surface **surface ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *rectWindow, const RECT *rectClient, const RECT *rectWindow, const RECT *rectClient,
const RECT *visible_rect, const RECT *valid_rects, const RECT *visible_rect, const RECT *valid_rects,
struct window_surface *surface ) DECLSPEC_HIDDEN; struct window_surface *surface ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags ) DECLSPEC_HIDDEN; UINT flags ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_ThreadDetach(void) DECLSPEC_HIDDEN; extern void X11DRV_ThreadDetach(void) DECLSPEC_HIDDEN;
/* X11 driver internal functions */ /* X11 driver internal functions */
...@@ -678,7 +678,7 @@ extern XContext win_data_context DECLSPEC_HIDDEN; ...@@ -678,7 +678,7 @@ extern XContext win_data_context DECLSPEC_HIDDEN;
extern XContext cursor_context DECLSPEC_HIDDEN; extern XContext cursor_context DECLSPEC_HIDDEN;
extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN;
extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;
extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN;
extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN;
...@@ -689,7 +689,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; ...@@ -689,7 +689,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;
extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;
extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN;
extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg ); typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg );
......
dlls/winex11.drv/x11drv_main.c
View file @ f6524f7a
...@@ -636,7 +636,7 @@ static BOOL process_attach(void) ...@@ -636,7 +636,7 @@ static BOOL process_attach(void)
/*********************************************************************** /***********************************************************************
* ThreadDetach (X11DRV.@) * ThreadDetach (X11DRV.@)
*/ */
void CDECL X11DRV_ThreadDetach(void) void X11DRV_ThreadDetach(void)
{ {
struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index );
...@@ -739,7 +739,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) ...@@ -739,7 +739,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
/*********************************************************************** /***********************************************************************
* SystemParametersInfo (X11DRV.@) * SystemParametersInfo (X11DRV.@)
*/ */
BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags )
{ {
switch (action) switch (action)
{ {
......
include/wine/gdi_driver.h
View file @ f6524f7a
...@@ -165,7 +165,7 @@ struct gdi_dc_funcs ...@@ -165,7 +165,7 @@ struct gdi_dc_funcs
}; };
/* increment this when you change the DC function table */ /* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 76 #define WINE_GDI_DRIVER_VERSION 77
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
...@@ -229,8 +229,6 @@ static inline ULONG window_surface_release( struct window_surface *surface ) ...@@ -229,8 +229,6 @@ static inline ULONG window_surface_release( struct window_surface *surface )
return ret; return ret;
} }
#endif /* __WINE_USE_MSVCRT */
/* display manager interface, used to initialize display device registry data */ /* display manager interface, used to initialize display device registry data */
struct gdi_gpu struct gdi_gpu
...@@ -274,62 +272,65 @@ struct user_driver_funcs ...@@ -274,62 +272,65 @@ struct user_driver_funcs
struct gdi_dc_funcs dc_funcs; struct gdi_dc_funcs dc_funcs;
/* keyboard functions */ /* keyboard functions */
BOOL (CDECL *pActivateKeyboardLayout)(HKL, UINT); BOOL (*pActivateKeyboardLayout)(HKL, UINT);
void (CDECL *pBeep)(void); void (*pBeep)(void);
INT (CDECL *pGetKeyNameText)(LONG,LPWSTR,INT); INT (*pGetKeyNameText)(LONG,LPWSTR,INT);
UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); UINT (*pGetKeyboardLayoutList)(INT, HKL *);
UINT (CDECL *pMapVirtualKeyEx)(UINT,UINT,HKL); UINT (*pMapVirtualKeyEx)(UINT,UINT,HKL);
BOOL (CDECL *pRegisterHotKey)(HWND,UINT,UINT); BOOL (*pRegisterHotKey)(HWND,UINT,UINT);
INT (CDECL *pToUnicodeEx)(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL); INT (*pToUnicodeEx)(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL);
void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); void (*pUnregisterHotKey)(HWND, UINT, UINT);
SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); SHORT (*pVkKeyScanEx)(WCHAR, HKL);
/* cursor/icon functions */ /* cursor/icon functions */
void (CDECL *pDestroyCursorIcon)(HCURSOR); void (*pDestroyCursorIcon)(HCURSOR);
void (CDECL *pSetCursor)(HCURSOR); void (*pSetCursor)(HCURSOR);
BOOL (CDECL *pGetCursorPos)(LPPOINT); BOOL (*pGetCursorPos)(LPPOINT);
BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (*pSetCursorPos)(INT,INT);
BOOL (CDECL *pClipCursor)(LPCRECT); BOOL (*pClipCursor)(LPCRECT);
/* clipboard functions */ /* clipboard functions */
void (CDECL *pUpdateClipboard)(void); void (*pUpdateClipboard)(void);
/* display modes */ /* display modes */
LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); LONG (*pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (*pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
void (CDECL *pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); void (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*);
/* windowing functions */ /* windowing functions */
BOOL (CDECL *pCreateDesktopWindow)(HWND); BOOL (*pCreateDesktopWindow)(HWND);
BOOL (CDECL *pCreateWindow)(HWND); BOOL (*pCreateWindow)(HWND);
void (CDECL *pDestroyWindow)(HWND); void (*pDestroyWindow)(HWND);
void (CDECL *pFlashWindowEx)(FLASHWINFO*); void (*pFlashWindowEx)(FLASHWINFO*);
void (CDECL *pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD); void (*pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD);
DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); DWORD (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
void (CDECL *pReleaseDC)(HWND,HDC); void (*pReleaseDC)(HWND,HDC);
BOOL (CDECL *pScrollDC)(HDC,INT,INT,HRGN); BOOL (*pScrollDC)(HDC,INT,INT,HRGN);
void (CDECL *pSetCapture)(HWND,UINT); void (*pSetCapture)(HWND,UINT);
void (CDECL *pSetFocus)(HWND); void (*pSetFocus)(HWND);
void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
void (CDECL *pSetParent)(HWND,HWND,HWND); void (*pSetParent)(HWND,HWND,HWND);
void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (*pSetWindowRgn)(HWND,HRGN,BOOL);
void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (*pSetWindowIcon)(HWND,UINT,HICON);
void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (*pSetWindowStyle)(HWND,INT,STYLESTRUCT*);
void (CDECL *pSetWindowText)(HWND,LPCWSTR); void (*pSetWindowText)(HWND,LPCWSTR);
UINT (CDECL *pShowWindow)(HWND,INT,RECT*,UINT); UINT (*pShowWindow)(HWND,INT,RECT*,UINT);
LRESULT (CDECL *pSysCommand)(HWND,WPARAM,LPARAM); LRESULT (*pSysCommand)(HWND,WPARAM,LPARAM);
BOOL (CDECL *pUpdateLayeredWindow)(HWND,const struct tagUPDATELAYEREDWINDOWINFO *,const RECT *); BOOL (*pUpdateLayeredWindow)(HWND,const struct tagUPDATELAYEREDWINDOWINFO *,const RECT *);
LRESULT (CDECL *pWindowMessage)(HWND,UINT,WPARAM,LPARAM); LRESULT (*pWindowMessage)(HWND,UINT,WPARAM,LPARAM);
BOOL (CDECL *pWindowPosChanging)(HWND,HWND,UINT,const RECT *,const RECT *,RECT *, BOOL (*pWindowPosChanging)(HWND,HWND,UINT,const RECT *,const RECT *,RECT *,
struct window_surface**); struct window_surface**);
void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *, void (*pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,
const RECT *,struct window_surface*); const RECT *,struct window_surface*);
/* system parameters */ /* system parameters */
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); BOOL (*pSystemParametersInfo)(UINT,UINT,void*,UINT);
/* vulkan support */ /* vulkan support */
const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT); const struct vulkan_funcs * (*pwine_get_vulkan_driver)(UINT);
/* opengl support */ /* opengl support */
struct opengl_funcs * (CDECL *pwine_get_wgl_driver)(UINT); struct opengl_funcs * (*pwine_get_wgl_driver)(UINT);
/* thread management */ /* thread management */
void (CDECL *pThreadDetach)(void); void (*pThreadDetach)(void);
}; };
#endif /* __WINE_USE_MSVCRT */
struct user_driver_funcs;
extern void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version );
extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );
extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version ); extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment