Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 51186: [User32] - Fix select old brush in FillRect.
by jimtabor＠svn.reactos.org 29 Mar '11

29 Mar '11

Author: jimtabor Date: Tue Mar 29 05:11:02 2011 New Revision: 51186 URL: http://svn.reactos.org/svn/reactos?rev=51186&view=rev Log: [User32] - Fix select old brush in FillRect. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Mar 29 05:11:02 2011 @@ -1564,8 +1564,8 @@ INT WINAPI FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) { - HBRUSH prevhbr; BOOL Ret; + HBRUSH prevhbr = NULL; /* Select brush if specified */ if (hbr) @@ -1583,7 +1583,7 @@ lprc->bottom - lprc->top, PATCOPY); /* Select old brush */ - if (hbr) + if (prevhbr) SelectObject(hDC, prevhbr); return (INT)Ret;

1 0

[jimtabor] 51185: [Win32k] - Finish object attribute support part 2. - Removed DC from the list, ReactOS handles this in a different way. Comment out Brush and Pen switches until proper handling is...
by jimtabor＠svn.reactos.org 29 Mar '11

29 Mar '11

Author: jimtabor Date: Tue Mar 29 02:57:48 2011 New Revision: 51185 URL: http://svn.reactos.org/svn/reactos?rev=51185&view=rev Log: [Win32k] - Finish object attribute support part 2. - Removed DC from the list, ReactOS handles this in a different way. Comment out Brush and Pen switches until proper handling is implemented. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c 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] Tue Mar 29 02:57:48 2011 @@ -741,16 +741,22 @@ } } - +/* + * Process Environment Cached GDI Handles + * + * What types of GDI handle objects that are cached in the GDI handle buffer? + * Brushes set to BS_SOLID, Pens with widths of zero or set to PS_SOLID, and + * Regions that are set to NULLREGION or SIMPLEREGION. + */ BOOL FASTCALL bPEBCacheHandle(HGDIOBJ Handle, int oType, PVOID pAttr) { PGDIHANDLECACHE GdiHandleCache; HGDIOBJ *hPtr; + HANDLE Lock; + int Number, Offset, MaxNum = CACHE_PEN_ENTRIES; BOOL Ret = FALSE; - int Offset = 0, Number; - HANDLE Lock; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; @@ -758,6 +764,7 @@ { case hctBrushHandle: Offset = 0; + MaxNum = CACHE_BRUSH_ENTRIES; break; case hctPenHandle: @@ -783,10 +790,10 @@ hPtr = GdiHandleCache->Handle + Offset; - if ( pAttr && oType == hctRegionHandle) + if ( pAttr ) { - if ( Number < CACHE_REGION_ENTRIES ) - { + if ( Number < MaxNum ) + { // This object is cached and waiting for it's resurrection by the users. ((PRGN_ATTR)pAttr)->AttrFlags |= ATTR_CACHED; hPtr[Number] = Handle; GdiHandleCache->ulNumHandles[oType]++; @@ -817,6 +824,7 @@ INT Index; PGDI_TABLE_ENTRY Entry; DWORD dwObjectType; + INT ihct; PVOID pAttr = NULL; DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject); @@ -831,14 +839,27 @@ switch (dwObjectType) { case GDI_OBJECT_TYPE_BRUSH: + ihct = hctBrushHandle; break; + case GDI_OBJECT_TYPE_PEN: + ihct = hctPenHandle; + break; + case GDI_OBJECT_TYPE_REGION: - /* If pAttr NULL, the probability is high for System Region. */ + ihct = hctRegionHandle; + break; + } + + switch (dwObjectType) + { +// case GDI_OBJECT_TYPE_BRUSH: +// case GDI_OBJECT_TYPE_PEN: + case GDI_OBJECT_TYPE_REGION: + /* If pAttr NULL, the probability is high for System GDI handle object. */ if ( pAttr && - bPEBCacheHandle(hObject, hctRegionHandle, pAttr)) - { - /* User space handle only! */ + bPEBCacheHandle(hObject, ihct, pAttr) ) + { /* User space handle only! */ return TRUE; } if (pAttr) @@ -846,10 +867,6 @@ FreeObjectAttr(pAttr); Entry->UserData = NULL; } - break; - - case GDI_OBJECT_TYPE_DC: -// DC_FreeDcAttr(hObject); break; }

