Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[dreimer] 41681: Forgot something in the changelog
by dreimer＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: dreimer Date: Mon Jun 29 13:52:25 2009 New Revision: 41681 URL: http://svn.reactos.org/svn/reactos?rev=41681&view=rev Log: Forgot something in the changelog Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Jun 29 13:52:25 2009 @@ -7,6 +7,9 @@ - Fixed "ssvn create" not working due to the fact that RosBE creates a log folder and then tries to verify a empty folder. Thx for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) - Updated: NSIS to 2.45 (Daniel Reimer) +- Added a while like loop to the batch scripts where needed and used in PS. This allows us to use update.cmd for + more than 10 updates and made the show logs feature of ssvn working in Batch too (Daniel Reimer, Victor Martinez) +- Fixed Update.cmd by removing a missed prerelease hack. (Daniel Reimer) *** May 26th, 2009 - RosBE 1.4.3 Released

1 0

[jimtabor] 41680: - Fix build: use gpsi->dwInstalledEventHooks instead of gpsi->SrvEventActivity
by jimtabor＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: jimtabor Date: Mon Jun 29 10:07:15 2009 New Revision: 41680 URL: http://svn.reactos.org/svn/reactos?rev=41680&view=rev Log: - Fix build: use gpsi->dwInstalledEventHooks instead of gpsi->SrvEventActivity Modified: trunk/reactos/dll/win32/user32/windows/hook.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Mon Jun 29 10:07:15 2009 @@ -316,7 +316,7 @@ // "Servers call NotifyWinEvent to announce the event to the system after the // event has occurred; they must never notify the system of an event before // the event has occurred." msdn on NotifyWinEvent. - if (g_psi->SrvEventActivity & GetMaskFromEvent(event)) // Check to see. + if (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) // Check to see. NtUserNotifyWinEvent(event, hwnd, idObject, idChild); } @@ -371,7 +371,7 @@ { if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) { - return (g_psi->SrvEventActivity & GetMaskFromEvent(event)) != 0; + return (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; } return FALSE; }

1 0

