Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68061: [XDK][PSDK][DDK] Share more Se types between winnt and ntddk/ntifs/wdm. Also add missing and improve some existing types and definitions in winnt to match the others.
by akhaldi＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: akhaldi Date: Sun Jun 7 13:14:36 2015 New Revision: 68061 URL: http://svn.reactos.org/svn/reactos?rev=68061&view=rev Log: [XDK][PSDK][DDK] Share more Se types between winnt and ntddk/ntifs/wdm. Also add missing and improve some existing types and definitions in winnt to match the others. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/winnt_old.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=68… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=68… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6806… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=… Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re…

1 0

[akhaldi] 68060: [XDK] Add some workarounds for the UM/KM types mismatches.
by akhaldi＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: akhaldi Date: Sun Jun 7 13:01:46 2015 New Revision: 68060 URL: http://svn.reactos.org/svn/reactos?rev=68060&view=rev Log: [XDK] Add some workarounds for the UM/KM types mismatches. Modified: trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Jun 7 13:01:46 2015 @@ -32,6 +32,7 @@ $define(UCHAR=UCHAR) $define(ULONG=ULONG) +$define(USHORT=USHORT) /* Dependencies */ #include <ntddk.h> Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sun Jun 7 13:01:46 2015 @@ -76,7 +76,9 @@ extern "C" { #endif +$define(UCHAR=UCHAR) $define(ULONG=ULONG) +$define(USHORT=USHORT) #if !defined(_NTHALDLL_) && !defined(_BLDR_) #define NTHALAPI DECLSPEC_IMPORT

1 0

[ekohl] 68059: [DISK] Get rid of explicit status definition. Import ntiologc.h instead.
by ekohl＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: ekohl Date: Sun Jun 7 11:46:34 2015 New Revision: 68059 URL: http://svn.reactos.org/svn/reactos?rev=68059&view=rev Log: [DISK] Get rid of explicit status definition. Import ntiologc.h instead. Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sun Jun 7 11:46:34 2015 @@ -12,14 +12,13 @@ #include <ntddscsi.h> #include <mountdev.h> #include <mountmgr.h> +#include <ntiologc.h> #include <include/class2.h> #include <stdio.h> #define NDEBUG #include <debug.h> -#define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) -#define IO_WRITE_CACHE_DISABLED ((NTSTATUS)0x80040022L) #ifdef POOL_TAGGING #ifdef ExAllocatePool @@ -4810,6 +4809,7 @@ ULONG numberListElements; BOOLEAN found; + DPRINT1("UpdateDeviceObjects()\n"); partitionCount = ((partitionList->PartitionCount + 3) / 4) * 4; // @@ -4910,10 +4910,11 @@ if (partitionEntry->PartitionLength.QuadPart == deviceExtension->PartitionLength.QuadPart) { - DebugPrint((3, +// DebugPrint((3, + DPRINT1( "UpdateDeviceObjects: Found match for \\Harddisk%d\\Partition%d\n", physicalExtension->DeviceNumber, - diskData->PartitionNumber)); + diskData->PartitionNumber); // // Indicate match is found and set partition number @@ -4949,11 +4950,12 @@ diskData->PartitionOrdinal = partitionOrdinal; - DebugPrint((1, +// DebugPrint((1, + DPRINT1( "UpdateDeviceObjects: Disk %d ordinal %d is partition %d\n", physicalExtension->DeviceNumber, diskData->PartitionOrdinal, - diskData->PartitionNumber)); + diskData->PartitionNumber); } else { @@ -4961,10 +4963,11 @@ // no match was found, indicate this partition is gone. // - DebugPrint((1, +// DebugPrint((1, + DPRINT1( "UpdateDeviceObjects: Deleting \\Device\\Harddisk%x\\Partition%x\n", physicalExtension->DeviceNumber, - diskData->PartitionNumber)); + diskData->PartitionNumber); deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0; } @@ -5086,9 +5089,10 @@ continue; } - DebugPrint((3, +// DebugPrint((3, + DPRINT1( "UpdateDeviceObjects: Create device object %s\n", - ntNameBuffer)); + ntNameBuffer); // // This is a new name. Create the device object to represent it. @@ -5103,9 +5107,10 @@ &deviceObject); if (!NT_SUCCESS(status)) { - DebugPrint((1, +// DebugPrint((1, + DPRINT1( "UpdateDeviceObjects: Can't create device %s\n", - ntNameBuffer)); + ntNameBuffer); RtlFreeUnicodeString(&ntUnicodeString); continue; } @@ -5196,10 +5201,11 @@ diskData = (PDISK_DATA)(deviceExtension + 1); - DebugPrint((1, +// DebugPrint((1, + DPRINT1( "UpdateDeviceObjects: Used existing device object \\Device\\Harddisk%x\\Partition%x\n", physicalExtension->DeviceNumber, - partitionNumber)); + partitionNumber); } // @@ -5214,10 +5220,11 @@ diskData->HiddenSectors = partitionEntry->HiddenSectors; diskData->PartitionOrdinal = partitionOrdinal; - DebugPrint((1, +// DebugPrint((1, + DPRINT1( "UpdateDeviceObjects: Ordinal %d is partition %d\n", diskData->PartitionOrdinal, - diskData->PartitionNumber)); + diskData->PartitionNumber); // // Update partition number passed in to indicate the

