Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[jimtabor] 75980: [NtUser] - Patch by MudHead : Should test for invalid parent parameter. See CORE-13718.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 27 22:39:17 2017 New Revision: 75980 URL: http://svn.reactos.org/svn/reactos?rev=75980&view=rev Log: [NtUser] - Patch by MudHead : Should test for invalid parent parameter. See CORE-13718. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Sep 27 22:39:17 2017 @@ -1944,7 +1944,7 @@ } else if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { - ERR("Cannot create a child window without a parrent!\n"); + ERR("Cannot create a child window without a parent!\n"); EngSetLastError(ERROR_TLW_WITH_WSCHILD); goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } @@ -1955,6 +1955,12 @@ if (hWndParent && !ParentWindow) { ERR("Got invalid parent window handle\n"); + goto cleanup; + } + else if (hWndOwner && !OwnerWindow) + { + ERR("Got invalid owner window handle\n"); + ParentWindow = NULL; goto cleanup; }

6 years, 11 months

[jimtabor] 75979: [NtUser] - Patch by MudHead : Not setting error on success. See CORE-13717.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 27 22:35:26 2017 New Revision: 75979 URL: http://svn.reactos.org/svn/reactos?rev=75979&view=rev Log: [NtUser] - Patch by MudHead : Not setting error on success. See CORE-13717. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Sep 27 22:35:26 2017 @@ -2322,6 +2322,10 @@ } if (ParentWindow) UserDerefObjectCo(ParentWindow); + // See CORE-13717, not setting error on success. + if (ret) + EngSetLastError(ERROR_SUCCESS); + return ret; }

6 years, 11 months

