Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[jimtabor] 45671: [Win32k] - If dc is window owned and not class owned do not set class if null pdce. Added debug prints to locate reentrancy issues due to a race condition. - Add more checks to find dead windows.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 16:42:08 2010 New Revision: 45671 URL: http://svn.reactos.org/svn/reactos?rev=45671&view=rev Log: [Win32k] - If dc is window owned and not class owned do not set class if null pdce. Added debug prints to locate reentrancy issues due to a race condition. - Add more checks to find dead windows. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Tue Feb 23 16:42:08 2010 @@ -48,6 +48,7 @@ #define DCX_DCPOWNED 0x00008000 #define DCX_NOCLIPCHILDREN 0x00080000 #define DCX_NORECOMPUTE 0x00100000 +#define DCX_INDESTROY 0x00400000 BOOL FASTCALL DCE_Cleanup(PDCE pDce); PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window, DCE_TYPE Type); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Feb 23 16:42:08 2010 @@ -238,7 +238,7 @@ * User32 macro NtUserShowCursor */ int UserShowCursor(BOOL bShow) { - PSYSTEM_CURSORINFO CurInfo = IntGetSysCursorInfo();; + PSYSTEM_CURSORINFO CurInfo = IntGetSysCursorInfo(); HDC hdcScreen; if (!(hdcScreen = IntGetScreenDC())) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Tue Feb 23 16:42:08 2010 @@ -92,7 +92,9 @@ (PreviousWnd == Wnd && ClipSiblings)) { CurrentSibling = CurrentWindow->spwndChild; - while (CurrentSibling != NULL && CurrentSibling != PreviousWindow) + while ( CurrentSibling != NULL && + CurrentSibling != PreviousWindow && + CurrentSibling->Wnd ) { CurrentSiblingWnd = CurrentSibling->Wnd; if ((CurrentSiblingWnd->style & WS_VISIBLE) && @@ -121,7 +123,7 @@ if (ClipChildren) { CurrentWindow = Window->spwndChild; - while (CurrentWindow) + while (CurrentWindow && CurrentWindow->Wnd) { CurrentWnd = CurrentWindow->Wnd; if ((CurrentWnd->style & WS_VISIBLE) && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Feb 23 16:42:08 2010 @@ -181,7 +181,7 @@ } else if (Dce->hrgnClip != NULL) { - REGION_FreeRgnByHandle(Dce->hrgnClip); + GDIOBJ_FreeObjByHandle(Dce->hrgnClip, GDI_OBJECT_TYPE_REGION|GDI_OBJECT_TYPE_SILENT); } Dce->hrgnClip = NULL; @@ -193,7 +193,7 @@ static INT FASTCALL DceReleaseDC(DCE* dce, BOOL EndPaint) { - if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_DCEEMPTY | DCX_DCEBUSY))) + if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_INDESTROY | DCX_DCEEMPTY | DCX_DCEBUSY))) { return 0; } @@ -573,6 +573,12 @@ } else if (ClipRegion != NULL) { + if (Dce->hrgnClip != NULL) + { + DPRINT1("Should not be called!!\n"); + GDIOBJ_FreeObjByHandle(Dce->hrgnClip, GDI_OBJECT_TYPE_REGION|GDI_OBJECT_TYPE_SILENT); + Dce->hrgnClip = NULL; + } Dce->hrgnClip = ClipRegion; } @@ -620,6 +626,8 @@ pLE = pdce->List.Flink; ret = CONTAINING_RECORD(pLE, DCE, List); + + pdce->DCXFlags |= DCX_INDESTROY; if (Force && !GDIOBJ_OwnedByCurrentProcess(pdce->hDC)) { @@ -638,9 +646,9 @@ if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE); - if (pdce->hrgnClip && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) - { - REGION_FreeRgnByHandle(pdce->hrgnClip); + if (pdce->hrgnClip && !(pdce->DCXFlags & DCX_KEEPCLIPRGN)) + { + GDIOBJ_FreeObjByHandle(pdce->hrgnClip, GDI_OBJECT_TYPE_REGION|GDI_OBJECT_TYPE_SILENT); pdce->hrgnClip = NULL; } @@ -673,7 +681,7 @@ if (DCECount <= 0) { - DPRINT1("No Entry!\n"); + DPRINT1("FreeWindowDCE No Entry! %d\n",DCECount); return; } @@ -681,8 +689,16 @@ pDCE = CONTAINING_RECORD(pLE, DCE, List); do { - if (!pDCE) break; - if (IsListEmpty(&pDCE->List)) break; + if (!pDCE) + { + DPRINT1("FreeWindowDCE No DCE Pointer!\n"); + break; + } + if (IsListEmpty(&pDCE->List)) + { + DPRINT1("FreeWindowDCE List is Empty!!!!\n"); + break; + } if ( pDCE->hwndCurrent == Window->hSelf && !(pDCE->DCXFlags & DCX_DCEEMPTY) ) { @@ -700,7 +716,10 @@ DPRINT("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %x \n", pDCE->hDC); if (!IntGdiSetDCOwnerEx( pDCE->hDC, GDI_OBJ_HMGR_NONE, FALSE)) - return; + { + DPRINT1("Fail Owner Switch hDC-> %x \n", pDCE->hDC); + break; + } /* Do not change owner so thread can clean up! */ } else if (Window->Wnd->pcls->style & CS_OWNDC) /* owned DCE*/ @@ -711,6 +730,7 @@ } else { + DPRINT1("Not POWNED or CLASSDC hwndCurrent -> %x \n", pDCE->hwndCurrent); ASSERT(FALSE); } } @@ -825,7 +845,7 @@ { if(!pDCE) break; if(pLE == &LEDce) break; - if (0 == (pDCE->DCXFlags & DCX_DCEEMPTY)) + if (0 == (pDCE->DCXFlags & (DCX_DCEEMPTY|DCX_INDESTROY))) { if (Window->hSelf == pDCE->hwndCurrent) { @@ -902,9 +922,12 @@ Dce = CONTAINING_RECORD(pLE, DCE, List); do { - if(Dce->hDC == hDc) - { - Ret = Dce->hwndCurrent; + if (Dce->hDC == hDc) + { + if (Dce->DCXFlags & DCX_INDESTROY) + Ret = NULL; + else + Ret = Dce->hwndCurrent; break; } pLE = Dce->List.Flink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Feb 23 16:42:08 2010 @@ -2057,9 +2057,7 @@ } else if ( Wnd->pcls->style & CS_OWNDC) { /* Allocate a DCE for this window. */ - PDCE pDce = DceAllocDCE(Window, DCE_WINDOW_DC); - if (!Wnd->pcls->pdce) - Wnd->pcls->pdce = pDce; + DceAllocDCE(Window, DCE_WINDOW_DC); } Pos.x = x;

14 years, 6 months

