Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 26 16:12:17 2008 New Revision: 33721 URL: http://svn.reactos.org/svn/reactos?rev=33721&view=rev Log: Fix the rest too.... Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Mon May 26 16:12:17 2008 @@ -842,7 +842,6 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes); IntGdiSelectVisRgn(hNewDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); /* Initialize the DC state */ DC_InitDC(hNewDC); @@ -1994,7 +1993,6 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, pBmp->SurfObj.sizlBitmap.cx, pBmp->SurfObj.sizlBitmap.cy); BITMAPOBJ_UnlockBitmap(pBmp); IntGdiSelectVisRgn(hDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); return hOrgBmp; }

16 years, 3 months

[janderwald] 33720: - check if MDICLIENTINFO is available before retrieving information - fixes a user32_winetest crash

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon May 26 15:52:28 2008 New Revision: 33720 URL: http://svn.reactos.org/svn/reactos?rev=33720&view=rev Log: - check if MDICLIENTINFO is available before retrieving information - fixes a user32_winetest crash Modified: trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Mon May 26 15:52:28 2008 @@ -305,7 +305,7 @@ { MDICLIENTINFO *ci = get_client_info(hwndClient); total = ci ? ci->nTotalCreated : 0; - *id = ci->idFirstChild + ci->nActiveChildren; + *id = ci ? ci->idFirstChild + ci->nActiveChildren : 0; TRACE("MDI child id %04x\n", *id); }

16 years, 3 months

[jimtabor] 33719: Why are we deleting prgnVis after setting it up? Wine code shows that it is deleted after an error if it was setup prior the error. This fixes a bug introduced in revision 5118.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 26 15:36:38 2008 New Revision: 33719 URL: http://svn.reactos.org/svn/reactos?rev=33719&view=rev Log: Why are we deleting prgnVis after setting it up? Wine code shows that it is deleted after an error if it was setup prior the error. This fixes a bug introduced in revision 5118. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Mon May 26 15:36:38 2008 @@ -1,4 +1,3 @@ - /* * ReactOS W32 Subsystem * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team @@ -152,13 +151,12 @@ DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); if (NULL != DisplayDC) - { - NtGdiDeleteObjectApp(DisplayDC); - } + { + NtGdiDeleteObjectApp(DisplayDC); + } hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); IntGdiSelectVisRgn(hNewDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); if (Layout) NtGdiSetLayout( hNewDC, -1, Layout); DC_InitDC(hNewDC);

16 years, 3 months

[navaraf] 33717: Fix incorrect logic in IntVideoPortSetupInterrupt and add comment.

by navaraf＠svn.reactos.org

Author: navaraf Date: Mon May 26 13:32:40 2008 New Revision: 33717 URL: http://svn.reactos.org/svn/reactos?rev=33717&view=rev Log: Fix incorrect logic in IntVideoPortSetupInterrupt and add comment. Modified: trunk/reactos/drivers/video/videoprt/interrupt.c Modified: trunk/reactos/drivers/video/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] Mon May 26 13:32:40 2008 @@ -48,13 +48,17 @@ DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - if (ConfigInfo->BusInterruptVector == 0) - ConfigInfo->BusInterruptVector = DeviceExtension->InterruptVector; + /* + * MSDN documentation for VIDEO_PORT_CONFIG_INFO states: "If a miniport driver's + * HwVidFindAdapter function finds that the video adapter does not generate + * interrupts or that it cannot determine a valid interrupt vector/level for + * the adapter, HwVidFindAdapter should set both BusInterruptVector and + * BusInterruptLevel to zero. + */ - if (ConfigInfo->BusInterruptLevel == 0) - ConfigInfo->BusInterruptLevel = DeviceExtension->InterruptLevel; - - if (DriverExtension->InitializationData.HwInterrupt != NULL) + if (DriverExtension->InitializationData.HwInterrupt != NULL && + ConfigInfo->BusInterruptLevel != 0 && + ConfigInfo->BusInterruptVector != 0) { ULONG InterruptVector; KIRQL Irql;

16 years, 3 months