[pschweitzer] 75978: [KERNEL32] - Move InternalOpenDirW() to disk.c; that's the last place where it's used - Implement GetVolumePathNamesForVolumeNameA(); its -W implementation is still to be imple...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 27 17:43:52 2017 New Revision: 75978 URL: http://svn.reactos.org/svn/reactos?rev=75978&view=rev Log: [KERNEL32] - Move InternalOpenDirW() to disk.c; that's the last place where it's used - Implement GetVolumePathNamesForVolumeNameA(); its -W implementation is still to be implemented - W2K3ify SetVolumeLabelW() and SetVolumeLabelA() Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Wed Sep 27 17:43:52 2017 @@ -26,7 +26,53 @@ DEBUG_CHANNEL(kernel32file); #define MAX_DOS_DRIVES 26 -HANDLE WINAPI InternalOpenDirW(IN LPCWSTR DirName, IN BOOLEAN Write); + +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); + + if (!NT_SUCCESS(errCode)) + { + BaseSetLastNTError(errCode); + return INVALID_HANDLE_VALUE; + } + + return hFile; +} /* * @implemented 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] Wed Sep 27 17:43:52 2017 @@ -22,54 +22,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); - -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); - - if (!NT_SUCCESS(errCode)) - { - BaseSetLastNTError(errCode); - return INVALID_HANDLE_VALUE; - } - - return hFile; -} + /* * @implemented @@ -506,30 +459,36 @@ SetVolumeLabelA(IN LPCSTR lpRootPathName, IN LPCSTR lpVolumeName OPTIONAL) /* NULL if deleting label */ { - PWCHAR RootPathNameW; - PWCHAR VolumeNameW = NULL; - BOOL Result; - - if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) - return FALSE; - - if (lpVolumeName) - { - if (!(VolumeNameW = FilenameA2W(lpVolumeName, TRUE))) - return FALSE; - } - - Result = SetVolumeLabelW (RootPathNameW, - VolumeNameW); - - if (VolumeNameW) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VolumeNameW ); - } - - return Result; + BOOL Ret; + UNICODE_STRING VolumeNameU; + PUNICODE_STRING RootPathNameU; + + if (lpRootPathName == NULL) + { + lpRootPathName = "\\"; + } + + RootPathNameU = Basep8BitStringToStaticUnicodeString(lpRootPathName); + if (RootPathNameU == NULL) + { + return FALSE; + } + + if (lpVolumeName != NULL) + { + if (!Basep8BitStringToDynamicUnicodeString(&VolumeNameU, lpVolumeName)) + { + return FALSE; + } + } + else + { + VolumeNameU.Buffer = NULL; + } + + Ret = SetVolumeLabelW(RootPathNameU->Buffer, VolumeNameU.Buffer); + RtlFreeUnicodeString(&VolumeNameU); + return Ret; } /* @@ -540,57 +499,153 @@ SetVolumeLabelW(IN LPCWSTR lpRootPathName, IN LPCWSTR lpVolumeName OPTIONAL) /* NULL if deleting label */ { - PFILE_FS_LABEL_INFORMATION LabelInfo; - IO_STATUS_BLOCK IoStatusBlock; - ULONG LabelLength; - HANDLE hFile; - NTSTATUS Status; - - LabelLength = wcslen(lpVolumeName) * sizeof(WCHAR); - LabelInfo = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(FILE_FS_LABEL_INFORMATION) + - LabelLength); - if (LabelInfo == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - LabelInfo->VolumeLabelLength = LabelLength; - memcpy(LabelInfo->VolumeLabel, - lpVolumeName, - LabelLength); - - hFile = InternalOpenDirW(lpRootPathName, TRUE); - if (INVALID_HANDLE_VALUE == hFile) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - LabelInfo); - return FALSE; - } - - Status = NtSetVolumeInformationFile(hFile, - &IoStatusBlock, - LabelInfo, - sizeof(FILE_FS_LABEL_INFORMATION) + - LabelLength, - FileFsLabelInformation); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - LabelInfo); - - if (!NT_SUCCESS(Status)) - { - WARN("Status: %x\n", Status); - CloseHandle(hFile); - BaseSetLastNTError(Status); - return FALSE; - } - - CloseHandle(hFile); - return TRUE; + BOOL Ret; + NTSTATUS Status; + PWSTR VolumeRoot; + HANDLE VolumeHandle; + WCHAR VolumeGuid[MAX_PATH]; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILE_FS_LABEL_INFORMATION FsLabelInfo; + UNICODE_STRING VolumeName, NtVolumeName; + + /* If no root path provided, default to \ */ + VolumeRoot = L"\\"; + + /* If user wants to set a label, make it a string */ + if (lpVolumeName != NULL) + { + RtlInitUnicodeString(&VolumeName, lpVolumeName); + } + else + { + VolumeName.Length = 0; + VolumeName.MaximumLength = 0; + VolumeName.Buffer = NULL; + } + + /* If we received a volume, try to get its GUID name */ + if (lpRootPathName != NULL) + { + Ret = GetVolumeNameForVolumeMountPointW(lpRootPathName, VolumeGuid, MAX_PATH); + } + else + { + Ret = FALSE; + } + + /* If we got the GUID name, use it */ + if (Ret) + { + VolumeRoot = VolumeGuid; + } + else + { + /* Otherwise, use the name provided by the caller */ + if (lpRootPathName != NULL) + { + VolumeRoot = (PWSTR)lpRootPathName; + } + } + + /* Convert to a NT path */ + if (!RtlDosPathNameToNtPathName_U(VolumeRoot, &NtVolumeName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + + /* Check we really end with a backslash */ + if (NtVolumeName.Buffer[(NtVolumeName.Length / sizeof(WCHAR)) - 1] != L'\\') + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtVolumeName.Buffer); + BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID); + return FALSE; + } + + /* Try to open the root directory */ + InitializeObjectAttributes(&ObjectAttributes, &NtVolumeName, + OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtOpenFile(&VolumeHandle, SYNCHRONIZE | FILE_WRITE_DATA, + &ObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtVolumeName.Buffer); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Validate it's really a root path */ + if (!IsThisARootDirectory(VolumeHandle, NULL)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtVolumeName.Buffer); + NtClose(VolumeHandle); + SetLastError(ERROR_DIR_NOT_ROOT); + return FALSE; + } + + /* Done */ + NtClose(VolumeHandle); + + /* Now, open the volume to perform the label change */ + NtVolumeName.Length -= sizeof(WCHAR); + InitializeObjectAttributes(&ObjectAttributes, &NtVolumeName, + OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtOpenFile(&VolumeHandle, SYNCHRONIZE | FILE_WRITE_DATA, + &ObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtVolumeName.Buffer); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Assume success */ + Ret = TRUE; + + /* Allocate a buffer that can hold new label and its size */ + FsLabelInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FILE_FS_LABEL_INFORMATION) + VolumeName.Length); + if (FsLabelInfo != NULL) + { + /* Copy name and set its size */ + RtlCopyMemory(FsLabelInfo->VolumeLabel, VolumeName.Buffer, VolumeName.Length); + FsLabelInfo->VolumeLabelLength = VolumeName.Length; + + /* And finally, set new label */ + Status = NtSetVolumeInformationFile(VolumeHandle, &IoStatusBlock, FsLabelInfo, sizeof(FILE_FS_LABEL_INFORMATION) + VolumeName.Length, FileFsLabelInformation); + } + else + { + /* Allocation failed */ + Status = STATUS_NO_MEMORY; + } + + /* In case of failure, set status and mark failure */ + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Ret = FALSE; + } + + /* We're done */ + NtClose(VolumeHandle); + + /* Free buffer if required */ + if (FsLabelInfo != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FsLabelInfo); + } + + return Ret; } /* @@ -891,7 +946,7 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI @@ -900,8 +955,103 @@ IN DWORD cchBufferLength, OUT PDWORD lpcchReturnLength) { - STUB; - return 0; + BOOL Ret; + NTSTATUS Status; + DWORD cchReturnLength; + ANSI_STRING VolumePathName; + PUNICODE_STRING VolumeNameU; + UNICODE_STRING VolumePathNamesU; + + /* Convert volume name to unicode */ + VolumeNameU = Basep8BitStringToStaticUnicodeString(lpszVolumeName); + if (VolumeNameU == NULL) + { + return FALSE; + } + + /* Initialize the strings we'll use later on */ + VolumePathName.Length = 0; + VolumePathName.MaximumLength = cchBufferLength; + VolumePathName.Buffer = lpszVolumePathNames; + + VolumePathNamesU.Length = 0; + VolumePathNamesU.MaximumLength = sizeof(WCHAR) * cchBufferLength; + /* If caller provided a non 0 sized string, allocate a buffer for our unicode string */ + if (VolumePathNamesU.MaximumLength != 0) + { + VolumePathNamesU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, VolumePathNamesU.MaximumLength); + if (VolumePathNamesU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + else + { + VolumePathNamesU.Buffer = NULL; + } + + /* Call the -W implementation */ + Ret = GetVolumePathNamesForVolumeNameW(VolumeNameU->Buffer, VolumePathNamesU.Buffer, + cchBufferLength, &cchReturnLength); + /* Call succeed, we'll return the total length */ + if (Ret) + { + VolumePathNamesU.Length = sizeof(WCHAR) * cchReturnLength; + } + else + { + /* Else, if we fail for anything else than too small buffer, quit */ + if (GetLastError() != ERROR_MORE_DATA) + { + if (VolumePathNamesU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePathNamesU.Buffer); + } + + return FALSE; + } + + /* Otherwise, we'll just copy as much as we can */ + VolumePathNamesU.Length = sizeof(WCHAR) * cchBufferLength; + } + + /* Convert our output string back to ANSI */ + Status = RtlUnicodeStringToAnsiString(&VolumePathName, &VolumePathNamesU, FALSE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + + if (VolumePathNamesU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePathNamesU.Buffer); + } + + return FALSE; + } + + /* If caller wants return length, two cases... */ + if (lpcchReturnLength != NULL) + { + /* We succeed: return the copied length */ + if (Ret) + { + *lpcchReturnLength = VolumePathName.Length; + } + /* We failed, return the size we would have loved having! */ + else + { + *lpcchReturnLength = sizeof(WCHAR) * cchReturnLength; + } + } + + /* Release our buffer if allocated */ + if (VolumePathNamesU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumePathNamesU.Buffer); + } + + return Ret; }

