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/mdi.c b/windows/mdi.c index 39c673e..fe881b9 100644 --- a/windows/mdi.c +++ b/windows/mdi.c
@@ -615,23 +615,29 @@ HDC32 hDCSrc = CreateCompatibleDC32(0); HDC32 hDCDest = CreateCompatibleDC32(hDCSrc); HBITMAP16 hbClose = LoadBitmap16(0, MAKEINTRESOURCE(OBM_CLOSE) ); - HBITMAP16 hbCopy,hb_src,hb_dest; + HBITMAP16 hbCopy; + HANDLE16 hobjSrc, hobjDest; - hb_src = SelectObject32(hDCSrc,hbClose); + hobjSrc = SelectObject32(hDCSrc, hbClose); hbCopy = CreateCompatibleBitmap32(hDCSrc,SYSMETRICS_CXSIZE,SYSMETRICS_CYSIZE); - hb_dest = SelectObject32(hDCDest,hbCopy); + hobjDest = SelectObject32(hDCDest, hbCopy); BitBlt32(hDCDest, 0, 0, SYSMETRICS_CXSIZE, SYSMETRICS_CYSIZE, hDCSrc, SYSMETRICS_CXSIZE, 0, SRCCOPY); - - SelectObject32(hDCSrc,hb_src); - SelectObject32(hDCDest,hb_dest); - + + SelectObject32(hDCSrc, hobjSrc); DeleteObject32(hbClose); - - DeleteDC32(hDCDest); DeleteDC32(hDCSrc); + hobjSrc = SelectObject32( hDCDest, GetStockObject32(BLACK_PEN) ); + + MoveToEx32( hDCDest, SYSMETRICS_CXSIZE - 1, 0, NULL ); + LineTo32( hDCDest, SYSMETRICS_CXSIZE - 1, SYSMETRICS_CYSIZE - 1); + + SelectObject32(hDCDest, hobjSrc ); + SelectObject32(hDCDest, hobjDest); + DeleteDC32(hDCDest); + return hbCopy; } @@ -897,7 +903,8 @@ * * This function is the handler for all MDI requests. */ -LRESULT MDIClientWndProc(HWND16 hwnd, UINT16 message, WPARAM16 wParam, LPARAM lParam) +LRESULT WINAPI MDIClientWndProc(HWND16 hwnd, UINT16 message, WPARAM16 wParam, + LPARAM lParam) { LPCREATESTRUCT16 cs; MDICLIENTINFO *ci; @@ -1090,8 +1097,8 @@ /*********************************************************************** * DefFrameProc16 (USER.445) */ -LRESULT DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient, UINT16 message, - WPARAM16 wParam, LPARAM lParam ) +LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient, + UINT16 message, WPARAM16 wParam, LPARAM lParam ) { HWND16 childHwnd; MDICLIENTINFO* ci; @@ -1188,8 +1195,8 @@ /*********************************************************************** * DefFrameProc32A (USER32.121) */ -LRESULT DefFrameProc32A( HWND32 hwnd, HWND32 hwndMDIClient, UINT32 message, - WPARAM32 wParam, LPARAM lParam ) +LRESULT WINAPI DefFrameProc32A( HWND32 hwnd, HWND32 hwndMDIClient, + UINT32 message, WPARAM32 wParam, LPARAM lParam) { if (hwndMDIClient) { @@ -1228,8 +1235,8 @@ /*********************************************************************** * DefFrameProc32W (USER32.122) */ -LRESULT DefFrameProc32W( HWND32 hwnd, HWND32 hwndMDIClient, UINT32 message, - WPARAM32 wParam, LPARAM lParam ) +LRESULT WINAPI DefFrameProc32W( HWND32 hwnd, HWND32 hwndMDIClient, + UINT32 message, WPARAM32 wParam, LPARAM lParam) { if (hwndMDIClient) { @@ -1265,8 +1272,8 @@ /*********************************************************************** * DefMDIChildProc16 (USER.447) */ -LRESULT DefMDIChildProc16( HWND16 hwnd, UINT16 message, - WPARAM16 wParam, LPARAM lParam ) +LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message, + WPARAM16 wParam, LPARAM lParam ) { MDICLIENTINFO *ci; WND *clientWnd; @@ -1411,8 +1418,8 @@ /*********************************************************************** * DefMDIChildProc32A (USER32.123) */ -LRESULT DefMDIChildProc32A( HWND32 hwnd, UINT32 message, - WPARAM32 wParam, LPARAM lParam ) +LRESULT WINAPI DefMDIChildProc32A( HWND32 hwnd, UINT32 message, + WPARAM32 wParam, LPARAM lParam ) { MDICLIENTINFO *ci; WND *clientWnd; @@ -1463,8 +1470,8 @@ /*********************************************************************** * DefMDIChildProc32W (USER32.124) */ -LRESULT DefMDIChildProc32W( HWND32 hwnd, UINT32 message, - WPARAM32 wParam, LPARAM lParam ) +LRESULT WINAPI DefMDIChildProc32W( HWND32 hwnd, UINT32 message, + WPARAM32 wParam, LPARAM lParam ) { MDICLIENTINFO *ci; WND *clientWnd; @@ -1509,7 +1516,7 @@ /********************************************************************** * TranslateMDISysAccel32 (USER32.554) */ -BOOL32 TranslateMDISysAccel32( HWND32 hwndClient, LPMSG32 msg ) +BOOL32 WINAPI TranslateMDISysAccel32( HWND32 hwndClient, LPMSG32 msg ) { MSG16 msg16; @@ -1522,7 +1529,7 @@ /********************************************************************** * TranslateMDISysAccel16 (USER.451) */ -BOOL16 TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg ) +BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg ) { WND* clientWnd = WIN_FindWndPtr( hwndClient); @@ -1570,7 +1577,7 @@ /*********************************************************************** * CalcChildScroll (USER.462) */ -void CalcChildScroll( HWND16 hwnd, WORD scroll ) +void WINAPI CalcChildScroll( HWND16 hwnd, WORD scroll ) { RECT32 childRect, clientRect; INT32 vmin, vmax, hmin, hmax, vpos, hpos; @@ -1620,7 +1627,7 @@ /*********************************************************************** * ScrollChildren16 (USER.463) */ -void ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam) +void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam) { return ScrollChildren32( hWnd, uMsg, wParam, lParam ); } @@ -1629,7 +1636,8 @@ /*********************************************************************** * ScrollChildren32 (USER32.447) */ -void ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam) +void WINAPI ScrollChildren32(HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam, + LPARAM lParam) { WND *wndPtr = WIN_FindWndPtr(hWnd); INT32 newPos = -1; @@ -1694,8 +1702,10 @@ SetScrollPos32(hWnd, (uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ , newPos, TRUE); if( uMsg == WM_VSCROLL ) - ScrollWindow32(hWnd ,0 ,curPos - newPos, NULL, NULL); + ScrollWindowEx32(hWnd ,0 ,curPos - newPos, NULL, NULL, 0, NULL, + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); else - ScrollWindow32(hWnd ,curPos - newPos, 0, NULL, NULL); + ScrollWindowEx32(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL, + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); }