Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ekohl] 17178: Replace Win32 types by native ones.

by ekohl＠svn.reactos.com

Replace Win32 types by native ones. Modified: trunk/reactos/drivers/storage/atapi/atapi.h _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.h --- trunk/reactos/drivers/storage/atapi/atapi.h 2005-08-07 18:47:26 UTC (rev 17177) +++ trunk/reactos/drivers/storage/atapi/atapi.h 2005-08-07 20:33:11 UTC (rev 17178) @@ -161,64 +161,64 @@ typedef struct _IDE_DRIVE_IDENTIFY { - WORD ConfigBits; /*00*/ - WORD LogicalCyls; /*01*/ - WORD Reserved02; /*02*/ - WORD LogicalHeads; /*03*/ - WORD BytesPerTrack; /*04*/ - WORD BytesPerSector; /*05*/ - WORD SectorsPerTrack; /*06*/ - BYTE InterSectorGap; /*07*/ - BYTE InterSectorGapSize; - BYTE Reserved08H; /*08*/ - BYTE BytesInPLO; - WORD VendorUniqueCnt; /*09*/ - char SerialNumber[20]; /*10*/ - WORD ControllerType; /*20*/ - WORD BufferSize; /*21*/ - WORD ECCByteCnt; /*22*/ - char FirmwareRev[8]; /*23*/ - char ModelNumber[40]; /*27*/ - WORD RWMultImplemented; /*47*/ - WORD DWordIo; /*48*/ - WORD Capabilities; /*49*/ + USHORT ConfigBits; /*00*/ + USHORT LogicalCyls; /*01*/ + USHORT Reserved02; /*02*/ + USHORT LogicalHeads; /*03*/ + USHORT BytesPerTrack; /*04*/ + USHORT BytesPerSector; /*05*/ + USHORT SectorsPerTrack; /*06*/ + UCHAR InterSectorGap; /*07*/ + UCHAR InterSectorGapSize; + UCHAR Reserved08H; /*08*/ + UCHAR BytesInPLO; + USHORT VendorUniqueCnt; /*09*/ + UCHAR SerialNumber[20]; /*10*/ + USHORT ControllerType; /*20*/ + USHORT BufferSize; /*21*/ + USHORT ECCByteCnt; /*22*/ + UCHAR FirmwareRev[8]; /*23*/ + UCHAR ModelNumber[40]; /*27*/ + USHORT RWMultImplemented; /*47*/ + USHORT DWordIo; /*48*/ + USHORT Capabilities; /*49*/ #define IDE_DRID_STBY_SUPPORTED 0x2000 #define IDE_DRID_IORDY_SUPPORTED 0x0800 #define IDE_DRID_IORDY_DISABLE 0x0400 #define IDE_DRID_LBA_SUPPORTED 0x0200 #define IDE_DRID_DMA_SUPPORTED 0x0100 - WORD Reserved50; /*50*/ - WORD MinPIOTransTime; /*51*/ - WORD MinDMATransTime; /*52*/ - WORD TMFieldsValid; /*53*/ - WORD TMCylinders; /*54*/ - WORD TMHeads; /*55*/ - WORD TMSectorsPerTrk; /*56*/ - WORD TMCapacityLo; /*57*/ - WORD TMCapacityHi; /*58*/ - WORD RWMultCurrent; /*59*/ - WORD TMSectorCountLo; /*60*/ - WORD TMSectorCountHi; /*61*/ - WORD DmaModes; /*62*/ - WORD MultiDmaModes; /*63*/ - WORD Reserved64[5]; /*64*/ - WORD Reserved69[2]; /*69*/ - WORD Reserved71[4]; /*71*/ - WORD MaxQueueDepth; /*75*/ - WORD Reserved76[4]; /*76*/ - WORD MajorRevision; /*80*/ - WORD MinorRevision; /*81*/ - WORD SupportedFeatures82; /*82*/ - WORD SupportedFeatures83; /*83*/ - WORD SupportedFeatures84; /*84*/ - WORD EnabledFeatures85; /*85*/ - WORD EnabledFeatures86; /*86*/ - WORD EnabledFeatures87; /*87*/ - WORD UltraDmaModes; /*88*/ - WORD Reserved89[11]; /*89*/ - WORD Max48BitAddress[4]; /*100*/ - WORD Reserved104[151]; /*104*/ - WORD Checksum; /*255*/ + USHORT Reserved50; /*50*/ + USHORT MinPIOTransTime; /*51*/ + USHORT MinDMATransTime; /*52*/ + USHORT TMFieldsValid; /*53*/ + USHORT TMCylinders; /*54*/ + USHORT TMHeads; /*55*/ + USHORT TMSectorsPerTrk; /*56*/ + USHORT TMCapacityLo; /*57*/ + USHORT TMCapacityHi; /*58*/ + USHORT RWMultCurrent; /*59*/ + USHORT TMSectorCountLo; /*60*/ + USHORT TMSectorCountHi; /*61*/ + USHORT DmaModes; /*62*/ + USHORT MultiDmaModes; /*63*/ + USHORT Reserved64[5]; /*64*/ + USHORT Reserved69[2]; /*69*/ + USHORT Reserved71[4]; /*71*/ + USHORT MaxQueueDepth; /*75*/ + USHORT Reserved76[4]; /*76*/ + USHORT MajorRevision; /*80*/ + USHORT MinorRevision; /*81*/ + USHORT SupportedFeatures82; /*82*/ + USHORT SupportedFeatures83; /*83*/ + USHORT SupportedFeatures84; /*84*/ + USHORT EnabledFeatures85; /*85*/ + USHORT EnabledFeatures86; /*86*/ + USHORT EnabledFeatures87; /*87*/ + USHORT UltraDmaModes; /*88*/ + USHORT Reserved89[11]; /*89*/ + USHORT Max48BitAddress[4]; /*100*/ + USHORT Reserved104[151]; /*104*/ + USHORT Checksum; /*255*/ } IDE_DRIVE_IDENTIFY, *PIDE_DRIVE_IDENTIFY;

19 years, 4 months

[weiden] 17177: also actually rename the files...

by weiden＠svn.reactos.com

also actually rename the files... Added: trunk/reactos/regtests/winetests/advapi32/advapi32.xml Deleted: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml Added: trunk/reactos/regtests/winetests/comctl32/comctl32.xml Deleted: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml Added: trunk/reactos/regtests/winetests/gdi32/gdi32.xml Deleted: trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml Added: trunk/reactos/regtests/winetests/kernel32/kernel32.xml Deleted: trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml Added: trunk/reactos/regtests/winetests/msvcrt/msvcrt.xml Deleted: trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml Added: trunk/reactos/regtests/winetests/ntdll/ntdll.xml Deleted: trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml Added: trunk/reactos/regtests/winetests/psapi/psapi.xml Deleted: trunk/reactos/regtests/winetests/psapi/psapi_test.xml Added: trunk/reactos/regtests/winetests/shlwapi/shlwapi.xml Deleted: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml Added: trunk/reactos/regtests/winetests/user32/user32.xml Deleted: trunk/reactos/regtests/winetests/user32/user32_test.xml Added: trunk/reactos/regtests/winetests/version/version.xml Deleted: trunk/reactos/regtests/winetests/version/version_test.xml _____ Copied: trunk/reactos/regtests/winetests/advapi32/advapi32.xml (from rev 17176, trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml --- trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,9 +0,0 @@ -<module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" warnings="true"> - <include base="advapi32_winetest">.</include> - <define name="__USE_W32API" /> - <library>advapi32</library> - <library>ntdll</library> - <file>registry.c</file> - <file>security.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/comctl32/comctl32.xml (from rev 17176, trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml --- trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,13 +0,0 @@ -<module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" warnings="true"> - <include base="comctl32_winetest">.</include> - <define name="__USE_W32API" /> - <library>shlwapi</library> - <library>ole32</library> - <library>comctl32</library> - <library>ntdll</library> - <file>dpa.c</file> - <file>mru.c</file> - <file>subclass.c</file> - <file>tab.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/gdi32/gdi32.xml (from rev 17176, trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml --- trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,11 +0,0 @@ -<module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" warnings="true"> - <include base="gdi32_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>gdi32</library> - <file>bitmap.c</file> - <file>brush.c</file> - <file>gdiobj.c</file> - <file>metafile.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/kernel32/kernel32.xml (from rev 17176, trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml --- trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,31 +0,0 @@ -<module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" warnings="true"> - <include base="kernel32_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>kernel32</library> - <file>alloc.c</file> - <file>atom.c</file> - <file>change.c</file> - <file>codepage.c</file> - <file>comm.c</file> - <file>console.c</file> - <file>directory.c</file> - <file>drive.c</file> - <file>environ.c</file> - <file>file.c</file> - <file>format_msg.c</file> - <file>heap.c</file> - <file>locale.c</file> - <file>mailslot.c</file> - <file>module.c</file> - <file>path.c</file> - <file>pipe.c</file> - <file>process.c</file> - <file>profile.c</file> - <file>sync.c</file> - <file>thread.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>virtual.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/msvcrt/msvcrt.xml (from rev 17176, trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml --- trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,14 +0,0 @@ -<module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" warnings="true"> - <include base="msvcrt_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <file>cpp.c</file> - <file>environ.c</file> - <file>file.c</file> - <file>heap.c</file> - <file>printf.c</file> - <file>scanf.c</file> - <file>string.c</file> - <file>testlist.c</file> - <file>time.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/ntdll/ntdll.xml (from rev 17176, trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml --- trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,18 +0,0 @@ -<module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" warnings="true"> - <include base="ntdll_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <file>atom.c</file> - <file>env.c</file> - <file>error.c</file> - <file>info.c</file> - <file>large_int.c</file> - <file>path.c</file> - <file>reg.c</file> - <file>rtlbitmap.c</file> - <file>rtl.c</file> - <file>rtlstr.c</file> - <file>string.c</file> - <file>time.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/psapi/psapi.xml (from rev 17176, trunk/reactos/regtests/winetests/psapi/psapi_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/psapi/psapi_test.xml --- trunk/reactos/regtests/winetests/psapi/psapi_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/psapi/psapi_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,8 +0,0 @@ -<module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" warnings="true"> - <include base="psapi_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>psapi</library> - <file>testlist.c</file> - <file>module.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/shlwapi/shlwapi.xml (from rev 17176, trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml --- trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,13 +0,0 @@ -<module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" warnings="true"> - <include base="shlwapi_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>shlwapi</library> - <library>ole32</library> - <library>oleaut32</library> - <file>clist.c</file> - <file>ordinal.c</file> - <file>shreg.c</file> - <file>string.c</file> - <file>testlist.c</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/user32/user32.xml (from rev 17176, trunk/reactos/regtests/winetests/user32/user32_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/user32/user32_test.xml --- trunk/reactos/regtests/winetests/user32/user32_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/user32/user32_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,25 +0,0 @@ -<module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" warnings="true"> - <include base="user32_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>user32</library> - <library>gdi32</library> - <file>class.c</file> - <file>clipboard.c</file> - <file>dce.c</file> - <file>dde.c</file> - <file>dialog.c</file> - <file>edit.c</file> - <file>input.c</file> - <file>listbox.c</file> - <file>menu.c</file> - <file>msg.c</file> - <file>resource.c</file> - <file>sysparams.c</file> - <file>text.c</file> - <file>win.c</file> - <file>winstation.c</file> - <file>wsprintf.c</file> - <file>testlist.c</file> - <file>resource.rc</file> -</module> _____ Copied: trunk/reactos/regtests/winetests/version/version.xml (from rev 17176, trunk/reactos/regtests/winetests/version/version_test.xml) _____ Deleted: trunk/reactos/regtests/winetests/version/version_test.xml --- trunk/reactos/regtests/winetests/version/version_test.xml 2005-08-07 18:38:37 UTC (rev 17176) +++ trunk/reactos/regtests/winetests/version/version_test.xml 2005-08-07 18:47:26 UTC (rev 17177) @@ -1,8 +0,0 @@ -<module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" warnings="true"> - <include base="version_winetest">.</include> - <define name="__USE_W32API" /> - <library>ntdll</library> - <library>version</library> - <file>testlist.c</file> - <file>info.c</file> -</module>

19 years, 4 months

[ion] 17176: - Initialize more fields when creating an Object Type

by ion＠svn.reactos.com

- Initialize more fields when creating an Object Type - Correct the Pool Charge for Object Types, select a Default Object, always use a security procedure, read global flag for maintaing type lists, set the pool type - Initialize a Default Wait Object. - Fix security callback for objects. - Implement SeDefaultObjectMethod for security callbacks of objects which don't have a custom one. Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/se/semgr.c _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/include/ndk/obtypes.h 2005-08-07 18:38:37 UTC (rev 17176) @@ -95,13 +95,17 @@ ULONG Attributes ); + typedef NTSTATUS (STDCALL *OB_SECURITY_METHOD)( - PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength + PVOID Object, + SECURITY_OPERATION_CODE OperationType, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR NewSecurityDescriptor, + PULONG ReturnLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping ); /* FIXME: TEMPORARY HACK */ _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-08-07 18:38:37 UTC (rev 17176) @@ -497,7 +497,10 @@ SECURITY_OPERATION_CODE OperationCode, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength); + PULONG BufferLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping); NTSTATUS STDCALL CmiObjectQueryName (PVOID ObjectBody, _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -450,7 +450,10 @@ SECURITY_OPERATION_CODE OperationCode, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength) + PULONG BufferLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping) { DPRINT("CmiObjectSecurity() called\n"); _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-08-07 18:38:37 UTC (rev 17176) @@ -400,7 +400,10 @@ SECURITY_OPERATION_CODE OperationCode, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength + PULONG BufferLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping ); NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2005-08-07 18:38:37 UTC (rev 17176) @@ -181,6 +181,17 @@ IN KPROCESSOR_MODE AccessMode, IN BOOLEAN CaptureIfKernel); +NTSTATUS +STDCALL +SeDefaultObjectMethod(PVOID Object, + SECURITY_OPERATION_CODE OperationType, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR NewSecurityDescriptor, + PULONG ReturnLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping); + #define SepAcquireTokenLockExclusive(Token) \ do { \ KeEnterCriticalRegion(); \ _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/io/file.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -239,7 +239,10 @@ SECURITY_OPERATION_CODE OperationCode, SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength) + PULONG BufferLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION StackPtr; _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -1109,6 +1109,9 @@ AssignSecurityDescriptor, 0, NewSecurityDescriptor, + NULL, + NULL, + NonPagedPool, NULL); } else _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -14,6 +14,7 @@ #define NDEBUG #include <internal/debug.h> +extern ULONG NtGlobalFlag; /* GLOBALS ****************************************************************/ @@ -24,8 +25,8 @@ PDIRECTORY_OBJECT ObpTypeDirectoryObject = NULL; /* FIXME: Move this somewhere else once devicemap support is in */ PDEVICE_MAP ObSystemDeviceMap = NULL; +KEVENT ObpDefaultObject; - static GENERIC_MAPPING ObpDirectoryMapping = { STANDARD_RIGHTS_READ|DIRECTORY_QUERY|DIRECTORY_TRAVERSE, STANDARD_RIGHTS_WRITE|DIRECTORY_CREATE_OBJECT|DIRECTORY_CREATE_SUBDIRECT ORY, @@ -430,6 +431,9 @@ /* Initialize the security descriptor cache */ ObpInitSdCache(); + /* Initialize the Default Event */ + KeInitializeEvent(&ObpDefaultObject, NotificationEvent, TRUE ); + /* Create the Type Type */ DPRINT("Creating Type Type\n"); RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); @@ -538,6 +542,7 @@ { POBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; + ULONG HeaderSize; NTSTATUS Status; DPRINT("ObpCreateTypeObject(ObjectType: %wZ)\n", TypeName); @@ -580,14 +585,71 @@ /* Set it up */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; LocalObjectType->Name = *TypeName; + LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; + + /* These two flags need to be manually set up */ + Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; + + /* Check if we have to maintain a type list */ + if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) + { + /* Enable support */ + LocalObjectType->TypeInfo.MaintainTypeList = TRUE; + } + + /* Calculate how much space our header'll take up */ + HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + (ObjectTypeInitializer->MaintainHandleCount ? + sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); + + /* Update the Pool Charges */ + if (ObjectTypeInitializer->PoolType == NonPagedPool) + { + LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; + } + else + { + LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; + } + /* All objects types need a security procedure */ + if (!ObjectTypeInitializer->SecurityProcedure) + { + LocalObjectType->TypeInfo.SecurityProcedure = SeDefaultObjectMethod; + } + + /* Select the Wait Object */ + if (LocalObjectType->TypeInfo.UseDefaultObject) + { + /* Add the SYNCHRONIZE access mask since it's waitable */ + LocalObjectType->TypeInfo.ValidAccessMask |= SYNCHRONIZE; + + /* Use the "Default Object", a simple event */ + LocalObjectType->DefaultObject = &ObpDefaultObject; + } + /* Special system objects get an optimized hack so they can be waited on */ + else if (TypeName->Length == 8 && !wcscmp(TypeName->Buffer, L"File")) + { + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, Event); + } + /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ + else + { + /* No default Object */ + LocalObjectType->DefaultObject = NULL; + } + + /* Initialize Object Type components */ + ExInitializeResourceLite(&LocalObjectType->Mutex); + InitializeListHead(&LocalObjectType->TypeList); + /* Insert it into the Object Directory */ if (ObpTypeDirectoryObject) { ObpAddEntryDirectory(ObpTypeDirectoryObject, Header, TypeName->Buffer); ObReferenceObject(ObpTypeDirectoryObject); } - + *ObjectType = LocalObjectType; return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -41,21 +41,15 @@ if (!NT_SUCCESS(Status)) return Status; - if (Type->TypeInfo.SecurityProcedure != NULL) - { /* Call the security method */ Status = Type->TypeInfo.SecurityProcedure(Object, AssignSecurityDescriptor, 0, NewDescriptor, - NULL); - } - else - { - /* Assign the security descriptor to the object header */ - Status = ObpAddSecurityDescriptor(NewDescriptor, - &(BODY_TO_HEADER(Object)->SecurityDescriptor)); - } + NULL, + NULL, + NonPagedPool, + NULL); /* Release the new security descriptor */ SeDeassignSecurity(&NewDescriptor); @@ -97,7 +91,10 @@ OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, NULL, - &Length); + &Length, + NULL, + NonPagedPool, + NULL); if (Status != STATUS_BUFFER_TOO_SMALL) return Status; @@ -113,7 +110,10 @@ OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, *SecurityDescriptor, - &Length); + &Length, + NULL, + NonPagedPool, + NULL); if (!NT_SUCCESS(Status)) { ExFreePool(*SecurityDescriptor); @@ -187,23 +187,15 @@ return STATUS_UNSUCCESSFUL; } - if (Header->Type->TypeInfo.SecurityProcedure != NULL) - { *ResultLength = Length; Status = Header->Type->TypeInfo.SecurityProcedure(Object, QuerySecurityDescriptor, SecurityInformation, SecurityDescriptor, - ResultLength); - } - else - { - *ResultLength = Length; - Status = SeQuerySecurityDescriptorInfo(&SecurityInformation, - SecurityDescriptor, - ResultLength, - &Header->SecurityDescriptor); - } + ResultLength, + NULL, + NonPagedPool, + NULL); ObDereferenceObject(Object); @@ -219,20 +211,8 @@ IN SECURITY_INFORMATION SecurityInformation, IN PSECURITY_DESCRIPTOR SecurityDescriptor) { - PSECURITY_DESCRIPTOR ObjectSd; - PSECURITY_DESCRIPTOR NewSd; POBJECT_HEADER Header; PVOID Object; - PSID Owner = 0; - PSID Group = 0; - PACL Dacl = 0; - PACL Sacl = 0; - ULONG OwnerLength = 0; - ULONG GroupLength = 0; - ULONG DaclLength = 0; - ULONG SaclLength = 0; - ULONG Control = 0; - ULONG_PTR Current; NTSTATUS Status; PAGED_CODE(); @@ -259,188 +239,15 @@ return STATUS_UNSUCCESSFUL; } - if (Header->Type->TypeInfo.SecurityProcedure != NULL) - { Status = Header->Type->TypeInfo.SecurityProcedure(Object, SetSecurityDescriptor, SecurityInformation, SecurityDescriptor, - NULL); - } - else - { - ObjectSd = Header->SecurityDescriptor; + NULL, + NULL, + NonPagedPool, + NULL); - /* Get owner and owner size */ - if (SecurityInformation & OWNER_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Owner != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + - (ULONG_PTR)SecurityDescriptor); - else - Owner = (PSID)SecurityDescriptor->Owner; - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); - } - else - { - if (ObjectSd->Owner != NULL) - { - Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); - } - - /* Get group and group size */ - if (SecurityInformation & GROUP_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Group != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + - (ULONG_PTR)SecurityDescriptor); - else - Group = (PSID)SecurityDescriptor->Group; - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); - } - else - { - if (ObjectSd->Group != NULL) - { - Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); - } - - /* Get DACL and DACL size */ - if (SecurityInformation & DACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - (SecurityDescriptor->Dacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + - (ULONG_PTR)SecurityDescriptor); - else - Dacl = (PACL)SecurityDescriptor->Dacl; - - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_DACL_PRESENT) && - (ObjectSd->Dacl != NULL)) - { - Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - - /* Get SACL and SACL size */ - if (SecurityInformation & SACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - (SecurityDescriptor->Sacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + - (ULONG_PTR)SecurityDescriptor); - else - Sacl = (PACL)SecurityDescriptor->Sacl; - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_SACL_PRESENT) && - (ObjectSd->Sacl != NULL)) - { - Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - - NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + - DaclLength + SaclLength); - if (NewSd == NULL) - { - ObDereferenceObject(Object); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); - /* We always build a self-relative descriptor */ - NewSd->Control = Control | SE_SELF_RELATIVE; - - Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); - - if (OwnerLength != 0) - { - RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); - NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); - Current += OwnerLength; - } - - if (GroupLength != 0) - { - RtlCopyMemory((PVOID)Current, - Group, - GroupLength); - NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); - Current += GroupLength; - } - - if (DaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); - NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += DaclLength; - } - - if (SaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); - NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += SaclLength; - } - - /* Add the new SD */ - Status = ObpAddSecurityDescriptor(NewSd, - &Header->SecurityDescriptor); - if (NT_SUCCESS(Status)) - { - /* Remove the old security descriptor */ - ObpRemoveSecurityDescriptor(ObjectSd); - } - else - { - /* Restore the old security descriptor */ - Header->SecurityDescriptor = ObjectSd; - } - - ExFreePool(NewSd); - } - ObDereferenceObject(Object); return Status; _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-08-07 17:46:50 UTC (rev 17175) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-08-07 18:38:37 UTC (rev 17176) @@ -188,7 +188,223 @@ UNIMPLEMENTED; } +NTSTATUS +STDCALL +SeDefaultObjectMethod(PVOID Object, + SECURITY_OPERATION_CODE OperationType, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG ReturnLength, + PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + POOL_TYPE PoolType, + PGENERIC_MAPPING GenericMapping) +{ + PSECURITY_DESCRIPTOR ObjectSd; + PSECURITY_DESCRIPTOR NewSd; + POBJECT_HEADER Header = BODY_TO_HEADER(Object); + PSID Owner = 0; + PSID Group = 0; + PACL Dacl = 0; + PACL Sacl = 0; + ULONG OwnerLength = 0; + ULONG GroupLength = 0; + ULONG DaclLength = 0; + ULONG SaclLength = 0; + ULONG Control = 0; + ULONG_PTR Current; + NTSTATUS Status; + if (OperationType == SetSecurityDescriptor) + { + ObjectSd = Header->SecurityDescriptor; + + /* Get owner and owner size */ + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Owner != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + + (ULONG_PTR)SecurityDescriptor); + else + Owner = (PSID)SecurityDescriptor->Owner; + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); + } + else + { + if (ObjectSd->Owner != NULL) + { + Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); + } + + /* Get group and group size */ + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Group != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + + (ULONG_PTR)SecurityDescriptor); + else + Group = (PSID)SecurityDescriptor->Group; + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); + } + else + { + if (ObjectSd->Group != NULL) + { + Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); + } + + /* Get DACL and DACL size */ + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && + (SecurityDescriptor->Dacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + + (ULONG_PTR)SecurityDescriptor); + else + Dacl = (PACL)SecurityDescriptor->Dacl; + + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_DACL_PRESENT) && + (ObjectSd->Dacl != NULL)) + { + Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + + /* Get SACL and SACL size */ + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && + (SecurityDescriptor->Sacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + + (ULONG_PTR)SecurityDescriptor); + else + Sacl = (PACL)SecurityDescriptor->Sacl; + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_SACL_PRESENT) && + (ObjectSd->Sacl != NULL)) + { + Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + + NewSd = ExAllocatePool(NonPagedPool, + sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + + DaclLength + SaclLength); + if (NewSd == NULL) + { + ObDereferenceObject(Object); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCreateSecurityDescriptor(NewSd, + SECURITY_DESCRIPTOR_REVISION1); + /* We always build a self-relative descriptor */ + NewSd->Control = Control | SE_SELF_RELATIVE; + + Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); + + if (OwnerLength != 0) + { + RtlCopyMemory((PVOID)Current, + Owner, + OwnerLength); + NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); + Current += OwnerLength; + } + + if (GroupLength != 0) + { + RtlCopyMemory((PVOID)Current, + Group, + GroupLength); + NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); + Current += GroupLength; + } + + if (DaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Dacl, + DaclLength); + NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += DaclLength; + } + + if (SaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += SaclLength; + } + + /* Add the new SD */ + Status = ObpAddSecurityDescriptor(NewSd, + &Header->SecurityDescriptor); + if (NT_SUCCESS(Status)) + { + /* Remove the old security descriptor */ + ObpRemoveSecurityDescriptor(ObjectSd); + } + else + { + /* Restore the old security descriptor */ + Header->SecurityDescriptor = ObjectSd; + } + + ExFreePool(NewSd); + } + else if (OperationType == QuerySecurityDescriptor) + { + Status = SeQuerySecurityDescriptorInfo(&SecurityInformation, + SecurityDescriptor, + ReturnLength, + &Header->SecurityDescriptor); + } + else if (OperationType == AssignSecurityDescriptor) + { + /* Assign the security descriptor to the object header */ + Status = ObpAddSecurityDescriptor(SecurityDescriptor, + &Header->SecurityDescriptor); + } + + + return STATUS_SUCCESS; +} + /* * @implemented */