6 years, 11 months

[hbelusca] 75977: [TIMEOUT]: Use a waitable timer to wait for a maximum of 1 second, instead of using some Sleep(100) calls. The only Sleep() call allowed is the Sleep(INFINITE) one.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 26 14:29:25 2017 New Revision: 75977 URL: http://svn.reactos.org/svn/reactos?rev=75977&view=rev Log: [TIMEOUT]: Use a waitable timer to wait for a maximum of 1 second, instead of using some Sleep(100) calls. The only Sleep() call allowed is the Sleep(INFINITE) one. Modified: trunk/reactos/base/applications/cmdutils/timeout/timeout.c Modified: trunk/reactos/base/applications/cmdutils/timeout/timeout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/timeout.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/timeout/timeout.c [iso-8859-1] Tue Sep 26 14:29:25 2017 @@ -49,6 +49,7 @@ INT Status = EXIT_SUCCESS; HANDLE hInput; BOOL bUseTimer = (timerValue != -1); + HANDLE hTimer = NULL; DWORD dwStartTime; LONG timeElapsed; DWORD dwWaitState; @@ -67,6 +68,16 @@ } /* Start a new wait if we use the timer */ + if (bNoBreak && bUseTimer) + { + hTimer = CreateWaitableTimer(NULL, TRUE, NULL); + if (hTimer == NULL) + { + /* A problem happened, bail out */ + PrintError(GetLastError()); + return EXIT_FAILURE; + } + } if (bUseTimer) dwStartTime = GetTickCount(); @@ -138,8 +149,34 @@ { if (bUseTimer) { - /* We use the timer: wait a little bit before updating it */ - Sleep(100); + LARGE_INTEGER DueTime; + + /* We use the timer: use a passive wait of maximum 1 second */ + timeElapsed = GetTickCount() - dwStartTime; + if (timeElapsed < 1000) + { + /* + * For whatever reason, x86 MSVC generates a ntdll!_allmul + * call when using Int32x32To64(), instead of an imul + * instruction. This leads the linker to error that _allmul + * is missing, since we do not link against ntdll. + * Everything is however OK with GCC... + * We therefore use the __emul() intrinsic which does + * the correct job. + */ + DueTime.QuadPart = __emul(1000 - timeElapsed, -10000); + SetWaitableTimer(hTimer, &DueTime, 0, NULL, NULL, FALSE); + dwWaitState = WaitForSingleObject(hTimer, INFINITE); + + /* Check whether the timer has been signaled */ + if (dwWaitState != WAIT_OBJECT_0) + { + /* An error happened, bail out */ + PrintError(GetLastError()); + Status = EXIT_FAILURE; + break; + } + } } else { @@ -170,7 +207,7 @@ else dwWaitState = WAIT_TIMEOUT; - /* Check whether the input handle has been signaled, or a timeout happened */ + /* Check whether the input event has been signaled, or a timeout happened */ if (dwWaitState == WAIT_TIMEOUT) continue; if (dwWaitState != WAIT_OBJECT_0) @@ -234,6 +271,9 @@ Quit: if (bNoBreak) SetConsoleCtrlHandler(NULL, FALSE); + + if (bNoBreak && bUseTimer) + CloseHandle(hTimer); return Status; }

6 years, 11 months

[ekohl] 75976: [FASTFAT] Revert r75975 because of failures in the advpack files winetest.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 13:49:09 2017 New Revision: 75976 URL: http://svn.reactos.org/svn/reactos?rev=75976&view=rev Log: [FASTFAT] Revert r75975 because of failures in the advpack files winetest. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue Sep 26 13:49:09 2017 @@ -577,7 +577,7 @@ else { PVFATFCB TargetFcb; - LONG idx; + LONG idx, FileNameLen; vfatAddToStat(DeviceExt, Fat.CreateHits, 1); @@ -615,6 +615,15 @@ if (idx > 0 || PathNameU.Buffer[0] == L'\\') { + /* We don't want to include / in the name */ + FileNameLen = PathNameU.Length - ((idx + 1) * sizeof(WCHAR)); + + /* Update FO just to keep file name */ + /* Skip first slash */ + ++idx; + FileObject->FileName.Length = FileNameLen; + RtlMoveMemory(&PathNameU.Buffer[0], &PathNameU.Buffer[idx], FileObject->FileName.Length); +#if 0 /* Terminate the string at the last backslash */ PathNameU.Buffer[idx + 1] = UNICODE_NULL; PathNameU.Length = (idx + 1) * sizeof(WCHAR); @@ -623,6 +632,7 @@ /* Update the file object as well */ FileObject->FileName.Length = PathNameU.Length; FileObject->FileName.MaximumLength = PathNameU.MaximumLength; +#endif } else {

