[ros-diffs] [fireball] 28289: - Merge 26992, 27646, 27679, 27966, 28258. - WinLdr now is up-to-date with trunk (28288).
fireball at svn.reactos.org
fireball at svn.reactos.org
Sat Aug 11 16:38:31 CEST 2007
Author: fireball
Date: Sat Aug 11 18:38:31 2007
New Revision: 28289
URL: http://svn.reactos.org/svn/reactos?rev=28289&view=rev
Log:
- Merge 26992, 27646, 27679, 27966, 28258.
- WinLdr now is up-to-date with trunk (28288).
Modified:
branches/winldr/ (props changed)
branches/winldr/arch/ (props changed)
branches/winldr/arch/i386/ (props changed)
branches/winldr/arch/i386/hwpci.c
branches/winldr/arch/powerpc/ (props changed)
branches/winldr/cache/ (props changed)
branches/winldr/comm/ (props changed)
branches/winldr/disk/ (props changed)
branches/winldr/fs/ (props changed)
branches/winldr/include/ (props changed)
branches/winldr/include/arch/ (props changed)
branches/winldr/include/arch/i386/ (props changed)
branches/winldr/include/fs/ (props changed)
branches/winldr/include/ui/ (props changed)
branches/winldr/include/ui.h
branches/winldr/inffile/ (props changed)
branches/winldr/inifile/ (props changed)
branches/winldr/math/ (props changed)
branches/winldr/mm/ (props changed)
branches/winldr/reactos/ (props changed)
branches/winldr/reactos/binhive.c
branches/winldr/rtl/ (props changed)
branches/winldr/ui/ (props changed)
branches/winldr/ui/tui.c
branches/winldr/ui/ui.c
branches/winldr/video/ (props changed)
branches/winldr/windows/ (props changed)
Propchange: branches/winldr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,7 +1,4 @@
-*.d
-*.map
-*.exe
-*.sys
GNUmakefile
*.vcproj
*.user
+*.cbp
Propchange: branches/winldr/arch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/arch/i386/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,3 +1,4 @@
-*.d
+GNUmakefile
*.vcproj
*.user
+*.cbp
Modified: branches/winldr/arch/i386/hwpci.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hwpci.c?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- branches/winldr/arch/i386/hwpci.c (original)
+++ branches/winldr/arch/i386/hwpci.c Sat Aug 11 18:38:31 2007
@@ -184,8 +184,8 @@
}
/* Set 'Configuration Data' value */
- Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) +
- Table->Size;
+ Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) +
+ 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size;
FullResourceDescriptor = MmAllocateMemory(Size);
if (FullResourceDescriptor == NULL)
{
@@ -198,14 +198,22 @@
memset(FullResourceDescriptor, 0, Size);
FullResourceDescriptor->InterfaceType = Isa;
FullResourceDescriptor->BusNumber = 0;
- FullResourceDescriptor->PartialResourceList.Count = 1;
+ FullResourceDescriptor->PartialResourceList.Version = 1;
+ FullResourceDescriptor->PartialResourceList.Revision = 1;
+ FullResourceDescriptor->PartialResourceList.Count = 2;
PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0];
+ PartialDescriptor->Type = CmResourceTypeBusNumber;
+ PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive;
+ PartialDescriptor->u.BusNumber.Start = 0;
+ PartialDescriptor->u.BusNumber.Length = 1;
+
+ PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1];
PartialDescriptor->Type = CmResourceTypeDeviceSpecific;
PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size;
- memcpy((PVOID)((ULONG_PTR)FullResourceDescriptor + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)),
+ memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[2],
Table,
Table->Size);
Propchange: branches/winldr/arch/powerpc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/comm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/disk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/fs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/include/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/include/arch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/include/arch/i386/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/include/fs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/include/ui/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Modified: branches/winldr/include/ui.h
URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/ui.h?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- branches/winldr/include/ui.h (original)
+++ branches/winldr/include/ui.h Sat Aug 11 18:38:31 2007
@@ -50,6 +50,7 @@
extern BOOLEAN UiMenuBox;
extern BOOLEAN UiMinimal;
extern CHAR UiTimeText[];
+extern BOOLEAN UiDrawTime;
extern const CHAR UiMonthNames[12][15];
Propchange: branches/winldr/inffile/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/inifile/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/math/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/mm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/reactos/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Modified: branches/winldr/reactos/binhive.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/binhive.c?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- branches/winldr/reactos/binhive.c (original)
+++ branches/winldr/reactos/binhive.c Sat Aug 11 18:38:31 2007
@@ -27,7 +27,7 @@
static PVOID
NTAPI
-CmpAllocate (ULONG Size, BOOLEAN Paged)
+CmpAllocate (SIZE_T Size, BOOLEAN Paged)
{
return MmAllocateMemory(Size);
}
Propchange: branches/winldr/rtl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/ui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Modified: branches/winldr/ui/tui.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/tui.c?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- branches/winldr/ui/tui.c (original)
+++ branches/winldr/ui/tui.c Sat Aug 11 18:38:31 2007
@@ -20,7 +20,6 @@
#include <freeldr.h>
PVOID TextVideoBuffer = NULL;
-extern BOOLEAN UiDrawTime;
extern BOOLEAN UiMinimal;
/*
Modified: branches/winldr/ui/ui.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/ui.c?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- branches/winldr/ui/ui.c (original)
+++ branches/winldr/ui/ui.c Sat Aug 11 18:38:31 2007
@@ -269,6 +269,7 @@
0,
ATTR(UiBackdropFgColor, UiBackdropBgColor));
+ UiDrawTime = FALSE;
UiStatusBarBgColor = 7;
UserInterfaceUp = TRUE;
Propchange: branches/winldr/video/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,1 +1,4 @@
-*.d
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
Propchange: branches/winldr/windows/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 11 18:38:31 2007
@@ -1,0 +1,4 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
More information about the Ros-diffs
mailing list