Release 970824
Sat Aug 23 00:05:23 1997 Andreas Mohr <100.30936@germany.net>
* [if1632/kernel.spec] [if1632/mmsystem.spec]
Added some stubs.
* [include/neexe.h] [loader/module.c]
Added warning for OS/2 executables.
* [multimedia/midi.c]
Shortened MIDIOUT driver version string to be less than 31 chars.
* [objects/gdiobj.c]
Fixed DeleteObject32() to react properly when called with stock object.
Fri Aug 22 18:03:26 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [controls/updown.c] [include/updown.h]
First attempt at implementiong the UpDown class.
* [controls/widgets.c]
Added the UpDown class to be initialized by InitCommonControls().
Wed Aug 20 18:01:33 1997 Doug Ridgway <ridgway@routh.UCSD.EDU>
* [graphics/*] [objects/*] [include/gdi.h]
Made all GDI objects (except DCs) moveable.
Mon Aug 18 03:25:30 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/event.c] [misc/winsock.c] [misc/winsock_dns.c]
Removed IPC communication to speed up winsock services
(tested only with 16-bit netscape 3.03).
* [graphics/x11drv/xfont.c] [documentation/fonts]
Miscellaneous improvements. Updated docs.
Sun Aug 17 20:39:55 1997 Ingo Schneider <schneidi@informatik.tu-muenchen.de>
* [misc/comm.c]
A couple of bug fixes.
Sun Aug 17 19:29:22 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/dbg.y]
Display next instruction after stepi/nexti.
* [if1632/relay.c] [include/callback.h] [tools/build.c]
Replaced CallTo32_LargeStack with the CALL_LARGE_STACK macro for
better Winelib support.
* [include/sigcontext.h]
Renamed to sig_context.h to avoid conflicts with libc.
* [*/*]
All API functions are now prefixed with WINAPI in prevision of
future Winelib integration.
* [loader/signal.c] [memory/ldt.c]
Fixed assembly code to be -fPIC compatible.
Thu Aug 14 14:38:15 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/crtdll.spec][win32/except.c]
_global_unwind, _local_unwind stub added.
* [objects/dib.c]
Don't read memory you don't even need for the target bitmap (fixes
one 'lazy' program).
* [if1632/relay.c][if1632/thunk.c][if1632/kernel32.spec]
[win32/ordinals.c][memory/selector.c][memory/global.c]
[include/callback.h]
Added/moved some more win95 ordinal stuff. Implemented QT_Thunk
(not 100% correct yet) and some friends.
* [loader/pe_image.c]
Add possibility to break at the DLL entrypoint.
* [controls/static.c][misc/commdlg.c][scheduler/thread.c]
Misc bugfixes and additions.
* [misc/registry.c]
The registry seems to be case-preserving but case-insensitive.
* [memory/global.c]
Adapted to new /proc/meminfo format.
* [objects/font.c][graphics/x11drv/xfont.c]
FONT_SelectObject and GetTextMetrics* get passed ranges in logical
and not device points (thanks to Marion Reyzl for pointing this
out).
* [windows/caret.c]
Use the windows own DC if present (The caret coordinates are
logical coordinates based on it). Fixes another AMIPRO problem.
Wed Aug 6 18:22:22 1997 Morten Welinder <terra@diku.dk>
* [controls/menu.c]
General clean-up and Win32 work: split item_flags into fType and
fState; split item_id into wID and hSubMenu. Improved
debug-printing. Implemented InsertMenuItem32[AW],
SetMenuDefaultItem32, and SetMenuItemInfo32[AW]. Fixed
GetMenuItemInfo32[AW].
* [if1632/user32.spec]
Define above new functions.
* [include/windows.h]
Define MF_DEFAULT and MF_RIGHTJUSTIFY. Prototype above functions.
* [include/menu.h]
Don't prototype now-static MENU_InitSysMenuPopup.
* [include/comm.h]
Reduce MAX_PORTS to 9 (which the profile code can handle).
Tue Aug 5 20:16:22 1997 Victor Schneider <vischne@ibm.net>
* [library/winestub.c] [libtest/expand.c]
These patches let people porting Windows apps compile them using
the same conventions regarding global _argc and _argv as those on
Windows C/C++ compilers.
diff --git a/windows/dialog.c b/windows/dialog.c
index 8b2f580..21ef5b0 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -618,8 +618,8 @@
/***********************************************************************
* CreateDialog16 (USER.89)
*/
-HWND16 CreateDialog16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc )
+HWND16 WINAPI CreateDialog16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc )
{
return CreateDialogParam16( hInst, dlgTemplate, owner, dlgProc, 0 );
}
@@ -628,8 +628,9 @@
/***********************************************************************
* CreateDialogParam16 (USER.241)
*/
-HWND16 CreateDialogParam16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc, LPARAM param )
+HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc,
+ LPARAM param )
{
HWND16 hwnd = 0;
HRSRC16 hRsrc;
@@ -652,8 +653,9 @@
/***********************************************************************
* CreateDialogParam32A (USER32.72)
*/
-HWND32 CreateDialogParam32A( HINSTANCE32 hInst, LPCSTR name,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+HWND32 WINAPI CreateDialogParam32A( HINSTANCE32 hInst, LPCSTR name,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
if (HIWORD(name))
{
@@ -669,8 +671,9 @@
/***********************************************************************
* CreateDialogParam32W (USER32.73)
*/
-HWND32 CreateDialogParam32W( HINSTANCE32 hInst, LPCWSTR name,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+HWND32 WINAPI CreateDialogParam32W( HINSTANCE32 hInst, LPCWSTR name,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
HANDLE32 hrsrc = FindResource32W( hInst, name, (LPWSTR)RT_DIALOG );
if (!hrsrc) return 0;
@@ -683,8 +686,8 @@
/***********************************************************************
* CreateDialogIndirect16 (USER.219)
*/
-HWND16 CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc )
+HWND16 WINAPI CreateDialogIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc )
{
return CreateDialogIndirectParam16( hInst, dlgTemplate, owner, dlgProc, 0);
}
@@ -693,9 +696,10 @@
/***********************************************************************
* CreateDialogIndirectParam16 (USER.242)
*/
-HWND16 CreateDialogIndirectParam16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc,
- LPARAM param )
+HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst,
+ LPCVOID dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc,
+ LPARAM param )
{
return DIALOG_CreateIndirect( hInst, dlgTemplate, FALSE, owner,
dlgProc, param, WIN_PROC_16 );
@@ -705,9 +709,10 @@
/***********************************************************************
* CreateDialogIndirectParam32A (USER32.69)
*/
-HWND32 CreateDialogIndirectParam32A( HINSTANCE32 hInst, LPCVOID dlgTemplate,
- HWND32 owner, DLGPROC32 dlgProc,
- LPARAM param )
+HWND32 WINAPI CreateDialogIndirectParam32A( HINSTANCE32 hInst,
+ LPCVOID dlgTemplate,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
(DLGPROC16)dlgProc, param, WIN_PROC_32A );
@@ -717,9 +722,10 @@
/***********************************************************************
* CreateDialogIndirectParam32W (USER32.71)
*/
-HWND32 CreateDialogIndirectParam32W( HINSTANCE32 hInst, LPCVOID dlgTemplate,
- HWND32 owner, DLGPROC32 dlgProc,
- LPARAM param )
+HWND32 WINAPI CreateDialogIndirectParam32W( HINSTANCE32 hInst,
+ LPCVOID dlgTemplate,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
(DLGPROC16)dlgProc, param, WIN_PROC_32W );
@@ -763,8 +769,8 @@
/***********************************************************************
* DialogBox16 (USER.87)
*/
-INT16 DialogBox16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc )
+INT16 WINAPI DialogBox16( HINSTANCE16 hInst, SEGPTR dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc )
{
return DialogBoxParam16( hInst, dlgTemplate, owner, dlgProc, 0 );
}
@@ -773,8 +779,8 @@
/***********************************************************************
* DialogBoxParam16 (USER.239)
*/
-INT16 DialogBoxParam16( HINSTANCE16 hInst, SEGPTR template,
- HWND16 owner, DLGPROC16 dlgProc, LPARAM param )
+INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, SEGPTR template,
+ HWND16 owner, DLGPROC16 dlgProc, LPARAM param )
{
HWND16 hwnd = CreateDialogParam16( hInst, template, owner, dlgProc, param);
if (hwnd) return (INT16)DIALOG_DoDialogBox( hwnd, owner );
@@ -785,8 +791,8 @@
/***********************************************************************
* DialogBoxParam32A (USER32.138)
*/
-INT32 DialogBoxParam32A( HINSTANCE32 hInst, LPCSTR name,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+INT32 WINAPI DialogBoxParam32A( HINSTANCE32 hInst, LPCSTR name,
+ HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
{
HWND32 hwnd = CreateDialogParam32A( hInst, name, owner, dlgProc, param );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
@@ -797,8 +803,8 @@
/***********************************************************************
* DialogBoxParam32W (USER32.139)
*/
-INT32 DialogBoxParam32W( HINSTANCE32 hInst, LPCWSTR name,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
+INT32 WINAPI DialogBoxParam32W( HINSTANCE32 hInst, LPCWSTR name,
+ HWND32 owner, DLGPROC32 dlgProc, LPARAM param )
{
HWND32 hwnd = CreateDialogParam32W( hInst, name, owner, dlgProc, param );
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
@@ -809,8 +815,8 @@
/***********************************************************************
* DialogBoxIndirect16 (USER.218)
*/
-INT16 DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc )
+INT16 WINAPI DialogBoxIndirect16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc )
{
return DialogBoxIndirectParam16( hInst, dlgTemplate, owner, dlgProc, 0 );
}
@@ -819,8 +825,9 @@
/***********************************************************************
* DialogBoxIndirectParam16 (USER.240)
*/
-INT16 DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
- HWND16 owner, DLGPROC16 dlgProc, LPARAM param )
+INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate,
+ HWND16 owner, DLGPROC16 dlgProc,
+ LPARAM param )
{
HWND16 hwnd;
LPCVOID ptr;
@@ -836,8 +843,9 @@
/***********************************************************************
* DialogBoxIndirectParam32A (USER32.135)
*/
-INT32 DialogBoxIndirectParam32A( HINSTANCE32 hInstance, LPCVOID template,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param)
+INT32 WINAPI DialogBoxIndirectParam32A(HINSTANCE32 hInstance, LPCVOID template,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
HWND32 hwnd = CreateDialogIndirectParam32A( hInstance, template,
owner, dlgProc, param );
@@ -849,8 +857,9 @@
/***********************************************************************
* DialogBoxIndirectParam32W (USER32.137)
*/
-INT32 DialogBoxIndirectParam32W( HINSTANCE32 hInstance, LPCVOID template,
- HWND32 owner, DLGPROC32 dlgProc, LPARAM param)
+INT32 WINAPI DialogBoxIndirectParam32W(HINSTANCE32 hInstance, LPCVOID template,
+ HWND32 owner, DLGPROC32 dlgProc,
+ LPARAM param )
{
HWND32 hwnd = CreateDialogIndirectParam32W( hInstance, template,
owner, dlgProc, param );
@@ -862,7 +871,7 @@
/***********************************************************************
* EndDialog16 (USER32.173)
*/
-BOOL16 EndDialog16( HWND16 hwnd, INT16 retval )
+BOOL16 WINAPI EndDialog16( HWND16 hwnd, INT16 retval )
{
return EndDialog32( hwnd, retval );
}
@@ -871,7 +880,7 @@
/***********************************************************************
* EndDialog32 (USER32.173)
*/
-BOOL32 EndDialog32( HWND32 hwnd, INT32 retval )
+BOOL32 WINAPI EndDialog32( HWND32 hwnd, INT32 retval )
{
WND * wndPtr = WIN_FindWndPtr( hwnd );
DIALOGINFO * dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
@@ -998,7 +1007,7 @@
/***********************************************************************
* IsDialogMessage16 (USER.90)
*/
-BOOL16 IsDialogMessage16( HWND16 hwndDlg, LPMSG16 msg )
+BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, LPMSG16 msg )
{
BOOL32 ret, translate, dispatch;
@@ -1017,7 +1026,7 @@
/***********************************************************************
* IsDialogMessage32A (USER32.341)
*/
-BOOL32 IsDialogMessage32A( HWND32 hwndDlg, LPMSG32 msg )
+BOOL32 WINAPI IsDialogMessage32A( HWND32 hwndDlg, LPMSG32 msg )
{
BOOL32 ret, translate, dispatch;
@@ -1036,7 +1045,7 @@
/***********************************************************************
* IsDialogMessage32W (USER32.342)
*/
-BOOL32 IsDialogMessage32W( HWND32 hwndDlg, LPMSG32 msg )
+BOOL32 WINAPI IsDialogMessage32W( HWND32 hwndDlg, LPMSG32 msg )
{
BOOL32 ret, translate, dispatch;
@@ -1055,7 +1064,7 @@
/****************************************************************
* GetDlgCtrlID16 (USER.277)
*/
-INT16 GetDlgCtrlID16( HWND16 hwnd )
+INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd )
{
WND *wndPtr = WIN_FindWndPtr(hwnd);
if (wndPtr) return wndPtr->wIDmenu;
@@ -1066,7 +1075,7 @@
/****************************************************************
* GetDlgCtrlID32 (USER32.233)
*/
-INT32 GetDlgCtrlID32( HWND32 hwnd )
+INT32 WINAPI GetDlgCtrlID32( HWND32 hwnd )
{
WND *wndPtr = WIN_FindWndPtr(hwnd);
if (wndPtr) return wndPtr->wIDmenu;
@@ -1077,7 +1086,7 @@
/***********************************************************************
* GetDlgItem16 (USER.91)
*/
-HWND16 GetDlgItem16( HWND16 hwndDlg, INT16 id )
+HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
{
WND *pWnd;
@@ -1091,7 +1100,7 @@
/***********************************************************************
* GetDlgItem32 (USER32.234)
*/
-HWND32 GetDlgItem32( HWND32 hwndDlg, INT32 id )
+HWND32 WINAPI GetDlgItem32( HWND32 hwndDlg, INT32 id )
{
WND *pWnd;
@@ -1105,8 +1114,8 @@
/*******************************************************************
* SendDlgItemMessage16 (USER.101)
*/
-LRESULT SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg,
- WPARAM16 wParam, LPARAM lParam )
+LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg,
+ WPARAM16 wParam, LPARAM lParam )
{
HWND16 hwndCtrl = GetDlgItem16( hwnd, id );
if (hwndCtrl) return SendMessage16( hwndCtrl, msg, wParam, lParam );
@@ -1117,8 +1126,8 @@
/*******************************************************************
* SendDlgItemMessage32A (USER32.451)
*/
-LRESULT SendDlgItemMessage32A( HWND32 hwnd, INT32 id, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI SendDlgItemMessage32A( HWND32 hwnd, INT32 id, UINT32 msg,
+ WPARAM32 wParam, LPARAM lParam )
{
HWND32 hwndCtrl = GetDlgItem32( hwnd, id );
if (hwndCtrl) return SendMessage32A( hwndCtrl, msg, wParam, lParam );
@@ -1129,8 +1138,8 @@
/*******************************************************************
* SendDlgItemMessage32W (USER32.452)
*/
-LRESULT SendDlgItemMessage32W( HWND32 hwnd, INT32 id, UINT32 msg,
- WPARAM32 wParam, LPARAM lParam )
+LRESULT WINAPI SendDlgItemMessage32W( HWND32 hwnd, INT32 id, UINT32 msg,
+ WPARAM32 wParam, LPARAM lParam )
{
HWND32 hwndCtrl = GetDlgItem32( hwnd, id );
if (hwndCtrl) return SendMessage32W( hwndCtrl, msg, wParam, lParam );
@@ -1141,7 +1150,7 @@
/*******************************************************************
* SetDlgItemText16 (USER.92)
*/
-void SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
+void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString )
{
SendDlgItemMessage16( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
}
@@ -1150,7 +1159,7 @@
/*******************************************************************
* SetDlgItemText32A (USER32.477)
*/
-void SetDlgItemText32A( HWND32 hwnd, INT32 id, LPCSTR lpString )
+void WINAPI SetDlgItemText32A( HWND32 hwnd, INT32 id, LPCSTR lpString )
{
SendDlgItemMessage32A( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
}
@@ -1159,7 +1168,7 @@
/*******************************************************************
* SetDlgItemText32W (USER32.478)
*/
-void SetDlgItemText32W( HWND32 hwnd, INT32 id, LPCWSTR lpString )
+void WINAPI SetDlgItemText32W( HWND32 hwnd, INT32 id, LPCWSTR lpString )
{
SendDlgItemMessage32W( hwnd, id, WM_SETTEXT, 0, (LPARAM)lpString );
}
@@ -1168,7 +1177,7 @@
/***********************************************************************
* GetDlgItemText16 (USER.93)
*/
-INT16 GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
+INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len )
{
return (INT16)SendDlgItemMessage16( hwnd, id, WM_GETTEXT,
len, (LPARAM)str );
@@ -1178,7 +1187,7 @@
/***********************************************************************
* GetDlgItemText32A (USER32.236)
*/
-INT32 GetDlgItemText32A( HWND32 hwnd, INT32 id, LPSTR str, UINT32 len )
+INT32 WINAPI GetDlgItemText32A( HWND32 hwnd, INT32 id, LPSTR str, UINT32 len )
{
return (INT32)SendDlgItemMessage32A( hwnd, id, WM_GETTEXT,
len, (LPARAM)str );
@@ -1188,7 +1197,7 @@
/***********************************************************************
* GetDlgItemText32W (USER32.237)
*/
-INT32 GetDlgItemText32W( HWND32 hwnd, INT32 id, LPWSTR str, UINT32 len )
+INT32 WINAPI GetDlgItemText32W( HWND32 hwnd, INT32 id, LPWSTR str, UINT32 len )
{
return (INT32)SendDlgItemMessage32W( hwnd, id, WM_GETTEXT,
len, (LPARAM)str );
@@ -1198,7 +1207,7 @@
/*******************************************************************
* SetDlgItemInt16 (USER.94)
*/
-void SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned )
+void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned )
{
return SetDlgItemInt32( hwnd, (UINT32)(UINT16)id, value, fSigned );
}
@@ -1207,7 +1216,8 @@
/*******************************************************************
* SetDlgItemInt32 (USER32.476)
*/
-void SetDlgItemInt32( HWND32 hwnd, INT32 id, UINT32 value, BOOL32 fSigned )
+void WINAPI SetDlgItemInt32( HWND32 hwnd, INT32 id, UINT32 value,
+ BOOL32 fSigned )
{
char str[20];
@@ -1220,8 +1230,8 @@
/***********************************************************************
* GetDlgItemInt16 (USER.95)
*/
-UINT16 GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
- BOOL16 fSigned )
+UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated,
+ BOOL16 fSigned )
{
UINT32 result;
BOOL32 ok;
@@ -1245,8 +1255,8 @@
/***********************************************************************
* GetDlgItemInt32 (USER32.235)
*/
-UINT32 GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
- BOOL32 fSigned )
+UINT32 WINAPI GetDlgItemInt32( HWND32 hwnd, INT32 id, BOOL32 *translated,
+ BOOL32 fSigned )
{
char str[30];
char * endptr;
@@ -1278,7 +1288,7 @@
/***********************************************************************
* CheckDlgButton16 (USER.97)
*/
-BOOL16 CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
+BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check )
{
SendDlgItemMessage32A( hwnd, id, BM_SETCHECK32, check, 0 );
return TRUE;
@@ -1288,7 +1298,7 @@
/***********************************************************************
* CheckDlgButton32 (USER32.44)
*/
-BOOL32 CheckDlgButton32( HWND32 hwnd, INT32 id, UINT32 check )
+BOOL32 WINAPI CheckDlgButton32( HWND32 hwnd, INT32 id, UINT32 check )
{
SendDlgItemMessage32A( hwnd, id, BM_SETCHECK32, check, 0 );
return TRUE;
@@ -1298,7 +1308,7 @@
/***********************************************************************
* IsDlgButtonChecked16 (USER.98)
*/
-UINT16 IsDlgButtonChecked16( HWND16 hwnd, UINT16 id )
+UINT16 WINAPI IsDlgButtonChecked16( HWND16 hwnd, UINT16 id )
{
return (UINT16)SendDlgItemMessage32A( hwnd, id, BM_GETCHECK32, 0, 0 );
}
@@ -1307,7 +1317,7 @@
/***********************************************************************
* IsDlgButtonChecked32 (USER32.343)
*/
-UINT32 IsDlgButtonChecked32( HWND32 hwnd, UINT32 id )
+UINT32 WINAPI IsDlgButtonChecked32( HWND32 hwnd, UINT32 id )
{
return (UINT32)SendDlgItemMessage32A( hwnd, id, BM_GETCHECK32, 0, 0 );
}
@@ -1316,8 +1326,8 @@
/***********************************************************************
* CheckRadioButton16 (USER.96)
*/
-BOOL16 CheckRadioButton16( HWND16 hwndDlg, UINT16 firstID, UINT16 lastID,
- UINT16 checkID )
+BOOL16 WINAPI CheckRadioButton16( HWND16 hwndDlg, UINT16 firstID,
+ UINT16 lastID, UINT16 checkID )
{
return CheckRadioButton32( hwndDlg, firstID, lastID, checkID );
}
@@ -1326,8 +1336,8 @@
/***********************************************************************
* CheckRadioButton32 (USER32.47)
*/
-BOOL32 CheckRadioButton32( HWND32 hwndDlg, UINT32 firstID, UINT32 lastID,
- UINT32 checkID )
+BOOL32 WINAPI CheckRadioButton32( HWND32 hwndDlg, UINT32 firstID,
+ UINT32 lastID, UINT32 checkID )
{
WND *pWnd = WIN_FindWndPtr( hwndDlg );
if (!pWnd) return FALSE;
@@ -1352,7 +1362,7 @@
/***********************************************************************
* GetDialogBaseUnits (USER.243) (USER32.232)
*/
-DWORD GetDialogBaseUnits(void)
+DWORD WINAPI GetDialogBaseUnits(void)
{
return MAKELONG( xBaseUnit, yBaseUnit );
}
@@ -1361,7 +1371,7 @@
/***********************************************************************
* MapDialogRect16 (USER.103)
*/
-void MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
+void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect )
{
DIALOGINFO * dlgInfo;
WND * wndPtr = WIN_FindWndPtr( hwnd );
@@ -1377,7 +1387,7 @@
/***********************************************************************
* MapDialogRect32 (USER32.381)
*/
-void MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
+void WINAPI MapDialogRect32( HWND32 hwnd, LPRECT32 rect )
{
DIALOGINFO * dlgInfo;
WND * wndPtr = WIN_FindWndPtr( hwnd );
@@ -1393,7 +1403,8 @@
/***********************************************************************
* GetNextDlgGroupItem16 (USER.227)
*/
-HWND16 GetNextDlgGroupItem16(HWND16 hwndDlg, HWND16 hwndCtrl, BOOL16 fPrevious)
+HWND16 WINAPI GetNextDlgGroupItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
+ BOOL16 fPrevious )
{
return (HWND16)GetNextDlgGroupItem32( hwndDlg, hwndCtrl, fPrevious );
}
@@ -1402,7 +1413,8 @@
/***********************************************************************
* GetNextDlgGroupItem32 (USER32.274)
*/
-HWND32 GetNextDlgGroupItem32(HWND32 hwndDlg, HWND32 hwndCtrl, BOOL32 fPrevious)
+HWND32 WINAPI GetNextDlgGroupItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
+ BOOL32 fPrevious )
{
WND *pWnd, *pWndLast, *pWndCtrl, *pWndDlg;
@@ -1452,7 +1464,8 @@
/***********************************************************************
* GetNextDlgTabItem16 (USER.228)
*/
-HWND16 GetNextDlgTabItem16( HWND16 hwndDlg, HWND16 hwndCtrl, BOOL16 fPrevious )
+HWND16 WINAPI GetNextDlgTabItem16( HWND16 hwndDlg, HWND16 hwndCtrl,
+ BOOL16 fPrevious )
{
return (HWND16)GetNextDlgTabItem32( hwndDlg, hwndCtrl, fPrevious );
}
@@ -1461,7 +1474,8 @@
/***********************************************************************
* GetNextDlgTabItem32 (USER32.275)
*/
-HWND32 GetNextDlgTabItem32( HWND32 hwndDlg, HWND32 hwndCtrl, BOOL32 fPrevious )
+HWND32 WINAPI GetNextDlgTabItem32( HWND32 hwndDlg, HWND32 hwndCtrl,
+ BOOL32 fPrevious )
{
WND *pWnd, *pWndLast, *pWndCtrl, *pWndDlg;
@@ -1691,7 +1705,7 @@
/**********************************************************************
* DlgDirSelect (USER.99)
*/
-BOOL16 DlgDirSelect( HWND16 hwnd, LPSTR str, INT16 id )
+BOOL16 WINAPI DlgDirSelect( HWND16 hwnd, LPSTR str, INT16 id )
{
return DlgDirSelectEx16( hwnd, str, 128, id );
}
@@ -1700,7 +1714,7 @@
/**********************************************************************
* DlgDirSelectComboBox (USER.194)
*/
-BOOL16 DlgDirSelectComboBox( HWND16 hwnd, LPSTR str, INT16 id )
+BOOL16 WINAPI DlgDirSelectComboBox( HWND16 hwnd, LPSTR str, INT16 id )
{
return DlgDirSelectComboBoxEx16( hwnd, str, 128, id );
}
@@ -1709,7 +1723,7 @@
/**********************************************************************
* DlgDirSelectEx16 (USER.422)
*/
-BOOL16 DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
+BOOL16 WINAPI DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
{
return DIALOG_DlgDirSelect( hwnd, str, len, id, FALSE, FALSE, FALSE );
}
@@ -1718,7 +1732,7 @@
/**********************************************************************
* DlgDirSelectEx32A (USER32.148)
*/
-BOOL32 DlgDirSelectEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
+BOOL32 WINAPI DlgDirSelectEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
{
return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, FALSE );
}
@@ -1727,7 +1741,7 @@
/**********************************************************************
* DlgDirSelectEx32W (USER32.149)
*/
-BOOL32 DlgDirSelectEx32W( HWND32 hwnd, LPWSTR str, INT32 len, INT32 id )
+BOOL32 WINAPI DlgDirSelectEx32W( HWND32 hwnd, LPWSTR str, INT32 len, INT32 id )
{
return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, FALSE );
}
@@ -1736,7 +1750,8 @@
/**********************************************************************
* DlgDirSelectComboBoxEx16 (USER.423)
*/
-BOOL16 DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id )
+BOOL16 WINAPI DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len,
+ INT16 id )
{
return DIALOG_DlgDirSelect( hwnd, str, len, id, FALSE, FALSE, TRUE );
}
@@ -1745,7 +1760,8 @@
/**********************************************************************
* DlgDirSelectComboBoxEx32A (USER32.146)
*/
-BOOL32 DlgDirSelectComboBoxEx32A( HWND32 hwnd, LPSTR str, INT32 len, INT32 id )
+BOOL32 WINAPI DlgDirSelectComboBoxEx32A( HWND32 hwnd, LPSTR str, INT32 len,
+ INT32 id )
{
return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, TRUE );
}
@@ -1754,7 +1770,8 @@
/**********************************************************************
* DlgDirSelectComboBoxEx32W (USER32.147)
*/
-BOOL32 DlgDirSelectComboBoxEx32W( HWND32 hwnd, LPWSTR str, INT32 len, INT32 id)
+BOOL32 WINAPI DlgDirSelectComboBoxEx32W( HWND32 hwnd, LPWSTR str, INT32 len,
+ INT32 id)
{
return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, TRUE );
}
@@ -1763,8 +1780,8 @@
/**********************************************************************
* DlgDirList16 (USER.100)
*/
-INT16 DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox, INT16 idStatic,
- UINT16 attrib )
+INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox,
+ INT16 idStatic, UINT16 attrib )
{
return DIALOG_DlgDirList( hDlg, spec, idLBox, idStatic, attrib, FALSE );
}
@@ -1773,8 +1790,8 @@
/**********************************************************************
* DlgDirList32A (USER32.142)
*/
-INT32 DlgDirList32A( HWND32 hDlg, LPSTR spec, INT32 idLBox, INT32 idStatic,
- UINT32 attrib )
+INT32 WINAPI DlgDirList32A( HWND32 hDlg, LPSTR spec, INT32 idLBox,
+ INT32 idStatic, UINT32 attrib )
{
return DIALOG_DlgDirList( hDlg, spec, idLBox, idStatic, attrib, FALSE );
}
@@ -1783,8 +1800,8 @@
/**********************************************************************
* DlgDirList32W (USER32.145)
*/
-INT32 DlgDirList32W( HWND32 hDlg, LPWSTR spec, INT32 idLBox, INT32 idStatic,
- UINT32 attrib )
+INT32 WINAPI DlgDirList32W( HWND32 hDlg, LPWSTR spec, INT32 idLBox,
+ INT32 idStatic, UINT32 attrib )
{
return DIALOG_DlgDirListW( hDlg, spec, idLBox, idStatic, attrib, FALSE );
}
@@ -1793,8 +1810,8 @@
/**********************************************************************
* DlgDirListComboBox16 (USER.195)
*/
-INT16 DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox,
- INT16 idStatic, UINT16 attrib )
+INT16 WINAPI DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox,
+ INT16 idStatic, UINT16 attrib )
{
return DIALOG_DlgDirList( hDlg, spec, idCBox, idStatic, attrib, TRUE );
}
@@ -1803,8 +1820,8 @@
/**********************************************************************
* DlgDirListComboBox32A (USER32.143)
*/
-INT32 DlgDirListComboBox32A( HWND32 hDlg, LPSTR spec, INT32 idCBox,
- INT32 idStatic, UINT32 attrib )
+INT32 WINAPI DlgDirListComboBox32A( HWND32 hDlg, LPSTR spec, INT32 idCBox,
+ INT32 idStatic, UINT32 attrib )
{
return DIALOG_DlgDirList( hDlg, spec, idCBox, idStatic, attrib, TRUE );
}
@@ -1813,8 +1830,8 @@
/**********************************************************************
* DlgDirListComboBox32W (USER32.144)
*/
-INT32 DlgDirListComboBox32W( HWND32 hDlg, LPWSTR spec, INT32 idCBox,
- INT32 idStatic, UINT32 attrib )
+INT32 WINAPI DlgDirListComboBox32W( HWND32 hDlg, LPWSTR spec, INT32 idCBox,
+ INT32 idStatic, UINT32 attrib )
{
return DIALOG_DlgDirListW( hDlg, spec, idCBox, idStatic, attrib, TRUE );
}