[jimtabor] 45670: [User32] - Remove 16 bit'isms. Added back removed code and commented it out with added notes. - Jason Edmeades : Combo should preselect all text on first WM_SETFOCUS. - Kusanagi Kouichi : Consolidate empty string. - Alexandre Julliard : Don' t forward WM_SETCURSOR to the desktop window. Modified. - Dmitry Timoshkov : In a DLGTEMPLATEEX resource dialog version goes before signature. - Due to truck freeze, there might have slipped in miscellaneous patches.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 16:28:45 2010 New Revision: 45670 URL: http://svn.reactos.org/svn/reactos?rev=45670&view=rev Log: [User32] - Remove 16 bit'isms. Added back removed code and commented it out with added notes. - Jason Edmeades : Combo should preselect all text on first WM_SETFOCUS. - Kusanagi Kouichi : Consolidate empty string. - Alexandre Julliard : Don' t forward WM_SETCURSOR to the desktop window. Modified. - Dmitry Timoshkov : In a DLGTEMPLATEEX resource dialog version goes before signature. - Due to truck freeze, there might have slipped in miscellaneous patches. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Tue Feb 23 16:28:45 2010 @@ -1921,10 +1921,16 @@ case WM_GETFONT: return (LRESULT)lphc->hFont; case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) - SetFocus( lphc->hWndEdit ); - else - COMBO_SetFocus( lphc ); + if( lphc->wState & CBF_EDIT ) { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if( !(lphc->wState & CBF_BEENFOCUSED) ) { + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; + } + } + else + COMBO_SetFocus( lphc ); return TRUE; case WM_KILLFOCUS: { @@ -2047,11 +2053,6 @@ /* Combo messages */ -#ifndef __REACTOS__ - case CB_ADDSTRING16: - if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_ADDSTRING: if( unicode ) { @@ -2082,12 +2083,6 @@ HeapFree(GetProcessHeap(), 0, string); return ret; } -#ifndef __REACTOS__ - case CB_INSERTSTRING16: - wParam = (INT)(INT16)wParam; - if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_INSERTSTRING: if( unicode ) { @@ -2106,57 +2101,23 @@ return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); } -#ifndef __REACTOS__ - case CB_DELETESTRING16: -#endif case CB_DELETESTRING: return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); -#ifndef __REACTOS__ - case CB_SELECTSTRING16: - wParam = (INT)(INT16)wParam; - if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_SELECTSTRING: return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); -#ifndef __REACTOS__ - case CB_FINDSTRING16: - wParam = (INT)(INT16)wParam; - if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_FINDSTRING: return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); -#ifndef __REACTOS__ - case CB_FINDSTRINGEXACT16: - wParam = (INT)(INT16)wParam; - if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_FINDSTRINGEXACT: return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); -#ifndef __REACTOS__ - case CB_SETITEMHEIGHT16: - wParam = (INT)(INT16)wParam; /* signed integer */ - /* fall through */ -#endif case CB_SETITEMHEIGHT: return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); -#ifndef __REACTOS__ - case CB_GETITEMHEIGHT16: - wParam = (INT)(INT16)wParam; - /* fall through */ -#endif case CB_GETITEMHEIGHT: if( (INT)wParam >= 0 ) /* listbox item */ return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); return CBGetTextAreaHeight(hwnd, lphc); -#ifndef __REACTOS__ - case CB_RESETCONTENT16: -#endif case CB_RESETCONTENT: SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) ) @@ -2187,40 +2148,15 @@ if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam; return CB_ERR; -#ifndef __REACTOS__ - case CB_GETDROPPEDCONTROLRECT16: - lParam = (LPARAM)MapSL(lParam); - if( lParam ) - { - RECT r; - RECT16 *r16 = (RECT16 *)lParam; - CBGetDroppedControlRect( lphc, &r ); - r16->left = r.left; - r16->top = r.top; - r16->right = r.right; - r16->bottom = r.bottom; - } - return CB_OKAY; -#endif case CB_GETDROPPEDCONTROLRECT: if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); return CB_OKAY; -#ifndef __REACTOS__ - case CB_GETDROPPEDSTATE16: -#endif case CB_GETDROPPEDSTATE: return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE; -#ifndef __REACTOS__ - case CB_DIR16: - return SendMessageA(lphc->hWndLBox, LB_DIR16, wParam, lParam); -#endif case CB_DIR: return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); -#ifndef __REACTOS__ - case CB_SHOWDROPDOWN16: -#endif case CB_SHOWDROPDOWN: if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { @@ -2234,21 +2170,10 @@ CBRollUp( lphc, FALSE, TRUE ); } return TRUE; -#ifndef __REACTOS__ - case CB_GETCOUNT16: -#endif case CB_GETCOUNT: return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); -#ifndef __REACTOS__ - case CB_GETCURSEL16: -#endif case CB_GETCURSEL: return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); -#ifndef __REACTOS__ - case CB_SETCURSEL16: - wParam = (INT)(INT16)wParam; - /* fall through */ -#endif case CB_SETCURSEL: lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); if( lParam >= 0 ) @@ -2261,58 +2186,26 @@ InvalidateRect(lphc->self, &lphc->textRect, TRUE); lphc->wState &= ~CBF_SELCHANGE; return lParam; -#ifndef __REACTOS__ - case CB_GETLBTEXT16: - wParam = (INT)(INT16)wParam; - lParam = (LPARAM)MapSL(lParam); - /* fall through */ -#endif case CB_GETLBTEXT: return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); -#ifndef __REACTOS__ - case CB_GETLBTEXTLEN16: - wParam = (INT)(INT16)wParam; - /* fall through */ -#endif case CB_GETLBTEXTLEN: return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); -#ifndef __REACTOS__ - case CB_GETITEMDATA16: - wParam = (INT)(INT16)wParam; - /* fall through */ -#endif case CB_GETITEMDATA: return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); -#ifndef __REACTOS__ - case CB_SETITEMDATA16: - wParam = (INT)(INT16)wParam; - /* fall through */ -#endif case CB_SETITEMDATA: return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); -#ifndef __REACTOS__ - case CB_GETEDITSEL16: - wParam = lParam = 0; /* just in case */ - /* fall through */ -#endif case CB_GETEDITSEL: /* Edit checks passed parameters itself */ if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); return CB_ERR; -#ifndef __REACTOS__ - case CB_SETEDITSEL16: -#endif case CB_SETEDITSEL: if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_SETSEL, (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) ); return CB_ERR; -#ifndef __REACTOS__ - case CB_SETEXTENDEDUI16: -#endif case CB_SETEXTENDEDUI: if( CB_GETTYPE(lphc) == CBS_SIMPLE ) return CB_ERR; @@ -2320,9 +2213,6 @@ lphc->wState |= CBF_EUI; else lphc->wState &= ~CBF_EUI; return CB_OKAY; -#ifndef __REACTOS__ - case CB_GETEXTENDEDUI16: -#endif case CB_GETEXTENDEDUI: return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Tue Feb 23 16:28:45 2010 @@ -116,9 +116,6 @@ and just line width for single line controls */ INT region_posx; /* Position of cursor relative to region: */ INT region_posy; /* -1: to left, 0: within, 1: to right */ -#ifndef __REACTOS__ - EDITWORDBREAKPROC16 word_break_proc16; -#endif void *word_break_proc; /* 32-bit word break proc: ANSI or Unicode */ INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -137,10 +134,6 @@ LPINT tabs; LINEDEF *first_line_def; /* linked list of (soft) linebreaks */ HLOCAL hloc32W; /* our unicode local memory block */ -#ifndef __REACTOS__ - HLOCAL16 hloc16; /* alias for 16-bit control receiving EM_GETHANDLE16 - or EM_SETHANDLE16 */ -#endif HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ /* @@ -164,6 +157,7 @@ (LPARAM)(es->hwndSelf)); \ } while(0) +static const WCHAR empty_stringW[] = {0}; /********************************************************************* * @@ -325,32 +319,7 @@ { INT ret; -#ifndef __REACTOS__ - if (es->word_break_proc16) { - HGLOBAL16 hglob16; - SEGPTR segptr; - INT countA; - WORD args[5]; - DWORD result; - - countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); - hglob16 = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, countA); - segptr = WOWGlobalLock16(hglob16); - WideCharToMultiByte(CP_ACP, 0, es->text + start, count, MapSL(segptr), countA, NULL, NULL); - args[4] = SELECTOROF(segptr); - args[3] = OFFSETOF(segptr); - args[2] = index; - args[1] = countA; - args[0] = action; - WOWCallback16Ex((DWORD)es->word_break_proc16, WCB16_PASCAL, sizeof(args), args, &result); - ret = LOWORD(result); - GlobalUnlock16(hglob16); - GlobalFree16(hglob16); - } - else if (es->word_break_proc) -#else - if (es->word_break_proc) -#endif + if (es->word_break_proc) { if(es->is_unicode) { @@ -368,8 +337,7 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); - if (textA == NULL) - return 0; + if (textA == NULL) return 0; WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); @@ -1114,33 +1082,15 @@ } /********************************************************************* - * - * EDIT_LockBuffer - * - * This acts as a LocalLock16(), but it locks only once. This way - * you can call it whenever you like, without unlocking. - * - * Initially the edit control allocates a HLOCAL32 buffer - * (32 bit linear memory handler). However, 16 bit application - * might send an EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF - * handler). From that moment on we have to keep using this 16 bit memory - * handler, because it is supposed to be valid at all times after EM_GETHANDLE. - * What we do is create a HLOCAL16 buffer, copy the text, and do pointer - * conversion. + * EDIT_LockBuffer * */ static void EDIT_LockBuffer(EDITSTATE *es) { -#ifndef __REACTOS__ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); -#endif if (!es->text) { - CHAR *textA = NULL; + + CHAR *textA = NULL; // ReactOS Hacked! UINT countA = 0; -#ifndef __REACTOS__ - BOOL _16bit = FALSE; -#endif if(es->hloc32W) { @@ -1150,18 +1100,6 @@ textA = LocalLock(es->hloc32A); countA = strlen(textA) + 1; } -#ifndef __REACTOS__ - else if(es->hloc16) - { - HANDLE16 oldDS = stack16->ds; - TRACE("Synchronizing with 16-bit ANSI buffer\n"); - stack16->ds = hInstance; - textA = MapSL(LocalLock16(es->hloc16)); - stack16->ds = oldDS; - countA = strlen(textA) + 1; - _16bit = TRUE; - } -#endif } else { ERR("no buffer ... please report\n"); @@ -1188,24 +1126,12 @@ WARN("FAILED! Will synchronize partially\n"); } } - /*TRACE("Locking 32-bit UNICODE buffer\n");*/ es->text = LocalLock(es->hloc32W); - if(textA) { MultiByteToWideChar(CP_ACP, 0, textA, countA, es->text, es->buffer_size + 1); -#ifndef __REACTOS__ - if(_16bit) - { - HANDLE16 oldDS = stack16->ds; - stack16->ds = hInstance; - LocalUnlock16(es->hloc16); - stack16->ds = oldDS; - } - else -#endif - LocalUnlock(es->hloc32A); + LocalUnlock(es->hloc32A); } } if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); @@ -1239,13 +1165,9 @@ if (force || (es->lock_count == 1)) { if (es->hloc32W) { - CHAR *textA = NULL; + CHAR *textA = NULL; // ReactOS hacked! UINT countA = 0; UINT countW = get_text_length(es) + 1; -#ifndef __REACTOS__ - STACK16FRAME* stack16 = NULL; - HANDLE16 oldDS = 0; -#endif if(es->hloc32A) { @@ -1270,52 +1192,13 @@ } textA = LocalLock(es->hloc32A); } -#ifndef __REACTOS__ - else if(es->hloc16) - { - UINT countA_new = WideCharToMultiByte(CP_ACP, 0, es->text, countW, NULL, 0, NULL, NULL); - - TRACE("Synchronizing with 16-bit ANSI buffer\n"); - TRACE("%d WCHARs translated to %d bytes\n", countW, countA_new); - - stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - oldDS = stack16->ds; - stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - - countA = LocalSize16(es->hloc16); - if(countA_new > countA) - { - HLOCAL16 hloc16_new; - UINT alloc_size = ROUND_TO_GROW(countA_new); - TRACE("Resizing 16-bit ANSI buffer from %d to %d bytes\n", countA, alloc_size); - hloc16_new = LocalReAlloc16(es->hloc16, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); - if(hloc16_new) - { - es->hloc16 = hloc16_new; - countA = LocalSize16(hloc16_new); - TRACE("Real new size %d bytes\n", countA); - } - else - WARN("FAILED! Will synchronize partially\n"); - } - textA = MapSL(LocalLock16(es->hloc16)); - } -#endif if(textA) { WideCharToMultiByte(CP_ACP, 0, es->text, countW, textA, countA, NULL, NULL); -#ifndef __REACTOS__ - if(stack16) - LocalUnlock16(es->hloc16); - else -#endif - LocalUnlock(es->hloc32A); - } - -#ifndef __REACTOS__ - if (stack16) stack16->ds = oldDS; -#endif + LocalUnlock(es->hloc32A); + } + LocalUnlock(es->hloc32W); es->text = NULL; } @@ -1771,11 +1654,7 @@ if(dy) EDIT_EM_LineScroll(es, 0, dy); } -#ifdef __REACTOS__ return MAKELONG((SHORT)dy, (BOOL)TRUE); -#else - return MAKELONG((INT16)dy, (BOOL16)TRUE); -#endif } @@ -2426,77 +2305,6 @@ TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } - - -#ifndef __REACTOS__ -/********************************************************************* - * - * EM_GETHANDLE16 - * - * Hopefully this won't fire back at us. - * We always start with a buffer in 32 bit linear memory. - * However, with this message a 16 bit application requests - * a handle of 16 bit local heap memory, where it expects to find - * the text. - * It's a pitty that from this moment on we have to use this - * local heap, because applications may rely on the handle - * in the future. - * - * In this function we'll try to switch to local heap. - */ -static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) -{ - CHAR *textA; - UINT countA, alloc_size; - STACK16FRAME* stack16; - HANDLE16 oldDS; - - if (!(es->style & ES_MULTILINE)) - return 0; - - if (es->hloc16) - return es->hloc16; - - stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - oldDS = stack16->ds; - stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - - if (!LocalHeapSize16()) { - - if (!LocalInit16(stack16->ds, 0, GlobalSize16(stack16->ds))) { - ERR("could not initialize local heap\n"); - goto done; - } - TRACE("local heap initialized\n"); - } - - countA = WideCharToMultiByte(CP_ACP, 0, es->text, -1, NULL, 0, NULL, NULL); - alloc_size = ROUND_TO_GROW(countA); - - TRACE("Allocating 16-bit ANSI alias buffer\n"); - if (!(es->hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { - ERR("could not allocate new 16 bit buffer\n"); - goto done; - } - - if (!(textA = MapSL(LocalLock16( es->hloc16)))) { - ERR("could not lock new 16 bit buffer\n"); - LocalFree16(es->hloc16); - es->hloc16 = 0; - goto done; - } - - WideCharToMultiByte(CP_ACP, 0, es->text, -1, textA, countA, NULL, NULL); - LocalUnlock16(es->hloc16); - es->flags |= EF_APP_HAS_HANDLE; - - TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LocalSize16(es->hloc16)); - -done: - stack16->ds = oldDS; - return es->hloc16; -} -#endif /********************************************************************* @@ -2791,19 +2599,6 @@ EDIT_UnlockBuffer(es, TRUE); -#ifndef __REACTOS__ - if(es->hloc16) - { - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - - stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - LocalFree16(es->hloc16); - stack16->ds = oldDS; - es->hloc16 = 0; - } -#endif - if(es->is_unicode) { if(es->hloc32A) @@ -2856,80 +2651,6 @@ /* force scroll info update */ EDIT_UpdateScrollInfo(es); } - - -#ifndef __REACTOS__ -/********************************************************************* - * - * EM_SETHANDLE16 - * - * FIXME: ES_LOWERCASE, ES_UPPERCASE, ES_OEMCONVERT, ES_NUMBER ??? - * - */ -static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) -{ - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - HANDLE16 oldDS = stack16->ds; - INT countW, countA; - HLOCAL hloc32W_new; - WCHAR *textW; - CHAR *textA; - - if (!(es->style & ES_MULTILINE)) - return; - - if (!hloc) { - WARN("called with NULL handle\n"); - return; - } - - EDIT_UnlockBuffer(es, TRUE); - - if(es->hloc32A) - { - LocalFree(es->hloc32A); - es->hloc32A = NULL; - } - - stack16->ds = hInstance; - countA = LocalSize16(hloc); - textA = MapSL(LocalLock16(hloc)); - countW = MultiByteToWideChar(CP_ACP, 0, textA, countA, NULL, 0); - if(!(hloc32W_new = LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT, countW * sizeof(WCHAR)))) - { - ERR("Could not allocate new unicode buffer\n"); - return; - } - textW = LocalLock(hloc32W_new); - MultiByteToWideChar(CP_ACP, 0, textA, countA, textW, countW); - LocalUnlock(hloc32W_new); - LocalUnlock16(hloc); - stack16->ds = oldDS; - - if(es->hloc32W) - LocalFree(es->hloc32W); - - es->hloc32W = hloc32W_new; - es->hloc16 = hloc; - - es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - - es->flags |= EF_APP_HAS_HANDLE; - EDIT_LockBuffer(es); - - es->x_offset = es->y_offset = 0; - es->selection_start = es->selection_end = 0; - EDIT_EM_EmptyUndoBuffer(es); - es->flags &= ~EF_MODIFIED; - es->flags &= ~EF_UPDATE; - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - EDIT_EM_ScrollCaret(es); - /* force scroll info update */ - EDIT_UpdateScrollInfo(es); -} -#endif /********************************************************************* @@ -3086,31 +2807,6 @@ } -#ifndef __REACTOS__ -/********************************************************************* - * - * EM_SETTABSTOPS16 - * - */ -static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, const INT16 *tabs) -{ - if (!(es->style & ES_MULTILINE)) - return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); - es->tabs_count = count; - if (!count) - es->tabs = NULL; - else { - INT i; - es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); - for (i = 0 ; i < count ; i++) - es->tabs[i] = *tabs++; - } - return TRUE; -} -#endif - - /********************************************************************* * * EM_SETWORDBREAKPROC @@ -3122,36 +2818,12 @@ return; es->word_break_proc = wbp; -#ifndef __REACTOS__ - es->word_break_proc16 = NULL; -#endif if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); } } - - -#ifndef __REACTOS__ -/********************************************************************* - * - * EM_SETWORDBREAKPROC16 - * - */ -static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) -{ - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } -} -#endif /********************************************************************* @@ -3230,8 +2902,7 @@ } else if (es->style & ES_PASSWORD) { /* clear selected text in password edit box even with empty clipboard */ - const WCHAR empty_strW[] = { 0 }; - EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); } CloseClipboard(); } @@ -3273,8 +2944,6 @@ */ static inline void EDIT_WM_Clear(EDITSTATE *es) { - static const WCHAR empty_stringW[] = {0}; - /* Protect read-only edit control from modification */ if(es->style & ES_READONLY) return; @@ -3380,6 +3049,43 @@ return 1; } +#if 0 // Removed see Revision 43925 comments. +/********************************************************************* + * + * WM_COMMAND + * + */ +static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) +{ + if (code || control) + return; + + switch (id) { + case EM_UNDO: + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); + break; + case WM_CUT: + SendMessageW(es->hwndSelf, WM_CUT, 0, 0); + break; + case WM_COPY: + SendMessageW(es->hwndSelf, WM_COPY, 0, 0); + break; + case WM_PASTE: + SendMessageW(es->hwndSelf, WM_PASTE, 0, 0); + break; + case WM_CLEAR: + SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); + break; + case EM_SETSEL: + EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); + EDIT_EM_ScrollCaret(es); + break; + default: + ERR("unknown menu item, please report\n"); + break; + } +} +#endif /********************************************************************* * @@ -3435,7 +3141,7 @@ } selectedItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); - + // Added see Revision 43925 comments. switch (selectedItem) { case EM_UNDO: SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); @@ -4020,7 +3726,6 @@ } else { - static const WCHAR empty_stringW[] = {0}; TRACE("<NULL>\n"); EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE); } @@ -4249,9 +3954,6 @@ * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ -#ifndef __REACTOS__ - case EM_GETTHUMB16: -#endif { LRESULT ret; if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) @@ -4265,12 +3967,10 @@ TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } -#ifndef __REACTOS__ - case EM_LINESCROLL16: - TRACE("EM_LINESCROLL16\n"); - dx = pos; - break; -#endif + case EM_LINESCROLL: + TRACE("EM_LINESCROLL16\n"); + dx = pos; + break; default: ERR("undocumented WM_HSCROLL action %d (0x%04x), please report\n", @@ -4377,9 +4077,6 @@ * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ -#ifndef __REACTOS__ - case EM_GETTHUMB16: -#endif { LRESULT ret; if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) @@ -4393,12 +4090,10 @@ TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } -#ifndef __REACTOS__ - case EM_LINESCROLL16: + case EM_LINESCROLL: TRACE("EM_LINESCROLL16 %d\n", pos); dy = pos; break; -#endif default: ERR("undocumented WM_VSCROLL action %d (0x%04x), please report\n", @@ -4422,14 +4117,10 @@ */ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) { -#ifdef __REACTOS__ return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB, 0), - EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); -#else - return MAKELONG(EDIT_WM_VScroll(es, EM_GETTHUMB16, 0), - EDIT_WM_HScroll(es, EM_GETTHUMB16, 0)); -#endif -} + EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); +} + /******************************************************************** * @@ -4549,7 +4240,6 @@ if (es->composition_len == 0 && es->selection_start != es->selection_end) { - static const WCHAR empty_stringW[] = {0}; EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); es->composition_start = es->selection_end; } @@ -4642,16 +4332,16 @@ alloc_size = ROUND_TO_GROW((es->buffer_size + 1) * sizeof(WCHAR)); if(!(es->hloc32W = LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) - return FALSE; + goto cleanup; es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; if (!(es->undo_text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (es->buffer_size + 1) * sizeof(WCHAR)))) - return FALSE; + goto cleanup; es->undo_buffer_size = es->buffer_size; if (es->style & ES_MULTILINE) if (!(es->first_line_def = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)))) - return FALSE; + goto cleanup; es->line_count = 1; /* @@ -4671,6 +4361,14 @@ SetWindowLongPtrW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); return TRUE; + +cleanup: + SetWindowLongPtrW(es->hwndSelf, 0, 0); + HeapFree(GetProcessHeap(), 0, es->first_line_def); + HeapFree(GetProcessHeap(), 0, es->undo_text); + if (es->hloc32W) LocalFree(es->hloc32W); + HeapFree(GetProcessHeap(), 0, es); + return FALSE; } @@ -4739,18 +4437,6 @@ if (es->hloc32A) { LocalFree(es->hloc32A); } -#ifndef __REACTOS__ - if (es->hloc16) { - STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); - HANDLE16 oldDS = stack16->ds; - - stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - while (LocalUnlock16(es->hloc16)) ; - LocalFree16(es->hloc16); - stack16->ds = oldDS; - } -#endif - pc = es->first_line_def; while (pc) { @@ -4760,6 +4446,7 @@ } SetWindowLongPtrW( es->hwndSelf, 0, 0 ); + HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es); return 0; @@ -4780,12 +4467,6 @@ * * The messages are in the order of the actual integer values * (which can be found in include/windows.h) - * Wherever possible the 16 bit versions are converted to - * the 32 bit ones, so that we can 'fall through' to the - * helper functions. These are mostly 32 bit (with a few - * exceptions, clearly indicated by a '16' extension to their - * names). - * */ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) @@ -4801,64 +4482,21 @@ if (es && (msg != WM_DESTROY)) EDIT_LockBuffer(es); switch (msg) { -#ifndef __REACTOS__ - case EM_GETSEL16: - wParam = 0; - lParam = 0; - /* fall through */ -#endif case EM_GETSEL: result = EDIT_EM_GetSel(es, (PUINT)wParam, (PUINT)lParam); break; -#ifndef __REACTOS__ - case EM_SETSEL16: - if ((short)LOWORD(lParam) == -1) - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); - else - EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE); - if (!wParam) - EDIT_EM_ScrollCaret(es); - result = 1; - break; -#endif case EM_SETSEL: EDIT_EM_SetSel(es, wParam, lParam, FALSE); EDIT_EM_ScrollCaret(es); result = 1; break; -#ifndef __REACTOS__ - case EM_GETRECT16: - if (lParam) - { - RECT16 *r16 = MapSL(lParam); - r16->left = es->format_rect.left; - r16->top = es->format_rect.top; - r16->right = es->format_rect.right; - r16->bottom = es->format_rect.bottom; - } - break; -#endif case EM_GETRECT: if (lParam) CopyRect((LPRECT)lParam, &es->format_rect); break; -#ifndef __REACTOS__ - case EM_SETRECT16: - if ((es->style & ES_MULTILINE) && lParam) { - RECT rc; - RECT16 *r16 = MapSL(lParam); - rc.left = r16->left; - rc.top = r16->top; - rc.right = r16->right; - rc.bottom = r16->bottom; - EDIT_SetRectNP(es, &rc); - EDIT_UpdateText(es, NULL, TRUE); - } - break; -#endif case EM_SETRECT: if ((es->style & ES_MULTILINE) && lParam) { EDIT_SetRectNP(es, (LPRECT)lParam); @@ -4866,59 +4504,28 @@ } break; -#ifndef __REACTOS__ - case EM_SETRECTNP16: - if ((es->style & ES_MULTILINE) && lParam) { - RECT rc; - RECT16 *r16 = MapSL(lParam); - rc.left = r16->left; - rc.top = r16->top; - rc.right = r16->right; - rc.bottom = r16->bottom; - EDIT_SetRectNP(es, &rc); - } - break; -#endif case EM_SETRECTNP: if ((es->style & ES_MULTILINE) && lParam) EDIT_SetRectNP(es, (LPRECT)lParam); break; -#ifndef __REACTOS__ - case EM_SCROLL16: -#endif case EM_SCROLL: result = EDIT_EM_Scroll(es, (INT)wParam); break; -#ifndef __REACTOS__ - case EM_LINESCROLL16: - wParam = (WPARAM)(INT)(SHORT)HIWORD(lParam); - lParam = (LPARAM)(INT)(SHORT)LOWORD(lParam); - /* fall through */ -#endif case EM_LINESCROLL: result = (LRESULT)EDIT_EM_LineScroll(es, (INT)wParam, (INT)lParam); break; -#ifndef __REACTOS__ - case EM_SCROLLCARET16: -#endif case EM_SCROLLCARET: EDIT_EM_ScrollCaret(es); result = 1; break; -#ifndef __REACTOS__ - case EM_GETMODIFY16: -#endif case EM_GETMODIFY: result = ((es->flags & EF_MODIFIED) != 0); break; -#ifndef __REACTOS__ - case EM_SETMODIFY16: -#endif case EM_SETMODIFY: if (wParam) es->flags |= EF_MODIFIED; @@ -4926,44 +4533,22 @@ es->flags &= ~(EF_MODIFIED | EF_UPDATE); /* reset pending updates */ break; -#ifndef __REACTOS__ - case EM_GETLINECOUNT16: -#endif case EM_GETLINECOUNT: result = (es->style & ES_MULTILINE) ? es->line_count : 1; break; -#ifndef __REACTOS__ - case EM_LINEINDEX16: - if ((INT16)wParam == -1) - wParam = (WPARAM)-1; - /* fall through */ -#endif case EM_LINEINDEX: result = (LRESULT)EDIT_EM_LineIndex(es, (INT)wParam); break; -#ifndef __REACTOS__ - case EM_SETHANDLE16: - EDIT_EM_SetHandle16(es, (HLOCAL16)wParam); - break; -#endif case EM_SETHANDLE: EDIT_EM_SetHandle(es, (HLOCAL)wParam); break; -#ifndef __REACTOS__ - case EM_GETHANDLE16: - result = (LRESULT)EDIT_EM_GetHandle16(es); - break; -#endif case EM_GETHANDLE: result = (LRESULT)EDIT_EM_GetHandle(es); break; -#ifndef __REACTOS__ - case EM_GETTHUMB16: -#endif case EM_GETTHUMB: result = EDIT_EM_GetThumb(es); break; @@ -4981,19 +4566,10 @@ result = DefWindowProcW(hwnd, msg, wParam, lParam); break; -#ifndef __REACTOS__ - case EM_LINELENGTH16: -#endif case EM_LINELENGTH: result = (LRESULT)EDIT_EM_LineLength(es, (INT)wParam); break; -#ifndef __REACTOS__ - case EM_REPLACESEL16: - lParam = (LPARAM)MapSL(lParam); - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ -#endif case EM_REPLACESEL: { LPWSTR textW; @@ -5016,66 +4592,35 @@ break; } -#ifndef __REACTOS__ - case EM_GETLINE16: - lParam = (LPARAM)MapSL(lParam); - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ -#endif case EM_GETLINE: result = (LRESULT)EDIT_EM_GetLine(es, (INT)wParam, (LPWSTR)lParam, unicode); break; -#ifndef __REACTOS__ - case EM_LIMITTEXT16: -#endif case EM_SETLIMITTEXT: EDIT_EM_SetLimitText(es, wParam); break; -#ifndef __REACTOS__ - case EM_CANUNDO16: -#endif case EM_CANUNDO: result = (LRESULT)EDIT_EM_CanUndo(es); break; -#ifndef __REACTOS__ - case EM_UNDO16: -#endif case EM_UNDO: case WM_UNDO: result = (LRESULT)EDIT_EM_Undo(es); break; -#ifndef __REACTOS__ - case EM_FMTLINES16: -#endif case EM_FMTLINES: result = (LRESULT)EDIT_EM_FmtLines(es, (BOOL)wParam); break; -#ifndef __REACTOS__ - case EM_LINEFROMCHAR16: -#endif case EM_LINEFROMCHAR: result = (LRESULT)EDIT_EM_LineFromChar(es, (INT)wParam); break; -#ifndef __REACTOS__ - case EM_SETTABSTOPS16: - result = (LRESULT)EDIT_EM_SetTabStops16(es, (INT)wParam, MapSL(lParam)); - break; -#endif case EM_SETTABSTOPS: result = (LRESULT)EDIT_EM_SetTabStops(es, (INT)wParam, (LPINT)lParam); break; -#ifndef __REACTOS__ - case EM_SETPASSWORDCHAR16: - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ -#endif case EM_SETPASSWORDCHAR: { WCHAR charW = 0; @@ -5092,25 +4637,14 @@ break; } -#ifndef __REACTOS__ - case EM_EMPTYUNDOBUFFER16: -#endif case EM_EMPTYUNDOBUFFER: EDIT_EM_EmptyUndoBuffer(es); break; -#ifndef __REACTOS__ - case EM_GETFIRSTVISIBLELINE16: - result = es->y_offset; - break; -#endif case EM_GETFIRSTVISIBLELINE: result = (es->style & ES_MULTILINE) ? es->y_offset : es->x_offset; break; -#ifndef __REACTOS__ - case EM_SETREADONLY16: -#endif case EM_SETREADONLY: { DWORD old_style = es->style; @@ -5132,29 +4666,14 @@ break; } -#ifndef __REACTOS__ - case EM_SETWORDBREAKPROC16: - EDIT_EM_SetWordBreakProc16(es, (EDITWORDBREAKPROC16)lParam); - break; -#endif case EM_SETWORDBREAKPROC: EDIT_EM_SetWordBreakProc(es, (void *)lParam); break; -#ifndef __REACTOS__ - case EM_GETWORDBREAKPROC16: - result = (LRESULT)es->word_break_proc16; - break; -#endif case EM_GETWORDBREAKPROC: result = (LRESULT)es->word_break_proc; break; -#ifndef __REACTOS__ - case EM_GETPASSWORDCHAR16: - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ -#endif case EM_GETPASSWORDCHAR: { if(unicode) @@ -5168,8 +4687,6 @@ } break; } - - /* The following EM_xxx are new to win95 and don't exist for 16 bit */ case EM_SETMARGINS: EDIT_EM_SetMargins(es, (INT)wParam, LOWORD(lParam), HIWORD(lParam), TRUE); @@ -5289,8 +4806,12 @@ case WM_CLEAR: EDIT_WM_Clear(es); break; - - case WM_CONTEXTMENU: +#if 0 // Removed see Revision 43925 comments. + case WM_COMMAND: + EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); + break; +#endif + case WM_CONTEXTMENU: EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; @@ -5463,7 +4984,6 @@ case WM_IME_ENDCOMPOSITION: if (es->composition_len > 0) { - static const WCHAR empty_stringW[] = {0}; EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); es->selection_end = es->selection_start; es->composition_len= 0; Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Tue Feb 23 16:28:45 2010 @@ -74,6 +74,7 @@ #define CBF_SELCHANGE 0x0400 #define CBF_NOEDITNOTIFY 0x1000 #define CBF_NOLBSELECT 0x2000 /* do not change current selection */ +#define CBF_BEENFOCUSED 0x4000 /* has it ever had focus */ #define CBF_EUI 0x8000 /* combo state struct */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Feb 23 16:28:45 2010 @@ -1355,22 +1355,22 @@ if (Style & WS_CHILD) { + /* with the exception of the border around a resizable wnd, + * give the parent first chance to set the cursor */ if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT) { - BOOL bResult; + HWND parent = GetParent( hWnd ); if (bUnicode) { - bResult = SendMessageW(GetParent(hWnd), WM_SETCURSOR, - wParam, lParam); + if (parent != GetDesktopWindow() && + SendMessageW( parent, WM_SETCURSOR, wParam, lParam)) + return TRUE; } else { - bResult = SendMessageA(GetParent(hWnd), WM_SETCURSOR, - wParam, lParam); - } - if (bResult) - { - return(TRUE); + if (parent != GetDesktopWindow() && + SendMessageA( parent, WM_SETCURSOR, wParam, lParam)) + return TRUE; } } } Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue Feb 23 16:28:45 2010 @@ -580,10 +580,10 @@ WORD signature; WORD dlgver; + dlgver = GET_WORD(p); p++; signature = GET_WORD(p); p++; - dlgver = GET_WORD(p); p++; - - if (signature == 1 && dlgver == 0xffff) /* DIALOGEX resource */ + + if (dlgver == 1 && signature == 0xffff) /* DIALOGEX resource */ { result->dialogEx = TRUE; result->helpId = GET_DWORD(p); p += 2;