[janderwald] 33716: - only convert the devmode if the caller passed one - fixes a user32_winetest crash failure

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon May 26 13:13:17 2008 New Revision: 33716 URL: http://svn.reactos.org/svn/reactos?rev=33716&view=rev Log: - only convert the devmode if the caller passed one - fixes a user32_winetest crash failure Modified: trunk/reactos/dll/win32/user32/misc/desktop.c Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Mon May 26 13:13:17 2008 @@ -466,7 +466,7 @@ ANSI_STRING DesktopNameA; UNICODE_STRING DesktopNameU; HDESK hDesktop; - LPDEVMODEW DevmodeW; + LPDEVMODEW DevmodeW = NULL; if (lpszDesktop != NULL) { @@ -478,7 +478,10 @@ RtlInitUnicodeString(&DesktopNameU, NULL); } - DevmodeW = GdiConvertToDevmodeW(pDevmode); + if (pDevmode) + { + DevmodeW = GdiConvertToDevmodeW(pDevmode); + } hDesktop = CreateDesktopW(DesktopNameU.Buffer, NULL,

16 years, 3 months

[fireball] 33715: - Fix misc structures definitions.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 26 13:08:50 2008 New Revision: 33715 URL: http://svn.reactos.org/svn/reactos?rev=33715&view=rev Log: - Fix misc structures definitions. Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=33… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Mon May 26 13:08:50 2008 @@ -1819,9 +1819,15 @@ SyncTypeCreateSection } FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; +typedef enum _FS_FILTER_STREAM_FO_NOTIFICATION_TYPE { + NotifyTypeCreate = 0, + NotifyTypeRetired +} FS_FILTER_STREAM_FO_NOTIFICATION_TYPE, *PFS_FILTER_STREAM_FO_NOTIFICATION_TYPE; + typedef union _FS_FILTER_PARAMETERS { struct { PLARGE_INTEGER EndingOffset; + PERESOURCE *ResourceToRelease; } AcquireForModifiedPageWriter; struct { @@ -1832,6 +1838,11 @@ FS_FILTER_SECTION_SYNC_TYPE SyncType; ULONG PageProtection; } AcquireForSectionSynchronization; + + struct { + FS_FILTER_STREAM_FO_NOTIFICATION_TYPE NotificationType; + BOOLEAN POINTER_ALIGNMENT SafeToRecurse; + } NotifyStreamFileObject; struct { PVOID Argument1; @@ -2278,7 +2289,7 @@ typedef VOID (NTAPI *PFLUSH_TO_LSN) ( IN PVOID LogHandle, - IN PLARGE_INTEGER Lsn + IN LARGE_INTEGER Lsn ); NTKERNELAPI

16 years, 3 months

[gbrunmar] 33714: Removed legacy code from r33695, trying to free a NULL pointer

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Mon May 26 11:13:19 2008 New Revision: 33714 URL: http://svn.reactos.org/svn/reactos?rev=33714&view=rev Log: Removed legacy code from r33695, trying to free a NULL pointer Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon May 26 11:13:19 2008 @@ -162,7 +162,6 @@ } else { - HeapFree( GetProcessHeap(), 0, dlgInfo ); return NULL; } }

16 years, 3 months

[fireball] 33713: - Erase countdown timer when needed. Based on a patch from bug 3279. See issue #3046 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 26 10:27:09 2008 New Revision: 33713 URL: http://svn.reactos.org/svn/reactos?rev=33713&view=rev Log: - Erase countdown timer when needed. Based on a patch from bug 3279. See issue #3046 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Mon May 26 10:27:09 2008 @@ -292,6 +292,35 @@ ATTR(UiMenuFgColor, UiMenuBgColor)); } } + else + { + // + // Erase the timeout string with spaces, and 0-terminate for sure + // + for (i=0; i<sizeof(MenuLineText)-1; i++) + { + MenuLineText[i] = ' '; + } + MenuLineText[sizeof(MenuLineText)-1] = 0; + + // + // Draw this "empty" string to erase + // + if (UiCenterMenu) + { + UiDrawText(MenuInfo->Right - strlen(MenuLineText) - 1, + MenuInfo->Bottom, + MenuLineText, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + else + { + UiDrawText(0, + MenuInfo->Bottom + 3, + MenuLineText, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + } // // Loop each item