1 0

[rharabien] 51184: [USER32] Fix a bug causing "Attempted to lock object, wrong reuse counter" messages when CMD was started in LiveCD. Once got desktop HDC was used in different threads. When threa...
by rharabien＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: rharabien Date: Mon Mar 28 20:52:27 2011 New Revision: 51184 URL: http://svn.reactos.org/svn/reactos?rev=51184&view=rev Log: [USER32] Fix a bug causing "Attempted to lock object, wrong reuse counter" messages when CMD was started in LiveCD. Once got desktop HDC was used in different threads. When thread, which created handle terminated, DC handle was removed and next calls to CreateIcon* API was using invalid hDC. Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Mon Mar 28 20:52:27 2011 @@ -458,16 +458,10 @@ void *color_bits, *mask_bits; BOOL ret = FALSE; HDC hdc = 0; - static HDC hScreenDC = 0; if (!(info = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] ))))) return FALSE; - if(!hScreenDC) - { - hScreenDC = GetDC(0); - if(!hScreenDC) goto done; - } - if (!(hdc = CreateCompatibleDC(hScreenDC))) goto done; + if (!(hdc = CreateCompatibleDC(NULL))) goto done; memcpy( info, bmi, size ); info->bmiHeader.biHeight /= 2; @@ -491,8 +485,8 @@ else { if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(*color = CreateBitmap( width, height, GetDeviceCaps(hScreenDC, PLANES), - GetDeviceCaps(hScreenDC, BITSPIXEL), NULL ))) + if (!(*color = CreateBitmap( width, height, GetDeviceCaps(hdc, PLANES), + GetDeviceCaps(hdc, BITSPIXEL), NULL ))) { DeleteObject( *mask ); goto done;

1 0

[tkreuzer] 51183: [CMAKE/AVIFIL32] Move utf-8 resources back into rsrc.rc, move avifile_Bg.rc to the bottom. Fixes compilation with MSVC
by tkreuzer＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: tkreuzer Date: Mon Mar 28 14:17:26 2011 New Revision: 51183 URL: http://svn.reactos.org/svn/reactos?rev=51183&view=rev Log: [CMAKE/AVIFIL32] Move utf-8 resources back into rsrc.rc, move avifile_Bg.rc to the bottom. Fixes compilation with MSVC Removed: branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/rsrc.rc Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Mon Mar 28 14:17:26 2011 @@ -23,7 +23,6 @@ tmpfile.c wavfile.c rsrc.rc - rsrc-utf8.rc ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) Removed: branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc (removed) @@ -1,50 +1,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael GÃ¼nnewig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "avifile_private.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library" -#define WINE_FILENAME_STR "avifil32.dll" -#define WINE_FILEVERSION 4,0,3,1998 -#define WINE_FILEVERSION_STR "4.03.1998" - -#include "wine/wine_common_ver.rc" - -/* - * Everything specific to any language goes - * in one of the specific files. - */ - -/* UTF-8 */ -#include "avifile_Bg.rc" -#include "avifile_Da.rc" -#include "avifile_De.rc" -#include "avifile_Fr.rc" -#include "avifile_Ja.rc" -#include "avifile_Ko.rc" -#include "avifile_Lt.rc" -#include "avifile_Pt.rc" -#include "avifile_Ro.rc" -#include "avifile_Ru.rc" -#include "avifile_Si.rc" -#include "avifile_Zh.rc" Modified: branches/cmake-bringup/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/rsrc.rc [iso-8859-1] Mon Mar 28 14:17:26 2011 @@ -29,6 +29,7 @@ #define WINE_FILEVERSION_STR "4.03.1998" #include "wine/wine_common_ver.rc" +#include "avifile_private.h" /* * Everything specific to any language goes @@ -46,3 +47,16 @@ #include "avifile_Tr.rc" #include "avifile_Uk.rc" +/* UTF-8 */ +#include "avifile_Da.rc" +#include "avifile_De.rc" +#include "avifile_Fr.rc" +#include "avifile_Ja.rc" +#include "avifile_Ko.rc" +#include "avifile_Lt.rc" +#include "avifile_Pt.rc" +#include "avifile_Ro.rc" +#include "avifile_Ru.rc" +#include "avifile_Si.rc" +#include "avifile_Zh.rc" +#include "avifile_Bg.rc"

