Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59639: [KERNEL32]: Fix a few bugs in StuffStdHandle. Ironically Windows Server 2003 actually has a bug here when calling NtDuplicateObject...
by ion＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ion Date: Sun Aug 4 18:46:07 2013 New Revision: 59639 URL: http://svn.reactos.org/svn/reactos?rev=59639&view=rev Log: [KERNEL32]: Fix a few bugs in StuffStdHandle. Ironically Windows Server 2003 actually has a bug here when calling NtDuplicateObject... Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Aug 4 18:46:07 2013 @@ -62,22 +62,27 @@ HANDLE DuplicatedHandle; SIZE_T Dummy; - /* Duplicate the handle */ - Status = NtDuplicateObject(NtCurrentProcess(), - StandardHandle, - ProcessHandle, - &DuplicatedHandle, - 0, - 0, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); - if (NT_SUCCESS(Status)) - { - /* Write it */ - NtWriteVirtualMemory(ProcessHandle, - Address, - &DuplicatedHandle, - sizeof(HANDLE), - &Dummy); + /* Is there a handle to duplicate? */ + if (StandardHandle) + { + /* Duplicate it */ + Status = NtDuplicateObject(NtCurrentProcess(), + StandardHandle, + ProcessHandle, + &DuplicatedHandle, + 0, + 0, + DUPLICATE_SAME_ACCESS | + DUPLICATE_SAME_ATTRIBUTES); + if (NT_SUCCESS(Status)) + { + /* Write it */ + NtWriteVirtualMemory(ProcessHandle, + Address, + &DuplicatedHandle, + sizeof(HANDLE), + &Dummy); + } } } @@ -4139,25 +4144,25 @@ /* Duplicate standard input unless it's a console handle */ if (!IsConsoleHandle(Peb->ProcessParameters->StandardInput)) { - StuffStdHandle(&ProcessParameters->StandardInput, - ProcessHandle, - Peb->ProcessParameters->StandardInput); + StuffStdHandle(ProcessHandle, + Peb->ProcessParameters->StandardInput, + &ProcessParameters->StandardInput); } /* Duplicate standard output unless it's a console handle */ if (!IsConsoleHandle(Peb->ProcessParameters->StandardOutput)) { - StuffStdHandle(&ProcessParameters->StandardOutput, - ProcessHandle, - Peb->ProcessParameters->StandardOutput); + StuffStdHandle(ProcessHandle, + Peb->ProcessParameters->StandardOutput, + &ProcessParameters->StandardOutput); } /* Duplicate standard error unless it's a console handle */ if (!IsConsoleHandle(Peb->ProcessParameters->StandardError)) { - StuffStdHandle(&ProcessParameters->StandardError, - ProcessHandle, - Peb->ProcessParameters->StandardError); + StuffStdHandle(ProcessHandle, + Peb->ProcessParameters->StandardError, + &ProcessParameters->StandardError); } } }

1 0

