Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 33493: - fixed and simplified scroll behavior
by mpiulachs＠svn.reactos.org 13 May '08

13 May '08

Author: mpiulachs Date: Tue May 13 06:29:56 2008 New Revision: 33493 URL: http://svn.reactos.org/svn/reactos?rev=33493&view=rev Log: - fixed and simplified scroll behavior Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 06:29:56 2008 @@ -238,25 +238,7 @@ ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) - { - coPos.X = GenericList->Right - 4; - coPos.Y = GenericList->Top; - WriteConsoleOutputCharacterA (StdOutput, - (LPCTSTR)"(\x18)", - 3, - coPos, - &Written); - - coPos.X = GenericList->Right - 4; - coPos.Y = GenericList->Bottom; - WriteConsoleOutputCharacterA (StdOutput, - (LPCTSTR)"(\x19)", - 3, - coPos, - &Written); break; - } - GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, @@ -302,6 +284,50 @@ } } +static VOID +DrawScrollBarGenericList(PGENERIC_LIST GenericList) +{ + COORD coPos; + DWORD Written; + + coPos.X = GenericList->Right + 1; + coPos.Y = GenericList->Top; + + if (GenericList->FirstShown != GenericList->ListHead.Flink) + { + FillConsoleOutputCharacterA (StdOutput, + '\x18', + 1, + coPos, + &Written); + } + else + { + FillConsoleOutputCharacterA (StdOutput, + ' ', + 1, + coPos, + &Written); + } + + coPos.Y = GenericList->Bottom; + if (GenericList->LastShown != GenericList->ListHead.Blink) + { + FillConsoleOutputCharacterA (StdOutput, + '\x19', + 1, + coPos, + &Written); + } + else + { + FillConsoleOutputCharacterA (StdOutput, + ' ', + 1, + coPos, + &Written); + } +} VOID DrawGenericList(PGENERIC_LIST List, @@ -322,6 +348,7 @@ return; DrawListEntries(List); + DrawScrollBarGenericList(List); } @@ -329,26 +356,12 @@ ScrollDownGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; - COORD coPos; - DWORD Written; if (List->CurrentEntry == NULL) return; if (List->CurrentEntry->Entry.Flink != &List->ListHead) { - if (List->LastShown != &List->ListHead) - { - /* Draw lower edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - List->Right - List->Left - 1, - coPos, - &Written); - } - Entry = List->CurrentEntry->Entry.Flink; if (List->LastShown == &List->CurrentEntry->Entry) { @@ -357,6 +370,7 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); + DrawScrollBarGenericList(List); } } @@ -365,8 +379,6 @@ ScrollUpGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; - COORD coPos; - DWORD Written; if (List->CurrentEntry == NULL) return; @@ -381,17 +393,7 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); - } - else - { - /* Draw upper edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - List->Right - List->Left - 1, - coPos, - &Written); + DrawScrollBarGenericList(List); } } Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Tue May 13 06:29:56 2008 @@ -53,6 +53,9 @@ SHORT Bottom); VOID +DrawScrollBarGenericLis(PGENERIC_LIST List); + +VOID ScrollDownGenericList(PGENERIC_LIST List); VOID

1 0

[cfinck] 33492: Use a Mutex, so that CPL applets cannot be launched multiple times. Fixes bug #781 partly, we still need a fix in "control.exe" (see my comment in the bug report)
by cfinck＠svn.reactos.org 13 May '08

13 May '08

Author: cfinck Date: Tue May 13 03:56:23 2008 New Revision: 33492 URL: http://svn.reactos.org/svn/reactos?rev=33492&view=rev Log: Use a Mutex, so that CPL applets cannot be launched multiple times. Fixes bug #781 partly, we still need a fix in "control.exe" (see my comment in the bug report) Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Tue May 13 03:56:23 2008 @@ -353,7 +353,11 @@ LPWSTR extraPmts = NULL; int quoted = 0; BOOL spSet = FALSE; - + HANDLE hMutex; + + hMutex = CreateMutex(NULL, FALSE, (LPCTSTR) wszCmd); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + return NULL; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -412,6 +416,7 @@ } Control_UnloadApplet(applet); } + ReleaseMutex(hMutex); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