14 years, 6 months

[janderwald] 45669: [KSPROXY] - Fix file headers for Christoph - Add debug spam - IsEqualIID uses REFIID

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 23 16:25:59 2010 New Revision: 45669 URL: http://svn.reactos.org/svn/reactos?rev=45669&view=rev Log: [KSPROXY] - Fix file headers for Christoph - Add debug spam - IsEqualIID uses REFIID Modified: trunk/reactos/dll/directx/ksproxy/basicaudio.cpp trunk/reactos/dll/directx/ksproxy/classfactory.cpp trunk/reactos/dll/directx/ksproxy/datatype.cpp trunk/reactos/dll/directx/ksproxy/ksproxy.cpp trunk/reactos/dll/directx/ksproxy/precomp.h Modified: trunk/reactos/dll/directx/ksproxy/basicaudio.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/basica… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/basicaudio.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/basicaudio.cpp [iso-8859-1] Tue Feb 23 16:25:59 2010 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy - * FILE: dll/directx/ksproxy/cvpvbiconfig.cpp - * PURPOSE: CVPVBIConfig interface + * FILE: dll/directx/ksproxy/basicaudio.cpp + * PURPOSE: IBasicAudio interface * * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ Modified: trunk/reactos/dll/directx/ksproxy/classfactory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/classf… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/classfactory.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/classfactory.cpp [iso-8859-1] Tue Feb 23 16:25:59 2010 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy * FILE: dll/directx/ksproxy/classfactory.cpp - * PURPOSE: ClassFactory interface + * PURPOSE: IClassFactory interface * * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ @@ -67,7 +67,16 @@ REFIID riid, LPVOID *ppvObject) { + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + *ppvObject = NULL; + + StringFromCLSID(riid, &lpstr); + + swprintf(Buffer, L"riid %s", lpstr); + OutputDebugStringW(Buffer); + if ( m_IID == NULL || IsEqualCLSID(riid, *m_IID) || IsEqualCLSID(riid, IID_IUnknown)) { Modified: trunk/reactos/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/dataty… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Tue Feb 23 16:25:59 2010 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy - * FILE: dll/directx/ksproxy/ksproxy.c + * FILE: dll/directx/ksproxy/datatype.cpp * PURPOSE: IKsDataTypeHandler interface * * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Tue Feb 23 16:25:59 2010 @@ -299,7 +299,7 @@ for (i = 0; InterfaceTable[i].riid; i++) { - if (IsEqualIID(InterfaceTable[i].riid, rclsid)) + if (IsEqualIID(*InterfaceTable[i].riid, rclsid)) { pcf = CClassFactory_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); break; Modified: trunk/reactos/dll/directx/ksproxy/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/precom… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/precomp.h [iso-8859-1] Tue Feb 23 16:25:59 2010 @@ -17,7 +17,7 @@ #include <vpconfig.h> #include <setupapi.h> -#include <debug.h> +//#include <debug.h> typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);

