1996-08-11 17:49:51 +02:00
|
|
|
/*
|
|
|
|
* Interface code to StatusWindow widget/control
|
|
|
|
*
|
|
|
|
* Copyright 1996 Bruce Milner
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "windows.h"
|
|
|
|
#include "status.h"
|
|
|
|
#include "commctrl.h"
|
|
|
|
#include "heap.h"
|
|
|
|
#include "win.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Run tests using Waite Group Windows95 API Bible Vol. 1&2
|
|
|
|
* The second cdrom contains executables drawstat.exe,gettext.exe,
|
|
|
|
* simple.exe, getparts.exe, setparts.exe, statwnd.exe
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fixme/Todo
|
|
|
|
* 1) Add size grip to status bar - SBARS_SIZEGRIP
|
|
|
|
* 2) Don't hard code bar to bottom of window, allow CCS_TOP also
|
|
|
|
* 3) Fix SBT_OWNERDRAW
|
|
|
|
* 4) Add DrawStatusText32A funtion
|
|
|
|
*/
|
|
|
|
|
|
|
|
static STATUSWINDOWINFO *GetStatusInfo(HWND32 hwnd)
|
|
|
|
{
|
|
|
|
WND *wndPtr;
|
|
|
|
|
|
|
|
wndPtr = WIN_FindWndPtr(hwnd);
|
|
|
|
return ((STATUSWINDOWINFO *) &wndPtr->wExtra[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static BOOL32 SW_Refresh( HWND32 hwnd, HDC32 hdc, STATUSWINDOWINFO *self )
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
Release 970120
Sun Jan 19 11:46:48 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c]
Fixed LoadModule() to always call the DLL initialization code.
* [windows/event.c]
Moved all the keyboard stuff to windows/keyboard.c
* [tools/build.c]
Fixed Win32 register functions.
Sat Jan 18 22:24:41 1997 David Makepeace <D.Makepeace@mailbox.uq.oz.au>
* [tools/makedep.c]
Fixed bug which causes SEGV on Solaris x86.
Fri Jan 17 18:32:27 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Implemented WM_UNDO, WM_CONTEXTMENU (temporary using WM_RBUTTONUP),
WM_COMMAND, WM_INITPOPUPMENU, WM_SYSKEYDOWN.
Fixed EM_SETSEL and some minor bugs (features).
Hence: fully functional undo and a win95 menu with the right mouse
button.
* [include/resources.h] [resources/TODO] [resources/sysres_??.rc]
Added a context menu for the edit control.
Translations, please ...
Fri Jan 17 08:29:52 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Move EVENT_ToAscii to windows/keyboard.c (where name ToAscii)
Fixed Keypad keys 0-9 and . in EVENT_event_to_vkey.
Added 3-state handling of toggle keys (CapsLock, NumLock) in order
to make them work with any X server.
Toggle keys now generate WM_KEYDOWN and WM_KEYUP on each pressing.
* [include/keyboard.h]
Totally replaced the file (formerly containing the vkcase definitions)
by the declaration of 'extern' variables contained by event.c and used
by keyboard.c
* [windows/keyboard.c]
Started to rewrite VkKeyScan and MapVirtualKey, to make them use the
table keyc2vkey or X functions only.
ToAscii : added keypad 0-9 and . special case.
Changed toggle keys active mask from 0x80 to 0x1.
* [misc/keyboard.c]
File deleted. Contents moved to windows/keyboard.c.
* [misc/main.c]
Added putenv XKB_DISABLE to disable XKB extension (which, when
present, causes AltGr to change keyboard group instead of being a
modifier).
Tue Jan 14 22:56:43 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [windows/event.c]
Do not assume NumLockMask is Mod2Mask, but compute it by scanning
output of XGetModifierMapping for XK_Num_Lock.
Tue Jan 14 15:49:49 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_*.c] [include/peexe.h] [include/resource32.h]
[debugger/*.c]
General clean up.
Changed defines/structures to match Windows NT SDK.
* [loader/main.c]
Don't crash on empty command-line.
* [windows/winpos.c]
winpos.c made win32 clean.
* [misc/ntdll.c]
Some string conversion additions.
* [files/file.c]
GetFileAttributes/GetTempFileName fixed.
* [misc/ver.c]
VerInstallFile implemented.
Mon Jan 13 15:03:11 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [tools/build.c]: Use PREFIX also in stabs messages.
Mon Jan 13 10:40:33 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/*] [include/win16drv.h]
Many fixes and some new features.
* [graphics/x11drv/font.c] [graphics/x11drv/init.c]
[include/x11drv.h] [objects/font.c]
GetTextMetrics() moved to graphics driver.
* [if1632/gdi.spec] [misc/fontengine.c] [misc/Makefile.in]
New dummy EngineEnumerateFont, EngineRealizeFont functions.
* [include/windows.h]
TEXTFORM16 and FONTINFO16 structure definitions moved here from
include/win16drv.h
1997-01-20 20:43:45 +01:00
|
|
|
if (!IsWindowVisible32(hwnd)) {
|
1996-08-11 17:49:51 +02:00
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self->simple) {
|
|
|
|
DrawStatusText32A(hdc,
|
|
|
|
&self->part0.bound,
|
|
|
|
self->part0.text,
|
|
|
|
self->part0.style);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (i = 0; i < self->numParts; i++) {
|
|
|
|
DrawStatusText32A(hdc,
|
|
|
|
&self->parts[i].bound,
|
|
|
|
self->parts[i].text,
|
|
|
|
self->parts[i].style);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_GetBorders(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
LPINT32 out;
|
|
|
|
|
|
|
|
/* FIXME for sizegrips */
|
|
|
|
out = (LPINT32) lParam;
|
|
|
|
out[0] = 1; /* vertical border width */
|
|
|
|
out[1] = 1; /* horizontal border width */
|
|
|
|
out[2] = 1; /* width of border between rectangles */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
SW_SetPartBounds(HWND32 hwnd, STATUSWINDOWINFO *self)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
RECT32 rect, *r;
|
|
|
|
STATUSWINDOWPART *part;
|
|
|
|
int sep = 1;
|
|
|
|
|
|
|
|
/* get our window size */
|
|
|
|
GetClientRect32(hwnd, &rect);
|
|
|
|
|
|
|
|
/* set bounds for simple rectangle */
|
|
|
|
self->part0.bound = rect;
|
|
|
|
|
|
|
|
/* set bounds for non-simple rectangles */
|
|
|
|
for (i = 0; i < self->numParts; i++) {
|
|
|
|
part = &self->parts[i];
|
|
|
|
r = &self->parts[i].bound;
|
|
|
|
r->top = rect.top;
|
|
|
|
r->bottom = rect.bottom;
|
|
|
|
if (i == 0)
|
|
|
|
r->left = 0;
|
|
|
|
else
|
|
|
|
r->left = self->parts[i-1].bound.right+sep;
|
|
|
|
if (part->x == -1)
|
|
|
|
r->right = rect.right;
|
|
|
|
else
|
|
|
|
r->right = part->x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_SetText(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
int part_num;
|
|
|
|
int style;
|
|
|
|
LPSTR text;
|
|
|
|
int len;
|
|
|
|
STATUSWINDOWPART *part;
|
|
|
|
|
|
|
|
text = (LPSTR) lParam;
|
|
|
|
part_num = ((INT32) wParam) & 0x00ff;
|
|
|
|
style = ((INT32) wParam) & 0xff00;
|
|
|
|
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
if (part_num >= 255)
|
1996-08-11 17:49:51 +02:00
|
|
|
return FALSE;
|
|
|
|
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
if ((self->simple) || (part_num==255))
|
1996-08-11 17:49:51 +02:00
|
|
|
part = &self->part0;
|
|
|
|
else
|
|
|
|
part = &self->parts[part_num];
|
|
|
|
part->style = style;
|
|
|
|
if (style == SBT_OWNERDRAW) {
|
|
|
|
part->text = text;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* duplicate string */
|
|
|
|
if (part->text)
|
|
|
|
HeapFree(SystemHeap, 0, part->text);
|
|
|
|
part->text = 0;
|
|
|
|
if (text && (len = lstrlen32A(text))) {
|
|
|
|
part->text = HeapAlloc(SystemHeap, 0, len+1);
|
|
|
|
lstrcpy32A(part->text, text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
InvalidateRect32(hwnd, &part->bound, FALSE);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_SetParts(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
HDC32 hdc;
|
|
|
|
LPINT32 parts;
|
|
|
|
STATUSWINDOWPART * tmp;
|
|
|
|
int i;
|
|
|
|
int oldNumParts;
|
|
|
|
|
|
|
|
if (self->simple) {
|
|
|
|
self->simple = FALSE;
|
|
|
|
}
|
|
|
|
oldNumParts = self->numParts;
|
|
|
|
self->numParts = (INT32) wParam;
|
|
|
|
parts = (LPINT32) lParam;
|
|
|
|
if (oldNumParts > self->numParts) {
|
|
|
|
for (i = self->numParts ; i < oldNumParts; i++) {
|
|
|
|
if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
|
|
|
|
HeapFree(SystemHeap, 0, self->parts[i].text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (oldNumParts < self->numParts) {
|
|
|
|
tmp = HeapAlloc(SystemHeap, HEAP_ZERO_MEMORY,
|
|
|
|
sizeof(STATUSWINDOWPART) * self->numParts);
|
|
|
|
for (i = 0; i < oldNumParts; i++) {
|
|
|
|
tmp[i] = self->parts[i];
|
|
|
|
}
|
|
|
|
if (self->parts)
|
|
|
|
HeapFree(SystemHeap, 0, self->parts);
|
|
|
|
self->parts = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < self->numParts; i++) {
|
|
|
|
self->parts[i].x = parts[i];
|
|
|
|
}
|
|
|
|
SW_SetPartBounds(hwnd, self);
|
|
|
|
|
1996-09-28 20:11:01 +02:00
|
|
|
hdc = GetDC32(hwnd);
|
1996-08-11 17:49:51 +02:00
|
|
|
SW_Refresh(hwnd, hdc, self);
|
1996-09-28 20:11:01 +02:00
|
|
|
ReleaseDC32(hwnd, hdc);
|
1996-08-11 17:49:51 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_GetParts(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
LPINT32 parts;
|
|
|
|
INT32 num_parts;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
self = GetStatusInfo(hwnd);
|
|
|
|
num_parts = (INT32) wParam;
|
|
|
|
parts = (LPINT32) lParam;
|
|
|
|
if (parts) {
|
|
|
|
return (self->numParts);
|
|
|
|
for (i = 0; i < num_parts; i++) {
|
|
|
|
parts[i] = self->parts[i].x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (self->numParts);
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_Create(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
RECT32 rect;
|
|
|
|
LPCREATESTRUCT32A lpCreate = (LPCREATESTRUCT32A) lParam;
|
|
|
|
int height, width;
|
|
|
|
HDC32 hdc;
|
|
|
|
HWND32 parent;
|
|
|
|
|
|
|
|
self->numParts = 0;
|
|
|
|
self->parts = 0;
|
|
|
|
self->simple = TRUE;
|
|
|
|
GetClientRect32(hwnd, &rect);
|
|
|
|
|
|
|
|
/* initialize simple case */
|
|
|
|
self->part0.bound = rect;
|
|
|
|
self->part0.text = 0;
|
|
|
|
self->part0.x = 0;
|
|
|
|
self->part0.style = 0;
|
|
|
|
|
|
|
|
height = 40;
|
1996-09-28 20:11:01 +02:00
|
|
|
if ((hdc = GetDC32(0))) {
|
1996-08-11 17:49:51 +02:00
|
|
|
TEXTMETRIC32A tm;
|
|
|
|
GetTextMetrics32A(hdc, &tm);
|
|
|
|
self->textHeight = tm.tmHeight;
|
1996-09-28 20:11:01 +02:00
|
|
|
ReleaseDC32(0, hdc);
|
1996-08-11 17:49:51 +02:00
|
|
|
}
|
|
|
|
|
1996-09-02 18:46:30 +02:00
|
|
|
parent = GetParent32(hwnd);
|
1996-08-11 17:49:51 +02:00
|
|
|
GetClientRect32(parent, &rect);
|
|
|
|
width = rect.right - rect.left;
|
|
|
|
height = (self->textHeight * 3)/2;
|
Release 970120
Sun Jan 19 11:46:48 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c]
Fixed LoadModule() to always call the DLL initialization code.
* [windows/event.c]
Moved all the keyboard stuff to windows/keyboard.c
* [tools/build.c]
Fixed Win32 register functions.
Sat Jan 18 22:24:41 1997 David Makepeace <D.Makepeace@mailbox.uq.oz.au>
* [tools/makedep.c]
Fixed bug which causes SEGV on Solaris x86.
Fri Jan 17 18:32:27 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Implemented WM_UNDO, WM_CONTEXTMENU (temporary using WM_RBUTTONUP),
WM_COMMAND, WM_INITPOPUPMENU, WM_SYSKEYDOWN.
Fixed EM_SETSEL and some minor bugs (features).
Hence: fully functional undo and a win95 menu with the right mouse
button.
* [include/resources.h] [resources/TODO] [resources/sysres_??.rc]
Added a context menu for the edit control.
Translations, please ...
Fri Jan 17 08:29:52 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Move EVENT_ToAscii to windows/keyboard.c (where name ToAscii)
Fixed Keypad keys 0-9 and . in EVENT_event_to_vkey.
Added 3-state handling of toggle keys (CapsLock, NumLock) in order
to make them work with any X server.
Toggle keys now generate WM_KEYDOWN and WM_KEYUP on each pressing.
* [include/keyboard.h]
Totally replaced the file (formerly containing the vkcase definitions)
by the declaration of 'extern' variables contained by event.c and used
by keyboard.c
* [windows/keyboard.c]
Started to rewrite VkKeyScan and MapVirtualKey, to make them use the
table keyc2vkey or X functions only.
ToAscii : added keypad 0-9 and . special case.
Changed toggle keys active mask from 0x80 to 0x1.
* [misc/keyboard.c]
File deleted. Contents moved to windows/keyboard.c.
* [misc/main.c]
Added putenv XKB_DISABLE to disable XKB extension (which, when
present, causes AltGr to change keyboard group instead of being a
modifier).
Tue Jan 14 22:56:43 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [windows/event.c]
Do not assume NumLockMask is Mod2Mask, but compute it by scanning
output of XGetModifierMapping for XK_Num_Lock.
Tue Jan 14 15:49:49 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_*.c] [include/peexe.h] [include/resource32.h]
[debugger/*.c]
General clean up.
Changed defines/structures to match Windows NT SDK.
* [loader/main.c]
Don't crash on empty command-line.
* [windows/winpos.c]
winpos.c made win32 clean.
* [misc/ntdll.c]
Some string conversion additions.
* [files/file.c]
GetFileAttributes/GetTempFileName fixed.
* [misc/ver.c]
VerInstallFile implemented.
Mon Jan 13 15:03:11 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [tools/build.c]: Use PREFIX also in stabs messages.
Mon Jan 13 10:40:33 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/*] [include/win16drv.h]
Many fixes and some new features.
* [graphics/x11drv/font.c] [graphics/x11drv/init.c]
[include/x11drv.h] [objects/font.c]
GetTextMetrics() moved to graphics driver.
* [if1632/gdi.spec] [misc/fontengine.c] [misc/Makefile.in]
New dummy EngineEnumerateFont, EngineRealizeFont functions.
* [include/windows.h]
TEXTFORM16 and FONTINFO16 structure definitions moved here from
include/win16drv.h
1997-01-20 20:43:45 +01:00
|
|
|
MoveWindow32(hwnd, lpCreate->x, lpCreate->y-1, width, height, FALSE);
|
1996-08-11 17:49:51 +02:00
|
|
|
SW_SetPartBounds(hwnd, self);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_GetRect(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
int part_num;
|
|
|
|
LPRECT32 rect;
|
|
|
|
|
|
|
|
part_num = ((INT32) wParam) & 0x00ff;
|
|
|
|
rect = (LPRECT32) lParam;
|
|
|
|
if (self->simple)
|
|
|
|
*rect = self->part0.bound;
|
|
|
|
else
|
|
|
|
*rect = self->parts[part_num].bound;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_GetText(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
int part_num;
|
|
|
|
LRESULT result;
|
|
|
|
STATUSWINDOWPART *part;
|
|
|
|
LPSTR out_text;
|
|
|
|
|
|
|
|
part_num = ((INT32) wParam) & 0x00ff;
|
|
|
|
out_text = (LPSTR) lParam;
|
|
|
|
if (self->simple)
|
|
|
|
part = &self->part0;
|
|
|
|
else
|
|
|
|
part = &self->parts[part_num];
|
|
|
|
|
|
|
|
if (part->style == SBT_OWNERDRAW)
|
|
|
|
result = (LRESULT) part->text;
|
|
|
|
else {
|
|
|
|
result = part->text ? lstrlen32A(part->text) : 0;
|
|
|
|
result |= (part->style << 16);
|
|
|
|
if (out_text) {
|
|
|
|
lstrcpy32A(out_text, part->text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_GetTextLength(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
int part_num;
|
|
|
|
STATUSWINDOWPART *part;
|
|
|
|
DWORD result;
|
|
|
|
|
|
|
|
part_num = ((INT32) wParam) & 0x00ff;
|
|
|
|
|
|
|
|
if (self->simple)
|
|
|
|
part = &self->part0;
|
|
|
|
else
|
|
|
|
part = &self->parts[part_num];
|
|
|
|
|
|
|
|
if (part->text)
|
|
|
|
result = lstrlen32A(part->text);
|
|
|
|
else
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
result |= (part->style << 16);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_SetMinHeight(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
/* FIXME */
|
|
|
|
/* size is wParam | 2*pixels_of_horz_border */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_Simple(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
BOOL32 simple;
|
|
|
|
HDC32 hdc;
|
|
|
|
|
|
|
|
simple = (BOOL32) wParam;
|
|
|
|
self->simple = simple;
|
1996-09-28 20:11:01 +02:00
|
|
|
hdc = GetDC32(hwnd);
|
1996-08-11 17:49:51 +02:00
|
|
|
SW_Refresh(hwnd, hdc, self);
|
1996-09-28 20:11:01 +02:00
|
|
|
ReleaseDC32(hwnd, hdc);
|
1996-08-11 17:49:51 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_Size(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
/* Need to resize width to match parent */
|
|
|
|
INT32 width, height, x, y;
|
|
|
|
RECT32 parent_rect;
|
|
|
|
HWND32 parent;
|
|
|
|
|
|
|
|
INT32 flags;
|
|
|
|
|
|
|
|
flags = (INT32) wParam;
|
|
|
|
|
|
|
|
/* FIXME for flags =
|
|
|
|
* SIZE_MAXIMIZED, SIZE_MAXSHOW, SIZE_MINIMIZED, SIZE_RESTORED
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (flags == SIZE_RESTORED) {
|
|
|
|
/* width and height don't apply */
|
1996-09-02 18:46:30 +02:00
|
|
|
parent = GetParent32(hwnd);
|
1996-08-11 17:49:51 +02:00
|
|
|
GetClientRect32(parent, &parent_rect);
|
|
|
|
height = (self->textHeight * 3)/2;
|
|
|
|
width = parent_rect.right - parent_rect.left;
|
|
|
|
x = parent_rect.left;
|
|
|
|
y = parent_rect.bottom - height;
|
Release 970120
Sun Jan 19 11:46:48 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c]
Fixed LoadModule() to always call the DLL initialization code.
* [windows/event.c]
Moved all the keyboard stuff to windows/keyboard.c
* [tools/build.c]
Fixed Win32 register functions.
Sat Jan 18 22:24:41 1997 David Makepeace <D.Makepeace@mailbox.uq.oz.au>
* [tools/makedep.c]
Fixed bug which causes SEGV on Solaris x86.
Fri Jan 17 18:32:27 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Implemented WM_UNDO, WM_CONTEXTMENU (temporary using WM_RBUTTONUP),
WM_COMMAND, WM_INITPOPUPMENU, WM_SYSKEYDOWN.
Fixed EM_SETSEL and some minor bugs (features).
Hence: fully functional undo and a win95 menu with the right mouse
button.
* [include/resources.h] [resources/TODO] [resources/sysres_??.rc]
Added a context menu for the edit control.
Translations, please ...
Fri Jan 17 08:29:52 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Move EVENT_ToAscii to windows/keyboard.c (where name ToAscii)
Fixed Keypad keys 0-9 and . in EVENT_event_to_vkey.
Added 3-state handling of toggle keys (CapsLock, NumLock) in order
to make them work with any X server.
Toggle keys now generate WM_KEYDOWN and WM_KEYUP on each pressing.
* [include/keyboard.h]
Totally replaced the file (formerly containing the vkcase definitions)
by the declaration of 'extern' variables contained by event.c and used
by keyboard.c
* [windows/keyboard.c]
Started to rewrite VkKeyScan and MapVirtualKey, to make them use the
table keyc2vkey or X functions only.
ToAscii : added keypad 0-9 and . special case.
Changed toggle keys active mask from 0x80 to 0x1.
* [misc/keyboard.c]
File deleted. Contents moved to windows/keyboard.c.
* [misc/main.c]
Added putenv XKB_DISABLE to disable XKB extension (which, when
present, causes AltGr to change keyboard group instead of being a
modifier).
Tue Jan 14 22:56:43 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [windows/event.c]
Do not assume NumLockMask is Mod2Mask, but compute it by scanning
output of XGetModifierMapping for XK_Num_Lock.
Tue Jan 14 15:49:49 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_*.c] [include/peexe.h] [include/resource32.h]
[debugger/*.c]
General clean up.
Changed defines/structures to match Windows NT SDK.
* [loader/main.c]
Don't crash on empty command-line.
* [windows/winpos.c]
winpos.c made win32 clean.
* [misc/ntdll.c]
Some string conversion additions.
* [files/file.c]
GetFileAttributes/GetTempFileName fixed.
* [misc/ver.c]
VerInstallFile implemented.
Mon Jan 13 15:03:11 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [tools/build.c]: Use PREFIX also in stabs messages.
Mon Jan 13 10:40:33 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/*] [include/win16drv.h]
Many fixes and some new features.
* [graphics/x11drv/font.c] [graphics/x11drv/init.c]
[include/x11drv.h] [objects/font.c]
GetTextMetrics() moved to graphics driver.
* [if1632/gdi.spec] [misc/fontengine.c] [misc/Makefile.in]
New dummy EngineEnumerateFont, EngineRealizeFont functions.
* [include/windows.h]
TEXTFORM16 and FONTINFO16 structure definitions moved here from
include/win16drv.h
1997-01-20 20:43:45 +01:00
|
|
|
MoveWindow32(hwnd, parent_rect.left, parent_rect.bottom - height - 1,
|
|
|
|
width, height, TRUE);
|
1996-08-11 17:49:51 +02:00
|
|
|
SW_SetPartBounds(hwnd, self);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_Destroy(STATUSWINDOWINFO *self, HWND32 hwnd, WPARAM32 wParam, LPARAM lParam)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < self->numParts; i++) {
|
|
|
|
if (self->parts[i].text && (self->parts[i].style != SBT_OWNERDRAW))
|
|
|
|
HeapFree(SystemHeap, 0, self->parts[i].text);
|
|
|
|
}
|
|
|
|
if (self->part0.text && (self->part0.style != SBT_OWNERDRAW))
|
|
|
|
HeapFree(SystemHeap, 0, self->part0.text);
|
|
|
|
HeapFree(SystemHeap, 0, self->parts);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static LRESULT
|
|
|
|
SW_Paint(STATUSWINDOWINFO *self, HWND32 hwnd)
|
|
|
|
{
|
|
|
|
HDC32 hdc;
|
|
|
|
PAINTSTRUCT32 ps;
|
|
|
|
|
|
|
|
hdc = BeginPaint32(hwnd, &ps);
|
|
|
|
SW_Refresh(hwnd, hdc, self);
|
|
|
|
EndPaint32(hwnd, &ps);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1997-08-24 18:00:30 +02:00
|
|
|
LRESULT WINAPI StatusWindowProc( HWND32 hwnd, UINT32 msg,
|
|
|
|
WPARAM32 wParam, LPARAM lParam )
|
1996-08-11 17:49:51 +02:00
|
|
|
{
|
|
|
|
STATUSWINDOWINFO *self;
|
|
|
|
|
|
|
|
self = GetStatusInfo(hwnd);
|
|
|
|
|
|
|
|
switch (msg) {
|
|
|
|
case SB_GETBORDERS:
|
|
|
|
return SW_GetBorders(self, hwnd, wParam, lParam);
|
|
|
|
case SB_GETPARTS:
|
|
|
|
return SW_GetParts(self, hwnd, wParam, lParam);
|
|
|
|
case SB_GETRECT:
|
|
|
|
return SW_GetRect(self, hwnd, wParam, lParam);
|
|
|
|
case SB_GETTEXT32A:
|
|
|
|
return SW_GetText(self, hwnd, wParam, lParam);
|
|
|
|
case SB_GETTEXTLENGTH32A:
|
|
|
|
return SW_GetTextLength(self, hwnd, wParam, lParam);
|
|
|
|
case SB_SETMINHEIGHT:
|
|
|
|
return SW_SetMinHeight(self, hwnd, wParam, lParam);
|
|
|
|
case SB_SETPARTS:
|
|
|
|
return SW_SetParts(self, hwnd, wParam, lParam);
|
|
|
|
case SB_SETTEXT32A:
|
|
|
|
return SW_SetText(self, hwnd, wParam, lParam);
|
|
|
|
case SB_SIMPLE:
|
|
|
|
return SW_Simple(self, hwnd, wParam, lParam);
|
|
|
|
|
|
|
|
case WM_CREATE:
|
|
|
|
return SW_Create(self, hwnd, wParam, lParam);
|
|
|
|
case WM_DESTROY:
|
|
|
|
return SW_Destroy(self, hwnd, wParam, lParam);
|
|
|
|
case WM_PAINT:
|
|
|
|
return SW_Paint(self, hwnd);
|
|
|
|
case WM_SIZE:
|
|
|
|
return SW_Size(self, hwnd, wParam, lParam);
|
|
|
|
default:
|
|
|
|
return DefWindowProc32A(hwnd, msg, wParam, lParam);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|