6 years, 11 months

[ekohl] 75975: [FASTFAT] Terminate the path name at the last slash when a file is opened using the IO_OPEN_TARGET_DIRECTORY option. This fixes some IoCreateFile kernel mode tests.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 12:36:17 2017 New Revision: 75975 URL: http://svn.reactos.org/svn/reactos?rev=75975&view=rev Log: [FASTFAT] Terminate the path name at the last slash when a file is opened using the IO_OPEN_TARGET_DIRECTORY option. This fixes some IoCreateFile kernel mode tests. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue Sep 26 12:36:17 2017 @@ -577,7 +577,7 @@ else { PVFATFCB TargetFcb; - LONG idx, FileNameLen; + LONG idx; vfatAddToStat(DeviceExt, Fat.CreateHits, 1); @@ -586,8 +586,8 @@ { vfatGrabFCB(DeviceExt, ParentFcb); } + Status = vfatGetFCBForFile(DeviceExt, &ParentFcb, &TargetFcb, &PathNameU); - if (NT_SUCCESS(Status)) { vfatReleaseFCB(DeviceExt, TargetFcb); @@ -615,14 +615,14 @@ if (idx > 0 || PathNameU.Buffer[0] == L'\\') { - /* We don't want to include / in the name */ - FileNameLen = PathNameU.Length - ((idx + 1) * sizeof(WCHAR)); - - /* Update FO just to keep file name */ - /* Skip first slash */ - ++idx; - FileObject->FileName.Length = FileNameLen; - RtlMoveMemory(&PathNameU.Buffer[0], &PathNameU.Buffer[idx], FileObject->FileName.Length); + /* Terminate the string at the last backslash */ + PathNameU.Buffer[idx + 1] = UNICODE_NULL; + PathNameU.Length = (idx + 1) * sizeof(WCHAR); + PathNameU.MaximumLength = PathNameU.Length + sizeof(WCHAR); + + /* Update the file object as well */ + FileObject->FileName.Length = PathNameU.Length; + FileObject->FileName.MaximumLength = PathNameU.MaximumLength; } else {

6 years, 11 months

[ekohl] 75974: [NETAPI32] Implement NetLogonSetServiceBits().

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 09:18:20 2017 New Revision: 75974 URL: http://svn.reactos.org/svn/reactos?rev=75974&view=rev Log: [NETAPI32] Implement NetLogonSetServiceBits(). Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/netlogon.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Tue Sep 26 09:18:20 2017 @@ -174,7 +174,7 @@ @ stdcall NetLocalGroupSetInfo(wstr wstr long ptr ptr) @ stdcall NetLocalGroupSetMembers(wstr wstr long ptr long) @ stub NetLogonGetTimeServiceParentDomain -@ stub NetLogonSetServiceBits +@ stdcall NetLogonSetServiceBits(wstr long long) @ stdcall NetMessageBufferSend(wstr wstr wstr ptr long) @ stdcall NetMessageNameAdd(wstr wstr) @ stdcall NetMessageNameDel(wstr wstr) Modified: trunk/reactos/dll/win32/netapi32/netlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netlogo… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] Tue Sep 26 09:18:20 2017 @@ -19,8 +19,10 @@ /* FUNCTIONS *****************************************************************/ -handle_t __RPC_USER -LOGONSRV_HANDLE_bind(LOGONSRV_HANDLE pszSystemName) +handle_t +__RPC_USER +LOGONSRV_HANDLE_bind( + LOGONSRV_HANDLE pszSystemName) { handle_t hBinding = NULL; LPWSTR pszStringBinding; @@ -58,9 +60,11 @@ } -void __RPC_USER -LOGONSRV_HANDLE_unbind(LOGONSRV_HANDLE pszSystemName, - handle_t hBinding) +void +__RPC_USER +LOGONSRV_HANDLE_unbind( + LOGONSRV_HANDLE pszSystemName, + handle_t hBinding) { RPC_STATUS status; @@ -73,6 +77,8 @@ } } + +/* PUBLIC FUNCTIONS **********************************************************/ DWORD WINAPI @@ -645,4 +651,32 @@ return NERR_DCNotFound; } + +NTSTATUS +WINAPI +NetLogonSetServiceBits( + _In_ LPWSTR ServerName, + _In_ DWORD ServiceBitsOfInterest, + _In_ DWORD ServiceBits) +{ + NTSTATUS Status; + + TRACE("NetLogonSetServiceBits(%s 0x%lx 0x%lx)\n", + debugstr_w(ServerName), ServiceBitsOfInterest, ServiceBits); + + RpcTryExcept + { + Status = NetrLogonSetServiceBits(ServerName, + ServiceBitsOfInterest, + ServiceBits); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = RpcExceptionCode(); + } + RpcEndExcept; + + return Status; +} + /* EOF */

6 years, 11 months

