Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 44821: Fix Property USERMODE on x86
by sserapion＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: sserapion Date: Thu Dec 31 08:42:39 2009 New Revision: 44821 URL: http://svn.reactos.org/svn/reactos?rev=44821&view=rev Log: Fix Property USERMODE on x86 Modified: branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild [iso-8859-1] Thu Dec 31 08:42:39 2009 @@ -36,14 +36,17 @@ <linkerflag>-section-alignment=0x1000</linkerflag> </group> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> + <if property="USERMODE" value="1"> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + </if> + <directory name="boot"> <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> </directory> <directory name="drivers"> <xi:include href="drivers/drivers.rbuild" /> Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] Thu Dec 31 08:42:39 2009 @@ -1,11 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<if property="ARCH" value="i386"> - <directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> - </directory> -</if> + <if property="USERMODE" value="1"> + <if property="ARCH" value="i386"> + <directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.rbuild" /> + </directory> + </if> + </if> + <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory>

1 0

[sserapion] 44820: Fix build after r44818
by sserapion＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: sserapion Date: Thu Dec 31 08:26:46 2009 New Revision: 44820 URL: http://svn.reactos.org/svn/reactos?rev=44820&view=rev Log: Fix build after r44818 Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] Thu Dec 31 08:26:46 2009 @@ -2249,12 +2249,12 @@ /************************************************************************** * mciGetCreatorTask [WINMM.@] */ -HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) +HTASK WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) { LPWINE_MCIDRIVER wmd; - HANDLE ret = 0; - - if ((wmd = MCI_GetDriver(uDeviceID))) ret = wmd->CreatorThread; + HTASK ret = 0; + + if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)wmd->CreatorThread; TRACE("(%u) => %p\n", uDeviceID, ret); return ret;

1 0

[jimtabor] 44819: [User32] - Patch modified by Dmitry Timoshkov : Handle virtual key codes only in the WM_KEYDOWN case. See bug 5063. Reported by David Quintana.
by jimtabor＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: jimtabor Date: Thu Dec 31 03:41:57 2009 New Revision: 44819 URL: http://svn.reactos.org/svn/reactos?rev=44819&view=rev Log: [User32] - Patch modified by Dmitry Timoshkov : Handle virtual key codes only in the WM_KEYDOWN case. See bug 5063. Reported by David Quintana. Modified: trunk/reactos/dll/win32/user32/controls/combo.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] Thu Dec 31 03:41:57 2009 @@ -1998,12 +1998,7 @@ COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; - case WM_CHAR: - case WM_IME_CHAR: case WM_KEYDOWN: - { - HWND hwndTarget; - if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) { @@ -2015,6 +2010,11 @@ COMBO_FlipListbox( lphc, FALSE, FALSE ); return TRUE; } + /* fall through */ + case WM_CHAR: + case WM_IME_CHAR: + { + HWND hwndTarget; if( lphc->wState & CBF_EDIT ) hwndTarget = lphc->hWndEdit;

1 0

[tkreuzer] 44818: - mciGetCreatorTask returns HTASK not HANDLE - remove broken LargeInteger functions from wintrnl.h
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 02:56:39 2009 New Revision: 44818 URL: http://svn.reactos.org/svn/reactos?rev=44818&view=rev Log: - mciGetCreatorTask returns HTASK not HANDLE - remove broken LargeInteger functions from wintrnl.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h branches/ros-amd64-bringup/reactos/include/psdk/winternl.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Thu Dec 31 02:56:39 2009 @@ -1886,7 +1886,7 @@ BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT); BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT); BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); -HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID); +HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); #ifdef _WINE Modified: branches/ros-amd64-bringup/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winternl.h [iso-8859-1] Thu Dec 31 02:56:39 2009 @@ -2126,15 +2126,6 @@ BOOLEAN WINAPI RtlIsValidHandle(const RTL_HANDLE_TABLE *, const RTL_HANDLE *); BOOLEAN WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE *, ULONG Index, RTL_HANDLE **); -#ifdef _M_AMD64 -#define RtlLargeIntegerAdd(x1, x2) ((x1)+(x2)) -#define RtlLargeIntegerArithmeticShift(x, s) ((x) >> (s)) -//#define RtlLargeIntegerDivide(a,b,c,d) -#define RtlLargeIntegerNegate(x) (-(x)) -#define RtlLargeIntegerShiftLeft(x, s) ((x)<<(s)) -#define RtlLargeIntegerShiftRight(x, s) ((x)>>(s)) -#define RtlLargeIntegerSubtract(x1, x2) ((x1)-(x2)) -#else LONGLONG WINAPI RtlLargeIntegerAdd(LONGLONG,LONGLONG); LONGLONG WINAPI RtlLargeIntegerArithmeticShift(LONGLONG,INT); ULONGLONG WINAPI RtlLargeIntegerDivide( ULONGLONG,ULONGLONG,ULONGLONG *); @@ -2142,7 +2133,6 @@ LONGLONG WINAPI RtlLargeIntegerShiftLeft(LONGLONG,INT); LONGLONG WINAPI RtlLargeIntegerShiftRight(LONGLONG,INT); LONGLONG WINAPI RtlLargeIntegerSubtract(LONGLONG,LONGLONG); -#endif NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PCHAR); NTSTATUS WINAPI RtlLeaveCriticalSection(RTL_CRITICAL_SECTION *); DWORD WINAPI RtlLengthRequiredSid(DWORD);