19 years, 4 months

[robertk] 17175: Modification for new RC release

by robertk＠svn.reactos.com

Modification for new RC release Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h --- branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-08-07 17:12:11 UTC (rev 17174) +++ branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-08-07 17:46:50 UTC (rev 17175) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 7 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC1" +#define KERNEL_VERSION_BUILD_TYPE L"RC2" #endif

19 years, 4 months

[sedwards] 17174: no need for long xml filenames

by sedwards＠svn.reactos.com

no need for long xml filenames Modified: trunk/reactos/regtests/winetests/directory.xml _____ Modified: trunk/reactos/regtests/winetests/directory.xml --- trunk/reactos/regtests/winetests/directory.xml 2005-08-07 17:11:13 UTC (rev 17173) +++ trunk/reactos/regtests/winetests/directory.xml 2005-08-07 17:12:11 UTC (rev 17174) @@ -1,32 +1,32 @@ <group> <directory name="advapi32"> - <xi:include href="advapi32/advapi32_test.xml" /> + <xi:include href="advapi32/advapi32.xml" /> </directory> <directory name="comctl32"> - <xi:include href="comctl32/comctl32_test.xml" /> + <xi:include href="comctl32/comctl32.xml" /> </directory> <directory name="gdi32"> - <xi:include href="gdi32/gdi32_test.xml" /> + <xi:include href="gdi32/gdi32.xml" /> </directory> <directory name="kernel32"> - <xi:include href="kernel32/kernel32_test.xml" /> + <xi:include href="kernel32/kernel32.xml" /> </directory> <directory name="msvcrt"> - <xi:include href="msvcrt/msvcrt_test.xml" /> + <xi:include href="msvcrt/msvcrt.xml" /> </directory> <directory name="ntdll"> - <xi:include href="ntdll/ntdll_test.xml" /> + <xi:include href="ntdll/ntdll.xml" /> </directory> <directory name="psapi"> - <xi:include href="psapi/psapi_test.xml" /> + <xi:include href="psapi/psapi.xml" /> </directory> <directory name="shlwapi"> - <xi:include href="shlwapi/shlwapi_test.xml" /> + <xi:include href="shlwapi/shlwapi.xml" /> </directory> <directory name="user32"> - <xi:include href="user32/user32_test.xml" /> + <xi:include href="user32/user32.xml" /> </directory> <directory name="version"> - <xi:include href="version/version_test.xml" /> + <xi:include href="version/version.xml" /> </directory> </group>