14 years, 6 months

[mjmartin] 45668: [usb/usbehci] - Add back WorkItem code but use it for calling the hub drivers callback routine (telling hub driver it needs check port status). - Add missing break for case URB_FUNCTION_GET_STATUS_FROM_DEVICE. - RootHubInitNotification: BusContext is the Device Object not the Device Objects Extensions. - UsbEhci now receives URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER IN requests, which is where we want to be for informing hub driver which port a device has been connected.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Feb 23 12:20:15 2010 New Revision: 45668 URL: http://svn.reactos.org/svn/reactos?rev=45668&view=rev Log: [usb/usbehci] - Add back WorkItem code but use it for calling the hub drivers callback routine (telling hub driver it needs check port status). - Add missing break for case URB_FUNCTION_GET_STATUS_FROM_DEVICE. - RootHubInitNotification: BusContext is the Device Object not the Device Objects Extensions. - UsbEhci now receives URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER IN requests, which is where we want to be for informing hub driver which port a device has been connected. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Tue Feb 23 12:20:15 2010 @@ -14,6 +14,24 @@ //#include "ntstrsafe.h" VOID NTAPI +DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) +{ + PWORKITEM_DATA WorkItemData; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + + WorkItemData = (PWORKITEM_DATA)Context; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + if (PdoDeviceExtension->CallbackRoutine) + PdoDeviceExtension->CallbackRoutine(PdoDeviceExtension->CallbackContext); + else + DPRINT1("PdoDeviceExtension->CallbackRoutine is NULL!\n"); + + IoFreeWorkItem(WorkItemData->IoWorkItem); + ExFreePool(WorkItemData); +} + +VOID NTAPI EhciDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVOID SystemArgument2) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; @@ -42,6 +60,7 @@ /* Check for port change on this port */ if (tmp & 0x02) { + PWORKITEM_DATA WorkItemData = NULL; /* Connect or Disconnect? */ if (tmp & 0x01) { @@ -84,7 +103,14 @@ DPRINT("port tmp %x\n", tmp); GetDeviceDescriptor(FdoDeviceExtension, 0, 0, FALSE); PdoDeviceExtension->ChildDeviceCount++; - //PdoDeviceExtension->CallbackRoutine(PdoDeviceExtension->CallbackContext); + WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEM_DATA)); + if (!WorkItemData) ASSERT(FALSE); + WorkItemData->IoWorkItem = IoAllocateWorkItem(PdoDeviceExtension->DeviceObject); + WorkItemData->PdoDeviceExtension = PdoDeviceExtension; + IoQueueWorkItem(WorkItemData->IoWorkItem, + (PIO_WORKITEM_ROUTINE)DeviceArrivalWorkItem, + DelayedWorkQueue, + WorkItemData); } else { Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Tue Feb 23 12:20:15 2010 @@ -92,12 +92,24 @@ { case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { - /* We should not get here yet! */ - ASSERT(FALSE); + /* Are we suppose to only return on this request when a device is connected + or is it the RootHubInitNotification Callback */ + DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); + DPRINT1("--->TransferBufferLength %x\n",Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + DPRINT1("--->TransferBuffer %x\n",Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + DPRINT1("--->PipeHandle %x\n",Urb->UrbBulkOrInterruptTransfer.PipeHandle); + DPRINT1("--->TransferFlags %x\n", Urb->UrbBulkOrInterruptTransfer.TransferFlags); + /* FIXME */ + RtlZeroMemory(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1; + /* Turn off Irp handling as nothing is handled beyond this */ + DeviceExtension->HaltUrbHandling = TRUE; + break; } case URB_FUNCTION_GET_STATUS_FROM_DEVICE: { DPRINT1("Get Status from Device\n"); + break; } case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: { @@ -320,8 +332,6 @@ Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; Urb->UrbHeader.UsbdFlags = 0; - /* Stop handling the URBs now as its not coded yet */ - //DeviceExtension->HaltUrbHandling = TRUE; break; } default: @@ -420,3 +430,4 @@ KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); } + Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Tue Feb 23 12:20:15 2010 @@ -363,7 +363,7 @@ typedef struct _WORKITEM_DATA { PIO_WORKITEM IoWorkItem; - PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; PDEVICE_OBJECT PortDeviceObject; } WORKITEM_DATA, *PWORKITEM_DATA; @@ -419,4 +419,7 @@ VOID URBRequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); +VOID NTAPI +DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); + #endif Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Tue Feb 23 12:20:15 2010 @@ -188,7 +188,7 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension; DPRINT1("RootHubInitNotification %x, %x, %x\n", BusContext, CallbackContext, CallbackRoutine); - PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)BusContext; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; PdoDeviceExtension->CallbackContext = CallbackContext; PdoDeviceExtension->CallbackRoutine = CallbackRoutine; return STATUS_SUCCESS;