[gadamopoulos] 75973: [WINLOGON][WIN32K][WINSRV] -Silence a lot of debug prints in the shutdown sequence. Add some debug prints in case of error. Also print the name of the processes that get termi...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Sep 26 09:11:51 2017 New Revision: 75973 URL: http://svn.reactos.org/svn/reactos?rev=75973&view=rev Log: [WINLOGON][WIN32K][WINSRV] -Silence a lot of debug prints in the shutdown sequence. Add some debug prints in case of error. Also print the name of the processes that get terminated. Keep the debug prints that show the parameters that are passed to SrvExitWindowsEx and WM_LOGONNOTIFY. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/shutdown.c trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv.cmake trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -558,7 +558,7 @@ uFlags = EWX_CALLER_WINLOGON | (LSData->Flags & 0x0F); - ERR("In LogoffShutdownThread with uFlags == 0x%x; exit_in_progress == %s\n", + TRACE("In LogoffShutdownThread with uFlags == 0x%x; exit_in_progress == %s\n", uFlags, ExitReactOSInProgress ? "true" : "false"); ExitReactOSInProgress = TRUE; @@ -585,7 +585,7 @@ DWORD ret = 1; PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; - ERR("In KillComProcesses\n"); + TRACE("In KillComProcesses\n"); if (LSData->Session->UserToken != NULL && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) @@ -1446,7 +1446,7 @@ } } - ERR("In LN_LOGOFF, exit_in_progress == %s\n", + TRACE("In LN_LOGOFF, exit_in_progress == %s\n", ExitReactOSInProgress ? "true" : "false"); /* Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -722,7 +722,7 @@ { ULONG CapturedFlags = 0; - ERR("Shutdown initiated\n"); + TRACE("Shutdown initiated\n"); if (ThreadInformationLength != sizeof(ULONG)) { @@ -764,7 +764,7 @@ { NTSTATUS ShutdownStatus; - ERR("Shutdown ended\n"); + TRACE("Shutdown ended\n"); if (ThreadInformationLength != sizeof(ShutdownStatus)) { Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -186,7 +186,7 @@ // if (hwndSAS && ( (Flags & EWX_SHUTDOWN) || RtlEqualLuid(CallerLuid, &SystemLuid)) ) if (hwndSAS) { - ERR("\tSending %s message to Winlogon\n", Notif == LN_LOGOFF ? "LN_LOGOFF" : "LN_LOGOFF_CANCELED"); + TRACE("\tSending %s message to Winlogon\n", Notif == LN_LOGOFF ? "LN_LOGOFF" : "LN_LOGOFF_CANCELED"); UserPostMessage(hwndSAS, WM_LOGONNOTIFY, Notif, (LPARAM)Param); return TRUE; } @@ -214,13 +214,13 @@ PPROCESSINFO ppi; - ERR("UserInitiateShutdown\n"); + TRACE("UserInitiateShutdown\n"); /* Get the caller's LUID */ Status = GetProcessLuid(Thread, &CallerLuid); if (!NT_SUCCESS(Status)) { - ERR("GetProcessLuid failed\n"); + ERR("UserInitiateShutdown: GetProcessLuid failed\n"); return Status; } @@ -239,7 +239,10 @@ /* Retrieve the Win32 process info */ ppi = PsGetProcessWin32Process(PsGetThreadProcess(Thread)); if (ppi == NULL) + { + ERR("UserInitiateShutdown: Failed to get win32 thread!\n"); return STATUS_INVALID_HANDLE; + } /* If the caller is not Winlogon, do some security checks */ if (PsGetThreadProcessId(Thread) != gpidLogon) @@ -254,11 +257,17 @@ /* Check whether the current process is attached to a window station */ if (ppi->prpwinsta == NULL) + { + ERR("UserInitiateShutdown: Process is not attached to a desktop\n"); return STATUS_INVALID_HANDLE; + } /* Check whether the window station of the current process can send exit requests */ if (!RtlAreAllAccessesGranted(ppi->amwinsta, WINSTA_EXITWINDOWS)) + { + ERR("UserInitiateShutdown: Caller doesn't have the rights to shutdown\n"); return STATUS_ACCESS_DENIED; + } /* * NOTE: USERSRV automatically adds the shutdown flag when we poweroff or reboot. @@ -269,7 +278,10 @@ { /* ... check whether it has shutdown privilege */ if (!HasPrivilege(&ShutdownPrivilege)) + { + ERR("UserInitiateShutdown: Caller doesn't have the rights to shutdown\n"); return STATUS_PRIVILEGE_NOT_HELD; + } } else { @@ -278,7 +290,10 @@ * window station is a non-IO one, fail the call. */ if (ppi->prpwinsta->Flags & WSS_NOIO) + { + ERR("UserInitiateShutdown: Caller doesn't have the rights to logoff\n"); return STATUS_INVALID_DEVICE_REQUEST; + } } } @@ -286,13 +301,13 @@ if (PsGetThreadProcessId(Thread) != gpidLogon) { // FIXME: HACK!! Do more checks!! - ERR("UserInitiateShutdown -- Notify Winlogon for shutdown\n"); + TRACE("UserInitiateShutdown: Notify Winlogon for shutdown\n"); NotifyLogon(hwndSAS, &CallerLuid, Flags, STATUS_SUCCESS); return STATUS_PENDING; } // If we reach this point, that means it's Winlogon that triggered the shutdown. - ERR("UserInitiateShutdown -- Winlogon is doing a shutdown\n"); + TRACE("UserInitiateShutdown: Winlogon is doing a shutdown\n"); /* * Update and save the shutdown flags globally for renotifying @@ -315,13 +330,13 @@ ULONG Flags; LUID CallerLuid; - ERR("UserEndShutdown\n"); + TRACE("UserEndShutdown called\n"); /* * FIXME: Some cleanup should be done when shutdown succeeds, * and some reset should be done when shutdown is cancelled. */ - STUB; + //STUB; Status = GetProcessLuid(Thread, &CallerLuid); if (!NT_SUCCESS(Status)) @@ -345,7 +360,7 @@ // FIXME: Should we reset gdwShutdownFlags to 0 ?? } - ERR("UserEndShutdown -- Notify Winlogon for end of shutdown\n"); + TRACE("UserEndShutdown: Notify Winlogon for end of shutdown\n"); NotifyLogon(hwndSAS, &CallerLuid, Flags, ShutdownStatus); /* Always return success */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -24,12 +24,12 @@ { PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - UNIMPLEMENTED; + //FIXME: UNIMPLEMENTED! if ( ProcessData->ConsoleHandle != NULL || ProcessData->HandleTable != NULL ) { - DPRINT1("ConsoleClientShutdown(0x%p, 0x%x, %s) - Console process [0x%x, 0x%x]\n", + DPRINT("ConsoleClientShutdown(0x%p, 0x%x, %s) - Console process [0x%x, 0x%x]\n", CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); @@ -39,7 +39,7 @@ } else { - DPRINT1("ConsoleClientShutdown(0x%p, 0x%x, %s) - Non-console process [0x%x, 0x%x]\n", + DPRINT("ConsoleClientShutdown(0x%p, 0x%x, %s) - Non-console process [0x%x, 0x%x]\n", CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); Modified: trunk/reactos/win32ss/user/winsrv/usersrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv.cmake [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -13,5 +13,5 @@ add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) -list(APPEND USERSRV_IMPORT_LIBS basesrv) +list(APPEND USERSRV_IMPORT_LIBS basesrv psapi) set_module_type(usersrv module UNICODE) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Tue Sep 26 09:11:51 2017 @@ -11,6 +11,7 @@ #include "usersrv.h" #include <commctrl.h> +#include <psapi.h> #include "resource.h" @@ -222,7 +223,7 @@ /* If the shutdown is aborted, just notify the process, there is no need to wait */ if ((Context->wParam & (MCS_QUERYENDSESSION | MCS_ENDSESSION)) == 0) { - MY_DPRINT("Called WM_CLIENTSHUTDOWN with wParam == 0 ...\n"); + DPRINT("Called WM_CLIENTSHUTDOWN with wParam == 0 ...\n"); SendNotifyMessageW(Context->Wnd, WM_CLIENTSHUTDOWN, Context->wParam, Context->lParam); return QUERY_RESULT_CONTINUE; @@ -255,12 +256,12 @@ Ret = QUERY_RESULT_CONTINUE; } - MY_DPRINT("SendClientShutdown -- Return == %s\n", + DPRINT("SendClientShutdown -- Return == %s\n", Ret == QUERY_RESULT_CONTINUE ? "Continue" : "Abort"); return Ret; } - MY_DPRINT("SendClientShutdown -- Error == %s\n", + DPRINT1("SendClientShutdown -- Error == %s\n", GetLastError() == 0 ? "Timeout" : "error"); return (GetLastError() == 0 ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR); @@ -374,7 +375,7 @@ NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; } - MY_DPRINT("NotifyContext->QueryResult == %d\n", NotifyContext->QueryResult); + DPRINT("NotifyContext->QueryResult == %d\n", NotifyContext->QueryResult); return (NotifyContext->QueryResult == QUERY_RESULT_CONTINUE); } @@ -672,7 +673,7 @@ goto Quit; } - DPRINT1("Caller LUID is: %lx.%lx\n", CallerLuid.HighPart, CallerLuid.LowPart); + DPRINT("Caller LUID is: %lx.%lx\n", CallerLuid.HighPart, CallerLuid.LowPart); /* Shutdown loop */ while (TRUE) @@ -681,23 +682,23 @@ Status = NtUserSetInformationThread(CsrThread->ThreadHandle, UserThreadInitiateShutdown, &Flags, sizeof(Flags)); - DPRINT1("Win32k says: %lx\n", Status); + DPRINT("Win32k says: %lx\n", Status); switch (Status) { /* We cannot wait here, the caller should start a new thread */ case STATUS_CANT_WAIT: - DPRINT1("STATUS_CANT_WAIT\n"); + DPRINT1("NtUserSetInformationThread returned STATUS_CANT_WAIT\n"); goto Quit; /* Shutdown is in progress */ case STATUS_PENDING: - DPRINT1("STATUS_PENDING\n"); + DPRINT1("NtUserSetInformationThread returned STATUS_PENDING\n"); goto Quit; /* Abort */ case STATUS_RETRY: { - DPRINT1("STATUS_RETRY\n"); + DPRINT1("NtUserSetInformationThread returned STATUS_RETRY\n"); UNIMPLEMENTED; continue; } @@ -740,7 +741,7 @@ UserThreadEndShutdown, &Status, sizeof(Status)); - DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); + DPRINT("SrvExitWindowsEx returned 0x%08x\n", Status); Quit: /* We are done */ @@ -755,9 +756,10 @@ IN ULONG Flags, IN BOOLEAN FirstPhase) { - DPRINT1("UserClientShutdown(0x%p, 0x%x, %s) - [0x%x, 0x%x]\n", + DPRINT("UserClientShutdown(0x%p, 0x%x, %s) - [0x%x, 0x%x], ShutdownFlags: %lu\n", CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", - CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); + CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread, + CsrProcess->ShutdownFlags); /* * Check for process validity @@ -767,7 +769,7 @@ if ((Flags & EWX_SHUTDOWN) == EWX_LOGOFF && (CsrProcess->ShutdownFlags & (SHUTDOWN_OTHERCONTEXT | SHUTDOWN_SYSTEMCONTEXT))) { - DPRINT1("Do not kill a system process in a logoff request!\n"); + DPRINT("Do not kill a system process in a logoff request!\n"); return CsrShutdownNonCsrProcess; } @@ -775,32 +777,35 @@ if (CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() || CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId)) { - DPRINT1("Not killing %s; CsrProcess->ShutdownFlags = %lu\n", + DPRINT("Not killing %s; CsrProcess->ShutdownFlags = %lu\n", CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() ? "CSRSS" : "Winlogon", CsrProcess->ShutdownFlags); return CsrShutdownNonCsrProcess; } - if (Flags & EWX_CALLER_SYSTEM) - DPRINT1("Killed by a SYSTEM process -- ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); - else - DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); - - if (CsrProcess->ShutdownFlags & SHUTDOWN_OTHERCONTEXT) - DPRINT1("This process has SHUTDOWN_OTHERCONTEXT\n"); - - if (CsrProcess->ShutdownFlags & SHUTDOWN_SYSTEMCONTEXT) - DPRINT1("This process has SHUTDOWN_SYSTEMCONTEXT\n"); - /* Notify the process for shutdown if needed */ if (!NotifyProcessForShutdown(CsrProcess, &ShutdownSettings, Flags)) { + DPRINT1("Process 0x%x aborted shutdown\n", CsrProcess->ClientId.UniqueProcess); /* Abort shutdown */ return CsrShutdownCancelled; } /* Terminate this process */ +#if DBG + { + WCHAR buffer[MAX_PATH]; + if (!GetProcessImageFileNameW(CsrProcess->ProcessHandle, buffer, MAX_PATH)) + { + DPRINT1("Terminating process %x\n", CsrProcess->ClientId.UniqueProcess); + } + else + { + DPRINT1("Terminating process %x (%S)\n", CsrProcess->ClientId.UniqueProcess, buffer); + } + } +#endif NtTerminateProcess(CsrProcess->ProcessHandle, 0); /* We are done */

