Release 961013
Sun Oct 13 15:32:32 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [Make.rules.in] [*/Makefile.in]
Made it possible to compile from a directory other than the source
directory.
* [graphics/metafiledrv/init.c] [include/metafiledrv.h]
[objects/metafile.c] [objects/dc.c]
New graphics driver for metafiles.
* [if1632/thunk.c]
Added thunks for SetWindowsHook and SetDCHook.
* [windows/dialog.c]
Fixed GetNextDlgGroupItem and GetNextDlgTabItem to skip disabled
items.
* [*/*]
Removed non Win32-clean types HANDLE, HBITMAP, HBRUSH, HFONT,
HINSTANCE, HMENU, HRGN and HTASK.
Wed Oct 9 14:59:45 1996 Frans van Dorsselaer <dorssel@rulhm1.LeidenUniv.nl>
* [controls/edit.c]
Fixed EditWndProc() to fall back to DefWndProc() when the
edit state structure is not available.
Wed Oct 2 14:00:34 1996 Huw D. M. Davies <h.davies1@physics.oxford.ac.uk>
* [windows/nonclient.c] [windows/mdi.c]
AdjustWindowRectEx16() should only take notice of the styles
WS_DLGFRAME, WS_BORDER, WS_THICKFRAME and
WS_EX_DLGMODALFRAME. Thanks to Alex Korobka.
* [controls/scroll.c]
Fixed typo in ShowScrollBar32().
Sun Aug 25 20:18:56 1996 Jukka Iivonen <iivonen@cc.helsinki.fi>
* [if1632/user32.spec] [if1632/winmm.spec]
Added SetParent and sndPlaySoundA.
diff --git a/windows/mdi.c b/windows/mdi.c
index 40b0d4d..6631b94 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -31,8 +31,8 @@
#include "debug.h"
-static HBITMAP hBmpClose = 0;
-static HBITMAP hBmpRestore = 0;
+static HBITMAP16 hBmpClose = 0;
+static HBITMAP16 hBmpRestore = 0;
DWORD SCROLL_SetNCSbState(WND*,int,int,int,int,int,int);
@@ -215,7 +215,8 @@
/**********************************************************************
* MDISetMenu
*/
-HMENU MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow)
+HMENU16 MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU16 hmenuFrame,
+ HMENU16 hmenuWindow)
{
WND *w = WIN_FindWndPtr(hwnd);
MDICLIENTINFO *ci;
@@ -228,7 +229,7 @@
if (!fRefresh)
{
HWND hwndFrame = GetParent16(hwnd);
- HMENU oldFrameMenu = GetMenu(hwndFrame);
+ HMENU16 oldFrameMenu = GetMenu(hwndFrame);
if( ci->hwndChildMaximized && hmenuFrame && hmenuFrame!=oldFrameMenu )
MDI_RestoreFrameMenu(w->parent, ci->hwndChildMaximized );
@@ -356,7 +357,7 @@
hwnd = CreateWindow16( (LPCSTR)PTR_SEG_TO_LIN(cs->szClass),
(LPCSTR)PTR_SEG_TO_LIN(cs->szTitle), style,
cs->x, cs->y, cs->cx, cs->cy, parent,
- (HMENU)(DWORD)(WORD)wIDmenu, w->hInstance,
+ (HMENU16)wIDmenu, w->hInstance,
(LPVOID)lParam);
/* MDI windows are WS_CHILD so they won't be activated by CreateWindow */
@@ -406,8 +407,7 @@
MapWindowPoints16(clientWnd->parent->hwndSelf,
((MDICLIENTINFO*)clientWnd->wExtra)->self, (LPPOINT16)&rect, 2);
- AdjustWindowRectEx16( &rect, childWnd->dwStyle & ~(WS_VSCROLL | WS_HSCROLL),
- 0, childWnd->dwExStyle );
+ AdjustWindowRectEx16( &rect, childWnd->dwStyle, 0, childWnd->dwExStyle );
lpMinMax->ptMaxSize.x = rect.right -= rect.left;
lpMinMax->ptMaxSize.y = rect.bottom -= rect.top;
@@ -664,7 +664,7 @@
/**********************************************************************
* CreateMDIMenuBitmap
*/
-HBITMAP CreateMDIMenuBitmap(void)
+HBITMAP16 CreateMDIMenuBitmap(void)
{
HDC hDCSrc = CreateCompatibleDC(0);
HDC hDCDest = CreateCompatibleDC(hDCSrc);
@@ -842,7 +842,7 @@
{
WND* child = WIN_FindWndPtr(hChild);
HGLOBAL16 handle;
- HMENU hSysPopup = 0;
+ HMENU16 hSysPopup = 0;
dprintf_mdi(stddeb,"MDI_AugmentFrameMenu: frame %p,child %04x\n",frame,hChild);
@@ -1070,7 +1070,7 @@
case WM_MDISETMENU:
#ifdef WINELIB32
- return (LRESULT)MDISetMenu(hwnd, FALSE, (HMENU)wParam, (HMENU)lParam);
+ return (LRESULT)MDISetMenu(hwnd, FALSE, (HMENU16)wParam, (HMENU16)lParam);
#else
return (LRESULT)MDISetMenu(hwnd, wParam, LOWORD(lParam), HIWORD(lParam));
#endif