[ion] 59638: [KERNEL32] [FORMATTING]: Separate volume.c into disk.c, volume.c, and mountpt.c. Format function headers appropriately. No code change.
by ion＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ion Date: Sun Aug 4 17:32:38 2013 New Revision: 59638 URL: http://svn.reactos.org/svn/reactos?rev=59638&view=rev Log: [KERNEL32] [FORMATTING]: Separate volume.c into disk.c, volume.c, and mountpt.c. Format function headers appropriately. No code change. Added: trunk/reactos/dll/win32/kernel32/client/file/disk.c (with props) trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Aug 4 17:32:38 2013 @@ -47,6 +47,7 @@ client/file/delete.c client/file/deviceio.c client/file/dir.c + client/file/disk.c client/file/fileinfo.c client/file/filemap.c client/file/filename.c @@ -57,6 +58,7 @@ client/file/lock.c client/file/mailslot.c client/file/move.c + client/file/mntpoint.c client/file/npipe.c client/file/rw.c client/file/tape.c Added: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c (added) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Sun Aug 4 17:32:38 2013 @@ -0,0 +1,424 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/kernel32/file/disk.c + * PURPOSE: Disk and Drive functions + * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Erik Bos, Alexandre Julliard : + * GetLogicalDriveStringsA, + * GetLogicalDriveStringsW, GetLogicalDrives + * UPDATE HISTORY: + * Created 01/11/98 + */ +//WINE copyright notice: +/* + * DOS drives handling functions + * + * Copyright 1993 Erik Bos + * Copyright 1996 Alexandre Julliard + */ + +#include <k32.h> +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(kernel32file); + +#define MAX_DOS_DRIVES 26 +HANDLE WINAPI InternalOpenDirW(IN LPCWSTR DirName, IN BOOLEAN Write); + +/* + * @implemented + */ +/* Synced to Wine-2008/12/28 */ +DWORD +WINAPI +GetLogicalDriveStringsA(IN DWORD nBufferLength, + IN LPSTR lpBuffer) +{ + DWORD drive, count; + DWORD dwDriveMap; + LPSTR p; + + dwDriveMap = GetLogicalDrives(); + + for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++) + { + if (dwDriveMap & (1<<drive)) + count++; + } + + + if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); + + p = lpBuffer; + + for (drive = 0; drive < MAX_DOS_DRIVES; drive++) + if (dwDriveMap & (1<<drive)) + { + *p++ = 'A' + (UCHAR)drive; + *p++ = ':'; + *p++ = '\\'; + *p++ = '\0'; + } + *p = '\0'; + + return (count * 4); +} + +/* + * @implemented + */ +/* Synced to Wine-2008/12/28 */ +DWORD +WINAPI +GetLogicalDriveStringsW(IN DWORD nBufferLength, + IN LPWSTR lpBuffer) +{ + DWORD drive, count; + DWORD dwDriveMap; + LPWSTR p; + + dwDriveMap = GetLogicalDrives(); + + for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++) + { + if (dwDriveMap & (1<<drive)) + count++; + } + + if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); + + p = lpBuffer; + for (drive = 0; drive < MAX_DOS_DRIVES; drive++) + if (dwDriveMap & (1<<drive)) + { + *p++ = (WCHAR)('A' + drive); + *p++ = (WCHAR)':'; + *p++ = (WCHAR)'\\'; + *p++ = (WCHAR)'\0'; + } + *p = (WCHAR)'\0'; + + return (count * 4); +} + +/* + * @implemented + */ +/* Synced to Wine-? */ +DWORD +WINAPI +GetLogicalDrives(VOID) +{ + NTSTATUS Status; + PROCESS_DEVICEMAP_INFORMATION ProcessDeviceMapInfo; + + /* Get the Device Map for this Process */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDeviceMap, + &ProcessDeviceMapInfo, + sizeof(ProcessDeviceMapInfo), + NULL); + + /* Return the Drive Map */ + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return ProcessDeviceMapInfo.Query.DriveMap; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetDiskFreeSpaceA(IN LPCSTR lpRootPathName, + OUT LPDWORD lpSectorsPerCluster, + OUT LPDWORD lpBytesPerSector, + OUT LPDWORD lpNumberOfFreeClusters, + OUT LPDWORD lpTotalNumberOfClusters) +{ + PWCHAR RootPathNameW=NULL; + + if (lpRootPathName) + { + if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) + return FALSE; + } + + return GetDiskFreeSpaceW (RootPathNameW, + lpSectorsPerCluster, + lpBytesPerSector, + lpNumberOfFreeClusters, + lpTotalNumberOfClusters); +} + +/* + * @implemented + */ +BOOL +WINAPI +GetDiskFreeSpaceW(IN LPCWSTR lpRootPathName, + OUT LPDWORD lpSectorsPerCluster, + OUT LPDWORD lpBytesPerSector, + OUT LPDWORD lpNumberOfFreeClusters, + OUT LPDWORD lpTotalNumberOfClusters) +{ + FILE_FS_SIZE_INFORMATION FileFsSize; + IO_STATUS_BLOCK IoStatusBlock; + WCHAR RootPathName[MAX_PATH]; + HANDLE hFile; + NTSTATUS errCode; + + if (lpRootPathName) + { + wcsncpy (RootPathName, lpRootPathName, 3); + } + else + { + GetCurrentDirectoryW (MAX_PATH, RootPathName); + } + RootPathName[3] = 0; + + hFile = InternalOpenDirW(RootPathName, FALSE); + if (INVALID_HANDLE_VALUE == hFile) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + errCode = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FileFsSize, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + if (!NT_SUCCESS(errCode)) + { + CloseHandle(hFile); + BaseSetLastNTError (errCode); + return FALSE; + } + + if (lpSectorsPerCluster) + *lpSectorsPerCluster = FileFsSize.SectorsPerAllocationUnit; + if (lpBytesPerSector) + *lpBytesPerSector = FileFsSize.BytesPerSector; + if (lpNumberOfFreeClusters) + *lpNumberOfFreeClusters = FileFsSize.AvailableAllocationUnits.u.LowPart; + if (lpTotalNumberOfClusters) + *lpTotalNumberOfClusters = FileFsSize.TotalAllocationUnits.u.LowPart; + CloseHandle(hFile); + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetDiskFreeSpaceExA(IN LPCSTR lpDirectoryName OPTIONAL, + OUT PULARGE_INTEGER lpFreeBytesAvailableToCaller, + OUT PULARGE_INTEGER lpTotalNumberOfBytes, + OUT PULARGE_INTEGER lpTotalNumberOfFreeBytes) +{ + PWCHAR DirectoryNameW=NULL; + + if (lpDirectoryName) + { + if (!(DirectoryNameW = FilenameA2W(lpDirectoryName, FALSE))) + return FALSE; + } + + return GetDiskFreeSpaceExW (DirectoryNameW , + lpFreeBytesAvailableToCaller, + lpTotalNumberOfBytes, + lpTotalNumberOfFreeBytes); +} + +/* + * @implemented + */ +BOOL +WINAPI +GetDiskFreeSpaceExW(IN LPCWSTR lpDirectoryName OPTIONAL, + OUT PULARGE_INTEGER lpFreeBytesAvailableToCaller, + OUT PULARGE_INTEGER lpTotalNumberOfBytes, + OUT PULARGE_INTEGER lpTotalNumberOfFreeBytes) +{ + union + { + FILE_FS_SIZE_INFORMATION FsSize; + FILE_FS_FULL_SIZE_INFORMATION FsFullSize; + } FsInfo; + IO_STATUS_BLOCK IoStatusBlock; + ULARGE_INTEGER BytesPerCluster; + HANDLE hFile; + NTSTATUS Status; + + if (lpDirectoryName == NULL) + lpDirectoryName = L"\\"; + + hFile = InternalOpenDirW(lpDirectoryName, FALSE); + if (INVALID_HANDLE_VALUE == hFile) + { + return FALSE; + } + + if (lpFreeBytesAvailableToCaller != NULL || lpTotalNumberOfBytes != NULL) + { + /* To get the free space available to the user associated with the + current thread, try FileFsFullSizeInformation. If this is not + supported by the file system, fall back to FileFsSize */ + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsFullSize, + sizeof(FsInfo.FsFullSize), + FileFsFullSizeInformation); + + if (NT_SUCCESS(Status)) + { + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + BytesPerCluster.QuadPart = + FsInfo.FsFullSize.BytesPerSector * FsInfo.FsFullSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller != NULL) + { + lpFreeBytesAvailableToCaller->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.CallerAvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes != NULL) + { + lpTotalNumberOfBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes != NULL) + { + lpTotalNumberOfFreeBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsFullSize.ActualAvailableAllocationUnits.QuadPart; + } + + return TRUE; + } + } + + Status = NtQueryVolumeInformationFile(hFile, + &IoStatusBlock, + &FsInfo.FsSize, + sizeof(FsInfo.FsSize), + FileFsSizeInformation); + + /* Close the handle before returning data + to avoid a handle leak in case of a fault! */ + CloseHandle(hFile); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError (Status); + return FALSE; + } + + BytesPerCluster.QuadPart = + FsInfo.FsSize.BytesPerSector * FsInfo.FsSize.SectorsPerAllocationUnit; + + if (lpFreeBytesAvailableToCaller) + { + lpFreeBytesAvailableToCaller->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfBytes) + { + lpTotalNumberOfBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsSize.TotalAllocationUnits.QuadPart; + } + + if (lpTotalNumberOfFreeBytes) + { + lpTotalNumberOfFreeBytes->QuadPart = + BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; + } + + return TRUE; +} + +/* + * @implemented + */ +UINT +WINAPI +GetDriveTypeA(IN LPCSTR lpRootPathName) +{ + PWCHAR RootPathNameW; + + if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) + return DRIVE_UNKNOWN; + + return GetDriveTypeW(RootPathNameW); +} + +/* + * @implemented + */ +UINT +WINAPI +GetDriveTypeW(IN LPCWSTR lpRootPathName) +{ + FILE_FS_DEVICE_INFORMATION FileFsDevice; + IO_STATUS_BLOCK IoStatusBlock; + + HANDLE hFile; + NTSTATUS errCode; + + hFile = InternalOpenDirW(lpRootPathName, FALSE); + if (hFile == INVALID_HANDLE_VALUE) + { + return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ + } + + errCode = NtQueryVolumeInformationFile (hFile, + &IoStatusBlock, + &FileFsDevice, + sizeof(FILE_FS_DEVICE_INFORMATION), + FileFsDeviceInformation); + if (!NT_SUCCESS(errCode)) + { + CloseHandle(hFile); + BaseSetLastNTError (errCode); + return 0; + } + CloseHandle(hFile); + + switch (FileFsDevice.DeviceType) + { + case FILE_DEVICE_CD_ROM: + case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + return DRIVE_CDROM; + case FILE_DEVICE_VIRTUAL_DISK: + return DRIVE_RAMDISK; + case FILE_DEVICE_NETWORK_FILE_SYSTEM: + return DRIVE_REMOTE; + case FILE_DEVICE_DISK: + case FILE_DEVICE_DISK_FILE_SYSTEM: + if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) + return DRIVE_REMOTE; + if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) + return DRIVE_REMOVABLE; + return DRIVE_FIXED; + } + + ERR("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); + + return DRIVE_UNKNOWN; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/file/disk.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c (added) +++ trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c [iso-8859-1] Sun Aug 4 17:32:38 2013 @@ -0,0 +1,394 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/kernel32/file/mntpoint.c + * PURPOSE: File volume mount point functions + * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Erik Bos, Alexandre Julliard : + * GetLogicalDriveStringsA, + * GetLogicalDriveStringsW, GetLogicalDrives + * UPDATE HISTORY: + * Created 01/11/98 + */ +//WINE copyright notice: +/* + * DOS drives handling functions + * + * Copyright 1993 Erik Bos + * Copyright 1996 Alexandre Julliard + */ + +#include <k32.h> +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(kernel32file); + +/** + * @name GetVolumeNameForVolumeMountPointW + * @implemented + * + * Return an unique volume name for a drive root or mount point. + * + * @param VolumeMountPoint + * Pointer to string that contains either root drive name or + * mount point name. + * @param VolumeName + * Pointer to buffer that is filled with resulting unique + * volume name on success. + * @param VolumeNameLength + * Size of VolumeName buffer in TCHARs. + * + * @return + * TRUE when the function succeeds and the VolumeName buffer is filled, + * FALSE otherwise. + */ +BOOL +WINAPI +GetVolumeNameForVolumeMountPointW(IN LPCWSTR VolumeMountPoint, + OUT LPWSTR VolumeName, + IN DWORD VolumeNameLength) +{ + UNICODE_STRING NtFileName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE FileHandle; + IO_STATUS_BLOCK Iosb; + ULONG BufferLength; + PMOUNTDEV_NAME MountDevName; + PMOUNTMGR_MOUNT_POINT MountPoint; + ULONG MountPointSize; + PMOUNTMGR_MOUNT_POINTS MountPoints; + ULONG Index; + PUCHAR SymbolicLinkName; + BOOL Result; + NTSTATUS Status; + + if (!VolumeMountPoint || !VolumeMountPoint[0]) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* + * First step is to convert the passed volume mount point name to + * an NT acceptable name. + */ + + if (!RtlDosPathNameToNtPathName_U(VolumeMountPoint, &NtFileName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + if (NtFileName.Length > sizeof(WCHAR) && + NtFileName.Buffer[(NtFileName.Length / sizeof(WCHAR)) - 1] == '\\') + { + NtFileName.Length -= sizeof(WCHAR); + } + + /* + * Query mount point device name which we will later use for determining + * the volume name. + */ + + InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); + Status = NtOpenFile(&FileHandle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, &Iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&NtFileName); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + BufferLength = sizeof(MOUNTDEV_NAME) + 50 * sizeof(WCHAR); + do + { + MountDevName = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (MountDevName == NULL) + { + NtClose(FileHandle); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, + IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, + NULL, 0, MountDevName, BufferLength); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; + continue; + } + else + { + NtClose(FileHandle); + BaseSetLastNTError(Status); + return FALSE; + } + } + } + while (!NT_SUCCESS(Status)); + + NtClose(FileHandle); + + /* + * Get the mount point information from mount manager. + */ + + MountPointSize = MountDevName->NameLength + sizeof(MOUNTMGR_MOUNT_POINT); + MountPoint = RtlAllocateHeap(GetProcessHeap(), 0, MountPointSize); + if (MountPoint == NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + RtlZeroMemory(MountPoint, sizeof(MOUNTMGR_MOUNT_POINT)); + MountPoint->DeviceNameOffset = sizeof(MOUNTMGR_MOUNT_POINT); + MountPoint->DeviceNameLength = MountDevName->NameLength; + RtlCopyMemory(MountPoint + 1, MountDevName->Name, MountDevName->NameLength); + RtlFreeHeap(RtlGetProcessHeap(), 0, MountDevName); + + RtlInitUnicodeString(&NtFileName, L"\\??\\MountPointManager"); + InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); + Status = NtOpenFile(&FileHandle, FILE_GENERIC_READ, &ObjectAttributes, + &Iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); + return FALSE; + } + + BufferLength = sizeof(MOUNTMGR_MOUNT_POINTS); + do + { + MountPoints = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (MountPoints == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); + NtClose(FileHandle); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, + IOCTL_MOUNTMGR_QUERY_POINTS, + MountPoint, MountPointSize, + MountPoints, BufferLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = MountPoints->Size; + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); + continue; + } + else if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); + NtClose(FileHandle); + BaseSetLastNTError(Status); + return FALSE; + } + } + } + while (!NT_SUCCESS(Status)); + + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); + NtClose(FileHandle); + + /* + * Now we've gathered info about all mount points mapped to our device, so + * select the correct one and copy it into the output buffer. + */ + + for (Index = 0; Index < MountPoints->NumberOfMountPoints; Index++) + { + MountPoint = MountPoints->MountPoints + Index; + SymbolicLinkName = (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset; + + /* + * Check for "\\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\" + * (with the last slash being optional) style symbolic links. + */ + + if (MountPoint->SymbolicLinkNameLength == 48 * sizeof(WCHAR) || + (MountPoint->SymbolicLinkNameLength == 49 * sizeof(WCHAR) && + SymbolicLinkName[48] == L'\\')) + { + if (RtlCompareMemory(SymbolicLinkName, L"\\??\\Volume{", + 11 * sizeof(WCHAR)) == 11 * sizeof(WCHAR) && + SymbolicLinkName[19] == L'-' && SymbolicLinkName[24] == L'-' && + SymbolicLinkName[29] == L'-' && SymbolicLinkName[34] == L'-' && + SymbolicLinkName[47] == L'}') + { + if (VolumeNameLength >= MountPoint->SymbolicLinkNameLength / sizeof(WCHAR)) + { + RtlCopyMemory(VolumeName, + (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset, + MountPoint->SymbolicLinkNameLength); + VolumeName[1] = L'\\'; + Result = TRUE; + } + else + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + Result = FALSE; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); + + return Result; + } + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); + SetLastError(ERROR_INVALID_PARAMETER); + + return FALSE; +} + +/* + * @implemented (Wine 13 sep 2008) + */ +BOOL +WINAPI +GetVolumeNameForVolumeMountPointA(IN LPCSTR lpszVolumeMountPoint, + IN LPSTR lpszVolumeName, + IN DWORD cchBufferLength) +{ + BOOL ret; + WCHAR volumeW[50], *pathW = NULL; + DWORD len = min( sizeof(volumeW) / sizeof(WCHAR), cchBufferLength ); + + TRACE("(%s, %p, %x)\n", debugstr_a(lpszVolumeMountPoint), lpszVolumeName, cchBufferLength); + + if (!lpszVolumeMountPoint || !(pathW = FilenameA2W( lpszVolumeMountPoint, TRUE ))) + return FALSE; + + if ((ret = GetVolumeNameForVolumeMountPointW( pathW, volumeW, len ))) + FilenameW2A_N( lpszVolumeName, len, volumeW, -1 ); + + RtlFreeHeap( RtlGetProcessHeap(), 0, pathW ); + return ret; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetVolumeMountPointW(IN LPCWSTR lpszVolumeMountPoint, + IN LPCWSTR lpszVolumeName) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetVolumeMountPointA(IN LPCSTR lpszVolumeMountPoint, + IN LPCSTR lpszVolumeName) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +DeleteVolumeMountPointA(IN LPCSTR lpszVolumeMountPoint) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +DeleteVolumeMountPointW(IN LPCWSTR lpszVolumeMountPoint) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +HANDLE +WINAPI +FindFirstVolumeMountPointW(IN LPCWSTR lpszRootPathName, + IN LPWSTR lpszVolumeMountPoint, + IN DWORD cchBufferLength) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +HANDLE +WINAPI +FindFirstVolumeMountPointA(IN LPCSTR lpszRootPathName, + IN LPSTR lpszVolumeMountPoint, + IN DWORD cchBufferLength) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +FindNextVolumeMountPointA(IN HANDLE hFindVolumeMountPoint, + IN LPSTR lpszVolumeMountPoint, + DWORD cchBufferLength) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +FindNextVolumeMountPointW(IN HANDLE hFindVolumeMountPoint, + IN LPWSTR lpszVolumeMountPoint, + DWORD cchBufferLength) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +FindVolumeMountPointClose(IN HANDLE hFindVolumeMountPoint) +{ + STUB; + return 0; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Sun Aug 4 17:32:38 2013 @@ -23,477 +23,66 @@ #include <debug.h> DEBUG_CHANNEL(kernel32file); -#define MAX_DOS_DRIVES 26 - - -static HANDLE -InternalOpenDirW(LPCWSTR DirName, - BOOLEAN Write) -{ - UNICODE_STRING NtPathU; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS errCode; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE hFile; - - if (!RtlDosPathNameToNtPathName_U(DirName, - &NtPathU, - NULL, - NULL)) - { - WARN("Invalid path\n"); - SetLastError(ERROR_BAD_PATHNAME); - return INVALID_HANDLE_VALUE; +HANDLE +WINAPI +InternalOpenDirW(IN LPCWSTR DirName, + IN BOOLEAN Write) +{ + UNICODE_STRING NtPathU; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS errCode; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + + if (!RtlDosPathNameToNtPathName_U(DirName, &NtPathU, NULL, NULL)) + { + WARN("Invalid path\n"); + SetLastError(ERROR_BAD_PATHNAME); + return INVALID_HANDLE_VALUE; } InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - errCode = NtCreateFile (&hFile, - Write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, - 0, - NULL, - 0); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - NtPathU.Buffer); + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + errCode = NtCreateFile(&hFile, + Write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); if (!NT_SUCCESS(errCode)) { - BaseSetLastNTError (errCode); - return INVALID_HANDLE_VALUE; - } + BaseSetLastNTError(errCode); + return INVALID_HANDLE_VALUE; + } + return hFile; } - /* * @implemented */ -/* Synced to Wine-2008/12/28 */ -DWORD WINAPI -GetLogicalDriveStringsA(DWORD nBufferLength, - LPSTR lpBuffer) -{ - DWORD drive, count; - DWORD dwDriveMap; - LPSTR p; - - dwDriveMap = GetLogicalDrives(); - - for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++) - { - if (dwDriveMap & (1<<drive)) - count++; - } - - - if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); - - p = lpBuffer; - - for (drive = 0; drive < MAX_DOS_DRIVES; drive++) - if (dwDriveMap & (1<<drive)) - { - *p++ = 'A' + (UCHAR)drive; - *p++ = ':'; - *p++ = '\\'; - *p++ = '\0'; - } - *p = '\0'; - - return (count * 4); -} - - -/* - * @implemented - */ -/* Synced to Wine-2008/12/28 */ -DWORD WINAPI -GetLogicalDriveStringsW(DWORD nBufferLength, - LPWSTR lpBuffer) -{ - DWORD drive, count; - DWORD dwDriveMap; - LPWSTR p; - - dwDriveMap = GetLogicalDrives(); - - for (drive = count = 0; drive < MAX_DOS_DRIVES; drive++) - { - if (dwDriveMap & (1<<drive)) - count++; - } - - if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); - - p = lpBuffer; - for (drive = 0; drive < MAX_DOS_DRIVES; drive++) - if (dwDriveMap & (1<<drive)) - { - *p++ = (WCHAR)('A' + drive); - *p++ = (WCHAR)':'; - *p++ = (WCHAR)'\\'; - *p++ = (WCHAR)'\0'; - } - *p = (WCHAR)'\0'; - - return (count * 4); -} - - -/* - * @implemented - */ -/* Synced to Wine-? */ -DWORD WINAPI -GetLogicalDrives(VOID) -{ - NTSTATUS Status; - PROCESS_DEVICEMAP_INFORMATION ProcessDeviceMapInfo; - - /* Get the Device Map for this Process */ - Status = NtQueryInformationProcess(NtCurrentProcess(), - ProcessDeviceMap, - &ProcessDeviceMapInfo, - sizeof(ProcessDeviceMapInfo), - NULL); - - /* Return the Drive Map */ - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return ProcessDeviceMapInfo.Query.DriveMap; -} - - -/* - * @implemented - */ -BOOL WINAPI -GetDiskFreeSpaceA ( - LPCSTR lpRootPathName, - LPDWORD lpSectorsPerCluster, - LPDWORD lpBytesPerSector, - LPDWORD lpNumberOfFreeClusters, - LPDWORD lpTotalNumberOfClusters - ) -{ - PWCHAR RootPathNameW=NULL; - - if (lpRootPathName) - { - if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) - return FALSE; - } - - return GetDiskFreeSpaceW (RootPathNameW, - lpSectorsPerCluster, - lpBytesPerSector, - lpNumberOfFreeClusters, - lpTotalNumberOfClusters); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetDiskFreeSpaceW( - LPCWSTR lpRootPathName, - LPDWORD lpSectorsPerCluster, - LPDWORD lpBytesPerSector, - LPDWORD lpNumberOfFreeClusters, - LPDWORD lpTotalNumberOfClusters - ) -{ - FILE_FS_SIZE_INFORMATION FileFsSize; - IO_STATUS_BLOCK IoStatusBlock; - WCHAR RootPathName[MAX_PATH]; - HANDLE hFile; - NTSTATUS errCode; - - if (lpRootPathName) - { - wcsncpy (RootPathName, lpRootPathName, 3); - } - else - { - GetCurrentDirectoryW (MAX_PATH, RootPathName); - } - RootPathName[3] = 0; - - hFile = InternalOpenDirW(RootPathName, FALSE); - if (INVALID_HANDLE_VALUE == hFile) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - errCode = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FileFsSize, - sizeof(FILE_FS_SIZE_INFORMATION), - FileFsSizeInformation); - if (!NT_SUCCESS(errCode)) - { - CloseHandle(hFile); - BaseSetLastNTError (errCode); - return FALSE; - } - - if (lpSectorsPerCluster) - *lpSectorsPerCluster = FileFsSize.SectorsPerAllocationUnit; - if (lpBytesPerSector) - *lpBytesPerSector = FileFsSize.BytesPerSector; - if (lpNumberOfFreeClusters) - *lpNumberOfFreeClusters = FileFsSize.AvailableAllocationUnits.u.LowPart; - if (lpTotalNumberOfClusters) - *lpTotalNumberOfClusters = FileFsSize.TotalAllocationUnits.u.LowPart; - CloseHandle(hFile); - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -GetDiskFreeSpaceExA ( - LPCSTR lpDirectoryName OPTIONAL, - PULARGE_INTEGER lpFreeBytesAvailableToCaller, - PULARGE_INTEGER lpTotalNumberOfBytes, - PULARGE_INTEGER lpTotalNumberOfFreeBytes - ) -{ - PWCHAR DirectoryNameW=NULL; - - if (lpDirectoryName) - { - if (!(DirectoryNameW = FilenameA2W(lpDirectoryName, FALSE))) - return FALSE; - } - - return GetDiskFreeSpaceExW (DirectoryNameW , - lpFreeBytesAvailableToCaller, - lpTotalNumberOfBytes, - lpTotalNumberOfFreeBytes); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetDiskFreeSpaceExW( - LPCWSTR lpDirectoryName OPTIONAL, - PULARGE_INTEGER lpFreeBytesAvailableToCaller, - PULARGE_INTEGER lpTotalNumberOfBytes, - PULARGE_INTEGER lpTotalNumberOfFreeBytes - ) -{ - union - { - FILE_FS_SIZE_INFORMATION FsSize; - FILE_FS_FULL_SIZE_INFORMATION FsFullSize; - } FsInfo; - IO_STATUS_BLOCK IoStatusBlock; - ULARGE_INTEGER BytesPerCluster; - HANDLE hFile; - NTSTATUS Status; - - if (lpDirectoryName == NULL) - lpDirectoryName = L"\\"; - - hFile = InternalOpenDirW(lpDirectoryName, FALSE); - if (INVALID_HANDLE_VALUE == hFile) - { - return FALSE; - } - - if (lpFreeBytesAvailableToCaller != NULL || lpTotalNumberOfBytes != NULL) - { - /* To get the free space available to the user associated with the - current thread, try FileFsFullSizeInformation. If this is not - supported by the file system, fall back to FileFsSize */ - - Status = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FsInfo.FsFullSize, - sizeof(FsInfo.FsFullSize), - FileFsFullSizeInformation); - - if (NT_SUCCESS(Status)) - { - /* Close the handle before returning data - to avoid a handle leak in case of a fault! */ - CloseHandle(hFile); - - BytesPerCluster.QuadPart = - FsInfo.FsFullSize.BytesPerSector * FsInfo.FsFullSize.SectorsPerAllocationUnit; - - if (lpFreeBytesAvailableToCaller != NULL) - { - lpFreeBytesAvailableToCaller->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsFullSize.CallerAvailableAllocationUnits.QuadPart; - } - - if (lpTotalNumberOfBytes != NULL) - { - lpTotalNumberOfBytes->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsFullSize.TotalAllocationUnits.QuadPart; - } - - if (lpTotalNumberOfFreeBytes != NULL) - { - lpTotalNumberOfFreeBytes->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsFullSize.ActualAvailableAllocationUnits.QuadPart; - } - - return TRUE; - } - } - - Status = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - &FsInfo.FsSize, - sizeof(FsInfo.FsSize), - FileFsSizeInformation); - - /* Close the handle before returning data - to avoid a handle leak in case of a fault! */ - CloseHandle(hFile); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - - BytesPerCluster.QuadPart = - FsInfo.FsSize.BytesPerSector * FsInfo.FsSize.SectorsPerAllocationUnit; - - if (lpFreeBytesAvailableToCaller) - { - lpFreeBytesAvailableToCaller->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; - } - - if (lpTotalNumberOfBytes) - { - lpTotalNumberOfBytes->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsSize.TotalAllocationUnits.QuadPart; - } - - if (lpTotalNumberOfFreeBytes) - { - lpTotalNumberOfFreeBytes->QuadPart = - BytesPerCluster.QuadPart * FsInfo.FsSize.AvailableAllocationUnits.QuadPart; - } - - return TRUE; -} - - -/* - * @implemented - */ -UINT WINAPI -GetDriveTypeA(LPCSTR lpRootPathName) -{ - PWCHAR RootPathNameW; - - if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) - return DRIVE_UNKNOWN; - - return GetDriveTypeW(RootPathNameW); -} - - -/* - * @implemented - */ -UINT WINAPI -GetDriveTypeW(LPCWSTR lpRootPathName) -{ - FILE_FS_DEVICE_INFORMATION FileFsDevice; - IO_STATUS_BLOCK IoStatusBlock; - - HANDLE hFile; - NTSTATUS errCode; - - hFile = InternalOpenDirW(lpRootPathName, FALSE); - if (hFile == INVALID_HANDLE_VALUE) - { - return DRIVE_NO_ROOT_DIR; /* According to WINE regression tests */ - } - - errCode = NtQueryVolumeInformationFile (hFile, - &IoStatusBlock, - &FileFsDevice, - sizeof(FILE_FS_DEVICE_INFORMATION), - FileFsDeviceInformation); - if (!NT_SUCCESS(errCode)) - { - CloseHandle(hFile); - BaseSetLastNTError (errCode); - return 0; - } - CloseHandle(hFile); - - switch (FileFsDevice.DeviceType) - { - case FILE_DEVICE_CD_ROM: - case FILE_DEVICE_CD_ROM_FILE_SYSTEM: - return DRIVE_CDROM; - case FILE_DEVICE_VIRTUAL_DISK: - return DRIVE_RAMDISK; - case FILE_DEVICE_NETWORK_FILE_SYSTEM: - return DRIVE_REMOTE; - case FILE_DEVICE_DISK: - case FILE_DEVICE_DISK_FILE_SYSTEM: - if (FileFsDevice.Characteristics & FILE_REMOTE_DEVICE) - return DRIVE_REMOTE; - if (FileFsDevice.Characteristics & FILE_REMOVABLE_MEDIA) - return DRIVE_REMOVABLE; - return DRIVE_FIXED; - } - - ERR("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); - - return DRIVE_UNKNOWN; -} - - -/* - * @implemented - */ -BOOL WINAPI -GetVolumeInformationA( - LPCSTR lpRootPathName, - LPSTR lpVolumeNameBuffer, - DWORD nVolumeNameSize, - LPDWORD lpVolumeSerialNumber, - LPDWORD lpMaximumComponentLength, - LPDWORD lpFileSystemFlags, - LPSTR lpFileSystemNameBuffer, - DWORD nFileSystemNameSize - ) +BOOL +WINAPI +GetVolumeInformationA(IN LPCSTR lpRootPathName, + IN LPSTR lpVolumeNameBuffer, + IN DWORD nVolumeNameSize, + OUT LPDWORD lpVolumeSerialNumber OPTIONAL, + OUT LPDWORD lpMaximumComponentLength OPTIONAL, + OUT LPDWORD lpFileSystemFlags OPTIONAL, + OUT LPSTR lpFileSystemNameBuffer OPTIONAL, + IN DWORD nFileSystemNameSize) { UNICODE_STRING FileSystemNameU; UNICODE_STRING VolumeNameU = { 0, 0, NULL }; @@ -622,17 +211,16 @@ /* * @implemented */ -BOOL WINAPI -GetVolumeInformationW( - LPCWSTR lpRootPathName, - LPWSTR lpVolumeNameBuffer, - DWORD nVolumeNameSize, - LPDWORD lpVolumeSerialNumber, - LPDWORD lpMaximumComponentLength, - LPDWORD lpFileSystemFlags, - LPWSTR lpFileSystemNameBuffer, - DWORD nFileSystemNameSize - ) +BOOL +WINAPI +GetVolumeInformationW(IN LPCWSTR lpRootPathName, + IN LPWSTR lpVolumeNameBuffer, + IN DWORD nVolumeNameSize, + OUT LPDWORD lpVolumeSerialNumber OPTIONAL, + OUT LPDWORD lpMaximumComponentLength OPTIONAL, + OUT LPDWORD lpFileSystemFlags OPTIONAL, + OUT LPWSTR lpFileSystemNameBuffer OPTIONAL, + IN DWORD nFileSystemNameSize) { PFILE_FS_VOLUME_INFORMATION FileFsVolume; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; @@ -734,16 +322,13 @@ return TRUE; } - /* * @implemented */ BOOL WINAPI -SetVolumeLabelA ( - LPCSTR lpRootPathName, - LPCSTR lpVolumeName /* NULL if deleting label */ - ) +SetVolumeLabelA(IN LPCSTR lpRootPathName, + IN LPCSTR lpVolumeName OPTIONAL) /* NULL if deleting label */ { PWCHAR RootPathNameW; PWCHAR VolumeNameW = NULL; @@ -771,15 +356,13 @@ return Result; } - /* * @implemented */ -BOOL WINAPI -SetVolumeLabelW( - LPCWSTR lpRootPathName, - LPCWSTR lpVolumeName /* NULL if deleting label */ - ) +BOOL +WINAPI +SetVolumeLabelW(IN LPCWSTR lpRootPathName, + IN LPCWSTR lpVolumeName OPTIONAL) /* NULL if deleting label */ { PFILE_FS_LABEL_INFORMATION LabelInfo; IO_STATUS_BLOCK IoStatusBlock; @@ -834,276 +417,13 @@ return TRUE; } -/** - * @name GetVolumeNameForVolumeMountPointW - * - * Return an unique volume name for a drive root or mount point. - * - * @param VolumeMountPoint - * Pointer to string that contains either root drive name or - * mount point name. - * @param VolumeName - * Pointer to buffer that is filled with resulting unique - * volume name on success. - * @param VolumeNameLength - * Size of VolumeName buffer in TCHARs. - * - * @return - * TRUE when the function succeeds and the VolumeName buffer is filled, - * FALSE otherwise. - */ - -BOOL WINAPI -GetVolumeNameForVolumeMountPointW( - IN LPCWSTR VolumeMountPoint, - OUT LPWSTR VolumeName, - IN DWORD VolumeNameLength) -{ - UNICODE_STRING NtFileName; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE FileHandle; - IO_STATUS_BLOCK Iosb; - ULONG BufferLength; - PMOUNTDEV_NAME MountDevName; - PMOUNTMGR_MOUNT_POINT MountPoint; - ULONG MountPointSize; - PMOUNTMGR_MOUNT_POINTS MountPoints; - ULONG Index; - PUCHAR SymbolicLinkName; - BOOL Result; - NTSTATUS Status; - - if (!VolumeMountPoint || !VolumeMountPoint[0]) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - /* - * First step is to convert the passed volume mount point name to - * an NT acceptable name. - */ - - if (!RtlDosPathNameToNtPathName_U(VolumeMountPoint, &NtFileName, NULL, NULL)) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - if (NtFileName.Length > sizeof(WCHAR) && - NtFileName.Buffer[(NtFileName.Length / sizeof(WCHAR)) - 1] == '\\') - { - NtFileName.Length -= sizeof(WCHAR); - } - - /* - * Query mount point device name which we will later use for determining - * the volume name. - */ - - InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); - Status = NtOpenFile(&FileHandle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, - &ObjectAttributes, &Iosb, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeUnicodeString(&NtFileName); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - BufferLength = sizeof(MOUNTDEV_NAME) + 50 * sizeof(WCHAR); - do - { - MountDevName = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); - if (MountDevName == NULL) - { - NtClose(FileHandle); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, - IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, - NULL, 0, MountDevName, BufferLength); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, MountDevName); - if (Status == STATUS_BUFFER_OVERFLOW) - { - BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; - continue; - } - else - { - NtClose(FileHandle); - BaseSetLastNTError(Status); - return FALSE; - } - } - } - while (!NT_SUCCESS(Status)); - - NtClose(FileHandle); - - /* - * Get the mount point information from mount manager. - */ - - MountPointSize = MountDevName->NameLength + sizeof(MOUNTMGR_MOUNT_POINT); - MountPoint = RtlAllocateHeap(GetProcessHeap(), 0, MountPointSize); - if (MountPoint == NULL) - { - RtlFreeHeap(GetProcessHeap(), 0, MountDevName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - RtlZeroMemory(MountPoint, sizeof(MOUNTMGR_MOUNT_POINT)); - MountPoint->DeviceNameOffset = sizeof(MOUNTMGR_MOUNT_POINT); - MountPoint->DeviceNameLength = MountDevName->NameLength; - RtlCopyMemory(MountPoint + 1, MountDevName->Name, MountDevName->NameLength); - RtlFreeHeap(RtlGetProcessHeap(), 0, MountDevName); - - RtlInitUnicodeString(&NtFileName, L"\\??\\MountPointManager"); - InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); - Status = NtOpenFile(&FileHandle, FILE_GENERIC_READ, &ObjectAttributes, - &Iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); - return FALSE; - } - - BufferLength = sizeof(MOUNTMGR_MOUNT_POINTS); - do - { - MountPoints = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); - if (MountPoints == NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); - NtClose(FileHandle); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, - IOCTL_MOUNTMGR_QUERY_POINTS, - MountPoint, MountPointSize, - MountPoints, BufferLength); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_BUFFER_OVERFLOW) - { - BufferLength = MountPoints->Size; - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); - continue; - } - else if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); - NtClose(FileHandle); - BaseSetLastNTError(Status); - return FALSE; - } - } - } - while (!NT_SUCCESS(Status)); - - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); - NtClose(FileHandle); - - /* - * Now we've gathered info about all mount points mapped to our device, so - * select the correct one and copy it into the output buffer. - */ - - for (Index = 0; Index < MountPoints->NumberOfMountPoints; Index++) - { - MountPoint = MountPoints->MountPoints + Index; - SymbolicLinkName = (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset; - - /* - * Check for "\\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\" - * (with the last slash being optional) style symbolic links. - */ - - if (MountPoint->SymbolicLinkNameLength == 48 * sizeof(WCHAR) || - (MountPoint->SymbolicLinkNameLength == 49 * sizeof(WCHAR) && - SymbolicLinkName[48] == L'\\')) - { - if (RtlCompareMemory(SymbolicLinkName, L"\\??\\Volume{", - 11 * sizeof(WCHAR)) == 11 * sizeof(WCHAR) && - SymbolicLinkName[19] == L'-' && SymbolicLinkName[24] == L'-' && - SymbolicLinkName[29] == L'-' && SymbolicLinkName[34] == L'-' && - SymbolicLinkName[47] == L'}') - { - if (VolumeNameLength >= MountPoint->SymbolicLinkNameLength / sizeof(WCHAR)) - { - RtlCopyMemory(VolumeName, - (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset, - MountPoint->SymbolicLinkNameLength); - VolumeName[1] = L'\\'; - Result = TRUE; - } - else - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - Result = FALSE; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); - - return Result; - } - } - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); - SetLastError(ERROR_INVALID_PARAMETER); - - return FALSE; -} - /* * @implemented (Wine 13 sep 2008) */ -BOOL -WINAPI -GetVolumeNameForVolumeMountPointA( - LPCSTR lpszVolumeMountPoint, - LPSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - BOOL ret; - WCHAR volumeW[50], *pathW = NULL; - DWORD len = min( sizeof(volumeW) / sizeof(WCHAR), cchBufferLength ); - - TRACE("(%s, %p, %x)\n", debugstr_a(lpszVolumeMountPoint), lpszVolumeName, cchBufferLength); - - if (!lpszVolumeMountPoint || !(pathW = FilenameA2W( lpszVolumeMountPoint, TRUE ))) - return FALSE; - - if ((ret = GetVolumeNameForVolumeMountPointW( pathW, volumeW, len ))) - FilenameW2A_N( lpszVolumeName, len, volumeW, -1 ); - - RtlFreeHeap( RtlGetProcessHeap(), 0, pathW ); - return ret; -} - -/* - * @implemented (Wine 13 sep 2008) - */ HANDLE WINAPI -FindFirstVolumeW( - LPWSTR volume, - DWORD len - ) +FindFirstVolumeW(IN LPWSTR volume, + IN DWORD len) { DWORD size = 1024; HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, @@ -1149,10 +469,8 @@ */ HANDLE WINAPI -FindFirstVolumeA( - LPSTR volume, - DWORD len - ) +FindFirstVolumeA(IN LPSTR volume, + IN DWORD len) { WCHAR *buffer = NULL; HANDLE handle; @@ -1184,9 +502,7 @@ */ BOOL WINAPI -FindVolumeClose( - HANDLE hFindVolume - ) +FindVolumeClose(IN HANDLE hFindVolume) { return RtlFreeHeap(RtlGetProcessHeap(), 0, hFindVolume); } @@ -1196,9 +512,9 @@ */ BOOL WINAPI -GetVolumePathNameA(LPCSTR lpszFileName, - LPSTR lpszVolumePathName, - DWORD cchBufferLength) +GetVolumePathNameA(IN LPCSTR lpszFileName, + IN LPSTR lpszVolumePathName, + IN DWORD cchBufferLength) { PWCHAR FileNameW = NULL; WCHAR VolumePathName[MAX_PATH]; @@ -1223,9 +539,9 @@ */ BOOL WINAPI -GetVolumePathNameW(LPCWSTR lpszFileName, - LPWSTR lpszVolumePathName, - DWORD cchBufferLength) +GetVolumePathNameW(IN LPCWSTR lpszFileName, + IN LPWSTR lpszVolumePathName, + IN DWORD cchBufferLength) { DWORD PathLength; UNICODE_STRING UnicodeFilePath; @@ -1329,57 +645,14 @@ return Result; } - -/* - * @unimplemented - */ -BOOL -WINAPI -SetVolumeMountPointW( - LPCWSTR lpszVolumeMountPoint, - LPCWSTR lpszVolumeName - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -DeleteVolumeMountPointA( - LPCSTR lpszVolumeMountPoint - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -HANDLE -WINAPI -FindFirstVolumeMountPointA( - LPCSTR lpszRootPathName, - LPSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ) -{ - STUB; - return 0; -} - /* * @implemented */ BOOL WINAPI -FindNextVolumeA(HANDLE handle, - LPSTR volume, - DWORD len) +FindNextVolumeA(IN HANDLE handle, + IN LPSTR volume, + IN DWORD len) { WCHAR *buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, len * sizeof(WCHAR)); BOOL ret; @@ -1400,101 +673,13 @@ } /* - * @unimplemented - */ -BOOL -WINAPI -FindNextVolumeMountPointA( - HANDLE hFindVolumeMountPoint, - LPSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetVolumePathNamesForVolumeNameA( - LPCSTR lpszVolumeName, - LPSTR lpszVolumePathNames, - DWORD cchBufferLength, - PDWORD lpcchReturnLength - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetVolumeMountPointA( - LPCSTR lpszVolumeMountPoint, - LPCSTR lpszVolumeName - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -FindVolumeMountPointClose( - HANDLE hFindVolumeMountPoint - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -DeleteVolumeMountPointW( - LPCWSTR lpszVolumeMountPoint - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -HANDLE -WINAPI -FindFirstVolumeMountPointW( - LPCWSTR lpszRootPathName, - LPWSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ) -{ - STUB; - return 0; -} - -/* * @implemented */ BOOL WINAPI -FindNextVolumeW( - HANDLE handle, - LPWSTR volume, - DWORD len - ) +FindNextVolumeW(IN HANDLE handle, + IN LPWSTR volume, + IN DWORD len) { MOUNTMGR_MOUNT_POINTS *data = handle; @@ -1527,31 +712,28 @@ */ BOOL WINAPI -FindNextVolumeMountPointW( - HANDLE hFindVolumeMountPoint, - LPWSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ) +GetVolumePathNamesForVolumeNameA(IN LPCSTR lpszVolumeName, + IN LPSTR lpszVolumePathNames, + IN DWORD cchBufferLength, + OUT PDWORD lpcchReturnLength) { STUB; return 0; } + /* * @unimplemented */ BOOL WINAPI -GetVolumePathNamesForVolumeNameW( - LPCWSTR lpszVolumeName, - LPWSTR lpszVolumePathNames, - DWORD cchBufferLength, - PDWORD lpcchReturnLength - ) +GetVolumePathNamesForVolumeNameW(IN LPCWSTR lpszVolumeName, + IN LPWSTR lpszVolumePathNames, + IN DWORD cchBufferLength, + OUT PDWORD lpcchReturnLength) { STUB; return 0; } - /* EOF */

