Release 950319
Sun Mar 19 16:30:20 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [*/*]
Implemented a new memory mapping scheme. There's no longer a
one-to-one mapping between 16-bit and 32-bit pointers. Please see
file DEVELOPERS-HINTS for technical details.
* [controls/scroll.c]
Fixed bug when dragging mouse in horizontal scrollbars.
* [tools/build.c] [if1632/*.spec]
Removed support for C callback functions and for re-ordering
of the 32-bit arguments, as these were never used. This should
allow a more efficient callback scheme to be implemented.
* [if1632/olecli.spec]
Reduced the number of entries to make the 16-bit code fit in 64k.
This limitation will soon be removed.
* [loader/ldt.c]
Rewrote LDT manipulation functions and implemented LDT_GetEntry().
* [memory/global.c]
Rewrote Global*() routines to use the new selector allocation
mechanism.
* [memory/local.c]
Rewrote local heap handling to use a Windows-compatible layout
(not really finished yet).
Implemented TOOLHELP heap-walking routines.
* [memory/selector.c]
Implemented LDT manipulation API functions.
Tue Mar 14 19:50:28 EST 1995 William Magro (wmagro@tc.cornell.edu)
* [windows/defdlg.c]
Fixed problem where dialogs closed using the System menu
('Close' item or double click on close box) would
hang Wine.
Sun Mar 12 14:28:13 1995 Michael Patra <micky@marie.physik.TU-Berlin.DE>
* [controls/listbox.c]
Removed most of the statements for sending a notification message
ListBoxDirectory(), DlgDirSelect(), DlgDirList(): Improved the
code; Borland's standard file open dialog will work now.
* [misc/main.c], [misc/file.c], [miscemu/int21.c]
Added support for new command line option "-allowreadonly". If set
an attempt to open a read only file in write mode will be converted
to opening it read only (many programs try to open all files in
read/write mode even if they only intend to read it - this might
cause a few under problems under an unix-like environment where most
files are read only for a "normal" user)
* [loader/selector.c]
GetMemoryReference(): Added support for __AHIncr and __AHShift
* [misc/dos_fs.c]
DOS_SimplifyPath(): This routine simplifies path names ( e.g., it
will change "/usr///local/bin/../lib//a" to "/usr/local/lib/a" )
match(): rewritten
* [objects/text.c]
TEXT_NextLine(): Removed a bug in the handling of LF's
* [miscemu/int21.c]
GetFileDateTime(): Fixed. SetFileDateTime() is still broken.
Sat Mar 11 19:46:19 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [controls/menu.c]
ChangeMenu: defaults to MF_INSERT
InsertMenu: allow insertion even if position is one after last item
* [if1632/Imakefile] [if1632/compobj.spec] [if1632/relay.c]
[if1632/storage.spec] [include/dlls.h]
Added stubs for STORAGE.DLL and COMPOBJ.DLL
* [if1632/user.spec] [windows/message.c]
InSendMessage: new function
* [include/neexe.h][include/ne_image.c]
NE_FixupSegment: fixed handling of additive records
* [loader/selector.c]
GetEntryDLLName: return NULL instead of pointer to DLL.0 if not found
* [loader/signal.c]
win_fault: Enter debugger on SIGFPE, too
Wed Mar 1 21:47:42 1995 Cameron Heide (heide@ee.ualberta.ca)
* [miscemu/int*.c]
Various minor modifications to the clock tick counter,
FindFirst/FindNext funcs, and DPB handling.
diff --git a/windows/class.c b/windows/class.c
index 7f937bb..fc7a4b5 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -13,6 +13,7 @@
#include "user.h"
#include "win.h"
#include "dce.h"
+#include "toolhelp.h"
#include "stddebug.h"
/* #define DEBUG_CLASS */
#include "debug.h"
@@ -33,37 +34,33 @@
HCLASS class;
CLASS * classPtr;
+ if (!(atom = GlobalFindAtom( name ))) return 0;
+
/* First search task-specific classes */
- if ((atom = /*FindAtom*/GlobalFindAtom( name )) != 0)
+ for (class = firstClass; (class); class = classPtr->hNext)
{
- for (class = firstClass; (class); class = classPtr->hNext)
- {
- classPtr = (CLASS *) USER_HEAP_ADDR(class);
- if (classPtr->wc.style & CS_GLOBALCLASS) continue;
- if ((classPtr->atomName == atom) &&
- (( hinstance==0xffff )|| (hinstance == classPtr->wc.hInstance)))
- {
- if (ptr) *ptr = classPtr;
- return class;
- }
- }
+ classPtr = (CLASS *) USER_HEAP_LIN_ADDR(class);
+ if (classPtr->wc.style & CS_GLOBALCLASS) continue;
+ if ((classPtr->atomName == atom) &&
+ ((hinstance==0xffff )|| (hinstance == classPtr->wc.hInstance)))
+ {
+ if (ptr) *ptr = classPtr;
+ return class;
+ }
}
/* Then search global classes */
- if ((atom = GlobalFindAtom( name )) != 0)
+ for (class = firstClass; (class); class = classPtr->hNext)
{
- for (class = firstClass; (class); class = classPtr->hNext)
- {
- classPtr = (CLASS *) USER_HEAP_ADDR(class);
- if (!(classPtr->wc.style & CS_GLOBALCLASS)) continue;
- if (classPtr->atomName == atom)
- {
- if (ptr) *ptr = classPtr;
- return class;
- }
- }
+ classPtr = (CLASS *) USER_HEAP_LIN_ADDR(class);
+ if (!(classPtr->wc.style & CS_GLOBALCLASS)) continue;
+ if (classPtr->atomName == atom)
+ {
+ if (ptr) *ptr = classPtr;
+ return class;
+ }
}
return 0;
@@ -80,7 +77,7 @@
CLASS * ptr;
if (!hclass) return NULL;
- ptr = (CLASS *) USER_HEAP_ADDR( hclass );
+ ptr = (CLASS *) USER_HEAP_LIN_ADDR( hclass );
if (ptr->wMagic != CLASS_MAGIC) return NULL;
return ptr;
}
@@ -94,15 +91,14 @@
CLASS * newClass, * prevClassPtr;
HCLASS handle, prevClass;
int classExtra;
+ char *name = PTR_SEG_TO_LIN( class->lpszClassName );
dprintf_class(stddeb, "RegisterClass: wndproc=%p hinst=%d name='%s' background %x\n",
- class->lpfnWndProc, class->hInstance, class->lpszClassName,
- class->hbrBackground );
+ class->lpfnWndProc, class->hInstance, name, class->hbrBackground );
/* Check if a class with this name already exists */
- prevClass = CLASS_FindClassByName( class->lpszClassName, class->hInstance,
- &prevClassPtr );
+ prevClass = CLASS_FindClassByName( name, class->hInstance, &prevClassPtr );
if (prevClass)
{
/* Class can be created only if it is local and */
@@ -115,9 +111,9 @@
/* Create class */
classExtra = (class->cbClsExtra < 0) ? 0 : class->cbClsExtra;
- handle = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CLASS) + classExtra );
+ handle = USER_HEAP_ALLOC( sizeof(CLASS) + classExtra );
if (!handle) return 0;
- newClass = (CLASS *) USER_HEAP_ADDR( handle );
+ newClass = (CLASS *) USER_HEAP_LIN_ADDR( handle );
newClass->hNext = firstClass;
newClass->wMagic = CLASS_MAGIC;
newClass->cWindows = 0;
@@ -125,9 +121,7 @@
newClass->wc.cbWndExtra = (class->cbWndExtra < 0) ? 0 : class->cbWndExtra;
newClass->wc.cbClsExtra = classExtra;
- /*if (newClass->wc.style & CS_GLOBALCLASS)*/
- newClass->atomName = GlobalAddAtom( class->lpszClassName );
- /*else newClass->atomName = AddAtom( class->lpszClassName );*/
+ newClass->atomName = GlobalAddAtom( name );
newClass->wc.lpszClassName = NULL;
if (newClass->wc.style & CS_CLASSDC)
@@ -138,12 +132,12 @@
if ((int)class->lpszMenuName & 0xffff0000)
{
- HANDLE hname;
- hname = USER_HEAP_ALLOC( GMEM_MOVEABLE, strlen(class->lpszMenuName)+1);
+ char *menuname = PTR_SEG_TO_LIN( class->lpszMenuName );
+ HANDLE hname = USER_HEAP_ALLOC( strlen(menuname)+1 );
if (hname)
{
- newClass->wc.lpszMenuName = (char *)USER_HEAP_ADDR( hname );
- strcpy( newClass->wc.lpszMenuName, class->lpszMenuName );
+ newClass->wc.lpszMenuName = (char *)USER_HEAP_SEG_ADDR( hname );
+ strcpy( USER_HEAP_LIN_ADDR( hname ), menuname );
}
}
@@ -173,7 +167,7 @@
{
for (prevClass = firstClass; prevClass; prevClass=prevClassPtr->hNext)
{
- prevClassPtr = (CLASS *) USER_HEAP_ADDR(prevClass);
+ prevClassPtr = (CLASS *) USER_HEAP_LIN_ADDR(prevClass);
if (prevClassPtr->hNext == class) break;
}
if (!prevClass)
@@ -264,6 +258,7 @@
CLASS *classPtr;
/* FIXME: We have the find the correct hInstance */
+ dprintf_class(stddeb,"GetClassName(%x,%p,%d\n)",hwnd,lpClassName,maxCount);
if (!(wndPtr = WIN_FindWndPtr(hwnd))) return 0;
if (!(classPtr = CLASS_FindClassPtr(wndPtr->hClass))) return 0;
@@ -307,3 +302,29 @@
memcpy(lpWndClass, &(classPtr->wc), sizeof(WNDCLASS));
return TRUE;
}
+
+
+/***********************************************************************
+ * ClassFirst (TOOLHELP.69)
+ */
+BOOL ClassFirst( CLASSENTRY *pClassEntry )
+{
+ pClassEntry->wNext = firstClass;
+ return ClassNext( pClassEntry );
+}
+
+
+/***********************************************************************
+ * ClassNext (TOOLHELP.70)
+ */
+BOOL ClassNext( CLASSENTRY *pClassEntry )
+{
+ CLASS *classPtr = (CLASS *) USER_HEAP_LIN_ADDR( pClassEntry->wNext );
+ if (!classPtr) return FALSE;
+
+ pClassEntry->hInst = classPtr->wc.hInstance;
+ pClassEntry->wNext = classPtr->hNext;
+ GlobalGetAtomName( classPtr->atomName, pClassEntry->szClassName,
+ sizeof(pClassEntry->szClassName) );
+ return TRUE;
+}