1 0

[akhaldi] 68058: [XDK][PSDK][DDK] Share some Se types between winnt and ntifs/wdm. WIP.
by akhaldi＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: akhaldi Date: Sun Jun 7 09:57:36 2015 New Revision: 68058 URL: http://svn.reactos.org/svn/reactos?rev=68058&view=rev Log: [XDK][PSDK][DDK] Share some Se types between winnt and ntifs/wdm. WIP. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=68… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Jun 7 09:57:36 2015 @@ -30,6 +30,7 @@ extern "C" { #endif + /* Dependencies */ #include <ntddk.h> #include <excpt.h> @@ -63,6 +64,7 @@ /****************************************************************************** * Security Manager Types * ******************************************************************************/ + #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED #define SID_IDENTIFIER_AUTHORITY_DEFINED typedef struct _SID_IDENTIFIER_AUTHORITY { @@ -83,6 +85,7 @@ #endif } SID, *PISID; #endif + #define SID_REVISION 1 #define SID_MAX_SUB_AUTHORITIES 15 Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6805… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Jun 7 09:57:36 2015 @@ -75,6 +75,7 @@ #ifdef __cplusplus extern "C" { #endif + #if !defined(_NTHALDLL_) && !defined(_BLDR_) #define NTHALAPI DECLSPEC_IMPORT @@ -2514,8 +2515,11 @@ typedef PVOID PSECURITY_DESCRIPTOR; typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION; typedef ULONG ACCESS_MASK, *PACCESS_MASK; + + typedef PVOID PACCESS_TOKEN; typedef PVOID PSID; + #define DELETE 0x00010000L #define READ_CONTROL 0x00020000L @@ -2594,6 +2598,7 @@ LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY]; } PRIVILEGE_SET,*PPRIVILEGE_SET; + typedef enum _SECURITY_IMPERSONATION_LEVEL { SecurityAnonymous, SecurityIdentification, @@ -2601,6 +2606,7 @@ SecurityDelegation } SECURITY_IMPERSONATION_LEVEL, * PSECURITY_IMPERSONATION_LEVEL; + #define SECURITY_MAX_IMPERSONATION_LEVEL SecurityDelegation #define SECURITY_MIN_IMPERSONATION_LEVEL SecurityAnonymous #define DEFAULT_IMPERSONATION_LEVEL SecurityImpersonation @@ -2608,6 +2614,7 @@ #define SECURITY_DYNAMIC_TRACKING (TRUE) #define SECURITY_STATIC_TRACKING (FALSE) + typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, *PSECURITY_CONTEXT_TRACKING_MODE; @@ -2624,6 +2631,7 @@ BOOLEAN EffectiveOnly; SECURITY_IMPERSONATION_LEVEL Level; } SE_IMPERSONATION_STATE, *PSE_IMPERSONATION_STATE; + #define OWNER_SECURITY_INFORMATION (0x00000001L) #define GROUP_SECURITY_INFORMATION (0x00000002L) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jun 7 09:57:36 2015 @@ -4462,43 +4462,60 @@ BOOL bInheritHandle; } SECURITY_ATTRIBUTES,*PSECURITY_ATTRIBUTES,*LPSECURITY_ATTRIBUTES; +/****************************************************************************** + * Security Manager Types * + ******************************************************************************/ + +typedef PVOID PACCESS_TOKEN; +typedef PVOID PSID; + + typedef enum _SECURITY_IMPERSONATION_LEVEL { SecurityAnonymous, SecurityIdentification, SecurityImpersonation, SecurityDelegation -} SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL; - -typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE; +} SECURITY_IMPERSONATION_LEVEL, * PSECURITY_IMPERSONATION_LEVEL; + + +typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, *PSECURITY_CONTEXT_TRACKING_MODE; typedef struct _SECURITY_QUALITY_OF_SERVICE { DWORD Length; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; BOOLEAN EffectiveOnly; -} SECURITY_QUALITY_OF_SERVICE,*PSECURITY_QUALITY_OF_SERVICE; - -typedef PVOID PACCESS_TOKEN; +} SECURITY_QUALITY_OF_SERVICE, *PSECURITY_QUALITY_OF_SERVICE; typedef struct _SE_IMPERSONATION_STATE { PACCESS_TOKEN Token; BOOLEAN CopyOnOpen; BOOLEAN EffectiveOnly; SECURITY_IMPERSONATION_LEVEL Level; -} SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE; - +} SE_IMPERSONATION_STATE, *PSE_IMPERSONATION_STATE; + + +#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED +#define SID_IDENTIFIER_AUTHORITY_DEFINED typedef struct _SID_IDENTIFIER_AUTHORITY { BYTE Value[6]; } SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; - -typedef PVOID PSID; - +#endif + +#ifndef SID_DEFINED +#define SID_DEFINED typedef struct _SID { BYTE Revision; BYTE SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; +#ifdef MIDL_PASS + [size_is(SubAuthorityCount)] DWORD SubAuthority[*]; +#else DWORD SubAuthority[ANYSIZE_ARRAY]; +#endif } SID, *PISID; +#endif + #define SECURITY_MIN_SID_SIZE (sizeof(SID)) #define SECURITY_MAX_SID_SIZE (FIELD_OFFSET(SID, SubAuthority) + SID_MAX_SUB_AUTHORITIES * sizeof(DWORD)) Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/setypes.h [iso-8859-1] Sun Jun 7 09:57:36 2015 @@ -7,8 +7,15 @@ typedef PVOID PSECURITY_DESCRIPTOR; typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION; typedef ULONG ACCESS_MASK, *PACCESS_MASK; + +$endif (_WDMDDK_) +$if (_WDMDDK_ || _WINNT_) + typedef PVOID PACCESS_TOKEN; typedef PVOID PSID; + +$endif (_WDMDDK_ || _WINNT_) +$if (_WDMDDK_) #define DELETE 0x00010000L #define READ_CONTROL 0x00020000L @@ -87,6 +94,9 @@ LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY]; } PRIVILEGE_SET,*PPRIVILEGE_SET; +$endif(_WDMDDK_) +$if(_WDMDDK_ || _WINNT_) + typedef enum _SECURITY_IMPERSONATION_LEVEL { SecurityAnonymous, SecurityIdentification, @@ -94,6 +104,9 @@ SecurityDelegation } SECURITY_IMPERSONATION_LEVEL, * PSECURITY_IMPERSONATION_LEVEL; +$endif (_WDMDDK_ || _WINNT_) +$if (_WDMDDK_) + #define SECURITY_MAX_IMPERSONATION_LEVEL SecurityDelegation #define SECURITY_MIN_IMPERSONATION_LEVEL SecurityAnonymous #define DEFAULT_IMPERSONATION_LEVEL SecurityImpersonation @@ -102,10 +115,13 @@ #define SECURITY_DYNAMIC_TRACKING (TRUE) #define SECURITY_STATIC_TRACKING (FALSE) +$endif (_WDMDDK_) +$if (_WDMDDK_ || _WINNT_) + typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE, *PSECURITY_CONTEXT_TRACKING_MODE; typedef struct _SECURITY_QUALITY_OF_SERVICE { - ULONG Length; + $ULONG Length; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; BOOLEAN EffectiveOnly; @@ -117,6 +133,9 @@ BOOLEAN EffectiveOnly; SECURITY_IMPERSONATION_LEVEL Level; } SE_IMPERSONATION_STATE, *PSE_IMPERSONATION_STATE; + +$endif (_WDMDDK_ || _WINNT_) +$if (_WDMDDK_) #define OWNER_SECURITY_INFORMATION (0x00000001L) #define GROUP_SECURITY_INFORMATION (0x00000002L) @@ -393,27 +412,31 @@ WinThisOrganizationCertificateSid = 82, } WELL_KNOWN_SID_TYPE; $endif (_NTDDK_) -$if (_NTIFS_) +$if (_NTIFS_ || _WINNT_) + #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED #define SID_IDENTIFIER_AUTHORITY_DEFINED typedef struct _SID_IDENTIFIER_AUTHORITY { - UCHAR Value[6]; + $UCHAR Value[6]; } SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; #endif #ifndef SID_DEFINED #define SID_DEFINED typedef struct _SID { - UCHAR Revision; - UCHAR SubAuthorityCount; + $UCHAR Revision; + $UCHAR SubAuthorityCount; SID_IDENTIFIER_AUTHORITY IdentifierAuthority; #ifdef MIDL_PASS - [size_is(SubAuthorityCount)] ULONG SubAuthority[*]; + [size_is(SubAuthorityCount)] $ULONG SubAuthority[*]; #else - ULONG SubAuthority[ANYSIZE_ARRAY]; + $ULONG SubAuthority[ANYSIZE_ARRAY]; #endif } SID, *PISID; #endif + +$endif (_NTIFS_ || _WINNT_) +$if (_NTIFS_) #define SID_REVISION 1 #define SID_MAX_SUB_AUTHORITIES 15 Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sun Jun 7 09:57:36 2015 @@ -2567,43 +2567,7 @@ BOOL bInheritHandle; } SECURITY_ATTRIBUTES,*PSECURITY_ATTRIBUTES,*LPSECURITY_ATTRIBUTES; -typedef enum _SECURITY_IMPERSONATION_LEVEL { - SecurityAnonymous, - SecurityIdentification, - SecurityImpersonation, - SecurityDelegation -} SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL; - -typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE; - -typedef struct _SECURITY_QUALITY_OF_SERVICE { - DWORD Length; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; - BOOLEAN EffectiveOnly; -} SECURITY_QUALITY_OF_SERVICE,*PSECURITY_QUALITY_OF_SERVICE; - -typedef PVOID PACCESS_TOKEN; - -typedef struct _SE_IMPERSONATION_STATE { - PACCESS_TOKEN Token; - BOOLEAN CopyOnOpen; - BOOLEAN EffectiveOnly; - SECURITY_IMPERSONATION_LEVEL Level; -} SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE; - -typedef struct _SID_IDENTIFIER_AUTHORITY { - BYTE Value[6]; -} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; - -typedef PVOID PSID; - -typedef struct _SID { - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[ANYSIZE_ARRAY]; -} SID, *PISID; +$include(setypes.h) #define SECURITY_MIN_SID_SIZE (sizeof(SID)) #define SECURITY_MAX_SID_SIZE (FIELD_OFFSET(SID, SubAuthority) + SID_MAX_SUB_AUTHORITIES * sizeof(DWORD))