1 0

[ion] 59637: [KERNEL32]: Complete rewrite of CreateProcessInternalW based on Server 2003, instead of the original version that I wrote based on Windows 2000. This new version adds the right CSRSS s...
by ion＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ion Date: Sun Aug 4 16:58:54 2013 New Revision: 59637 URL: http://svn.reactos.org/svn/reactos?rev=59637&view=rev Log: [KERNEL32]: Complete rewrite of CreateProcessInternalW based on Server 2003, instead of the original version that I wrote based on Windows 2000. This new version adds the right CSRSS support for VDM and Wow32, stubs the upcoming support for SxS, uses the new NtCreateProcessEx functionality, adds checks for SDB/Shim/AppCompat, adds checks for SRP (the old AppLocker), adds support for image file execution options, such as large pages and the debugger key, adds licensing checks, adds better path handling using the path APIs that Thomas, Hermes, and Myself re-wrote/improved in Rtl/NTDLL, and a whole lot more. Tested with a bunch of launches, downloads, and apps, and no immediate regressions were seen, but this is 3500 lines of code and nothing is perfect. Please file Jira issues as they come up -- I will maintain & fix this. Will also ask Hermes to start working on the VDM/WoW32 paths for the new NTVDM work that's happening, and I will start looking at SxS. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/include/kernel32.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include…

