mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 17:16:18 +00:00
02e90087ff
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [debugger/db_disasm.c] Added cpuid and cmpxchg instructions. * [if1632/builtin.c] [relay32/builtin32.c] Fixed broken -dll option with Win32 DLLs. * [include/heap.h] Added SYSTEM_LOCK/SYSTEM_UNLOCK macros. * [configure.in] [misc/lstr.c] Added check for wctype.h. Commented out --enable-ipc option (IPC code has been broken for a long time anyway). * [scheduler/critsection.c] [scheduler/event.c] [scheduler/mutex.c] [scheduler/semaphore.c] Implemented Win32 synchronization objects. * [scheduler/synchro.c] Implemented WaitForMultipleObjects and related functions. * [scheduler/thread.c] If possible, use clone() in CreateThread(). * [scheduler/thread.c] [scheduler/process.c] Made thread and process waitable objects. Thread and process id values are now different from the pointers they represent. * [win32/k32obj.c] Moved to scheduler directory. Added function table for waiting operations on objects. * [files/file.c] [memory/virtual.c] Added new K32OBJ function table. Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net> * [files/file.c] Fixed my patch for GetTempFileName16() as needed. It was ...Name32A() that didn't work properly, not ...Name16(). * [graphics/x11drv/brush.c] Fixed a BadMatch error. * [msdos/int21.c] Fixed INT21_FindNextFCB() to get correct volume labels e.g. in "file open" dialog. * [multimedia/joystick.c] [relay32/winmm.spec] Stub JoyGetPosEx(). * [scheduler/process.c] [relay32/kernel32.spec] Implemented RegisterServiceProcess(). Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com> * [if1632/kernel.spec] [if1632/relay.c] Define CallProcEx32w - Thanks to Marcus Meissner for his excellent CallProc32W. * [loader/module.c] Take a shot at defining FreeLibrary32W. Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de> * [controls/menu.c] Menu modification from WM_INITMENUPOPUP message fixed. Menu items now can have different wID and hSubMenu (Win95 behavior). * [misc/cpu.c] Improved IsProcessorFeaturePresent. Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no> * [include/winsock.h] [misc/winsock.c] Fixed WS_SOL_SOCKET for setsockopt(), and made select() return empty fd_sets if timeout. * [objects/palette.c] AnimatePalette() bailed out if entire palette is animated. Fixed. * [objects/dib.c] Added some code to SetDIBitsToDevice() and its helpers to fix some offseting problems. * [objects/cursoricon.c] Made CreateCursor32() convert the instance handle properly. Made DestroyCursor() return correct success status. Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu> * [windows/syscolor.c] Added definition of GetSysColorPen16/32. This function does not exist in the Win32 API but is a very close (and natural) relative to GetSysColorBrush function. Moreover, it is *very* much used within Wine since there are a lot of places where we need to draw lines with the standard colors. * [controls/button.c] [controls/combo.c] [controls/icontitle.c] [controls/menu.c] [controls/progress.c] [controls/scroll.c] [controls/updown.c] [graphics/painting.c] [misc/tweak.c] [windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c] Replaced references to sysColorObjects with the appropriate call to GetSysColorBrush32/GetSysColorPen32. There is no need to expose the implementation of these functions, even within Wine. This makes the code easier to understand, debug, maintain. * [controls/uitools.c] Modified most of the functions in this file to use the now standard pens (i.e. GetSysColorPen32). These functions made *heavy* use of standard pens so I expect a lot less CreatePen/DeleteObject calls can do only good...:) Plus some minor modifications (*no* functional changes though). * [controls/updown.c] Used the new DrawFrameControl32 function to paint the control. I also deleted UDDOWN_DrawArrow since it was no longer required. Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no> * [configure.in] Added check for -lw. * [include/wintypes.h] [tools/build.c] Changes to make the assembly understandable for even sun as. ".ascii" -> ".string", "call %foo" -> "call *%foo", "pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s". * [memory/ldt.c] #ifdef added so <sys/seg.h> will not be included on Solaris. Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [configure.in] Added XF86DGA check. * [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h] Started DirectSound. Only stubs for now. * [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec] Started to implement DirectDraw. Mostly stubs, some testcases work. Requires the XF86DGA extension to XFree86. (check demo/blizdemo.exe from the Diablo CD-ROM). * [files/drive.c] Return correct "CDFS" fsname so Diablo is a bit happier. Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com> * [misc/registry.c] Fixed bugs in the routines which read the Windows '95 registry files. Added extra information regarding the format of the Windows '95 registry files.
208 lines
5.3 KiB
C
208 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 "stddebug.h"
|
|
#include "debug.h"
|
|
|
|
/* Control configuration constants */
|
|
|
|
#define LED_WIDTH 8
|
|
#define LED_GAP 2
|
|
|
|
/* Work constants */
|
|
|
|
#define UNKNOWN_PARAM(msg, wParam, lParam) dprintf_progress(stddeb, \
|
|
"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_progress(stddeb, "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_updown(stddeb, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
|
|
break;
|
|
|
|
case WM_DESTROY:
|
|
dprintf_updown(stddeb, "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;
|
|
}
|
|
|
|
|
|
|