[tkreuzer] 41679: - Remove ntuser syscolor functions from win32k (NtUserCallTwoParam) - Remove syscolor pen support from win32k - use gpsi->dwInstalledEventHooks instead of gpsi->SrvEventActivity - remove reactos specific fields from SERVERINFO
by tkreuzer＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: tkreuzer Date: Mon Jun 29 07:36:31 2009 New Revision: 41679 URL: http://svn.reactos.org/svn/reactos?rev=41679&view=rev Log: - Remove ntuser syscolor functions from win32k (NtUserCallTwoParam) - Remove syscolor pen support from win32k - use gpsi->dwInstalledEventHooks instead of gpsi->SrvEventActivity - remove reactos specific fields from SERVERINFO Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jun 29 07:36:31 2009 @@ -408,10 +408,6 @@ CHAR acAnsiToOem[256]; DWORD dwInstalledEventHooks; PERUSERSERVERINFO; -/////////////////////////////// - /* Reactos specific fields */ - DWORD SrvEventActivity; - HPEN SysColorPens[COLOR_MENUBAR+1]; } SERVERINFO, *PSERVERINFO; #define CTI_INSENDMESSAGE 0x0002 @@ -2863,9 +2859,6 @@ #define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 #define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 #define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 -#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 -#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 -#define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 #define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Mon Jun 29 07:36:31 2009 @@ -154,17 +154,8 @@ BOOL FASTCALL IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors); -BOOL FASTCALL -IntGetSysColorBrushes(HBRUSH *Brushes, UINT nBrushes); - HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object); - -BOOL FASTCALL -IntGetSysColorPens(HPEN *Pens, UINT nPens); - -BOOL FASTCALL -IntGetSysColors(COLORREF *Colors, UINT nColors); DWORD FASTCALL IntGetSysColor(INT nIndex); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Jun 29 07:36:31 2009 @@ -62,28 +62,28 @@ (event >= EVENT_CONSOLE_CARET && event <= EVENT_CONSOLE_END_APPLICATION) || (event >= EVENT_OBJECT_CREATE && event <= EVENT_OBJECT_ACCELERATORCHANGE)) { - gpsi->SrvEventActivity |= GetMaskFromEvent(event); + gpsi->dwInstalledEventHooks |= GetMaskFromEvent(event); } if (event > EVENT_SYSTEM_MINIMIZEEND && event < EVENT_CONSOLE_CARET) { event = EVENT_CONSOLE_CARET-1; - gpsi->SrvEventActivity |= GetMaskFromEvent(event); + gpsi->dwInstalledEventHooks |= GetMaskFromEvent(event); } if (event > EVENT_CONSOLE_END_APPLICATION && event < EVENT_OBJECT_CREATE ) { event = EVENT_OBJECT_CREATE-1; - gpsi->SrvEventActivity |= GetMaskFromEvent(event); + gpsi->dwInstalledEventHooks |= GetMaskFromEvent(event); } if (event > EVENT_OBJECT_ACCELERATORCHANGE && event < EVENT_MAX) { event = EVENT_MAX-1; - gpsi->SrvEventActivity |= GetMaskFromEvent(event); + gpsi->dwInstalledEventHooks |= GetMaskFromEvent(event); break; - } - } - if (!gpsi->SrvEventActivity) - gpsi->SrvEventActivity |= SRV_EVENT_RUNNING; // Set something. - DPRINT("SetSrvEventMask 2 : %x\n", gpsi->SrvEventActivity); + } + } + if (!gpsi->dwInstalledEventHooks) + gpsi->dwInstalledEventHooks |= SRV_EVENT_RUNNING; // Set something. + DPRINT("SetSrvEventMask 2 : %x\n", gpsi->dwInstalledEventHooks); } static @@ -128,7 +128,7 @@ { RemoveEntryList(&pEH->Chain); GlobalEvents->Counts--; - if (!GlobalEvents->Counts) gpsi->SrvEventActivity = 0; + if (!GlobalEvents->Counts) gpsi->dwInstalledEventHooks = 0; UserDeleteObject(pEH->Self, otEvent); return TRUE; } @@ -229,9 +229,9 @@ { UserLeave(); return; - } - - if (gpsi->SrvEventActivity & GetMaskFromEvent(Event)) + } + + if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(Event)) { UserRefObjectCo(Window, &Ref); IntNotifyWinEvent( Event, Window, idObject, idChild); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Jun 29 07:36:31 2009 @@ -229,7 +229,7 @@ case ONEPARAM_ROUTINE_SWAPMOUSEBUTTON: { DWORD Result; - + Result = gspv.bMouseBtnSwap; gspv.bMouseBtnSwap = Param ? TRUE : FALSE; gpsi->aiSysMet[SM_SWAPBUTTON] = gspv.bMouseBtnSwap; @@ -419,7 +419,7 @@ } _SEH2_END; RETURN(Ret); - } + } } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); @@ -607,55 +607,6 @@ case TWOPARAM_ROUTINE_REGISTERLOGONPROC: RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); - - case TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES: - case TWOPARAM_ROUTINE_GETSYSCOLORPENS: - case TWOPARAM_ROUTINE_GETSYSCOLORS: - { - DWORD Ret = 0; - union - { - PVOID Pointer; - HBRUSH *Brushes; - HPEN *Pens; - COLORREF *Colors; - } Buffer; - - /* FIXME - we should make use of SEH here... */ - - Buffer.Pointer = ExAllocatePool(PagedPool, Param2 * sizeof(HANDLE)); - if(Buffer.Pointer != NULL) - { - switch(Routine) - { - case TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES: - Ret = (DWORD)IntGetSysColorBrushes(Buffer.Brushes, (UINT)Param2); - break; - case TWOPARAM_ROUTINE_GETSYSCOLORPENS: - Ret = (DWORD)IntGetSysColorPens(Buffer.Pens, (UINT)Param2); - break; - case TWOPARAM_ROUTINE_GETSYSCOLORS: - Ret = (DWORD)IntGetSysColors(Buffer.Colors, (UINT)Param2); - break; - default: - Ret = 0; - break; - } - - if(Ret > 0) - { - Status = MmCopyToCaller((PVOID)Param1, Buffer.Pointer, Param2 * sizeof(HANDLE)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - Ret = 0; - } - } - - ExFreePool(Buffer.Pointer); - } - RETURN( Ret); - } case TWOPARAM_ROUTINE_ROS_REGSYSCLASSES: { @@ -760,7 +711,7 @@ case HWNDLOCK_ROUTINE_REDRAWFRAME: co_WinPosSetWindowPos( Window, HWND_DESKTOP, - 0,0,0,0, + 0,0,0,0, SWP_NOSIZE| SWP_NOMOVE| SWP_NOZORDER| @@ -772,7 +723,7 @@ case HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK: co_WinPosSetWindowPos( Window, HWND_DESKTOP, - 0,0,0,0, + 0,0,0,0, SWP_NOSIZE| SWP_NOMOVE| SWP_NOZORDER| Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Mon Jun 29 07:36:31 2009 @@ -230,7 +230,6 @@ { gpsi->argbSystem[*Elements] = *Colors; IntGdiSetSolidBrushColor(gpsi->ahbrSystem[*Elements], *Colors); - IntGdiSetSolidPenColor(gpsi->SysColorPens[*Elements], *Colors); } Elements++; Colors++; @@ -238,77 +237,12 @@ return nColors > 0; } -BOOL FASTCALL -IntGetSysColorBrushes(HBRUSH *pahBrushes, UINT nBrushes) -{ - UINT i; - - ASSERT(pahBrushes); - - if (nBrushes > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < nBrushes; i++) - { - pahBrushes[i] = gpsi->ahbrSystem[i]; - } - - return nBrushes > 0; -} - HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object) { return ((Object < 0) || (NUM_SYSCOLORS <= Object)) ? NULL : gpsi->ahbrSystem[Object]; } -BOOL FASTCALL -IntGetSysColorPens(HPEN *Pens, UINT nPens) -{ - UINT i; - - ASSERT(Pens); - - if (nPens > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < nPens; i++) - { - *(Pens++) = gpsi->SysColorPens[i]; - } - - return nPens > 0; -} - -BOOL FASTCALL -IntGetSysColors(COLORREF *Colors, UINT nColors) -{ - UINT i; - COLORREF *col; - - ASSERT(Colors); - - if (nColors > NUM_SYSCOLORS) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - col = &gpsi->argbSystem[0]; - for (i = 0; i < nColors; i++) - { - *(Colors++) = *(col++); - } - - return nColors > 0; -} - DWORD FASTCALL IntGetSysColor(INT nIndex) { @@ -319,7 +253,6 @@ CreateSysColorObjects(VOID) { UINT i; - LOGPEN Pen; for (i = 0; i < NUM_SYSCOLORS; i++) { @@ -338,23 +271,6 @@ } } } - - /* Create the syscolor pens */ - Pen.lopnStyle = PS_SOLID; - Pen.lopnWidth.x = 0; - Pen.lopnWidth.y = 0; - for (i = 0; i < NUM_SYSCOLORS; i++) - { - if (gpsi->SysColorPens[i] == NULL) - { - Pen.lopnColor = SysColors[i]; - gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor); - if (gpsi->SysColorPens[i] != NULL) - { - GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]); - } - } - } } /* EOF */