1 0

[akhaldi] 59636: [PSDK] * Annotate some advpub.h functions.
by akhaldi＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: akhaldi Date: Sun Aug 4 16:38:27 2013 New Revision: 59636 URL: http://svn.reactos.org/svn/reactos?rev=59636&view=rev Log: [PSDK] * Annotate some advpub.h functions. Modified: trunk/reactos/include/psdk/advpub.h Modified: trunk/reactos/include/psdk/advpub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/advpub.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/advpub.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/advpub.h [iso-8859-1] Sun Aug 4 16:38:27 2013 @@ -190,9 +190,23 @@ HRESULT WINAPI ExtractFilesA(LPCSTR,LPCSTR,DWORD,LPCSTR,LPVOID,DWORD); HRESULT WINAPI ExtractFilesW(LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPVOID,DWORD); #define ExtractFiles WINELIB_NAME_AW(ExtractFiles) -HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName); -HRESULT WINAPI FileSaveMarkNotExistW(LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName); + +HRESULT +WINAPI +FileSaveMarkNotExistA( + _In_opt_ LPSTR pszFileList, + _In_opt_ LPSTR pszDir, + _In_opt_ LPSTR pszBaseName); + +HRESULT +WINAPI +FileSaveMarkNotExistW( + _In_opt_ LPWSTR pszFileList, + _In_opt_ LPWSTR pszDir, + _In_opt_ LPWSTR pszBaseName); + #define FileSaveMarkNotExist WINELIB_NAME_AW(FileSaveMarkNotExist) + HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName, DWORD dwFlags); HRESULT WINAPI FileSaveRestoreW(HWND hDlg, LPWSTR pszFileList, LPWSTR pszDir, @@ -213,9 +227,25 @@ INT WINAPI LaunchINFSectionA(HWND,HINSTANCE,LPSTR,INT); INT WINAPI LaunchINFSectionW(HWND,HINSTANCE,LPWSTR,INT); #define LaunchINFSection WINELIB_NAME_AW(LaunchINFSection) -HRESULT WINAPI LaunchINFSectionExA(HWND,HINSTANCE,LPSTR,INT); -HRESULT WINAPI LaunchINFSectionExW(HWND,HINSTANCE,LPWSTR,INT); + +HRESULT +WINAPI +LaunchINFSectionExA( + _In_opt_ HWND, + _In_opt_ HINSTANCE, + _In_ LPSTR, + _In_ INT); + +HRESULT +WINAPI +LaunchINFSectionExW( + _In_opt_ HWND, + _In_opt_ HINSTANCE, + _In_ LPWSTR, + _In_ INT); + #define LaunchINFSectionEx WINELIB_NAME_AW(LaunchINFSectionEx) + DWORD WINAPI NeedRebootInit(VOID); BOOL WINAPI NeedReboot(DWORD dwRebootCheck); HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, @@ -229,9 +259,23 @@ HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable); #define RegInstall WINELIB_NAME_AW(RegInstall) -HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey); -HRESULT WINAPI RegRestoreAllW(HWND hWnd, LPWSTR pszTitleString, HKEY hkBackupKey); + +HRESULT +WINAPI +RegRestoreAllA( + _In_opt_ HWND hWnd, + _In_opt_ LPSTR pszTitleString, + _In_ HKEY hkBackupKey); + +HRESULT +WINAPI +RegRestoreAllW( + _In_opt_ HWND hWnd, + _In_opt_ LPWSTR pszTitleString, + _In_ HKEY hkBackupKey); + #define RegRestoreAll WINELIB_NAME_AW(RegRestoreAll) + HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKey, LPCSTR pcszRootKey, LPCSTR pcszSubKey, LPCSTR pcszValueName, DWORD dwFlags); HRESULT WINAPI RegSaveRestoreW(HWND hWnd, LPCWSTR pszTitleString, HKEY hkBackupKey, @@ -249,15 +293,34 @@ LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); #define RunSetupCommand WINELIB_NAME_AW(RunSetupCommand) -HRESULT WINAPI SetPerUserSecValuesA(PPERUSERSECTIONA pPerUser); -HRESULT WINAPI SetPerUserSecValuesW(PPERUSERSECTIONW pPerUser); +HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser); +HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser); #define SetPerUserSecValues WINELIB_NAME_AW(SetPerUserSecValues) -HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, - LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer, - DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved); -HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, - LPCWSTR pszTranslateSection, LPCWSTR pszTranslateKey, LPWSTR pszBuffer, - DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved); + +HRESULT +WINAPI +TranslateInfStringA( + _In_ LPCSTR pszInfFilename, + _In_ LPCSTR pszInstallSection, + _In_ LPCSTR pszTranslateSection, + _In_ LPCSTR pszTranslateKey, + _Out_writes_opt_(dwBufferSize) LPSTR pszBuffer, + _In_ DWORD dwBufferSize, + _Out_ PDWORD pdwRequiredSize, + _Reserved_ PVOID pvReserved); + +HRESULT +WINAPI +TranslateInfStringW( + _In_ LPCWSTR pszInfFilename, + _In_ LPCWSTR pszInstallSection, + _In_ LPCWSTR pszTranslateSection, + _In_ LPCWSTR pszTranslateKey, + _Out_writes_opt_(dwBufferSize) LPWSTR pszBuffer, + _In_ DWORD dwBufferSize, + _Out_ PDWORD pdwRequiredSize, + _Reserved_ PVOID pvReserved); + #define TranslateInfString WINELIB_NAME_AW(TranslateInfString) HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer,