6 years, 11 months

[ekohl] 75972: [NETAPI32] Implement NetStatisticsGet() and move NetpNtStatusToApiStatus().

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 09:03:27 2017 New Revision: 75972 URL: http://svn.reactos.org/svn/reactos?rev=75972&view=rev Log: [NETAPI32] Implement NetStatisticsGet() and move NetpNtStatusToApiStatus(). Added: trunk/reactos/dll/win32/netapi32/misc.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Tue Sep 26 09:03:27 2017 @@ -20,6 +20,7 @@ dssetup.c group.c local_group.c + misc.c nbcmdqueue.c nbnamecache.c nbt.c Added: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c (added) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Tue Sep 26 09:03:27 2017 @@ -0,0 +1,115 @@ +/* + * PROJECT: NetAPI DLL + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Miscellaneous functions + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" + +#include <rpc.h> +#include "srvsvc_c.h" +#include "wkssvc_c.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +NET_API_STATUS +WINAPI +NetStatisticsGet( + _In_ LPWSTR server, + _In_ LPWSTR service, + _In_ DWORD level, + _In_ DWORD options, + _Out_ LPBYTE *bufptr) +{ + NET_API_STATUS status = ERROR_NOT_SUPPORTED; + + TRACE("NetStatisticsGet(%s %s %lu %lu %p)\n", + debugstr_w(server), debugstr_w(service), level, options, bufptr); + + *bufptr = NULL; + + if (_wcsicmp(service, L"LanmanWorkstation") == 0) + { + if (level != 0) + return ERROR_INVALID_LEVEL; + + if (options != 0) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrWorkstationStatisticsGet(server, + L"LanmanWorkstation", + level, + options, + (LPSTAT_WORKSTATION_0*)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + } + else if (_wcsicmp(service, L"LanmanServer") == 0) + { + if (level != 0) + return ERROR_INVALID_LEVEL; + + if (options != 0) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrServerStatisticsGet(server, + L"LanmanServer", + level, + options, + (LPSTAT_SERVER_0 *)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + } + + return status; +} + + +NET_API_STATUS +WINAPI +NetpNtStatusToApiStatus( + _In_ NTSTATUS Status) +{ + NET_API_STATUS ApiStatus; + + switch (Status) + { + case STATUS_SUCCESS: + ApiStatus = NERR_Success; + break; + + case STATUS_INVALID_ACCOUNT_NAME: + ApiStatus = NERR_BadUsername; + break; + + case STATUS_PASSWORD_RESTRICTION: + ApiStatus = NERR_PasswordTooShort; + break; + + default: + ApiStatus = RtlNtStatusToDosError(Status); + break; + } + + return ApiStatus; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/misc.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Sep 26 09:03:27 2017 @@ -101,42 +101,3 @@ return ret; } - -/************************************************************ - * NetStatisticsGet (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, - DWORD level, DWORD options, - LPBYTE *bufptr) -{ - TRACE("(%p, %p, %d, %d, %p)\n", server, service, level, options, bufptr); - return NERR_InternalError; -} - -NET_API_STATUS -WINAPI -NetpNtStatusToApiStatus(NTSTATUS Status) -{ - NET_API_STATUS ApiStatus; - - switch (Status) - { - case STATUS_SUCCESS: - ApiStatus = NERR_Success; - break; - - case STATUS_INVALID_ACCOUNT_NAME: - ApiStatus = NERR_BadUsername; - break; - - case STATUS_PASSWORD_RESTRICTION: - ApiStatus = NERR_PasswordTooShort; - break; - - default: - ApiStatus = RtlNtStatusToDosError(Status); - break; - } - - return ApiStatus; -}

