Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
206 lines
5.3 KiB
C
206 lines
5.3 KiB
C
/*
|
|
* Progress control
|
|
*
|
|
* Copyright 1997 Dimitrie O. Paun
|
|
*
|
|
* TODO:
|
|
* - I do not know what to to on WM_[SG]ET_FONT
|
|
* Problems:
|
|
* - I think I do not compute correctly the numer of leds to be drawn
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include "windows.h"
|
|
#include "sysmetrics.h"
|
|
#include "progress.h"
|
|
#include "graphics.h"
|
|
#include "heap.h"
|
|
#include "win.h"
|
|
#include "debug.h"
|
|
|
|
/* Control configuration constants */
|
|
|
|
#define LED_WIDTH 8
|
|
#define LED_GAP 2
|
|
|
|
/* Work constants */
|
|
|
|
#define UNKNOWN_PARAM(msg, wParam, lParam) dprintf_warn(progress, \
|
|
"Progress Ctrl: Unknown parameter(s) for message " #msg \
|
|
"(%04x): wp=%04x lp=%08lx\n", msg, wParam, lParam);
|
|
|
|
#define PROGRESS_GetInfoPtr(wndPtr) ((PROGRESS_INFO *)wndPtr->wExtra)
|
|
|
|
|
|
/***********************************************************************
|
|
* PROGRESS_Paint
|
|
* Draw the arrows. The background need not be erased.
|
|
* If dc!=0, it draws on it
|
|
*/
|
|
static void PROGRESS_Paint(WND *wndPtr, HDC32 dc)
|
|
{
|
|
PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr);
|
|
HBRUSH32 ledBrush;
|
|
int rightBar, rightMost;
|
|
PAINTSTRUCT32 ps;
|
|
RECT32 rect;
|
|
HDC32 hdc;
|
|
|
|
dprintf_info(progress, "Progress Bar: paint pos=%d min=%d, max=%d\n",
|
|
infoPtr->CurVal, infoPtr->MinVal, infoPtr->MaxVal);
|
|
|
|
/* get a dc */
|
|
hdc = dc==0 ? BeginPaint32(wndPtr->hwndSelf, &ps) : dc;
|
|
|
|
/* get the required brush */
|
|
ledBrush = GetSysColorBrush32(COLOR_HIGHLIGHT);
|
|
|
|
/* get rect for the bar, adjusted for the border */
|
|
GetClientRect32(wndPtr->hwndSelf, &rect);
|
|
|
|
/* draw the border */
|
|
DrawEdge32(hdc, &rect, BDR_SUNKENOUTER, BF_RECT|BF_ADJUST|BF_MIDDLE);
|
|
rect.left++; rect.right--; rect.top++; rect.bottom--;
|
|
rightMost = rect.right;
|
|
|
|
/* compute extent of progress bar */
|
|
rightBar = rect.left +
|
|
MulDiv32(infoPtr->CurVal-infoPtr->MinVal,
|
|
rect.right - rect.left,
|
|
infoPtr->MaxVal-infoPtr->MinVal);
|
|
|
|
/* now draw the bar */
|
|
while(rect.left < rightBar) {
|
|
rect.right = rect.left+LED_WIDTH;
|
|
FillRect32(hdc, &rect, ledBrush);
|
|
rect.left = rect.right+LED_GAP;
|
|
}
|
|
|
|
/* clean-up */
|
|
if(!dc)
|
|
EndPaint32(wndPtr->hwndSelf, &ps);
|
|
}
|
|
|
|
/***********************************************************************
|
|
* PROGRESS_CoercePos
|
|
* Makes sure the current position (CUrVal) is within bounds.
|
|
*/
|
|
static void PROGRESS_CoercePos(WND *wndPtr)
|
|
{
|
|
PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr);
|
|
|
|
if(infoPtr->CurVal < infoPtr->MinVal)
|
|
infoPtr->CurVal = infoPtr->MinVal;
|
|
if(infoPtr->CurVal > infoPtr->MaxVal)
|
|
infoPtr->CurVal = infoPtr->MaxVal;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* ProgressWindowProc
|
|
*/
|
|
LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
|
|
WPARAM32 wParam, LPARAM lParam)
|
|
{
|
|
WND *wndPtr = WIN_FindWndPtr(hwnd);
|
|
PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr);
|
|
UINT32 temp;
|
|
|
|
switch(message)
|
|
{
|
|
case WM_CREATE:
|
|
/* initialize the info struct */
|
|
infoPtr->MinVal=0;
|
|
infoPtr->MaxVal=100;
|
|
infoPtr->CurVal=0;
|
|
infoPtr->Step=10;
|
|
dprintf_info(updown, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
|
|
break;
|
|
|
|
case WM_DESTROY:
|
|
dprintf_info(updown, "Progress Ctrl destruction, hwnd=%04x\n", hwnd);
|
|
break;
|
|
|
|
case WM_ERASEBKGND:
|
|
/* pretend to erase it here, but we will do it in the paint
|
|
function to avoid flicker */
|
|
return 1;
|
|
|
|
case WM_GETFONT:
|
|
/* FIXME: What do we need to do? */
|
|
break;
|
|
|
|
case WM_SETFONT:
|
|
/* FIXME: What do we need to do? */
|
|
break;
|
|
|
|
case WM_PAINT:
|
|
PROGRESS_Paint(wndPtr, wParam);
|
|
break;
|
|
|
|
case PBM_DELTAPOS:
|
|
if(lParam)
|
|
UNKNOWN_PARAM(PBM_DELTAPOS, wParam, lParam);
|
|
temp = infoPtr->CurVal;
|
|
if(wParam != 0){
|
|
infoPtr->CurVal += (UINT16)wParam;
|
|
PROGRESS_CoercePos(wndPtr);
|
|
PROGRESS_Paint(wndPtr, 0);
|
|
}
|
|
return temp;
|
|
|
|
case PBM_SETPOS:
|
|
if (lParam)
|
|
UNKNOWN_PARAM(PBM_SETPOS, wParam, lParam);
|
|
temp = infoPtr->CurVal;
|
|
if(temp != wParam){
|
|
infoPtr->CurVal = (UINT16)wParam;
|
|
PROGRESS_CoercePos(wndPtr);
|
|
PROGRESS_Paint(wndPtr, 0);
|
|
}
|
|
return temp;
|
|
|
|
case PBM_SETRANGE:
|
|
if (wParam)
|
|
UNKNOWN_PARAM(PBM_SETRANGE, wParam, lParam);
|
|
temp = MAKELONG(infoPtr->MinVal, infoPtr->MaxVal);
|
|
if(temp != lParam){
|
|
infoPtr->MinVal = LOWORD(lParam);
|
|
infoPtr->MaxVal = HIWORD(lParam);
|
|
if(infoPtr->MaxVal <= infoPtr->MinVal)
|
|
infoPtr->MaxVal = infoPtr->MinVal+1;
|
|
PROGRESS_CoercePos(wndPtr);
|
|
PROGRESS_Paint(wndPtr, 0);
|
|
}
|
|
return temp;
|
|
|
|
case PBM_SETSTEP:
|
|
if (lParam)
|
|
UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
|
|
temp = infoPtr->Step;
|
|
infoPtr->Step = (UINT16)wParam;
|
|
return temp;
|
|
|
|
case PBM_STEPIT:
|
|
if (wParam || lParam)
|
|
UNKNOWN_PARAM(PBM_STEPIT, wParam, lParam);
|
|
temp = infoPtr->CurVal;
|
|
infoPtr->CurVal += infoPtr->Step;
|
|
if(infoPtr->CurVal > infoPtr->MaxVal)
|
|
infoPtr->CurVal = infoPtr->MinVal;
|
|
if(temp != infoPtr->CurVal)
|
|
PROGRESS_Paint(wndPtr, 0);
|
|
return temp;
|
|
|
|
default:
|
|
if (message >= WM_USER)
|
|
fprintf( stderr, "Progress Ctrl: unknown msg %04x wp=%04x lp=%08lx\n",
|
|
message, wParam, lParam );
|
|
return DefWindowProc32A( hwnd, message, wParam, lParam );
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
|