Release 980517
Sun May 17 16:23:56 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [file/profile.c]
Fix the return value of PROFILE_GetSection
* [misc/crtdll.c]
Do _getdrive, fix _chdrive.
* [misc/commdlg.c]
First cut at ChooseColor[WA].
* [misc/network.c]
Do something sensible for WNetGetDirectoryType16.
Sun May 17 10:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [controls/menu.c]
Fixed disabled sub menus with MF_BYPOSITION that were not disabled.
* [misc/crtdll.c] [relay32/crtdll.spec] [include/winerror.h]
Implemented fscanf, fsetpos, _access, _fpreset (thanks to Uwe Bonnes),
and _ltoa.
* [loader/task.c]
MakeProcInstance: must use CURRENT_DS if hInst == NULL.
* [misc/shell.c]
SHELL_GetResourceTable, InternalExtractIcon: fixed broken .ICO handling
* [windows/winpos.c]
DeferWindowPos: removed "same parent" requirement.
Which doc states that this is required ?
Sat May 16 20:08:11 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c] [loader/ne/module.c]
More NE module cleanups.
* [loader/task.c]
Fixed SwitchStackBack().
Fri May 15 10:04:27 1998 Marcus Meissner <marcus@jet.franken.de>
* [configure.in][inlcude/acconfig.h]
Fixed broken OSS check, added check for working sigaltstack,
fixed broken statfs checks on some linux systems.
* [files/directory.c][loader/pe_image.c][relay32/builtin.c]
[loader/module.c]
Added handling of win32 module pathnames.
* [relay32/wnaspi32.spec]
New file.
* [misc/lzexpand.c]
LZCopy auto-decompresses LZ compressed files, even if they are not
specially flagged. Fixes some InstallShield problems.
* [misc/registry.c]
Some fixes for RegQueryInfoKey (reference program monkey.exe
from Win32 SDK works now better). Probably still has faults.
Fri May 15 08:58:58 1998 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/mapping.c] [include/dc.h] [include/gdi.h] [objects/dc.c]
Reworked the way world transformations and mapping modes are handled
so that both of these transformations can be computed in a single
step.
* [graphics/painting.c] [graphics/path.c] [include/path.h]
More GDI path support.
* [graphics/x11drv/graphics.c]
Fixed the return value of GRAPH_DrawArc for the zero height /
zero width case to reflect Windows' behaviour.
* [include/windows.h] [relay32/gdi32.spec] [objects/dc.c]
Implemented ModifyWorldTransform and CombineTransform.
Tue May 14 18:03:46 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][relay32/comctl32.spec]
[controls/*.c][include/*.h]
Implemented InitCommonControlsEx (dll version 4.72 compatible).
InitCommonControls calls ImageCommonControlsEx.
Registering code of the common controls had to be changed
(see XXXX_Register functions).
* [controls/status.c][include/commctrl.h][include/status.h]
Implemented most new features and fixed the look and feel.
* [contols/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Implemented MenuHelp (incomplete).
* [controls/status.c][controls/progress.c]
Changed allocation strategy for control specific memory.
* [controls/header.c][include/header.h][include/commctrl.h]
First implementation of header control.
* [windows/defwnd.c][windows/syscolors.c]
Fixed default control colors for Win95 look.
* [windows/nonclient.c]
Fixed off by one error for Win95 look. Top border of child windows
should be visible.
* [misc/imagelist.h]
Improved documentation and fixed some bugs.
Thu May 14 15:42:21 1998 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [relay32/crtdll.spec]
Added hypot,j0,j1,jn and ceil.
Wed May 13 19:10:10 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [controls/listbox.c]
Item height is now exactly font height.
Wine listboxes now behave like Windows' when they are
created without WS_VSCROLL but the program subsequently
calls ShowScrollBar or SetScrollInfo.
Wed May 13 18:33:01 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [relay32/relay386.c]
Restore ES also in the non-debug case.
* [windows/event.c]
Bugfix: Blocking TSXNextEvent could deadlock Wine.
* [win32/process.c] [windows/message.c]
Silly stubs for MsgWaitForMultipleObjects / PostThreadMessage
that make some programs run better.
* [windows/winproc.c]
WINPROC_MapMsg32Ato16/16To32A: added WM_NOTIFY.
* [win32/kernel32.c]
Added 16->32 thunking and improved 32->16 thunking functions.
* [tools/build.c]
Added new variant of CallFrom16 stub for use with Win95 thunks.
* [if1632/kernel.spec] [if1632/builtin.c] [win32/kernel32.c]
Added a few undocumented KERNEL functions.
* [loader/ne/module.c] [loader/ne/segment.c]
Call DllEntryPoint for 16-bit DLLs with subsystem >= 4.0.
* [win32/kernel32.spec] [win32/wow32.spec] [win32/ordinals.c]
Use names from the Oct 94 beta release for undoc. functions.
Wed May 13 14:18:26 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Code cleanup.
* [misc/cpu.c]
Commented out the registry puts temporarily.
* [programs/regtest/*]
New registry testing program.
Tue May 12 22:54:03 1998 Michael Mess <michael@kawo2.rwth-aachen.de>
* [multimedia/audio.c]
ioctl's do not commute in /dev/dsp initialization.
Tue May 12 20:11:42 1998 Karl Garrison <karlos@eznet.net>
* [win32/console.c]
Implemented SetConsoleTextAttribute, FillConsoleOutputCharacter.
Improved cursor positioning.
This allows for text colors in an xterm, rxvt, or console.
Tue May 12 17:57:52 1998 Petter Reinholdtsen <pere@td.org.uit.no>
* [Makefile.in]
Create prefix/{bin|lib} directories if missing during install.
Sun May 10 19:37:51 1998 Jan Willamowius <jan@janhh.shnet.org>
* [multimedia/mmio.c]
Have mmioSetBuffer return success (0), so Corel Draw 4
keeps working. (IO is still unbuffered)
Wed May 6 16:57:55 1998 James Juran <jrj120@psu.edu>
* [Makefile.in] [Make.rules.in]
Changed "make clean" to remove `textedit` backup files (*%)
* [controls/menu.c][graphics/x11drv/xfont.c][include/libres.h]
[loader/main.c][loader/ne/module.c][scheduler/synchro.c]
[win32/time.c][windows/winpos.c][include/windows.h]
Fixed miscellaneous compilation warnings.
* [misc/main.c][miscemu/main.c][include/main.h]
Moved prototypes to new include file main.h, various cleanups.
Tue May 5 21:05:06 1998 Morten Welinder <terra@diku.dk>
* [misc/winsock.c]
Don't refer to __FreeBSD__ when HAVE_STRERROR is meant.
* [misc/debugstr.c]
For debug_dumpstrSend, send strings to stderr.
Tue May 5 21:47:40 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [objects/region.c]
Fix for REGION_RegionOp() if newReg is one of the source regions.
Tue May 5 18:27:32 1998 Jim Peterson <jspeter@roanoke.infi.net>
* [misc/main.c]
Add '-h/-help' option and print WINE_RELEASE_INFO with usage message.
* [misc/spy.c]
Realign trace messages.
Tue May 5 15:46:47 1998 Donnie V. Savage <dsavage@cisco.com>
* [graphics/ddraw.c]
Fixed compile warnings
* [misc/winsock.c]
Warnings should not be errors.
Tue May 5 13:40:42 1998 Jim Peterson <jspeter@roanoke.infi.net>
* [*/*]
Remove many warnings through explicit casts, added #include's,
and corrected printf formats.
Tue May 5 05:18:12 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu>
* [graphics/ddraw.c]
Kept unchanged portion of old palette when changing only a few
palette entries. Really should only deallocate the changed cells.
This make StarCraft work almost perfectly (sound overflows still
cause static).
Mon May 4 15:04:57 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [misc/lstr.c]
FormatMessage: terminate string on %0, undo linefeed strip.
diff --git a/controls/commctrl.c b/controls/commctrl.c
index a720660..245eb86 100644
--- a/controls/commctrl.c
+++ b/controls/commctrl.c
@@ -8,24 +8,11 @@
#include "win.h"
#include "heap.h"
#include "commctrl.h"
+#include "header.h"
#include "progress.h"
#include "status.h"
#include "updown.h"
-
-/* Win32 common controls */
-
-static WNDCLASS32A WIDGETS_CommonControls32[] =
-{
- { CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW, StatusWindowProc, 0,
- sizeof(STATUSWINDOWINFO), 0, 0, 0, 0, 0, STATUSCLASSNAME32A },
- { CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW, UpDownWindowProc, 0,
- sizeof(UPDOWN_INFO), 0, 0, 0, 0, 0, UPDOWN_CLASS32A },
- { CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW, ProgressWindowProc, 0,
- sizeof(PROGRESS_INFO), 0, 0, 0, 0, 0, PROGRESS_CLASS32A }
-};
-
-#define NB_COMMON_CONTROLS32 \
- (sizeof(WIDGETS_CommonControls32)/sizeof(WIDGETS_CommonControls32[0]))
+#include "debug.h"
/***********************************************************************
@@ -37,8 +24,6 @@
RECT32 r = *lprc;
UINT32 border = BDR_SUNKENOUTER;
- DrawEdge32(hdc, &r, BDR_RAISEDINNER, BF_RECT|BF_ADJUST|BF_FLAT);
-
if(style==SBT_POPOUT)
border = BDR_RAISEDOUTER;
else if(style==SBT_NOBORDERS)
@@ -59,7 +44,7 @@
}
/***********************************************************************
- * DrawStatusText32W (COMCTL32.24)
+ * DrawStatusText32W (COMCTL32.28)
*/
void WINAPI DrawStatusText32W( HDC32 hdc, LPRECT32 lprc, LPCWSTR text,
UINT32 style )
@@ -70,7 +55,7 @@
}
/***********************************************************************
- * DrawStatusText16 (COMCTL32.23)
+ * DrawStatusText16 (COMCTL32.27)
*/
void WINAPI DrawStatusText16( HDC16 hdc, LPRECT16 lprc, LPCSTR text,
UINT16 style )
@@ -97,7 +82,7 @@
}
/***********************************************************************
- * CreateStatusWindow16 (COMCTL32.18)
+ * CreateStatusWindow16 (COMCTL32.21)
*/
HWND16 WINAPI CreateStatusWindow16( INT16 style, LPCSTR text, HWND16 parent,
UINT16 wid )
@@ -109,7 +94,7 @@
}
/***********************************************************************
- * CreateStatusWindow32W (COMCTL32.19)
+ * CreateStatusWindow32W (COMCTL32.22)
*/
HWND32 WINAPI CreateStatusWindow32W( INT32 style, LPCWSTR text, HWND32 parent,
UINT32 wid )
@@ -141,24 +126,165 @@
/***********************************************************************
- * InitCommonControls (COMCTL32.17)
+ * InitCommonControls [COMCTL32.17]
+ *
+ *
+ *
*/
-void WINAPI InitCommonControls(void)
-{
- int i;
- char name[30];
- const char *old_name;
- WNDCLASS32A *class32 = WIDGETS_CommonControls32;
- for (i = 0; i < NB_COMMON_CONTROLS32; i++, class32++)
- {
- /* Just to make sure the string is > 0x10000 */
- old_name = class32->lpszClassName;
- strcpy( name, (char *)class32->lpszClassName );
- class32->lpszClassName = name;
- class32->hCursor = LoadCursor32A( 0, IDC_ARROW32A );
- RegisterClass32A( class32 );
- class32->lpszClassName = old_name;
- }
+VOID WINAPI
+InitCommonControls (VOID)
+{
+ INITCOMMONCONTROLSEX icc;
+
+ icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
+ icc.dwICC = ICC_WIN95_CLASSES;
+
+ InitCommonControlsEx (&icc);
}
+
+/***********************************************************************
+ * InitCommonControlsEx [COMCTL32.81]
+ *
+ *
+ *
+ */
+
+BOOL32 WINAPI
+InitCommonControlsEx (LPINITCOMMONCONTROLSEX lpInitCtrls)
+{
+ INT32 cCount;
+ DWORD dwMask;
+
+ if (lpInitCtrls == NULL) return (FALSE);
+ if (lpInitCtrls->dwSize < sizeof(INITCOMMONCONTROLSEX)) return (FALSE);
+
+ for (cCount = 0; cCount <= 31; cCount++) {
+ dwMask = 1 << cCount;
+ if (!(lpInitCtrls->dwICC & dwMask))
+ continue;
+
+ switch (lpInitCtrls->dwICC & dwMask) {
+ case ICC_LISTVIEW_CLASSES:
+ TRACE (commctrl, "No listview class implemented!\n");
+ HEADER_Register();
+ break;
+
+ case ICC_TREEVIEW_CLASSES:
+ TRACE (commctrl, "No treeview class implemented!\n");
+ TRACE (commctrl, "No tooltip class implemented!\n");
+ break;
+
+ case ICC_BAR_CLASSES:
+ TRACE (commctrl, "No toolbar class implemented!\n");
+ STATUS_Register ();
+ TRACE (commctrl, "No trackbar class implemented!\n");
+ TRACE (commctrl, "No tooltip class implemented!\n");
+ break;
+
+ case ICC_TAB_CLASSES:
+ TRACE (commctrl, "No tab class implemented!\n");
+ TRACE (commctrl, "No tooltip class implemented!\n");
+ break;
+
+ case ICC_UPDOWN_CLASS:
+ UPDOWN_Register ();
+ break;
+
+ case ICC_PROGRESS_CLASS:
+ PROGRESS_Register ();
+ break;
+
+ case ICC_HOTKEY_CLASS:
+ TRACE (commctrl, "No hotkey class implemented!\n");
+ break;
+
+ case ICC_ANIMATE_CLASS:
+ TRACE (commctrl, "No animation class implemented!\n");
+ break;
+
+ case ICC_DATE_CLASSES:
+ TRACE (commctrl, "No month calendar class implemented!\n");
+ TRACE (commctrl, "No date picker class implemented!\n");
+ TRACE (commctrl, "No time picker class implemented!\n");
+ break;
+
+ case ICC_USEREX_CLASSES:
+ TRACE (commctrl, "No comboex class implemented!\n");
+ break;
+
+ case ICC_COOL_CLASSES:
+ TRACE (commctrl, "No rebar class implemented!\n");
+ break;
+
+ case ICC_INTERNET_CLASSES:
+ TRACE (commctrl, "No internet classes implemented!\n");
+ break;
+
+ case ICC_PAGESCROLLER_CLASS:
+ TRACE (commctrl, "No page scroller class implemented!\n");
+ break;
+
+ case ICC_NATIVEFNTCTL_CLASS:
+ TRACE (commctrl, "No native font class implemented!\n");
+ break;
+
+ default:
+ WARN (commctrl, "Unknown class! dwICC=0x%lX\n", dwMask);
+ break;
+ }
+ }
+
+ return (TRUE);
+}
+
+
+/***********************************************************************
+ * MenuHelp (COMCTL32.2)
+ *
+ *
+ *
+ *
+ */
+
+VOID WINAPI
+MenuHelp (UINT32 uMsg, WPARAM32 wParam, LPARAM lParam, HMENU32 hMainMenu,
+ HINSTANCE32 hInst, HWND32 hwndStatus, LPUINT32 lpwIDs)
+{
+ char szStatusText[128];
+
+ if (!IsWindow32 (hwndStatus)) return;
+
+ switch (uMsg) {
+ case WM_MENUSELECT:
+ TRACE (commctrl, "WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
+ wParam, lParam);
+
+ if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
+ /* menu was closed */
+ SendMessage32A (hwndStatus, SB_SIMPLE, FALSE, 0);
+ }
+ else {
+ if (HIWORD(wParam) & MF_POPUP) {
+ TRACE (commctrl, "Popup menu selected!\n");
+ FIXME (commctrl, "No popup menu texts!\n");
+
+ szStatusText[0] = 0;
+ }
+ else {
+ TRACE (commctrl, "Menu item selected!\n");
+ if (!LoadString32A (hInst, LOWORD(wParam), szStatusText, 128))
+ szStatusText[0] = 0;
+ }
+ SendMessage32A (hwndStatus, SB_SETTEXT32A, 255 | SBT_NOBORDERS,
+ (LPARAM)szStatusText);
+ SendMessage32A (hwndStatus, SB_SIMPLE, TRUE, 0);
+ }
+ break;
+
+ default:
+ WARN (commctrl, "Invalid Message!\n");
+ break;
+ }
+}