14 years, 6 months

[jimtabor] 45667: [Win32k|Gdi32] - Fix GdiBatch, the limit is for user space not system. Revert 45659.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 05:18:24 2010 New Revision: 45667 URL: http://svn.reactos.org/svn/reactos?rev=45667&view=rev Log: [Win32k|Gdi32] - Fix GdiBatch, the limit is for user space not system. Revert 45659. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Tue Feb 23 05:18:24 2010 @@ -104,7 +104,7 @@ FASTCALL DeleteRegion( HRGN hRgn ) { -#if 0 +//#if 0 PRGN_ATTR Rgn_Attr; if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && @@ -128,7 +128,7 @@ } } } -#endif +//#endif return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Tue Feb 23 05:18:24 2010 @@ -101,8 +101,9 @@ TextIntRealizeFont((HFONT) pgO->hgdiobj, NULL); pdcattr->ulDirty_ &= ~(DIRTY_CHARSET); } + case GdiBCDelRgn: + DPRINT("Delete Region Object!\n"); case GdiBCDelObj: - case GdiBCDelRgn: { PGDIBSOBJECT pgO = (PGDIBSOBJECT) pHdr; GreDeleteObject( pgO->hgdiobj ); @@ -146,8 +147,9 @@ HDC hDC = (HDC) pTeb->GdiTebBatch.HDC; /* If hDC is zero and the buffer fills up with delete objects we need - to run anyway. So, hard code to the system batch limit. */ - if ((hDC) || (GdiBatchCount >= GDI_BATCH_LIMIT)) + to run anyway. + */ + if (hDC || GdiBatchCount) { PCHAR pHdr = (PCHAR)&pTeb->GdiTebBatch.Buffer[0]; PDC pDC = NULL;

14 years, 6 months

[jimtabor] 45666: [Win32k] - Fix the new GetClipRgn clipping wine test for EqualRgn and clip region note.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 04:17:37 2010 New Revision: 45666 URL: http://svn.reactos.org/svn/reactos?rev=45666&view=rev Log: [Win32k] - Fix the new GetClipRgn clipping wine test for EqualRgn and clip region note. Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Tue Feb 23 04:17:37 2010 @@ -202,6 +202,7 @@ return ERROR; } + /* FIXME! Rao and Vis only! */ if (dc->prgnAPI) // APIRGN { hRgn = ((PROSRGNDATA)dc->prgnAPI)->BaseObject.hHmgr; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Feb 23 04:17:37 2010 @@ -3439,27 +3439,33 @@ return ERROR; } - if (rgn1->rdh.nCount != rgn2->rdh.nCount || - rgn1->rdh.nCount == 0 || - rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || - rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || - rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || - rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) - goto exit; + if ( rgn1->rdh.nCount != rgn2->rdh.nCount ) goto exit; + + if ( rgn1->rdh.nCount == 0 ) + { + bRet = TRUE; + goto exit; + } + + if ( rgn1->rdh.rcBound.left != rgn2->rdh.rcBound.left || + rgn1->rdh.rcBound.right != rgn2->rdh.rcBound.right || + rgn1->rdh.rcBound.top != rgn2->rdh.rcBound.top || + rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom ) + goto exit; tRect1 = rgn1->Buffer; tRect2 = rgn2->Buffer; if (!tRect1 || !tRect2) - goto exit; + goto exit; for (i=0; i < rgn1->rdh.nCount; i++) { - if (tRect1[i].left != tRect2[i].left || - tRect1[i].right != tRect2[i].right || - tRect1[i].top != tRect2[i].top || - tRect1[i].bottom != tRect2[i].bottom) - goto exit; + if ( tRect1[i].left != tRect2[i].left || + tRect1[i].right != tRect2[i].right || + tRect1[i].top != tRect2[i].top || + tRect1[i].bottom != tRect2[i].bottom ) + goto exit; } bRet = TRUE;

14 years, 6 months

[jimtabor] 45665: [User32] - ReactOS uses DCX_KEEPCLIPRGN to prevent the deletion of regions so user support can manage them. Comctl32 depends on this since it does not delete the regions after calling DefWindowProc.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 04:14:09 2010 New Revision: 45665 URL: http://svn.reactos.org/svn/reactos?rev=45665&view=rev Log: [User32] - ReactOS uses DCX_KEEPCLIPRGN to prevent the deletion of regions so user support can manage them. Comctl32 depends on this since it does not delete the regions after calling DefWindowProc. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Tue Feb 23 04:14:09 2010 @@ -489,6 +489,7 @@ } ReleaseDC(hWnd, hDC); + DeleteObject(hRgn); // We use DCX_KEEPCLIPRGN return 0; }

14 years, 6 months

[jimtabor] 45664: [Win32k] - Properly assign error code when a real status error occurred. - Free the non user event container for WaitForInputIdle.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 23 04:08:16 2010 New Revision: 45664 URL: http://svn.reactos.org/svn/reactos?rev=45664&view=rev Log: [Win32k] - Properly assign error code when a real status error occurred. - Free the non user event container for WaitForInputIdle. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Feb 23 04:08:16 2010 @@ -1053,9 +1053,11 @@ while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status ); - SetLastNtError(Status); - - DPRINT1("Exit co_IntWaitMessage on error!\n"); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DPRINT1("Exit co_IntWaitMessage on error!\n"); + } return FALSE; } @@ -2626,7 +2628,7 @@ WaitExit: if (W32Process->InputIdleEvent) { - EngDeleteEvent((PEVENT)W32Process->InputIdleEvent); + EngFreeMem((PVOID)W32Process->InputIdleEvent); W32Process->InputIdleEvent = NULL; } ObDereferenceObject(Process);