1 0

[akhaldi] 59635: [CRT] * Annotate stdio_s.h.
by akhaldi＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: akhaldi Date: Sun Aug 4 14:43:44 2013 New Revision: 59635 URL: http://svn.reactos.org/svn/reactos?rev=59635&view=rev Log: [CRT] * Annotate stdio_s.h. Modified: trunk/reactos/include/crt/sec_api/stdio_s.h Modified: trunk/reactos/include/crt/sec_api/stdio_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/stdio_… ============================================================================== --- trunk/reactos/include/crt/sec_api/stdio_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/stdio_s.h [iso-8859-1] Sun Aug 4 14:43:44 2013 @@ -16,133 +16,1133 @@ #ifndef _STDIO_S_DEFINED #define _STDIO_S_DEFINED - _CRTIMP errno_t __cdecl clearerr_s(FILE *_File); - int __cdecl fprintf_s(FILE *_File,const char *_Format,...); - size_t __cdecl fread_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File); - _CRTIMP int __cdecl _fscanf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...); - int __cdecl printf_s(const char *_Format,...); - _CRTIMP int __cdecl _scanf_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _scanf_s_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,...); - _CRTIMP int __cdecl _snprintf_c(char *_DstBuf,size_t _MaxCount,const char *_Format,...); - _CRTIMP int __cdecl _vsnprintf_c(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); - int __cdecl sprintf_s(char *_DstBuf,size_t _DstSize,const char *_Format,...); - _CRTIMP int __cdecl _fscanf_l(FILE *_File,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _sscanf_l(const char *_Src,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _sscanf_s_l(const char *_Src,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snscanf_s(const char *_Src,size_t _MaxCount,const char *_Format,...); - _CRTIMP int __cdecl _snscanf_l(const char *_Src,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snscanf_s_l(const char *_Src,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - int __cdecl vfprintf_s(FILE *_File,const char *_Format,va_list _ArgList); - int __cdecl vprintf_s(const char *_Format,va_list _ArgList); - int __cdecl vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList); - int __cdecl vsprintf_s(char *_DstBuf,size_t _Size,const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _fprintf_p(FILE *_File,const char *_Format,...); - _CRTIMP int __cdecl _printf_p(const char *_Format,...); - _CRTIMP int __cdecl _sprintf_p(char *_Dst,size_t _MaxCount,const char *_Format,...); - _CRTIMP int __cdecl _vfprintf_p(FILE *_File,const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vprintf_p(const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vsprintf_p(char *_Dst,size_t _MaxCount,const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _scprintf_p(const char *_Format,...); - _CRTIMP int __cdecl _vscprintf_p(const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _printf_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _printf_p_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fprintf_l(FILE *_File,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _fprintf_p_l(FILE *_File,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfprintf_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vfprintf_p_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _sprintf_l(char *_DstBuf,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _sprintf_p_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsprintf_l(char *_DstBuf,const char *_Format,_locale_t,va_list _ArgList); - _CRTIMP int __cdecl _vsprintf_p_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _scprintf_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _scprintf_p_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vscprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vscprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _printf_s_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vprintf_s_l(const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fprintf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfprintf_s_l(FILE *_File,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _sprintf_s_l(char *_DstBuf,size_t _DstSize,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsprintf_s_l(char *_DstBuf,size_t _DstSize,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snprintf_s_l(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnprintf_s_l(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnprintf_l(char *_DstBuf,size_t _MaxCount,const char *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vsnprintf_c_l(char *_DstBuf,size_t _MaxCount,const char *,_locale_t _Locale,va_list _ArgList); - _CRTIMP errno_t __cdecl fopen_s(FILE **_File,const char *_Filename,const char *_Mode); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + clearerr_s( + _Inout_ FILE *_File); + + _Check_return_opt_ + int + __cdecl + fprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + size_t + __cdecl + fread_s( + _Out_writes_bytes_(_ElementSize * _Count) void *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _ElementSize, + _In_ size_t _Count, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fscanf_s_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_s_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + int + __cdecl + printf_s( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _scanf_l( + _In_z_ _Scanf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _scanf_s_l( + _In_z_ _Scanf_s_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snprintf_s( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snprintf_c( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnprintf_c( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + int + __cdecl + sprintf_s( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fscanf_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sscanf_l( + _In_z_ const char *_Src, + _In_z_ _Scanf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sscanf_s_l( + _In_z_ const char *_Src, + _In_z_ _Scanf_s_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snscanf_s( + _In_reads_bytes_(_MaxCount) _Pre_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snscanf_l( + _In_reads_bytes_(_MaxCount) _Pre_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snscanf_s_l( + _In_reads_bytes_(_MaxCount) _Pre_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + int + __cdecl + vfprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + int + __cdecl + vprintf_s( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + int + __cdecl + vsnprintf_s( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnprintf_s( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + int + __cdecl + vsprintf_s( + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _printf_p( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sprintf_p( + _Out_writes_z_(_MaxCount) char *_Dst, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vprintf_p( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsprintf_p( + _Out_writes_z_(_MaxCount) char *_Dst, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scprintf_p( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscprintf_p( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _printf_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _printf_p_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vprintf_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vprintf_p_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sprintf_l( + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sprintf_p_l( + _Out_writes_z_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsprintf_l( + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsprintf_p_l( + _Out_writes_z_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _scprintf_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _scprintf_p_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vscprintf_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vscprintf_p_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _printf_s_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vprintf_s_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _sprintf_s_l( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsprintf_s_l( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snprintf_s_l( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnprintf_s_l( + _Out_writes_z_(_DstSize) char *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snprintf_l( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snprintf_c_l( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnprintf_l( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnprintf_c_l( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + const char *, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + fopen_s( + _Outptr_result_maybenull_ FILE **_File, + _In_z_ const char *_Filename, + _In_z_ const char *_Mode); #ifndef _WSTDIO_S_DEFINED #define _WSTDIO_S_DEFINED - _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); - int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); - int __cdecl wprintf_s(const wchar_t *_Format,...); - int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); - int __cdecl vwprintf_s(const wchar_t *_Format,va_list _ArgList); - int __cdecl swprintf_s(wchar_t *_Dst,size_t _SizeInWords,const wchar_t *_Format,...); - int __cdecl vswprintf_s(wchar_t *_Dst,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_s(wchar_t *_DstBuf,size_t _DstSizeInWords,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vsnwprintf_s(wchar_t *_DstBuf,size_t _DstSizeInWords,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _wprintf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vwprintf_s_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwprintf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfwprintf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vswprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnwprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwscanf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swscanf_s_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP errno_t __cdecl _wfopen_s(FILE **_File,const wchar_t *_Filename,const wchar_t *_Mode); - _CRTIMP errno_t __cdecl _wfreopen_s(FILE **_File,const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); - _CRTIMP errno_t __cdecl _wtmpnam_s(wchar_t *_DstBuf,size_t _SizeInWords); - _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vscwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _wprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _fwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vfwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vswprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vswprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _scwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vscwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + wchar_t * + __cdecl + _getws_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_opt_ + int + __cdecl + fwprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + int + __cdecl + wprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + int + __cdecl + vfwprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + int + __cdecl + vwprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + int + __cdecl + swprintf_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + int + __cdecl + vswprintf_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_s( + _Out_writes_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_s( + _Out_writes_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwscanf_s_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swscanf_s_l( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_s( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_s_l( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wscanf_s_l( + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wfopen_s( + _Outptr_result_maybenull_ FILE **_File, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wfreopen_s( + _Outptr_result_maybenull_ FILE **_File, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _Inout_ FILE *_OldFile); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wtmpnam_s( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + _CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...); _CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args); - _CRTIMP int __cdecl _vscwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwscanf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP errno_t __cdecl _wfopen_s(FILE ** _File,const wchar_t *_Filename,const wchar_t *_Mode); -#endif -#endif - - _CRTIMP size_t __cdecl _fread_nolock_s(void *_DstBuf,size_t _DstSize,size_t _ElementSize,size_t _Count,FILE *_File); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwscanf_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swscanf_l( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_l( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wscanf_l( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wfopen_s( + _Outptr_result_maybenull_ FILE ** _File, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode); + +#endif /* _WSTDIO_S_DEFINED */ + +#endif /* _STDIO_S_DEFINED */ + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _fread_nolock_s( + _Out_writes_bytes_(_ElementSize * _Count) void *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _ElementSize, + _In_ size_t _Count, + _Inout_ FILE *_File); #ifdef __cplusplus } #endif -#endif -#endif + +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_STDIO_S */