1 0

[tkreuzer] 51182: [CMAKE/ROSSYM] Implement some dummy functions for MSVC. ntoskrnl links now.
by tkreuzer＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: tkreuzer Date: Mon Mar 28 11:59:37 2011 New Revision: 51182 URL: http://svn.reactos.org/svn/reactos?rev=51182&view=rev Log: [CMAKE/ROSSYM] Implement some dummy functions for MSVC. ntoskrnl links now. Modified: branches/cmake-bringup/lib/rossym/dummy.c Modified: branches/cmake-bringup/lib/rossym/dummy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dummy.… ============================================================================== --- branches/cmake-bringup/lib/rossym/dummy.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/dummy.c [iso-8859-1] Mon Mar 28 11:59:37 2011 @@ -1,1 +1,32 @@ -/* This file is intentionally left empty */ + +#include <ntddk.h> +#include <reactos/rossym.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN +RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) +{ + return FALSE; +} + +VOID +RosSymDelete(PROSSYM_INFO RosSymInfo) +{ +} + +BOOLEAN +RosSymGetAddressInformation(PROSSYM_INFO RosSymInfo, + ULONG_PTR RelativeAddress, + ULONG *LineNumber, + char *FileName, + char *FunctionName) +{ + return FALSE; +} + +VOID +RosSymInitKernelMode(VOID) +{ +}

1 0

[tkreuzer] 51181: [NTOSKRNL] Move macro definition out of macro instantiation. Fixes compilation with MSVC
by tkreuzer＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: tkreuzer Date: Mon Mar 28 11:58:46 2011 New Revision: 51181 URL: http://svn.reactos.org/svn/reactos?rev=51181&view=rev Log: [NTOSKRNL] Move macro definition out of macro instantiation. Fixes compilation with MSVC Modified: branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c Modified: branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Mar 28 11:58:46 2011 @@ -474,10 +474,9 @@ } } } - + +#define print_supported(kf_value) ((FeatureBits & kf_value) ? #kf_value : "") DPRINT1("Supported CPU features : %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", -#define print_supported(kf_value) \ - FeatureBits & kf_value ? #kf_value : "" print_supported(KF_V86_VIS), print_supported(KF_RDTSC), print_supported(KF_CR4), @@ -739,7 +738,7 @@ /* Check if we support CPUID 0x80000006 */ CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); if (Data[0] >= 0x80000006) - { + { /* Get 2nd level cache and tlb size */ CPUID(0x80000006, &Data[0], &Data[1], &Data[2], &Data[3]); @@ -1352,7 +1351,7 @@ /* Now load NPX state from the NPX area */ FxSaveArea = KiGetThreadNpxArea(Thread); - Ke386FxStore(FxSaveArea); + Ke386FxStore(FxSaveArea); } else {

1 0

[tkreuzer] 51180: [CMAKE] move the EXTERN _KiSystemService:PROC from syscalls.inc to zw.S. Fixes build of ntdll with MSVC
by tkreuzer＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: tkreuzer Date: Mon Mar 28 11:27:08 2011 New Revision: 51180 URL: http://svn.reactos.org/svn/reactos?rev=51180&view=rev Log: [CMAKE] move the EXTERN _KiSystemService:PROC from syscalls.inc to zw.S. Fixes build of ntdll with MSVC Modified: branches/cmake-bringup/include/asm/syscalls.inc branches/cmake-bringup/ntoskrnl/ex/zw.S Modified: branches/cmake-bringup/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/sysca… ============================================================================== --- branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] Mon Mar 28 11:27:08 2011 @@ -1,6 +1,5 @@ #ifdef _M_IX86 -EXTERN _KiSystemService:PROC #define KUSER_SHARED_SYSCALL HEX(7ffe0300) #define KGDT_R0_CODE 8 MACRO(STUBCODE_U, SyscallId, StackBytes) @@ -18,7 +17,6 @@ ret StackBytes ENDM #elif defined(_M_AMD64) -EXTERN KiSystemService:PROC MACRO(STUBCODE_U, SyscallId, StackBytes) mov eax, SyscallId mov r10, rcx Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/zw.S?… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] Mon Mar 28 11:27:08 2011 @@ -1,6 +1,12 @@ #include <asm.inc> #include <syscalls.inc> + +#ifdef _M_IX86 +EXTERN _KiSystemService:PROC +#elif defined(_M_AMD64) +EXTERN KiSystemService:PROC +#endif .code