[frik85] 33491: improve visual scroll behavior (arrow-up/-down hints) of the generic list (first step setup)
by frik85＠svn.reactos.org 13 May '08

13 May '08

Author: frik85 Date: Tue May 13 03:04:59 2008 New Revision: 33491 URL: http://svn.reactos.org/svn/reactos?rev=33491&view=rev Log: improve visual scroll behavior (arrow-up/-down hints) of the generic list (first step setup) Modified: trunk/reactos/base/setup/usetup/genlist.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue May 13 03:04:59 2008 @@ -238,7 +238,25 @@ ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == GenericList->Bottom) + { + coPos.X = GenericList->Right - 4; + coPos.Y = GenericList->Top; + WriteConsoleOutputCharacterA (StdOutput, + (LPCTSTR)"(\x18)", + 3, + coPos, + &Written); + + coPos.X = GenericList->Right - 4; + coPos.Y = GenericList->Bottom; + WriteConsoleOutputCharacterA (StdOutput, + (LPCTSTR)"(\x19)", + 3, + coPos, + &Written); break; + } + GenericList->LastShown = Entry; FillConsoleOutputAttribute (StdOutput, @@ -311,12 +329,26 @@ ScrollDownGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; + COORD coPos; + DWORD Written; if (List->CurrentEntry == NULL) return; if (List->CurrentEntry->Entry.Flink != &List->ListHead) { + if (List->LastShown != &List->ListHead) + { + /* Draw lower edge */ + coPos.X = List->Left + 1; + coPos.Y = List->Bottom; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + List->Right - List->Left - 1, + coPos, + &Written); + } + Entry = List->CurrentEntry->Entry.Flink; if (List->LastShown == &List->CurrentEntry->Entry) { @@ -333,6 +365,8 @@ ScrollUpGenericList (PGENERIC_LIST List) { PLIST_ENTRY Entry; + COORD coPos; + DWORD Written; if (List->CurrentEntry == NULL) return; @@ -348,6 +382,17 @@ List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); DrawListEntries(List); } + else + { + /* Draw upper edge */ + coPos.X = List->Left + 1; + coPos.Y = List->Top; + FillConsoleOutputCharacterA (StdOutput, + 0xC4, // '-', + List->Right - List->Left - 1, + coPos, + &Written); + } }

1 0

[jimtabor] 33490: Added W32PF and Brush flags. Fixed IntGdiExtCreatePen and all related so to pass wine gdi32 pen tests. Fail 100 out of 664 no skips.
by jimtabor＠svn.reactos.org 13 May '08

13 May '08