1 0

[ekohl] 59634: [SAMLIB] Formatting. No code changes!
by ekohl＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ekohl Date: Sun Aug 4 13:04:02 2013 New Revision: 59634 URL: http://svn.reactos.org/svn/reactos?rev=59634&view=rev Log: [SAMLIB] Formatting. No code changes! Modified: trunk/reactos/dll/win32/samlib/dllmain.c Modified: trunk/reactos/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] Sun Aug 4 13:04:02 2013 @@ -35,13 +35,13 @@ /* FUNCTIONS *****************************************************************/ -BOOL WINAPI -DllMain (HINSTANCE hInstance, - DWORD dwReason, - LPVOID lpReserved) +BOOL +WINAPI +DllMain(HINSTANCE hInstance, + DWORD dwReason, + LPVOID lpReserved) { - - return TRUE; + return TRUE; } /* EOF */

1 0

[cgutman] 59633: [IP] - Do a better job of selecting an interface to use when none was specified - Fix build
by cgutman＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: cgutman Date: Sun Aug 4 12:45:53 2013 New Revision: 59633 URL: http://svn.reactos.org/svn/reactos?rev=59633&view=rev Log: [IP] - Do a better job of selecting an interface to use when none was specified - Fix build Modified: trunk/reactos/lib/drivers/ip/network/interface.c Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Sun Aug 4 12:45:53 2013 @@ -10,6 +10,8 @@ */ #include "precomp.h" + +ULONG NextDefaultAdapter = 0; NTSTATUS GetInterfaceIPv4Address( PIP_INTERFACE Interface, ULONG TargetType, @@ -143,18 +145,46 @@ return TRUE; } -static PIP_INTERFACE GetDefaultInterface(VOID) +PIP_INTERFACE GetDefaultInterface(VOID) { KIRQL OldIrql; + ULONG Index = 0; + IF_LIST_ITER(CurrentIF); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); + /* DHCP hack: Always return the adapter without an IP address */ ForEachInterface(CurrentIF) { if (CurrentIF->Context) { + if (AddrIsUnspecified(&CurrentIF->Unicast)) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + return CurrentIF; + } + } + } EndFor(CurrentIF); + + /* Try to continue from the next adapter */ + ForEachInterface(CurrentIF) { + if (CurrentIF->Context) { + if (Index++ == NextDefaultAdapter) { + NextDefaultAdapter++; + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + return CurrentIF; + } + } + } EndFor(CurrentIF); + + /* No luck, so we'll choose the first adapter this time */ + ForEachInterface(CurrentIF) { + if (CurrentIF->Context) { + NextDefaultAdapter = 1; TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); return CurrentIF; } } EndFor(CurrentIF); + + /* Even that didn't work, so we'll just go with loopback */ + NextDefaultAdapter = 0; TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); /* There are no physical interfaces on the system