1 0

[akhaldi] 68057: [XDK] Add some workarounds for the UM/KM types mismatches.
by akhaldi＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: akhaldi Date: Sun Jun 7 09:28:56 2015 New Revision: 68057 URL: http://svn.reactos.org/svn/reactos?rev=68057&view=rev Log: [XDK] Add some workarounds for the UM/KM types mismatches. Modified: trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Jun 7 09:28:56 2015 @@ -29,6 +29,9 @@ #ifdef __cplusplus extern "C" { #endif + +$define(UCHAR=UCHAR) +$define(ULONG=ULONG) /* Dependencies */ #include <ntddk.h> Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sun Jun 7 09:28:56 2015 @@ -75,6 +75,8 @@ #ifdef __cplusplus extern "C" { #endif + +$define(ULONG=ULONG) #if !defined(_NTHALDLL_) && !defined(_BLDR_) #define NTHALAPI DECLSPEC_IMPORT

1 0

[akhaldi] 68056: [XDK] Correct the paths for some output headers.
by akhaldi＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: akhaldi Date: Sun Jun 7 09:13:09 2015 New Revision: 68056 URL: http://svn.reactos.org/svn/reactos?rev=68056&view=rev Log: [XDK] Correct the paths for some output headers. Modified: trunk/reactos/include/xdk/generate.bat Modified: trunk/reactos/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r… ============================================================================== --- trunk/reactos/include/xdk/generate.bat [iso-8859-1] (original) +++ trunk/reactos/include/xdk/generate.bat [iso-8859-1] Sun Jun 7 09:13:09 2015 @@ -1,8 +1,8 @@ -hpp.exe wdm.template.h wdm.h -hpp.exe ntddk.template.h ntddk.h -hpp.exe ntifs.template.h ntifs.h -hpp.exe devioctl.template.h devioctl.h +hpp.exe wdm.template.h ..\ddk\wdm.h +hpp.exe ntddk.template.h ..\ddk\ntddk.h +hpp.exe ntifs.template.h ..\ddk\ntifs.h +hpp.exe devioctl.template.h ..\psdk\devioctl.h hpp.exe ntdef.template.h ..\psdk\ntdef.h hpp.exe winnt.template.h ..\psdk\winnt.h

