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/clipboard.c b/windows/clipboard.c
index ce261c0..d51dbd4 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -178,7 +178,7 @@
 
   selectionWait=True;
   while(selectionWait) 
-        EVENT_WaitXEvent( TRUE, FALSE );
+        EVENT_WaitNetEvent( TRUE, FALSE );
 
   /* we treat Unix text as CF_OEMTEXT */
   dprintf_clipboard(stddeb,"\tgot CF_OEMTEXT = %i\n", 
@@ -212,7 +212,7 @@
 /**************************************************************************
  *            OpenClipboard16   (USER.137)
  */
-BOOL16 OpenClipboard16( HWND16 hWnd )
+BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
 {
     return OpenClipboard32( hWnd );
 }
@@ -221,7 +221,7 @@
 /**************************************************************************
  *            OpenClipboard32   (USER32.406)
  */
-BOOL32 OpenClipboard32( HWND32 hWnd )
+BOOL32 WINAPI OpenClipboard32( HWND32 hWnd )
 {
     BOOL32 bRet = FALSE;
     dprintf_clipboard(stddeb,"OpenClipboard(%04x) = ", hWnd);
@@ -241,7 +241,7 @@
 /**************************************************************************
  *            CloseClipboard16   (USER.138)
  */
-BOOL16 CloseClipboard16(void)
+BOOL16 WINAPI CloseClipboard16(void)
 {
     return CloseClipboard32();
 }
@@ -250,7 +250,7 @@
 /**************************************************************************
  *            CloseClipboard32   (USER32.53)
  */
-BOOL32 CloseClipboard32(void)
+BOOL32 WINAPI CloseClipboard32(void)
 {
     dprintf_clipboard(stddeb,"CloseClipboard(); !\n");
 
@@ -266,7 +266,7 @@
 /**************************************************************************
  *            EmptyClipboard16   (USER.139)
  */
-BOOL16 EmptyClipboard16(void)
+BOOL16 WINAPI EmptyClipboard16(void)
 {
     return EmptyClipboard32();
 }
@@ -275,7 +275,7 @@
 /**************************************************************************
  *            EmptyClipboard32   (USER32.168)
  */
-BOOL32 EmptyClipboard32(void)
+BOOL32 WINAPI EmptyClipboard32(void)
 {
     LPCLIPFORMAT lpFormat = ClipFormats; 
 
@@ -316,7 +316,7 @@
 /**************************************************************************
  *            GetClipboardOwner16   (USER.140)
  */
-HWND16 GetClipboardOwner16(void)
+HWND16 WINAPI GetClipboardOwner16(void)
 {
     return hWndClipOwner;
 }
@@ -325,7 +325,7 @@
 /**************************************************************************
  *            GetClipboardOwner32   (USER32.224)
  */
-HWND32 GetClipboardOwner32(void)
+HWND32 WINAPI GetClipboardOwner32(void)
 {
     return hWndClipOwner;
 }
@@ -334,7 +334,7 @@
 /**************************************************************************
  *            SetClipboardData16   (USER.141)
  */
-HANDLE16 SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
+HANDLE16 WINAPI SetClipboardData16( UINT16 wFormat, HANDLE16 hData )
 {
     LPCLIPFORMAT lpFormat = ClipFormats; 
     Window       owner;
@@ -391,7 +391,7 @@
 /**************************************************************************
  *            SetClipboardData32   (USER32.469)
  */
-HANDLE32 SetClipboardData32( UINT32 wFormat, HANDLE32 hData )
+HANDLE32 WINAPI SetClipboardData32( UINT32 wFormat, HANDLE32 hData )
 {
     fprintf( stderr, "SetClipboardData: empty stub\n" );
     return 0;
@@ -450,7 +450,7 @@
 /**************************************************************************
  *             GetClipboardData16   (USER.142)
  */
-HANDLE16 GetClipboardData16( UINT16 wFormat )
+HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
 {
     LPCLIPFORMAT lpRender = ClipFormats; 
     LPCLIPFORMAT lpUpdate = NULL;
@@ -499,7 +499,7 @@
 /**************************************************************************
  *             GetClipboardData32   (USER32.221)
  */
-HANDLE32 GetClipboardData32( UINT32 wFormat )
+HANDLE32 WINAPI GetClipboardData32( UINT32 wFormat )
 {
     fprintf( stderr, "GetClipboardData32: empty stub\n" );
     return 0;
@@ -508,7 +508,7 @@
 /**************************************************************************
  *           CountClipboardFormats16   (USER.143)
  */
-INT16 CountClipboardFormats16(void)
+INT16 WINAPI CountClipboardFormats16(void)
 {
     return CountClipboardFormats32();
 }
@@ -517,7 +517,7 @@
 /**************************************************************************
  *           CountClipboardFormats32   (USER32.62)
  */
-INT32 CountClipboardFormats32(void)
+INT32 WINAPI CountClipboardFormats32(void)
 {
     INT32 FormatCount = 0;
     LPCLIPFORMAT lpFormat = ClipFormats; 
@@ -548,7 +548,7 @@
 /**************************************************************************
  *            EnumClipboardFormats16   (USER.144)
  */
-UINT16 EnumClipboardFormats16( UINT16 wFormat )
+UINT16 WINAPI EnumClipboardFormats16( UINT16 wFormat )
 {
     return EnumClipboardFormats32( wFormat );
 }
@@ -557,7 +557,7 @@
 /**************************************************************************
  *            EnumClipboardFormats32   (USER32.178)
  */
-UINT32 EnumClipboardFormats32( UINT32 wFormat )
+UINT32 WINAPI EnumClipboardFormats32( UINT32 wFormat )
 {
     LPCLIPFORMAT lpFormat = ClipFormats; 
 
@@ -600,7 +600,7 @@
 /**************************************************************************
  *            RegisterClipboardFormat16  (USER.145)
  */
-UINT16 RegisterClipboardFormat16( LPCSTR FormatName )
+UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 {
     LPCLIPFORMAT lpNewFormat; 
     LPCLIPFORMAT lpFormat = ClipFormats; 
@@ -646,7 +646,7 @@
 /**************************************************************************
  *            RegisterClipboardFormat32A   (USER32.430)
  */
-UINT32 RegisterClipboardFormat32A( LPCSTR formatName )
+UINT32 WINAPI RegisterClipboardFormat32A( LPCSTR formatName )
 {
     return RegisterClipboardFormat16( formatName );
 }
@@ -655,7 +655,7 @@
 /**************************************************************************
  *            RegisterClipboardFormat32W   (USER32.431)
  */
-UINT32 RegisterClipboardFormat32W( LPCWSTR formatName )
+UINT32 WINAPI RegisterClipboardFormat32W( LPCWSTR formatName )
 {
     LPSTR aFormat = HEAP_strdupWtoA( GetProcessHeap(), 0, formatName );
     UINT32 ret = RegisterClipboardFormat32A( aFormat );
@@ -666,7 +666,7 @@
 /**************************************************************************
  *            GetClipboardFormatName16   (USER.146)
  */
-INT16 GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxlen )
+INT16 WINAPI GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxlen )
 {
     return GetClipboardFormatName32A( wFormat, retStr, maxlen );
 }
@@ -675,7 +675,7 @@
 /**************************************************************************
  *            GetClipboardFormatName32A   (USER32.222)
  */
-INT32 GetClipboardFormatName32A( UINT32 wFormat, LPSTR retStr, INT32 maxlen )
+INT32 WINAPI GetClipboardFormatName32A( UINT32 wFormat, LPSTR retStr, INT32 maxlen )
 {
     LPCLIPFORMAT lpFormat = ClipFormats; 
 
@@ -702,7 +702,7 @@
 /**************************************************************************
  *            GetClipboardFormatName32W   (USER32.223)
  */
-INT32 GetClipboardFormatName32W( UINT32 wFormat, LPWSTR retStr, INT32 maxlen )
+INT32 WINAPI GetClipboardFormatName32W( UINT32 wFormat, LPWSTR retStr, INT32 maxlen )
 {
     LPSTR p = HEAP_xalloc( GetProcessHeap(), 0, maxlen );
     INT32 ret = GetClipboardFormatName32A( wFormat, p, maxlen );
@@ -715,7 +715,7 @@
 /**************************************************************************
  *            SetClipboardViewer16   (USER.147)
  */
-HWND16 SetClipboardViewer16( HWND16 hWnd )
+HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd )
 {
     return SetClipboardViewer32( hWnd );
 }
@@ -724,11 +724,11 @@
 /**************************************************************************
  *            SetClipboardViewer32   (USER32.470)
  */
-HWND32 SetClipboardViewer32( HWND32 hWnd )
+HWND32 WINAPI SetClipboardViewer32( HWND32 hWnd )
 {
     HWND32 hwndPrev = hWndViewer;
 
-    dprintf_clipboard(stddeb,"SetClipboardViewer(%04x)\n", hWnd);
+    dprintf_clipboard(stddeb,"SetClipboardViewer(%04x): returning %04x\n", hWnd, hwndPrev);
 
     hWndViewer = hWnd;
     return hwndPrev;
@@ -738,7 +738,7 @@
 /**************************************************************************
  *           GetClipboardViewer16   (USER.148)
  */
-HWND16 GetClipboardViewer16(void)
+HWND16 WINAPI GetClipboardViewer16(void)
 {
     return hWndViewer;
 }
@@ -747,7 +747,7 @@
 /**************************************************************************
  *           GetClipboardViewer32   (USER32.225)
  */
-HWND32 GetClipboardViewer32(void)
+HWND32 WINAPI GetClipboardViewer32(void)
 {
     return hWndViewer;
 }
@@ -756,7 +756,7 @@
 /**************************************************************************
  *           ChangeClipboardChain16   (USER.149)
  */
-BOOL16 ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
+BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
 {
     return ChangeClipboardChain32(hWnd,hWndNext);
 }
@@ -764,7 +764,7 @@
 /**************************************************************************
  *           ChangeClipboardChain32   (USER32.21)
  */
-BOOL32 ChangeClipboardChain32(HWND32 hWnd, HWND32 hWndNext)
+BOOL32 WINAPI ChangeClipboardChain32(HWND32 hWnd, HWND32 hWndNext)
 {
     BOOL32 bRet = 0;
 
@@ -786,7 +786,7 @@
 /**************************************************************************
  *           IsClipboardFormatAvailable16   (USER.193)
  */
-BOOL16 IsClipboardFormatAvailable16( UINT16 wFormat )
+BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat )
 {
     return IsClipboardFormatAvailable32( wFormat );
 }
@@ -795,7 +795,7 @@
 /**************************************************************************
  *           IsClipboardFormatAvailable32   (USER32.339)
  */
-BOOL32 IsClipboardFormatAvailable32( UINT32 wFormat )
+BOOL32 WINAPI IsClipboardFormatAvailable32( UINT32 wFormat )
 {
     dprintf_clipboard(stddeb,"IsClipboardFormatAvailable(%04X) !\n", wFormat);
 
@@ -809,7 +809,7 @@
 /**************************************************************************
  *             GetOpenClipboardWindow16   (USER.248)
  */
-HWND16 GetOpenClipboardWindow16(void)
+HWND16 WINAPI GetOpenClipboardWindow16(void)
 {
     return hWndClipWindow;
 }
@@ -818,7 +818,7 @@
 /**************************************************************************
  *             GetOpenClipboardWindow32   (USER32.276)
  */
-HWND32 GetOpenClipboardWindow32(void)
+HWND32 WINAPI GetOpenClipboardWindow32(void)
 {
     return hWndClipWindow;
 }
@@ -827,7 +827,7 @@
 /**************************************************************************
  *             GetPriorityClipboardFormat16   (USER.402)
  */
-INT16 GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
+INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
 {
     fprintf( stderr, "GetPriorityClipboardFormat16(%p, %d): stub\n",
              lpPriorityList, nCount );
@@ -838,7 +838,7 @@
 /**************************************************************************
  *             GetPriorityClipboardFormat32   (USER32
  */
-INT32 GetPriorityClipboardFormat32( UINT32 *lpPriorityList, INT32 nCount )
+INT32 WINAPI GetPriorityClipboardFormat32( UINT32 *lpPriorityList, INT32 nCount )
 {
     fprintf( stderr, "GetPriorityClipboardFormat32(%p, %d): stub\n",
              lpPriorityList, nCount );