Ros-diffs June 2018

ros-diffs@reactos.org

26 participants
174 discussions

05/15: [NTOS:PS] Adjust the PsReferenceEffectiveToken() prototype in the header; add a comment about the fact that the ImpersonationLevel parameter can be left untouched on purpose in one special case.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=813879f02f55bed94a9a4… commit 813879f02f55bed94a9a4e0fef6c6c2a4f324aa0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 25 15:21:33 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:40:13 2018 +0200 [NTOS:PS] Adjust the PsReferenceEffectiveToken() prototype in the header; add a comment about the fact that the ImpersonationLevel parameter can be left untouched on purpose in one special case. --- ntoskrnl/include/internal/ps.h | 6 +++--- ntoskrnl/ps/security.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/ps.h b/ntoskrnl/include/internal/ps.h index f39239ffd7..b6eb06d250 100644 --- a/ntoskrnl/include/internal/ps.h +++ b/ntoskrnl/include/internal/ps.h @@ -170,9 +170,9 @@ PACCESS_TOKEN NTAPI PsReferenceEffectiveToken( IN PETHREAD Thread, - OUT PTOKEN_TYPE TokenType, - OUT PUCHAR b, - OUT PSECURITY_IMPERSONATION_LEVEL Level + OUT IN PTOKEN_TYPE TokenType, + OUT PBOOLEAN EffectiveOnly, + OUT PSECURITY_IMPERSONATION_LEVEL ImpersonationLevel ); NTSTATUS diff --git a/ntoskrnl/ps/security.c b/ntoskrnl/ps/security.c index e49e23be08..f696d0f3e5 100644 --- a/ntoskrnl/ps/security.c +++ b/ntoskrnl/ps/security.c @@ -691,11 +691,13 @@ NTAPI PsReferenceEffectiveToken(IN PETHREAD Thread, OUT IN PTOKEN_TYPE TokenType, OUT PBOOLEAN EffectiveOnly, - OUT PSECURITY_IMPERSONATION_LEVEL Level) + OUT PSECURITY_IMPERSONATION_LEVEL ImpersonationLevel) { PEPROCESS Process; PACCESS_TOKEN Token = NULL; + PAGED_CODE(); + PSTRACE(PS_SECURITY_DEBUG, "Thread: %p, TokenType: %p\n", Thread, TokenType); @@ -716,7 +718,7 @@ PsReferenceEffectiveToken(IN PETHREAD Thread, /* Return data to caller */ *TokenType = TokenImpersonation; *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; - *Level = Thread->ImpersonationInfo->ImpersonationLevel; + *ImpersonationLevel = Thread->ImpersonationInfo->ImpersonationLevel; /* Unlock the Process */ PspUnlockProcessSecurityShared(Process); @@ -746,6 +748,7 @@ PsReferenceEffectiveToken(IN PETHREAD Thread, /* Return the token */ *TokenType = TokenPrimary; *EffectiveOnly = FALSE; + // NOTE: ImpersonationLevel is left untouched on purpose! return Token; }

6 years, 5 months

04/15: [PSDK] ntsecpkg.h: fix minor typos (make some structure names MS-PSDK-compatible), and add LSA_TOKEN_INFORMATION_V2.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cdb717a7b81c466b9735… commit 3cdb717a7b81c466b9735a8229581e0c237bd1e4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 25 14:55:46 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:40:13 2018 +0200 [PSDK] ntsecpkg.h: fix minor typos (make some structure names MS-PSDK-compatible), and add LSA_TOKEN_INFORMATION_V2. --- sdk/include/psdk/ntsecpkg.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdk/include/psdk/ntsecpkg.h b/sdk/include/psdk/ntsecpkg.h index c7d837e1ad..c10f26b7e3 100644 --- a/sdk/include/psdk/ntsecpkg.h +++ b/sdk/include/psdk/ntsecpkg.h @@ -42,7 +42,8 @@ extern "C" { /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { LsaTokenInformationNull, - LsaTokenInformationV1 + LsaTokenInformationV1, + LsaTokenInformationV2 } LSA_TOKEN_INFORMATION_TYPE, *PLSA_TOKEN_INFORMATION_TYPE; typedef enum _SECPKG_EXTENDED_INFORMATION_CLASS @@ -78,6 +79,8 @@ typedef struct _LSA_TOKEN_INFORMATION_V1 TOKEN_DEFAULT_DACL DefaultDacl; } LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1; +typedef LSA_TOKEN_INFORMATION_V1 LSA_TOKEN_INFORMATION_V2, *PLSA_TOKEN_INFORMATION_V2; + typedef struct _SECPKG_PRIMARY_CRED { LUID LogonId; UNICODE_STRING DownlevelName; @@ -255,14 +258,14 @@ typedef NTSTATUS (NTAPI *PLSA_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, PVOID, PVOID, ULONG, PVOID*, PULONG, PNTSTATUS); /* Dispatch tables of functions used by SSP/AP */ -typedef struct SECPKG_DLL_FUNCTIONS { +typedef struct _SECPKG_DLL_FUNCTIONS { PLSA_ALLOCATE_LSA_HEAP AllocateHeap; PLSA_FREE_LSA_HEAP FreeHeap; PLSA_REGISTER_CALLBACK RegisterCallback; } SECPKG_DLL_FUNCTIONS, *PSECPKG_DLL_FUNCTIONS; -typedef struct LSA_DISPATCH_TABLE { +typedef struct _LSA_DISPATCH_TABLE { PLSA_CREATE_LOGON_SESSION CreateLogonSession; PLSA_DELETE_LOGON_SESSION DeleteLogonSession; PLSA_ADD_CREDENTIAL AddCredential; @@ -418,7 +421,7 @@ typedef NTSTATUS (NTAPI SpImportSecurityContextFn)(PSecBuffer, HANDLE, #endif /* dispatch tables of LSA-mode functions implemented by SSP/AP */ -typedef struct SECPKG_FUNCTION_TABLE { +typedef struct _SECPKG_FUNCTION_TABLE { PLSA_AP_INITIALIZE_PACKAGE InitializePackage; PLSA_AP_LOGON_USER LsaLogonUser; PLSA_AP_CALL_PACKAGE CallPackage; @@ -466,7 +469,7 @@ typedef struct SECPKG_FUNCTION_TABLE { *PSECPKG_FUNCTION_TABLE; /* dispatch tables of user-mode functions implemented by SSP/AP */ -typedef struct SECPKG_USER_FUNCTION_TABLE { +typedef struct _SECPKG_USER_FUNCTION_TABLE { SpInstanceInitFn *InstanceInit; SpInitUserModeContextFn *InitUserModeContext; SpMakeSignatureFn *MakeSignature;

6 years, 5 months

03/15: [SAMSRV] In SamrGetAliasMembership(), perform STATUS_OBJECT_NAME_NOT_FOUND status fixup in the assignment loop as done in the allocation loop.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf56db2eb3ebaa570a7a4… commit cf56db2eb3ebaa570a7a44d956f7673a2462c7c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 24 03:30:10 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:40:13 2018 +0200 [SAMSRV] In SamrGetAliasMembership(), perform STATUS_OBJECT_NAME_NOT_FOUND status fixup in the assignment loop as done in the allocation loop. This avoids this function returning failure while everything actually succeeded. --- dll/win32/samsrv/samrpc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index c48f7fa2ba..d5651b2236 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -3538,6 +3538,9 @@ TRACE("Open %S\n", MemberSidString); SampRegCloseKey(&MemberKeyHandle); } + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + LocalFree(MemberSidString); }

6 years, 5 months

02/15: [LSASRV] If TokenInfo1->Privileges is NULL, which can be expected, pass a valid pointer to a valid but empty privilege structure to NtCreateToken(), as it always want a non-NULL pointer.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62384951c8367e2511d94… commit 62384951c8367e2511d94e16571d7999f225cb40 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 24 03:25:21 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:40:12 2018 +0200 [LSASRV] If TokenInfo1->Privileges is NULL, which can be expected, pass a valid pointer to a valid but empty privilege structure to NtCreateToken(), as it always want a non-NULL pointer. --- dll/win32/lsasrv/authpackage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 3cc43f7487..0e9ab0b701 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -1550,6 +1550,7 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, if (TokenInformationType == LsaTokenInformationV1) { + TOKEN_PRIVILEGES NoPrivilege = {0}; TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); @@ -1573,7 +1574,8 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, &TokenInfo1->ExpirationTime, &TokenInfo1->User, TokenInfo1->Groups, - TokenInfo1->Privileges, + TokenInfo1->Privileges ? TokenInfo1->Privileges + : &NoPrivilege, &TokenInfo1->Owner, &TokenInfo1->PrimaryGroup, &TokenInfo1->DefaultDacl,

6 years, 5 months

01/15: [ADVAPI32] Additions for CreateProcessAsUserA/W().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4b4da5385b76a7c1c7a1… commit d4b4da5385b76a7c1c7a1b0e2d52e6cf4a448c11 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 23 00:17:05 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:40:07 2018 +0200 [ADVAPI32] Additions for CreateProcessAsUserA/W(). - Use a common helper function used by both the ANSI and UNICODE functions so that the large code block that deals with setting the new process token becomes automatically common to both these functions, while the ANSI vs. UNICODE conversions are handled directly via the CreateProcessA/W() calls. - Duplicate the token and acquire the process primary token assignment privilege before calling NtSetInformationProcess(). --- dll/win32/advapi32/advapi32.h | 2 + dll/win32/advapi32/misc/logon.c | 272 ++++++++++++++++++++++++++-------------- 2 files changed, 180 insertions(+), 94 deletions(-) diff --git a/dll/win32/advapi32/advapi32.h b/dll/win32/advapi32/advapi32.h index 5869e35d43..77312e7654 100644 --- a/dll/win32/advapi32/advapi32.h +++ b/dll/win32/advapi32/advapi32.h @@ -23,12 +23,14 @@ #define _WMI_SOURCE_ #include <aclapi.h> #include <winsafer.h> + #define NTOS_MODE_USER #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/sefuncs.h> +#include <ndk/setypes.h> /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> diff --git a/dll/win32/advapi32/misc/logon.c b/dll/win32/advapi32/misc/logon.c index 8b3b6b4a2c..88be6e5f39 100644 --- a/dll/win32/advapi32/misc/logon.c +++ b/dll/win32/advapi32/misc/logon.c @@ -86,58 +86,132 @@ CloseLogonLsaHandle(VOID) } -/* - * @implemented - */ -BOOL WINAPI DECLSPEC_HOTPATCH -CreateProcessAsUserA(HANDLE hToken, - LPCSTR lpApplicationName, - LPSTR lpCommandLine, - LPSECURITY_ATTRIBUTES lpProcessAttributes, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - BOOL bInheritHandles, - DWORD dwCreationFlags, - LPVOID lpEnvironment, - LPCSTR lpCurrentDirectory, - LPSTARTUPINFOA lpStartupInfo, - LPPROCESS_INFORMATION lpProcessInformation) +static +BOOL +CreateProcessAsUserCommon( + _In_ BOOL bUnicode, + _In_opt_ HANDLE hToken, + _In_opt_ LPCVOID lpApplicationName, + _Inout_opt_ LPVOID lpCommandLine, + _In_opt_ LPSECURITY_ATTRIBUTES lpProcessAttributes, + _In_opt_ LPSECURITY_ATTRIBUTES lpThreadAttributes, + _In_ BOOL bInheritHandles, + _In_ DWORD dwCreationFlags, + _In_opt_ LPVOID lpEnvironment, + _In_opt_ LPCVOID lpCurrentDirectory, + _In_ LPVOID lpStartupInfo, + _Out_ LPPROCESS_INFORMATION lpProcessInformation) { - PROCESS_ACCESS_TOKEN AccessToken; NTSTATUS Status; - - TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_a(lpApplicationName), - debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, - dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + PROCESS_ACCESS_TOKEN AccessToken; /* Create the process with a suspended main thread */ - if (!CreateProcessA(lpApplicationName, - lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, - dwCreationFlags | CREATE_SUSPENDED, - lpEnvironment, - lpCurrentDirectory, - lpStartupInfo, - lpProcessInformation)) + if (bUnicode) { - ERR("CreateProcessA failed! GLE: %d\n", GetLastError()); - return FALSE; + /* Call the UNICODE version */ + if (!CreateProcessW((LPCWSTR)lpApplicationName, + (LPWSTR)lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags | CREATE_SUSPENDED, + lpEnvironment, + (LPCWSTR)lpCurrentDirectory, + (LPSTARTUPINFOW)lpStartupInfo, + lpProcessInformation)) + { + ERR("CreateProcessW failed, last error: %d\n", GetLastError()); + return FALSE; + } + } + else + { + /* Call the ANSI version */ + if (!CreateProcessA((LPCSTR)lpApplicationName, + (LPSTR)lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags | CREATE_SUSPENDED, + lpEnvironment, + (LPCSTR)lpCurrentDirectory, + (LPSTARTUPINFOA)lpStartupInfo, + lpProcessInformation)) + { + ERR("CreateProcessA failed, last error: %d\n", GetLastError()); + return FALSE; + } } if (hToken != NULL) { - AccessToken.Token = hToken; - AccessToken.Thread = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hTokenDup; + BOOLEAN PrivilegeSet = FALSE; + + /* Duplicate the token for this new process */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); // FIXME: Use a valid SecurityDescriptor! + Status = NtDuplicateToken(hToken, + 0, + &ObjectAttributes, + FALSE, + TokenPrimary, + &hTokenDup); + if (!NT_SUCCESS(Status)) + { + ERR("NtDuplicateToken failed, Status 0x%08x\n", Status); + TerminateProcess(lpProcessInformation->hProcess, Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + // FIXME: Do we always need SecurityImpersonation? + if (!ImpersonateSelf(SecurityImpersonation)) + { + ERR("ImpersonateSelf(SecurityImpersonation) failed, last error: %d\n", GetLastError()); + NtClose(hTokenDup); + TerminateProcess(lpProcessInformation->hProcess, RtlGetLastNtStatus()); + // SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Acquire the process primary token assignment privilege */ + Status = RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, TRUE, &PrivilegeSet); + if (!NT_SUCCESS(Status)) + { + ERR("RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE) failed, Status 0x%08lx\n", Status); + RevertToSelf(); + NtClose(hTokenDup); + TerminateProcess(lpProcessInformation->hProcess, Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + AccessToken.Token = hTokenDup; + AccessToken.Thread = lpProcessInformation->hThread; /* Set the new process token */ Status = NtSetInformationProcess(lpProcessInformation->hProcess, ProcessAccessToken, (PVOID)&AccessToken, sizeof(AccessToken)); - if (!NT_SUCCESS (Status)) + + /* Restore the privileges */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, PrivilegeSet, TRUE, &PrivilegeSet); + + RevertToSelf(); + + /* Close the duplicated token */ + NtClose(hTokenDup); + + /* Check whether NtSetInformationProcess() failed */ + if (!NT_SUCCESS(Status)) { - ERR("NtSetInformationProcess failed: 0x%08x\n", Status); + ERR("NtSetInformationProcess failed, Status 0x%08x\n", Status); TerminateProcess(lpProcessInformation->hProcess, Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -157,68 +231,78 @@ CreateProcessAsUserA(HANDLE hToken, /* * @implemented */ -BOOL WINAPI DECLSPEC_HOTPATCH -CreateProcessAsUserW(HANDLE hToken, - LPCWSTR lpApplicationName, - LPWSTR lpCommandLine, - LPSECURITY_ATTRIBUTES lpProcessAttributes, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - BOOL bInheritHandles, - DWORD dwCreationFlags, - LPVOID lpEnvironment, - LPCWSTR lpCurrentDirectory, - LPSTARTUPINFOW lpStartupInfo, - LPPROCESS_INFORMATION lpProcessInformation) +BOOL +WINAPI +DECLSPEC_HOTPATCH +CreateProcessAsUserA( + _In_opt_ HANDLE hToken, + _In_opt_ LPCSTR lpApplicationName, + _Inout_opt_ LPSTR lpCommandLine, + _In_opt_ LPSECURITY_ATTRIBUTES lpProcessAttributes, + _In_opt_ LPSECURITY_ATTRIBUTES lpThreadAttributes, + _In_ BOOL bInheritHandles, + _In_ DWORD dwCreationFlags, + _In_opt_ LPVOID lpEnvironment, + _In_opt_ LPCSTR lpCurrentDirectory, + _In_ LPSTARTUPINFOA lpStartupInfo, + _Out_ LPPROCESS_INFORMATION lpProcessInformation) { - PROCESS_ACCESS_TOKEN AccessToken; - NTSTATUS Status; + TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_a(lpApplicationName), + debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, + dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + + /* Call the helper function */ + return CreateProcessAsUserCommon(FALSE, + hToken, + lpApplicationName, + lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags, + lpEnvironment, + lpCurrentDirectory, + lpStartupInfo, + lpProcessInformation); +} + +/* + * @implemented + */ +BOOL +WINAPI +DECLSPEC_HOTPATCH +CreateProcessAsUserW( + _In_opt_ HANDLE hToken, + _In_opt_ LPCWSTR lpApplicationName, + _Inout_opt_ LPWSTR lpCommandLine, + _In_opt_ LPSECURITY_ATTRIBUTES lpProcessAttributes, + _In_opt_ LPSECURITY_ATTRIBUTES lpThreadAttributes, + _In_ BOOL bInheritHandles, + _In_ DWORD dwCreationFlags, + _In_opt_ LPVOID lpEnvironment, + _In_opt_ LPCWSTR lpCurrentDirectory, + _In_ LPSTARTUPINFOW lpStartupInfo, + _Out_ LPPROCESS_INFORMATION lpProcessInformation) +{ TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); - /* Create the process with a suspended main thread */ - if (!CreateProcessW(lpApplicationName, - lpCommandLine, - lpProcessAttributes, - lpThreadAttributes, - bInheritHandles, - dwCreationFlags | CREATE_SUSPENDED, - lpEnvironment, - lpCurrentDirectory, - lpStartupInfo, - lpProcessInformation)) - { - ERR("CreateProcessW failed! GLE: %d\n", GetLastError()); - return FALSE; - } - - if (hToken != NULL) - { - AccessToken.Token = hToken; - AccessToken.Thread = NULL; - - /* Set the new process token */ - Status = NtSetInformationProcess(lpProcessInformation->hProcess, - ProcessAccessToken, - (PVOID)&AccessToken, - sizeof(AccessToken)); - if (!NT_SUCCESS (Status)) - { - ERR("NtSetInformationProcess failed: 0x%08x\n", Status); - TerminateProcess(lpProcessInformation->hProcess, Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - /* Resume the main thread */ - if (!(dwCreationFlags & CREATE_SUSPENDED)) - { - ResumeThread(lpProcessInformation->hThread); - } - - return TRUE; + /* Call the helper function */ + return CreateProcessAsUserCommon(TRUE, + hToken, + lpApplicationName, + lpCommandLine, + lpProcessAttributes, + lpThreadAttributes, + bInheritHandles, + dwCreationFlags, + lpEnvironment, + lpCurrentDirectory, + lpStartupInfo, + lpProcessInformation); } @@ -478,7 +562,7 @@ LogonUserExW( Password.Buffer, Password.MaximumLength); - /* Create the Logon SID*/ + /* Create the Logon SID */ AllocateLocallyUniqueId(&LogonId); Status = RtlAllocateAndInitializeSid(&SystemAuthority, SECURITY_LOGON_IDS_RID_COUNT, @@ -494,7 +578,7 @@ LogonUserExW( if (!NT_SUCCESS(Status)) goto done; - /* Create the Local SID*/ + /* Create the Local SID */ Status = RtlAllocateAndInitializeSid(&LocalAuthority, 1, SECURITY_LOCAL_RID,

6 years, 5 months

01/01: [SHELL32] Add missing desktop.ini files (#640)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3189ec94289eb85fce3d1… commit 3189ec94289eb85fce3d1411a60eec37485d837b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 28 06:11:31 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:11:31 2018 +0200 [SHELL32] Add missing desktop.ini files (#640) Add the "desktop.ini" files to the special folders to realize their custom icons. CORE-10045 --- dll/win32/shell32/wine/shellpath.c | 132 ++++++++++++++++++++++++++++--------- 1 file changed, 100 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index df6d98b2f2..a6f5d63741 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -3,6 +3,7 @@ * * Copyright 1998, 1999, 2000 Juergen Schmied * Copyright 2004 Juan Lang + * Copyright 2018 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,6 +37,7 @@ #include <undocshell.h> #include <shlwapi.h> #include <sddl.h> +#include <strsafe.h> #include <wine/debug.h> #include <wine/unicode.h> @@ -661,6 +663,7 @@ typedef struct CSIDL_Type type; LPCWSTR szValueName; LPCWSTR szDefaultPath; /* fallback string or resource ID */ + INT nShell32IconIndex; } CSIDL_DATA; static const CSIDL_DATA CSIDL_Data[] = @@ -669,7 +672,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Desktop, CSIDL_Type_User, DesktopW, - MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY) + MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), + -IDI_SHELL_DESKTOP }, { /* 0x01 - CSIDL_INTERNET */ &FOLDERID_InternetFolder, @@ -681,31 +685,36 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Programs, CSIDL_Type_User, ProgramsW, - MAKEINTRESOURCEW(IDS_PROGRAMS) + MAKEINTRESOURCEW(IDS_PROGRAMS), + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x03 - CSIDL_CONTROLS (.CPL files) */ &FOLDERID_ControlPanelFolder, CSIDL_Type_SystemPath, NULL, - NULL + NULL, + -IDI_SHELL_CONTROL_PANEL }, { /* 0x04 - CSIDL_PRINTERS */ &FOLDERID_PrintersFolder, CSIDL_Type_SystemPath, NULL, - NULL + NULL, + -IDI_SHELL_PRINTERS_FOLDER }, { /* 0x05 - CSIDL_PERSONAL */ &FOLDERID_Documents, CSIDL_Type_User, PersonalW, - MAKEINTRESOURCEW(IDS_PERSONAL) + MAKEINTRESOURCEW(IDS_PERSONAL), + -IDI_SHELL_MY_DOCUMENTS }, { /* 0x06 - CSIDL_FAVORITES */ &FOLDERID_Favorites, CSIDL_Type_User, FavoritesW, - MAKEINTRESOURCEW(IDS_FAVORITES) + MAKEINTRESOURCEW(IDS_FAVORITES), + -IDI_SHELL_FAVORITES }, { /* 0x07 - CSIDL_STARTUP */ &FOLDERID_Startup, @@ -717,7 +726,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Recent, CSIDL_Type_User, RecentW, - MAKEINTRESOURCEW(IDS_RECENT) + MAKEINTRESOURCEW(IDS_RECENT), + -IDI_SHELL_RECENT_DOCUMENTS }, { /* 0x09 - CSIDL_SENDTO */ &FOLDERID_SendTo, @@ -729,31 +739,35 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_RecycleBinFolder, CSIDL_Type_Disallowed, NULL, - NULL, + NULL }, { /* 0x0b - CSIDL_STARTMENU */ &FOLDERID_StartMenu, CSIDL_Type_User, Start_MenuW, - MAKEINTRESOURCEW(IDS_STARTMENU) + MAKEINTRESOURCEW(IDS_STARTMENU), + -IDI_SHELL_TSKBAR_STARTMENU }, { /* 0x0c - CSIDL_MYDOCUMENTS */ &GUID_NULL, CSIDL_Type_Disallowed, /* matches WinXP--can't get its path */ NULL, - NULL + NULL, + -IDI_SHELL_MY_DOCUMENTS }, { /* 0x0d - CSIDL_MYMUSIC */ &FOLDERID_Music, CSIDL_Type_User, My_MusicW, - MAKEINTRESOURCEW(IDS_MYMUSIC) + MAKEINTRESOURCEW(IDS_MYMUSIC), + -IDI_SHELL_MY_MUSIC }, { /* 0x0e - CSIDL_MYVIDEO */ &FOLDERID_Videos, CSIDL_Type_User, My_VideoW, - MAKEINTRESOURCEW(IDS_MYVIDEO) + MAKEINTRESOURCEW(IDS_MYVIDEO), + -IDI_SHELL_MY_MOVIES }, { /* 0x0f - unassigned */ &GUID_NULL, @@ -765,31 +779,36 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Desktop, CSIDL_Type_User, DesktopW, - MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY) + MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), + -IDI_SHELL_DESKTOP }, { /* 0x11 - CSIDL_DRIVES */ &FOLDERID_ComputerFolder, CSIDL_Type_Disallowed, NULL, NULL, + -IDI_SHELL_COMPUTER_FOLDER }, { /* 0x12 - CSIDL_NETWORK */ &FOLDERID_NetworkFolder, CSIDL_Type_Disallowed, NULL, NULL, + -IDI_SHELL_NETWORK_FOLDER }, { /* 0x13 - CSIDL_NETHOOD */ &FOLDERID_NetHood, CSIDL_Type_User, NetHoodW, - MAKEINTRESOURCEW(IDS_NETHOOD) + MAKEINTRESOURCEW(IDS_NETHOOD), + -IDI_SHELL_NETWORK }, { /* 0x14 - CSIDL_FONTS */ &FOLDERID_Fonts, CSIDL_Type_WindowsPath, FontsW, - FontsW + FontsW, + -IDI_SHELL_FONTS_FOLDER }, { /* 0x15 - CSIDL_TEMPLATES */ &FOLDERID_Templates, @@ -801,13 +820,15 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_CommonStartMenu, CSIDL_Type_AllUsers, Common_Start_MenuW, - MAKEINTRESOURCEW(IDS_STARTMENU) + MAKEINTRESOURCEW(IDS_STARTMENU), + -IDI_SHELL_TSKBAR_STARTMENU }, { /* 0x17 - CSIDL_COMMON_PROGRAMS */ &FOLDERID_CommonPrograms, CSIDL_Type_AllUsers, Common_ProgramsW, - MAKEINTRESOURCEW(IDS_PROGRAMS) + MAKEINTRESOURCEW(IDS_PROGRAMS), + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x18 - CSIDL_COMMON_STARTUP */ &FOLDERID_CommonStartup, @@ -819,7 +840,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PublicDesktop, CSIDL_Type_AllUsers, Common_DesktopW, - MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY) + MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), + -IDI_SHELL_DESKTOP }, { /* 0x1a - CSIDL_APPDATA */ &FOLDERID_RoamingAppData, @@ -831,7 +853,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PrintHood, CSIDL_Type_User, PrintHoodW, - MAKEINTRESOURCEW(IDS_PRINTHOOD) + MAKEINTRESOURCEW(IDS_PRINTHOOD), + -IDI_SHELL_PRINTERS_FOLDER }, { /* 0x1c - CSIDL_LOCAL_APPDATA */ &FOLDERID_LocalAppData, @@ -855,7 +878,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Favorites, CSIDL_Type_AllUsers, Common_FavoritesW, - MAKEINTRESOURCEW(IDS_FAVORITES) + MAKEINTRESOURCEW(IDS_FAVORITES), + -IDI_SHELL_FAVORITES }, { /* 0x20 - CSIDL_INTERNET_CACHE */ &FOLDERID_InternetCache, @@ -885,25 +909,29 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Windows, CSIDL_Type_WindowsPath, NULL, - NULL + NULL, + -IDI_SHELL_SYSTEM_GEAR }, { /* 0x25 - CSIDL_SYSTEM */ &FOLDERID_System, CSIDL_Type_SystemPath, NULL, - NULL + NULL, + -IDI_SHELL_SYSTEM_GEAR }, { /* 0x26 - CSIDL_PROGRAM_FILES */ &FOLDERID_ProgramFiles, CSIDL_Type_CurrVer, ProgramFilesDirW, - MAKEINTRESOURCEW(IDS_PROGRAM_FILES) + MAKEINTRESOURCEW(IDS_PROGRAM_FILES), + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x27 - CSIDL_MYPICTURES */ &FOLDERID_Pictures, CSIDL_Type_User, My_PicturesW, - MAKEINTRESOURCEW(IDS_MYPICTURES) + MAKEINTRESOURCEW(IDS_MYPICTURES), + -IDI_SHELL_MY_PICTURES }, { /* 0x28 - CSIDL_PROFILE */ &FOLDERID_Profile, @@ -915,19 +943,22 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_SystemX86, CSIDL_Type_SystemX86Path, NULL, - NULL + NULL, + -IDI_SHELL_SYSTEM_GEAR }, { /* 0x2a - CSIDL_PROGRAM_FILESX86 */ &FOLDERID_ProgramFilesX86, CSIDL_Type_CurrVer, ProgramFilesDirX86W, - Program_Files_x86W + Program_Files_x86W, + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */ &FOLDERID_ProgramFilesCommon, CSIDL_Type_CurrVer, CommonFilesDirW, - MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON) + MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON), + -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */ &FOLDERID_ProgramFilesCommonX86, @@ -945,7 +976,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PublicDocuments, CSIDL_Type_AllUsers, Common_DocumentsW, - MAKEINTRESOURCEW(IDS_PERSONAL) + MAKEINTRESOURCEW(IDS_PERSONAL), + -IDI_SHELL_MY_DOCUMENTS }, { /* 0x2f - CSIDL_COMMON_ADMINTOOLS */ &FOLDERID_CommonAdminTools, @@ -963,7 +995,8 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_ConnectionsFolder, CSIDL_Type_Disallowed, NULL, - NULL + NULL, + -IDI_SHELL_NETWORK_CONNECTIONS }, { /* 0x32 - unassigned */ &GUID_NULL, @@ -987,19 +1020,22 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PublicMusic, CSIDL_Type_AllUsers, CommonMusicW, - MAKEINTRESOURCEW(IDS_COMMON_MUSIC) + MAKEINTRESOURCEW(IDS_COMMON_MUSIC), + -IDI_SHELL_MY_MUSIC }, { /* 0x36 - CSIDL_COMMON_PICTURES */ &FOLDERID_PublicPictures, CSIDL_Type_AllUsers, CommonPicturesW, - MAKEINTRESOURCEW(IDS_COMMON_PICTURES) + MAKEINTRESOURCEW(IDS_COMMON_PICTURES), + -IDI_SHELL_MY_PICTURES }, { /* 0x37 - CSIDL_COMMON_VIDEO */ &FOLDERID_PublicVideos, CSIDL_Type_AllUsers, CommonVideoW, - MAKEINTRESOURCEW(IDS_COMMON_VIDEO) + MAKEINTRESOURCEW(IDS_COMMON_VIDEO), + -IDI_SHELL_MY_MOVIES }, { /* 0x38 - CSIDL_RESOURCES */ &FOLDERID_ResourceDir, @@ -2130,6 +2166,38 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( } TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath)); + + /* create desktop.ini for custom icon */ + if (CSIDL_Data[folder].nShell32IconIndex) + { + static const WCHAR s_szFormat[] = L"%%SystemRoot%%\\system32\\shell32.dll,%d"; + WCHAR szIconLocation[MAX_PATH]; + DWORD dwAttributes; + + /* make the directory a system folder */ + dwAttributes = GetFileAttributesW(szBuildPath); + dwAttributes |= FILE_ATTRIBUTE_SYSTEM; + SetFileAttributesW(szBuildPath, dwAttributes); + + /* build the desktop.ini file path */ + PathAppendW(szBuildPath, L"desktop.ini"); + + /* build the icon location */ + StringCchPrintfW(szIconLocation, _countof(szIconLocation), s_szFormat, + CSIDL_Data[folder].nShell32IconIndex); + + /* write desktop.ini */ + WritePrivateProfileStringW(L".ShellClassInfo", L"IconResource", szIconLocation, szBuildPath); + + /* flush! */ + WritePrivateProfileStringW(NULL, NULL, NULL, szBuildPath); + + /* make the desktop.ini a system and hidden file */ + dwAttributes = GetFileAttributesW(szBuildPath); + dwAttributes |= FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + SetFileAttributesW(szBuildPath, dwAttributes); + } + end: TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr;

6 years, 5 months

01/01: [TRANSLATION][AT] Implement the Italian resource file (#641)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=089ff1511d7af4259459a… commit 089ff1511d7af4259459a912abda087cd711797f Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jun 27 23:09:56 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:09:56 2018 +0200 [TRANSLATION][AT] Implement the Italian resource file (#641) --- base/applications/cmdutils/at/at.rc | 3 ++ base/applications/cmdutils/at/lang/it-IT.rc | 62 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/base/applications/cmdutils/at/at.rc b/base/applications/cmdutils/at/at.rc index f36c371944..ea43c3d765 100644 --- a/base/applications/cmdutils/at/at.rc +++ b/base/applications/cmdutils/at/at.rc @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/cmdutils/at/lang/it-IT.rc b/base/applications/cmdutils/at/lang/it-IT.rc new file mode 100644 index 0000000000..23cc30d205 --- /dev/null +++ b/base/applications/cmdutils/at/lang/it-IT.rc @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS AT Utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Il comando AT permette di stabilire altri comandi e programmi di eseguire\n\ +in un computer in un certo tempo. Lo servizio ""Schedule"" deve essere in esecuzione per\n\ +poter usare il comando AT.\n\n\ +AT [\\\\nomecomputer] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\nomecomputer] tempo [/INTERACTIVE]\n\ + [ /EVERY:data[,...] | /NEXT:data[,...]] ""comando""\n\n\ +\\\\nomecomputer Specifica un computer remoto. I comandi saranno programmati \n\ + sul computer locale se questo parametro è omesso.\n\ +id È un numero d'identificazione assegnato al comando programmato.\n\ +/DELETE Cancella un comando programmato. Se l'id viene omesso, tutti\n\ + i comandi programmati nel computer saranno cancellati.\n\ +/YES Usato con l'opzione ""DELETE"", annullerà tutti i compiti programmati\n\ + nel computer senza ulteriore conferma.\n\ +tempo Specifica il tempo per l'esecuzione del comando.\n\ +/INTERACTIVE Permette ai comandi di interagire con il desktop dell'utente\n\ + che è autenticato al momento della loro esecuzione.\n\ +/EVERY:data[,...] Esegue il comando nel giorno o nei giorni specificati d'ogni\n\ + settimana o mese. Se la data è omessa, verrà considerata il\n\ + giorno attuale del mese.\n\ +/NEXT:data[,...] Esegue il comando specificato nel prossimo giorno (per\n\ + esempio prossimo Martedì). Se la data è omessa, verrà\n\ + considerata il giorno attuale del mese.\n\ +""comando"" Il nome del comando o programma da eseguire.\n" + + IDS_DELETE_ALL "Questa operazione cancellerà tutte le operazioni programmate.\n" + IDS_NEW_JOB "È stata pianificata una nuova attività con l'ID = %lu\n" + IDS_JOBS_LIST "Stato ID Giorno Tempo Riga di comando\n" + IDS_NO_ENTRIES "Non ci sono comandi programmati nella lista.\n" + + IDS_CONFIRM_QUESTION "Sei sicuro di voler continuare questa operazione? (S/N) [N]: " + IDS_CONFIRM_INVALID "\nQuesta risposta non è valida.\n" + IDS_CONFIRM_YES "S" + IDS_CONFIRM_NO "N" + + IDS_TODAY "Oggi" + IDS_TOMORROW "Domani" + IDS_EVERY "Ogni" + IDS_NEXT "Seguente" + + IDS_YES "Sì" + IDS_NO "No" + IDS_ERROR "ERRORE" + IDS_OK "OK" + + IDS_TASKID "ID Operazione: %lu\n" + IDS_STATUS "Stato: %s\n" + IDS_SCHEDULE "Orario: %s\n" + IDS_TIME "Tempo del giorno: %s\n" + IDS_INTERACTIVE "Interattivo: %s\n" + IDS_COMMAND "Comando: %s\n" +END

6 years, 5 months

01/01: [SHELL32] Enable custom CD/DVD icons (#639)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c74bd5d662d88c3d9e797… commit c74bd5d662d88c3d9e797ff933c5a0c4f80eb01b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 28 06:06:54 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 27 23:06:54 2018 +0200 [SHELL32] Enable custom CD/DVD icons (#639) Properly show the custom icon specified in "autorun.inf" file in CDs/DVDs. CORE-14766 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 53 ++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index a4c09b1f9e..77f6420196 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -4,7 +4,7 @@ * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied * Copyright 2009 Andrew Hill - * Copyright 2017 Katayama Hirofumi MZ + * Copyright 2017-2018 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -297,6 +297,51 @@ HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, DrivesContextMenuCallback, cKeys, hKeys, ppcm); } +static HRESULT +getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags, + LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +{ + WCHAR wszPath[MAX_PATH]; + WCHAR wszAutoRunInfPath[MAX_PATH]; + WCHAR wszValue[MAX_PATH], wszTemp[MAX_PATH]; + static const WCHAR wszAutoRunInf[] = { 'a','u','t','o','r','u','n','.','i','n','f',0 }; + static const WCHAR wszAutoRun[] = { 'a','u','t','o','r','u','n',0 }; + + // get path + if (!ILGetDisplayNameExW(psf, pidl, wszPath, 0)) + return E_FAIL; + if (!PathIsDirectoryW(wszPath)) + return E_FAIL; + + // build the full path of autorun.inf + StringCchCopyW(wszAutoRunInfPath, _countof(wszAutoRunInfPath), wszPath); + PathAppendW(wszAutoRunInfPath, wszAutoRunInf); + + // autorun.inf --> wszValue + if (GetPrivateProfileStringW(wszAutoRun, L"icon", NULL, wszValue, _countof(wszValue), + wszAutoRunInfPath) && wszValue[0] != 0) + { + // wszValue --> wszTemp + ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp)); + + // parse the icon location + *piIndex = PathParseIconLocationW(wszTemp); + + // wszPath + wszTemp --> wszPath + if (PathIsRelativeW(wszTemp)) + PathAppendW(wszPath, wszTemp); + else + StringCchCopyW(wszPath, _countof(wszPath), wszTemp); + + // wszPath --> szIconFile + GetFullPathNameW(wszPath, cchMax, szIconFile, NULL); + + return S_OK; + } + + return E_FAIL; +} + HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -311,11 +356,17 @@ HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl WCHAR wTemp[MAX_PATH]; int icon_idx; + UINT flags = 0; if ((DriveType == DRIVE_FIXED || DriveType == DRIVE_UNKNOWN) && (HCR_GetIconW(L"Drive", wTemp, NULL, MAX_PATH, &icon_idx))) { initIcon->SetNormalIcon(wTemp, icon_idx); } + else if (SUCCEEDED(getIconLocationForDrive(psf, pidl, 0, wTemp, _countof(wTemp), + &icon_idx, &flags))) + { + initIcon->SetNormalIcon(wTemp, icon_idx); + } else { icon_idx = iDriveIconIds[DriveType];

6 years, 5 months

01/01: [AUTOCHK] Improve autochk messages

by David Knapp

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=893a3c9d030fd8b078cbd… commit 893a3c9d030fd8b078cbd747eeefd3f6ce57e560 Author: David Knapp <mazecraze96(a)gmail.com> AuthorDate: Tue Jun 26 09:13:49 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jun 26 09:16:34 2018 +0200 [AUTOCHK] Improve autochk messages --- base/system/autochk/autochk.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 5a71ae7d36..1940c651ec 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -5,7 +5,7 @@ * PURPOSE: Filesystem checker * PROGRAMMERS: Aleksey Bragin * Eric Kohl - * Herv� Poussineau + * Hervé Poussineau * Pierre Schweitzer */ @@ -329,7 +329,7 @@ ChkdskCallback( Status = (PBOOLEAN)Argument; if (*Status != FALSE) { - PrintString("Autochk was unable to complete successfully.\r\n\r\n"); + PrintString("The file system check was unable to complete successfully.\r\n\r\n"); // Error = TRUE; } break; @@ -348,7 +348,7 @@ CheckVolume( NTSTATUS Status; DWORD Count; - PrintString(" Verifying volume %S\r\n", DrivePath); + PrintString(" Checking file system on %S\r\n", DrivePath); /* Get the file system */ Status = GetFileSystem(DrivePath, @@ -357,11 +357,11 @@ CheckVolume( if (!NT_SUCCESS(Status)) { DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status); - PrintString(" Unable to get file system of %S\r\n", DrivePath); + PrintString(" Unable to detect file system of %S\r\n", DrivePath); return Status; } - PrintString(" Its filesystem type is %S\r\n", FileSystem); + PrintString(" The file system type is %S.\r\n", FileSystem); /* Call provider */ for (Count = 0; Count < sizeof(FileSystems) / sizeof(FileSystems[0]); ++Count) @@ -390,9 +390,9 @@ CheckVolume( NTSTATUS WaitStatus; /* Let the user decide whether to repair */ - PrintString(" %S needs to be checked\r\n", DrivePath); - PrintString(" You can skip it, but be advised it is not recommanded\r\n"); - PrintString(" To skip disk checking press any key in %d second(s)\r\n", TimeOut); + PrintString(" The file system on this volume needs to be checked for problems.\r\n"); + PrintString(" You may cancel this check, but it's recommended that you continue.\r\n"); + PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n", TimeOut); /* Timeout == fix it! */ WaitStatus = WaitForKeyboard(TimeOut); @@ -404,10 +404,11 @@ CheckVolume( TRUE, // CheckOnlyIfDirty FALSE,// ScanDrive ChkdskCallback); + PrintString(" The system will now check the file system.\r\n"); } else { - PrintString(" %S checking has been skipped\r\n", DrivePath); + PrintString(" File system check has been skipped.\r\n"); } } break; @@ -416,7 +417,7 @@ CheckVolume( if (Count == sizeof(FileSystems) / sizeof(FileSystems[0])) { DPRINT1("File system not supported\n"); - PrintString(" Unable to verify a %S volume\r\n", FileSystem); + PrintString(" Unable to check the file system. %S is not supported.\r\n", FileSystem); return STATUS_DLL_NOT_FOUND; }

6 years, 6 months

01/01: [NEWDEV] Fix a truncated text

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23881cfcf3e153df69704… commit 23881cfcf3e153df69704c322387a90bea1af40c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Jun 25 10:35:14 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jun 25 13:55:19 2018 +0200 [NEWDEV] Fix a truncated text --- dll/win32/newdev/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/newdev/lang/ru-RU.rc b/dll/win32/newdev/lang/ru-RU.rc index 58c38cc027..8ec2dda482 100644 --- a/dll/win32/newdev/lang/ru-RU.rc +++ b/dll/win32/newdev/lang/ru-RU.rc @@ -19,7 +19,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Мастер нового оборудования" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 26 LTEXT "Оборудование не установлено, поскольку мастер не смог найти нужного программного обеспечения.", IDC_STATIC, 120, 32, 195, 16 LTEXT "Если имеются установочные диски или известно расположение нужного программного обеспечения, нажмите кнопку ""Назад"".", IDC_STATIC, 120, 98, 195, 24 CONTROL "Больше не напоминать об установке этого драйвера.", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 @@ -30,7 +30,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Мастер нового оборудования" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "Это оборудование установить не удалось", IDC_FINISHTITLE, 120, 8, 195, 26 LTEXT "Неизвестная ошибка. Не удалось установить устройство.", IDC_STATIC, 120, 32, 195, 16 LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53, 147, 12 END

6 years, 6 months

← Newer
1
2
3
4
5
6
7
...
18
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 June 2018