1 0

[jimtabor] 44817: [Win32k] - Plugged in region attribute support and added the PEB cache for it as well. [Gdi32] - Using CreateRectRgn only with attribute and PEB cache support. [Testing] - Wine tests: gdi32; clipping and dc. gdiplus; region. user32; dce. Same results. - Applications, AbiWord 2.6.8, FF 3.5, miranda 0.7.19 unicode, putty, SeaMonkey 2.0, WinMerge 2.12.4 and winamp 2.95 rc std. Same results.
by jimtabor＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: jimtabor Date: Wed Dec 30 23:56:09 2009 New Revision: 44817 URL: http://svn.reactos.org/svn/reactos?rev=44817&view=rev Log: [Win32k] - Plugged in region attribute support and added the PEB cache for it as well. [Gdi32] - Using CreateRectRgn only with attribute and PEB cache support. [Testing] - Wine tests: gdi32; clipping and dc. gdiplus; region. user32; dce. Same results. - Applications, AbiWord 2.6.8, FF 3.5, miranda 0.7.19 unicode, putty, SeaMonkey 2.0, WinMerge 2.12.4 and winamp 2.95 rc std. Same results. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Wed Dec 30 23:56:09 2009 @@ -16,10 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS gdi32.dll - * FILE: lib/gdi32/misc/misc.c + * FILE: dll/win32/gdi32/misc/misc.c * PURPOSE: Miscellaneous functions * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: @@ -284,10 +283,46 @@ return NtGdiSetBoundsRect(hdc, prc, 0x8000 | DCB_ACCUMULATE ) ? TRUE : FALSE; } +extern PGDIHANDLECACHE GdiHandleCache; + HGDIOBJ FASTCALL hGetPEBHandle(HANDLECACHETYPE Type, COLORREF cr) { - return NULL; -} - + int Number; + HANDLE Lock; + HGDIOBJ Handle = NULL; + + Lock = InterlockedCompareExchangePointer( (PVOID*)&GdiHandleCache->ulLock, + NtCurrentTeb(), + NULL ); + + if (Lock) return Handle; + + Number = GdiHandleCache->ulNumHandles[Type]; + + if ( Number && Number <= CACHE_REGION_ENTRIES ) + { + if ( Type == hctRegionHandle) + { + PRGN_ATTR pRgn_Attr; + HGDIOBJ *hPtr; + hPtr = GdiHandleCache->Handle + CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES; + Handle = hPtr[Number - 1]; + + if (GdiGetHandleUserData( Handle, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) + { + if (pRgn_Attr->AttrFlags & ATTR_CACHED) + { + DPRINT("Get Handle! Count %d\n", GdiHandleCache->ulNumHandles[Type]); + pRgn_Attr->AttrFlags &= ~ATTR_CACHED; + hPtr[Number - 1] = NULL; + GdiHandleCache->ulNumHandles[Type]--; + } + } + } + } + (void)InterlockedExchangePointer((PVOID*)&GdiHandleCache->ulLock, Lock); + return Handle; +} + 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] Wed Dec 30 23:56:09 2009 @@ -438,39 +438,35 @@ { PRGN_ATTR pRgn_Attr; HRGN hrgn; - int x, y; - -//// Remove when Brush/Pen/Rgn Attr is ready! - return NtGdiCreateRectRgn(x1,y1,x2,y2); -//// + int tmp; /* Normalize points */ - x = x1; + tmp = x1; if ( x1 > x2 ) { x1 = x2; - x2 = x; - } - - y = y1; + x2 = tmp; + } + + tmp = y1; if ( y1 > y2 ) { y1 = y2; - y2 = y; - } - - if ( (UINT)x1 < 0x80000000 || - (UINT)y1 < 0x80000000 || - (UINT)x2 > 0x7FFFFFFF || - (UINT)y2 > 0x7FFFFFFF ) + y2 = tmp; + } + /* Check outside 24 bit limit for universal set. Chp 9 Areas, pg 560.*/ + if ( x1 < -(1<<27) || + y1 < -(1<<27) || + x2 > (1<<27)-1 || + y2 > (1<<27)-1 ) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } -// hrgn = hGetPEBHandle(hctRegionHandle, 0); - -// if (!hrgn) + hrgn = hGetPEBHandle(hctRegionHandle, 0); + + if (!hrgn) hrgn = NtGdiCreateRectRgn(0, 0, 1, 1); if (!hrgn) @@ -478,6 +474,7 @@ if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) { + DPRINT1("No Attr for Region handle!!!\n"); DeleteRegion(hrgn); return NULL; } @@ -778,15 +775,11 @@ nRightRect = nXOffset + nRightRect; nBottomRect = nYOffset + nBottomRect; - /* Mask and bit test. */ - if ( ( nLeftRect & 0xF8000000 && - (nLeftRect & 0xF8000000) != 0x80000000 ) || - ( nTopRect & 0xF8000000 && - (nTopRect & 0xF8000000) != 0x80000000 ) || - ( nRightRect & 0xF8000000 && - (nRightRect & 0xF8000000) != 0x80000000 ) || - ( nBottomRect & 0xF8000000 && - (nBottomRect & 0xF8000000) != 0x80000000 ) ) + /* Check 28 bit limit. Chp 9 Areas, pg 560. */ + if ( nLeftRect < -(1<<27) || + nTopRect < -(1<<27) || + nRightRect > (1<<27)-1 || + nBottomRect > (1<<27)-1 ) { return ERROR; } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Dec 30 23:56:09 2009 @@ -654,6 +654,69 @@ } +BOOL +FASTCALL +bPEBCacheHandle(HGDIOBJ Handle, int oType, PVOID pAttr) +{ + PGDIHANDLECACHE GdiHandleCache; + HGDIOBJ *hPtr; + BOOL Ret = FALSE; + int Offset = 0, Number; + HANDLE Lock; + + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + + switch (oType) + { + case hctBrushHandle: + Offset = 0; + break; + + case hctPenHandle: + Offset = CACHE_BRUSH_ENTRIES; + break; + + case hctRegionHandle: + Offset = CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES; + break; + + default: + return FALSE; + } + + Lock = InterlockedCompareExchangePointer( (PVOID*)&GdiHandleCache->ulLock, + NtCurrentTeb(), + NULL ); + if (Lock) return FALSE; + + _SEH2_TRY + { + Number = GdiHandleCache->ulNumHandles[oType]; + + hPtr = GdiHandleCache->Handle + Offset; + + if ( oType == hctRegionHandle) + { + if ( Number < CACHE_REGION_ENTRIES ) + { + ((PRGN_ATTR)pAttr)->AttrFlags |= ATTR_CACHED; + hPtr[Number] = Handle; + GdiHandleCache->ulNumHandles[oType]++; + DPRINT("Put Handle Count %d\n", GdiHandleCache->ulNumHandles[oType]); + Ret = TRUE; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END; + + (void)InterlockedExchangePointer((PVOID*)&GdiHandleCache->ulLock, Lock); + return Ret; +} + /*! * Delete GDI object * \param hObject object handle @@ -676,11 +739,17 @@ Index = GDI_HANDLE_GET_INDEX(hObject); Entry = &GdiHandleTable->Entries[Index]; pAttr = Entry->UserData; - + switch (dwObjectType) { -// case GDI_OBJECT_TYPE_BRUSH: + case GDI_OBJECT_TYPE_BRUSH: + break; + case GDI_OBJECT_TYPE_REGION: + if (bPEBCacheHandle(hObject, hctRegionHandle, pAttr)) + { + return TRUE; + } if (pAttr) FreeObjectAttr(pAttr); break; @@ -1485,58 +1554,6 @@ /** PUBLIC FUNCTIONS **********************************************************/ -/* - Since Brush/Pen and Region objects are sharable,,, we can just use - UserHeapAlloc to allocate the small attribute objects. - - Example Allocating: - - // Save Kernel Space Pointer - (PBRUSH)->pBrushAttr = IntGdiAllocObjAttr(GDIObjType_BRUSH_TYPE); - - // Kernel Space to User Space Pointer - (PGDI_TABLE_ENTRY)->UserData = pBrushAttr; - // Gdi will adjust for heap delta. - - Example Freeing: - - (PGDI_TABLE_ENTRY)->UserData = NULL; // Zero the user ptr. - UserHeapFree((PBRUSH)->pBrushAttr); // Free from kernel ptr. - (PBRUSH)->pBrushAttr = NULL; - - Notes: - Testing with DC_ATTR works but has drawing difficulties. - Base on observation, (Over looking the obvious) we need to supply heap delta - to user space gdi. Now, with testing, looks all normal. - - */ -PVOID -FASTCALL -IntGdiAllocObjAttr(GDIOBJTYPE Type) -{ - PVOID pMemAttr = NULL; - - switch( Type ) - { - case GDIObjType_DC_TYPE: - pMemAttr = UserHeapAlloc(sizeof(DC_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(DC_ATTR)); - break; - case GDIObjType_RGN_TYPE: - pMemAttr = UserHeapAlloc(sizeof(RGN_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(RGN_ATTR)); - break; - case GDIObjType_BRUSH_TYPE: - pMemAttr = UserHeapAlloc(sizeof(BRUSH_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(BRUSH_ATTR)); - break; - default: - break; - } - return pMemAttr; -} - - BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH pbr, DWORD OwnerMask) 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] Wed Dec 30 23:56:09 2009 @@ -2034,6 +2034,8 @@ { HRGN hReg; PROSRGNDATA pReg; + INT Index; + PGDI_TABLE_ENTRY Entry; pReg = (PROSRGNDATA)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_REGION); if(!pReg) @@ -2059,6 +2061,10 @@ return NULL; } } + + Index = GDI_HANDLE_GET_INDEX(hReg); + Entry = &GdiHandleTable->Entries[Index]; + Entry->UserData = AllocateObjectAttr(); EMPTY_REGION(pReg); pReg->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -2085,27 +2091,35 @@ Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; + if (pRgn_Attr) { - if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) - { - switch (pRgn_Attr->Flags) + _SEH2_TRY + { + if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) { - case NULLREGION: - EMPTY_REGION( pRgn ); - pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; // Clear flag in these cases, - break; - - case SIMPLEREGION: - REGION_SetRectRgn( pRgn, - pRgn_Attr->Rect.left, - pRgn_Attr->Rect.top, - pRgn_Attr->Rect.right, - pRgn_Attr->Rect.bottom ); - pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; // just incase, force a redraw. - break; + switch (pRgn_Attr->Flags) + { + case NULLREGION: + EMPTY_REGION( pRgn ); + break; + + case SIMPLEREGION: + REGION_SetRectRgn( pRgn, + pRgn_Attr->Rect.left, + pRgn_Attr->Rect.top, + pRgn_Attr->Rect.right, + pRgn_Attr->Rect.bottom ); + break; + } + pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + if (ppRgn_Attr) *ppRgn_Attr = pRgn_Attr; } @@ -2132,17 +2146,25 @@ Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; - if ( pRgn_Attr ) + + _SEH2_TRY { - if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) - { - pRgn_Attr->Flags = REGION_Complexity( pRgn ); - pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; - pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; - pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; - pRgn_Attr->Rect.bottom = pRgn->rdh.rcBound.bottom; + if ( pRgn_Attr ) + { + if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) + { + pRgn_Attr->Flags = REGION_Complexity( pRgn ); + pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; + pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; + pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; + pRgn_Attr->Rect.bottom = pRgn->rdh.rcBound.bottom; + } } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; } REGION_UnlockRgn(pRgn); }