16 years, 3 months

[janderwald] 33712: - add support for a future timeout callback mechanism

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon May 26 10:23:24 2008 New Revision: 33712 URL: http://svn.reactos.org/svn/reactos?rev=33712&view=rev Log: - add support for a future timeout callback mechanism Added: trunk/reactos/tools/sysreg/timer_callback.h (with props) trunk/reactos/tools/sysreg/timer_command_callback.cpp (with props) trunk/reactos/tools/sysreg/timer_command_callback.h (with props) Modified: trunk/reactos/tools/sysreg/sysreg.rbuild Modified: trunk/reactos/tools/sysreg/sysreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.rbuild… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/sysreg/sysreg.rbuild [iso-8859-1] Mon May 26 10:23:24 2008 @@ -21,4 +21,5 @@ <file>sysreg.cpp</file> <file>file_reader.cpp</file> <file>os_support.cpp</file> + <file>timer_command_callback.cpp</file> </module> Added: trunk/reactos/tools/sysreg/timer_callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/timer_callbac… ============================================================================== --- trunk/reactos/tools/sysreg/timer_callback.h (added) +++ trunk/reactos/tools/sysreg/timer_callback.h [iso-8859-1] Mon May 26 10:23:24 2008 @@ -1,0 +1,56 @@ +#ifndef TIMER_CALLBACK_H__ +#define TIMER_CALLBACK_H__ + + +namespace System_ +{ +//--------------------------------------------------------------------------------------- +/// +/// TimerCallback +/// +/// Description: base class for all timer callback functions + + class TimerCallback + { + public: +//--------------------------------------------------------------------------------------- +/// +/// TimerCallback +/// +/// Description: constructor of class TimerCallback + + TimerCallback() {} + +//--------------------------------------------------------------------------------------- +/// +/// TimerCallback +/// +/// Description: destructor of class TimerCallback + + virtual ~TimerCallback() {} + + +//--------------------------------------------------------------------------------------- +/// +/// initialize +/// +/// Description: this function is called when the timercallback object is initialized in +/// in the callback mechanism + + virtual bool initialize(){ return true;} + + +//--------------------------------------------------------------------------------------- +/// +/// hasExpired +/// +/// Description: this function is called everytime timer event has started. The callback object +/// should return true if the expiration function has expired. +/// Note: the function should then also cleanup all consumed resourced + + virtual bool hasExpired() = 0; + }; //end of class TimerCallback + +}// end of namespace System_ + +#endif Propchange: trunk/reactos/tools/sysreg/timer_callback.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/sysreg/timer_command_callback.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/timer_command… ============================================================================== --- trunk/reactos/tools/sysreg/timer_command_callback.cpp (added) +++ trunk/reactos/tools/sysreg/timer_command_callback.cpp [iso-8859-1] Mon May 26 10:23:24 2008 @@ -1,0 +1,41 @@ +#include "timer_command_callback.h" + + +namespace System_ +{ + using Sysreg_::ConfigParser; + + string TimerCommandCallback::ROS_TIMER_COMMAND="ROS_TIMER_COMMAND"; + string TimerCommandCallback::ROS_TIMER_TIMEOUT="ROS_TIMER_TIMEOUT"; + +//--------------------------------------------------------------- + TimerCommandCallback::TimerCommandCallback(ConfigParser &conf_parser) : TimerCallback(), m_parser(conf_parser), m_Cmd(""), m_Timeout(0) + { + } +//--------------------------------------------------------------- + TimerCommandCallback::~TimerCommandCallback() + { + } +//--------------------------------------------------------------- + bool TimerCommandCallback::initialize() + { + m_parser.getStringValue(ROS_TIMER_COMMAND, m_Cmd); + m_parser.getIntValue(ROS_TIMER_TIMEOUT, m_Timeout); + //FIXME + // calculate current time + + return true; + } + +//--------------------------------------------------------------- + bool TimerCommandCallback::hasExpired() + { + + // FIXME + // calculate current time + // calculate difference + // and invoke m_Cmd when it has expired + return false; + } + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/timer_command_callback.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/sysreg/timer_command_callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/timer_command… ============================================================================== --- trunk/reactos/tools/sysreg/timer_command_callback.h (added) +++ trunk/reactos/tools/sysreg/timer_command_callback.h [iso-8859-1] Mon May 26 10:23:24 2008 @@ -1,0 +1,57 @@ +#ifndef TIMER_COMMAND_CALLBACK_H__ //timer_command_callback.h +#define TIMER_COMMAND_CALLBACK_H__ + +#include "conf_parser.h" +#include "timer_callback.h" + +namespace System_ +{ + + class TimerCommandCallback : public TimerCallback + { + public: +//--------------------------------------------------------------- +/// +/// TimerCommandCallback +/// +/// Description: constructor of class TimerCommandCallback +/// +/// @param conf_parser contains configuration data + + TimerCommandCallback(Sysreg_::ConfigParser &conf_parser); + +//--------------------------------------------------------------- +/// +/// ~TimerCommandCallback +/// +/// Description: destructor of class TimerCommandCallback + + virtual ~TimerCommandCallback(); + +//--------------------------------------------------------------- +/// +/// initialize +/// +/// Description: initializes the callback object + + virtual bool initialize(); + +//--------------------------------------------------------------- +/// +/// hasExpired +/// +/// Description: returns true when the callback object has expired + + virtual bool hasExpired(); + protected: + Sysreg_::ConfigParser & m_parser; + string m_Cmd; + long int m_Timeout; + static string ROS_TIMER_TIMEOUT; + static string ROS_TIMER_COMMAND; + }; + +} /* EOF namspace System_ */ + + +#endif /* EOF TIMER_COMMAND_CALLBACK_H__ */ Propchange: trunk/reactos/tools/sysreg/timer_command_callback.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 3 months