1 0

[cgutman] 59632: [TCPIP] - Properly support having the same neighbor addresses on different interfaces
by cgutman＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: cgutman Date: Sun Aug 4 12:35:05 2013 New Revision: 59632 URL: http://svn.reactos.org/svn/reactos?rev=59632&view=rev Log: [TCPIP] - Properly support having the same neighbor addresses on different interfaces Modified: trunk/reactos/drivers/network/tcpip/include/interface.h trunk/reactos/drivers/network/tcpip/include/neighbor.h trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/include/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -15,3 +15,4 @@ NTSTATUS GetInterfaceConnectionStatus( PIP_INTERFACE Interface, PULONG OperStatus ); PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address); +PIP_INTERFACE GetDefaultInterface(VOID); Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -83,7 +83,8 @@ UCHAR State); PNEIGHBOR_CACHE_ENTRY NBLocateNeighbor( - PIP_ADDRESS Address); + PIP_ADDRESS Address, + PIP_INTERFACE Interface); PNEIGHBOR_CACHE_ENTRY NBFindOrCreateNeighbor( PIP_INTERFACE Interface, Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -145,7 +145,7 @@ AddrInitIPv4(&Address, ArpEntry->LogAddr); - if ((NCE = NBLocateNeighbor(&Address))) + if ((NCE = NBLocateNeighbor(&Address, IF))) NBRemoveNeighbor(NCE); if (NBAddNeighbor(IF, Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -271,7 +271,7 @@ AddrInitIPv4(&SrcAddress, *((PULONG)SenderProtoAddress)); /* Check if we know the sender */ - NCE = NBLocateNeighbor(&SrcAddress); + NCE = NBLocateNeighbor(&SrcAddress, Interface); if (NCE) { /* We know the sender. Update the hardware address and state in our neighbor address cache */ Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -173,7 +173,7 @@ } else { - if(!(NCE = NBLocateNeighbor( &LocalAddress ))) + if(!(NCE = NBLocateNeighbor( &LocalAddress, NULL ))) { UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -327,7 +327,7 @@ PNEIGHBOR_CACHE_ENTRY NCE; IP_ADDRESS GeneralRoute; - NCE = NBLocateNeighbor(&IF->Unicast); + NCE = NBLocateNeighbor(&IF->Unicast, IF); if (NCE) { TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -415,11 +415,13 @@ } PNEIGHBOR_CACHE_ENTRY NBLocateNeighbor( - PIP_ADDRESS Address) + PIP_ADDRESS Address, + PIP_INTERFACE Interface) /* * FUNCTION: Locates a neighbor in the neighbor cache * ARGUMENTS: * Address = Pointer to IP address + * Interface = Pointer to IP interface * RETURNS: * Pointer to NCE, NULL if not found * NOTES: @@ -430,6 +432,7 @@ PNEIGHBOR_CACHE_ENTRY NCE; UINT HashValue; KIRQL OldIrql; + PIP_INTERFACE FirstInterface; TI_DbgPrint(DEBUG_NCACHE, ("Called. Address (0x%X).\n", Address)); @@ -443,10 +446,36 @@ NCE = NeighborCache[HashValue].Cache; - while ((NCE) && (!AddrIsEqual(Address, &NCE->Address))) - { - NCE = NCE->Next; - } + /* If there's no adapter specified, we'll look for a match on + * each one. */ + if (Interface == NULL) + { + FirstInterface = GetDefaultInterface(); + Interface = FirstInterface; + } + else + { + FirstInterface = NULL; + } + + do + { + while (NCE != NULL) + { + if (NCE->Interface == Interface && + AddrIsEqual(Address, &NCE->Address)) + { + break; + } + + NCE = NCE->Next; + } + + if (NCE != NULL) + break; + } + while ((FirstInterface != NULL) && + ((Interface = GetDefaultInterface()) != FirstInterface)); TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); @@ -475,7 +504,7 @@ TI_DbgPrint(DEBUG_NCACHE, ("Called. Interface (0x%X) Address (0x%X).\n", Interface, Address)); - NCE = NBLocateNeighbor(Address); + NCE = NBLocateNeighbor(Address, Interface); if (NCE == NULL) { TI_DbgPrint(MID_TRACE,("BCAST: %s\n", A2S(&Interface->Broadcast))); Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -230,7 +230,7 @@ } else { - if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { + if(!(NCE = NBLocateNeighbor( &LocalAddress, NULL ))) { UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sun Aug 4 12:35:05 2013 @@ -208,7 +208,7 @@ } else { - if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { + if(!(NCE = NBLocateNeighbor( &LocalAddress, NULL ))) { UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; }

