[ros-diffs] [ion] 13231: Fix svn:ignore problems and remove alignment hacks

[ion at svn.reactos.com]

Fix svn:ignore problems and remove alignment hacks
Modified: trunk/reactos/ntoskrnl/ob/object.c
Modified: trunk/reactos/ntoskrnl/ps/process.c
Property changes on: trunk/reactos/drivers/usb/miniport
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
Property changes on: trunk/reactos/drivers/usb/miniport/usbehci
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.sys
Property changes on: trunk/reactos/drivers/usb/miniport/usbohci
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.sys
Property changes on: trunk/reactos/drivers/usb/miniport/usbuhci
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.sys
Property changes on: trunk/reactos/drivers/usb/usbhub
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.sys
Property changes on: trunk/reactos/drivers/usb/usbport
___________________________________________________________________
Name: svn:ignore
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.sys
  _____  

Modified: trunk/reactos/ntoskrnl/ob/object.c
--- trunk/reactos/ntoskrnl/ob/object.c	2005-01-23 21:19:24 UTC (rev
13230)
+++ trunk/reactos/ntoskrnl/ob/object.c	2005-01-23 21:26:27 UTC (rev
13231)
@@ -608,7 +608,7 @@

     {
       ProbeForRead(ObjectAttributes,
                    sizeof(OBJECT_ATTRIBUTES),
-                   sizeof(USHORT)); /*FIXME: HACK!
kernel32/file/file.c:~734 is having a weird stack */
+                   sizeof(ULONG));
     }
     _SEH_HANDLE
     {
  _____  

Modified: trunk/reactos/ntoskrnl/ps/process.c
--- trunk/reactos/ntoskrnl/ps/process.c	2005-01-23 21:19:24 UTC (rev
13230)
+++ trunk/reactos/ntoskrnl/ps/process.c	2005-01-23 21:26:27 UTC (rev
13231)
@@ -40,33 +40,33 @@

   ICI_SQ_SAME( sizeof(IO_COUNTERS),                   sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessIoCounters */
   ICI_SQ_SAME( sizeof(VM_COUNTERS),                   sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessVmCounters */
   ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES),             sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessTimes */
-  ICI_SQ_SAME( sizeof(KPRIORITY),                     sizeof(USHORT),
ICIF_SET ),                       /* ProcessBasePriority */
+  ICI_SQ_SAME( sizeof(KPRIORITY),                     sizeof(ULONG),
ICIF_SET ),                       /* ProcessBasePriority */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_SET ),                       /* ProcessRaisePriority */
   ICI_SQ_SAME( sizeof(HANDLE),                        sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessDebugPort */
   ICI_SQ_SAME( sizeof(HANDLE),                        sizeof(ULONG),
ICIF_SET ),                       /* ProcessExceptionPort */
-  ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN),          sizeof(USHORT),
ICIF_SET ),                       /* ProcessAccessToken */
-  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(USHORT),
ICIF_QUERY | ICIF_SET ),          /* ProcessLdtInformation */
-  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(USHORT),
ICIF_SET ),                       /* ProcessLdtSize */
-  ICI_SQ_SAME( sizeof(ULONG),                         sizeof(USHORT),
ICIF_QUERY | ICIF_SET ),          /* ProcessDefaultHardErrorMode */
-  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(USHORT),
ICIF_SET ),                       /* ProcessIoPortHandlers */
+  ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN),          sizeof(ULONG),
ICIF_SET ),                       /* ProcessAccessToken */
+  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessLdtInformation */
+  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(ULONG),
ICIF_SET ),                       /* ProcessLdtSize */
+  ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessDefaultHardErrorMode */
+  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(ULONG),
ICIF_SET ),                       /* ProcessIoPortHandlers */
   ICI_SQ_SAME( sizeof(POOLED_USAGE_AND_LIMITS),       sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessPooledUsageAndLimits */
   ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION),  sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessWorkingSetWatch */
-  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(USHORT),
ICIF_SET ),                       /* ProcessUserModeIOPL */
-  ICI_SQ_SAME( sizeof(BOOLEAN),                       sizeof(USHORT),
ICIF_SET ),                       /* ProcessEnableAlignmentFaultFixup */
-  ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS),        sizeof(USHORT),
ICIF_SET ),                      /* ProcessPriorityClass */
+  ICI_SQ_SAME( 0 /* FIXME */,                         sizeof(ULONG),
ICIF_SET ),                       /* ProcessUserModeIOPL */
+  ICI_SQ_SAME( sizeof(BOOLEAN),                       sizeof(ULONG),
ICIF_SET ),                       /* ProcessEnableAlignmentFaultFixup */
+  ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS),        sizeof(USHORT),
ICIF_SET ),                       /* ProcessPriorityClass */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessWx86Information */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessHandleCount */
-  ICI_SQ_SAME( sizeof(KAFFINITY),                     sizeof(USHORT),
ICIF_SET ),                       /* ProcessAffinityMask */
+  ICI_SQ_SAME( sizeof(KAFFINITY),                     sizeof(ULONG),
ICIF_SET ),                       /* ProcessAffinityMask */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessPriorityBoost */
 
   ICI_SQ(/*Q*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Query),
/* ProcessDeviceMap */
          /*S*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Set),
-                                                /*Q*/ sizeof(USHORT),
-                                                /*S*/ sizeof(USHORT),
+                                                /*Q*/ sizeof(ULONG),
+                                                /*S*/ sizeof(ULONG),
 
ICIF_QUERY | ICIF_SET ),
 
-  ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION),   sizeof(USHORT),
ICIF_QUERY | ICIF_SET ),          /* ProcessSessionInformation */
-  ICI_SQ_SAME( sizeof(BOOLEAN),                       sizeof(USHORT),
ICIF_SET ),                       /* ProcessForegroundInformation */
+  ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION),   sizeof(ULONG),
ICIF_QUERY | ICIF_SET ),          /* ProcessSessionInformation */
+  ICI_SQ_SAME( sizeof(BOOLEAN),                       sizeof(ULONG),
ICIF_SET ),                       /* ProcessForegroundInformation */
   ICI_SQ_SAME( sizeof(ULONG),                         sizeof(ULONG),
ICIF_QUERY ),                     /* ProcessWow64Information */
   ICI_SQ_SAME( sizeof(UNICODE_STRING),                sizeof(ULONG),
ICIF_QUERY | ICIF_SIZE_VARIABLE), /* ProcessImageFileName */
 };
Property changes on: trunk/reactos/subsys/system/msiexec
___________________________________________________________________
Name: svn:ignore
   - *.o
*.d
*.exe
*.coff
*.sym
*.map
   + *.d
*.a
*.o
*.bin
*.dll
*.lib
*.coff
*.sym
*.tmp
*.gch
*.pch
*.map
*.exe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050123/e7e765a8/attachment.html