From 6315f62b2066386211bbfa5056c26532747223a1 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 25 Aug 2003 02:02:37 +0000 Subject: [PATCH] 2003-08-25 Steven Edwards * include/ddk/ntifs.h: Change all C++ style comments to C. * include/GL/gl.h: Ditto. 2003-08-25 Martin Fuchs * include/shlobj.h (SFGAO_GHOSTED): Correct. (SFGAO_HIDDEN): Add define. --- winsup/w32api/ChangeLog | 10 ++++ winsup/w32api/include/GL/gl.h | 6 +- winsup/w32api/include/ddk/ntifs.h | 92 +++++++++++++++---------------- winsup/w32api/include/shlobj.h | 7 ++- 4 files changed, 63 insertions(+), 52 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 69862b00b..cfa9ed6fa 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,13 @@ +2003-08-25 Steven Edwards + + * include/ddk/ntifs.h: Change all C++ style comments to C. + * include/GL/gl.h: Ditto. + +2003-08-25 Martin Fuchs + + * include/shlobj.h (SFGAO_GHOSTED): Correct. + (SFGAO_HIDDEN): Add define. + 2003-08-25 Filip Navara * include/commctrl.h (ILCF_*): Add defines. diff --git a/winsup/w32api/include/GL/gl.h b/winsup/w32api/include/GL/gl.h index b2db7f559..f11188ef1 100644 --- a/winsup/w32api/include/GL/gl.h +++ b/winsup/w32api/include/GL/gl.h @@ -65,11 +65,11 @@ /* GLAPI, part 2 */ #if !defined(GLAPI) -# if defined(_MSC_VER) // Microsoft Visual C++ +# if defined(_MSC_VER) /* Microsoft Visual C++ */ # define GLAPI __declspec(dllimport) -# elif defined(__LCC__) && defined(__WIN32__) // LCC-Win32 +# elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */ # define GLAPI __stdcall -# else // Others (e.g. MinGW, Cygwin, non-win32) +# else /* Others (e.g. MinGW, Cygwin, non-win32) */ # define GLAPI extern # endif #endif diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h index 01fd01b5c..b09c16306 100644 --- a/winsup/w32api/include/ddk/ntifs.h +++ b/winsup/w32api/include/ddk/ntifs.h @@ -162,7 +162,7 @@ extern PACL SeSystemDefaultDacl; #define FILE_PIPE_READ_DATA 0x00000000 #define FILE_PIPE_WRITE_SPACE 0x00000001 -#define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 // FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE +#define FILE_STORAGE_TYPE_SPECIFIED 0x00000041 /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */ #define FILE_STORAGE_TYPE_DEFAULT (StorageTypeDefault << FILE_STORAGE_TYPE_SHIFT) #define FILE_STORAGE_TYPE_DIRECTORY (StorageTypeDirectory << FILE_STORAGE_TYPE_SHIFT) #define FILE_STORAGE_TYPE_FILE (StorageTypeFile << FILE_STORAGE_TYPE_SHIFT) @@ -385,7 +385,7 @@ extern PACL SeSystemDefaultDacl; #define FSCTL_GET_HFS_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS) -#endif // (VER_PRODUCTBUILD >= 1381) +#endif /* (VER_PRODUCTBUILD >= 1381) */ #if (VER_PRODUCTBUILD >= 2195) @@ -430,7 +430,7 @@ extern PACL SeSystemDefaultDacl; #define FSCTL_READ_FROM_PLEX CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT, FILE_READ_DATA) #define FSCTL_FILE_PREFETCH CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ #define FSCTL_MAILSLOT_PEEK CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA) @@ -658,7 +658,7 @@ typedef struct _MMSUPPORT { ULONG NextAgingSlot; ULONG EstimatedAvailable; ULONG GrowthSinceLastEstimate; -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ } MMSUPPORT, *PMMSUPPORT; #endif @@ -978,7 +978,7 @@ typedef struct _FILE_FS_OBJECT_ID_INFORMATION { UCHAR ExtendedInfo[48]; } FILE_FS_OBJECT_ID_INFORMATION, *PFILE_FS_OBJECT_ID_INFORMATION; -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ typedef struct _FILE_FS_SIZE_INFORMATION { LARGE_INTEGER TotalAllocationUnits; @@ -1043,14 +1043,14 @@ typedef struct _FILE_LOCK_INFO { LARGE_INTEGER EndingByte; } FILE_LOCK_INFO, *PFILE_LOCK_INFO; -// raw internal file lock struct returned from FsRtlGetNextFileLock +/* raw internal file lock struct returned from FsRtlGetNextFileLock */ typedef struct _FILE_SHARED_LOCK_ENTRY { PVOID Unknown1; PVOID Unknown2; FILE_LOCK_INFO FileLock; } FILE_SHARED_LOCK_ENTRY, *PFILE_SHARED_LOCK_ENTRY; -// raw internal file lock struct returned from FsRtlGetNextFileLock +/* raw internal file lock struct returned from FsRtlGetNextFileLock */ typedef struct _FILE_EXCLUSIVE_LOCK_ENTRY { LIST_ENTRY ListEntry; PVOID Unknown1; @@ -1282,7 +1282,7 @@ typedef struct _FSRTL_COMMON_FCB_HEADER { #if (VER_PRODUCTBUILD >= 1381) UCHAR Flags2; UCHAR Reserved; -#endif // (VER_PRODUCTBUILD >= 1381) +#endif /* (VER_PRODUCTBUILD >= 1381) */ PERESOURCE Resource; PERESOURCE PagingIoResource; LARGE_INTEGER AllocationSize; @@ -1683,7 +1683,7 @@ typedef struct _VAD_HEADER { PVAD_HEADER ParentLink; PVAD_HEADER LeftLink; PVAD_HEADER RightLink; - ULONG Flags; // LSB = CommitCharge + ULONG Flags; /* LSB = CommitCharge */ PVOID ControlArea; PVOID FirstProtoPte; PVOID LastPTE; @@ -1823,7 +1823,7 @@ CcGetFlushedValidData ( IN BOOLEAN BcbListHeld ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI LARGE_INTEGER @@ -2004,7 +2004,7 @@ CcRemapBcb ( IN PVOID Bcb ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI VOID @@ -2082,8 +2082,8 @@ VOID NTAPI CcSetReadAheadGranularity ( IN PFILE_OBJECT FileObject, - IN ULONG Granularity // default: PAGE_SIZE - // allowed: 2^n * PAGE_SIZE + IN ULONG Granularity /* default: PAGE_SIZE */ + /* allowed: 2^n * PAGE_SIZE */ ); NTKERNELAPI @@ -2128,7 +2128,7 @@ CcWaitForCurrentLazyWriterActivity ( VOID ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI BOOLEAN @@ -2179,7 +2179,7 @@ FsRtlAllocateFileLock ( IN PUNLOCK_ROUTINE UnlockRoutine OPTIONAL ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI PVOID @@ -2389,7 +2389,7 @@ FsRtlFastUnlockAll ( IN PEPROCESS Process, IN PVOID Context OPTIONAL ); -//ret: STATUS_RANGE_NOT_LOCKED +/* ret: STATUS_RANGE_NOT_LOCKED */ NTKERNELAPI NTSTATUS @@ -2401,7 +2401,7 @@ FsRtlFastUnlockAllByKey ( IN ULONG Key, IN PVOID Context OPTIONAL ); -//ret: STATUS_RANGE_NOT_LOCKED +/* ret: STATUS_RANGE_NOT_LOCKED */ NTKERNELAPI NTSTATUS @@ -2416,7 +2416,7 @@ FsRtlFastUnlockSingle ( IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized ); -//ret: STATUS_RANGE_NOT_LOCKED +/* ret: STATUS_RANGE_NOT_LOCKED */ NTKERNELAPI BOOLEAN @@ -2440,7 +2440,7 @@ FsRtlFreeFileLock ( IN PFILE_LOCK FileLock ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI NTSTATUS @@ -2654,7 +2654,7 @@ FsRtlNotifyVolumeEvent ( IN ULONG EventCode ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI NTSTATUS @@ -2827,7 +2827,7 @@ IoCheckQuotaBufferValidity ( OUT PULONG ErrorOffset ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI PFILE_OBJECT @@ -2847,7 +2847,7 @@ IoCreateStreamFileObjectLite ( IN PDEVICE_OBJECT DeviceObject OPTIONAL ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI BOOLEAN @@ -2890,7 +2890,7 @@ IoGetRequestorProcessId ( IN PIRP Irp ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI PIRP @@ -2931,7 +2931,7 @@ IoIsValidNameGraftingBuffer ( IN PREPARSE_DATA_BUFFER ReparseBuffer ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI NTSTATUS @@ -2988,7 +2988,7 @@ IoRegisterFsRegistrationChange ( IN PDRIVER_FS_NOTIFICATION DriverNotificationRoutine ); -#endif // (VER_PRODUCTBUILD >= 1381) +#endif /* (VER_PRODUCTBUILD >= 1381) */ NTKERNELAPI VOID @@ -3057,7 +3057,7 @@ IoUnregisterFsRegistrationChange ( IN PDRIVER_FS_NOTIFICATION DriverNotificationRoutine ); -#endif // (VER_PRODUCTBUILD >= 1381) +#endif /* (VER_PRODUCTBUILD >= 1381) */ NTKERNELAPI NTSTATUS @@ -3155,7 +3155,7 @@ KeUnstackDetachProcess ( IN PKAPC_STATE ApcState ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI BOOLEAN @@ -3663,7 +3663,7 @@ RtlSelfRelativeToAbsoluteSD ( IN PULONG PrimaryGroupSize ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -3779,7 +3779,7 @@ SeCreateClientSecurityFromSubjectContext ( OUT PSECURITY_CLIENT_CONTEXT ClientContext ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ #define SeDeleteClientSecurity(C) { \ if (SeTokenType((C)->ClientToken) == TokenPrimary) { \ @@ -3824,7 +3824,7 @@ SeImpersonateClientEx ( IN PETHREAD ServerThread OPTIONAL ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI VOID @@ -3898,7 +3898,7 @@ SeQueryInformationToken ( OUT PVOID *TokenInformation ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI NTSTATUS @@ -3920,7 +3920,7 @@ SeQuerySessionIdToken ( IN PULONG SessionId ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ #define SeQuerySubjectContextToken( SubjectContext ) \ ( ARGUMENT_PRESENT( \ @@ -3996,7 +3996,7 @@ SeTokenIsRestricted ( IN PACCESS_TOKEN Token ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTKERNELAPI TOKEN_TYPE @@ -4032,7 +4032,7 @@ ZwAdjustPrivilegesToken ( OUT PULONG ReturnLength ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4080,7 +4080,7 @@ ZwCancelIoFile ( OUT PIO_STATUS_BLOCK IoStatusBlock ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4205,7 +4205,7 @@ ZwFlushVirtualMemory ( OUT PIO_STATUS_BLOCK IoStatusBlock ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4245,13 +4245,13 @@ ZwInitiatePowerAction ( IN BOOLEAN Asynchronous ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS NTAPI ZwLoadDriver ( - // "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" + /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" */ IN PUNICODE_STRING RegistryPath ); @@ -4349,7 +4349,7 @@ ZwPowerInformation ( IN ULONG OutputBufferLength ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4414,7 +4414,7 @@ ZwQueryEaFile ( IN BOOLEAN RestartScan ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4520,7 +4520,7 @@ ZwRestoreKey ( IN ULONG Flags ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4557,7 +4557,7 @@ ZwSetEaFile ( IN ULONG Length ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4598,7 +4598,7 @@ ZwSetSecurityObject ( IN PSECURITY_DESCRIPTOR SecurityDescriptor ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4630,7 +4630,7 @@ ZwSetVolumeInformationFile ( IN FS_INFORMATION_CLASS FsInformationClass ); -#endif // (VER_PRODUCTBUILD >= 2195) +#endif /* (VER_PRODUCTBUILD >= 2195) */ NTSYSAPI NTSTATUS @@ -4644,7 +4644,7 @@ NTSYSAPI NTSTATUS NTAPI ZwUnloadDriver ( - // "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" + /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" */ IN PUNICODE_STRING RegistryPath ); @@ -4688,4 +4688,4 @@ ZwYieldExecution ( } #endif -#endif // _NTIFS_ +#endif /* _NTIFS_ */ diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index e31244508..c990c471b 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -82,15 +82,16 @@ extern "C" { #define SFGAO_CANCOPY DROPEFFECT_COPY #define SFGAO_CANMOVE DROPEFFECT_MOVE #define SFGAO_CANLINK DROPEFFECT_LINK -#define SFGAO_CANRENAME 0x00000010L -#define SFGAO_CANDELETE 0x00000020L +#define SFGAO_CANRENAME 0x00000010L +#define SFGAO_CANDELETE 0x00000020L #define SFGAO_HASPROPSHEET 0x00000040L #define SFGAO_DROPTARGET 0x00000100L #define SFGAO_CAPABILITYMASK 0x00000177L +#define SFGAO_GHOSTED 0x00008000L #define SFGAO_LINK 0x00010000L #define SFGAO_SHARE 0x00020000L #define SFGAO_READONLY 0x00040000L -#define SFGAO_GHOSTED 0x00080000L +#define SFGAO_HIDDEN 0x00080000L #define SFGAO_DISPLAYATTRMASK 0x000F0000L #define SFGAO_FILESYSANCESTOR 0x10000000L #define SFGAO_FOLDER 0x20000000L