1 0

[ekohl] 44816: [services] Set the given service start name or LocalSystem for a new service.
by ekohl＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: ekohl Date: Wed Dec 30 18:17:58 2009 New Revision: 44816 URL: http://svn.reactos.org/svn/reactos?rev=44816&view=rev Log: [services] Set the given service start name or LocalSystem for a new service. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Dec 30 18:17:58 2009 @@ -1733,6 +1733,7 @@ SC_HANDLE hServiceHandle = NULL; LPWSTR lpImagePath = NULL; HKEY hServiceKey = NULL; + LPWSTR lpObjectName; DPRINT("RCreateServiceW() called\n"); DPRINT("lpServiceName = %S\n", lpServiceName); @@ -1973,16 +1974,16 @@ goto done; } - /* FIXME: Handle lpServiceStartName propertly! */ - /* If a non driver and NULL for lpServiceStartName, write ObjectName as LocalSystem */ - if ((dwServiceType & SERVICE_WIN32) && (!lpServiceStartName)) - { + /* Write service start name */ + if (dwServiceType & SERVICE_WIN32) + { + lpObjectName = (lpServiceStartName != NULL) ? (LPWSTR)lpServiceStartName : L"LocalSystem"; dwError = RegSetValueExW(hServiceKey, L"ObjectName", 0, REG_SZ, - (LPBYTE)L"LocalSystem", - 24); + (LPBYTE)lpObjectName, + (wcslen(lpObjectName) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) goto done; }