1 0

[tkreuzer] 41678: Get rid of the SysColorPen stuff in user32, it's a wine concept. Use DC pen instead.
by tkreuzer＠svn.reactos.org 29 Jun '09

29 Jun '09

Author: tkreuzer Date: Mon Jun 29 06:49:57 2009 New Revision: 41678 URL: http://svn.reactos.org/svn/reactos?rev=41678&view=rev Log: Get rid of the SysColorPen stuff in user32, it's a wine concept. Use DC pen instead. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/include/draw.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -860,8 +860,12 @@ SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); setup_clipping( hwnd, hDC ); - +#ifdef __REACTOS__ + hOldPen = SelectObject(hDC, GetStockObject(DC_PEN)); + SetDCPenColor(hDC, GetSysColor(COLOR_WINDOWFRAME)); +#else hOldPen = SelectObject(hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); +#endif hOldBrush = SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); Modified: trunk/reactos/dll/win32/user32/include/draw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/draw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/draw.h [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -1,2 +1,1 @@ -HPEN WINAPI GetSysColorPen (int nIndex); void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -64,9 +64,6 @@ #define NtUserGetSysColorBrushes(HBrushes, count) \ (BOOL)NtUserCallTwoParam((DWORD)(HBrushes), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES) -#define NtUserGetSysColorPens(HPens, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(HPens), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORPENS) - #define NtUserGetSysColors(ColorRefs, count) \ (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS) @@ -229,7 +226,6 @@ PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); PVOID FASTCALL ValidateHandle(HANDLE, UINT); -#define SYSCOLOR_GetPen(index) GetSysColorPen(index) #define WIN_GetFullHandle(h) ((HWND)(h)) #ifndef __ms_va_list Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -68,21 +68,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; -} - -/* - * @implemented - */ -HPEN WINAPI -GetSysColorPen(int nIndex) -{ - if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) - { - return g_psi->SysColorPens[nIndex]; - } - - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; } /* 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] Mon Jun 29 06:49:57 2009 @@ -120,7 +120,6 @@ /* FUNCTIONS *****************************************************************/ -HPEN WINAPI GetSysColorPen(int nIndex); HBRUSH WINAPI GetSysColorBrush(int nIndex); /* Ported from WINE20020904 */ @@ -187,9 +186,9 @@ } if(InnerI != -1) - InnerPen = GetSysColorPen(InnerI); + InnerPen = GetStockObject(DC_PEN); if(OuterI != -1) - OuterPen = GetSysColorPen(OuterI); + OuterPen = GetStockObject(DC_PEN); MoveToEx(hdc, 0, 0, &SavePoint); @@ -241,9 +240,11 @@ MoveToEx(hdc, spx, spy, NULL); SelectObject(hdc, OuterPen); + SetDCPenColor(hdc, GetSysColor(OuterI)); LineTo(hdc, epx, epy); SelectObject(hdc, InnerPen); + SetDCPenColor(hdc, GetSysColor(InnerI)); switch(uFlags & (BF_RECT|BF_DIAGONAL)) { @@ -337,11 +338,11 @@ if((uFlags & BF_MIDDLE) && retval) { HBRUSH hbsave; - HBRUSH hb = GetSysColorBrush(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE); HPEN hpsave; - HPEN hp = GetSysColorPen(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE); - hbsave = (HBRUSH)SelectObject(hdc, hb); - hpsave = (HPEN)SelectObject(hdc, hp); + hbsave = (HBRUSH)SelectObject(hdc, GetStockObject(DC_BRUSH)); + hpsave = (HPEN)SelectObject(hdc, GetStockObject(DC_PEN)); + SetDCBrushColor(hdc, GetSysColor(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE)); + SetDCPenColor(hdc, GetSysColor(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE)); Polygon(hdc, Points, 4); SelectObject(hdc, hbsave); SelectObject(hdc, hpsave); @@ -503,13 +504,13 @@ LTpenplus = 1; if(LTInnerI != -1) - LTInnerPen = GetSysColorPen(LTInnerI); + LTInnerPen = GetStockObject(DC_PEN); if(LTOuterI != -1) - LTOuterPen = GetSysColorPen(LTOuterI); + LTOuterPen = GetStockObject(DC_PEN); if(RBInnerI != -1) - RBInnerPen = GetSysColorPen(RBInnerI); + RBInnerPen = GetStockObject(DC_PEN); if(RBOuterI != -1) - RBOuterPen = GetSysColorPen(RBOuterI); + RBOuterPen = GetStockObject(DC_PEN); if((uFlags & BF_MIDDLE) && retval) { FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? @@ -519,6 +520,7 @@ /* Draw the outer edge */ SelectObject(hdc, LTOuterPen); + SetDCPenColor(hdc, GetSysColor(LTOuterI)); if(uFlags & BF_TOP) { MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); @@ -530,6 +532,7 @@ LineTo(hdc, InnerRect.left, InnerRect.bottom); } SelectObject(hdc, RBOuterPen); + SetDCPenColor(hdc, GetSysColor(RBOuterI)); if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); @@ -543,6 +546,7 @@ /* Draw the inner edge */ SelectObject(hdc, LTInnerPen); + SetDCPenColor(hdc, GetSysColor(LTInnerI)); if(uFlags & BF_TOP) { MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); @@ -554,6 +558,7 @@ LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); } SelectObject(hdc, RBInnerPen); + SetDCPenColor(hdc, GetSysColor(RBInnerI)); if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); @@ -891,8 +896,9 @@ POINT Line[4]; int SmallDiam = UITOOLS_MakeSquareRect(r, &myr) - 2; int i; - HBRUSH hbsave, hb, hb2; - HPEN hpsave, hp, hp2; + HBRUSH hbsave; + HPEN hpsave; + COLORREF crPen1, crPen2, crBrush1, crBrush2; int d46, d93; // end scrollgripsize switch(uFlags & 0xff) @@ -909,7 +915,7 @@ case DFCS_SCROLLLEFT: Symbol = '3'; break; - + case DFCS_SCROLLRIGHT: Symbol = '4'; break; @@ -918,20 +924,21 @@ // FIXME: needs to use marlett too, copied for compatibility only /* This one breaks the flow... */ IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); - hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN)); - hbsave = (HBRUSH)SelectObject(dc, GetStockObject(NULL_BRUSH)); + hpsave = (HPEN)SelectObject(dc, GetStockObject(DC_PEN)); + hbsave = (HBRUSH)SelectObject(dc, GetStockObject(DC_BRUSH)); if(uFlags & (DFCS_MONO|DFCS_FLAT)) { - hp = hp2 = GetSysColorPen(COLOR_WINDOWFRAME); - hb = hb2 = GetSysColorBrush(COLOR_WINDOWFRAME); + crPen1 = crPen2 = GetSysColor(COLOR_WINDOWFRAME); + crBrush1 = crBrush2 = GetSysColor(COLOR_WINDOWFRAME); } else { - hp = GetSysColorPen(COLOR_BTNHIGHLIGHT); - hp2 = GetSysColorPen(COLOR_BTNSHADOW); - hb = GetSysColorBrush(COLOR_BTNHIGHLIGHT); - hb2 = GetSysColorBrush(COLOR_BTNSHADOW); + crPen1 = GetSysColor(COLOR_BTNHIGHLIGHT); + crPen2 = GetSysColor(COLOR_BTNSHADOW); + crBrush1 = GetSysColor(COLOR_BTNHIGHLIGHT); + crBrush2 = GetSysColor(COLOR_BTNSHADOW); } + Line[0].x = Line[1].x = r->right-1; Line[2].y = Line[3].y = r->bottom-1; d46 = 46*SmallDiam/750; @@ -942,15 +949,15 @@ Line[3].x = r->right - i - 1; Line[1].y = Line[0].y + d46; Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); + SetDCBrushColor(dc, crBrush1); + SetDCPenColor(dc, crPen1); Polygon(dc, Line, 4); Line[1].y++; Line[2].x++; Line[0].y = Line[1].y + d93; Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); + SetDCBrushColor(dc, crBrush2); + SetDCPenColor(dc, crPen2); Polygon(dc, Line, 4); i = 398*SmallDiam/750; @@ -958,15 +965,15 @@ Line[3].x = r->right - i - 1; Line[1].y = Line[0].y + d46; Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); + SetDCBrushColor(dc, crBrush1); + SetDCPenColor(dc, crPen1); Polygon(dc, Line, 4); Line[1].y++; Line[2].x++; Line[0].y = Line[1].y + d93; Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); + SetDCBrushColor(dc, crBrush2); + SetDCPenColor(dc, crPen2); Polygon(dc, Line, 4); i = 210*SmallDiam/750; @@ -974,15 +981,15 @@ Line[3].x = r->right - i - 1; Line[1].y = Line[0].y + d46; Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); + SetDCBrushColor(dc, crBrush1); + SetDCPenColor(dc, crPen1); Polygon(dc, Line, 4); Line[1].y++; Line[2].x++; Line[0].y = Line[1].y + d93; Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); + SetDCBrushColor(dc, crBrush2); + SetDCPenColor(dc, crPen2); Polygon(dc, Line, 4); SelectObject(dc, hpsave); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -659,7 +659,8 @@ rc.bottom = Height - 3; if (flat_menu) { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + oldPen = SelectObject( Dc, GetStockObject(DC_PEN) ); + SetDCPenColor(Dc, GetSysColor(COLOR_BTNSHADOW)); MoveToEx( Dc, rc.left, rc.top, NULL ); LineTo( Dc, rc.left, rc.bottom ); SelectObject( Dc, oldPen ); @@ -678,7 +679,8 @@ rc.top += SEPARATOR_HEIGHT / 2; if (flat_menu) { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + oldPen = SelectObject( Dc, GetStockObject(DC_PEN) ); + SetDCPenColor(Dc, GetSysColor(COLOR_BTNSHADOW)); MoveToEx( Dc, rc.left, rc.top, NULL ); LineTo( Dc, rc.right, rc.top ); SelectObject( Dc, oldPen ); @@ -692,7 +694,8 @@ /* helper lines for debugging */ /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ FrameRect(Dc, &Rect, GetStockObject(BLACK_BRUSH)); - SelectObject(Dc, GetSysColorPen(COLOR_WINDOWFRAME)); + SelectObject(Dc, GetStockObject(DC_PEN)); + SetDCPenColor(Dc, GetSysColor(COLOR_WINDOWFRAME)); MoveToEx(Dc, Rect.left, (Rect.top + Rect.bottom) / 2, NULL); LineTo(Dc, Rect.right, (Rect.top + Rect.bottom) / 2); #endif @@ -1639,7 +1642,8 @@ FillRect(DC, Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); - SelectObject(DC, GetSysColorPen(COLOR_3DFACE)); + SelectObject(DC, GetStockObject(DC_PEN)); + SetDCPenColor(DC, GetSysColor(COLOR_3DFACE)); MoveToEx(DC, Rect->left, Rect->bottom, NULL); LineTo(DC, Rect->right, Rect->bottom); @@ -4010,7 +4014,7 @@ MenuInfo.Height = 0; // make sure to recalc size MenuSetRosMenuInfo(&MenuInfo); /* The wine method doesn't work and I suspect it's more effort - then hackfix solution + then hackfix solution SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED ); return TRUE;*/ @@ -4224,7 +4228,7 @@ RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); mii->dwTypeData = AnsiBuffer; - + return TRUE; } Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Mon Jun 29 06:49:57 2009 @@ -54,8 +54,6 @@ IntDrawScrollBar(HWND hWnd, HDC hDC, INT nBar); DWORD IntScrollHitTest(HWND hWnd, INT nBar, POINT pt, BOOL bDragging); -HPEN WINAPI -GetSysColorPen(int nIndex); BOOL WINAPI GdiGradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); @@ -432,7 +430,8 @@ if(!(Style & WS_MINIMIZE)) { /* Line under caption */ - PreviousPen = SelectObject(hDC, GetSysColorPen( + PreviousPen = SelectObject(hDC, GetStockObject(DC_PEN)); + SetDCPenColor(hDC, GetSysColor( ((ExStyle & (WS_EX_STATICEDGE | WS_EX_CLIENTEDGE | WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) ? COLOR_WINDOWFRAME : COLOR_3DFACE));

