Release 961013
Sun Oct 13 15:32:32 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [Make.rules.in] [*/Makefile.in]
Made it possible to compile from a directory other than the source
directory.
* [graphics/metafiledrv/init.c] [include/metafiledrv.h]
[objects/metafile.c] [objects/dc.c]
New graphics driver for metafiles.
* [if1632/thunk.c]
Added thunks for SetWindowsHook and SetDCHook.
* [windows/dialog.c]
Fixed GetNextDlgGroupItem and GetNextDlgTabItem to skip disabled
items.
* [*/*]
Removed non Win32-clean types HANDLE, HBITMAP, HBRUSH, HFONT,
HINSTANCE, HMENU, HRGN and HTASK.
Wed Oct 9 14:59:45 1996 Frans van Dorsselaer <dorssel@rulhm1.LeidenUniv.nl>
* [controls/edit.c]
Fixed EditWndProc() to fall back to DefWndProc() when the
edit state structure is not available.
Wed Oct 2 14:00:34 1996 Huw D. M. Davies <h.davies1@physics.oxford.ac.uk>
* [windows/nonclient.c] [windows/mdi.c]
AdjustWindowRectEx16() should only take notice of the styles
WS_DLGFRAME, WS_BORDER, WS_THICKFRAME and
WS_EX_DLGMODALFRAME. Thanks to Alex Korobka.
* [controls/scroll.c]
Fixed typo in ShowScrollBar32().
Sun Aug 25 20:18:56 1996 Jukka Iivonen <iivonen@cc.helsinki.fi>
* [if1632/user32.spec] [if1632/winmm.spec]
Added SetParent and sndPlaySoundA.
diff --git a/controls/edit.c b/controls/edit.c
index fb87a79..a5e811e 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -49,7 +49,7 @@
UINT TextWidth; /* width of the widest line in pixels */
HLOCAL16 hBuf;
char *text;
- HFONT hFont;
+ HFONT16 hFont;
LINEDEF *LineDefs;
UINT XOffset; /* offset of the viewport in pixels */
UINT FirstVisibleLine;
@@ -240,6 +240,9 @@
LRESULT lResult = 0L;
WND *wndPtr = WIN_FindWndPtr(hwnd);
+ if ((!EDITSTATEPTR(wndPtr)) && (msg != WM_CREATE))
+ return DefWindowProc16(hwnd, msg, wParam, lParam);
+
switch (msg) {
case EM_CANUNDO:
DPRINTF_EDIT_MSG("EM_CANUNDO");
@@ -504,8 +507,8 @@
char *text = EDIT_GetPasswordPointer(wndPtr);
int ww = EDIT_GetWndWidth(wndPtr);
HDC32 hdc;
- HFONT hFont;
- HFONT oldFont = 0;
+ HFONT16 hFont;
+ HFONT16 oldFont = 0;
char *start, *cp;
int prev, next;
int width;
@@ -513,7 +516,7 @@
LINE_END ending;
hdc = GetDC32(wndPtr->hwndSelf);
- hFont = (HFONT)EDIT_WM_GetFont(wndPtr, 0, 0L);
+ hFont = (HFONT16)EDIT_WM_GetFont(wndPtr, 0, 0L);
if (hFont)
oldFont = SelectObject(hdc, hFont);
@@ -1442,15 +1445,15 @@
char *text = EDIT_GetPasswordPointer(wndPtr);
INT ret;
HDC32 hdc;
- HFONT hFont;
- HFONT oldFont = 0;
+ HFONT16 hFont;
+ HFONT16 oldFont = 0;
UINT lc = (UINT)EDIT_EM_GetLineCount(wndPtr, 0, 0L);
UINT li = (UINT)EDIT_EM_LineIndex(wndPtr, line, 0L);
UINT ll = (UINT)EDIT_EM_LineLength(wndPtr, li, 0L);
UINT xoff = EDIT_GetXOffset(wndPtr);
hdc = GetDC32(wndPtr->hwndSelf);
- hFont = (HFONT)EDIT_WM_GetFont(wndPtr, 0, 0L);
+ hFont = (HFONT16)EDIT_WM_GetFont(wndPtr, 0, 0L);
if (hFont)
oldFont = SelectObject(hdc, hFont);
line = MAX(0, MIN(line, lc - 1));
@@ -2311,12 +2314,12 @@
*/
static LRESULT EDIT_WM_EraseBkGnd(WND *wndPtr, WPARAM wParam, LPARAM lParam)
{
- HBRUSH hBrush;
+ HBRUSH16 hBrush;
RECT16 rc;
- hBrush = (HBRUSH)EDIT_SEND_CTLCOLOR(wndPtr, wParam);
+ hBrush = (HBRUSH16)EDIT_SEND_CTLCOLOR(wndPtr, wParam);
if (!hBrush)
- hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH);
+ hBrush = (HBRUSH16)GetStockObject(WHITE_BRUSH);
GetClientRect16(wndPtr->hwndSelf, &rc);
IntersectClipRect((HDC)wParam, rc.left, rc.top, rc.right, rc.bottom);
@@ -2678,8 +2681,8 @@
UINT vlc = EDIT_GetVisibleLineCount(wndPtr);
UINT lc = (UINT)EDIT_EM_GetLineCount(wndPtr, 0, 0L);
HDC16 hdc;
- HFONT hFont;
- HFONT oldFont = 0;
+ HFONT16 hFont;
+ HFONT16 oldFont = 0;
RECT16 rc;
RECT16 rcLine;
RECT16 rcRgn;
@@ -2776,9 +2779,9 @@
EDITSTATE *es = EDITSTATEPTR(wndPtr);
LPARAM sel = EDIT_EM_GetSel(wndPtr, 0, 0L);
HDC32 hdc;
- HFONT oldFont = 0;
+ HFONT16 oldFont = 0;
- es->hFont = (HFONT)wParam;
+ es->hFont = (HFONT16)wParam;
hdc = GetDC32(wndPtr->hwndSelf);
if (es->hFont)
oldFont = SelectObject(hdc, es->hFont);