1 0

[fireball] 44815: - Enable window contents copying in certain cases (like movement of a child window), which works beautifully now after fix from r44814.
by fireball＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: fireball Date: Wed Dec 30 18:07:31 2009 New Revision: 44815 URL: http://svn.reactos.org/svn/reactos?rev=44815&view=rev Log: - Enable window contents copying in certain cases (like movement of a child window), which works beautifully now after fix from r44814. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Dec 30 18:07:31 2009 @@ -815,7 +815,7 @@ !(data = NTDRV_create_win_data( hwnd ))) return; /* Do some magic... */ - FIXME("Window %x is being made visible1\n", hwnd); + TRACE("Window %x is being made visible1\n", hwnd); } if (offset == GWL_STYLE && (changed & WS_DISABLED)) @@ -922,20 +922,18 @@ { /* if we have an SWM window the bits will be moved by the SWM */ if (!data->whole_window) - ;//move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); - //FIXME("change1\n"); + move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else { - //move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); - //FIXME("change2, vrects[0] %s, vrects[1] %s\n", wine_dbgstr_rect(&valid_rects[0]), wine_dbgstr_rect(&valid_rects[1])); + move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } } if (!data->whole_window) return; /* Sync position change */ - if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this explorer's start menu start to appear partially. Investigate! + if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this, explorer's start menu starts to appear partially. Investigate! SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); /* Pass show/hide information to the window manager */

