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/combo.c b/controls/combo.c
new file mode 100644
index 0000000..ee90962
--- /dev/null
+++ b/controls/combo.c
@@ -0,0 +1,256 @@
+/*
+ * Interface code to COMBOBOX widget
+ *
+ * Copyright Martin Ayotte, 1993
+ *
+ */
+
+/*
+#define DEBUG_COMBO
+*/
+
+static char Copyright[] = "Copyright Martin Ayotte, 1993";
+
+#include <X11/Intrinsic.h>
+#include <X11/StringDefs.h>
+#include "windows.h"
+#include "combo.h"
+#include "heap.h"
+#include "win.h"
+#include "dirent.h"
+#include <sys/stat.h>
+
+LPHEADCOMBO ComboGetStorageHeader(HWND hwnd);
+int CreateComboStruct(HWND hwnd);
+
+
+void COMBOBOX_CreateComboBox(LPSTR className, LPSTR comboLabel, HWND hwnd)
+{
+ WND *wndPtr = WIN_FindWndPtr(hwnd);
+ WND *parentPtr = WIN_FindWndPtr(wndPtr->hwndParent);
+ DWORD style;
+ char widgetName[15];
+
+#ifdef DEBUG_COMBO
+ printf("combo: label = %s, x = %d, y = %d\n", comboLabel,
+ wndPtr->rectClient.left, wndPtr->rectClient.top);
+ printf(" width = %d, height = %d\n",
+ wndPtr->rectClient.right - wndPtr->rectClient.left,
+ wndPtr->rectClient.bottom - wndPtr->rectClient.top);
+#endif
+
+ if (!wndPtr)
+ return;
+
+ style = wndPtr->dwStyle & 0x0000FFFF;
+/*
+ if ((style & LBS_NOTIFY) == LBS_NOTIFY)
+*/
+ sprintf(widgetName, "%s%d", className, wndPtr->wIDmenu);
+ wndPtr->winWidget = XtVaCreateManagedWidget(widgetName,
+ compositeWidgetClass,
+ parentPtr->winWidget,
+ XtNx, wndPtr->rectClient.left,
+ XtNy, wndPtr->rectClient.top,
+ XtNwidth, wndPtr->rectClient.right -
+ wndPtr->rectClient.left,
+ XtNheight, 16,
+ NULL );
+ GlobalUnlock(hwnd);
+ GlobalUnlock(wndPtr->hwndParent);
+}
+
+
+/***********************************************************************
+ * WIDGETS_ComboWndProc
+ */
+LONG COMBOBOX_ComboBoxWndProc( HWND hwnd, WORD message,
+ WORD wParam, LONG lParam )
+{
+ WORD wRet;
+ RECT rect;
+ int y;
+ int width, height;
+ WND *wndPtr;
+ LPHEADCOMBO lphc;
+ char str[128];
+ static RECT rectsel;
+ switch(message)
+ {
+ case WM_CREATE:
+ CreateComboStruct(hwnd);
+ wndPtr = WIN_FindWndPtr(hwnd);
+ width = wndPtr->rectClient.right - wndPtr->rectClient.left;
+ height = wndPtr->rectClient.bottom - wndPtr->rectClient.top;
+ lphc = ComboGetStorageHeader(hwnd);
+ if (lphc == NULL) return 0;
+ lphc->hWndDrop = CreateWindow("BUTTON", "",
+ WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE | BS_PUSHBUTTON,
+ width - 16, 0, 16, 16, hwnd, 1, wndPtr->hInstance, 0L);
+ lphc->hWndEdit = CreateWindow("STATIC", "",
+ WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE | SS_LEFT,
+ 0, 0, width - 16, 16, hwnd, 1, wndPtr->hInstance, 0L);
+ lphc->hWndLBox = CreateWindow("LISTBOX", "",
+ WS_CHILD | WS_CLIPCHILDREN | WS_BORDER | WS_VSCROLL | LBS_NOTIFY,
+ wndPtr->rectClient.left, wndPtr->rectClient.top + 16, width, height,
+ wndPtr->hwndParent, 1, wndPtr->hInstance, (LPSTR)MAKELONG(0, hwnd));
+/*
+ ShowWindow(lphc->hWndLBox, SW_HIDE);
+*/
+ InvalidateRect(lphc->hWndEdit, NULL, TRUE);
+ UpdateWindow(lphc->hWndEdit);
+ InvalidateRect(lphc->hWndDrop, NULL, TRUE);
+ UpdateWindow(lphc->hWndDrop);
+#ifdef DEBUG_COMBO
+ printf("Combo Creation Drop=%X LBox=%X!\n", lphc->hWndDrop, lphc->hWndLBox);
+#endif
+ return 0;
+ case WM_DESTROY:
+ lphc = ComboGetStorageHeader(hwnd);
+ DestroyWindow(lphc->hWndDrop);
+ DestroyWindow(lphc->hWndEdit);
+ DestroyWindow(lphc->hWndLBox);
+ free(lphc);
+#ifdef DEBUG_COMBO
+ printf("Combo WM_DESTROY !\n");
+#endif
+ return 0;
+
+ case WM_COMMAND:
+ wndPtr = WIN_FindWndPtr(hwnd);
+ lphc = ComboGetStorageHeader(hwnd);
+ if (lphc == NULL) return 0;
+ if (LOWORD(lParam) == lphc->hWndDrop) {
+ if (HIWORD(lParam) != BN_CLICKED) return 0;
+#ifdef DEBUG_COMBO
+ printf("CB_SHOWDROPDOWN !\n");
+#endif
+ lphc->dwState = lphc->dwState ^ CB_SHOWDROPDOWN;
+ if ((lphc->dwState & CB_SHOWDROPDOWN) == CB_SHOWDROPDOWN) {
+ ShowWindow(lphc->hWndLBox, SW_SHOW);
+ }
+ else {
+ ShowWindow(lphc->hWndLBox, SW_HIDE);
+ y = SendMessage(lphc->hWndLBox, LB_GETCURSEL, 0, 0L);
+ SendMessage(lphc->hWndLBox, LB_GETTEXT, (WORD)y, (LPARAM)str);
+ SendMessage(lphc->hWndEdit, WM_SETTEXT, (WORD)y, (LPARAM)str);
+ printf("combo hide\n");
+ }
+ }
+ if (LOWORD(lParam) == lphc->hWndLBox) {
+ switch(HIWORD(lParam))
+ {
+ case LBN_SELCHANGE:
+ lphc->dwState = lphc->dwState ^ CB_SHOWDROPDOWN;
+ ShowWindow(lphc->hWndLBox, SW_HIDE);
+ y = SendMessage(lphc->hWndLBox, LB_GETCURSEL, 0, 0L);
+ SendMessage(lphc->hWndLBox, LB_GETTEXT, (WORD)y, (LPARAM)str);
+ SendMessage(lphc->hWndEdit, WM_SETTEXT, (WORD)y, (LPARAM)str);
+ SendMessage(GetParent(hwnd), WM_COMMAND, wndPtr->wIDmenu,
+ MAKELONG(hwnd, CBN_SELCHANGE));
+ break;
+ case LBN_DBLCLK:
+ SendMessage(GetParent(hwnd), WM_COMMAND, wndPtr->wIDmenu,
+ MAKELONG(hwnd, CBN_DBLCLK));
+ break;
+ }
+ }
+ break;
+ case WM_LBUTTONDOWN:
+ printf("Combo WM_LBUTTONDOWN wParam=%x lParam=%lX !\n", wParam, lParam);
+ break;
+ case WM_KEYDOWN:
+ printf("Combo WM_KEYDOWN wParam %X!\n", wParam);
+ break;
+ case WM_CTLCOLOR:
+ return(SendMessage(GetParent(hwnd), WM_CTLCOLOR, wParam, lParam));
+ case WM_PAINT:
+ lphc = ComboGetStorageHeader(hwnd);
+ InvalidateRect(lphc->hWndEdit, NULL, TRUE);
+ UpdateWindow(lphc->hWndEdit);
+ InvalidateRect(lphc->hWndDrop, NULL, TRUE);
+ UpdateWindow(lphc->hWndDrop);
+ if ((lphc->dwState & CB_SHOWDROPDOWN) == CB_SHOWDROPDOWN) {
+ InvalidateRect(lphc->hWndLBox, NULL, TRUE);
+ UpdateWindow(lphc->hWndLBox);
+ }
+ break;
+ case WM_MOUSEMOVE:
+ if ((wParam & MK_LBUTTON) != 0) {
+ y = HIWORD(lParam);
+ if (y < 4) {
+ lphc = ComboGetStorageHeader(hwnd);
+ }
+ GetClientRect(hwnd, &rect);
+ if (y > (rect.bottom - 4)) {
+ lphc = ComboGetStorageHeader(hwnd);
+ }
+ }
+ case CB_ADDSTRING:
+#ifdef DEBUG_COMBO
+ printf("CB_ADDSTRING '%s' !\n", (LPSTR)lParam);
+#endif
+ lphc = ComboGetStorageHeader(hwnd);
+ return(SendMessage(lphc->hWndLBox, LB_ADDSTRING, wParam, lParam));
+ case CB_GETLBTEXT:
+ printf("CB_GETLBTEXT #%u !\n", wParam);
+ lphc = ComboGetStorageHeader(hwnd);
+ return(SendMessage(lphc->hWndLBox, LB_GETTEXT, wParam, lParam));
+ case CB_INSERTSTRING:
+ printf("CB_INSERTSTRING '%s' !\n", (LPSTR)lParam);
+ lphc = ComboGetStorageHeader(hwnd);
+ return(SendMessage(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam));
+ case CB_DELETESTRING:
+ printf("CB_DELETESTRING #%u !\n", wParam);
+ lphc = ComboGetStorageHeader(hwnd);
+ return(SendMessage(lphc->hWndLBox, LB_DELETESTRING, wParam, 0L));
+ case CB_RESETCONTENT:
+ printf("CB_RESETCONTENT !\n");
+ lphc = ComboGetStorageHeader(hwnd);
+ return(SendMessage(lphc->hWndLBox, LB_RESETCONTENT, 0, 0L));
+ case CB_DIR:
+ printf("ComboBox CB_DIR !\n");
+ return(SendMessage(lphc->hWndLBox, LB_DIR, wParam, lParam));
+ case CB_FINDSTRING:
+ return(SendMessage(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam));
+ case CB_GETCOUNT:
+ return(SendMessage(lphc->hWndLBox, LB_GETCOUNT, 0, 0L));
+ case CB_GETCURSEL:
+ printf("ComboBox CB_GETCURSEL !\n");
+ return(SendMessage(lphc->hWndLBox, LB_GETCOUNT, 0, 0L));
+ case CB_SETCURSEL:
+ printf("ComboBox CB_SETCURSEL wParam=%x !\n", wParam);
+ return(SendMessage(lphc->hWndLBox, LB_GETCOUNT, wParam, 0L));
+
+ default:
+ return DefWindowProc( hwnd, message, wParam, lParam );
+ }
+return 0;
+}
+
+
+
+LPHEADCOMBO ComboGetStorageHeader(HWND hwnd)
+{
+ WND *wndPtr;
+ LPHEADCOMBO lphc;
+ wndPtr = WIN_FindWndPtr(hwnd);
+ lphc = *((LPHEADCOMBO *)&wndPtr->wExtra[1]);
+ return lphc;
+}
+
+
+
+int CreateComboStruct(HWND hwnd)
+{
+ WND *wndPtr;
+ LPHEADCOMBO lphc;
+ wndPtr = WIN_FindWndPtr(hwnd);
+ lphc = (LPHEADCOMBO)malloc(sizeof(HEADCOMBO));
+ *((LPHEADCOMBO *)&wndPtr->wExtra[1]) = lphc;
+ lphc->dwState = 0;
+ return TRUE;
+}
+
+
+