1 0

[jimtabor] 51179: [GDI32|User32|Win32k] - Fix ScrollDC ApiTest.
by jimtabor＠svn.reactos.org 28 Mar '11

28 Mar '11

Author: jimtabor Date: Mon Mar 28 00:17:21 2011 New Revision: 51179 URL: http://svn.reactos.org/svn/reactos?rev=51179&view=rev Log: [GDI32|User32|Win32k] - Fix ScrollDC ApiTest. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.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] Mon Mar 28 00:17:21 2011 @@ -275,7 +275,7 @@ FASTCALL hGetPEBHandle(HANDLECACHETYPE Type, COLORREF cr) { - int Number, Count, MaxNum, GdiType; + int Number, Offset, MaxNum, GdiType; HANDLE Lock; HGDIOBJ Handle = NULL; @@ -289,19 +289,19 @@ if (Type == hctBrushHandle) { - Count = 0; + Offset = 0; MaxNum = CACHE_BRUSH_ENTRIES; GdiType = GDILoObjType_LO_BRUSH_TYPE; } else if (Type == hctPenHandle) { - Count = CACHE_BRUSH_ENTRIES; + Offset = CACHE_BRUSH_ENTRIES; MaxNum = CACHE_PEN_ENTRIES; GdiType = GDILoObjType_LO_PEN_TYPE; } else if (Type == hctRegionHandle) { - Count = CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES; + Offset = CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES; MaxNum = CACHE_REGION_ENTRIES; GdiType = GDILoObjType_LO_REGION_TYPE; } @@ -314,7 +314,7 @@ { PBRUSH_ATTR pBrush_Attr; HGDIOBJ *hPtr; - hPtr = GdiHandleCache->Handle + Count; + hPtr = GdiHandleCache->Handle + Offset; Handle = hPtr[Number - 1]; if (GdiGetHandleUserData( Handle, GdiType, (PVOID) &pBrush_Attr)) @@ -335,6 +335,10 @@ } } } + else + { + Handle = NULL; + } } (void)InterlockedExchangePointer((PVOID*)&GdiHandleCache->ulLock, Lock); return Handle; Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Mon Mar 28 00:17:21 2011 @@ -107,19 +107,19 @@ pWnd = ValidateHwnd(Wnd); if (!pWnd) return FALSE; -/* + if ( pWnd->hrgnUpdate || pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) - {*/ + { return NtUserGetUpdateRect(Wnd, Rect, Erase); -/* } + } if (Rect) { // Did the Rgn update? No! Back set and shutup! Rect->left = Rect->right = Rect->top = Rect->bottom = 0; } return FALSE; // msdn: "If there is no update region, the return value is zero." -*/ + } @@ -144,14 +144,14 @@ pWnd = ValidateHwnd(hWnd); if (!pWnd) return ERROR; -/* + if ( pWnd->hrgnUpdate || pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) - {*/ + { return NtUserGetUpdateRgn(hWnd, hRgn, bErase); -/* } + } SetRectRgn(hRgn, 0, 0, 0, 0); - return NULLREGION;*/ + return NULLREGION; } @@ -239,14 +239,14 @@ if (!pWnd) return FALSE; -/* + if ( pWnd->hrgnUpdate || pWnd->state & WNDS_INTERNALPAINT || pWnd->spwndChild ) - {*/ + { return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); -/* } - return TRUE;*/ + } + return TRUE; } /* @@ -286,7 +286,7 @@ if (!Ret) return ERROR; - if (pWnd->fnid != FNID_DESKTOP) + if (hWnd != GetDesktopWindow()) // pWnd->fnid != FNID_DESKTOP) Ret = OffsetRgn(hRgn, -pWnd->rcWindow.left, -pWnd->rcWindow.top); if (pWnd->ExStyle & WS_EX_LAYOUTRTL) @@ -320,7 +320,7 @@ if (!Ret) return ERROR; - if (pWnd->fnid != FNID_DESKTOP) + if (hWnd != GetDesktopWindow()) // pWnd->fnid != FNID_DESKTOP) OffsetRect(lprc, -pWnd->rcWindow.left, -pWnd->rcWindow.top); if (pWnd->ExStyle & WS_EX_LAYOUTRTL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Mar 28 00:17:21 2011 @@ -1248,6 +1248,7 @@ hrgnOwn = hrgnUpdate; if (!NtGdiSetRectRgn(hrgnOwn, rcDst.left, rcDst.top, rcDst.right, rcDst.bottom)) { + DC_UnlockDc(pDC); return ERROR; } } @@ -1265,8 +1266,8 @@ NtGdiOffsetRgn(hrgnTmp, dx, dy); Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); - /* DO NOT Unlock DC while messing with prgnVis! */ - DC_UnlockDc(pDC); + /* DO NOT Unlock DC while messing with prgnVis! */ + DC_UnlockDc(pDC); REGION_FreeRgnByHandle(hrgnTmp); 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] Mon Mar 28 00:17:21 2011 @@ -2080,6 +2080,7 @@ { Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, pRgn->BaseObject.hHmgr); Entry->UserData = AllocateObjectAttr(); + RtlZeroMemory(Entry->UserData, sizeof(RGN_ATTR)); } return pRgn; } @@ -2090,6 +2091,7 @@ { PGDI_TABLE_ENTRY Entry; PRGN_ATTR pRgn_Attr; + BOOL Hit = FALSE; PROSRGNDATA pRgn = NULL; pRgn = REGION_LockRgn(hRgn); @@ -2103,11 +2105,12 @@ { _SEH2_TRY { - if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) && - pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) + if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) ) { - switch (pRgn_Attr->Flags) + if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) { + switch (pRgn_Attr->Flags) + { case NULLREGION: EMPTY_REGION( pRgn ); break; @@ -2119,15 +2122,25 @@ pRgn_Attr->Rect.right, pRgn_Attr->Rect.bottom ); break; + } + pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; } - pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; } + else + { // This object is cached an waiting for it's resurrection by the users. + Hit = TRUE; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { } _SEH2_END; + if (Hit) + { + REGION_UnlockRgn(pRgn); + return NULL; + } if (ppRgn_Attr) *ppRgn_Attr = pRgn_Attr; }