1 0

[fireball] 44814: - Fix a copypaste typo which led to incorrect calculation of a source point in BitBlt.
by fireball＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: fireball Date: Wed Dec 30 17:58:01 2009 New Revision: 44814 URL: http://svn.reactos.org/svn/reactos?rev=44814&view=rev Log: - Fix a copypaste typo which led to incorrect calculation of a source point in BitBlt. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Wed Dec 30 17:58:01 2009 @@ -345,7 +345,7 @@ if (pSrc) { SourcePoint.x += pSrc->rcDcRect.left + pSrc->rcVport.left; - SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.left; + SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.top; } /* Create the XLATEOBJ */

1 0

[ekohl] 44813: [umpnpmgr] Move device instance action constants into the idf file and use them instead of hardcoded values.
by ekohl＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: ekohl Date: Wed Dec 30 14:57:47 2009 New Revision: 44813 URL: http://svn.reactos.org/svn/reactos?rev=44813&view=rev Log: [umpnpmgr] Move device instance action constants into the idf file and use them instead of hardcoded values. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Dec 30 14:57:47 2009 @@ -1086,9 +1086,6 @@ /* Function 29 */ -#define PNP_DEVINST_SETUP 0x3 -#define PNP_DEVINST_ENABLE 0x4 -#define PNP_DEVINST_REENUMERATE 0x7 DWORD PNP_DeviceInstanceAction( handle_t hBinding, DWORD ulMajorAction, Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Dec 30 14:57:47 2009 @@ -745,7 +745,7 @@ RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, - 5, + PNP_DEVINST_DISABLE, ulFlags, lpDevInst, NULL); @@ -844,7 +844,7 @@ RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, - 4, + PNP_DEVINST_ENABLE, ulFlags, lpDevInst, NULL); @@ -3044,7 +3044,7 @@ RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, - 2, + PNP_DEVINST_MOVE, ulFlags, lpFromDevInst, lpToDevInst); @@ -3301,7 +3301,7 @@ RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, - 7, + PNP_DEVINST_REENUMERATE, ulFlags, lpDevInst, NULL); @@ -3935,7 +3935,7 @@ RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, - 3, + PNP_DEVINST_SETUP, ulFlags, lpDevInst, NULL); Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Wed Dec 30 14:57:47 2009 @@ -482,6 +482,11 @@ [in] DWORD ulFlags); /* Function 29 */ + cpp_quote("#define PNP_DEVINST_MOVE 0x2") + cpp_quote("#define PNP_DEVINST_SETUP 0x3") + cpp_quote("#define PNP_DEVINST_ENABLE 0x4") + cpp_quote("#define PNP_DEVINST_DISABLE 0x5") + cpp_quote("#define PNP_DEVINST_REENUMERATE 0x7") DWORD PNP_DeviceInstanceAction( [in] handle_t hBinding, [in] DWORD ulMajorAction,