Author: jimtabor Date: Tue May 13 00:13:25 2008 New Revision: 33490 URL: http://svn.reactos.org/svn/reactos?rev=33490&view=rev Log: Added W32PF and Brush flags. Fixed IntGdiExtCreatePen and all related so to pass wine gdi32 pen tests. Fail 100 out of 664 no skips. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Tue May 13 00:13:25 2008 @@ -1392,7 +1392,7 @@ return NtGdiSelectBrush(hDC, hGdiObj); case GDI_OBJECT_TYPE_PEN: -// case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_EXTPEN: #if 0 // enable this when support is ready in win32k hOldObj = pDc_Attr->hpen; pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -58,7 +58,7 @@ } GDIBRUSHINST, *PGDIBRUSHINST; /* GDI Brush Attributes */ - +#define GDIBRUSH_NEED_FG_CLR 0x0001 #define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ #define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ #define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ @@ -69,7 +69,12 @@ #define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ #define GDIBRUSH_IS_PEN 0x0400 /* Pen */ #define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ +#define GDIBRUSH_IS_DIBPALCOLORS 0x1000 +#define GDIBRUSH_IS_DIBPALINDICE 0x2000 +#define GDIBRUSH_IS_DEFAULTSTYLE 0x4000 #define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ +#define GDIBRUSH_IS_INSIDEFRAME 0x00010000 +#define GDIBRUSH_CACHED_ENGINE 0x00040000 #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 #define BRUSHOBJ_AllocBrush() ((PGDIBRUSHOBJ) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -2,9 +2,34 @@ #define __WIN32K_MISC_H /* W32PROCESS flags */ -#define W32PF_NOWINDOWGHOSTING (0x0001) -#define W32PF_MANUALGUICHECK (0x0002) -#define W32PF_CREATEDWINORDC (0x0004) +#define W32PF_CONSOLEAPPLICATION 0x00000001 +#define W32PF_FORCEOFFFEEDBACK 0x00000002 +#define W32PF_STARTGLASS 0x00000004 +#define W32PF_WOW 0x00000008 +#define W32PF_READSCREENACCESSGRANTED 0x00000010 +#define W32PF_INITIALIZED 0x00000020 +#define W32PF_APPSTARTING 0x00000040 +#define W32PF_WOW64 0x00000080 +#define W32PF_ALLOWFOREGROUNDACTIVATE 0x00000100 +#define W32PF_OWNDCCLEANUP 0x00000200 +#define W32PF_SHOWSTARTGLASSCALLED 0x00000400 +#define W32PF_FORCEBACKGROUNDPRIORITY 0x00000800 +#define W32PF_TERMINATED 0x00001000 +#define W32PF_CLASSESREGISTERED 0x00002000 +#define W32PF_THREADCONNECTED 0x00004000 +#define W32PF_PROCESSCONNECTED 0x00008000 +#define W32PF_WAKEWOWEXEC 0x00010000 +#define W32PF_WAITFORINPUTIDLE 0x00020000 +#define W32PF_IOWINSTA 0x00040000 +#define W32PF_CONSOLEFOREGROUND 0x00080000 +#define W32PF_OLELOADED 0x00100000 +#define W32PF_SCREENSAVER 0x00200000 +#define W32PF_IDLESCREENSAVER 0x00400000 +// ReactOS +#define W32PF_NOWINDOWGHOSTING (0x01000000) +#define W32PF_MANUALGUICHECK (0x02000000) +#define W32PF_CREATEDWINORDC (0x04000000) + ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] Tue May 13 00:13:25 2008 @@ -8,16 +8,24 @@ #define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_PEN) + +#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) #define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) -#define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) + +//#define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) + #define PENOBJ_AllocExtPen() ((PGDIBRUSHOBJ)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define PENOBJ_AllocExtPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN)) -#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TYPE_EXTPEN) + +#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) #define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) -#define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) + +//#define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) + #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) + +PGDIBRUSHOBJ FASTCALL PENOBJ_LockPen(HGDIOBJ); INT STDCALL PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Tue May 13 00:13:25 2008 @@ -26,6 +26,16 @@ #include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ + +PGDIBRUSHOBJ +FASTCALL +PENOBJ_LockPen(HGDIOBJ hBMObj) +{ + if (GDI_HANDLE_GET_TYPE(hBMObj) == GDI_OBJECT_TYPE_EXTPEN) + return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_EXTPEN); + else + return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_PEN); +} HPEN STDCALL IntGdiExtCreatePen( @@ -37,7 +47,7 @@ IN ULONG_PTR ulHatch, DWORD dwStyleCount, PULONG pStyle, - IN ULONG cjDIB, + IN ULONG cjDIB, // FIXME! We are shipping this too! IN BOOL bOldStylePen, IN OPTIONAL HBRUSH hbrush) { @@ -49,6 +59,8 @@ static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38}; + dwWidth = abs(dwWidth); + if (bOldStylePen) { PenObject = PENOBJ_AllocPenWithHandle(); @@ -65,6 +77,9 @@ return 0; } hPen = PenObject->BaseObject.hHmgr; + + // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. + if ((bOldStylePen) && (!dwWidth)) dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0; @@ -78,6 +93,10 @@ PenObject->flAttrs = bOldStylePen? GDIBRUSH_IS_OLDSTYLEPEN : GDIBRUSH_IS_PEN; + // If dwPenStyle is PS_COSMETIC, the width must be set to 1. + if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) + goto EEXIT; + switch (dwPenStyle & PS_STYLE_MASK) { case PS_NULL: @@ -89,6 +108,8 @@ break; case PS_ALTERNATE: + /* PS_ALTERNATE is applicable only for cosmetic pens */ + if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto EEXIT; PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; @@ -115,10 +136,35 @@ case PS_INSIDEFRAME: /* FIXME: does it need some additional work? */ - PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + /* PS_INSIDEFRAME is applicable only for geometric pens */ + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto EEXIT; + PenObject->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); break; case PS_USERSTYLE: + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) + { + /* FIXME: PS_USERSTYLE workaround */ + DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + } + else + { + UINT i; + BOOL has_neg = FALSE, all_zero = TRUE; + + for(i = 0; (i < dwStyleCount) && !has_neg; i++) + { + has_neg = has_neg || (((INT)(pStyle[i])) < 0); + all_zero = all_zero && (pStyle[i] == 0); + } + + if(all_zero || has_neg) + { + goto EEXIT; + } + } /* FIXME: what style here? */ PenObject->flAttrs |= 0; break; @@ -127,8 +173,16 @@ DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); } PENOBJ_UnlockPen(PenObject); - return hPen; + +EEXIT: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + PENOBJ_UnlockPen(PenObject); + if (bOldStylePen) + PENOBJ_FreePenByHandle(hPen); + else + PENOBJ_FreeExtPenByHandle(hPen); + return NULL; } VOID FASTCALL @@ -201,9 +255,10 @@ COLORREF Color, IN HBRUSH hbr) { - if (PenStyle > PS_INSIDEFRAME) - { - PenStyle = PS_SOLID; + if ( PenStyle < PS_SOLID || PenStyle > PS_INSIDEFRAME ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; } return IntGdiExtCreatePen(PenStyle, @@ -237,8 +292,10 @@ DWORD* pSafeStyle = NULL; HPEN hPen; + if (dwStyleCount < 0) return 0; if (dwStyleCount > 16) { + SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } @@ -281,12 +338,7 @@ cjDIB, bOldStylePen, hBrush); - - if ((!hPen) && (pSafeStyle)) - { - ExFreePool(pSafeStyle); - } - +// BRUSH_Cleanup takes care of pSafeStyle return hPen; }

