Release 0.4.7
Mon Nov 1 14:40:21 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [if1632/user.spec]
Removed some duplicate entries.
* [include/dialog.h] [windows/dialog.c]
Implemented dialog units and fonts.
Added preliminary loading of dialog resources.
Preliminary implementation of DialogBox().
Implemented Get/SetDlgItem* functions.
* [windows/win.c]
Implemented WM_PARENTNOTIFY message.
Implemented CreateWindowEx() and GetWindow().
Completed DestroyWindow().
Mon Nov 1 18:19:34 1993 Erik Bos
* [loader/signal.c]
Added support for int 0x11 & 0x12.
* [loader/int21.c]
Improved function handling.
Sun Oct 31 12:38:09 1993 David Metcalfe <david@prism.demon.co.uk>
* [objects/font.c]
Implemented GetCharWidth().
Wed Oct 27 09:56:06 1993 John Brezak <brezak@ch.hp.com>
* [Makefile]
Use GNU malloc.
* [include/int21.h include/wine.h]
Change sc_eflags to sc_efl .
* [include/wine.h]
Fix misplaced #endif
Include <signal.h> for NetBSD
* [loader/int21.c]
Don't include <sys/vfs.h> in NetBSD
Do include <sys/mount.h> in NetBSD
Cleanup some lint.
Mon Oct 26 17:59:01 1993 Erik Bos
* [include/int21.h]
Added.
* [loader/int21.c]
Added support for many dos ints.
* [misc/file.c] [include/files.h]
Moved OPEN_MAX and DosDriveStruct to files.h.
Sun Oct 24 13:36:50 1993 David Metcalfe <david@prism.demon.co.uk>
* [controls/button.c]
Implemented CHECKBOX, AUTOCHECKBOX, 3STATE, AUTO3STATE,
RADIOBUTTON, AUTORADIOBUTTON, GROUPBOX controls, together with
a preliminary USERBUTTON control.
* [objects/text.c]
Corrected bugs in TEXT_NextLine() and added handling of prefix
character.
* [controls/button.c]
Disabled focus handling by commenting out SetFocus() calls until
serious bug can be found.
Oct 20, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [controls/listbox.c]
Listbox control window
Painting cleanup, new messages processed.
* [controls/scroll.c]
Scroll bar control window
Painting cleanup.
* [controls/combo.c]
Combo box control window
Painting cleanup.
Tue Oct 12 17:50:11 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c] [objects/palette.c] [windows/syscolor.c]
Better support for the private color map.
Using a private map is now the default.
* [windows/win.c]
Bug fix.
* [include/dialog.h] [windows/dialog.c]
Implemented CreateDialog*() and IsDialogMessage().
* [misc/xt.c] [windows/defwnd.c]
Moved DefWindowProc() to defwnd.c.
Added WM_NCCREATE, WM_NCDESTROY and WM_CTLCOLOR handling.
* [windows/defdlg.c]
Started the implementation of DefDlgProc().
* [windows/win.c]
Added WM_NCCREATE and WM_NCDESTROY messages.
Implemented IsChild().
Tue Oct 12 17:50:20 1993 David Metcalfe <david@prism.demon.co.uk>
* [windows/focus.c]
Implemented GetFocus() and SetFocus().
* [windows/event.c]
Added processing of FocusIn and FocusOut events.
* [windows/graphics.c]
Added DrawFocusRect().
Sat Oct 9 14:36:57 1993 Erik Bos
* [loader/int1a.c]
Added more function handling.
Wed Oct 6 12:21:22 1993 Erik Bos
* [loader/signal.c]
Split signal.c into int1a.c, int21.c and signal.c.
Tue Oct 5 22:12:40 1993 David Metcalfe
* [controls/static.c] [control/widgets.c]
Static control class.
* [objects/text.c]
Added processing of additional DT_ flags to DrawText().
* [windows/win.c] [misc/xt.c]
Added SetWindowText() and WM_SETTEXT processing.
Tue Oct 5 22:12:40 1993 Martin Ayotte
* [controls/listbox.c]
Listbox control window
* [controls/scroll.c]
Scroll bar control window
* [controls/combo.c]
Combo box control window
* [include/combo.h]
Combo box definitions
* [include/listbox.h]
Listbox definitions
* [include/scroll.h]
Scroll bar definitions
Sat Oct 2 09:35:54 1993 Bob Amstadt (bob at pooh)
* [if1632/callback.c]
Fixed bug in MakeProcInstance().
* [debugger/info.c]
Changed x/w and x/b to display in hex.
* [debugger/i386-pinsn.c]
Added code to properly unassemble 16-bit indexing.
Fri Oct 1 08:29:05 1993 Bob Amstadt (bob at pooh)
* [loader/files.c] [misc/profile.c]
System initialization file is now called "wine.ini" and can
be located in the current directory, the user's home directory,
or any directories specified in the WINEPATH environment variable.
* [tools/build.c] [if1632/call.S] [include/regfunc.h]
Changed register function stack to match sigcontext structure.
Thu Sep 30 22:30:21 1993 Bob Amstadt (bob at pooh)
* [loader/files.c]
Created function to search a path for files to load.
* [loader/wine.c]
Modified exe and dll file loading to search through path
specified by the environment variable WINEPATH.
Thu Sep 30 22:30:21 1993 Eric Youngdale
* [loader/signal.c]
Bug fix.
Thu Sep 30 22:30:21 1993 John Brezak
* [debugger/dbg.y] [debugger/debug.l] [debugger/dtest.c]
[debugger/obstack.h]
Updates to allow debugger to function under NetBSD.
diff --git a/controls/static.c b/controls/static.c
new file mode 100644
index 0000000..40e5fbb
--- /dev/null
+++ b/controls/static.c
@@ -0,0 +1,266 @@
+/*
+ * Static control
+ *
+ * Copyright David W. Metcalfe, 1993
+ *
+ */
+
+static char Copyright[] = "Copyright David W. Metcalfe, 1993";
+
+#include <windows.h>
+#include "win.h"
+#include "user.h"
+
+LONG StaticWndProc(HWND hWnd, WORD uMsg, WORD wParam, LONG lParam);
+
+static LONG PaintTextfn(HWND hwnd);
+static LONG PaintRectfn(HWND hwnd);
+static LONG PaintFramefn(HWND hwnd);
+
+static COLORREF color_windowframe, color_background, color_window,
+ color_windowtext;
+
+#define NOTIFY_PARENT(hWndCntrl, wNotifyCode) \
+ SendMessage(GetParent(hWndCntrl), WM_COMMAND, \
+ GetDlgCtrlID(hWndCntrl), MAKELPARAM(hWndCntrl, wNotifyCode));
+#define DIM(array) ((sizeof array)/(sizeof array[0]))
+
+typedef struct
+{
+ LONG (*paintfn)();
+} STATICFN;
+
+#define MAX_STATIC_TYPE 12
+
+static STATICFN staticfn[MAX_STATIC_TYPE] =
+{
+ { (LONG(*)())PaintTextfn }, /* SS_LEFT */
+ { (LONG(*)())PaintTextfn }, /* SS_CENTER */
+ { (LONG(*)())PaintTextfn }, /* SS_RIGHT */
+ { (LONG(*)())NULL }, /* SS_ICON */
+ { (LONG(*)())PaintRectfn }, /* SS_BLACKRECT */
+ { (LONG(*)())PaintRectfn }, /* SS_GRAYRECT */
+ { (LONG(*)())PaintRectfn }, /* SS_WHITERECT */
+ { (LONG(*)())PaintFramefn }, /* SS_BLACKFRAME */
+ { (LONG(*)())PaintFramefn }, /* SS_GRAYFRAME */
+ { (LONG(*)())PaintFramefn }, /* SS_WHITEFRAME */
+ { (LONG(*)())PaintTextfn }, /* SS_SIMPLE */
+ { (LONG(*)())PaintTextfn } /* SS_LEFTNOWORDWRAP */
+};
+
+
+LONG StaticWndProc(HWND hWnd, WORD uMsg, WORD wParam, LONG lParam)
+{
+ LONG lResult = 0;
+ HDC hDC;
+ RECT rc;
+ LPSTR textPtr;
+
+ WND *wndPtr = WIN_FindWndPtr(hWnd);
+ LONG style = wndPtr->dwStyle & 0x0000000F;
+
+ switch (uMsg) {
+ case WM_ENABLE:
+ InvalidateRect(hWnd, NULL, FALSE);
+ break;
+
+ case WM_CREATE:
+ if (style < 0L || style >= (LONG)DIM(staticfn))
+ lResult = -1L;
+ else
+ {
+ /* initialise colours */
+ color_windowframe = GetSysColor(COLOR_WINDOWFRAME);
+ color_background = GetSysColor(COLOR_BACKGROUND);
+ color_window = GetSysColor(COLOR_WINDOW);
+ color_windowtext = GetSysColor(COLOR_WINDOWTEXT);
+ lResult = 0L;
+ }
+ break;
+
+ case WM_PAINT:
+ if (staticfn[style].paintfn)
+ (staticfn[style].paintfn)(hWnd);
+ break;
+
+ case WM_SYSCOLORCHANGE:
+ color_windowframe = GetSysColor(COLOR_WINDOWFRAME);
+ color_background = GetSysColor(COLOR_BACKGROUND);
+ color_window = GetSysColor(COLOR_WINDOW);
+ color_windowtext = GetSysColor(COLOR_WINDOWTEXT);
+ InvalidateRect(hWnd, NULL, TRUE);
+ break;
+
+ case WM_SETTEXT:
+ if (wndPtr->hText)
+ USER_HEAP_FREE(wndPtr->hText);
+
+ wndPtr->hText = USER_HEAP_ALLOC(GMEM_MOVEABLE,
+ strlen((LPSTR)lParam) + 1);
+ textPtr = (LPSTR)USER_HEAP_ADDR(wndPtr->hText);
+ strcpy(textPtr, (LPSTR)lParam);
+ InvalidateRect(hWnd, NULL, TRUE);
+ break;
+
+ default:
+ lResult = DefWindowProc(hWnd, uMsg, wParam, lParam);
+ break;
+ }
+
+ GlobalUnlock(hWnd);
+ return lResult;
+}
+
+
+static LONG PaintTextfn(HWND hwnd)
+{
+ PAINTSTRUCT ps;
+ RECT rc;
+ HDC hdc;
+ HBRUSH hBrush;
+ HANDLE hText;
+ char *text;
+ int textlen;
+ WORD wFormat;
+
+ WND *wndPtr = WIN_FindWndPtr(hwnd);
+ LONG style = wndPtr->dwStyle;
+
+ hdc = BeginPaint(hwnd, &ps);
+ GetClientRect(hwnd, &rc);
+
+ textlen = GetWindowTextLength(hwnd);
+ hText = LocalAlloc(LMEM_MOVEABLE, textlen+1);
+ text = LocalLock(hText);
+ GetWindowText(hwnd, text, textlen+1);
+
+ switch (style & 0x0000000F)
+ {
+ case SS_LEFT:
+ wFormat = DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK;
+ break;
+
+ case SS_CENTER:
+ wFormat = DT_CENTER | DT_EXPANDTABS | DT_WORDBREAK;
+ break;
+
+ case SS_RIGHT:
+ wFormat = DT_RIGHT | DT_EXPANDTABS | DT_WORDBREAK;
+ break;
+
+ case SS_SIMPLE:
+ wFormat = DT_LEFT | DT_SINGLELINE | DT_VCENTER;
+ break;
+
+ case SS_LEFTNOWORDWRAP:
+ wFormat = DT_LEFT | DT_SINGLELINE | DT_EXPANDTABS | DT_VCENTER;
+ break;
+ }
+
+ if (style & SS_NOPREFIX)
+ wFormat |= DT_NOPREFIX;
+
+ hBrush = SendMessage(GetParent(hwnd), WM_CTLCOLOR, (WORD)hdc,
+ MAKELONG(hwnd, CTLCOLOR_STATIC));
+ if (hBrush == (HBRUSH)NULL) hBrush = GetStockObject(WHITE_BRUSH);
+ FillRect(hdc, &rc, hBrush);
+ DrawText(hdc, text, textlen, &rc, wFormat);
+
+ LocalUnlock(hText);
+ LocalFree(hText);
+ GlobalUnlock(hwnd);
+ EndPaint(hwnd, &ps);
+}
+
+static LONG PaintRectfn(HWND hwnd)
+{
+ PAINTSTRUCT ps;
+ RECT rc;
+ HDC hdc;
+ HPEN hOldPen, hPen;
+ HBRUSH hOldBrush, hBrush;
+
+ WND *wndPtr = WIN_FindWndPtr(hwnd);
+
+ hdc = BeginPaint(hwnd, &ps);
+ GetClientRect(hwnd, &rc);
+
+ switch (wndPtr->dwStyle & 0x0000000F)
+ {
+ case SS_BLACKRECT:
+ hPen = CreatePen(PS_SOLID, 1, color_windowframe);
+ hBrush = CreateSolidBrush(color_windowframe);
+ break;
+
+ case SS_GRAYRECT:
+ hPen = CreatePen(PS_SOLID, 1, color_background);
+ hBrush = CreateSolidBrush(color_background);
+ break;
+
+ case SS_WHITERECT:
+ hPen = CreatePen(PS_SOLID, 1, color_window);
+ hBrush = CreateSolidBrush(color_window);
+ break;
+ }
+
+ hOldPen = (HPEN)SelectObject(hdc, (HANDLE)hPen);
+ hOldBrush = (HBRUSH)SelectObject(hdc, (HANDLE)hBrush);
+ Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom);
+
+ SelectObject(hdc, (HANDLE)hOldPen);
+ SelectObject(hdc, (HANDLE)hOldBrush);
+ DeleteObject((HANDLE)hPen);
+ DeleteObject((HANDLE)hBrush);
+
+ GlobalUnlock(hwnd);
+ EndPaint(hwnd, &ps);
+}
+
+static LONG PaintFramefn(HWND hwnd)
+{
+ PAINTSTRUCT ps;
+ RECT rc;
+ HDC hdc;
+ HPEN hOldPen, hPen;
+ HBRUSH hOldBrush, hBrush;
+
+ WND *wndPtr = WIN_FindWndPtr(hwnd);
+
+ hdc = BeginPaint(hwnd, &ps);
+ GetClientRect(hwnd, &rc);
+
+ switch (wndPtr->dwStyle & 0x0000000F)
+ {
+ case SS_BLACKFRAME:
+ hPen = CreatePen(PS_SOLID, 1, color_windowframe);
+ break;
+
+ case SS_GRAYFRAME:
+ hPen = CreatePen(PS_SOLID, 1, color_background);
+ break;
+
+ case SS_WHITEFRAME:
+ hPen = CreatePen(PS_SOLID, 1, color_window);
+ break;
+ }
+
+ hBrush = CreateSolidBrush(color_window);
+ hOldPen = (HPEN)SelectObject(hdc, (HANDLE)hPen);
+ hOldBrush = (HBRUSH)SelectObject(hdc, (HANDLE)hBrush);
+ Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom);
+
+ SelectObject(hdc, (HANDLE)hOldPen);
+ SelectObject(hdc, (HANDLE)hOldBrush);
+ DeleteObject((HANDLE)hPen);
+ DeleteObject((HANDLE)hBrush);
+
+ GlobalUnlock(hwnd);
+ EndPaint(hwnd, &ps);
+}
+
+
+
+
+
+
+
