Release 950522
Sun May 21 12:30:30 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [debugger/hash.c] [debugger/info.c]
Added support for symbolic segmented addresses. Add symbols for all
built-in API entry points.
* [if1632/relay.c] [include/dlls.h]
Removed dll_table structure, as we now use the built-in module
structures.
* [if1632/relay.c] [loader/main.c]
Removed winestat option, as it was no longer very meaningful.
* [include/stackframe.h]
New macro MAKE_SEGPTR that creates a segmented pointer to a local
variable on the 32-bit stack.
* [loader/module.c]
Added support for multiple instances of an application.
Implemented LoadModule() and FreeModule().
* [loader/ne_image.c] [loader/task.c]
Moved initialisation of built-in DLLs to InitTask().
* [memory/global.c]
Implemented discardable blocks.
* [misc/file.c]
Search path of current executable in OpenFile().
Fixed bug with searching in Windows path.
* [misc/lstr.c]
Hard-coded translation tables for Ansi<->Oem.
* [misc/user.c]
Moved some global initializations to InitApp(), because they need
a task context to be performed.
* [objects/dc.c]
Handle R2_BLACK and R2_WHITE specially so that they work correctly
with palette displays.
* [tools/build.c]
Suppressed generation of the C file for DLL specs, because it's no
longer needed. Output all the assembly code directly to stdout.
Some changes to integrate Win32 support from Martin von Loewis.
* [windows/msgbox.c]
Moved message box code from misc/ to windows/.
Mon May 15 23:40:04 1995 Martin Ayotte (wine@trgcorp.mksinfo.qc.ca)
* [misc/audio.c] [misc/mcicda.c] [misc/mcianim.c] [misc/midi.c]
[misc/mmaux.c] [misc/mmsystem.c]
Modify code & use pointers conversion macros.
Make cdaudio & wave devices work again (only using some applets).
* [misc/profile.c]
Change getc() to fgetc() where needed.
Mon May 15 22:10:56 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [if1632/Imakefile]
added entries for the new files gdi32.spec, kernel32.spec,
user32.spec, shell32.spec and winprocs32.spec.
* [if1632/commdlg.spec][if1632/kernel.spec][if1632/shell.spec]
[if1632/storage.spec][if1632/system.spec][if1632/user.spec]
ChooseFont, RESERVED5, InternalExtractIcon: Marked as stubs
ExtractAssociatedIcon, DoEnvironmentSubst, DumpIcon:
stub implementations provided
marked storage.dll,storege.sys functions as stubs
* [include/pe_image.h]
Added structures WIN32_builtin and WIN32_function
* [include/peexe.h]
PE_Import_Directory: renamed reserved fields to
TimeDate, Forwarder, Thunk_List
* [include/winerror.h]
New file.
* [loader/main.c]
called RELAY32_Init
* [loader/pe_image.c]
xmmap: map BSS anonymous
dump_imports: renamed to fixup_imports, do the fixup of imported
symbols
PE_LoadImage: pass raw data size to xmmap
* [loader/resource.c]
DumpIcon: new function
* [misc/kernel32.c]
New file.
* [misc/main.c]
make stdout and stderr unbuffered
* [misc/shell.c]
DoEnvironmentSubst: new function
* [objects/font.c]
FONT_MatchFont: try oblique if there is no italic
* [rc/Imakefile][rc/parser.l]
yywrap: new function
Don't link with libfl.a on Linux
* [tools/build.c]
Added keywords stdcall, subsystem, base
GenerateForWin32: new function
BuildSpecFiles: call GenerateForWin32 if subsystem is win32
Mon May 15 10:38:14 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c] [controls/combo.c] [windows/defwnd.c]
Minor fixes.
* [misc/message.c] [misc/main.c] [rc/sysres*.rc] [include/texts.h]
Rewrote message box handling.
* [windows/dialog.c]
Dialogs should be invisible until after WM_INITDIALOG is seent.
Don't switch to invisible dialog items on a TAB keypress.
* [windows/mdi.c]
Send WM_NCPAINT message in MDIRestoreChild().
* [windows/painting.c]
Fixed typo (&& -> &).
* [windows/message.c] [if1632/user.spec]
Implemented PostAppMessage().
* [windows/event.c]
SetCapture(0) should act like ReleaseCapture().
Tue May 9 11:55:52 1995 Eddie C. Dost (ecd@dressler.de)
* [Imakefile]
Changed CDEBUGFLAGS for systems running __ELF__ (temporarily)
Added ASFLAGS to exported variables.
* [debugger/readline/Imakefile]
Moved defines for libreadline from DEFINES to EXTRA_DEFINES
* [memory/local.c] [miscemu/int21.c]
Added some more debugging outputs.
Mon May 8 00:55:27 MET DST 1995 Dag Asheim (dash@ifi.uio.no)
* [misc/message.c]
Fixed a "FIXME" concerning norwegian translation.
Sun May 7 23:25:23 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [*/*]
Removed warnings in a couple of files and deleted some obsolete code.
* [controls/listbox.c]
Cleanup, speed improvements & lots of bug fixes.
* [controls/combo.c]
Mostly rewritten. This is still very buggy, but not quite as bad as
before.
* [include/commdlg.h] [misc/commdlg.c]
Removed the need for sysres.dll. Small bug fixes.
* [objects/oembitmap.c] [include/bitmaps/<many>] [include/windows.h]
[loader/library.c] [loader/main.c] [rc/sysres*.rc]
Removed sysres.dll and replaced the remaining bitmaps/icons with
XPM equivalents.
* [misc/message.c] [windows/nonclient.c] [misc/main.c]
[if1632/winprocs.spec]
"About Wine..." now brings up a standard ShellAbout() window with
the Wine icon and the list of contributors.
* [misc/shell.c]
Fixed ShellAbout()/AboutDialogProc() to show the right icon.
* [windows/event.c]
Small hack for non-alphanumeric keys: Dont't send the ascii value in
the WM_KEYDOWN message, but some unused code instead. Should be done
properly by sending different codes for each key. The edit control
used to get a VK_DELETE message each time the user typed '.'.
* [windows/class.c]
Removed a check for CS_GLOBALCLASS in CLASS_FindClassByName().
This used to be no problem, but breaks Resource Workshop in 950403.
* [objects/dib.c]
New diagnostic for a bug I've been encountering. If it shows up,
please report it.
Sun May 7 23:11:18 EDT 1995 William Magro (wmagro@tc.cornell.edu)
* [objects/color.c]
Handle situation when 'dc' exists, but palette mapping
does not. (Fixes kidpix2 demo.)
Sun May 7 03:32:00 1995 Charles M. Hannum (mycroft@mit.edu)
* [loader/ldt.c]
LDT_Print: Only show the number of entries that the kernel
returned. Make this work for NetBSD.
Fri May 5 02:53:26 1995 Charles M. Hannum (mycroft@mit.edu)
* [debugger/dbg.y] [include/wine.h] [loader/signal.c]
Modify cs and ds selector values for NetBSD-current.
* [debugger/debug.l]
$sp, $esp: Use RN_ESP_AT_SIGNAL rather than RN_ESP.
* [debugger/regpos.h]
Modify sigcontext format for NetBSD-current.
SC_ESP: Use RN_ESP_AT_SIGNAL rather than RN_ESP.
* [include/ldt.h]
SELECTOR_TO_ENTRY: Explicitly clear the top half of the selector
value, since only 16 bits of it may have been saved.
* [misc/winsocket.c]
Set structure packing with `#pragma pack' to accomodate
other/older compilers.
Tue May 2 18:15:01 1995 Paal Beyer (beyer@idt.unit.no)
* [misc/commdlg.c]
Fixed path-names so when changing directory the listboxes
changes too.
* [debugger/dbg.y debugger/debug.l wine.ini]
Added SymbolTableFile to wine.ini so symbols can be read
without standing in the directory containing wine.sym.
Added the possibility to specify full name of wine.sym from
the debugger prompt.
diff --git a/controls/listbox.c b/controls/listbox.c
index d20e568..75b1a37 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -1,18 +1,21 @@
/*
- * Interface code to listbox widgets
- *
+ * Listbox controls
+ *
* Copyright Martin Ayotte, 1993
* Copyright Constantine Sapuntzakis, 1995
- *
-static char Copyright[] = "Copyright Martin Ayotte, 1993";
-*/
+ *
+ */
+
+ /*
+ * TODO:
+ * - check if multi-column listboxes work
+ * - implement more messages and styles
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "windows.h"
#include "user.h"
#include "win.h"
@@ -22,43 +25,6 @@
#include "stddebug.h"
#include "debug.h"
-#define GMEM_ZEROINIT 0x0040
-
-LPLISTSTRUCT ListBoxGetItem (HWND hwnd, UINT uIndex);
-int ListBoxScrolltoFocus(HWND hwnd);
-LPHEADLIST ListBoxGetWindowAndStorage(HWND hwnd, WND **wndPtr);
-LPHEADLIST ListBoxGetStorageHeader(HWND hwnd);
-void RepaintListBox(HWND hwnd);
-int ListBoxFindMouse(HWND hwnd, int X, int Y);
-int CreateListBoxStruct(HWND hwnd);
-void ListBoxAskMeasure(WND *wndPtr, LPHEADLIST lphl, LPLISTSTRUCT lpls);
-int ListBoxAddString(HWND hwnd, LPSTR newstr);
-int ListBoxInsertString(HWND hwnd, UINT uIndex, LPSTR newstr);
-int ListBoxGetText(HWND hwnd, UINT uIndex, LPSTR OutStr, BOOL bItemData);
-int ListBoxSetItemData(HWND hwnd, UINT uIndex, DWORD ItemData);
-int ListBoxDeleteString(HWND hwnd, UINT uIndex);
-int ListBoxFindString(HWND hwnd, UINT nFirst, LPSTR MatchStr);
-int ListBoxResetContent(HWND hwnd);
-int ListBoxSetCurSel(HWND hwnd, WORD wIndex);
-int ListBoxSetSel(HWND hwnd, WORD wIndex, WORD state);
-int ListBoxGetSel(HWND hwnd, WORD wIndex);
-int ListBoxDirectory(HWND hwnd, UINT attrib, LPSTR filespec);
-int ListBoxGetItemRect(HWND hwnd, WORD wIndex, LPRECT rect);
-int ListBoxSetItemHeight(HWND hwnd, WORD wIndex, long height);
-int ListBoxDefaultItem(HWND hwnd, WND *wndPtr,
- LPHEADLIST lphl, LPLISTSTRUCT lpls);
-int ListBoxFindNextMatch(HWND hwnd, WORD wChar);
-int ListMaxFirstVisible(LPHEADLIST lphl);
-void ListBoxSendNotification(HWND hwnd, WORD code);
-
-#define OWNER_DRAWN(wndPtr) \
- ((wndPtr->dwStyle & LBS_OWNERDRAWFIXED) || \
- (wndPtr->dwStyle & LBS_OWNERDRAWVARIABLE))
-
-#define HasStrings(wndPtr) ( \
- (! OWNER_DRAWN (wndPtr)) || \
- (wndPtr->dwStyle & LBS_HASSTRINGS))
-
#if 0
#define LIST_HEAP_ALLOC(lphl,f,size) ((int)HEAP_Alloc(&lphl->Heap,f,size) & 0xffff)
#define LIST_HEAP_FREE(lphl,handle) (HEAP_Free(&lphl->Heap,LIST_HEAP_ADDR(lphl,handle)))
@@ -76,52 +42,52 @@
/* Design notes go here */
-LONG LBCreate( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetDlgCode( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBDestroy( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBVScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBHScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBLButtonDown( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBLButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBRButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBMouseMove( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBKeyDown( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetFont( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetRedraw( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBPaint( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBKillFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBResetContent( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBDir( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBAddString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetText( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBInsertString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBDeleteString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBFindString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetCount( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetItemRect( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetSelCount( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetSelItems( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetTextLen( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBGetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSelectString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSelItemRange( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetColumnWidth( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetTabStops( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-LONG LBSetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam );
-
+static LONG LBCreate( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetDlgCode( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBDestroy( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBVScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBHScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBLButtonDown( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBLButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBRButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBMouseMove( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBKeyDown( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBChar( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetFont( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetRedraw( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBPaint( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBKillFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBResetContent( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBDir( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBAddString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetText( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBInsertString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBDeleteString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBFindString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetCount( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetItemRect( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetSelCount( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetSelItems( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetTextLen( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBGetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSelectString( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSelItemRange( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetColumnWidth( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetTabStops( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam );
+static LONG LBSetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam );
typedef struct {
WORD message;
@@ -140,6 +106,7 @@
{WM_LBUTTONDBLCLK, LBRButtonUp},
{WM_MOUSEMOVE, LBMouseMove},
{WM_KEYDOWN, LBKeyDown},
+ {WM_CHAR, LBChar},
{WM_SETFONT, LBSetFont},
{WM_SETREDRAW, LBSetRedraw},
{WM_PAINT, LBPaint},
@@ -177,144 +144,732 @@
{LB_SETITEMHEIGHT, LBSetItemHeight}
};
-/***********************************************************************
- * LBCreate
- */
-LONG LBCreate( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+BOOL OWNER_DRAWN(LPHEADLIST lphl)
{
- LPHEADLIST lphl;
- CREATESTRUCT *createStruct;
- WND *wndPtr;
-
- CreateListBoxStruct(hwnd);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- dprintf_listbox(stddeb,"ListBox WM_CREATE %p !\n", lphl);
-
- if (lphl == NULL) return 0;
-
- createStruct = (CREATESTRUCT *)PTR_SEG_TO_LIN(lParam);
-
- if (HIWORD(createStruct->lpCreateParams) != 0)
- lphl->hWndLogicParent = (HWND)HIWORD(createStruct->lpCreateParams);
- else
- lphl->hWndLogicParent = GetParent(hwnd);
-
- lphl->hFont = GetStockObject(SYSTEM_FONT);
- lphl->ColumnsWidth = wndPtr->rectClient.right - wndPtr->rectClient.left;
-
- SetScrollRange(hwnd, SB_VERT, 1, ListMaxFirstVisible(lphl), TRUE);
- SetScrollRange(hwnd, SB_HORZ, 1, 1, TRUE);
-
- return 0;
+ return lphl->dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE);
}
-int CreateListBoxStruct(HWND hwnd)
-
+BOOL HasStrings(LPHEADLIST lphl)
{
- WND *wndPtr;
- LPHEADLIST lphl;
+ return (lphl->dwStyle & LBS_HASSTRINGS) || !OWNER_DRAWN(lphl);
+}
- wndPtr = WIN_FindWndPtr(hwnd);
-
- lphl = (LPHEADLIST)malloc(sizeof(HEADLIST));
- *((LPHEADLIST *)&wndPtr->wExtra[1]) = lphl;
-
+static void ListBoxInitialize(LPHEADLIST lphl)
+{
lphl->lpFirst = NULL;
lphl->ItemsCount = 0;
lphl->ItemsVisible = 0;
- lphl->FirstVisible = 1;
+ lphl->FirstVisible = 0;
lphl->ColumnsVisible = 1;
lphl->ItemsPerColumn = 0;
- lphl->StdItemHeight = 15;
lphl->ItemFocused = -1;
lphl->PrevFocused = -1;
- lphl->DrawCtlType = ODT_LISTBOX;
+}
+
+void CreateListBoxStruct(HWND hwnd, WORD CtlType, LONG styles, HWND parent)
+{
+ LPHEADLIST lphl;
+
+ lphl = (LPHEADLIST)malloc(sizeof(HEADLIST));
+ SetWindowLong(hwnd, 0, (LONG)lphl);
+ if (lphl == NULL) {
+ fprintf(stderr,"malloc failed in CreateListBoxStruct()\n");
+ exit(1); /* Things won't get better */
+ }
+
+ ListBoxInitialize(lphl);
+ lphl->DrawCtlType = CtlType;
+ lphl->CtlID = GetWindowWord(hwnd,GWW_ID);
lphl->bRedrawFlag = TRUE;
lphl->iNumStops = 0;
lphl->TabStops = NULL;
+ lphl->hFont = GetStockObject(SYSTEM_FONT);
+ lphl->hParent = parent;
+ lphl->StdItemHeight = 15; /* FIXME: should get the font height */
+ lphl->dwStyle = styles;
- if (OWNER_DRAWN(wndPtr))
+ if (OWNER_DRAWN(lphl)) {
+ LISTSTRUCT dummyls;
+
lphl->hDrawItemStruct = USER_HEAP_ALLOC(sizeof(DRAWITEMSTRUCT));
- else
+ lphl->needMeasure = TRUE;
+ dummyls.mis.CtlType = lphl->DrawCtlType;
+ dummyls.mis.CtlID = lphl->CtlID;
+ dummyls.mis.itemID = -1;
+ dummyls.mis.itemWidth = 0; /* ignored */
+ dummyls.mis.itemData = 0;
+
+ ListBoxAskMeasure(lphl,&dummyls);
+ } else {
lphl->hDrawItemStruct = 0;
+ }
#if 0
HeapHandle = GlobalAlloc(GMEM_FIXED, LIST_HEAP_SIZE);
HeapBase = GlobalLock(HeapHandle);
HEAP_Init(&lphl->Heap, HeapBase, LIST_HEAP_SIZE);
#endif
- return TRUE;
}
-
-/***********************************************************************
- * LBDestroy
- */
-LONG LBDestroy( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+void DestroyListBoxStruct(LPHEADLIST lphl)
{
- LPHEADLIST lphl;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (lphl == NULL) return 0;
- ListBoxResetContent(hwnd);
-
if (lphl->hDrawItemStruct)
USER_HEAP_FREE(lphl->hDrawItemStruct);
/* XXX need to free lphl->Heap */
free(lphl);
- *((LPHEADLIST *)&wndPtr->wExtra[1]) = 0;
- dprintf_listbox(stddeb,"ListBox WM_DESTROY %p !\n", lphl);
- return 0;
}
+static LPHEADLIST ListBoxGetStorageHeader(HWND hwnd)
+{
+ return (LPHEADLIST)GetWindowLong(hwnd,0);
+}
+
+/* Send notification "code" as part of a WM_COMMAND-message if hwnd
+ has the LBS_NOTIFY style */
+void ListBoxSendNotification(LPHEADLIST lphl, HWND hwnd, WORD code)
+{
+ if (lphl->dwStyle & LBS_NOTIFY)
+ SendMessage(lphl->hParent, WM_COMMAND,
+ lphl->CtlID, MAKELONG(hwnd, code));
+}
+
+
/* get the maximum value of lphl->FirstVisible */
int ListMaxFirstVisible(LPHEADLIST lphl)
{
- int m = lphl->ItemsCount-lphl->ItemsVisible+1;
- return (m < 1) ? 1 : m;
+ int m = lphl->ItemsCount-lphl->ItemsVisible;
+ return (m < 0) ? 0 : m;
}
+void ListBoxUpdateWindow(HWND hwnd, LPHEADLIST lphl, BOOL repaint)
+{
+ SetScrollRange(hwnd, SB_VERT, 0, ListMaxFirstVisible(lphl), TRUE);
+ if (lphl->ItemsPerColumn != 0) {
+ SetScrollRange(hwnd, SB_HORZ, 1, lphl->ItemsVisible /
+ lphl->ItemsPerColumn + 1, TRUE);
+ }
+ if (repaint && lphl->bRedrawFlag) {
+ InvalidateRect(hwnd, NULL, TRUE);
+ }
+}
+
+/* Returns: 0 if nothing needs to be changed */
+/* 1 if FirstVisible changed */
+
+int ListBoxScrollToFocus(LPHEADLIST lphl)
+{
+ short end;
+
+ if (lphl->ItemsCount == 0) return 0;
+ if (lphl->ItemFocused == -1) return 0;
+
+ end = lphl->FirstVisible + lphl->ItemsVisible - 1;
+
+ if (lphl->ItemFocused < lphl->FirstVisible ) {
+ lphl->FirstVisible = lphl->ItemFocused;
+ return 1;
+ } else {
+ if (lphl->ItemFocused > end) {
+ WORD maxFirstVisible = ListMaxFirstVisible(lphl);
+
+ lphl->FirstVisible = lphl->ItemFocused;
+
+ if (lphl->FirstVisible > maxFirstVisible) {
+ lphl->FirstVisible = maxFirstVisible;
+ }
+ return 1;
+ }
+ }
+ return 0;
+}
+
+
+LPLISTSTRUCT ListBoxGetItem(LPHEADLIST lphl, UINT uIndex)
+{
+ LPLISTSTRUCT lpls;
+ UINT Count = 0;
+
+ if (uIndex >= lphl->ItemsCount) return NULL;
+
+ lpls = lphl->lpFirst;
+ while (Count++ < uIndex) lpls = lpls->lpNext;
+ return lpls;
+}
+
+
+void ListBoxDrawItem (HWND hwnd, LPHEADLIST lphl, HDC hdc, LPLISTSTRUCT lpls,
+ RECT *rect, WORD itemAction, WORD itemState)
+{
+ if (OWNER_DRAWN(lphl)) {
+ DRAWITEMSTRUCT *dis = USER_HEAP_LIN_ADDR(lphl->hDrawItemStruct);
+
+ dis->CtlID = lpls->mis.CtlID;
+ dis->CtlType = lpls->mis.CtlType;
+ dis->itemID = lpls->mis.itemID;
+ dis->hDC = hdc;
+ dis->hwndItem = hwnd;
+ dis->itemData = lpls->mis.itemData;
+ dis->itemAction = itemAction;
+ dis->itemState = itemState;
+ dis->rcItem = *rect;
+ SendMessage(lphl->hParent, WM_DRAWITEM,
+ 0, (LPARAM)USER_HEAP_SEG_ADDR(lphl->hDrawItemStruct));
+ } else {
+ if (itemAction == ODA_DRAWENTIRE || itemAction == ODA_SELECT) {
+ int OldBkMode;
+ DWORD dwOldTextColor = 0;
+
+ OldBkMode = SetBkMode(hdc, TRANSPARENT);
+
+ if (itemState != 0) {
+ dwOldTextColor = SetTextColor(hdc, 0x00FFFFFFL);
+ FillRect(hdc, rect, GetStockObject(BLACK_BRUSH));
+ }
+
+ if (lphl->dwStyle & LBS_USETABSTOPS) {
+ TabbedTextOut(hdc, rect->left + 5, rect->top + 2,
+ (char *)lpls->itemText, strlen((char *)lpls->itemText),
+ lphl->iNumStops, lphl->TabStops, 0);
+ } else {
+ TextOut(hdc, rect->left + 5, rect->top + 2,
+ (char *)lpls->itemText, strlen((char *)lpls->itemText));
+ }
+
+ if (itemState != 0) {
+ SetTextColor(hdc, dwOldTextColor);
+ }
+
+ SetBkMode(hdc, OldBkMode);
+ } else DrawFocusRect(hdc, rect);
+ }
+
+ return;
+}
+
+
+int ListBoxFindMouse(LPHEADLIST lphl, int X, int Y)
+{
+ LPLISTSTRUCT lpls = lphl->lpFirst;
+ int i, j;
+ POINT point;
+
+ point.x = X; point.y = Y;
+ if (lphl->ItemsCount == 0) return LB_ERR;
+
+ for(i = 0; i < lphl->FirstVisible; i++) {
+ if (lpls == NULL) return LB_ERR;
+ lpls = lpls->lpNext;
+ }
+ for(j = 0; j < lphl->ItemsVisible; i++, j++) {
+ if (lpls == NULL) return LB_ERR;
+ if (PtInRect(&lpls->itemRect,point)) {
+ return i;
+ }
+ lpls = lpls->lpNext;
+ }
+ dprintf_listbox(stddeb,"ListBoxFindMouse: not found\n");
+ return LB_ERR;
+}
+
+
+void ListBoxAskMeasure(LPHEADLIST lphl, LPLISTSTRUCT lpls)
+{
+ HANDLE hTemp = USER_HEAP_ALLOC( sizeof(MEASUREITEMSTRUCT) );
+ MEASUREITEMSTRUCT *lpmeasure = (MEASUREITEMSTRUCT *) USER_HEAP_LIN_ADDR(hTemp);
+
+ if (lpmeasure == NULL) {
+ fprintf(stderr,"ListBoxAskMeasure() out of memory !\n");
+ return;
+ }
+
+ *lpmeasure = lpls->mis;
+ lpmeasure->itemHeight = lphl->StdItemHeight;
+ SendMessage(lphl->hParent, WM_MEASUREITEM,
+ 0, USER_HEAP_SEG_ADDR(hTemp));
+
+ if (lphl->dwStyle & LBS_OWNERDRAWFIXED) {
+ lphl->StdItemHeight = lpmeasure->itemHeight;
+ lphl->needMeasure = FALSE;
+ }
+
+ USER_HEAP_FREE(hTemp);
+}
+
+
+LPLISTSTRUCT ListBoxCreateItem(LPHEADLIST lphl, int id)
+{
+ LPLISTSTRUCT lplsnew = (LPLISTSTRUCT)malloc(sizeof(LISTSTRUCT));
+
+ if (lplsnew == NULL) return NULL;
+
+ lplsnew->itemState = 0;
+ lplsnew->mis.CtlType = lphl->DrawCtlType;
+ lplsnew->mis.CtlID = lphl->CtlID;
+ lplsnew->mis.itemID = id;
+ lplsnew->mis.itemHeight = lphl->StdItemHeight;
+ lplsnew->mis.itemWidth = 0; /* ignored */
+ lplsnew->mis.itemData = 0;
+ SetRect(&lplsnew->itemRect, 0, 0, 0, 0);
+
+ return lplsnew;
+}
+
+
+int ListBoxInsertString(LPHEADLIST lphl, UINT uIndex, LPSTR newstr)
+{
+ LPLISTSTRUCT *lppls, lplsnew;
+ HANDLE hStr;
+ LPSTR str;
+ UINT Count;
+
+ dprintf_listbox(stddeb,"ListBoxInsertString(%d, %p);\n", uIndex, newstr);
+
+ if (uIndex == (UINT)-1)
+ uIndex = lphl->ItemsCount;
+
+ lppls = &lphl->lpFirst;
+ for(Count = 0; Count < uIndex; Count++) {
+ if (*lppls == NULL) return LB_ERR;
+ lppls = (LPLISTSTRUCT *) &(*lppls)->lpNext;
+ }
+
+ lplsnew = ListBoxCreateItem(lphl, Count);
+
+ if (lplsnew == NULL) {
+ printf("ListBoxInsertString() out of memory !\n");
+ return LB_ERRSPACE;
+ }
+
+ lplsnew->lpNext = *lppls;
+ *lppls = lplsnew;
+ lphl->ItemsCount++;
+
+ hStr = 0;
+ if (HasStrings(lphl)) {
+ hStr = LIST_HEAP_ALLOC(lphl, GMEM_MOVEABLE, strlen(newstr) + 1);
+ str = (LPSTR)LIST_HEAP_ADDR(lphl, hStr);
+ if (str == NULL) return LB_ERRSPACE;
+ strcpy(str, newstr);
+ lplsnew->itemText = str;
+ /* I'm not so sure about the next one */
+ lplsnew->mis.itemData = LIST_HEAP_SEG_ADDR(lphl,hStr);
+ } else {
+ lplsnew->itemText = NULL;
+ lplsnew->mis.itemData = (DWORD)newstr;
+ }
+
+ lplsnew->mis.itemID = lphl->ItemsCount;
+ lplsnew->hData = hStr;
+
+ if (lphl->needMeasure) {
+ ListBoxAskMeasure(lphl, lplsnew);
+ }
+
+ dprintf_listbox(stddeb,"ListBoxInsertString // count=%d\n", lphl->ItemsCount);
+ return uIndex;
+}
+
+
+int ListBoxAddString(LPHEADLIST lphl, LPSTR newstr)
+{
+ UINT pos = (UINT) -1;
+
+ if (HasStrings(lphl) && (lphl->dwStyle & LBS_SORT)) {
+ LPLISTSTRUCT lpls = lphl->lpFirst;
+ for (pos = 0; lpls != NULL; lpls = lpls->lpNext, pos++)
+ if (strcmp(lpls->itemText, newstr) >= 0)
+ break;
+ }
+ return ListBoxInsertString(lphl, pos, newstr);
+}
+
+
+int ListBoxGetText(LPHEADLIST lphl, UINT uIndex, LPSTR OutStr)
+{
+ LPLISTSTRUCT lpls;
+
+ if (!OutStr) {
+ dprintf_listbox(stddeb, "ListBoxGetText // OutStr==NULL\n");
+ return 0;
+ }
+
+ lpls = ListBoxGetItem (lphl, uIndex);
+ if (lpls == NULL) return LB_ERR;
+
+ if (!HasStrings(lphl)) {
+ *((long *)OutStr) = lpls->mis.itemData;
+ return 4;
+ }
+
+ strcpy(OutStr, lpls->itemText);
+ return strlen(OutStr);
+}
+
+
+DWORD ListBoxGetItemData(LPHEADLIST lphl, UINT uIndex)
+{
+ LPLISTSTRUCT lpls;
+
+ lpls = ListBoxGetItem (lphl, uIndex);
+ if (lpls == NULL) return LB_ERR;
+ return lpls->mis.itemData;
+}
+
+
+int ListBoxSetItemData(LPHEADLIST lphl, UINT uIndex, DWORD ItemData)
+{
+ LPLISTSTRUCT lpls = ListBoxGetItem(lphl, uIndex);
+
+ if (lpls == NULL) return LB_ERR;
+ lpls->mis.itemData = ItemData;
+ return 1;
+}
+
+
+int ListBoxDeleteString(LPHEADLIST lphl, UINT uIndex)
+{
+ LPLISTSTRUCT lpls;
+ UINT Count;
+
+ if (uIndex >= lphl->ItemsCount) return LB_ERR;
+
+ lpls = lphl->lpFirst;
+ if (lpls == NULL) return LB_ERR;
+
+ if (uIndex == 0)
+ lphl->lpFirst = lpls->lpNext;
+ else {
+ LPLISTSTRUCT lpls2 = NULL;
+ for(Count = 0; Count < uIndex; Count++) {
+ if (lpls->lpNext == NULL) return LB_ERR;
+
+ lpls2 = lpls;
+ lpls = (LPLISTSTRUCT)lpls->lpNext;
+ }
+ lpls2->lpNext = (LPLISTSTRUCT)lpls->lpNext;
+ }
+
+ lphl->ItemsCount--;
+
+ if (lpls->hData != 0) LIST_HEAP_FREE(lphl, lpls->hData);
+ free(lpls);
+
+ return lphl->ItemsCount;
+}
+
+
+int ListBoxFindString(LPHEADLIST lphl, UINT nFirst, SEGPTR MatchStr)
+{
+ LPLISTSTRUCT lpls;
+ UINT Count;
+ UINT First = nFirst + 1;
+ LPSTR lpMatchStr = (LPSTR)MatchStr;
+
+ if (First > lphl->ItemsCount) return LB_ERR;
+
+ if (HasStrings(lphl)) lpMatchStr = PTR_SEG_TO_LIN(MatchStr);
+
+ lpls = ListBoxGetItem(lphl, First);
+ Count = 0;
+ while(lpls != NULL) {
+ if (HasStrings(lphl)) {
+ if (strstr(lpls->itemText, lpMatchStr) == lpls->itemText) return Count;
+ } else if (lphl->dwStyle & LBS_SORT) {
+ /* XXX Do a compare item */
+ }
+ else
+ if (lpls->mis.itemData == (DWORD)lpMatchStr) return Count;
+
+ lpls = lpls->lpNext;
+ Count++;
+ }
+
+ /* Start over at top */
+ Count = 0;
+ lpls = lphl->lpFirst;
+
+ while (Count < First) {
+ if (HasStrings(lphl)) {
+ if (strstr(lpls->itemText, lpMatchStr) == lpls->itemText) return Count;
+ } else if (lphl->dwStyle & LBS_SORT) {
+ /* XXX Do a compare item */
+ } else {
+ if (lpls->mis.itemData == (DWORD)lpMatchStr) return Count;
+ }
+ lpls = lpls->lpNext;
+ Count++;
+ }
+
+ return LB_ERR;
+}
+
+
+int ListBoxResetContent(LPHEADLIST lphl)
+{
+ LPLISTSTRUCT lpls;
+ int i;
+
+ if (lphl->ItemsCount == 0) return 0;
+
+ dprintf_listbox(stddeb, "ListBoxResetContent // ItemCount = %d\n",
+ lphl->ItemsCount);
+
+ for(i = 0; i < lphl->ItemsCount; i++) {
+ lpls = lphl->lpFirst;
+ if (lpls == NULL) return LB_ERR;
+
+ lphl->lpFirst = lpls->lpNext;
+ if (lpls->hData != 0) LIST_HEAP_FREE(lphl, lpls->hData);
+ free(lpls);
+ }
+ ListBoxInitialize(lphl);
+
+ return TRUE;
+}
+
+
+int ListBoxSetCurSel(LPHEADLIST lphl, WORD wIndex)
+{
+ LPLISTSTRUCT lpls;
+
+ if (lphl->dwStyle & LBS_MULTIPLESEL) return 0;
+
+ if (lphl->ItemFocused != -1) {
+ lpls = ListBoxGetItem(lphl, lphl->ItemFocused);
+ if (lpls == 0) return LB_ERR;
+ lpls->itemState = 0;
+ }
+
+ if (wIndex != (UINT)-1) {
+ lphl->ItemFocused = wIndex;
+ lpls = ListBoxGetItem(lphl, wIndex);
+ if (lpls == 0) return LB_ERR;
+ lpls->itemState = ODS_SELECTED | ODS_FOCUS;
+
+ return 0;
+ }
+
+ return LB_ERR;
+}
+
+
+int ListBoxSetSel(LPHEADLIST lphl, WORD wIndex, WORD state)
+{
+ LPLISTSTRUCT lpls;
+
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) return 0;
+
+ if (wIndex == (UINT)-1) {
+ for (lpls = lphl->lpFirst; lpls != NULL; lpls = lpls->lpNext) {
+ lpls->itemState = state;
+ }
+ return 0;
+ }
+
+ if (wIndex >= lphl->ItemsCount) return LB_ERR;
+
+ lpls = ListBoxGetItem(lphl, wIndex);
+ lpls->itemState = state;
+
+ return 0;
+}
+
+
+int ListBoxGetSel(LPHEADLIST lphl, WORD wIndex)
+{
+ LPLISTSTRUCT lpls = ListBoxGetItem(lphl, wIndex);
+
+ if (lpls == NULL) return LB_ERR;
+ return lpls->itemState;
+}
+
+
+int ListBoxDirectory(LPHEADLIST lphl, UINT attrib, LPSTR filespec)
+{
+ struct dosdirent *dp, *dp_old;
+ char temp[256];
+ int drive;
+ LPSTR tstr;
+
+ dprintf_listbox(stddeb,"ListBoxDirectory: %s, %4x\n",filespec,attrib);
+
+ if (strchr(filespec, '\\') || strchr(filespec, ':')) {
+ drive = DOS_GetDefaultDrive();
+ if (filespec[1] == ':') {
+ drive = toupper(filespec[0]) - 'A';
+ filespec += 2;
+ }
+ strcpy(temp,filespec);
+ tstr = strrchr(temp, '\\');
+ if (tstr == NULL)
+ DOS_SetDefaultDrive( drive );
+ else {
+ *tstr = 0;
+ filespec = tstr + 1;
+ if (!DOS_ChangeDir( drive, temp )) return 0;
+ DOS_SetDefaultDrive( drive );
+ }
+ dprintf_listbox(stddeb,"Changing directory to %c:%s, filemask is %s\n",
+ drive+'A', temp, filespec);
+ }
+
+ if ((dp = (struct dosdirent *)DOS_opendir(filespec)) ==NULL) return 0;
+ dp_old = dp;
+ while ((dp = (struct dosdirent *)DOS_readdir(dp))) {
+ if (!dp->inuse) break;
+ dprintf_listbox(stddeb, "ListBoxDirectory %p '%s' !\n", dp->filename,
+ dp->filename);
+ if (dp->attribute & FA_DIREC) {
+ if (attrib & DDL_DIRECTORY && strcmp(dp->filename, ".") != 0) {
+ sprintf(temp, "[%s]", dp->filename);
+ if (ListBoxAddString(lphl, temp) == LB_ERR) break;
+ }
+ }
+ else {
+ if (attrib & DDL_EXCLUSIVE) {
+ if (attrib & (DDL_READWRITE | DDL_READONLY | DDL_HIDDEN | DDL_SYSTEM)) {
+ if (ListBoxAddString(lphl, dp->filename) == LB_ERR) break;
+ }
+ } else {
+ if (ListBoxAddString(lphl, dp->filename) == LB_ERR) break;
+ }
+ }
+ }
+ DOS_closedir(dp_old);
+
+ if (attrib & DDL_DRIVES) {
+ int x;
+ for (x = 0; x != MAX_DOS_DRIVES ; x++) {
+ if (DOS_ValidDrive(x)) {
+ sprintf(temp, "[-%c-]", 'a'+x);
+ if (ListBoxInsertString(lphl, (UINT)-1, temp) == LB_ERR) break;
+ }
+ }
+ }
+ return 1;
+}
+
+
+int ListBoxGetItemRect(LPHEADLIST lphl, WORD wIndex, LPRECT lprect)
+{
+ LPLISTSTRUCT lpls = ListBoxGetItem(lphl,wIndex);
+
+ if (lpls == NULL) return LB_ERR;
+ *lprect = lpls->itemRect;
+ return 0;
+}
+
+
+int ListBoxSetItemHeight(LPHEADLIST lphl, WORD wIndex, long height)
+{
+ LPLISTSTRUCT lpls;
+
+ if (!(lphl->dwStyle & LBS_OWNERDRAWVARIABLE)) {
+ lphl->StdItemHeight = (short)height;
+ return 0;
+ }
+
+ lpls = ListBoxGetItem(lphl, wIndex);
+ if (lpls == NULL) return LB_ERR;
+
+ lpls->mis.itemHeight = height;
+ return 0;
+}
+
+
+int ListBoxFindNextMatch(LPHEADLIST lphl, WORD wChar)
+{
+ LPLISTSTRUCT lpls;
+ UINT count,first;
+
+ if ((char)wChar < ' ') return LB_ERR;
+ if (!HasStrings(lphl)) return LB_ERR;
+
+ lpls = lphl->lpFirst;
+
+ for (count = 0; lpls != NULL; lpls = lpls->lpNext, count++) {
+ if (tolower(*lpls->itemText) == tolower((char)wChar)) break;
+ }
+ if (lpls == NULL) return LB_ERR;
+ first = count;
+ for(; lpls != NULL; lpls = lpls->lpNext, count++) {
+ if (*lpls->itemText != (char)wChar)
+ break;
+ if (count > lphl->ItemFocused)
+ return count;
+ }
+ return first;
+}
+
+/***********************************************************************
+ * LBCreate
+ */
+static LONG LBCreate(HWND hwnd, WORD message, WORD wParam, LONG lParam)
+{
+ LPHEADLIST lphl;
+ RECT rect;
+
+ CreateListBoxStruct(hwnd, ODT_LISTBOX, GetWindowLong(hwnd,GWL_STYLE), GetParent(hwnd));
+ lphl = ListBoxGetStorageHeader(hwnd);
+ dprintf_listbox(stddeb,"ListBox WM_CREATE %p !\n", lphl);
+
+ GetClientRect(hwnd,&rect);
+ lphl->ColumnsWidth = rect.right - rect.left;
+
+ SetScrollRange(hwnd, SB_VERT, 0, ListMaxFirstVisible(lphl), TRUE);
+ SetScrollRange(hwnd, SB_HORZ, 1, 1, TRUE);
+
+ return 0;
+}
+
+/***********************************************************************
+ * LBDestroy
+ */
+static LONG LBDestroy(HWND hwnd, WORD message, WORD wParam, LONG lParam)
+{
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+
+ ListBoxResetContent(lphl);
+
+ DestroyListBoxStruct(lphl);
+ dprintf_listbox(stddeb,"ListBox WM_DESTROY %p !\n", lphl);
+ return 0;
+}
+
/***********************************************************************
* LBVScroll
*/
-LONG LBVScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBVScroll(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
int y;
dprintf_listbox(stddeb,"ListBox WM_VSCROLL w=%04X l=%08lX !\n",
wParam, lParam);
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return 0;
y = lphl->FirstVisible;
switch(wParam) {
case SB_LINEUP:
- if (lphl->FirstVisible > 1)
+ if (lphl->FirstVisible > 0)
lphl->FirstVisible--;
break;
case SB_LINEDOWN:
- if (lphl->FirstVisible < ListMaxFirstVisible(lphl))
- lphl->FirstVisible++;
+ lphl->FirstVisible++;
break;
case SB_PAGEUP:
- if (lphl->FirstVisible > 1)
+ if (lphl->FirstVisible > lphl->ItemsVisible) {
lphl->FirstVisible -= lphl->ItemsVisible;
+ } else {
+ lphl->FirstVisible = 0;
+ }
break;
case SB_PAGEDOWN:
- if (lphl->FirstVisible < ListMaxFirstVisible(lphl))
- lphl->FirstVisible += lphl->ItemsVisible;
+ lphl->FirstVisible += lphl->ItemsVisible;
break;
case SB_THUMBTRACK:
@@ -322,14 +877,12 @@
break;
}
- if (lphl->FirstVisible < 1) lphl->FirstVisible = 1;
if (lphl->FirstVisible > ListMaxFirstVisible(lphl))
lphl->FirstVisible = ListMaxFirstVisible(lphl);
if (y != lphl->FirstVisible) {
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
}
return 0;
}
@@ -337,8 +890,7 @@
/***********************************************************************
* LBHScroll
*/
-LONG LBHScroll( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBHScroll(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
LPHEADLIST lphl;
int y;
@@ -346,34 +898,37 @@
dprintf_listbox(stddeb,"ListBox WM_HSCROLL w=%04X l=%08lX !\n",
wParam, lParam);
lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return 0;
y = lphl->FirstVisible;
switch(wParam) {
case SB_LINEUP:
- if (lphl->FirstVisible > 1)
+ if (lphl->FirstVisible > lphl->ItemsPerColumn) {
lphl->FirstVisible -= lphl->ItemsPerColumn;
+ } else {
+ lphl->FirstVisible = 0;
+ }
break;
case SB_LINEDOWN:
- if (lphl->FirstVisible < ListMaxFirstVisible(lphl))
- lphl->FirstVisible += lphl->ItemsPerColumn;
+ lphl->FirstVisible += lphl->ItemsPerColumn;
break;
case SB_PAGEUP:
- if (lphl->FirstVisible > 1 && lphl->ItemsPerColumn != 0)
- lphl->FirstVisible -= lphl->ItemsVisible /
- lphl->ItemsPerColumn * lphl->ItemsPerColumn;
+ if (lphl->ItemsPerColumn != 0) {
+ int lbsub = lphl->ItemsVisible / lphl->ItemsPerColumn * lphl->ItemsPerColumn;
+ if (lphl->FirstVisible > lbsub) {
+ lphl->FirstVisible -= lbsub;
+ } else {
+ lphl->FirstVisible = 0;
+ }
+ }
break;
case SB_PAGEDOWN:
- if (lphl->FirstVisible < ListMaxFirstVisible(lphl) &&
- lphl->ItemsPerColumn != 0)
+ if (lphl->ItemsPerColumn != 0)
lphl->FirstVisible += lphl->ItemsVisible /
lphl->ItemsPerColumn * lphl->ItemsPerColumn;
break;
case SB_THUMBTRACK:
- lphl->FirstVisible = lphl->ItemsPerColumn *
- (LOWORD(lParam) - 1) + 1;
+ lphl->FirstVisible = lphl->ItemsPerColumn * LOWORD(lParam);
break;
}
- if (lphl->FirstVisible < 1) lphl->FirstVisible = 1;
if (lphl->FirstVisible > ListMaxFirstVisible(lphl))
lphl->FirstVisible = ListMaxFirstVisible(lphl);
@@ -384,7 +939,6 @@
SetScrollPos(hwnd, SB_HORZ, lphl->FirstVisible /
lphl->ItemsPerColumn + 1, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
}
}
return 0;
@@ -393,11 +947,9 @@
/***********************************************************************
* LBLButtonDown
*/
-LONG LBLButtonDown( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBLButtonDown(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
WORD wRet;
int y;
RECT rectsel;
@@ -405,30 +957,25 @@
SetFocus(hwnd);
SetCapture(hwnd);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
-
lphl->PrevFocused = lphl->ItemFocused;
- y = ListBoxFindMouse(hwnd, LOWORD(lParam), HIWORD(lParam));
- if (y==-1)
+ y = ListBoxFindMouse(lphl, LOWORD(lParam), HIWORD(lParam));
+ if (y == -1)
return 0;
- if (wndPtr->dwStyle & LBS_MULTIPLESEL) {
+ if (lphl->dwStyle & LBS_MULTIPLESEL) {
lphl->ItemFocused = y;
- wRet = ListBoxGetSel(hwnd, y);
- ListBoxSetSel(hwnd, y, !wRet);
+ wRet = ListBoxGetSel(lphl, y);
+ ListBoxSetSel(lphl, y, !wRet);
+ } else {
+ ListBoxSetCurSel(lphl, y);
}
- else
- ListBoxSetCurSel(hwnd, y);
+ if (lphl->dwStyle & LBS_MULTIPLESEL)
+ ListBoxSendNotification(lphl, hwnd, LBN_SELCHANGE);
- if (wndPtr->dwStyle & LBS_MULTIPLESEL)
- ListBoxSendNotification( hwnd, LBN_SELCHANGE );
-
- ListBoxGetItemRect(hwnd, y, &rectsel);
+ ListBoxGetItemRect(lphl, y, &rectsel);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
@@ -436,18 +983,14 @@
/***********************************************************************
* LBLButtonUp
*/
-LONG LBLButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBLButtonUp(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
if (GetCapture() == hwnd) ReleaseCapture();
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
if (lphl->PrevFocused != lphl->ItemFocused)
- ListBoxSendNotification( hwnd, LBN_SELCHANGE );
+ ListBoxSendNotification(lphl, hwnd, LBN_SELCHANGE);
return 0;
}
@@ -455,15 +998,11 @@
/***********************************************************************
* LBRButtonUp
*/
-LONG LBRButtonUp( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBRButtonUp(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
- SendMessage(lphl->hWndLogicParent, WM_COMMAND, wndPtr->wIDmenu,
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+
+ SendMessage(lphl->hParent, WM_COMMAND, GetWindowWord(hwnd,GWW_ID),
MAKELONG(hwnd, LBN_DBLCLK));
return 0;
@@ -472,50 +1011,47 @@
/***********************************************************************
* LBMouseMove
*/
-LONG LBMouseMove( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBMouseMove(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
int y;
- WORD wRet;
- RECT rect, rectsel; /* XXX Broken */
+ WORD wRet;
+ RECT rect, rectsel; /* XXX Broken */
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
+ dprintf_listbox(stddeb,"LBMouseMove %d %d\n",SLOWORD(lParam),SHIWORD(lParam));
if ((wParam & MK_LBUTTON) != 0) {
- y = HIWORD(lParam);
- if (y < 4) {
- if (lphl->FirstVisible > 1) {
+ y = SHIWORD(lParam);
+ if (y < 0) {
+ if (lphl->FirstVisible > 0) {
lphl->FirstVisible--;
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
}
GetClientRect(hwnd, &rect);
- if (y > (rect.bottom - 4)) {
+ if (y >= rect.bottom) {
if (lphl->FirstVisible < ListMaxFirstVisible(lphl)) {
lphl->FirstVisible++;
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
}
if ((y > 0) && (y < (rect.bottom - 4))) {
if ((y < rectsel.top) || (y > rectsel.bottom)) {
- wRet = ListBoxFindMouse(hwnd, LOWORD(lParam), HIWORD(lParam));
- if ((wndPtr->dwStyle & LBS_MULTIPLESEL) == LBS_MULTIPLESEL) {
- lphl->ItemFocused = wRet;
- ListBoxSendNotification(hwnd, LBN_SELCHANGE);
+ wRet = ListBoxFindMouse(lphl, LOWORD(lParam), HIWORD(lParam));
+ if (wRet == lphl->ItemFocused) {
+ return 0;
}
- else
- ListBoxSetCurSel(hwnd, wRet);
- ListBoxGetItemRect(hwnd, wRet, &rectsel);
+ if (lphl->dwStyle & LBS_MULTIPLESEL) {
+ lphl->ItemFocused = wRet;
+ ListBoxSendNotification(lphl, hwnd, LBN_SELCHANGE);
+ } else {
+ ListBoxSetCurSel(lphl, wRet);
+ }
+ ListBoxGetItemRect(lphl, wRet, &rectsel);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
}
}
}
@@ -526,85 +1062,97 @@
/***********************************************************************
* LBKeyDown
*/
-LONG LBKeyDown( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBKeyDown(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
- HWND hWndCtl;
- WORD wRet;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ WORD newFocused = lphl->ItemFocused;
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
- switch(wParam) {
- case VK_TAB:
- hWndCtl = GetNextDlgTabItem(lphl->hWndLogicParent,
- hwnd, !(GetKeyState(VK_SHIFT) < 0));
- SetFocus(hWndCtl);
- if(debugging_listbox){
- if ((GetKeyState(VK_SHIFT) < 0))
- dprintf_listbox(stddeb,"ListBox PreviousDlgTabItem %04X !\n", hWndCtl);
- else
- dprintf_listbox(stddeb,"ListBox NextDlgTabItem %04X !\n", hWndCtl);
+ if (wParam == VK_SPACE) {
+ if (lphl->dwStyle & LBS_MULTIPLESEL) {
+ WORD wRet = ListBoxGetSel(lphl, lphl->ItemFocused);
+ ListBoxSetSel(lphl, lphl->ItemFocused, !wRet);
}
- break;
+ return 0;
+ }
+ switch(wParam) {
case VK_HOME:
- lphl->ItemFocused = 0;
+ newFocused = 0;
break;
case VK_END:
- lphl->ItemFocused = lphl->ItemsCount - 1;
+ newFocused = lphl->ItemsCount - 1;
break;
case VK_LEFT:
- if ((wndPtr->dwStyle & LBS_MULTICOLUMN) == LBS_MULTICOLUMN) {
- lphl->ItemFocused -= lphl->ItemsPerColumn;
+ if (lphl->dwStyle & LBS_MULTICOLUMN) {
+ if (newFocused >= lphl->ItemsPerColumn) {
+ newFocused -= lphl->ItemsPerColumn;
+ } else {
+ newFocused = 0;
+ }
}
break;
case VK_UP:
- lphl->ItemFocused--;
+ if (newFocused > 0) newFocused--;
break;
case VK_RIGHT:
- if ((wndPtr->dwStyle & LBS_MULTICOLUMN) == LBS_MULTICOLUMN) {
- lphl->ItemFocused += lphl->ItemsPerColumn;
+ if (lphl->dwStyle & LBS_MULTICOLUMN) {
+ newFocused += lphl->ItemsPerColumn;
}
break;
case VK_DOWN:
- lphl->ItemFocused++;
+ newFocused++;
break;
case VK_PRIOR:
- lphl->ItemFocused -= lphl->ItemsVisible;
+ if (newFocused > lphl->ItemsVisible) {
+ newFocused -= lphl->ItemsVisible;
+ } else {
+ newFocused = 0;
+ }
break;
case VK_NEXT:
- lphl->ItemFocused += lphl->ItemsVisible;
- break;
- case VK_SPACE:
- wRet = ListBoxGetSel(hwnd, lphl->ItemFocused);
- ListBoxSetSel(hwnd, lphl->ItemFocused, !wRet);
+ newFocused += lphl->ItemsVisible;
break;
default:
- ListBoxFindNextMatch(hwnd, wParam);
return 0;
}
- if (lphl->ItemFocused < 0) lphl->ItemFocused = 0;
- if (lphl->ItemFocused >= lphl->ItemsCount)
- lphl->ItemFocused = lphl->ItemsCount - 1;
-
- if (lphl->ItemsVisible != 0)
- lphl->FirstVisible = lphl->ItemFocused / lphl->ItemsVisible *
- lphl->ItemsVisible + 1;
-
- if (lphl->FirstVisible < 1) lphl->FirstVisible = 1;
- if (lphl->FirstVisible > ListMaxFirstVisible(lphl))
- lphl->FirstVisible = ListMaxFirstVisible(lphl);
-
- if ((wndPtr->dwStyle & LBS_MULTIPLESEL) != LBS_MULTIPLESEL) {
- ListBoxSetCurSel(hwnd, lphl->ItemFocused);
- ListBoxSendNotification(hwnd, LBN_SELCHANGE);
+ if (newFocused >= lphl->ItemsCount)
+ newFocused = lphl->ItemsCount - 1;
+
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) {
+ ListBoxSetCurSel(lphl, newFocused);
+ ListBoxSendNotification(lphl, hwnd, LBN_SELCHANGE);
}
+ lphl->ItemFocused = newFocused;
+ ListBoxScrollToFocus(lphl);
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
+
+ return 0;
+}
+
+/***********************************************************************
+ * LBChar
+ */
+static LONG LBChar(HWND hwnd, WORD message, WORD wParam, LONG lParam)
+{
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ WORD newFocused;
+
+ newFocused = ListBoxFindNextMatch(lphl, wParam);
+ if (newFocused == (WORD)LB_ERR) return 0;
+
+ if (newFocused >= lphl->ItemsCount)
+ newFocused = lphl->ItemsCount - 1;
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) {
+ ListBoxSetCurSel(lphl, newFocused);
+ ListBoxSendNotification(lphl, hwnd, LBN_SELCHANGE);
+ }
+
+ lphl->ItemFocused = newFocused;
+ ListBoxScrollToFocus(lphl);
+ SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
+ InvalidateRect(hwnd, NULL, TRUE);
return 0;
}
@@ -612,15 +1160,11 @@
/***********************************************************************
* LBSetRedraw
*/
-LONG LBSetRedraw( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetRedraw(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
dprintf_listbox(stddeb,"ListBox WM_SETREDRAW hWnd=%04X w=%04X !\n", hwnd, wParam);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
lphl->bRedrawFlag = wParam;
return 0;
@@ -629,15 +1173,9 @@
/***********************************************************************
* LBSetFont
*/
-
-LONG LBSetFont( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetFont(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return 0;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
if (wParam == 0)
lphl->hFont = GetStockObject(SYSTEM_FONT);
@@ -650,24 +1188,98 @@
/***********************************************************************
* LBPaint
*/
-LONG LBPaint( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBPaint(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- RepaintListBox(hwnd);
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ LPLISTSTRUCT lpls;
+ PAINTSTRUCT ps;
+ HBRUSH hBrush;
+ HFONT hOldFont;
+ HDC hdc;
+ RECT rect;
+ int i, top, height, maxwidth, ipc;
+
+ top = 0;
+ hdc = BeginPaint( hwnd, &ps );
+
+ if (!IsWindowVisible(hwnd) || !lphl->bRedrawFlag) {
+ EndPaint(hwnd, &ps);
+ return 0;
+ }
+
+ hOldFont = SelectObject(hdc, lphl->hFont);
+
+ hBrush = SendMessage(lphl->hParent, WM_CTLCOLOR, hdc,
+ MAKELONG(hwnd, CTLCOLOR_LISTBOX));
+
+ if (hBrush == 0) hBrush = GetStockObject(WHITE_BRUSH);
+
+ GetClientRect(hwnd, &rect);
+ FillRect(hdc, &rect, hBrush);
+
+ maxwidth = rect.right;
+ if (lphl->dwStyle & LBS_MULTICOLUMN) {
+ rect.right = lphl->ColumnsWidth;
+ }
+ lpls = lphl->lpFirst;
+
+ lphl->ItemsVisible = 0;
+ lphl->ItemsPerColumn = ipc = 0;
+
+ for(i = 0; i < lphl->ItemsCount; i++) {
+ if (lpls == NULL) break;
+
+ if (i >= lphl->FirstVisible) {
+ height = lpls->mis.itemHeight;
+
+ if (top > rect.bottom) {
+ if (lphl->dwStyle & LBS_MULTICOLUMN) {
+ lphl->ItemsPerColumn = max(lphl->ItemsPerColumn, ipc);
+ ipc = 0;
+ top = 0;
+ rect.left += lphl->ColumnsWidth;
+ rect.right += lphl->ColumnsWidth;
+ if (rect.left > maxwidth) break;
+ } else {
+ break;
+ }
+ }
+
+ lpls->itemRect.top = top;
+ lpls->itemRect.bottom = top + height;
+ lpls->itemRect.left = rect.left;
+ lpls->itemRect.right = rect.right;
+
+ dprintf_listbox(stddeb,"drawing item: %d %d %d %d %d\n",rect.left,top,rect.right,top+height,lpls->itemState);
+ if (OWNER_DRAWN(lphl)) {
+ ListBoxDrawItem (hwnd, lphl, hdc, lpls, &lpls->itemRect, ODA_DRAWENTIRE, 0);
+ if (lpls->itemState)
+ ListBoxDrawItem (hwnd, lphl, hdc, lpls, &lpls->itemRect, ODA_SELECT, ODS_SELECTED);
+ } else {
+ ListBoxDrawItem (hwnd, lphl, hdc, lpls, &lpls->itemRect, ODA_DRAWENTIRE,
+ lpls->itemState);
+ }
+ if ((lphl->ItemFocused == i) && GetFocus() == hwnd)
+ ListBoxDrawItem (hwnd,lphl, hdc, lpls, &lpls->itemRect, ODA_FOCUS, ODS_FOCUS);
+
+ top += height;
+ lphl->ItemsVisible++;
+ ipc++;
+ }
+
+ lpls = lpls->lpNext;
+ }
+ SelectObject(hdc,hOldFont);
+ EndPaint( hwnd, &ps );
return 0;
}
/***********************************************************************
* LBSetFocus
*/
-LONG LBSetFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetFocus(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
-
dprintf_listbox(stddeb,"ListBox WM_SETFOCUS !\n");
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
return 0;
}
@@ -675,13 +1287,11 @@
/***********************************************************************
* LBKillFocus
*/
-LONG LBKillFocus( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBKillFocus(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
dprintf_listbox(stddeb,"ListBox WM_KILLFOCUS !\n");
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
@@ -689,61 +1299,57 @@
/***********************************************************************
* LBResetContent
*/
-LONG LBResetContent( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBResetContent(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- dprintf_listbox(stddeb,"ListBox LB_RESETCONTENT !\n");
- ListBoxResetContent(hwnd);
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ dprintf_listbox(stddeb,"ListBox LB_RESETCONTENT !\n");
+ ListBoxResetContent(lphl);
+ ListBoxUpdateWindow(hwnd, lphl, TRUE);
return 0;
}
/***********************************************************************
* LBDir
*/
-LONG LBDir( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBDir(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
WORD wRet;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
dprintf_listbox(stddeb,"ListBox LB_DIR !\n");
- wRet = ListBoxDirectory(hwnd, wParam,
- (LPSTR)PTR_SEG_TO_LIN(lParam));
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
+ wRet = ListBoxDirectory(lphl, wParam, (LPSTR)PTR_SEG_TO_LIN(lParam));
+ ListBoxUpdateWindow(hwnd, lphl, TRUE);
return wRet;
}
/***********************************************************************
* LBAddString
*/
-LONG LBAddString( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBAddString(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
WORD wRet;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
- wndPtr = WIN_FindWndPtr(hwnd);
-
- if (HasStrings(wndPtr))
- wRet = ListBoxAddString(hwnd, (LPSTR)PTR_SEG_TO_LIN(lParam));
+ if (HasStrings(lphl))
+ wRet = ListBoxAddString(lphl, (LPSTR)PTR_SEG_TO_LIN(lParam));
else
- wRet = ListBoxAddString(hwnd, (LPSTR)lParam);
+ wRet = ListBoxAddString(lphl, (LPSTR)lParam);
+ ListBoxUpdateWindow(hwnd,lphl,TRUE);
return wRet;
}
/***********************************************************************
* LBGetText
*/
-LONG LBGetText( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetText(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
LONG wRet;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
dprintf_listbox(stddeb, "LB_GETTEXT wParam=%d\n",wParam);
- wRet = ListBoxGetText(hwnd, wParam,
- (LPSTR)PTR_SEG_TO_LIN(lParam), FALSE);
+ wRet = ListBoxGetText(lphl, wParam, (LPSTR)PTR_SEG_TO_LIN(lParam));
return wRet;
}
@@ -751,60 +1357,54 @@
/***********************************************************************
* LBInsertString
*/
-LONG LBInsertString( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBInsertString(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
WORD wRet;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
- wndPtr = WIN_FindWndPtr(hwnd);
-
- if (HasStrings(wndPtr))
- wRet = ListBoxInsertString(hwnd, wParam, (LPSTR)PTR_SEG_TO_LIN(lParam));
+ if (HasStrings(lphl))
+ wRet = ListBoxInsertString(lphl, wParam, (LPSTR)PTR_SEG_TO_LIN(lParam));
else
- wRet = ListBoxInsertString(hwnd, wParam, (LPSTR)lParam);
+ wRet = ListBoxInsertString(lphl, wParam, (LPSTR)lParam);
+ ListBoxUpdateWindow(hwnd,lphl,TRUE);
return wRet;
}
/***********************************************************************
* LBDeleteString
- */
-LONG LBDeleteString( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+ */
+static LONG LBDeleteString(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- return ListBoxDeleteString(hwnd, wParam);
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ LONG lRet = ListBoxDeleteString(lphl,wParam);
+
+ ListBoxUpdateWindow(hwnd,lphl,TRUE);
+ return lRet;
}
/***********************************************************************
* LBFindString
*/
-LONG LBFindString( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBFindString(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- return ListBoxFindString(hwnd, wParam,
- (LPSTR)PTR_SEG_TO_LIN(lParam));
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ return ListBoxFindString(lphl, wParam, lParam);
}
/***********************************************************************
* LBGetCaretIndex
*/
-LONG LBGetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetCaretIndex(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
-
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return LB_ERR;
-
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
return lphl->ItemFocused;
}
/***********************************************************************
* LBGetCount
*/
-LONG LBGetCount( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetCount(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
LPHEADLIST lphl;
@@ -815,8 +1415,7 @@
/***********************************************************************
* LBGetCurSel
*/
-LONG LBGetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetCurSel(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
LPHEADLIST lphl;
@@ -829,73 +1428,56 @@
/***********************************************************************
* LBGetHorizontalExtent
*/
-LONG LBGetHorizontalExtent( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
return 0;
}
/***********************************************************************
- * LBGetItemData
- */
-LONG LBGetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
-{
- dprintf_listbox(stddeb, "LB_GETITEMDATA wParam=%x\n", wParam);
- return ListBoxGetText(hwnd, wParam,
- (LPSTR)PTR_SEG_TO_LIN(lParam), TRUE);
-}
-
-/***********************************************************************
* LBGetItemHeight
*/
-LONG LBGetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetItemHeight(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- RECT rect;
-
- ListBoxGetItemRect(hwnd, wParam, &rect);
- return (rect.bottom - rect.top);
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ LPLISTSTRUCT lpls = ListBoxGetItem (lphl, wParam);
+
+ if (lpls == NULL) return LB_ERR;
+ return lpls->mis.itemHeight;
}
/***********************************************************************
* LBGetItemRect
*/
-LONG LBGetItemRect( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetItemRect(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- return ListBoxGetItemRect (hwnd, wParam, PTR_SEG_TO_LIN(lParam));
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ return ListBoxGetItemRect(lphl, wParam, PTR_SEG_TO_LIN(lParam));
}
/***********************************************************************
* LBGetSel
*/
-LONG LBGetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetSel(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- return ListBoxGetSel (hwnd, wParam);
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ return ListBoxGetSel(lphl, wParam);
}
/***********************************************************************
* LBGetSelCount
*/
-LONG LBGetSelCount( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetSelCount(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
LPLISTSTRUCT lpls;
int cnt = 0;
- WND *wndPtr;
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
lpls = lphl->lpFirst;
while (lpls != NULL) {
- if (lpls->dis.itemState > 0) cnt++;
+ if (lpls->itemState > 0) cnt++;
lpls = lpls->lpNext;
}
@@ -906,19 +1488,14 @@
/***********************************************************************
* LBGetSelItems
*/
-LONG LBGetSelItems( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetSelItems(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
LPLISTSTRUCT lpls;
- int cnt, idx;
- WND *wndPtr;
- int *lpItems = PTR_SEG_TO_LIN(lParam);
+ int cnt, idx;
+ int *lpItems = PTR_SEG_TO_LIN(lParam);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
if (wParam == 0) return 0;
@@ -926,7 +1503,7 @@
cnt = 0; idx = 0;
while (lpls != NULL) {
- if (lpls->dis.itemState > 0) lpItems[cnt++] = idx;
+ if (lpls->itemState > 0) lpItems[cnt++] = idx;
if (cnt == wParam) break;
idx++;
@@ -939,65 +1516,43 @@
/***********************************************************************
* LBGetTextLen
*/
-LONG LBGetTextLen( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetTextLen(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- WND *wndPtr;
- int cnt = 0;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ LPLISTSTRUCT lpls = ListBoxGetItem(lphl,wParam);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!HasStrings(wndPtr)) return LB_ERR;
-
- if (wParam >= lphl->ItemsCount) return LB_ERR;
-
- lpls = lphl->lpFirst;
-
- while (cnt++ < wParam) lpls = lpls->lpNext;
-
+ if (lpls == NULL || !HasStrings(lphl)) return LB_ERR;
return strlen(lpls->itemText);
}
/***********************************************************************
* LBGetDlgCode
*/
-LONG LBGetDlgCode( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetDlgCode(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- return DLGC_WANTALLKEYS;
+ return DLGC_WANTARROWS | DLGC_WANTCHARS;
}
/***********************************************************************
* LBGetTopIndex
*/
-LONG LBGetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBGetTopIndex(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return LB_ERR;
-
- return (lphl->FirstVisible - 1);
+ return lphl->FirstVisible;
}
/***********************************************************************
* LBSelectString
*/
-LONG LBSelectString( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSelectString(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
WORD wRet;
- wndPtr = WIN_FindWndPtr(hwnd);
-
- wRet = ListBoxFindString(hwnd, wParam,
- (LPSTR)PTR_SEG_TO_LIN(lParam));
+ wRet = ListBoxFindString(lphl, wParam, lParam);
/* XXX add functionality here */
@@ -1007,21 +1562,16 @@
/***********************************************************************
* LBSelItemRange
*/
-LONG LBSelItemRange( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSelItemRange(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
LPLISTSTRUCT lpls;
- WND *wndPtr;
WORD cnt;
WORD first = LOWORD(lParam);
WORD last = HIWORD(lParam);
BOOL select = wParam;
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) return LB_ERR;
if (first >= lphl->ItemsCount ||
last >= lphl->ItemsCount) return LB_ERR;
@@ -1031,7 +1581,7 @@
while (lpls != NULL) {
if (cnt++ >= first)
- lpls->dis.itemState = select ? ODS_SELECTED : 0;
+ lpls->itemState = select ? ODS_SELECTED : 0;
if (cnt > last)
break;
@@ -1045,66 +1595,64 @@
/***********************************************************************
* LBSetCaretIndex
*/
-LONG LBSetCaretIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetCaretIndex(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
- WND *wndPtr;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_MULTIPLESEL)) return 0;
+ if (!(lphl->dwStyle & LBS_MULTIPLESEL)) return 0;
if (wParam >= lphl->ItemsCount) return LB_ERR;
lphl->ItemFocused = wParam;
- ListBoxScrolltoFocus (hwnd);
+ ListBoxScrollToFocus (lphl);
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
/***********************************************************************
* LBSetColumnWidth
*/
-LONG LBSetColumnWidth( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetColumnWidth(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
-
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return LB_ERR;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
lphl->ColumnsWidth = wParam;
-
+ InvalidateRect(hwnd,NULL,TRUE);
return 0;
}
/***********************************************************************
* LBSetHorizontalExtent
*/
-LONG LBSetHorizontalExtent( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetHorizontalExtent(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
return 0;
}
/***********************************************************************
+ * LBGetItemData
+ */
+static LONG LBGetItemData(HWND hwnd, WORD message, WORD wParam, LONG lParam)
+{
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ dprintf_listbox(stddeb, "LB_GETITEMDATA wParam=%x\n", wParam);
+ return ListBoxGetItemData(lphl, wParam);
+}
+
+/***********************************************************************
* LBSetItemData
*/
-LONG LBSetItemData( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetItemData(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
dprintf_listbox(stddeb, "LB_SETITEMDATA wParam=%x lParam=%lx\n", wParam, lParam);
- return ListBoxSetItemData(hwnd, wParam, lParam);
+ return ListBoxSetItemData(lphl, wParam, lParam);
}
/***********************************************************************
* LBSetTabStops
*/
-LONG LBSetTabStops( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetTabStops(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
LPHEADLIST lphl;
@@ -1128,23 +1676,18 @@
/***********************************************************************
* LBSetCurSel
*/
-LONG LBSetCurSel( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetCurSel(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
WORD wRet;
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return LB_ERR;
-
dprintf_listbox(stddeb,"ListBox LB_SETCURSEL wParam=%x !\n",
wParam);
- wRet = ListBoxSetCurSel(hwnd, wParam);
+ wRet = ListBoxSetCurSel(lphl, wParam);
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return wRet;
}
@@ -1152,16 +1695,15 @@
/***********************************************************************
* LBSetSel
*/
-LONG LBSetSel( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetSel(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
WORD wRet;
dprintf_listbox(stddeb,"ListBox LB_SETSEL wParam=%x lParam=%lX !\n", wParam, lParam);
- wRet = ListBoxSetSel(hwnd, LOWORD(lParam), wParam);
+ wRet = ListBoxSetSel(lphl, LOWORD(lParam), wParam);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return wRet;
}
@@ -1169,19 +1711,16 @@
/***********************************************************************
* LBSetTopIndex
*/
-LONG LBSetTopIndex( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+static LONG LBSetTopIndex(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- LPHEADLIST lphl;
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
dprintf_listbox(stddeb,"ListBox LB_SETTOPINDEX wParam=%x !\n",
wParam);
- lphl = ListBoxGetStorageHeader(hwnd);
lphl->FirstVisible = wParam;
SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
return 0;
}
@@ -1189,23 +1728,21 @@
/***********************************************************************
* LBSetItemHeight
*/
-LONG LBSetItemHeight( HWND hwnd, WORD message, WORD wParam, LONG lParam)
-
+static LONG LBSetItemHeight(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
- WORD wRet;
-
+ LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
+ WORD wRet;
+
dprintf_listbox(stddeb,"ListBox LB_SETITEMHEIGHT wParam=%x lParam=%lX !\n", wParam, lParam);
- wRet = ListBoxSetItemHeight(hwnd, wParam, lParam);
+ wRet = ListBoxSetItemHeight(lphl, wParam, lParam);
+ InvalidateRect(hwnd,NULL,TRUE);
return wRet;
}
-
/***********************************************************************
* ListBoxWndProc
*/
-
-LONG ListBoxWndProc( HWND hwnd, WORD message, WORD wParam, LONG lParam )
-
+LONG ListBoxWndProc(HWND hwnd, WORD message, WORD wParam, LONG lParam)
{
int idx = 0;
int table_size = sizeof (methods) / sizeof (msg_tbl);
@@ -1219,860 +1756,6 @@
return DefWindowProc (hwnd, message, wParam, lParam);
}
-
-LPLISTSTRUCT ListBoxGetItem(HWND hwnd, UINT uIndex)
-
-{
- LPHEADLIST lphl = ListBoxGetStorageHeader(hwnd);
- LPLISTSTRUCT lpls;
- UINT Count = 0;
-
- if (uIndex >= lphl->ItemsCount) return NULL;
-
- lpls = lphl->lpFirst;
-
- while (Count++ < uIndex) lpls = lpls->lpNext;
-
- return lpls;
-}
-
-
-LPHEADLIST ListBoxGetWindowAndStorage(HWND hwnd, WND **wndPtr)
-{
- WND *Ptr;
- LPHEADLIST lphl;
- *(wndPtr) = Ptr = WIN_FindWndPtr(hwnd);
- lphl = *((LPHEADLIST *)&Ptr->wExtra[1]);
- return lphl;
-}
-
-
-LPHEADLIST ListBoxGetStorageHeader(HWND hwnd)
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- wndPtr = WIN_FindWndPtr(hwnd);
- lphl = *((LPHEADLIST *)&wndPtr->wExtra[1]);
- return lphl;
-}
-
-
-void ListBoxDrawItem (HWND hwnd, HDC hdc, LPLISTSTRUCT lpls,
- WORD itemAction, WORD itemState)
-
-{
- LPHEADLIST lphl;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (OWNER_DRAWN(wndPtr)) {
- DRAWITEMSTRUCT *dis = USER_HEAP_LIN_ADDR(lphl->hDrawItemStruct);
-
- memcpy (dis, &lpls->dis, sizeof(DRAWITEMSTRUCT));
-
- dis->CtlType = ODT_LISTBOX;
- dis->hDC = hdc;
-
- if ((!dis->CtlID) && lphl->hWndLogicParent) {
- WND *ParentWndPtr;
-
- ParentWndPtr = WIN_FindWndPtr(lphl->hWndLogicParent);
- dis->CtlID = ParentWndPtr->wIDmenu;
- }
-
- if (HasStrings(wndPtr)) dis->itemData = LIST_HEAP_SEG_ADDR(lpls,lpls->hData);
-
- dis->itemAction = itemAction;
- dis->itemState = itemState;
-
- SendMessage(lphl->hWndLogicParent, WM_DRAWITEM,
- 0, (LPARAM)USER_HEAP_SEG_ADDR(lphl->hDrawItemStruct));
- } else {
-
- if (itemAction == ODA_DRAWENTIRE ||
- itemAction == ODA_SELECT) {
- int OldBkMode;
- DWORD dwOldTextColor;
-
- OldBkMode = SetBkMode(hdc, TRANSPARENT);
-
- if (itemState != 0) {
- dwOldTextColor = SetTextColor(hdc, 0x00FFFFFFL);
- FillRect(hdc, &lpls->dis.rcItem, GetStockObject(BLACK_BRUSH));
- }
-
- if (wndPtr->dwStyle & LBS_USETABSTOPS)
- TabbedTextOut(hdc, lpls->dis.rcItem.left + 5,
- lpls->dis.rcItem.top + 2,
- (char *)lpls->itemText,
- strlen((char *)lpls->itemText), lphl->iNumStops,
- lphl->TabStops, 0);
- else
- TextOut(hdc, lpls->dis.rcItem.left + 5, lpls->dis.rcItem.top + 2,
- (char *)lpls->itemText, strlen((char *)lpls->itemText));
-
- if (itemState != 0) {
- SetTextColor(hdc, dwOldTextColor);
- }
-
- SetBkMode(hdc, OldBkMode);
- } else DrawFocusRect(hdc, &lpls->dis.rcItem);
- }
-
- return;
-}
-
-void RepaintListBox(HWND hwnd)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- PAINTSTRUCT ps;
- HBRUSH hBrush;
-
- HDC hdc;
- RECT rect;
- int i, top, height, maxwidth, ipc;
-
- top = 0;
-
- hdc = BeginPaint( hwnd, &ps );
-
- if (!IsWindowVisible(hwnd)) {
- EndPaint( hwnd, &ps );
- return;
- }
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) goto EndOfPaint;
- if (!lphl->bRedrawFlag) goto EndOfPaint;
-
- SelectObject(hdc, lphl->hFont);
-
- hBrush = SendMessage(lphl->hWndLogicParent, WM_CTLCOLOR, (WORD)hdc,
- MAKELONG(hwnd, CTLCOLOR_LISTBOX));
-
- if (hBrush == (HBRUSH)NULL) hBrush = GetStockObject(WHITE_BRUSH);
-
- GetClientRect(hwnd, &rect);
- FillRect(hdc, &rect, hBrush);
-
- maxwidth = rect.right;
- rect.right = lphl->ColumnsWidth;
-
- if (lphl->ItemsCount == 0) goto EndOfPaint;
-
- lpls = lphl->lpFirst;
-
- lphl->ItemsVisible = 0;
- lphl->ItemsPerColumn = ipc = 0;
-
- for(i = 0; i < lphl->ItemsCount; i++) {
- if (lpls == NULL) goto EndOfPaint;
-
- if (i >= lphl->FirstVisible - 1) {
- height = lpls->dis.rcItem.bottom - lpls->dis.rcItem.top;
-
- if (top > rect.bottom) {
- if ((wndPtr->dwStyle & LBS_MULTICOLUMN) == LBS_MULTICOLUMN) {
- lphl->ItemsPerColumn = max(lphl->ItemsPerColumn, ipc);
- ipc = 0;
- top = 0;
- rect.left += lphl->ColumnsWidth;
- rect.right += lphl->ColumnsWidth;
- if (rect.left > maxwidth) break;
- }
- else
- break;
- }
-
- lpls->dis.rcItem.top = top;
- lpls->dis.rcItem.bottom = top + height;
- lpls->dis.rcItem.left = rect.left;
- lpls->dis.rcItem.right = rect.right;
-
- if (OWNER_DRAWN(wndPtr)) {
- ListBoxDrawItem (hwnd, hdc, lpls, ODA_DRAWENTIRE, 0);
- if (lpls->dis.itemState)
- ListBoxDrawItem (hwnd, hdc, lpls, ODA_SELECT, ODS_SELECTED);
- }
- else
- ListBoxDrawItem (hwnd, hdc, lpls, ODA_DRAWENTIRE, lpls->dis.itemState);
-
- if ((lphl->ItemFocused == i) && GetFocus() == hwnd)
- ListBoxDrawItem (hwnd, hdc, lpls, ODA_FOCUS, ODS_FOCUS);
-
- top += height;
- lphl->ItemsVisible++;
- ipc++;
- }
-
- lpls = lpls->lpNext;
- }
- EndOfPaint:
- EndPaint( hwnd, &ps );
-}
-
-int ListBoxFindMouse(HWND hwnd, int X, int Y)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- RECT rect;
- int i, h, h2, w, w2;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (lphl == NULL) return LB_ERR;
- if (lphl->ItemsCount == 0) return LB_ERR;
-
- lpls = lphl->lpFirst;
- if (lpls == NULL) return LB_ERR;
- GetClientRect(hwnd, &rect);
- h = w2 = 0;
- w = lphl->ColumnsWidth;
-
- for(i = 1; i <= lphl->ItemsCount; i++) {
- if (i >= lphl->FirstVisible) {
- h2 = h;
- h += lpls->dis.rcItem.bottom - lpls->dis.rcItem.top;
- if ((Y > h2) && (Y < h) &&
- (X > w2) && (X < w)) return(i - 1);
- if (h > rect.bottom) {
- if ((wndPtr->dwStyle & LBS_MULTICOLUMN) != LBS_MULTICOLUMN) return LB_ERR;
- h = 0;
- w2 = w;
- w += lphl->ColumnsWidth;
- if (w2 > rect.right) return LB_ERR;
- }
- }
- if (lpls->lpNext == NULL) return LB_ERR;
- lpls = (LPLISTSTRUCT)lpls->lpNext;
- }
- return(LB_ERR);
-}
-
-void ListBoxAskMeasure(WND *wndPtr, LPHEADLIST lphl, LPLISTSTRUCT lpls)
-
-{
- MEASUREITEMSTRUCT *lpmeasure;
-
- HANDLE hTemp = USER_HEAP_ALLOC( sizeof(MEASUREITEMSTRUCT) );
-
- lpmeasure = (MEASUREITEMSTRUCT *) USER_HEAP_LIN_ADDR(hTemp);
-
- if (lpmeasure == NULL) {
- fprintf(stderr,"ListBoxAskMeasure() // Bad allocation of Measure struct !\n");
- return;
- }
-
- lpmeasure->CtlType = ODT_LISTBOX;
- lpmeasure->CtlID = wndPtr->wIDmenu;
- lpmeasure->itemID = lpls->dis.itemID;
- lpmeasure->itemWidth = wndPtr->rectWindow.right - wndPtr->rectWindow.left;
- lpmeasure->itemHeight = 0;
-
- if (HasStrings(wndPtr))
- lpmeasure->itemData = LIST_HEAP_SEG_ADDR(lpls,lpls->hData);
- else
- lpmeasure->itemData = lpls->dis.itemData;
-
- SendMessage(lphl->hWndLogicParent, WM_MEASUREITEM,
- 0, USER_HEAP_SEG_ADDR(hTemp));
-
- if (wndPtr->dwStyle & LBS_OWNERDRAWFIXED) {
- lphl->StdItemHeight = lpmeasure->itemHeight;
- }
-
- lpls->dis.rcItem.right = lpls->dis.rcItem.left + lpmeasure->itemWidth;
- lpls->dis.rcItem.bottom = lpls->dis.rcItem.top + lpmeasure->itemHeight;
- USER_HEAP_FREE(hTemp);
-}
-
-
-int ListBoxAddString(HWND hwnd, LPSTR newstr)
-{
- LPHEADLIST lphl;
- UINT pos = (UINT) -1;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (HasStrings(wndPtr) && (wndPtr->dwStyle & LBS_SORT)) {
- LPLISTSTRUCT lpls = lphl->lpFirst;
- for (pos = 0; lpls; lpls = lpls->lpNext, pos++)
- if (strcmp(lpls->itemText, newstr) >= 0)
- break;
- }
- return ListBoxInsertString(hwnd, pos, newstr);
-}
-
-int ListBoxInsertString(HWND hwnd, UINT uIndex, LPSTR newstr)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT *lppls, lplsnew;
- HANDLE hItem;
- HANDLE hStr;
- LPSTR str;
- UINT Count;
-
- dprintf_listbox(stddeb,"ListBoxInsertString(%04X, %d, %p);\n",
- hwnd, uIndex, newstr);
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (uIndex == (UINT)-1)
- uIndex = lphl->ItemsCount;
-
- if (uIndex > lphl->ItemsCount) return LB_ERR;
-
- lppls = (LPLISTSTRUCT *) &lphl->lpFirst;
-
- for(Count = 0; Count < uIndex; Count++) {
- if (*lppls == NULL) return LB_ERR;
- lppls = (LPLISTSTRUCT *) &(*lppls)->lpNext;
- }
-
- hItem = LIST_HEAP_ALLOC(lphl, GMEM_MOVEABLE, sizeof(LISTSTRUCT));
- lplsnew = (LPLISTSTRUCT) LIST_HEAP_ADDR(lphl, hItem);
-
- if (lplsnew == NULL) {
- printf("ListBoxInsertString() // Bad allocation of new item !\n");
- return LB_ERRSPACE;
- }
-
- ListBoxDefaultItem(hwnd, wndPtr, lphl, lplsnew);
- lplsnew->hMem = hItem;
- lplsnew->lpNext = *lppls;
- *lppls = lplsnew;
- lphl->ItemsCount++;
- hStr = 0;
-
- if (HasStrings(wndPtr)) {
- hStr = LIST_HEAP_ALLOC(lphl, GMEM_MOVEABLE, strlen(newstr) + 1);
- str = (LPSTR)LIST_HEAP_ADDR(lphl, hStr);
- if (str == NULL) return LB_ERRSPACE;
- strcpy(str, newstr);
- newstr = str;
- lplsnew->itemText = str;
- dprintf_listbox(stddeb,"ListBoxInsertString // LBS_HASSTRINGS after strcpy '%s'\n", str);
- } else {
- lplsnew->itemText = NULL;
- lplsnew->dis.itemData = (DWORD)newstr;
- }
-
- lplsnew->dis.itemID = lphl->ItemsCount;
- lplsnew->hData = hStr;
-
- if ((wndPtr->dwStyle & LBS_OWNERDRAWFIXED) && (lphl->ItemsCount == 1)) {
- ListBoxAskMeasure(wndPtr, lphl, lplsnew);
- }
-
- if (wndPtr->dwStyle & LBS_OWNERDRAWVARIABLE)
- ListBoxAskMeasure(wndPtr, lphl, lplsnew);
-
- SetScrollRange(hwnd, SB_VERT, 1, ListMaxFirstVisible(lphl),
- (lphl->FirstVisible != 1 && lphl->bRedrawFlag));
-
- if (lphl->ItemsPerColumn != 0)
- SetScrollRange(hwnd, SB_HORZ, 1, lphl->ItemsVisible /
- lphl->ItemsPerColumn + 1,
- (lphl->FirstVisible != 1 && lphl->bRedrawFlag));
-
- if ((lphl->FirstVisible <= uIndex) &&
- ((lphl->FirstVisible + lphl->ItemsVisible) >= uIndex)) {
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
- }
-
- dprintf_listbox(stddeb,"ListBoxInsertString // count=%d\n", lphl->ItemsCount);
- return uIndex;
-}
-
-
-int ListBoxGetText(HWND hwnd, UINT uIndex, LPSTR OutStr, BOOL bItemData)
-
-{
- WND *wndPtr;
- LPLISTSTRUCT lpls;
-
- wndPtr = WIN_FindWndPtr(hwnd);
-
- if (!OutStr && !bItemData) {
- dprintf_listbox(stddeb, "ListBoxGetText // OutStr==NULL\n");
- return 0;
- }
-
- if (!bItemData) *OutStr=0;
-
- if ((lpls = ListBoxGetItem (hwnd, uIndex)) == NULL)
- return LB_ERR;
-
- if (bItemData)
- return lpls->dis.itemData;
-
- if (!HasStrings(wndPtr)) {
- *((long *)OutStr) = lpls->dis.itemData;
- return 4;
- }
-
- strcpy(OutStr, lpls->itemText);
- return strlen(OutStr);
-}
-
-int ListBoxSetItemData(HWND hwnd, UINT uIndex, DWORD ItemData)
-
-{
- LPLISTSTRUCT lpls;
-
- if ((lpls = ListBoxGetItem(hwnd, uIndex)) == NULL)
- return LB_ERR;
-
- lpls->dis.itemData = ItemData;
- return 1;
-}
-
-
-int ListBoxDeleteString(HWND hwnd, UINT uIndex)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls, lpls2;
- UINT Count;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (uIndex >= lphl->ItemsCount) return LB_ERR;
-
- lpls = lphl->lpFirst;
- if (lpls == NULL) return LB_ERR;
-
- if( uIndex == 0 )
- lphl->lpFirst = lpls->lpNext;
- else {
- for(Count = 0; Count < uIndex; Count++) {
- if (lpls->lpNext == NULL) return LB_ERR;
-
- lpls2 = lpls;
- lpls = (LPLISTSTRUCT)lpls->lpNext;
- }
- lpls2->lpNext = (LPLISTSTRUCT)lpls->lpNext;
- }
-
- lphl->ItemsCount--;
-
- if (lpls->hData != 0) LIST_HEAP_FREE(lphl, lpls->hData);
- if (lpls->hMem != 0) LIST_HEAP_FREE(lphl, lpls->hMem);
-
- SetScrollRange(hwnd, SB_VERT, 1, ListMaxFirstVisible(lphl), TRUE);
- if (lphl->ItemsPerColumn != 0)
- SetScrollRange(hwnd, SB_HORZ, 1, lphl->ItemsVisible /
- lphl->ItemsPerColumn + 1, TRUE);
-
- if ((lphl->FirstVisible <= uIndex) &&
- ((lphl->FirstVisible + lphl->ItemsVisible) >= uIndex)) {
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
- }
-
- return lphl->ItemsCount;
-}
-
-
-int ListBoxFindString(HWND hwnd, UINT nFirst, LPSTR MatchStr)
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- UINT Count;
- UINT First = nFirst + 1;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (lphl == NULL) return LB_ERR;
-
- if (First > lphl->ItemsCount) return LB_ERR;
-
- lpls = ListBoxGetItem(hwnd, First);
- Count = 0;
- while(lpls != NULL) {
- if (HasStrings(wndPtr)) {
- if (strstr(lpls->itemText, MatchStr) == lpls->itemText) return Count;
- } else if (wndPtr->dwStyle & LBS_SORT) {
- /* XXX Do a compare item */
- }
- else
- if (lpls->dis.itemData == (DWORD)MatchStr) return Count;
-
- lpls = lpls->lpNext;
- Count++;
- }
-
- /* Start over at top */
- Count = 0;
- lpls = lphl->lpFirst;
-
- while (Count < First) {
- if (HasStrings(wndPtr)) {
- if (strstr(lpls->itemText, MatchStr) == lpls->itemText) return Count;
- } else if (wndPtr->dwStyle & LBS_SORT) {
- /* XXX Do a compare item */
- }
- else
- if (lpls->dis.itemData == (DWORD)MatchStr) return Count;
-
- lpls = lpls->lpNext;
- Count++;
- }
-
- return LB_ERR;
-}
-
-
-int ListBoxResetContent(HWND hwnd)
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- UINT i;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (lphl->ItemsCount == 0) return 0;
-
- lpls = lphl->lpFirst;
-
- dprintf_listbox(stddeb, "ListBoxResetContent // ItemCount = %d\n",
- lphl->ItemsCount);
-
- for(i = 0; i < lphl->ItemsCount; i++) {
- LPLISTSTRUCT lpls2;
-
- if (lpls == NULL) return LB_ERR;
-
- lpls2 = lpls->lpNext;
-
- if (i != 0) {
- dprintf_listbox(stddeb,"ResetContent #%u\n", i);
- if (lpls->hData != 0 && lpls->hData != lpls->hMem)
- LIST_HEAP_FREE(lphl, lpls->hData);
-
- if (lpls->hMem != 0) LIST_HEAP_FREE(lphl, lpls->hMem);
- }
-
- lpls = lpls2;
- }
-
- lphl->lpFirst = NULL;
- lphl->FirstVisible = 1;
- lphl->ItemsCount = 0;
- lphl->ItemFocused = -1;
- lphl->PrevFocused = -1;
-
- SetScrollRange(hwnd, SB_VERT, 1, ListMaxFirstVisible(lphl), TRUE);
-
- if (lphl->ItemsPerColumn != 0)
- SetScrollRange(hwnd, SB_HORZ, 1, lphl->ItemsVisible /
- lphl->ItemsPerColumn + 1, TRUE);
-
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
-
- return TRUE;
-}
-
-
-int ListBoxSetCurSel(HWND hwnd, WORD wIndex)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (wndPtr->dwStyle & LBS_MULTIPLESEL) return 0;
-
- if (lphl->ItemFocused != -1) {
- lpls = ListBoxGetItem(hwnd, lphl->ItemFocused);
- if (lpls == 0) return LB_ERR;
- lpls->dis.itemState = 0;
- }
-
- if (wIndex != (UINT)-1) {
- lphl->ItemFocused = wIndex;
- lpls = ListBoxGetItem(hwnd, wIndex);
- if (lpls == 0) return LB_ERR;
- lpls->dis.itemState = ODS_SELECTED | ODS_FOCUS;
-
- return 0;
- }
-
- return LB_ERR;
-}
-
-int ListBoxSetSel(HWND hwnd, WORD wIndex, WORD state)
-
-{
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- WND *wndPtr;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_MULTIPLESEL)) return 0;
-
- if (wIndex == (UINT)-1) {
- lpls = lphl->lpFirst;
-
- while (lpls != NULL) {
- lpls->dis.itemState = state;
- lpls = lpls->lpNext;
- }
-
- return 0;
- }
-
- if (wIndex >= lphl->ItemsCount) return LB_ERR;
-
- lpls = ListBoxGetItem(hwnd, wIndex);
- lpls->dis.itemState = state;
-
- return 0;
-}
-
-
-int ListBoxGetSel(HWND hwnd, WORD wIndex)
-{
- LPLISTSTRUCT lpls;
-
- if ((lpls = ListBoxGetItem(hwnd, wIndex)) == NULL) return LB_ERR;
-
- return lpls->dis.itemState;
-}
-
-
-int ListBoxDirectory(HWND hwnd, UINT attrib, LPSTR filespec)
-{
- struct dosdirent *dp, *dp_old;
- int x, wRet = LB_OKAY;
- BOOL OldFlag;
- char temp[256];
- LPHEADLIST lphl;
- int drive;
- LPSTR tstr;
-
- dprintf_listbox(stddeb,"ListBoxDirectory: %s, %4x\n",filespec,attrib);
-
- if( strchr( filespec, '\\' ) || strchr( filespec, ':' ) ) {
- drive = DOS_GetDefaultDrive();
- if( filespec[1] == ':' ) {
- drive = toupper(filespec[0]) - 'A';
- filespec += 2;
- }
- strcpy(temp,filespec);
- tstr = strrchr(temp, '\\');
- if( tstr == NULL )
- DOS_SetDefaultDrive( drive );
- else {
- *tstr = 0;
- filespec = tstr + 1;
- DOS_ChangeDir( drive, temp );
- if (!DOS_ChangeDir( drive, temp )) return 0;
- }
- dprintf_listbox(stddeb,"Changing directory to %c:%s, filemask is %s\n",
- drive+'A', temp, filespec );
- }
- lphl = ListBoxGetStorageHeader(hwnd);
- if (lphl == NULL) return LB_ERR;
- if ((dp = (struct dosdirent *)DOS_opendir(filespec)) ==NULL) return 0;
- dp_old = dp;
- OldFlag = lphl->bRedrawFlag;
- lphl->bRedrawFlag = FALSE;
- while ((dp = (struct dosdirent *)DOS_readdir(dp))) {
- if (!dp->inuse) break;
- dprintf_listbox( stddeb, "ListBoxDirectory %p '%s' !\n", dp->filename,
- dp->filename);
- if (dp->attribute & FA_DIREC) {
- if (attrib & DDL_DIRECTORY && strcmp(dp->filename, ".") != 0) {
- sprintf(temp, "[%s]", dp->filename);
- if ( (wRet = ListBoxAddString(hwnd, temp)) == LB_ERR) break;
- }
- }
- else {
- if (attrib & DDL_EXCLUSIVE) {
- if (attrib & (DDL_READWRITE | DDL_READONLY | DDL_HIDDEN |
- DDL_SYSTEM) )
- if ( (wRet = ListBoxAddString(hwnd, dp->filename))
- == LB_ERR) break;
- }
- else {
- if ( (wRet = ListBoxAddString(hwnd, dp->filename))
- == LB_ERR) break;
- }
- }
- }
- DOS_closedir(dp_old);
-
- if (attrib & DDL_DRIVES) {
- for (x=0;x!=MAX_DOS_DRIVES;x++) {
- if (DOS_ValidDrive(x)) {
- sprintf(temp, "[-%c-]", 'a'+x);
- if((wRet = ListBoxInsertString(hwnd, (UINT)-1, temp)) == LB_ERR) break;
- }
- }
- }
- lphl->bRedrawFlag = OldFlag;
- if (OldFlag) {
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
- }
- dprintf_listbox(stddeb,"End of ListBoxDirectory !\n");
- return 1; /* FIXME: Should be 0 if "filespec" is invalid */
-}
-
-
-int ListBoxGetItemRect(HWND hwnd, WORD wIndex, LPRECT lprect)
-
-{
- LPLISTSTRUCT lpls;
-
- if ((lpls = ListBoxGetItem(hwnd, wIndex)) == NULL) return LB_ERR;
-
- *(lprect) = lpls->dis.rcItem;
-
- return 0;
-}
-
-
-int ListBoxSetItemHeight(HWND hwnd, WORD wIndex, long height)
-
-{
- LPHEADLIST lphl;
- WND *wndPtr;
- LPLISTSTRUCT lpls;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
-
- if (!(wndPtr->dwStyle & LBS_OWNERDRAWVARIABLE)) {
- lphl->StdItemHeight = (short)height;
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
-
- return 0;
- }
-
- if ((lpls = ListBoxGetItem(hwnd, wIndex)) == NULL) return LB_ERR;
-
- lpls->dis.rcItem.bottom = lpls->dis.rcItem.top + (short)height;
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
-
- return 0;
-}
-
-int ListBoxDefaultItem(HWND hwnd, WND *wndPtr,
- LPHEADLIST lphl, LPLISTSTRUCT lpls)
-
-{
- RECT rect;
-
- if (wndPtr == NULL || lphl == NULL || lpls == NULL) {
- fprintf(stderr,"ListBoxDefaultItem() // Bad Pointers !\n");
- return FALSE;
- }
-
- GetClientRect(hwnd, &rect);
- SetRect(&lpls->dis.rcItem, 0, 0, rect.right, lphl->StdItemHeight);
-
- lpls->dis.CtlType = lphl->DrawCtlType;
- lpls->dis.CtlID = wndPtr->wIDmenu;
- lpls->dis.itemID = 0;
- lpls->dis.itemAction = 0;
- lpls->dis.itemState = 0;
- lpls->dis.hwndItem = hwnd;
- lpls->dis.hDC = 0;
- lpls->dis.itemData = 0;
-
- return TRUE;
-}
-
-
-
-int ListBoxFindNextMatch(HWND hwnd, WORD wChar)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- LPLISTSTRUCT lpls;
- UINT Count;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
- if (lphl == NULL) return LB_ERR;
- lpls = lphl->lpFirst;
- if (lpls == NULL) return LB_ERR;
- if (wChar < ' ') return LB_ERR;
-
- if (!HasStrings(wndPtr)) return LB_ERR;
-
- Count = 0;
- while(lpls != NULL) {
- if (Count > lphl->ItemFocused) {
- if (*(lpls->itemText) == (char)wChar) {
- if ((wndPtr->dwStyle & LBS_MULTIPLESEL) == LBS_MULTIPLESEL) {
- lphl->ItemFocused = Count;
- ListBoxScrolltoFocus(hwnd);
- }
- else {
- ListBoxSetCurSel(hwnd, Count);
- }
- SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
- return Count;
- }
- }
- lpls = (LPLISTSTRUCT)lpls->lpNext;
- Count++;
- }
- Count = 0;
- lpls = lphl->lpFirst;
- while(lpls != NULL) {
- if (*(lpls->itemText) == (char)wChar) {
- if (Count == lphl->ItemFocused) return LB_ERR;
-
- if ((wndPtr->dwStyle & LBS_MULTIPLESEL) == LBS_MULTIPLESEL) {
- lphl->ItemFocused = Count;
- ListBoxScrolltoFocus(hwnd);
- }
- else {
- ListBoxSetCurSel(hwnd, Count);
- }
- SetScrollPos(hwnd, SB_VERT, lphl->FirstVisible, TRUE);
- InvalidateRect(hwnd, NULL, TRUE);
- UpdateWindow(hwnd);
- return Count;
- }
- lpls = lpls->lpNext;
- Count++;
- }
- return LB_ERR;
-}
-
-
/************************************************************************
* DlgDirSelect [USER.99]
*/
@@ -2087,12 +1770,12 @@
hwnd = GetDlgItem(hDlg, nIDLBox);
lphl = ListBoxGetStorageHeader(hwnd);
- if( lphl->ItemFocused == -1 ) {
- dprintf_listbox( stddeb, "Nothing selected!\n" );
+ if(lphl->ItemFocused == -1) {
+ dprintf_listbox(stddeb, "Nothing selected!\n");
return FALSE;
}
- ListBoxGetText(hwnd, lphl->ItemFocused, (LPSTR)s, FALSE);
- dprintf_listbox( stddeb, "Selection is %s\n", s );
+ ListBoxGetText(lphl, lphl->ItemFocused, s);
+ dprintf_listbox(stddeb, "Selection is %s\n", s);
if( s[0] == '[' ) {
if( s[1] == '-' ) {
strncpy( lpStr, s+2, strlen(s)-4 ); /* device name */
@@ -2106,8 +1789,7 @@
}
dprintf_listbox( stddeb, "Returning %s\n", lpStr );
return TRUE;
- }
- else {
+ } else {
strcpy( lpStr, s ); /* file name */
dprintf_listbox( stddeb, "Returning %s\n", lpStr );
return FALSE;
@@ -2116,27 +1798,27 @@
/************************************************************************
- * DlgDirList [USER.100]
+ * DlgDirList [USER.100]
*/
int DlgDirList(HWND hDlg, LPSTR lpPathSpec,
- int nIDLBox, int nIDStat, WORD wType)
+ int nIDLBox, int nIDStat, WORD wType)
{
HWND hWnd;
int ret;
+
dprintf_listbox(stddeb,"DlgDirList(%04X, '%s', %d, %d, %04X) \n",
hDlg, lpPathSpec, nIDLBox, nIDStat, wType);
- if (nIDLBox)
+ if (nIDLBox) {
+ LPHEADLIST lphl;
hWnd = GetDlgItem(hDlg, nIDLBox);
- else
- hWnd = 0;
- if (hWnd)
- ListBoxResetContent(hWnd);
- if (hWnd)
- ret=ListBoxDirectory(hWnd, wType, lpPathSpec);
- else
- ret=0;
- if (nIDStat)
- {
+ lphl = ListBoxGetStorageHeader(hWnd);
+ ListBoxResetContent(lphl);
+ ret = ListBoxDirectory(lphl, wType, lpPathSpec);
+ ListBoxUpdateWindow(hWnd, lphl, TRUE);
+ } else {
+ ret = 0;
+ }
+ if (nIDStat) {
int drive;
HANDLE hTemp;
char *temp;
@@ -2149,8 +1831,7 @@
temp[2] = ':';
SendDlgItemMessage( hDlg, nIDStat, WM_SETTEXT, 0,
USER_HEAP_SEG_ADDR(hTemp) + 1 );
- }
- else {
+ } else {
temp[0] = 'A'+drive;
temp[1] = ':';
temp[2] = '\\';
@@ -2158,53 +1839,6 @@
USER_HEAP_SEG_ADDR(hTemp) );
}
USER_HEAP_FREE( hTemp );
- }
+ }
return ret;
}
-
-
-/* Returns: 0 if nothing needs to be changed */
-/* 1 if FirstVisible changed */
-
-int ListBoxScrolltoFocus(HWND hwnd)
-
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- short end;
-
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (lphl->ItemsCount == 0) return 0;
- if (lphl->ItemFocused == -1) return 0;
-
- end = lphl->FirstVisible + lphl->ItemsVisible - 2;
-
- if (lphl->ItemFocused < lphl->FirstVisible - 1) {
- lphl->FirstVisible = lphl->ItemFocused + 1;
- }
- else if (lphl->ItemFocused > end) {
- UINT maxFirstVisible = ListMaxFirstVisible(lphl);
-
- lphl->FirstVisible = lphl->ItemFocused;
-
- if (lphl->FirstVisible > maxFirstVisible) {
- lphl->FirstVisible = maxFirstVisible;
- }
- } else return 0;
-
- return 1;
-}
-
-/* Send notification "code" as part of a WM_COMMAND-message if hwnd
- has the LBS_NOTIFY style */
-void ListBoxSendNotification(HWND hwnd, WORD code)
-{
- WND *wndPtr;
- LPHEADLIST lphl;
- lphl = ListBoxGetWindowAndStorage(hwnd, &wndPtr);
-
- if (wndPtr && (wndPtr->dwStyle & LBS_NOTIFY))
- SendMessage(lphl->hWndLogicParent, WM_COMMAND,
- wndPtr->wIDmenu, MAKELONG(hwnd, code));
-}