1 0

[janderwald] 41677: - Remove alternative definition of KSDATAFORMAT which was introduced in 41468 and also exists in MS header - Fixes breakage of AC97 in real hw - MS should start fixing their headers
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Mon Jun 29 03:16:41 2009 New Revision: 41677 URL: http://svn.reactos.org/svn/reactos?rev=41677&view=rev Log: - Remove alternative definition of KSDATAFORMAT which was introduced in 41468 and also exists in MS header - Fixes breakage of AC97 in real hw - MS should start fixing their headers Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4167… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Jun 29 03:16:41 2009 @@ -249,17 +249,6 @@ typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; typedef KSIDENTIFIER KSPIN_MEDIUM, *PKSPIN_MEDIUM; -#if !defined( _MSC_VER ) -typedef struct { - ULONG FormatSize; - ULONG Flags; - ULONG SampleSize; - ULONG Reserved; - GUID MajorFormat; - GUID SubFormat; - GUID Specifier; -} KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; -#else typedef union { struct { ULONG FormatSize; @@ -272,7 +261,7 @@ }; LONGLONG Alignment; } KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; -#endif + typedef struct {

1 0

[cwittich] 41676: add SIIMIO flag for IXP700 like done for Silicon Image controllers
by cwittich＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cwittich Date: Mon Jun 29 01:02:44 2009 New Revision: 41676 URL: http://svn.reactos.org/svn/reactos?rev=41676&view=rev Log: add SIIMIO flag for IXP700 like done for Silicon Image controllers Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Mon Jun 29 01:02:44 2009 @@ -521,7 +521,7 @@ PCI_DEV_HW_SPEC_BM( 438c, 1002, 0x00, ATA_UDMA6, "ATI IXP600" , 0 ), PCI_DEV_HW_SPEC_BM( 4380, 1002, 0x00, ATA_SA150, "ATI IXP600" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 439c, 1002, 0x00, ATA_UDMA6, "ATI IXP700" , 0 ), - PCI_DEV_HW_SPEC_BM( 4390, 1002, 0x00, ATA_SA150, "ATI IXP700" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 4390, 1002, 0x00, ATA_SA150, "ATI IXP700" , SIIMIO | UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 0004, 1103, 0x05, ATA_UDMA6, "HighPoint HPT372" , HPT372 | 0x00 | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 0004, 1103, 0x03, ATA_UDMA5, "HighPoint HPT370" , HPT370 | 0x00 | UNIATA_RAID_CONTROLLER),

