Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:05:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to edit to fix:

Browse source 
-drawing lines while maintaining clip regions
-shutdown now works better. GlobalUnlock has the correct return codes.

svn path=/trunk/; revision=6392
This commit is contained in:
Mark Tempel 2003-10-21 01:35:05 +00:00
parent ecdcd538eb
commit 97ebaeae3c
2 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/lib/kernel32/mem/global.c
View file

@ -1,4 +1,4 @@
/* $Id: global.c,v 1.15 2003/10/14 01:44:39 mtempel Exp $ /* $Id: global.c,v 1.16 2003/10/21 01:35:05 mtempel Exp $
* *
* Win32 Global/Local heap functions (GlobalXXX, LocalXXX). * Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
* These functions included in Win32 for compatibility with 16 bit Windows * These functions included in Win32 for compatibility with 16 bit Windows
@ -584,23 +584,31 @@ GlobalUnlock(HGLOBAL hMem)
PGLOBAL_HANDLE phandle; PGLOBAL_HANDLE phandle;
BOOL locked; BOOL locked;
DPRINT("GlobalUnlock( 0x%lX )\n", (ULONG)hMem); DbgPrint("GlobalUnlock( 0x%lX )\n", (ULONG)hMem);
if(ISPOINTER(hMem)) if(ISPOINTER(hMem))
return TRUE; {
SetLastError(ERROR_NOT_LOCKED);
return FALSE;
}
HeapLock(GetProcessHeap()); HeapLock(GetProcessHeap());
phandle = HANDLE_TO_INTERN(hMem); phandle = HANDLE_TO_INTERN(hMem);
if(MAGIC_GLOBAL_USED == phandle->Magic) if(MAGIC_GLOBAL_USED == phandle->Magic)
{ {
if((GLOBAL_LOCK_MAX > phandle->LockCount) && if (0 >= phandle->LockCount)
(0 < phandle->LockCount) ) {
locked = FALSE;
SetLastError(ERROR_NOT_LOCKED);
}
else if (GLOBAL_LOCK_MAX > phandle->LockCount)
{
phandle->LockCount--; phandle->LockCount--;
locked = (0 == phandle->LockCount) ? TRUE : FALSE;
locked = (0 == phandle->LockCount) ? TRUE : FALSE; SetLastError(NO_ERROR);
}
} }
else else
{ {

22
reactos/lib/user32/controls/edit.c
View file

@ -298,7 +298,9 @@ LRESULT CALLBACK EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
const struct builtin_class_descr EDIT_builtin_class = const struct builtin_class_descr EDIT_builtin_class =
{ {
L"Edit", /* name */ L"Edit", /* name */
CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style */ CS_GLOBALCLASS | CS_DBLCLKS, /* style */
/*TODO: Fix ExtTextOut so that we can have the CS_PARENTDC style*/
/*CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC,*/ /* style */
(WNDPROC) EditWndProcW, /* procW */ (WNDPROC) EditWndProcW, /* procW */
sizeof(EDITSTATE *), /* extra */ sizeof(EDITSTATE *), /* extra */
(LPCWSTR) IDC_ARROW, /* cursor */ /* FIXME Wine uses IDC_ARROWA */ (LPCWSTR) IDC_ARROW, /* cursor */ /* FIXME Wine uses IDC_ARROWA */
@ -3492,25 +3494,32 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name)
static LRESULT EDIT_WM_Destroy(EDITSTATE *es) static LRESULT EDIT_WM_Destroy(EDITSTATE *es)
{ {
LINEDEF *pc, *pp; LINEDEF *pc, *pp;
DbgPrint("[edit] In EDIT_WM_Destroy\n");
if (es->hloc32W) { if (es->hloc32W) {
while (LocalUnlock(es->hloc32W)) ; while (LocalUnlock(es->hloc32W))
{
DbgPrint("[edit] spinning on LocalUnlock(es->hloc32W)\n");
}
LocalFree(es->hloc32W); LocalFree(es->hloc32W);
} }
if (es->hloc32A) { if (es->hloc32A) {
while (LocalUnlock(es->hloc32A)) ; while (LocalUnlock(es->hloc32A))
LocalFree(es->hloc32A); {
DbgPrint("[edit] spinning on LocalUnlock(es->hloc32A)\n");
}
LocalFree(es->hloc32A);
} }
pc = es->first_line_def; pc = es->first_line_def;
while (pc) while (pc)
{ {
DbgPrint("[edit] freeing line structures.\n");
pp = pc->next; pp = pc->next;
HeapFree(GetProcessHeap(), 0, pc); HeapFree(GetProcessHeap(), 0, pc);
pc = pp; pc = pp;
} }
SetWindowLongW( es->hwndSelf, 0, 0 ); SetWindowLongW( es->hwndSelf, 0, 0 );
HeapFree(GetProcessHeap(), 0, es); HeapFree(GetProcessHeap(), 0, es);
return 0; return 0;
@ -4209,6 +4218,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, WPARAM wParam)
if (!es->bEnableState) if (!es->bEnableState)
SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT));
GetClipBox(dc, &rcRgn); GetClipBox(dc, &rcRgn);
DbgPrint("[edit...WM_Paint] GetClipBox returns: Top: %d Left: %d Bottom: %d Right: %d\n", rcRgn.top, rcRgn.left, rcRgn.bottom, rcRgn.right);
if (es->style & ES_MULTILINE) { if (es->style & ES_MULTILINE) {
INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) { for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) {