1 0

[rharabien] 51178: [USER32] Don't fail if FillRect is called without brush. Fixes user32:uitools winetest
by rharabien＠svn.reactos.org 27 Mar '11

27 Mar '11

Author: rharabien Date: Sun Mar 27 23:19:56 2011 New Revision: 51178 URL: http://svn.reactos.org/svn/reactos?rev=51178&view=rev Log: [USER32] Don't fail if FillRect is called without brush. Fixes user32:uitools winetest Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Sun Mar 27 23:19:56 2011 @@ -1565,19 +1565,28 @@ FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) { HBRUSH prevhbr; - - if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) - { - hbr = GetSysColorBrush(PtrToUlong(hbr) - 1); - } - if ((prevhbr = SelectObject(hDC, hbr)) == NULL) - { - return FALSE; - } - PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, - lprc->bottom - lprc->top, PATCOPY); - SelectObject(hDC, prevhbr); - return TRUE; + BOOL Ret; + + /* Select brush if specified */ + if (hbr) + { + /* Handle system colors */ + if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) + hbr = GetSysColorBrush(PtrToUlong(hbr) - 1); + + prevhbr = SelectObject(hDC, hbr); + if (prevhbr == NULL) + return (INT)FALSE; + } + + Ret = PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, + lprc->bottom - lprc->top, PATCOPY); + + /* Select old brush */ + if (hbr) + SelectObject(hDC, prevhbr); + + return (INT)Ret; } /*

1 0

[rharabien] 51177: [PING] Fix crash if option, which needs number is on the end of command line Get rid of GetULONG and GetULONG2 functions. MS doesn't check input so precisely Command line options...
by rharabien＠svn.reactos.org 27 Mar '11