1 0

[ekohl] 59631: [NETAPI32] NetpNtStatusToApiStatus: Convert STATUS_PASSWORD_RESTRICTION to NERR_PasswordTooShort.
by ekohl＠svn.reactos.org 04 Aug '13

04 Aug '13

Author: ekohl Date: Sun Aug 4 10:55:09 2013 New Revision: 59631 URL: http://svn.reactos.org/svn/reactos?rev=59631&view=rev Log: [NETAPI32] NetpNtStatusToApiStatus: Convert STATUS_PASSWORD_RESTRICTION to NERR_PasswordTooShort. Modified: trunk/reactos/dll/win32/netapi32/netapi32.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Sun Aug 4 10:55:09 2013 @@ -230,6 +230,10 @@ ApiStatus = NERR_BadUsername; break; + case STATUS_PASSWORD_RESTRICTION: + ApiStatus = NERR_PasswordTooShort; + break; + default: ApiStatus = RtlNtStatusToDosError(Status); break;

1 0

[ekohl] 59630: [SAMLIB] Implement SamQueryDisplayInformation.
by ekohl＠svn.reactos.org 03 Aug '13

03 Aug '13

Author: ekohl Date: Sat Aug 3 22:39:58 2013 New Revision: 59630 URL: http://svn.reactos.org/svn/reactos?rev=59630&view=rev Log: [SAMLIB] Implement SamQueryDisplayInformation. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Aug 3 22:39:58 2013 @@ -1411,6 +1411,92 @@ NTSTATUS NTAPI +SamQueryDisplayInformation(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN ULONG Index, + IN ULONG EntryCount, + IN ULONG PreferredMaximumLength, + OUT PULONG TotalAvailable, + OUT PULONG TotalReturned, + OUT PULONG ReturnedEntryCount, + OUT PVOID *SortedBuffer) +{ + SAMPR_DISPLAY_INFO_BUFFER LocalBuffer; + NTSTATUS Status; + + TRACE("(%p %lu %lu %lu %lu %p %p %p %p)\n", + DomainHandle, DisplayInformation, Index, EntryCount, + PreferredMaximumLength, TotalAvailable, TotalReturned, + ReturnedEntryCount, SortedBuffer); + + if ((TotalAvailable == NULL) || + (TotalReturned == NULL) || + (ReturnedEntryCount == NULL) || + (SortedBuffer == NULL)) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = SamrQueryDisplayInformation3((SAMPR_HANDLE)DomainHandle, + DisplayInformation, + Index, + EntryCount, + PreferredMaximumLength, + TotalAvailable, + TotalReturned, + &LocalBuffer); + if (NT_SUCCESS(Status)) + { + switch (DisplayInformation) + { + case DomainDisplayUser: + *ReturnedEntryCount = LocalBuffer.UserInformation.EntriesRead; + *SortedBuffer = LocalBuffer.UserInformation.Buffer; + break; + + case DomainDisplayMachine: + *ReturnedEntryCount = LocalBuffer.MachineInformation.EntriesRead; + *SortedBuffer = LocalBuffer.MachineInformation.Buffer; + break; + + case DomainDisplayGroup: + *ReturnedEntryCount = LocalBuffer.GroupInformation.EntriesRead; + *SortedBuffer = LocalBuffer.GroupInformation.Buffer; + break; + + case DomainDisplayOemUser: + *ReturnedEntryCount = LocalBuffer.OemUserInformation.EntriesRead; + *SortedBuffer = LocalBuffer.OemUserInformation.Buffer; + break; + + case DomainDisplayOemGroup: + *ReturnedEntryCount = LocalBuffer.OemGroupInformation.EntriesRead; + *SortedBuffer = LocalBuffer.OemGroupInformation.Buffer; + break; + + case DomainDisplayServer: + /* FIXME */ + break; + } + } + else + { + *ReturnedEntryCount = 0; + *SortedBuffer = NULL; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamQueryInformationAlias(IN SAM_HANDLE AliasHandle, IN ALIAS_INFORMATION_CLASS AliasInformationClass, OUT PVOID *Buffer) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sat Aug 3 22:39:58 2013 @@ -32,7 +32,7 @@ @ stdcall SamOpenDomain(ptr long ptr ptr) @ stdcall SamOpenGroup(ptr long long ptr) @ stdcall SamOpenUser(ptr long long ptr) -@ stub SamQueryDisplayInformation +@ stdcall SamQueryDisplayInformation(ptr long long long long ptr ptr ptr ptr) @ stdcall SamQueryInformationAlias(ptr long ptr) @ stdcall SamQueryInformationDomain(ptr long ptr) @ stdcall SamQueryInformationGroup(ptr long ptr) Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sat Aug 3 22:39:58 2013 @@ -903,6 +903,18 @@ NTSTATUS NTAPI +SamQueryDisplayInformation(IN SAM_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformation, + IN ULONG Index, + IN ULONG EntryCount, + IN ULONG PreferredMaximumLength, + OUT PULONG TotalAvailable, + OUT PULONG TotalReturned, + OUT PULONG ReturnedEntryCount, + OUT PVOID *SortedBuffer); + +NTSTATUS +NTAPI SamQueryInformationAlias(IN SAM_HANDLE AliasHandle, IN ALIAS_INFORMATION_CLASS AliasInformationClass, OUT PVOID *Buffer);

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