1 0

[fireball] 41675: - Prevent PEVENT type redifinition (which is fine with MSVC but not with GCC).
by fireball＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: fireball Date: Mon Jun 29 00:52:37 2009 New Revision: 41675 URL: http://svn.reactos.org/svn/reactos?rev=41675&view=rev Log: - Prevent PEVENT type redifinition (which is fine with MSVC but not with GCC). Modified: trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/ddk/winddi.h Modified: trunk/reactos/include/ddk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvdeo.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] Mon Jun 29 00:52:37 2009 @@ -426,7 +426,9 @@ #define VIDEO_DUALVIEW_PRIMARY 0x80000000 #define VIDEO_DUALVIEW_SECONDARY 0x40000000 +#ifndef _WINDDI_ typedef struct _ENG_EVENT *PEVENT; +#endif typedef struct _ENG_EVENT { Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Mon Jun 29 00:52:37 2009 @@ -84,7 +84,9 @@ DECLARE_HANDLE(DHPDEV); DECLARE_HANDLE(HDRVOBJ); +#ifndef __NTDDVDEO_H typedef struct _ENG_EVENT *PEVENT; +#endif #define OPENGL_CMD 4352 #define OPENGL_GETINFO 4353

1 0

[janderwald] 41674: - Fix broken check for KSDATARANGE_AUDIO - Zero struct
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Mon Jun 29 00:06:45 2009 New Revision: 41674 URL: http://svn.reactos.org/svn/reactos?rev=41674&view=rev Log: - Fix broken check for KSDATARANGE_AUDIO - Zero struct Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Mon Jun 29 00:06:45 2009 @@ -321,13 +321,16 @@ return; } + /* Zero pin connect */ + RtlZeroMemory(MixerPinConnect, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); + /* Copy initial connect details */ RtlMoveMemory(MixerPinConnect, WorkerContext->PinConnect, sizeof(KSPIN_CONNECT)); OutputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(MixerPinConnect + 1); - Status = ComputeCompatibleFormat(WorkerContext->Entry, WorkerContext->PinConnect->PinId, WorkerContext->DeviceExtension, (PKSDATAFORMAT_WAVEFORMATEX)(WorkerContext->PinConnect + 1), OutputFormat); + Status = ComputeCompatibleFormat(WorkerContext->Entry, WorkerContext->PinConnect->PinId, WorkerContext->DeviceExtension, InputFormat, OutputFormat); if (!NT_SUCCESS(Status)) { DPRINT1("ComputeCompatibleFormat failed with %x\n", Status); @@ -612,6 +615,7 @@ { UNIMPLEMENTED AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize); + continue; } /* Select best quality available */

