Release 980913
Fri Sep 11 13:14:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/file.c] [include/file.h]
Fixed SetFilePointer to allow negative positions as in DOS.
* [graphics/ddraw.c]
Added some methods to IDirect3D.
* [ole/compobj.c] [if1632/compobj.spec]
Added/implemented CoCreateStandardMalloc16,
CoGetClassObject, CoCreateInstance,
LookupETask, SetETask, CoGetState16.
* [loader/task.c]
MakeProcInstance: return 0 if func == NULL.
* [*/*] [tools/winapi-check]
Added zillions of missing WINAPI's and __cdecl's.
(oops, several caused by myself)
Wrote script for automated checking.
* [if1632/compobj.spec]
Many stub names.
* [misc/ddeml.c] [ole/compobj.c]
Some stubs.
Tue Sep 9 21:36:48 1998 Anders Carlsson <anders.carlsson@linux.nu>
* [dlls/comctl32/Makefile.in] [dlls/comctl32/commctrl.c]
[dlls/comctl32/tab.c] [include/commctrl.h] [include/tab.h]
Added preliminary tab control support.
Sat Sep 5 16:27:20 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/psdrv/*]
More changes to the PostScript driver:
Implemented pens and solid brushes.
Colour/greyscale for fonts, pens and brushes.
To get coloured output you need to have *ColorDevice set to true
in your PPD, otherwise you'll get greyscale.
Landscape mode now works, as does non-A4 page sizes.
Encoding of fonts to ANSI is better, Symbol works again.
* [objects/dc.c] [include/gdi.h] [*/*]
Moved dc->w.{text,background}Pixel to X11DRV_PDEVICE where they
belong.
Sat Sep 5 05:12:09 1998 Ove Kaaven <ovek@arcticnet.no>
* [include/dosexe.h] [include/miscemu.h] [include/msdos.h]
[loader/dos/dosvm.c] [loader/dos/module.c] [msdos/dpmi.c]
[msdos/int2f.c] [msdos/interrupts.c]
Fixed portability. Adapted some code to make it easier to
integrate the DOS subsystem with the DPMI subsystem, made
the DPMI simulated real-mode interrupts be handled the V86
way. Added support for .COM files. Made int2f DPMI check
fail, to avoid pkunzip crashing in attempting to use DPMI.
Generally moved stuff around a little.
It is now technically possible to load several DOS programs
into the same memory space. Not tested, though.
Fri Sep 4 21:40:45 1998 Marcus Meissner <marcus@jet.franken.de>
* [if1632/kernel.spec]
Changed 500-53x stubnames accordingly to nt3.51 krnl386.exe.
* [win32/except.c]
Fixed one bad program behaviour, (deleting SEH while in
first walk). RtlUnwind is broken too I think (it should unwind
on success, not while walking the exception chain).
* [ole/ole2nls.c]
Get*DefaultLCID returns 0x400|id. expected by one application.
* [if1632/snoop.c]
Handle non-standard SP returns more graceful.
* [windows/class.c]
hinstances are mostly irrelevant for win32.
* [memory/string.c] [misc/registry.c]
lstrcmpi32W: use toupper for characters < 0x100. (speedup hack
for registry.c)
Some small speedup hacks for registry.c
Thu Sep 3 20:40:16 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [Makefile.in][configure][configure.in][dlls/Makefile.in]
[dlls/comctl32/Makefile.in]
Created dlls/comctl32 and moved the common controls stuff to it.
* [misc/version.c]
Removed COMCTL32_DllGetVersion. The fixed function is part
of the common controls stuff.
* [dlls/comctl32/*.c][include/commctrl.h]
Added structure size tests.
* [dlls/comctl32/toolbar.c]
Fixed a bug in TOOLBAR_GetMaxWidth().
* [dlls/comctl32/animate.c][include/animate.h]
[dlls/comctl32/comboex.c][include/comboex.h]
[dlls/comctl32/hotkey.c][include/hotkey.h]
[dlls/comctl32/listview.c][include/listview.h]
[dlls/comctl32/commctrl.c][include/commctrl.h]
New files. Added Animation, ComboBoxEx, Hotkey and
Listview control dummies.
* [dlls/comctl32/tooltips.c]
Fixed a display bug and font selection.
* [dlls/comctl32/comctl32undoc.c][include/commctrl.h]
Added missing DPA functions. Fixed bugs and published the
function prototypes.
* [documentation/common_controls]
Updated.
Wed Sep 2 15:43:45 1998 Patrik Stridvall <ps@leissner.se>
* [AUTHORS] [include/authors.h]
Added myself as a Wine author.
* [memory/virtual.c] [objects/dc.c]
Fixed runtime errors for Solaris.
* [misc/ddeml.c] [objects/gdiobj.c]
Minor fixes.
* [win32/device.c]
Added stubs for IFSMgr VxDCall and
a partial implementation of IFSMgr DeviceIo.
* [relay32/Makefile.in] [relay32/builtin32.c] [relay32/imm32.spec]
[relay32/msnet32.spec] [relay32/oledlg.spec]
Added new spec files for IMM32.DLL, MSNET32.DLL, OLEDLG.DLL.
* [misc/Makefile.in] [misc/imm.c] [include/imm.h]
Added news files for implementation of IMM32.DLL.
All functions return 0 as is correct for all Western Languages.
* [ole/Makefile.in] [ole/oledlg.c] [include/oledlg.h]
Added new files for implementation of OLEDLG.DLL.
Added stubs with FIXME:s for all functions.
Wed Sep 2 10:50:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [dlls/shell32/contmenu.c][dlls/shell32/shellole.c]
[dlls/shell32/shlfolder.c][dlls/shell32/shlview.c]
[documentation/shell32][include/shell.h]
Clean up, bugfixes.
* [dlls/shell32/enumidlist.c]
Fileattributes implemented.
* [dlls/shell32/pidl.c]
Class pidlmgr splited into functions, structures changed,
some functions rewritten.
* [dlls/shell32/shell32_main.c]
Small changes and bugfixes SHGetFileInfoA, SHGetSpecialFolderLocation.
* [dlls/shell32/shellord.c][relay32/shell32.spec]
Parameter documented, implemented SHCloneSpecialIDList.
Stub improved ShellExecuteEx32A.
New stubs SHFind_InitMenuPopup, FileMenu_InitMenuPopup,
FileMenu_Create, FileMenu_TrackPopupMenuEx, SHWinHelp,
SHRunConrolPanel, DAD_ShowDragImage, FileMenu_Destroy,
SHGetDataFromIDListA, SHFileOperationA.
* [include/winnls.h][include/ole2nls.c]
TIME_FORCE24HOURFORMAT, TIME_NOTIMEMARKER implemented
in OLE_GetFormatA, GetTimeFormat32A.
* [win32/code_page.c]
WideCharToMultiByte: parameter checking and returning of strlen
implemented.
* [windows/keyboard.c][windows/defwnd.c]
Debug messages added.
* [windows/win.c]
WIN_SetWindowLong GWL_STYLE and GWL_EXSTYLE implemented.
* [controls/menu.c]
Missing line added.
* [include/winerror.h]
Macros for SUCCEEDED and FAILED added.
Mon Aug 31 00:55:31 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [loader/module.c]
Bugfix: LoadModule16 should *not* call LoadModule32.
* [files/dos_fs.c]
Bugfix: don't crash if given directory doesn't exist.
Sat Aug 29 15:00:49 1998 Turchanov Sergey <turchanov@usa.net>
* [include/mmsystem.h][multimedia/mmsystem.c][relay32/winmm.spec]
Almost completed implementation of [snd]PlaySound (except
flags SND_ALIAS_ID and SND_APPLICATION).
* [if1632/user.spec][windows/winpos.c]
Added SetWindowRgn16 stub.
Sat Aug 29 02:53:31 1998 Alexander Lukyanov <lav@long.yar.ru>
* [files/drive.c]
GetDriveType32A: return DRIVE_DOESNOTEXIST in case of non
existent drive.
* [msdos/int21.c]
INT21_FindFirstFCB: check drive validity to prevent oops.
* [win32/file.c]
CreateFile32A: duplicate STD_{INPUT,OUTPUT}_HANDLE.
* [files/dos_fs.c]
Make DOSFS_OpenDir treat "" as "/".
DOSFS_OpenDevice: duplicate STD_{INPUT,OUTPUT}_HANDLE.
* [windows/dialog.c]
GetNextDlgTabItem32: use last/first item instead of first/last
when hwndCtrl==0. This fixes initial focus.
Sat Aug 29 02:46:32 1998 Adrian Harvey <adrian@select.com.au>
* [include/process.h] [include/process.c]
Renamed PROCESS_SELF to CURRENT_PROCESS_PSEUDOHANDLE in line
with thread constant, and Win32 documentation (which calls it
a pseudohandle.) Made GetCurrentProcess actually use this
constant instead of the value.
* [include/process.h] [include/thread.h] [scheduler/thread.c]
[scheduler/process.c] [scheduler/handle.c]
Modify HANDLE_GetObjPtr to understand about
CURRENT_THREAD_PSEUDOHANDLE and CURRENT_PROCESS_PSEUDOHANDLE.
This allows DuplicateHandle to do the correct thing with these
handles. Removed now duplicate functionality from THREAD_GetPtr
and PROCESS_GetPtr.
* [loader/ne/segment.c]
Fixed two places where HFILE32s were being created and passed to
16-bit code. This should unbreak NE self-loading code.
Added two casts to remove compile time warnings.
Fri Aug 28 21:04:13 1998 Joseph Pranevich <knight@baltimore.wwaves.com>
* [msdos/dosmem.c] [msdos/int2f.c]
Added beginnings of DOS error table.
* [msdos/int1a.c]
Stub for subfunction 0xb0.
* [msdos/int10.c] [loader/dos/dosvm.c]
INT 10 support completely rewritten and lots of debugging
added. Now, DOS apps that use INT 10 to write to the screen will
work. (Beyond Zork does, at least. Somewhat.)
* [include/miscemu.h] [msdos/dosmem.c] [msdos/int21.c]
Another shot at getting MS's generic error message facility
right.
* [msdos/int21.c]
Command.Com wanted to set its own PSP address. I let it.
Wed Aug 26 12:26:20 1998 Matthew Toseland <Matthew.Toseland@btinternet.com>
* [include/file.h] [misc/lzexpand.c]
Fixed LZCopy16 by fixing HFILE16/HFILE32 convertor macros so don't
convert lzw handles.
Tue Aug 25 22:22:55 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [misc/registry.c]
In RegEnumvalue, ivalue == 0 is a legal request and should
return the first entry.
* [msdos/int21.c]
Add handling for Int21-48/49 in Win16. Makes blinker demo work.
* [windows/winproc.c]
Add Msg32A<->Msg32W translation for LB_ADDSTRING.
Tue Aug 25 21:03:31 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [windows/win.c]
Fix for SetParent(): MS Windows 3.11 does not clear the WS_CHILD
flag when a child window is reparented to the desktop window.
Mon Aug 24 20:55:22 1998 Berend Reitsma <berend at asset-control dot com>
* [controls/menu.c]
Menus created with SetMenuItemInfo and InsertMenuItem should
work now.
Sun Aug 23 23:23:23 1998 Alex Korobka <korobka@ams.sunysb.edu>
* [controls/combo.c]
Added CB_GETITEMHEIGHT.
* [windows/winpos.c]
WM_NCHITTEST, SWP_FRAMECHANGED bugfixes.
Sat Aug 22 21:15:29 1998 Alex Priem <alexp@sci.kun.nl>
* [files/profile.c] [include/windows.h]
Added GetPrivateProfileSectionNames[AW],GetPrivateProfileSectionW,
GetPrivateProfileStructW, GetProfileSectionW,
WriteProfileSection[AW], WritePrivateProfileStructW.
diff --git a/windows/class.c b/windows/class.c
index aef5cd3..bde35d1 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -1102,8 +1102,8 @@
TRACE(class,"%x %p %p\n",hInstance, name, wc);
if (!(atom = GlobalFindAtom32A( name )) ||
- !(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
- (hInstance != classPtr->hInstance)) return FALSE;
+ !(classPtr = CLASS_FindClassByAtom( atom, hInstance ))
+ /*|| (hInstance != classPtr->hInstance) */ ) return FALSE;
wc->style = classPtr->style;
wc->lpfnWndProc = (WNDPROC32)WINPROC_GetProc( classPtr->winproc,
WIN_PROC_32A );
diff --git a/windows/dce.c b/windows/dce.c
index 1e9b316..25145c8 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -144,7 +144,7 @@
}
else if( pDCE->DCXflags & DCX_DCEBUSY ) /* shared cache DCE */
{
- ERR(cd,"[%04x] GetDC() without ReleaseDC()!\n",
+ ERR(dc,"[%04x] GetDC() without ReleaseDC()!\n",
pWnd->hwndSelf);
DCE_ReleaseDC( pDCE );
}
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 1a57fa4..46117e7 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -164,9 +164,15 @@
case WM_CONTEXTMENU:
if( wndPtr->dwStyle & WS_CHILD )
SendMessage32A( wndPtr->parent->hwndSelf, msg, wParam, lParam );
-
- /* else
- * FIXME: Track system popup if click was in the caption area. */
+ else
+ if (wndPtr->hSysMenu)
+ { /*
+ TrackPopupMenu32(wndPtr->hSysMenu,TPM_LEFTALIGN | TPM_RETURNCMD,LOWORD(lParam),HIWORD(lParam),0,wndPtr->hwndSelf,NULL);
+ DestroyMenu32(wndPtr->hSysMenu);
+ */
+ FIXME(win,"Display default popup menu\n");
+ /* Track system popup if click was in the caption area. */
+ }
break;
case WM_NCACTIVATE:
diff --git a/windows/dialog.c b/windows/dialog.c
index 2226a2e..691813e 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1583,7 +1583,7 @@
{
/* No ctrl specified -> start from the beginning */
if (!(pWndCtrl = pWndDlg->child)) return 0;
- if (fPrevious) while (pWndCtrl->next) pWndCtrl = pWndCtrl->next;
+ if (!fPrevious) while (pWndCtrl->next) pWndCtrl = pWndCtrl->next;
}
pWndLast = pWndCtrl;
diff --git a/windows/graphics.c b/windows/graphics.c
index fcdf859..2a1e9e2 100644
--- a/windows/graphics.c
+++ b/windows/graphics.c
@@ -84,8 +84,8 @@
TSXSetFunction( display, dc->u.x.gc, GXcopy );
if (bmp->bitmap.bmBitsPixel == 1)
{
- TSXSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
- TSXSetBackground( display, dc->u.x.gc, dc->w.textPixel );
+ TSXSetForeground( display, dc->u.x.gc, dc->u.x.backgroundPixel );
+ TSXSetBackground( display, dc->u.x.gc, dc->u.x.textPixel );
TSXCopyPlane( display, bmp->pixmap, dc->u.x.drawable, dc->u.x.gc,
xsrc, ysrc, width, height, xdest, ydest, 1 );
}
@@ -97,13 +97,13 @@
if( COLOR_GetMonoPlane(&plane) )
{
- TSXSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
- TSXSetBackground( display, dc->u.x.gc, dc->w.textPixel );
+ TSXSetForeground(display, dc->u.x.gc, dc->u.x.backgroundPixel);
+ TSXSetBackground(display, dc->u.x.gc, dc->u.x.textPixel);
}
else
{
- TSXSetForeground( display, dc->u.x.gc, dc->w.textPixel );
- TSXSetBackground( display, dc->u.x.gc, dc->w.backgroundPixel );
+ TSXSetForeground(display, dc->u.x.gc, dc->u.x.textPixel);
+ TSXSetBackground(display, dc->u.x.gc, dc->u.x.backgroundPixel);
}
TSXCopyPlane( display, bmp->pixmap, dc->u.x.drawable, dc->u.x.gc,
xsrc, ysrc, width, height, xdest, ydest, plane );
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 667f2d5..5422700 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -773,6 +773,8 @@
{
LPACCEL32 lpAccelTbl = (LPACCEL32)LockResource32(hAccel);
int i;
+
+ TRACE(accel,"hwnd=0x%x hacc=0x%x msg=0x%x wp=0x%x lp=0x%lx\n", hWnd, hAccel, msg->message, msg->wParam, msg->lParam);
if (hAccel == 0 || msg == NULL ||
(msg->message != WM_KEYDOWN &&
diff --git a/windows/mdi.c b/windows/mdi.c
index dadc4c8..f38c164 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -259,7 +259,7 @@
TRACE(mdi, "%04x %04x %04x\n",
hwnd, hmenuFrame, hmenuWindow);
- FIXME(mdi,"partially function stub");
+ FIXME(mdi,"partial function stub\n");
return oldFrameMenu;
}
@@ -1600,7 +1600,6 @@
{
RECT32 childRect, clientRect;
INT32 vmin, vmax, hmin, hmax, vpos, hpos;
- BOOL32 noscroll = FALSE;
WND *pWnd, *Wnd;
if (!(Wnd = pWnd = WIN_FindWndPtr( hwnd ))) return;
@@ -1608,11 +1607,14 @@
SetRectEmpty32( &childRect );
for ( pWnd = pWnd->child; pWnd; pWnd = pWnd->next )
- {
- UnionRect32( &childRect, &pWnd->rectWindow, &childRect );
+ {
if( pWnd->dwStyle & WS_MAXIMIZE )
- noscroll = TRUE;
- }
+ {
+ ShowScrollBar32(hwnd, SB_BOTH, FALSE);
+ return;
+ }
+ UnionRect32( &childRect, &pWnd->rectWindow, &childRect );
+ }
UnionRect32( &childRect, &clientRect, &childRect );
/* jump through the hoops to prevent excessive flashing
@@ -1623,11 +1625,8 @@
vmin = childRect.top; vmax = childRect.bottom - clientRect.bottom;
vpos = clientRect.top - childRect.top;
- if( noscroll )
- ShowScrollBar32(hwnd, SB_BOTH, FALSE);
- else
switch( scroll )
- {
+ {
case SB_HORZ:
vpos = hpos; vmin = hmin; vmax = hmax;
case SB_VERT:
@@ -1639,7 +1638,7 @@
hmin, hmax, hpos);
SetWindowPos32(hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE
| SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
- }
+ }
}
diff --git a/windows/message.c b/windows/message.c
index 972e6ef..ea6c848 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -1585,7 +1585,7 @@
TRACE(key, "(%s, %04X, %08lX)\n",
SPY_GetMsgName(message), wParam, lParam );
- if ((message != WM_KEYDOWN) && (message != WM_SYSKEYDOWN)) return FALSE;
+ if ((message != WM_KEYDOWN) && (message != WM_SYSKEYDOWN)) return FALSE;
TRACE(key, "Translating key %04X, scancode %04X\n",
wParam, HIWORD(lParam) );
@@ -1912,7 +1912,7 @@
HWND32 hWnd,UINT32 Msg,WPARAM32 wParam,LPARAM lParam,
/*SENDASYNCPROC*/FARPROC32 lpResultCallBack,DWORD dwData
) {
- FIXME(msg,"(0x%04x,0x%04x,0x%08lx,0x%08lx,%p,0x%08lx),stub!\n",
+ FIXME(msg,"(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
hWnd,Msg,wParam,lParam,lpResultCallBack,dwData
);
return FALSE;
diff --git a/windows/user.c b/windows/user.c
index 97cc773..46bfd5b 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -351,7 +351,7 @@
*
* Used by Turbo Debugger for Windows
*/
-FARPROC16 SetEventHook(FARPROC16 lpfnEventHook)
+FARPROC16 WINAPI SetEventHook(FARPROC16 lpfnEventHook)
{
FIXME(hook, "(lpfnEventHook=%08x): stub\n", (UINT32)lpfnEventHook);
return NULL;
diff --git a/windows/win.c b/windows/win.c
index 456f215..575457b 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -1560,7 +1560,9 @@
{
LONG *ptr, retval;
WND * wndPtr = WIN_FindWndPtr( hwnd );
-
+ STYLESTRUCT style;
+
+ TRACE(win,"%x=%p %x %lx %x\n",hwnd, wndPtr, offset, newval, type);
if (!wndPtr) return 0;
if (offset >= 0)
{
@@ -1581,27 +1583,41 @@
}
else switch(offset)
{
- case GWL_ID:
- ptr = (DWORD*)&wndPtr->wIDmenu;
- break;
- case GWL_HINSTANCE:
- return SetWindowWord32( hwnd, offset, newval );
+ case GWL_ID:
+ ptr = (DWORD*)&wndPtr->wIDmenu;
+ break;
+ case GWL_HINSTANCE:
+ return SetWindowWord32( hwnd, offset, newval );
case GWL_WNDPROC:
- retval = (LONG)WINPROC_GetProc( wndPtr->winproc, type );
- WINPROC_SetProc( &wndPtr->winproc, (WNDPROC16)newval,
+ retval = (LONG)WINPROC_GetProc( wndPtr->winproc, type );
+ WINPROC_SetProc( &wndPtr->winproc, (WNDPROC16)newval,
type, WIN_PROC_WINDOW );
- return retval;
+ return retval;
case GWL_STYLE:
+ if (wndPtr->flags & WIN_ISWIN32)
+ { style.styleOld = wndPtr->dwStyle;
+ newval &= ~(WS_VISIBLE | WS_CHILD); /* Some bits can't be changed this way */
+ style.styleNew = newval | (style.styleOld & (WS_VISIBLE | WS_CHILD));
- /* FIXME: WM_STYLE... messages for WIN_ISWIN32 windows */
-
- ptr = &wndPtr->dwStyle;
- /* Some bits can't be changed this way */
- newval &= ~(WS_VISIBLE | WS_CHILD);
- newval |= (*ptr & (WS_VISIBLE | WS_CHILD));
- break;
- case GWL_USERDATA: ptr = &wndPtr->userdata; break;
- case GWL_EXSTYLE: ptr = &wndPtr->dwExStyle; break;
+ SendMessage32A(hwnd,WM_STYLECHANGING,GWL_STYLE,(LPARAM)&style);
+ wndPtr->dwStyle = style.styleNew;
+ SendMessage32A(hwnd,WM_STYLECHANGED,GWL_STYLE,(LPARAM)&style);
+ UpdateWindow32(hwnd);
+ return style.styleOld;
+ }
+ case GWL_USERDATA:
+ ptr = &wndPtr->userdata;
+ break;
+ case GWL_EXSTYLE:
+ if (wndPtr->flags & WIN_ISWIN32)
+ { style.styleOld = wndPtr->dwExStyle;
+ style.styleNew = newval;
+ SendMessage32A(hwnd,WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&style);
+ wndPtr->dwExStyle = newval;
+ SendMessage32A(hwnd,WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&style);
+ UpdateWindow32(hwnd);
+ return style.styleOld;
+ }
default:
WARN( win, "Invalid offset %d\n", offset );
return 0;
@@ -1939,9 +1955,7 @@
/* FIXME: Create an X counterpart for reparented top-level windows
* when not in the desktop mode. */
- if ( pWndParent == pWndDesktop )
- wndPtr->dwStyle &= ~WS_CHILD;
- else wndPtr->dwStyle |= WS_CHILD;
+ if ( pWndParent != pWndDesktop ) wndPtr->dwStyle |= WS_CHILD;
WIN_LinkWindow(hwndChild, HWND_BOTTOM);
if( bFixupDCE )
diff --git a/windows/winpos.c b/windows/winpos.c
index 74af90a..d1bbd21 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -260,7 +260,7 @@
/***********************************************************************
* SetWindowRgn32
*/
-BOOL32 WINAPI SetWindowRgn32 ( HWND32 hwnd, HRGN32 hrgn,BOOL32 bRedraw)
+INT32 WINAPI SetWindowRgn32( HWND32 hwnd, HRGN32 hrgn,BOOL32 bRedraw)
{
@@ -268,6 +268,17 @@
return TRUE;
}
+/***********************************************************************
+ * SetWindowRgn16
+ */
+INT16 WINAPI SetWindowRgn16( HWND16 hwnd, HRGN16 hrgn,BOOL16 bRedraw)
+
+{
+
+ FIXME (win, "SetWindowRgn16: stub\n");
+ return TRUE;
+}
+
/***********************************************************************
* GetClientRect16 (USER.33)
@@ -349,8 +360,15 @@
INT16 hittest = HTERROR;
POINT16 xy = pt;
- *ppWnd = NULL;
+ *ppWnd = NULL;
wndPtr = wndScope->child;
+ if( wndScope->flags & WIN_MANAGED )
+ {
+ /* this prevents mouse clicks from going "through" scrollbars in managed mode */
+ if( pt.x < wndScope->rectClient.left || pt.x >= wndScope->rectClient.right ||
+ pt.y < wndScope->rectClient.top || pt.y >= wndScope->rectClient.bottom )
+ goto hittest;
+ }
MapWindowPoints16( GetDesktopWindow16(), wndScope->hwndSelf, &xy, 1 );
for (;;)
@@ -388,6 +406,7 @@
else wndPtr = wndPtr->next;
}
+hittest:
/* If nothing found, try the scope window */
if (!*ppWnd) *ppWnd = wndScope;
@@ -1801,7 +1820,7 @@
* WINPOS_ReorderOwnedPopups
*
* fix Z order taking into account owned popups -
- * basically we need to maintain them above owner window
+ * basically we need to maintain them above the window that owns them
*/
HWND32 WINPOS_ReorderOwnedPopups(HWND32 hwndInsertAfter,WND* wndPtr,WORD flags)
{
@@ -2303,37 +2322,47 @@
newClientRect.left - newWindowRect.left) ||
(oldClientRect.top - oldWindowRect.top !=
newClientRect.top - newWindowRect.top) ||
- winpos.flags & SWP_NOCOPYBITS )
+ (winpos.flags & SWP_NOCOPYBITS) )
+ {
+ /* if the client area moved as a result of WM_NCCALCSIZE returning
+ * obscure WVR_ALIGNxxx flags then we simply redraw the whole thing
+ *
+ * TODO: use WINPOS_SizeMoveClean() if there is no SWP_NOCOPYBITS
+ */
PAINT_RedrawWindow( wndPtr->hwndSelf, NULL, 0, RDW_INVALIDATE |
RDW_ALLCHILDREN | RDW_FRAME | RDW_ERASE, 0 );
+ }
else
if( winpos.flags & SWP_FRAMECHANGED )
{
WORD wErase = 0;
RECT32 rect;
- if( oldClientRect.right > newClientRect.right )
+ if( newClientRect.right > oldClientRect.right ) /* redraw exposed client area on the right */
{
- rect.left = newClientRect.right; rect.top = newClientRect.top;
- rect.right = oldClientRect.right; rect.bottom = newClientRect.bottom;
+ rect.top = 0; rect.bottom = newClientRect.bottom - newClientRect.top;
+ rect.left = oldClientRect.right - newClientRect.left;
+ rect.right = newClientRect.right - newClientRect.left;
wErase = 1;
PAINT_RedrawWindow( wndPtr->hwndSelf, &rect, 0,
- RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN, 0 );
+ RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW | RDW_ALLCHILDREN, 0 );
}
- if( oldClientRect.bottom > newClientRect.bottom )
+ if( newClientRect.bottom > oldClientRect.bottom ) /* redraw exposed client area on the bottom */
{
- rect.left = newClientRect.left; rect.top = newClientRect.bottom;
- rect.right = (wErase)?oldClientRect.right:newClientRect.right;
- rect.bottom = oldClientRect.bottom;
+ rect.left = 0; rect.right = ((wErase)?oldClientRect.right:newClientRect.right) - newClientRect.left;
+ rect.top = oldClientRect.bottom - newClientRect.top;
+ rect.bottom = newClientRect.bottom - newClientRect.top;
wErase = 1;
PAINT_RedrawWindow( wndPtr->hwndSelf, &rect, 0,
- RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN, 0 );
+ RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW | RDW_ALLCHILDREN, 0 );
}
- if( !wErase ) wndPtr->flags |= WIN_NEEDS_NCPAINT;
+ if( !wErase ) /* just update the nonclient area */
+ wndPtr->flags |= WIN_NEEDS_NCPAINT;
}
+ uFlags |= SMC_NOPARENTERASE; /* X windows do not have eraseable parents */
}
- else
+ else /* not an X window */
{
RECT32 oldClientRect = wndPtr->rectClient;
@@ -2347,7 +2376,7 @@
newClientRect.right - newClientRect.left ) result &= ~WVR_HREDRAW;
if( !(flags & (SWP_NOREDRAW | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) )
- {
+ {
uFlags |= ((winpos.flags & SWP_NOCOPYBITS) ||
(result >= WVR_HREDRAW && result < WVR_VALIDRECTS)) ? SMC_NOCOPY : 0;
uFlags |= (winpos.flags & SWP_FRAMECHANGED) ? SMC_DRAWFRAME : 0;
@@ -2356,13 +2385,13 @@
uFlags = WINPOS_SizeMoveClean(wndPtr, visRgn, &oldWindowRect,
&oldClientRect, uFlags);
else
- {
- /* adjust frame and do not erase parent */
+ {
+ /* adjust the frame and do not erase the parent */
if( winpos.flags & SWP_FRAMECHANGED ) wndPtr->flags |= WIN_NEEDS_NCPAINT;
if( winpos.flags & SWP_NOZORDER ) uFlags |= SMC_NOPARENTERASE;
- }
- }
+ }
+ }
DeleteObject32(visRgn);
}
diff --git a/windows/winproc.c b/windows/winproc.c
index bb6ff92..c813860 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -402,6 +402,7 @@
}
return 1;
case WM_SETTEXT:
+ case LB_ADDSTRING32:
*plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
return (*plparam ? 1 : -1);
case WM_NCCREATE:
@@ -464,6 +465,7 @@
HeapFree( SystemHeap, 0, ptr );
}
break;
+ case LB_ADDSTRING32:
case WM_SETTEXT:
HeapFree( SystemHeap, 0, (void *)lParam );
break;
@@ -512,6 +514,7 @@
}
return 1;
case WM_SETTEXT:
+ case LB_ADDSTRING32:
*plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
return (*plparam ? 1 : -1);
case WM_NCCREATE:
@@ -574,6 +577,7 @@
HeapFree( SystemHeap, 0, ptr );
}
break;
+ case LB_ADDSTRING32:
case WM_SETTEXT:
HeapFree( SystemHeap, 0, (void *)lParam );
break;
