Release 980413
Sun Apr 12 12:22:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/drive.c]
Fixed "no free space" problem with partition sizes between 1 and 2 GB
(cluster_sectors may not exceed 0x40).
* [windows/msgbox.c] [if1632/user.spec] [include/windows.h]
Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16.
* [loader/task.c]
DOS environment strings may never exceed 127 chars
-> truncate Unix environment strings if necessary.
Sun Apr 12 02:51:44 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [files/*.c]
All fprintf statements were converted to appropriate debug
messages.
* [tools/find_debug_channels]
Updated comments at the beginning of the file.
Sat Apr 11 15:27:21 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c] [loader/task.c] [scheduler/process.c]
Moved some code around to prepare the ground for CreateProcess().
* [memory/environ.c] [loader/task.c]
Moved Win32 environment strings functions to environ.c.
Unified Win16 and Win32 environment management.
* [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c]
Implemented handle inheritance and DuplicateHandle().
* [scheduler/thread.c]
Create a 16-bit stack for all threads.
* [windows/dialog.c]
Implemented DIALOGEX resource format.
Fri Apr 10 20:21:51 1998 Marcus Meissner <marcus@mud.de>
* [configure.in][include/acconfig.h][*/*][multimedia/*]
Cleaned up the OSS detection stuff, added some more checks for
headerfiles/functions.
Removed a lot of OS specific #ifdefs.
Lots of dependend multimedia cleanups.
* [loader/pe_image.c]
Enhanced comment, added missing reference count increase.
* [ole/compobj.c]
Replaced broken StringFromGUID2 by working one.
* [misc/winsock.c]
SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned
int (32bit) for UNIX.
* [memory/global.c]
Allow realloc for lockcount 1 too.
Fri Apr 10 15:27:34 1998 Morten Welinder <terra@diku.dk>
* [graphics/x11drv/text.c]
Handle control characters in trace. Ignore terminating newline.
* [multimedia/init.c]
(MULTIMEDIA_Init): Correct allocations.
* [tools/examine-relay]
Tidy up.
* [windows/syscolor.c]
Change highlight colour from lightblue to lightgray. This
looks correct for menus.
Fri Apr 10 01:49:58 1998 Douglas Ridgway <ridgway@winehq.com>
* [configure.in] [Make.rules.in]
Add check for c2man before using it.
Fri Apr 10 02:59:21 1998 Douglas Ridgway <ridgway@winehq.com>
* [DEVELOPERS-HINTS]
Simple description of adding API calls.
* [include/wintypes.h] [include/windows.h]
Get rid of Winelib16, avoid declaring some illegal functions in
Winelib, add prototypes for some enhanced metafile functions, fix
GetTextExtentPoint32 declarations.
* [relay32/gdi32.spec] [objects/enhmetafile.c]
Cosmetic and functional improvements.
* [include/wincon.h] [programs/view/*]
Fixes, improved compatibility with native compilers.
Thu Apr 9 15:48:49 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c]
Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime.
Fixed Common32ThkLS thunk function.
* [tools/build.c] [relay32/relay386.c] [if1632/relay.c]
Changed relay code to allow register functions to modify stack layout.
* [memory/selector.c]
Implemented AllocMappedBuffer / FreeMappedBuffer.
* [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c]
Added names for undocumented functions.
* [loader/module.c]
Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL.
Thu Apr 9 03:54:58 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/keyboard.c]
Fix an erroneous test in TranslateAccelerator{16,32} for the end
of the accelerator table.
Thu Apr 8 20:36:28 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [misc/crtdll.c]
Implement getenv.
* [misc/commdlg.c]
Make Get[Save/Open]FileName work in most situations.
* [misc/lstr.c]
Use wvsprintf32A instead of vsprintf in FormatMessage32X
* [misc/version]
Make NT3.50 a recognised version
* [graphics/x11drv/graphics.c]
Change the algorithme to draw arcs
* [loader/resource.c]
Return an empty buffer in LoadString32A if no resource found.
* [win32/code_page.c]
Try harder to get the right size in MultiByteToWideChar.
* [win32/process.c]
Call WinExec32 for CreateProcess32A.
* [windows/user.c]
Install default Int0 Handler in InitApp().
Thu Apr 8 19:29:48 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [misc/imagelist.c]
Preliminary fix for drawing selected images.
Various improvements.
* [controls/progress.c][include/progress.c][include/commctrl.h]
Added progress bar messages and styles for IE4.01 (dll version 4.72)
compatibility.
Fixed led size problem.
* [controls/updown.c][include/commctrl.h]
Added UDM_GETRANGE32 and UDM_SETRANGE32.
* [objects/oembitmaps.c][include/windows.h][include/bitmaps/*]
Added Win95 icons and fixed Win95 cursor and restore button bug.
Now they should be visible. Sorry!!!
* [relay32/comctl32.spec]
Added most missing function names.
Tue Apr 6 18:48:36 1998 Matthew Becker <mbecker@glasscity.net>
* [objects/font.c] [if1632/gdi.spec]
GetOutlineTextMetrics: stub
* [objects/text.c]
GetTextCharset should just call GetTextCharsetInfo.
* [misc/mpr.c] [relay32/mpr.spec]
WNetCachePassword: stub
* [scheduler/thread.c] [relay32/user32.spec]
AttachThreadInput: stub
Updated documentation.
* [objects/palette.c]
Updated documentation.
Tue Mar 31 17:06:30 1998 James Juran <jrj120@psu.edu>
* [*/*.c]
Finished fixing USER32 ordinal numbers in function documentation.
Mon Mar 30 20:27:38 1998 Morten Welinder <terra@diku.dk>
* [misc/debugstr.c] [include/debugstr.h]
Moved _dumpstr from relay32/relay386.c. Improved control
character handling.
* [msdos/int21.c]
Implement 215E00 -- get machine name.
* [windows/winpos.c]
SetWindowPos32: Make an extra sync when mapping managed
windows. This makes sure the reconfigure event has been
handled. See Mshearts' what's-your-name window.
Mon Mar 30 01:13:50 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [Makefile.in]
Install includes from TOPSRCDIR.
diff --git a/controls/menu.c b/controls/menu.c
index 3508d4d..f9efbf8 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -329,9 +329,9 @@
0x55, 0, 0xAA, 0 };
/* Load menu bitmaps */
- hStdCheck = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_CHECK));
- hStdRadioCheck = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_RADIOCHECK));
- hStdMnArrow = LoadBitmap32A(0, (LPSTR)MAKEINTRESOURCE(OBM_MNARROW));
+ hStdCheck = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_CHECK));
+ hStdRadioCheck = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_RADIOCHECK));
+ hStdMnArrow = LoadBitmap32A(0, MAKEINTRESOURCE32A(OBM_MNARROW));
if (hStdCheck)
{
@@ -2542,7 +2542,7 @@
/**********************************************************************
- * TrackPopupMenu32 (USER32.548)
+ * TrackPopupMenu32 (USER32.549)
*/
BOOL32 WINAPI TrackPopupMenu32( HMENU32 hMenu, UINT32 wFlags, INT32 x, INT32 y,
INT32 nReserved, HWND32 hWnd, const RECT32 *lpRect )
@@ -2558,7 +2558,7 @@
}
/**********************************************************************
- * TrackPopupMenuEx (USER32.549)
+ * TrackPopupMenuEx (USER32.550)
*/
BOOL32 WINAPI TrackPopupMenuEx( HMENU32 hMenu, UINT32 wFlags, INT32 x, INT32 y,
HWND32 hWnd, LPTPMPARAMS lpTpm )
@@ -2702,7 +2702,7 @@
/*******************************************************************
- * ChangeMenu32A (USER32.22)
+ * ChangeMenu32A (USER32.23)
*/
BOOL32 WINAPI ChangeMenu32A( HMENU32 hMenu, UINT32 pos, LPCSTR data,
UINT32 id, UINT32 flags )
@@ -2723,7 +2723,7 @@
/*******************************************************************
- * ChangeMenu32W (USER32.23)
+ * ChangeMenu32W (USER32.24)
*/
BOOL32 WINAPI ChangeMenu32W( HMENU32 hMenu, UINT32 pos, LPCWSTR data,
UINT32 id, UINT32 flags )
@@ -2753,7 +2753,7 @@
/*******************************************************************
- * CheckMenuItem32 (USER32.45)
+ * CheckMenuItem32 (USER32.46)
*/
DWORD WINAPI CheckMenuItem32( HMENU32 hMenu, UINT32 id, UINT32 flags )
{
@@ -2779,7 +2779,7 @@
/**********************************************************************
- * EnableMenuItem32 (USER32.169)
+ * EnableMenuItem32 (USER32.170)
*/
BOOL32 WINAPI EnableMenuItem32( HMENU32 hMenu, UINT32 wItemID, UINT32 wFlags )
{
@@ -2827,7 +2827,7 @@
/*******************************************************************
- * GetMenuString32A (USER32.267)
+ * GetMenuString32A (USER32.268)
*/
INT32 WINAPI GetMenuString32A( HMENU32 hMenu, UINT32 wItemID,
LPSTR str, INT32 nMaxSiz, UINT32 wFlags )
@@ -2847,7 +2847,7 @@
/*******************************************************************
- * GetMenuString32W (USER32.268)
+ * GetMenuString32W (USER32.269)
*/
INT32 WINAPI GetMenuString32W( HMENU32 hMenu, UINT32 wItemID,
LPWSTR str, INT32 nMaxSiz, UINT32 wFlags )
@@ -2876,7 +2876,7 @@
/**********************************************************************
- * HiliteMenuItem32 (USER32.317)
+ * HiliteMenuItem32 (USER32.318)
*/
BOOL32 WINAPI HiliteMenuItem32( HWND32 hWnd, HMENU32 hMenu, UINT32 wItemID,
UINT32 wHilite )
@@ -2903,7 +2903,7 @@
/**********************************************************************
- * GetMenuState32 (USER32.266)
+ * GetMenuState32 (USER32.267)
*/
UINT32 WINAPI GetMenuState32( HMENU32 hMenu, UINT32 wItemID, UINT32 wFlags )
{
@@ -2942,7 +2942,7 @@
/**********************************************************************
- * GetMenuItemCount32 (USER32.261)
+ * GetMenuItemCount32 (USER32.262)
*/
INT32 WINAPI GetMenuItemCount32( HMENU32 hMenu )
{
@@ -2969,7 +2969,7 @@
/**********************************************************************
- * GetMenuItemID32 (USER32.262)
+ * GetMenuItemID32 (USER32.263)
*/
UINT32 WINAPI GetMenuItemID32( HMENU32 hMenu, INT32 nPos )
{
@@ -2997,7 +2997,7 @@
/*******************************************************************
- * InsertMenu32A (USER32.321)
+ * InsertMenu32A (USER32.322)
*/
BOOL32 WINAPI InsertMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
UINT32 id, LPCSTR str )
@@ -3030,7 +3030,7 @@
/*******************************************************************
- * InsertMenu32W (USER32.324)
+ * InsertMenu32W (USER32.325)
*/
BOOL32 WINAPI InsertMenu32W( HMENU32 hMenu, UINT32 pos, UINT32 flags,
UINT32 id, LPCWSTR str )
@@ -3058,7 +3058,7 @@
/*******************************************************************
- * AppendMenu32A (USER32.4)
+ * AppendMenu32A (USER32.5)
*/
BOOL32 WINAPI AppendMenu32A( HMENU32 hMenu, UINT32 flags,
UINT32 id, LPCSTR data )
@@ -3068,7 +3068,7 @@
/*******************************************************************
- * AppendMenu32W (USER32.5)
+ * AppendMenu32W (USER32.6)
*/
BOOL32 WINAPI AppendMenu32W( HMENU32 hMenu, UINT32 flags,
UINT32 id, LPCWSTR data )
@@ -3087,7 +3087,7 @@
/**********************************************************************
- * RemoveMenu32 (USER32.440)
+ * RemoveMenu32 (USER32.441)
*/
BOOL32 WINAPI RemoveMenu32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags )
{
@@ -3132,7 +3132,7 @@
/**********************************************************************
- * DeleteMenu32 (USER32.128)
+ * DeleteMenu32 (USER32.129)
*/
BOOL32 WINAPI DeleteMenu32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags )
{
@@ -3159,7 +3159,7 @@
/*******************************************************************
- * ModifyMenu32A (USER32.396)
+ * ModifyMenu32A (USER32.397)
*/
BOOL32 WINAPI ModifyMenu32A( HMENU32 hMenu, UINT32 pos, UINT32 flags,
UINT32 id, LPCSTR str )
@@ -3184,7 +3184,7 @@
/*******************************************************************
- * ModifyMenu32W (USER32.397)
+ * ModifyMenu32W (USER32.398)
*/
BOOL32 WINAPI ModifyMenu32W( HMENU32 hMenu, UINT32 pos, UINT32 flags,
UINT32 id, LPCWSTR str )
@@ -3212,7 +3212,7 @@
/**********************************************************************
- * CreatePopupMenu32 (USER32.81)
+ * CreatePopupMenu32 (USER32.82)
*/
HMENU32 WINAPI CreatePopupMenu32(void)
{
@@ -3227,7 +3227,7 @@
/**********************************************************************
- * GetMenuCheckMarkDimensions (USER.417) (USER32.257)
+ * GetMenuCheckMarkDimensions (USER.417) (USER32.258)
*/
DWORD WINAPI GetMenuCheckMarkDimensions(void)
{
@@ -3246,7 +3246,7 @@
/**********************************************************************
- * SetMenuItemBitmaps32 (USER32.489)
+ * SetMenuItemBitmaps32 (USER32.490)
*/
BOOL32 WINAPI SetMenuItemBitmaps32( HMENU32 hMenu, UINT32 nPos, UINT32 wFlags,
HBITMAP32 hNewUnCheck, HBITMAP32 hNewCheck)
@@ -3280,7 +3280,7 @@
/**********************************************************************
- * CreateMenu32 (USER32.80)
+ * CreateMenu32 (USER32.81)
*/
HMENU32 WINAPI CreateMenu32(void)
{
@@ -3312,7 +3312,7 @@
/**********************************************************************
- * DestroyMenu32 (USER32.133)
+ * DestroyMenu32 (USER32.134)
*/
BOOL32 WINAPI DestroyMenu32( HMENU32 hMenu )
{
@@ -3364,7 +3364,7 @@
/**********************************************************************
- * GetSystemMenu32 (USER32.290)
+ * GetSystemMenu32 (USER32.291)
*/
HMENU32 WINAPI GetSystemMenu32( HWND32 hWnd, BOOL32 bRevert )
{
@@ -3408,7 +3408,7 @@
/*******************************************************************
- * SetSystemMenu32 (USER32.507)
+ * SetSystemMenu32 (USER32.508)
*/
BOOL32 WINAPI SetSystemMenu32( HWND32 hwnd, HMENU32 hMenu )
{
@@ -3437,7 +3437,7 @@
/**********************************************************************
- * GetMenu32 (USER32.256)
+ * GetMenu32 (USER32.257)
*/
HMENU32 WINAPI GetMenu32( HWND32 hWnd )
{
@@ -3458,7 +3458,7 @@
/**********************************************************************
- * SetMenu32 (USER32.486)
+ * SetMenu32 (USER32.487)
*/
BOOL32 WINAPI SetMenu32( HWND32 hWnd, HMENU32 hMenu )
{
@@ -3500,7 +3500,7 @@
/**********************************************************************
- * GetSubMenu32 (USER32.287)
+ * GetSubMenu32 (USER32.288)
*/
HMENU32 WINAPI GetSubMenu32( HMENU32 hMenu, INT32 nPos )
{
@@ -3523,7 +3523,7 @@
/**********************************************************************
- * DrawMenuBar32 (USER32.160)
+ * DrawMenuBar32 (USER32.161)
*/
BOOL32 WINAPI DrawMenuBar32( HWND32 hWnd )
{
@@ -3544,7 +3544,7 @@
/***********************************************************************
- * EndMenu (USER.187) (USER32.174)
+ * EndMenu (USER.187) (USER32.175)
*/
void WINAPI EndMenu(void)
{
@@ -3589,7 +3589,7 @@
return LoadMenu32A(instance,PTR_SEG_TO_LIN(name));
instance = GetExePtr( instance );
- if (!(hRsrc = FindResource16( instance, name, RT_MENU ))) return 0;
+ if (!(hRsrc = FindResource16( instance, name, RT_MENU16 ))) return 0;
if (!(handle = LoadResource16( instance, hRsrc ))) return 0;
hMenu = LoadMenuIndirect16(LockResource16(handle));
FreeResource16( handle );
@@ -3602,18 +3602,18 @@
*/
HMENU32 WINAPI LoadMenu32A( HINSTANCE32 instance, LPCSTR name )
{
- HRSRC32 hrsrc = FindResource32A( instance, name, (LPSTR)RT_MENU );
+ HRSRC32 hrsrc = FindResource32A( instance, name, RT_MENU32A );
if (!hrsrc) return 0;
return LoadMenuIndirect32A( (LPCVOID)LoadResource32( instance, hrsrc ));
}
/*****************************************************************
- * LoadMenu32W (USER32.372)
+ * LoadMenu32W (USER32.373)
*/
HMENU32 WINAPI LoadMenu32W( HINSTANCE32 instance, LPCWSTR name )
{
- HRSRC32 hrsrc = FindResource32W( instance, name, (LPWSTR)RT_MENU );
+ HRSRC32 hrsrc = FindResource32W( instance, name, RT_MENU32W );
if (!hrsrc) return 0;
return LoadMenuIndirect32W( (LPCVOID)LoadResource32( instance, hrsrc ));
}
@@ -3649,7 +3649,7 @@
/**********************************************************************
- * LoadMenuIndirect32A (USER32.370)
+ * LoadMenuIndirect32A (USER32.371)
*/
HMENU32 WINAPI LoadMenuIndirect32A( LPCVOID template )
{
@@ -3690,7 +3690,7 @@
/**********************************************************************
- * LoadMenuIndirect32W (USER32.371)
+ * LoadMenuIndirect32W (USER32.372)
*/
HMENU32 WINAPI LoadMenuIndirect32W( LPCVOID template )
{
@@ -3710,7 +3710,7 @@
/**********************************************************************
- * IsMenu32 (USER32.345)
+ * IsMenu32 (USER32.346)
*/
BOOL32 WINAPI IsMenu32(HMENU32 hmenu)
{
@@ -3775,7 +3775,7 @@
}
/**********************************************************************
- * GetMenuItemInfo32A (USER32.263)
+ * GetMenuItemInfo32A (USER32.264)
*/
BOOL32 WINAPI GetMenuItemInfo32A( HMENU32 hmenu, UINT32 item, BOOL32 bypos,
LPMENUITEMINFO32A lpmii)
@@ -3784,7 +3784,7 @@
}
/**********************************************************************
- * GetMenuItemInfo32W (USER32.264)
+ * GetMenuItemInfo32W (USER32.265)
*/
BOOL32 WINAPI GetMenuItemInfo32W( HMENU32 hmenu, UINT32 item, BOOL32 bypos,
LPMENUITEMINFO32W lpmii)
@@ -3840,7 +3840,7 @@
}
/**********************************************************************
- * SetMenuItemInfo32A (USER32.490)
+ * SetMenuItemInfo32A (USER32.491)
*/
BOOL32 WINAPI SetMenuItemInfo32A(HMENU32 hmenu, UINT32 item, BOOL32 bypos,
const MENUITEMINFO32A *lpmii)
@@ -3850,7 +3850,7 @@
}
/**********************************************************************
- * SetMenuItemInfo32W (USER32.491)
+ * SetMenuItemInfo32W (USER32.492)
*/
BOOL32 WINAPI SetMenuItemInfo32W(HMENU32 hmenu, UINT32 item, BOOL32 bypos,
const MENUITEMINFO32W *lpmii)
@@ -3860,7 +3860,7 @@
}
/**********************************************************************
- * SetMenuDefaultItem32 (USER32.488)
+ * SetMenuDefaultItem32 (USER32.489)
*/
BOOL32 WINAPI SetMenuDefaultItem32(HMENU32 hmenu, UINT32 item, BOOL32 bypos)
{
@@ -3900,7 +3900,7 @@
/**********************************************************************
- * InsertMenuItem32A (USER32.322)
+ * InsertMenuItem32A (USER32.323)
*/
BOOL32 WINAPI InsertMenuItem32A(HMENU32 hMenu, UINT32 uItem, BOOL32 bypos,
const MENUITEMINFO32A *lpmii)
@@ -3911,7 +3911,7 @@
/**********************************************************************
- * InsertMenuItem32W (USER32.323)
+ * InsertMenuItem32W (USER32.324)
*/
BOOL32 WINAPI InsertMenuItem32W(HMENU32 hMenu, UINT32 uItem, BOOL32 bypos,
const MENUITEMINFO32W *lpmii)