1 0

[aandrejevic] 68055: [NTVDM] Fix the previous fix.
by aandrejevic＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: aandrejevic Date: Sun Jun 7 02:51:06 2015 New Revision: 68055 URL: http://svn.reactos.org/svn/reactos?rev=68055&view=rev Log: [NTVDM] Fix the previous fix. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Jun 7 02:51:06 2015 @@ -1903,7 +1903,7 @@ /* General failure */ setAX(0x800C); - Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + Stack[STACK_FLAGS - 1] |= EMULATOR_FLAG_CF; } VOID WINAPI DosInt27h(LPWORD Stack)

1 0

[aandrejevic] 68054: [NTVDM] Stubplement INT 25h and INT 26h. These interrupt calls are really weird since they don't IRET on return, so the default interrupt stub messes up the stack.
by aandrejevic＠svn.reactos.org 07 Jun '15

07 Jun '15

Author: aandrejevic Date: Sun Jun 7 02:49:54 2015 New Revision: 68054 URL: http://svn.reactos.org/svn/reactos?rev=68054&view=rev Log: [NTVDM] Stubplement INT 25h and INT 26h. These interrupt calls are really weird since they don't IRET on return, so the default interrupt stub messes up the stack. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Jun 7 02:49:54 2015 @@ -1868,6 +1868,44 @@ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } +VOID WINAPI DosAbsoluteRead(LPWORD Stack) +{ + /* + * This call should leave the flags on the stack for some reason, + * so move the stack by one word. + */ + Stack[STACK_INT_NUM] = Stack[STACK_IP]; + Stack[STACK_IP] = Stack[STACK_CS]; + Stack[STACK_CS] = Stack[STACK_FLAGS]; + setSP(LOWORD(getSP() - 2)); + + // TODO: NOT IMPLEMENTED; + UNIMPLEMENTED; + + /* General failure */ + setAX(0x800C); + Stack[STACK_FLAGS - 1] |= EMULATOR_FLAG_CF; +} + +VOID WINAPI DosAbsoluteWrite(LPWORD Stack) +{ + /* + * This call should leave the flags on the stack for some reason, + * so move the stack by one word. + */ + Stack[STACK_INT_NUM] = Stack[STACK_IP]; + Stack[STACK_IP] = Stack[STACK_CS]; + Stack[STACK_CS] = Stack[STACK_FLAGS]; + setSP(LOWORD(getSP() - 2)); + + // TODO: NOT IMPLEMENTED; + UNIMPLEMENTED; + + /* General failure */ + setAX(0x800C); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; +} + VOID WINAPI DosInt27h(LPWORD Stack) { DosTerminateProcess(getCS(), 0, (getDX() + 0x0F) >> 4); @@ -2078,14 +2116,14 @@ // RegisterDosInt32(0x22, DosInt22h ); // Termination RegisterDosInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break // RegisterDosInt32(0x24, DosInt24h ); // Critical Error + RegisterDosInt32(0x25, DosAbsoluteRead ); // Absolute Disk Read + RegisterDosInt32(0x26, DosAbsoluteWrite ); // Absolute Disk Write RegisterDosInt32(0x27, DosInt27h ); // Terminate and Stay Resident RegisterDosInt32(0x28, DosIdle ); // DOS Idle Interrupt RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); /* Unimplemented DOS interrupts */ - RegisterDosInt32(0x25, NULL); // Absolute Disk Read - RegisterDosInt32(0x26, NULL); // Absolute Disk Write RegisterDosInt32(0x2A, NULL); // Network - Installation Check /* Load the CON driver */