[fireball] 33711: - Remove $Id tags.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 26 09:42:27 2008 New Revision: 33711 URL: http://svn.reactos.org/svn/reactos?rev=33711&view=rev Log: - Remove $Id tags. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.rc trunk/reactos/drivers/video/miniport/vga/vgamp.rc trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc trunk/reactos/drivers/video/videoprt/event.c trunk/reactos/drivers/video/videoprt/videoprt.def trunk/reactos/drivers/video/videoprt/videoprt.rc Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.rc [iso-8859-1] Mon May 26 09:42:27 2008 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VBE Miniport Device Driver\0" #define REACTOS_STR_INTERNAL_NAME "vbemp\0" Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga/vgamp.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.rc [iso-8859-1] Mon May 26 09:42:27 2008 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Miniport Device Driver\0" #define REACTOS_STR_INTERNAL_NAME "vgamp\0" Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… ============================================================================== --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc [iso-8859-1] Mon May 26 09:42:27 2008 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Xbox Miniport Device Driver\0" #define REACTOS_STR_INTERNAL_NAME "xboxvmp\0" Modified: trunk/reactos/drivers/video/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/eve… ============================================================================== --- trunk/reactos/drivers/video/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/event.c [iso-8859-1] Mon May 26 09:42:27 2008 @@ -18,7 +18,6 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: event.c 21844 2006-05-07 19:34:23Z ion $ */ #include "videoprt.h" Modified: trunk/reactos/drivers/video/videoprt/videoprt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.def [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.def [iso-8859-1] Mon May 26 09:42:27 2008 @@ -1,4 +1,3 @@ -; $Id: videoprt.def 27062 2007-06-07 21:13:06Z greatlrd $ ; ; videoprt.def - export definition file for ReactOS ; Modified: trunk/reactos/drivers/video/videoprt/videoprt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rc [iso-8859-1] Mon May 26 09:42:27 2008 @@ -1,5 +1,3 @@ -/* $Id: videoprt.rc 21844 2006-05-07 19:34:23Z ion $ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Videoport Driver\0" #define REACTOS_STR_INTERNAL_NAME "videoprt\0"

16 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008