1 0

[tkreuzer] 33489: fix build, sorry
by tkreuzer＠svn.reactos.org 13 May '08

13 May '08

Author: tkreuzer Date: Mon May 12 23:30:00 2008 New Revision: 33489 URL: http://svn.reactos.org/svn/reactos?rev=33489&view=rev Log: fix build, sorry Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon May 12 23:30:00 2008 @@ -1501,7 +1501,7 @@ /* remove the message queue from any desktops */ if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0))) { - InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); + (void)InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); IntDereferenceMessageQueue(MessageQueue); }

1 0

[tkreuzer] 33488: - fix a pointer to INT cast - use InterlockedExchangePointer instead of InterlockedExchange for a pointer
by tkreuzer＠svn.reactos.org 13 May '08

13 May '08

Author: tkreuzer Date: Mon May 12 23:18:07 2008 New Revision: 33488 URL: http://svn.reactos.org/svn/reactos?rev=33488&view=rev Log: - fix a pointer to INT cast - use InterlockedExchangePointer instead of InterlockedExchange for a pointer Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon May 12 23:18:07 2008 @@ -868,7 +868,7 @@ if (Message->HookMessage) { Result = co_HOOK_CallHooks(Message->Msg.message, - (INT) Message->Msg.hwnd, + (INT)(INT_PTR)Message->Msg.hwnd, Message->Msg.wParam, Message->Msg.lParam); } @@ -1499,9 +1499,9 @@ PDESKTOP_OBJECT desk; /* remove the message queue from any desktops */ - if ((desk = (PDESKTOP_OBJECT)InterlockedExchange((LONG*)&MessageQueue->Desktop, 0))) - { - InterlockedExchange((LONG*)&desk->ActiveMessageQueue, 0); + if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0))) + { + InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); IntDereferenceMessageQueue(MessageQueue); }

1 0

[cfinck] 33487: Don't strip trailing spaces from the command line This way, stuff like "notepad abc.txt " will correctly pass "abc.txt " as the filename like Windows does. See issue #1818 for more details.
by cfinck＠svn.reactos.org 12 May '08

12 May '08

Author: cfinck Date: Mon May 12 16:26:38 2008 New Revision: 33487 URL: http://svn.reactos.org/svn/reactos?rev=33487&view=rev Log: Don't strip trailing spaces from the command line This way, stuff like "notepad abc.txt " will correctly pass "abc.txt " as the filename like Windows does. See issue #1818 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon May 12 16:26:38 2008 @@ -1529,11 +1529,6 @@ *cp = _T('\0'); - /* strip trailing spaces */ - while ((--cp >= commandline) && _istspace (*cp)); - - *(cp + 1) = _T('\0'); - /* JPP 19980807 */ /* Echo batch file line */ if (bEchoThisLine)

1 0

[cfinck] 33486: Fix the Release build by marking MmPageArraySize as unreferenced. Changing the ASSERT, so that it doesn't spit out an "unused variable" warning on Release builds doesn't work, because then it expects this variable to exist. (which is not the case for some struct elements passed to ASSERT in some other parts of the kernel)
by cfinck＠svn.reactos.org 12 May '08

12 May '08

Author: cfinck Date: Mon May 12 15:48:48 2008 New Revision: 33486 URL: http://svn.reactos.org/svn/reactos?rev=33486&view=rev Log: Fix the Release build by marking MmPageArraySize as unreferenced. Changing the ASSERT, so that it doesn't spit out an "unused variable" warning on Release builds doesn't work, because then it expects this variable to exist. (which is not the case for some struct elements passed to ASSERT in some other parts of the kernel) Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon May 12 15:48:48 2008 @@ -986,6 +986,9 @@ extern PPHYSICAL_PAGE MmPageArray; extern ULONG MmPageArraySize; + /* Mark MmPageArraySize as unreferenced, otherwise it will appear as an unused variable on a Release build */ + UNREFERENCED_PARAMETER(MmPageArraySize); + /* Make sure the PFN number is valid */ ASSERT(Pfn <= MmPageArraySize);

1 0

[cfinck] 33485: [FORMATTING] Fix indentation (4 spaces)
by cfinck＠svn.reactos.org 12 May '08

12 May '08