1 0

[fireball] 41673: - Add ENG_EVENT structure definition (from MSDN) to ntddvdeo.h. - Fix PEVENT definition in video.h: it's not some mystic VIDEO_PORT_EVENT which is not defined anywhere, it's a documented structure, which has to be compatible with the structure used in win32k EngEvent* functions too.
by fireball＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: fireball Date: Sun Jun 28 22:58:45 2009 New Revision: 41673 URL: http://svn.reactos.org/svn/reactos?rev=41673&view=rev Log: - Add ENG_EVENT structure definition (from MSDN) to ntddvdeo.h. - Fix PEVENT definition in video.h: it's not some mystic VIDEO_PORT_EVENT which is not defined anywhere, it's a documented structure, which has to be compatible with the structure used in win32k EngEvent* functions too. Modified: trunk/reactos/include/ddk/ntddvdeo.h trunk/reactos/include/ddk/video.h Modified: trunk/reactos/include/ddk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddvdeo.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddvdeo.h [iso-8859-1] Sun Jun 28 22:58:45 2009 @@ -426,6 +426,15 @@ #define VIDEO_DUALVIEW_PRIMARY 0x80000000 #define VIDEO_DUALVIEW_SECONDARY 0x40000000 +typedef struct _ENG_EVENT *PEVENT; + +typedef struct _ENG_EVENT +{ + PVOID pKEvent; + ULONG fFlags; +} ENG_EVENT, *PENG_EVENT; + + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=41… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Sun Jun 28 22:58:45 2009 @@ -44,7 +44,6 @@ typedef LONG VP_STATUS; typedef VP_STATUS *PVP_STATUS; typedef struct __DMA_PARAMETERS * PDMA; -typedef struct _VIDEO_PORT_EVENT *PEVENT; typedef struct _VIDEO_PORT_SPIN_LOCK *PSPIN_LOCK; typedef struct __VP_DMA_ADAPTER *PVP_DMA_ADAPTER;

1 0

[mkupfer] 41672: add svchost.exe to install package
by mkupfer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: mkupfer Date: Sun Jun 28 22:23:05 2009 New Revision: 41672 URL: http://svn.reactos.org/svn/reactos?rev=41672&view=rev Log: add svchost.exe to install package Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 28 22:23:05 2009 @@ -96,6 +96,7 @@ base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 base\services\wlansvc\wlansvc.exe 1 +base\services\svchost\svchost.exe 1 base\setup\setup\setup.exe 1 base\setup\vmwinst\vmwinst.exe 1

1 0

← Newer
1
2
3
4
5
6
7
8
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009