1 0

[akhaldi] 68053: [LOTUS] Create the textfiles folder in preparation for the output files.
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 22:24:42 2015 New Revision: 68053 URL: http://svn.reactos.org/svn/reactos?rev=68053&view=rev Log: [LOTUS] Create the textfiles folder in preparation for the output files. Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] Sat Jun 6 22:24:42 2015 @@ -4,6 +4,7 @@ textfiles/LargeFontsNormal.INI textfiles/NormalNormal.INI) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/textfiles) foreach(_file ${TEXTFILES}) get_filename_component(_file_name ${_file} NAME_WE) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}")

1 0

[akhaldi] 68052: [SHELL32] Add colon to Recycle Bin properties. By Jared Smudde. CORE-9771
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 21:09:05 2015 New Revision: 68052 URL: http://svn.reactos.org/svn/reactos?rev=68052&view=rev Log: [SHELL32] Add colon to Recycle Bin properties. By Jared Smudde. CORE-9771 Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Sat Jun 6 21:09:05 2015 @@ -953,7 +953,7 @@ dwSerial = -1; } - swprintf(szVolume, L"%s (%c)", szName, szDrive[0]); + swprintf(szVolume, L"%s (%c:)", szName, szDrive[0]); memset(&li, 0x0, sizeof(LVITEMW)); li.mask = LVIF_TEXT | LVIF_PARAM; li.iSubItem = 0;

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