27 Mar '11

Author: rharabien Date: Sun Mar 27 22:47:59 2011 New Revision: 51177 URL: http://svn.reactos.org/svn/reactos?rev=51177&view=rev Log: [PING] Fix crash if option, which needs number is on the end of command line Get rid of GetULONG and GetULONG2 functions. MS doesn't check input so precisely Command line options can be preceded by "/" See issue #6047 for more details. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sun Mar 27 22:47:59 2011 @@ -59,7 +59,6 @@ #pragma pack(1) -BOOL InvalidOption; BOOL NeverStop; BOOL ResolveAddresses; UINT PingCount; @@ -213,84 +212,71 @@ } } -/* Return ULONG in a string */ -static ULONG GetULONG(LPWSTR String) -{ - UINT i, Length; - ULONG Value; - LPWSTR StopString; - i = 0; - Length = (UINT)wcslen(String); - while ((i < Length) && ((String[i] < L'0') || (String[i] > L'9'))) i++; - if ((i >= Length) || ((String[i] < L'0') || (String[i] > L'9'))) - { - InvalidOption = TRUE; - return 0; - } - Value = wcstoul(&String[i], &StopString, 10); - - return Value; -} - -/* Return ULONG in a string. Try next paramter if not successful */ -static ULONG GetULONG2(LPWSTR String1, LPWSTR String2, PINT i) -{ - ULONG Value; - - Value = GetULONG(String1); - if (InvalidOption) - { - InvalidOption = FALSE; - if (String2[0] != L'-') - { - Value = GetULONG(String2); - if (!InvalidOption) - *i += 1; - } - } - - return Value; -} - /* Parse command line parameters */ static BOOL ParseCmdline(int argc, LPWSTR argv[]) { INT i; - BOOL ShowUsage; - BOOL FoundTarget; + BOOL FoundTarget = FALSE, InvalidOption = FALSE; + if (argc < 2) - ShowUsage = TRUE; - else - ShowUsage = FALSE; - FoundTarget = FALSE; - InvalidOption = FALSE; + { + Usage(); + return FALSE; + } for (i = 1; i < argc; i++) { - if (argv[i][0] == L'-') + if (argv[i][0] == L'-' || argv[i][0] == L'/') { switch (argv[i][1]) { case L't': NeverStop = TRUE; break; case L'a': ResolveAddresses = TRUE; break; - case L'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case L'n': + if (i + 1 < argc) + PingCount = wcstoul(argv[++i], NULL, 0); + else + InvalidOption = TRUE; + break; case L'l': - DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); - if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER)) + if (i + 1 < argc) { - FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \ - (int)sizeof(ICMP_ECHO_PACKET) - \ - (int)sizeof(IPv4_HEADER)); - return FALSE; - } + DataSize = wcstoul(argv[++i], NULL, 0); + + if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER)) + { + FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \ + (int)sizeof(ICMP_ECHO_PACKET) - \ + (int)sizeof(IPv4_HEADER)); + return FALSE; + } + } else + InvalidOption = TRUE; break; case L'f': DontFragment = TRUE; break; - case L'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case L'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case L'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case L'i': + if (i + 1 < argc) + TTLValue = wcstoul(argv[++i], NULL, 0); + else + InvalidOption = TRUE; + break; + case L'v': + if (i + 1 < argc) + TOSValue = wcstoul(argv[++i], NULL, 0); + else + InvalidOption = TRUE; + break; + case L'w': + if (i + 1 < argc) + Timeout = wcstoul(argv[++i], NULL, 0); + else + InvalidOption = TRUE; + break; + case '?': + Usage(); + return FALSE; default: FormatOutput(IDS_BAD_OPTION, argv[i]); - Usage(); return FALSE; } if (InvalidOption) @@ -314,17 +300,12 @@ } } - if ((!ShowUsage) && (!FoundTarget)) + if (!FoundTarget) { FormatOutput(IDS_DEST_MUST_BE_SPECIFIED); return FALSE; } - if (ShowUsage) - { - Usage(); - return FALSE; - } return TRUE; }

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