14 years, 6 months

[ekohl] 45663: Split the initial status code for drivers and services. You can easily test services by uncommenting '#define USE_SERVICE_STATUS_PENDING'.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 23 00:17:03 2010 New Revision: 45663 URL: http://svn.reactos.org/svn/reactos?rev=45663&view=rev Log: Split the initial status code for drivers and services. You can easily test services by uncommenting '#define USE_SERVICE_STATUS_PENDING'. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Feb 23 00:17:03 2010 @@ -17,6 +17,11 @@ #define NDEBUG #include <debug.h> +/* + * Uncomment the line below to start services + * using the SERVICE_START_PENDING state + */ +// #define USE_SERVICE_START_PENDING /* GLOBALS *******************************************************************/ @@ -1038,12 +1043,23 @@ /* Load driver */ dwError = ScmLoadDriver(Service); if (dwError == ERROR_SUCCESS) + { Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + Service->Status.dwCurrentState = SERVICE_RUNNING; + } } else { /* Start user-mode service */ dwError = ScmStartUserModeService(Service, argc, argv); + if (dwError == ERROR_SUCCESS) + { +#ifdef USE_SERVICE_START_PENDING + Service->Status.dwCurrentState = SERVICE_START_PENDING; +#else + Service->Status.dwCurrentState = SERVICE_RUNNING; +#endif + } } DPRINT("ScmStartService() done (Error %lu)\n", dwError); @@ -1054,7 +1070,6 @@ { Group->ServicesRunning = TRUE; } - Service->Status.dwCurrentState = SERVICE_RUNNING; } #if 0 else

14 years, 6 months

[cfinck] 45662: Put Vizzini's "csq.h" in the Public Domain with permission from the author: <sedwards> I talked to vizini <sedwards> it's public domain <sedwards> do what you will <sedwards> slap your name on it <sedwards> and submit it <Colin_Finck> I can just do a commit to put it under PD now and everything will be alright? <sedwards> yes, the author who wishes to remain anonymous is quite fine with that

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Feb 22 23:00:00 2010 New Revision: 45662 URL: http://svn.reactos.org/svn/reactos?rev=45662&view=rev Log: Put Vizzini's "csq.h" in the Public Domain with permission from the author: <sedwards> I talked to vizini <sedwards> it's public domain <sedwards> do what you will <sedwards> slap your name on it <sedwards> and submit it <Colin_Finck> I can just do a commit to put it under PD now and everything will be alright? <sedwards> yes, the author who wishes to remain anonymous is quite fine with that Modified: trunk/reactos/include/ddk/csq.h Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=4566… ============================================================================== --- trunk/reactos/include/ddk/csq.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/csq.h [iso-8859-1] Mon Feb 22 23:00:00 2010 @@ -1,7 +1,17 @@ /* * Cancel-Safe Queue Library - * Copyright (c) 2004, Vizzini (vizzini(a)plasmic.com) - * Licensed under the GNU GPL for the ReactOS project + * Created in 2004 by Vizzini (vizzini(a)plasmic.com) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * * * This header defines the interface to the ReactOS Cancel-Safe Queue library. * This interface is based on and is similar to the Microsoft Cancel-Safe

14 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010