1 0

[fireball] 44812: - Pass swp flags to SWM and cleanup usermode part of WindowPosChanged. - SWM: Silence debug prints. - SWM: Warn when the zorder change is requested but not performed (and window's zorder doesn't match the requested one). - SWM: Don't use SwmBringToFront in SwmShowWindow and make it respect the SWP_NOZORDER flag.
by fireball＠svn.reactos.org 30 Dec '09

30 Dec '09

Author: fireball Date: Wed Dec 30 14:26:24 2009 New Revision: 44812 URL: http://svn.reactos.org/svn/reactos?rev=44812&view=rev Log: - Pass swp flags to SWM and cleanup usermode part of WindowPosChanged. - SWM: Silence debug prints. - SWM: Warn when the zorder change is requested but not performed (and window's zorder doesn't match the requested one). - SWM: Don't use SwmBringToFront in SwmShowWindow and make it respect the SWP_NOZORDER flag. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Dec 30 14:26:24 2009 @@ -892,9 +892,6 @@ const RECT *visible_rect, const RECT *valid_rects ) { RECT old_whole_rect, old_client_rect; - //RECT whole_rect = *visible_rect; - //RECT client_rect = *rectClient; - struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); if (!data) return; @@ -939,22 +936,13 @@ /* Sync position change */ if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this explorer's start menu start to appear partially. Investigate! - SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect); + SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); /* Pass show/hide information to the window manager */ if (swp_flags & SWP_SHOWWINDOW) - { - if (swp_flags & SWP_NOZORDER) FIXME("no zorder change for hwnd %x, ignoring!\n", hwnd); - //if (swp_flags & SWP_NOACTIVATE) FIXME("no activate change, ignoring!\n"); - - //SwmSetForeground(hwnd); - SwmShowWindow(hwnd, TRUE); - } + SwmShowWindow(hwnd, TRUE, swp_flags); else if (swp_flags & SWP_HIDEWINDOW) - SwmShowWindow(hwnd, FALSE); - -// visible: 0x1843, hide: 0x1883. 1843 = 1 + 2 + 64 + 2048 + 4096 - //RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); + SwmShowWindow(hwnd, FALSE, swp_flags); } /* EOF */ Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Wed Dec 30 14:26:24 2009 @@ -169,12 +169,12 @@ SwmPosChanging(HWND hWnd, const RECT *WindowRect); VOID NTAPI -SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect); +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); HWND NTAPI SwmGetWindowFromPoint(LONG x, LONG y); VOID NTAPI -SwmShowWindow(HWND hWnd, BOOLEAN Show); +SwmShowWindow(HWND hWnd, BOOLEAN Show, UINT SwpFlags); #endif /* __WIN32K_NTUSER_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Dec 30 14:26:24 2009 @@ -95,7 +95,7 @@ req.window = (UINT_PTR)Window->hwnd; req_update_window_zorder(&req, &reply); } - DbgPrint("\n"); + //DbgPrint("\n"); /* Convert region to client coordinates */ offset_region(ClientRegion, -Window->Window.left, -Window->Window.top); @@ -300,8 +300,8 @@ { PSWM_WINDOW Win; - DPRINT1("SwmAddWindow %x\n", hWnd); - DPRINT1("rect (%d,%d)-(%d,%d)\n", WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); + DPRINT("SwmAddWindow %x\n", hWnd); + DPRINT("rect (%d,%d)-(%d,%d)\n", WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); /* Acquire the lock */ SwmAcquire(); @@ -416,7 +416,7 @@ /* Acquire the lock */ SwmAcquire(); - DPRINT1("SwmRemoveWindow %x\n", hWnd); + DPRINT("SwmRemoveWindow %x\n", hWnd); /* Allocate entry */ Win = SwmFindByHwnd(hWnd); @@ -536,9 +536,9 @@ VOID NTAPI -SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect) -{ - PSWM_WINDOW SwmWin; +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags) +{ + PSWM_WINDOW SwmWin, SwmPrev; /* Acquire the lock */ SwmAcquire(); @@ -552,8 +552,9 @@ return; } - /* Check if window really moved anywhere */ - if (WindowRect->left - OldRect->left == 0 && + /* Check if window really moved anywhere (origin, size or z order) */ + if (hWndAfter == 0 && + WindowRect->left - OldRect->left == 0 && WindowRect->top - OldRect->top == 0 && WindowRect->right - OldRect->right == 0 && WindowRect->bottom - OldRect->bottom == 0) @@ -562,14 +563,28 @@ SwmRelease(); return; } -//DPRINT1("rect (%d,%d)-(%d,%d)\n", TmpRect.left, TmpRect.top, TmpRect.right, TmpRect.bottom); - DPRINT1("SwmPosChanged hwnd %x, new rect (%d,%d)-(%d,%d)\n", hWnd, WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); + + DPRINT("SwmPosChanged hwnd %x, new rect (%d,%d)-(%d,%d)\n", hWnd, + WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); SwmWin->Window.left = WindowRect->left; SwmWin->Window.top = WindowRect->top; SwmWin->Window.right = WindowRect->right; SwmWin->Window.bottom = WindowRect->bottom; + /* Check if we need to change zorder */ + if (hWndAfter && !(SwpFlags & SWP_NOZORDER)) + { + /* Get the previous window */ + SwmPrev = CONTAINING_RECORD(SwmWin->Entry.Blink, SWM_WINDOW, Entry); + + /* Check if they are different */ + if (SwmPrev->hwnd != hWndAfter) + { + DPRINT1("WARNING: Change in zorder is requested but ignored! Previous hwnd %x, but should be %x\n", SwmPrev->hwnd, hWndAfter); + } + } + /* Recalculate all clipping */ SwmClipAllWindows(); @@ -579,7 +594,7 @@ VOID NTAPI -SwmShowWindow(HWND hWnd, BOOLEAN Show) +SwmShowWindow(HWND hWnd, BOOLEAN Show, UINT SwpFlags) { PSWM_WINDOW Win; struct region *OldRegion; @@ -601,13 +616,28 @@ if (Show && Win->Hidden) { /* Change state from hidden to visible */ - DPRINT1("Unhiding %x, rect (%d,%d)-(%d,%d)\n", Win->hwnd, Win->Window.left, Win->Window.top, Win->Window.right, Win->Window.bottom); + DPRINT("Unhiding %x, rect (%d,%d)-(%d,%d)\n", Win->hwnd, Win->Window.left, Win->Window.top, Win->Window.right, Win->Window.bottom); Win->Hidden = FALSE; - SwmBringToFront(Win); + + /* Make it topmost window if needed */ + if (!(SwpFlags & SWP_NOZORDER)) + { + /* Remove it from the list */ + RemoveEntryList(&Win->Entry); + + /* Add it to the head of the list */ + InsertHeadList(&SwmWindows, &Win->Entry); + } + + /* Calculate visible regions for all windows */ + SwmClipAllWindows(); + + /* Draw the newly appeared window */ + SwmInvalidateRegion(Win, Win->Visible, NULL); } else if (!Show && !Win->Hidden) { - DPRINT1("Hiding %x\n", Win->hwnd); + DPRINT("Hiding %x\n", Win->hwnd); /* Change state from visible to hidden */ Win->Hidden = TRUE; Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Dec 30 14:26:24 2009 @@ -91,6 +91,6 @@ SwmRemoveWindow 1 SwmSetForeground 1 SwmPosChanging 2 -SwmPosChanged 3 +SwmPosChanged 5 SwmGetWindowFromPoint 2 -SwmShowWindow 2 +SwmShowWindow 3

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs