Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
diff --git a/controls/menu.c b/controls/menu.c
index a31b2f1..35a89f1 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3,6 +3,7 @@
*
* Copyright 1993 Martin Ayotte
* Copyright 1994 Alexandre Julliard
+ * Copyright 1997 Morten Welinder
*/
/*
@@ -142,6 +143,7 @@
static WORD check_bitmap_width = 0, check_bitmap_height = 0;
static WORD arrow_bitmap_width = 0, arrow_bitmap_height = 0;
+static HBITMAP32 hStdRadioCheck = 0;
static HBITMAP32 hStdCheck = 0;
static HBITMAP32 hStdMnArrow = 0;
static HBRUSH32 hShadeBrush = 0;
@@ -316,38 +318,50 @@
*/
BOOL32 MENU_Init()
{
- /* Load menu bitmaps */
+ HBITMAP32 hBitmap;
+ static unsigned char shade_bits[16] = { 0x55, 0, 0xAA, 0,
+ 0x55, 0, 0xAA, 0,
+ 0x55, 0, 0xAA, 0,
+ 0x55, 0, 0xAA, 0 };
- if ((hStdCheck = LoadBitmap32A( 0, (LPSTR)MAKEINTRESOURCE(OBM_CHECK) )))
+ /* Load menu bitmaps */
+ hStdCheck = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_CHECK));
+ hStdRadioCheck = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_RADIOCHECK));
+ hStdMnArrow = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_MNARROW));
+
+ if (hStdCheck)
{
BITMAP32 bm;
-
GetObject32A( hStdCheck, sizeof(bm), &bm );
check_bitmap_width = bm.bmWidth;
check_bitmap_height = bm.bmHeight;
+ } else
+ return FALSE;
- if ((hStdMnArrow = LoadBitmap32A(0,(LPSTR)MAKEINTRESOURCE(OBM_MNARROW))))
+ /* Assume that radio checks have the same size as regular check. */
+ if (!hStdRadioCheck)
+ return FALSE;
+
+ if (hStdMnArrow)
{
- HBITMAP32 hBitmap;
- static unsigned char shade_bits[16] = { 0x55, 0, 0xAA, 0,
- 0x55, 0, 0xAA, 0,
- 0x55, 0, 0xAA, 0,
- 0x55, 0, 0xAA, 0 };
+ BITMAP32 bm;
GetObject32A( hStdMnArrow, sizeof(bm), &bm );
arrow_bitmap_width = bm.bmWidth;
arrow_bitmap_height = bm.bmHeight;
+ } else
+ return FALSE;
- if((hBitmap = CreateBitmap32( 8, 8, 1, 1, shade_bits)))
+ if ((hBitmap = CreateBitmap32( 8, 8, 1, 1, shade_bits)))
{
if((hShadeBrush = CreatePatternBrush32( hBitmap )))
{
DeleteObject32( hBitmap );
- if((MENU_DefSysPopup = MENU_CopySysPopup())) return TRUE;
- }
- }
+ if ((MENU_DefSysPopup = MENU_CopySysPopup()))
+ return TRUE;
}
}
- return FALSE; /* failure */
+
+ return FALSE;
}
/***********************************************************************
@@ -720,7 +734,7 @@
/***********************************************************************
* MENU_MenuBarCalcSize
*
- * FIXME: Word 6 implements it's own MDI and it's 'close window' bitmap
+ * FIXME: Word 6 implements its own MDI and its own 'close window' bitmap
* height is off by 1 pixel which causes lengthy window relocations when
* active document window is maximized/restored.
*
@@ -936,10 +950,16 @@
*/
if (lpitem->fState & MF_CHECKED)
- GRAPH_DrawBitmap( hdc, lpitem->hCheckBit ? lpitem->hCheckBit
- : hStdCheck, rect.left, (y - check_bitmap_height) / 2,
- 0, 0, check_bitmap_width, check_bitmap_height, TRUE );
- else if (lpitem->hUnCheckBit)
+ {
+ HBITMAP32 bm =
+ lpitem->hCheckBit ? lpitem->hCheckBit :
+ ((lpitem->fType & MFT_RADIOCHECK)
+ ? hStdRadioCheck : hStdCheck);
+ GRAPH_DrawBitmap( hdc, bm, rect.left,
+ (y - check_bitmap_height) / 2,
+ 0, 0, check_bitmap_width,
+ check_bitmap_height, TRUE );
+ } else if (lpitem->hUnCheckBit)
GRAPH_DrawBitmap( hdc, lpitem->hUnCheckBit, rect.left,
(y - check_bitmap_height) / 2, 0, 0,
check_bitmap_width, check_bitmap_height, TRUE );
@@ -3872,3 +3892,105 @@
MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos);
return SetMenuItemInfo32_common(item, (const MENUITEMINFO32A*)lpmii, TRUE);
}
+
+/**********************************************************************
+ * CheckMenuRadioItem32 (USER32.47)
+ */
+
+BOOL32 WINAPI CheckMenuRadioItem32(HMENU32 hMenu,
+ UINT32 first, UINT32 last, UINT32 check,
+ BOOL32 bypos)
+{
+ MENUITEM *mifirst, *milast, *micheck;
+ HMENU32 mfirst = hMenu, mlast = hMenu, mcheck = hMenu;
+
+ dprintf_menu (stddeb,
+ "CheckMenuRadioItem32: ox%x: %d-%d, check %d, bypos=%d\n",
+ hMenu, first, last, check, bypos);
+
+ mifirst = MENU_FindItem (&mfirst, &first, bypos);
+ milast = MENU_FindItem (&mlast, &last, bypos);
+ micheck = MENU_FindItem (&mcheck, &check, bypos);
+
+ if (mifirst == NULL || milast == NULL || micheck == NULL ||
+ mifirst > milast || mfirst != mlast || mfirst != mcheck ||
+ micheck > milast || micheck < mifirst)
+ return FALSE;
+
+ while (mifirst <= milast)
+ {
+ if (mifirst == micheck)
+ {
+ mifirst->fType |= MFT_RADIOCHECK;
+ mifirst->fState |= MFS_CHECKED;
+ } else {
+ mifirst->fType &= ~MFT_RADIOCHECK;
+ mifirst->fState &= ~MFS_CHECKED;
+ }
+ mifirst++;
+ }
+
+ return TRUE;
+}
+
+/**********************************************************************
+ * CheckMenuRadioItem16 (not a Windows API)
+ */
+
+BOOL16 WINAPI CheckMenuRadioItem16(HMENU16 hMenu,
+ UINT16 first, UINT16 last, UINT16 check,
+ BOOL16 bypos)
+{
+ return CheckMenuRadioItem32 (hMenu, first, last, check, bypos);
+}
+
+/**********************************************************************
+ * GetMenuItemRect32 (USER32.266)
+ */
+
+BOOL32 WINAPI GetMenuItemRect32 (HWND32 hwnd, HMENU32 hMenu, UINT32 uItem,
+ LPRECT32 rect)
+{
+ RECT32 saverect, clientrect;
+ BOOL32 barp;
+ HDC32 hdc;
+ WND *wndPtr;
+ MENUITEM *item;
+ HMENU32 orghMenu = hMenu;
+
+ dprintf_menu (stddeb, "GetMenuItemRect32 (0x%x,0x%x,%d,%p)\n",
+ hwnd, hMenu, uItem, rect);
+
+ item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION);
+ wndPtr = WIN_FindWndPtr (hwnd);
+ if (!rect || !item || !wndPtr) return FALSE;
+
+ GetClientRect32( hwnd, &clientrect );
+ hdc = GetDCEx32( hwnd, 0, DCX_CACHE | DCX_WINDOW );
+ barp = (hMenu == orghMenu);
+
+ saverect = item->rect;
+ MENU_CalcItemSize (hdc, item, hwnd,
+ clientrect.left, clientrect.top, barp);
+ *rect = item->rect;
+ item->rect = saverect;
+
+ ReleaseDC32( hwnd, hdc );
+ return TRUE;
+}
+
+/**********************************************************************
+ * GetMenuItemRect16 (USER.665)
+ */
+
+BOOL16 WINAPI GetMenuItemRect16 (HWND16 hwnd, HMENU16 hMenu, UINT16 uItem,
+ LPRECT16 rect)
+{
+ RECT32 r32;
+ BOOL32 res;
+
+ if (!rect) return FALSE;
+ res = GetMenuItemRect32 (hwnd, hMenu, uItem, &r32);
+ CONV_RECT32TO16 (&r32, rect);
+ return res;
+}