19 years, 4 months

[ekohl] 17173: Remove trailing whitespace and fix the indentation.

by ekohl＠svn.reactos.com

Remove trailing whitespace and fix the indentation. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/rtltypes.h _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-08-07 17:07:35 UTC (rev 17172) +++ trunk/reactos/include/ndk/iotypes.h 2005-08-07 17:11:13 UTC (rev 17173) @@ -95,7 +95,7 @@ /* TYPES *********************************************************************/ -typedef struct _MAILSLOT_CREATE_PARAMETERS +typedef struct _MAILSLOT_CREATE_PARAMETERS { ULONG MailslotQuota; ULONG MaximumMessageSize; @@ -103,7 +103,7 @@ BOOLEAN TimeoutSpecified; } MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; -typedef struct _NAMED_PIPE_CREATE_PARAMETERS +typedef struct _NAMED_PIPE_CREATE_PARAMETERS { ULONG NamedPipeType; ULONG ReadMode; @@ -115,7 +115,7 @@ BOOLEAN TimeoutSpecified; } NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; -typedef struct _IO_TIMER +typedef struct _IO_TIMER { USHORT Type; USHORT TimerEnabled; _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-08-07 17:07:35 UTC (rev 17172) +++ trunk/reactos/include/ndk/rtltypes.h 2005-08-07 17:11:13 UTC (rev 17173) @@ -196,19 +196,19 @@ typedef struct _RTL_HANDLE_TABLE_ENTRY { - ULONG Flags; - struct _RTL_HANDLE_TABLE_ENTRY *NextFree; + ULONG Flags; + struct _RTL_HANDLE_TABLE_ENTRY *NextFree; } RTL_HANDLE_TABLE_ENTRY, *PRTL_HANDLE_TABLE_ENTRY; typedef struct _RTL_HANDLE_TABLE { - ULONG MaximumNumberOfHandles; - ULONG SizeOfHandleTableEntry; - ULONG Reserved[2]; - PRTL_HANDLE_TABLE_ENTRY FreeHandles; - PRTL_HANDLE_TABLE_ENTRY CommittedHandles; - PRTL_HANDLE_TABLE_ENTRY UnCommittedHandles; - PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; + ULONG MaximumNumberOfHandles; + ULONG SizeOfHandleTableEntry; + ULONG Reserved[2]; + PRTL_HANDLE_TABLE_ENTRY FreeHandles; + PRTL_HANDLE_TABLE_ENTRY CommittedHandles; + PRTL_HANDLE_TABLE_ENTRY UnCommittedHandles; + PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; typedef struct _LOCK_INFORMATION @@ -233,8 +233,8 @@ #ifdef _INC_EXCPT typedef struct _EXCEPTION_REGISTRATION { - struct _EXCEPTION_REGISTRATION* prev; - PEXCEPTION_HANDLER handler; + struct _EXCEPTION_REGISTRATION *prev; + PEXCEPTION_HANDLER handler; } EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION; #endif @@ -294,10 +294,10 @@ typedef struct _RANGE_LIST_ITERATOR { - PLIST_ENTRY RangeListHead; - PLIST_ENTRY MergedHead; - PVOID Current; - ULONG Stamp; + PLIST_ENTRY RangeListHead; + PLIST_ENTRY MergedHead; + PVOID Current; + ULONG Stamp; } RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; typedef struct _RTL_MESSAGE_RESOURCE_ENTRY @@ -322,15 +322,15 @@ typedef struct _NLS_FILE_HEADER { - USHORT HeaderSize; - USHORT CodePage; - USHORT MaximumCharacterSize; /* SBCS = 1, DBCS = 2 */ - USHORT DefaultChar; - USHORT UniDefaultChar; - USHORT TransDefaultChar; - USHORT TransUniDefaultChar; - USHORT DBCSCodePage; - UCHAR LeadByte[MAXIMUM_LEADBYTES]; + USHORT HeaderSize; + USHORT CodePage; + USHORT MaximumCharacterSize; /* SBCS = 1, DBCS = 2 */ + USHORT DefaultChar; + USHORT UniDefaultChar; + USHORT TransDefaultChar; + USHORT TransUniDefaultChar; + USHORT DBCSCodePage; + UCHAR LeadByte[MAXIMUM_LEADBYTES]; } NLS_FILE_HEADER, *PNLS_FILE_HEADER; typedef struct _RTL_USER_PROCESS_PARAMETERS

19 years, 4 months

[sedwards] 17172: change rostest name back to dllname_test.exe

by sedwards＠svn.reactos.com

change rostest name back to dllname_test.exe Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml _____ Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml --- trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-07 17:07:00 UTC (rev 17171) +++ trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-07 17:07:35 UTC (rev 17172) @@ -1,4 +1,4 @@ -<module name="kernel32_rostest" type="test"> +<module name="kernel32_test" type="test"> <include base="rtshared">.</include> <include base="kernel32">.</include> <define name="_DISABLE_TIDENTS" />

19 years, 4 months

[sedwards] 17171: rename tests to dllname_winetest to make it less trouble on exception to change build system rules for ros tests

by sedwards＠svn.reactos.com

rename tests to dllname_winetest to make it less trouble on exception to change build system rules for ros tests Modified: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml Modified: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml Modified: trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml Modified: trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml Modified: trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml Modified: trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml Modified: trunk/reactos/regtests/winetests/psapi/psapi_test.xml Modified: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml Modified: trunk/reactos/regtests/winetests/user32/user32_test.xml Modified: trunk/reactos/regtests/winetests/version/version_test.xml _____ Modified: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml --- trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="advapi32_test" type="win32cui" installbase="bin" installname="advapi32_test.exe" warnings="true"> - <include base="advapi32_test">.</include> +<module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" warnings="true"> + <include base="advapi32_winetest">.</include> <define name="__USE_W32API" /> <library>advapi32</library> <library>ntdll</library> _____ Modified: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml --- trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="comctl32_test" type="win32cui" installbase="bin" installname="comctl32_test.exe" warnings="true"> - <include base="comctl32_test">.</include> +<module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" warnings="true"> + <include base="comctl32_winetest">.</include> <define name="__USE_W32API" /> <library>shlwapi</library> <library>ole32</library> _____ Modified: trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml --- trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="gdi32_test" type="win32cui" installbase="bin" installname="gdi32_test.exe" warnings="true"> - <include base="gdi32_test">.</include> +<module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" warnings="true"> + <include base="gdi32_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>gdi32</library> _____ Modified: trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml --- trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="kernel32_test" type="win32cui" installbase="bin" installname="kernel32_test.exe" warnings="true"> - <include base="kernel32_test">.</include> +<module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" warnings="true"> + <include base="kernel32_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml --- trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="msvcrt_test" type="win32cui" installbase="bin" installname="msvcrt_test.exe" warnings="true"> - <include base="msvcrt_test">.</include> +<module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" warnings="true"> + <include base="msvcrt_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <file>cpp.c</file> _____ Modified: trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml --- trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="ntdll_test" type="win32cui" installbase="bin" installname="ntdll_test.exe" warnings="true"> - <include base="ntdll_test">.</include> +<module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" warnings="true"> + <include base="ntdll_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <file>atom.c</file> _____ Modified: trunk/reactos/regtests/winetests/psapi/psapi_test.xml --- trunk/reactos/regtests/winetests/psapi/psapi_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/psapi/psapi_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="psapi_test" type="win32cui" installbase="bin" installname="psapi_test.exe" warnings="true"> - <include base="psapi_test">.</include> +<module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" warnings="true"> + <include base="psapi_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>psapi</library> _____ Modified: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml --- trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="shlwapi_test" type="win32cui" installbase="bin" installname="shlwapi_test.exe" warnings="true"> - <include base="shlwapi_test">.</include> +<module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" warnings="true"> + <include base="shlwapi_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>shlwapi</library> _____ Modified: trunk/reactos/regtests/winetests/user32/user32_test.xml --- trunk/reactos/regtests/winetests/user32/user32_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/user32/user32_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="user32_test" type="win32cui" installbase="bin" installname="user32_test.exe" warnings="true"> - <include base="user32_test">.</include> +<module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" warnings="true"> + <include base="user32_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>user32</library> _____ Modified: trunk/reactos/regtests/winetests/version/version_test.xml --- trunk/reactos/regtests/winetests/version/version_test.xml 2005-08-07 16:22:37 UTC (rev 17170) +++ trunk/reactos/regtests/winetests/version/version_test.xml 2005-08-07 17:07:00 UTC (rev 17171) @@ -1,5 +1,5 @@ -<module name="version_test" type="win32cui" installbase="bin" installname="version_test.exe" warnings="true"> - <include base="version_test">.</include> +<module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" warnings="true"> + <include base="version_winetest">.</include> <define name="__USE_W32API" /> <library>ntdll</library> <library>version</library>

19 years, 4 months

[greatlrd] 17170: GdiEntry11 (not tested, we can not test it yet in ros, until we got ddraw.dll and some api in win32k/ntdraw been implement)

by greatlrd＠svn.reactos.com

GdiEntry11 (not tested, we can not test it yet in ros, until we got ddraw.dll and some api in win32k/ntdraw been implement) Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-08-07 15:55:01 UTC (rev 17169) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-08-07 16:22:37 UTC (rev 17170) @@ -123,10 +123,10 @@ * * GDIEntry 4 */ -BOOL STDCALL DdCreateSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -BOOL bPrimarySurface -) +BOOL +STDCALL +DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + BOOL bPrimarySurface) { return intDDCreateSurface(pSurfaceLocal,1); } @@ -210,9 +210,37 @@ return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD, pbNewMode); } +/* + * @implemented + * + * GDIEntry 11 + */ +BOOL +STDCALL +DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo) +{ + /* Create Surface if it does not exits one */ + if (pSurfaceFrom->hDDSurface) + { + if (!intDDCreateSurface(pSurfaceFrom,FALSE)) + { + return FALSE; + } + } + /* Create Surface if it does not exits one */ + if (pSurfaceTo->hDDSurface) + { + if (!intDDCreateSurface(pSurfaceTo,FALSE)) + { + return FALSE; + } + } + return NtGdiDdAttachSurface( (HANDLE) pSurfaceFrom->hDDSurface, (HANDLE) pSurfaceTo->hDDSurface); +} /* * @implemented @@ -309,7 +337,7 @@ /* interal create surface */ BOOL intDDCreateSurface ( LPDDRAWI_DDRAWSURFACE_LCL pSurface, - BOOL bComplete) + BOOL bComplete) { DD_SURFACE_LOCAL SurfaceLocal; DD_SURFACE_GLOBAL SurfaceGlobal; _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-08-07 15:55:01 UTC (rev 17169) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-08-07 16:22:37 UTC (rev 17170) @@ -3905,24 +3905,9 @@ } - /* * @unimplemented */ -BOOL STDCALL DdAttachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ BOOL STDCALL GdiPlayEMF

19 years, 4 months

[navaraf] 17169: Change the module type to win32gui. We really don't want to attempt to create consoles at this stage.

by navaraf＠svn.reactos.com

Change the module type to win32gui. We really don't want to attempt to create consoles at this stage. Modified: trunk/reactos/subsys/system/winlogon/winlogon.xml _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.xml --- trunk/reactos/subsys/system/winlogon/winlogon.xml 2005-08-07 15:16:52 UTC (rev 17168) +++ trunk/reactos/subsys/system/winlogon/winlogon.xml 2005-08-07 15:55:01 UTC (rev 17169) @@ -1,4 +1,4 @@ -<module name="winlogon" type="win32cui" installbase="system32" installname="winlogon.exe"> +<module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe"> <include base="winlogon">.</include> <define name="UNICODE" /> <define name="_UNICODE" />

19 years, 4 months

← Newer
1
...
40
41
42
43
44
45
46
...
67
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 August 2005