6 years, 11 months

[ekohl] 75971: [NETAPI32] Rename misc.c to utils.c because misc.c will be used for something else.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 07:51:56 2017 New Revision: 75971 URL: http://svn.reactos.org/svn/reactos?rev=75971&view=rev Log: [NETAPI32] Rename misc.c to utils.c because misc.c will be used for something else. Added: trunk/reactos/dll/win32/netapi32/utils.c - copied, changed from r75964, trunk/reactos/dll/win32/netapi32/misc.c Removed: trunk/reactos/dll/win32/netapi32/misc.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Tue Sep 26 07:51:56 2017 @@ -20,7 +20,6 @@ dssetup.c group.c local_group.c - misc.c nbcmdqueue.c nbnamecache.c nbt.c @@ -31,6 +30,7 @@ schedule.c srvsvc.c user.c + utils.c wksta.c wksta_new.c netapi32.h Removed: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c (removed) @@ -1,218 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: NetAPI DLL - * FILE: reactos/dll/win32/netapi32/misc.c - * PURPOSE: Helper functions - * - * PROGRAMMERS: Eric Kohl - */ - -/* INCLUDES ******************************************************************/ - -#include "netapi32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - -/* GLOBALS *******************************************************************/ - -static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -GetAccountDomainSid(IN PUNICODE_STRING ServerName, - OUT PSID *AccountDomainSid) -{ - PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle = NULL; - ULONG Length = 0; - NTSTATUS Status; - - memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); - - Status = LsaOpenPolicy(ServerName, - &ObjectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, - &PolicyHandle); - if (!NT_SUCCESS(Status)) - { - ERR("LsaOpenPolicy failed (Status %08lx)\n", Status); - return Status; - } - - Status = LsaQueryInformationPolicy(PolicyHandle, - PolicyAccountDomainInformation, - (PVOID *)&AccountDomainInfo); - if (!NT_SUCCESS(Status)) - { - ERR("LsaQueryInformationPolicy failed (Status %08lx)\n", Status); - goto done; - } - - Length = RtlLengthSid(AccountDomainInfo->DomainSid); - - *AccountDomainSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); - if (*AccountDomainSid == NULL) - { - ERR("Failed to allocate SID\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - memcpy(*AccountDomainSid, AccountDomainInfo->DomainSid, Length); - -done: - if (AccountDomainInfo != NULL) - LsaFreeMemory(AccountDomainInfo); - - LsaClose(PolicyHandle); - - return Status; -} - - -NTSTATUS -GetBuiltinDomainSid(OUT PSID *BuiltinDomainSid) -{ - PSID Sid = NULL; - PULONG Ptr; - NTSTATUS Status = STATUS_SUCCESS; - - *BuiltinDomainSid = NULL; - - Sid = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - RtlLengthRequiredSid(1)); - if (Sid == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Status = RtlInitializeSid(Sid, - &NtAuthority, - 1); - if (!NT_SUCCESS(Status)) - goto done; - - Ptr = RtlSubAuthoritySid(Sid, 0); - *Ptr = SECURITY_BUILTIN_DOMAIN_RID; - - *BuiltinDomainSid = Sid; - -done: - if (!NT_SUCCESS(Status)) - { - if (Sid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); - } - - return Status; -} - - -NTSTATUS -OpenAccountDomain(IN SAM_HANDLE ServerHandle, - IN PUNICODE_STRING ServerName, - IN ULONG DesiredAccess, - OUT PSAM_HANDLE DomainHandle) -{ - PSID DomainSid = NULL; - NTSTATUS Status; - - Status = GetAccountDomainSid(ServerName, - &DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - return Status; - } - - Status = SamOpenDomain(ServerHandle, - DesiredAccess, - DomainSid, - DomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - } - - return Status; -} - - -NTSTATUS -OpenBuiltinDomain(IN SAM_HANDLE ServerHandle, - IN ULONG DesiredAccess, - OUT PSAM_HANDLE DomainHandle) -{ - PSID DomainSid = NULL; - NTSTATUS Status; - - Status = GetBuiltinDomainSid(&DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); - return Status; - } - - Status = SamOpenDomain(ServerHandle, - DesiredAccess, - DomainSid, - DomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - } - - return Status; -} - - -NET_API_STATUS -BuildSidFromSidAndRid(IN PSID SrcSid, - IN ULONG RelativeId, - OUT PSID *DestSid) -{ - UCHAR RidCount; - PSID DstSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - NET_API_STATUS ApiStatus = NERR_Success; - - RidCount = *RtlSubAuthorityCountSid(SrcSid); - if (RidCount >= 8) - return ERROR_INVALID_PARAMETER; - - DstSidSize = RtlLengthRequiredSid(RidCount + 1); - - ApiStatus = NetApiBufferAllocate(DstSidSize, - &DstSid); - if (ApiStatus != NERR_Success) - return ApiStatus; - - RtlInitializeSid(DstSid, - RtlIdentifierAuthoritySid(SrcSid), - RidCount + 1); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(SrcSid, i); - q = RtlSubAuthoritySid(DstSid, i); - *q = *p; - } - - q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); - *q = RelativeId; - - *DestSid = DstSid; - - return NERR_Success; -} - -/* EOF */ Copied: trunk/reactos/dll/win32/netapi32/utils.c (from r75964, trunk/reactos/dll/win32/netapi32/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/utils.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/utils.c [iso-8859-1] Tue Sep 26 07:51:56 2017 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: NetAPI DLL - * FILE: reactos/dll/win32/netapi32/misc.c + * FILE: reactos/dll/win32/netapi32/utils.c * PURPOSE: Helper functions * * PROGRAMMERS: Eric Kohl

6 years, 11 months

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017