Author: cfinck Date: Mon May 12 15:11:11 2008 New Revision: 33485 URL: http://svn.reactos.org/svn/reactos?rev=33485&view=rev Log: [FORMATTING] Fix indentation (4 spaces) Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] Mon May 12 15:11:11 2008 @@ -15,51 +15,45 @@ */ int STDCALL -lstrcmpA( - LPCSTR lpString1, - LPCSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; -} - - -/* - * @implemented - */ -int -STDCALL -lstrcmpiA( - LPCSTR lpString1, - LPCSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, - lpString2, -1); - if (Result) Result -= 2; - - return Result; +lstrcmpA(LPCSTR lpString1, LPCSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); + if (Result) Result -= 2; + + return Result; +} + + +/* + * @implemented + */ +int +STDCALL +lstrcmpiA(LPCSTR lpString1, LPCSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; } /* @@ -67,11 +61,7 @@ */ LPSTR STDCALL -lstrcpynA( - LPSTR lpString1, - LPCSTR lpString2, - int iMaxLength - ) +lstrcpynA(LPSTR lpString1, LPCSTR lpString2, int iMaxLength) { LPSTR d = lpString1; LPCSTR s = lpString2; @@ -85,7 +75,9 @@ count--; *d++ = *s++; } - if (count) *d = 0; + + if (count) + *d = 0; Ret = lpString1; } @@ -101,10 +93,7 @@ */ LPSTR STDCALL -lstrcpyA( - LPSTR lpString1, - LPCSTR lpString2 - ) +lstrcpyA(LPSTR lpString1, LPCSTR lpString2) { LPSTR Ret = NULL; @@ -112,7 +101,7 @@ { memmove(lpString1, lpString2, strlen(lpString2) + 1); Ret = lpString1; - } + } _SEH_HANDLE _SEH_END; @@ -125,10 +114,7 @@ */ LPSTR STDCALL -lstrcatA( - LPSTR lpString1, - LPCSTR lpString2 - ) +lstrcatA(LPSTR lpString1, LPCSTR lpString2) { LPSTR Ret = NULL; @@ -140,18 +126,15 @@ _SEH_END; return Ret; - -} - - -/* - * @implemented - */ -int -STDCALL -lstrlenA( - LPCSTR lpString - ) +} + + +/* + * @implemented + */ +int +STDCALL +lstrlenA(LPCSTR lpString) { INT Ret = 0; @@ -171,50 +154,46 @@ */ int STDCALL -lstrcmpW( - LPCWSTR lpString1, - LPCWSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringW(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; -} - - -/* - * @implemented - */ -int -STDCALL -lstrcmpiW( - LPCWSTR lpString1, - LPCWSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; +lstrcmpW(LPCWSTR lpString1, LPCWSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringW(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; +} + + +/* + * @implemented + */ +int +STDCALL +lstrcmpiW(LPCWSTR lpString1, LPCWSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; } @@ -223,11 +202,7 @@ */ LPWSTR STDCALL -lstrcpynW( - LPWSTR lpString1, - LPCWSTR lpString2, - int iMaxLength - ) +lstrcpynW(LPWSTR lpString1, LPCWSTR lpString2, int iMaxLength) { LPWSTR d = lpString1; LPCWSTR s = lpString2; @@ -241,7 +216,9 @@ count--; *d++ = *s++; } - if (count) *d = 0; + + if (count) + *d = 0; Ret = lpString1; } @@ -257,10 +234,7 @@ */ LPWSTR STDCALL -lstrcpyW( - LPWSTR lpString1, - LPCWSTR lpString2 - ) +lstrcpyW(LPWSTR lpString1, LPCWSTR lpString2) { LPWSTR Ret = NULL; @@ -280,10 +254,7 @@ */ LPWSTR STDCALL -lstrcatW( - LPWSTR lpString1, - LPCWSTR lpString2 - ) +lstrcatW(LPWSTR lpString1, LPCWSTR lpString2) { LPWSTR Ret = NULL; @@ -303,9 +274,7 @@ */ int STDCALL -lstrlenW( - LPCWSTR lpString - ) +lstrlenW(LPCWSTR lpString) { INT Ret = 0;

1 0

[cfinck] 33484: The lstr* functions don't reset the last error on an exception. Also they handle more than just access violation exceptions. This makes us passing (at least) one more sub test of a Wine test (user32_winetest text) Behaviour verified under Windows XP SP2.
by cfinck＠svn.reactos.org 12 May '08

12 May '08

Author: cfinck Date: Mon May 12 15:01:48 2008 New Revision: 33484 URL: http://svn.reactos.org/svn/reactos?rev=33484&view=rev Log: The lstr* functions don't reset the last error on an exception. Also they handle more than just access violation exceptions. This makes us passing (at least) one more sub test of a Wine test (user32_winetest text) Behaviour verified under Windows XP SP2. Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] Mon May 12 15:01:48 2008 @@ -10,15 +10,6 @@ #include <k32.h> -static _SEH_FILTER(lstr_page_fault) -{ - if (_SEH_GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return _SEH_EXECUTE_HANDLER; - else - return _SEH_CONTINUE_SEARCH; -} - - /* * @implemented */ @@ -98,10 +89,7 @@ Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError( ERROR_INVALID_PARAMETER ); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -125,10 +113,7 @@ memmove(lpString1, lpString2, strlen(lpString2) + 1); Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -151,10 +136,7 @@ { Ret = strcat(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -177,10 +159,7 @@ { Ret = strlen(lpString); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -266,10 +245,7 @@ Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError( ERROR_INVALID_PARAMETER ); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -292,10 +268,7 @@ { Ret = wcscpy(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -318,10 +291,7 @@ { Ret = wcscat(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -343,11 +313,8 @@ { Ret = wcslen(lpString); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } - _SEH_END; - - return Ret; -} + _SEH_HANDLE + _SEH_END; + + return Ret; +}

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