Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [SERVICES] Create a new control set on a non-setup boot.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea6dac3438a7ec3b333f4… commit ea6dac3438a7ec3b333f4cb3fb738177e9e62c0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 16:24:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 16:24:07 2018 +0200 [SERVICES] Create a new control set on a non-setup boot. --- base/system/services/controlset.c | 381 ++++++++++++++++++++++++++++++++++++++ base/system/services/services.c | 6 +- base/system/services/services.h | 3 +- 3 files changed, 386 insertions(+), 4 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index 19bbb53877..948f3ddc79 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -25,6 +25,234 @@ static DWORD dwLastKnownGoodControlSet; /* FUNCTIONS *****************************************************************/ +static +DWORD +ScmCopyKey(HKEY hDstKey, + HKEY hSrcKey) +{ +#if (_WIN32_WINNT >= 0x0600) + return RegCopyTreeW(hSrcKey, + NULL, + hDstKey); +#else + FILETIME LastWrite; + DWORD dwSubKeys; + DWORD dwValues; + DWORD dwType; + DWORD dwMaxSubKeyNameLength; + DWORD dwSubKeyNameLength; + DWORD dwMaxValueNameLength; + DWORD dwValueNameLength; + DWORD dwMaxValueLength; + DWORD dwValueLength; + DWORD dwDisposition; + DWORD i; + LPWSTR lpNameBuffer; + LPBYTE lpDataBuffer; + HKEY hDstSubKey; + HKEY hSrcSubKey; + DWORD dwError; + + DPRINT("ScmCopyKey()\n"); + + dwError = RegQueryInfoKey(hSrcKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyNameLength, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", dwError); + return dwError; + } + + dwMaxSubKeyNameLength++; + dwMaxValueNameLength++; + + DPRINT("dwSubKeys %lu\n", dwSubKeys); + DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); + DPRINT("dwValues %lu\n", dwValues); + DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); + DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength); + + /* Copy subkeys */ + if (dwSubKeys != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxSubKeyNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + for (i = 0; i < dwSubKeys; i++) + { + dwSubKeyNameLength = dwMaxSubKeyNameLength; + dwError = RegEnumKeyExW(hSrcKey, + i, + lpNameBuffer, + &dwSubKeyNameLength, + NULL, + NULL, + NULL, + &LastWrite); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Subkey enumeration failed (Error %lu)\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegCreateKeyExW(hDstKey, + lpNameBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDstSubKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Subkey creation failed (Error %lu)\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegOpenKeyExW(hSrcKey, + lpNameBuffer, + 0, + KEY_READ, + &hSrcSubKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + RegCloseKey(hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = ScmCopyKey(hDstSubKey, + hSrcSubKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + RegCloseKey (hSrcSubKey); + RegCloseKey (hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + RegCloseKey(hSrcSubKey); + RegCloseKey(hDstSubKey); + } + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + /* Copy values */ + if (dwValues != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + lpDataBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueLength); + if (lpDataBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return ERROR_NOT_ENOUGH_MEMORY; + } + + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLength; + dwValueLength = dwMaxValueLength; + dwError = RegEnumValueW(hSrcKey, + i, + lpNameBuffer, + &dwValueNameLength, + NULL, + &dwType, + lpDataBuffer, + &dwValueLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegSetValueExW(hDstKey, + lpNameBuffer, + 0, + dwType, + lpDataBuffer, + dwValueLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + } + + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + DPRINT("ScmCopyKey() done \n"); + + return ERROR_SUCCESS; +#endif +} + + +static BOOL ScmGetControlSetValues(VOID) { @@ -102,4 +330,157 @@ ScmGetControlSetValues(VOID) return TRUE; } + +static +DWORD +ScmSetLastKnownGoodControlSet( + DWORD dwControlSet) +{ + HKEY hSelectKey; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\Select", + 0, + KEY_WRITE, + &hSelectKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegSetValueExW(hSelectKey, + L"LastKnownGood", + 0, + REG_DWORD, + (LPBYTE)&dwControlSet, + sizeof(dwControlSet)); + + RegCloseKey(hSelectKey); + + return dwError; +} + + +static +DWORD +ScmGetSetupInProgress(VOID) +{ + DWORD dwError; + HKEY hKey; + DWORD dwType; + DWORD dwSize; + DWORD dwSetupInProgress = (DWORD)-1; + + DPRINT("ScmGetSetupInProgress()\n"); + + /* Open key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError == ERROR_SUCCESS) + { + /* Read key */ + dwSize = sizeof(DWORD); + RegQueryValueExW(hKey, + L"SystemSetupInProgress", + NULL, + &dwType, + (LPBYTE)&dwSetupInProgress, + &dwSize); + RegCloseKey(hKey); + } + + DPRINT("SetupInProgress: %lu\n", dwSetupInProgress); + return dwSetupInProgress; +} + + +BOOL +ScmUpdateControlSets(VOID) +{ + WCHAR szCurrentControlSetName[32]; + WCHAR szNewControlSetName[32]; + HKEY hCurrentControlSetKey = NULL; + HKEY hNewControlSetKey = NULL; + DWORD dwNewControlSet, dwDisposition; + DWORD dwError; + + /* Do not create a new control set when the system setup is running */ + if (ScmGetSetupInProgress() != 0) + { + DPRINT1("No new control set because we are in setup mode!\n"); + return TRUE; + } + + /* Get the control set values */ + if (!ScmGetControlSetValues()) + return FALSE; + + /* Search for a new control set number */ + for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) + { + if ((dwNewControlSet != dwCurrentControlSet) && + (dwNewControlSet != dwDefaultControlSet) && + (dwNewControlSet != dwFailedControlSet) && + (dwNewControlSet != dwLastKnownGoodControlSet)) + break; + } + + /* Fail if we did not find an unused control set!*/ + if (dwNewControlSet >= 1000) + { + DPRINT1("Too many control sets!\n"); + return FALSE; + } + + /* Create the current control set name */ + swprintf(szCurrentControlSetName, L"SYSTEM\\ControlSet%03lu", dwCurrentControlSet); + DPRINT("Current control set: %S\n", szCurrentControlSetName); + + /* Create the new control set name */ + swprintf(szNewControlSetName, L"SYSTEM\\ControlSet%03lu", dwNewControlSet); + DPRINT("New control set: %S\n", szNewControlSetName); + + /* Open the current control set key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szCurrentControlSetName, + 0, + KEY_READ, + &hCurrentControlSetKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Create the new control set key */ + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szNewControlSetName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hNewControlSetKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Copy the current control set to the new control set */ + dwError = ScmCopyKey(hNewControlSetKey, + hCurrentControlSetKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Set the new 'LastKnownGood' control set */ + dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + +done: + if (hNewControlSetKey != NULL) + RegCloseKey(hNewControlSetKey); + + if (hCurrentControlSetKey != NULL) + RegCloseKey(hCurrentControlSetKey); + + return (dwError == ERROR_SUCCESS); +} + /* EOF */ diff --git a/base/system/services/services.c b/base/system/services/services.c index bd7f24ccc0..591c5a7062 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -178,10 +178,10 @@ wWinMain(HINSTANCE hInstance, /* FIXME: more initialization */ - /* Read the control set values */ - if (!ScmGetControlSetValues()) + /* Update the control sets */ + if (!ScmUpdateControlSets()) { - DPRINT1("SERVICES: Failed to read the control set values\n"); + DPRINT1("SERVICES: Failed to update the control sets\n"); goto done; } diff --git a/base/system/services/services.h b/base/system/services/services.h index ce1b46eafa..cbbf6eb008 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -159,7 +159,8 @@ ScmDecryptPassword( /* controlset.c */ -BOOL ScmGetControlSetValues(VOID); +BOOL +ScmUpdateControlSets(VOID) /* database.c */

1 0

03/03: [ADVAPI32] Improve a bit CreateProcessAsUser().
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c446ce0d625b8c86e204b… commit c446ce0d625b8c86e204b86e8e66503f10c8c580 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 28 00:36:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:04 2018 +0200 [ADVAPI32] Improve a bit CreateProcessAsUser(). - Check whether the user-provided token is a primary token. - Do not fail when the RtlAdjustPrivilege() call fails (see the code comment for an explanation). TL;DR is: that call may indeed fail but the privilege may also not be necessary because the user-provided token is a restricted version of the caller's primary token. And this is situation is perfectly fine. This fixes Java 7 installation, CORE-14874. --- dll/win32/advapi32/misc/logon.c | 86 ++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/dll/win32/advapi32/misc/logon.c b/dll/win32/advapi32/misc/logon.c index f4e3f851df..0b9d60320f 100644 --- a/dll/win32/advapi32/misc/logon.c +++ b/dll/win32/advapi32/misc/logon.c @@ -145,9 +145,30 @@ CreateProcessAsUserCommon( if (hToken != NULL) { + TOKEN_TYPE Type; + ULONG ReturnLength; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hTokenDup; - BOOLEAN PrivilegeSet = FALSE; + BOOLEAN PrivilegeSet = FALSE, HavePrivilege; + + /* Check whether the user-provided token is a primary token */ + // GetTokenInformation(); + Status = NtQueryInformationToken(hToken, + TokenType, + &Type, + sizeof(Type), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryInformationToken() failed, Status 0x%08x\n", Status); + goto Quit; + } + if (Type != TokenPrimary) + { + ERR("Wrong token type for token 0x%p, expected TokenPrimary, got %ld\n", hToken, Type); + Status = STATUS_BAD_TOKEN_TYPE; + goto Quit; + } /* Duplicate the token for this new process */ InitializeObjectAttributes(&ObjectAttributes, @@ -163,32 +184,43 @@ CreateProcessAsUserCommon( &hTokenDup); if (!NT_SUCCESS(Status)) { - ERR("NtDuplicateToken failed, Status 0x%08x\n", Status); - TerminateProcess(lpProcessInformation->hProcess, Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + ERR("NtDuplicateToken() failed, Status 0x%08x\n", Status); + goto Quit; } // FIXME: Do we always need SecurityImpersonation? - if (!ImpersonateSelf(SecurityImpersonation)) + Status = RtlImpersonateSelf(SecurityImpersonation); + if (!NT_SUCCESS(Status)) { - ERR("ImpersonateSelf(SecurityImpersonation) failed, last error: %d\n", GetLastError()); + ERR("RtlImpersonateSelf(SecurityImpersonation) failed, Status 0x%08x\n", Status); NtClose(hTokenDup); - TerminateProcess(lpProcessInformation->hProcess, RtlGetLastNtStatus()); - // SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + goto Quit; } - /* Acquire the process primary token assignment privilege */ - Status = RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, TRUE, &PrivilegeSet); - if (!NT_SUCCESS(Status)) + /* + * Attempt to acquire the process primary token assignment privilege + * in case we actually need it. + * The call will either succeed or fail when the caller has (or has not) + * enough rights. + * The last situation may not be dramatic for us. Indeed it may happen + * that the user-provided token is a restricted version of the caller's + * primary token (aka. a "child" token), or both tokens inherit (i.e. are + * children, and are together "siblings") from a common parent token. + * In this case the NT kernel allows us to assign the token to the child + * process without the need for the assignment privilege, which is fine. + * On the contrary, if the user-provided token is completely arbitrary, + * then the NT kernel will enforce the presence of the assignment privilege: + * because we failed (by assumption) to assign the privilege, the process + * token assignment will fail as required. It is then the job of the + * caller to manually acquire the necessary privileges. + */ + Status = RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, + TRUE, TRUE, &PrivilegeSet); + HavePrivilege = NT_SUCCESS(Status); + if (!HavePrivilege) { - ERR("RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE) failed, Status 0x%08lx\n", Status); - RevertToSelf(); - NtClose(hTokenDup); - TerminateProcess(lpProcessInformation->hProcess, Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + ERR("RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE) failed, Status 0x%08lx, " + "attempting to continue without it...\n", Status); } AccessToken.Token = hTokenDup; @@ -200,8 +232,12 @@ CreateProcessAsUserCommon( (PVOID)&AccessToken, sizeof(AccessToken)); - /* Restore the privileges */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, PrivilegeSet, TRUE, &PrivilegeSet); + /* Restore the privilege */ + if (HavePrivilege) + { + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, + PrivilegeSet, TRUE, &PrivilegeSet); + } RevertToSelf(); @@ -211,7 +247,13 @@ CreateProcessAsUserCommon( /* Check whether NtSetInformationProcess() failed */ if (!NT_SUCCESS(Status)) { - ERR("NtSetInformationProcess failed, Status 0x%08x\n", Status); + ERR("NtSetInformationProcess() failed, Status 0x%08x\n", Status); + goto Quit; + } + + if (!NT_SUCCESS(Status)) + { +Quit: TerminateProcess(lpProcessInformation->hProcess, Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE;

1 0

02/03: [NTOS:PS] In PspSetPrimaryToken(), check also for sibling token to determine whether it is required to have the SeAssignPrimaryTokenPrivilege.
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89c5191d3f1f74f42b31d… commit 89c5191d3f1f74f42b31d833226dfbd09585ea88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 26 01:33:02 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:03 2018 +0200 [NTOS:PS] In PspSetPrimaryToken(), check also for sibling token to determine whether it is required to have the SeAssignPrimaryTokenPrivilege. In addition, it is the presence or absence of the 'Token' pointer that indicates whether or not we should use instead the provided token handle. --- ntoskrnl/ps/security.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/ps/security.c b/ntoskrnl/ps/security.c index f696d0f3e5..e245dde563 100644 --- a/ntoskrnl/ps/security.c +++ b/ntoskrnl/ps/security.c @@ -217,18 +217,18 @@ PspSetPrimaryToken(IN PEPROCESS Process, IN PACCESS_TOKEN Token OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - BOOLEAN IsChild; + BOOLEAN IsChildOrSibling; PACCESS_TOKEN NewToken = Token; NTSTATUS Status, AccessStatus; BOOLEAN Result, SdAllocated; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; SECURITY_SUBJECT_CONTEXT SubjectContext; + PSTRACE(PS_SECURITY_DEBUG, "Process: %p Token: %p\n", Process, Token); - /* Make sure we got a handle */ - if (TokenHandle) + /* Reference the token by handle if we don't already have a token object */ + if (!Token) { - /* Reference it */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ASSIGN_PRIMARY, SeTokenObjectType, @@ -238,24 +238,38 @@ PspSetPrimaryToken(IN PEPROCESS Process, if (!NT_SUCCESS(Status)) return Status; } - /* Check if this is a child */ - Status = SeIsTokenChild(NewToken, &IsChild); + /* + * Check whether this token is a child or sibling of the current process token. + * NOTE: On Windows Vista+ both of these checks (together with extra steps) + * are now performed by a new SeIsTokenAssignableToProcess() helper. + */ + Status = SeIsTokenChild(NewToken, &IsChildOrSibling); if (!NT_SUCCESS(Status)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return Status; } + if (!IsChildOrSibling) + { + Status = SeIsTokenSibling(NewToken, &IsChildOrSibling); + if (!NT_SUCCESS(Status)) + { + /* Failed, dereference */ + if (!Token) ObDereferenceObject(NewToken); + return Status; + } + } /* Check if this was an independent token */ - if (!IsChild) + if (!IsChildOrSibling) { /* Make sure we have the privilege to assign a new one */ if (!SeSinglePrivilegeCheck(SeAssignPrimaryTokenPrivilege, PreviousMode)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return STATUS_PRIVILEGE_NOT_HELD; } } @@ -314,7 +328,7 @@ PspSetPrimaryToken(IN PEPROCESS Process, } /* Dereference the token */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return Status; }

1 0

01/03: [NTOS:SE] Fixes for NT tokens.
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f9282927b8cbb5f6633d… commit 7f9282927b8cbb5f6633d24c69f9f1d3c7dcb42d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 26 00:51:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:01 2018 +0200 [NTOS:SE] Fixes for NT tokens. - SeIsTokenChild(): Correctly check whether a caller-provided token is a child from the current process' primary token by looking at its ParentTokenId member. - Add a SeIsTokenSibling() helper to determine whether a caller-provided token and the current process' primary token are siblings, by comparing their ParentTokenId's and AuthenticationId's. NOTE: Children tokens are created through CreateRestrictedToken(); sibling tokens are created through DuplicateToken() (amongst others). See slide 49 of https://www.slideshare.net/Shakacon/social-engineering-the-windows-kernel-b… or https://googleprojectzero.blogspot.com/2016/01/raising-dead.html for some details. --- ntoskrnl/include/internal/se.h | 7 ++++++ ntoskrnl/se/token.c | 56 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 993c6ceb11..6095bd9e01 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -314,6 +314,13 @@ SeIsTokenChild( OUT PBOOLEAN IsChild ); +NTSTATUS +NTAPI +SeIsTokenSibling( + IN PTOKEN Token, + OUT PBOOLEAN IsSibling +); + NTSTATUS NTAPI SepCreateImpersonationTokenDacl( diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 0b20030b8d..f41ef93f52 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -717,25 +717,67 @@ SeIsTokenChild(IN PTOKEN Token, OUT PBOOLEAN IsChild) { PTOKEN ProcessToken; - LUID ProcessLuid, CallerLuid; + LUID ProcessTokenId, CallerParentId; /* Assume failure */ *IsChild = FALSE; /* Reference the process token */ ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + if (!ProcessToken) + return STATUS_UNSUCCESSFUL; - /* Get the ID */ - ProcessLuid = ProcessToken->AuthenticationId; + /* Get its token ID */ + ProcessTokenId = ProcessToken->TokenId; /* Dereference the token */ ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); - /* Get our LUID */ - CallerLuid = Token->AuthenticationId; + /* Get our parent token ID */ + CallerParentId = Token->ParentTokenId; - /* Compare the LUIDs */ - if (RtlEqualLuid(&CallerLuid, &ProcessLuid)) *IsChild = TRUE; + /* Compare the token IDs */ + if (RtlEqualLuid(&CallerParentId, &ProcessTokenId)) + *IsChild = TRUE; + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SeIsTokenSibling(IN PTOKEN Token, + OUT PBOOLEAN IsSibling) +{ + PTOKEN ProcessToken; + LUID ProcessParentId, ProcessAuthId; + LUID CallerParentId, CallerAuthId; + + /* Assume failure */ + *IsSibling = FALSE; + + /* Reference the process token */ + ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + if (!ProcessToken) + return STATUS_UNSUCCESSFUL; + + /* Get its parent and authentication IDs */ + ProcessParentId = ProcessToken->ParentTokenId; + ProcessAuthId = ProcessToken->AuthenticationId; + + /* Dereference the token */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); + + /* Get our parent and authentication IDs */ + CallerParentId = Token->ParentTokenId; + CallerAuthId = Token->AuthenticationId; + + /* Compare the token IDs */ + if (RtlEqualLuid(&CallerParentId, &ProcessParentId) && + RtlEqualLuid(&CallerAuthId, &ProcessAuthId)) + { + *IsSibling = TRUE; + } /* Return success */ return STATUS_SUCCESS;

1 0

01/01: [DWNL] Add translations (for Romanian & Italian)
by Bișoc George 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3caab66e223f59476fac8… commit 3caab66e223f59476fac8d62937dadcaf86ddfd1 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Sep 25 16:50:13 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:23:48 2018 +0200 [DWNL] Add translations (for Romanian & Italian) And include them as well. --- base/applications/network/dwnl/dwnl.rc | 6 ++++++ base/applications/network/dwnl/lang/it-IT.rc | 32 ++++++++++++++++++++++++++++ base/applications/network/dwnl/lang/ro-RO.rc | 32 ++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc index 5077a012ee..5b2aa1351e 100644 --- a/base/applications/network/dwnl/dwnl.rc +++ b/base/applications/network/dwnl/dwnl.rc @@ -20,9 +20,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/base/applications/network/dwnl/lang/it-IT.rc b/base/applications/network/dwnl/lang/it-IT.rc new file mode 100644 index 0000000000..51c952e8ca --- /dev/null +++ b/base/applications/network/dwnl/lang/it-IT.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS File Download 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 "Uso: dwnl URL [DESTINAZIONE]\n" + IDS_RESOLVING "Risolvere %s... " + IDS_DONE "fatto.\n" + IDS_LENGTH_FULL "Lunghezza: %I64u [%s]\n" + IDS_LENGTH "Lunghezza: %I64u\n" + IDS_FILE_SAVED "\nIl file è stato salvato.\n" + IDS_CONNECTING_TO_FULL "Connettersi a %s [%s]... " + IDS_CONNECTING_TO "Connettersi a %s... " + IDS_REDIRECTING_TO "Reindirizzato a %s... " + IDS_SEND_REQUEST "Invio richiesta... " + IDS_BYTES_DOWNLOADED "%I64u byte scaricati" + IDS_BYTES_DOWNLOADED_FULL "%2d%% (%I64u byte scaricati)" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nERRORE: Download fallito.\n" + IDS_ERROR_CODE "\nERRORE: %u\n" + IDS_ERROR_FILENAME "\nERRORE: Impossibile determinare il nome del file, si prega di specificare una destinazione.\n" + IDS_ERROR_PROTOCOL "\nERRORE: Protocollo non supportato.\n" +END diff --git a/base/applications/network/dwnl/lang/ro-RO.rc b/base/applications/network/dwnl/lang/ro-RO.rc new file mode 100644 index 0000000000..fd43ceca87 --- /dev/null +++ b/base/applications/network/dwnl/lang/ro-RO.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS File Download Utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Romanian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Uz: dwnl URL [DESTINAȚIE]\n" + IDS_RESOLVING "Rezolvare %s... " + IDS_DONE "terminat.\n" + IDS_LENGTH_FULL "Lungime: %I64u [%s]\n" + IDS_LENGTH "Lungime: %I64u\n" + IDS_FILE_SAVED "\nFișier descărcat.\n" + IDS_CONNECTING_TO_FULL "Conectare la %s [%s]... " + IDS_CONNECTING_TO "Conectare la %s... " + IDS_REDIRECTING_TO "Redirecționare la %s... " + IDS_SEND_REQUEST "Trimitere cerere... " + IDS_BYTES_DOWNLOADED "%I64u octeți descărcați" + IDS_BYTES_DOWNLOADED_FULL "%2d%% (%I64u octeți descărcați)" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nEROARE: Descărcare eșuată.\n" + IDS_ERROR_CODE "\nEROARE: %u\n" + IDS_ERROR_FILENAME "\nEROARE: Determinarea numelui de fișier este imposibilă, specificați destinația numelui de fișier.\n" + IDS_ERROR_PROTOCOL "\nEROARE: Protocol nerecunoscut.\n" +END

1 0

01/01: [DEVCPUX] Add russian translation
by Stanislav Motylkov 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fa744241fd9600c97095… commit 0fa744241fd9600c970955bb29494fb9f05ee5e2 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Sep 26 16:15:07 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 27 12:10:06 2018 +0200 [DEVCPUX] Add russian translation Also make MHz string translatable. Addendum to 793e2a3. --- dll/shellext/devcpux/lang/en-US.rc | 5 +++++ dll/shellext/devcpux/lang/ru-RU.rc | 21 +++++++++++++++++++++ dll/shellext/devcpux/processor.c | 8 +++++++- dll/shellext/devcpux/processor.rc | 5 ++++- dll/shellext/devcpux/resource.h | 2 ++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dll/shellext/devcpux/lang/en-US.rc b/dll/shellext/devcpux/lang/en-US.rc index 4ea9377e0a..428531e5a8 100644 --- a/dll/shellext/devcpux/lang/en-US.rc +++ b/dll/shellext/devcpux/lang/en-US.rc @@ -15,6 +15,11 @@ BEGIN LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 END +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME diff --git a/dll/shellext/devcpux/lang/ru-RU.rc b/dll/shellext/devcpux/lang/ru-RU.rc new file mode 100644 index 0000000000..6e5217b28f --- /dev/null +++ b/dll/shellext/devcpux/lang/ru-RU.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Процессор" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Возможности:", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "Модель:", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "Степпинг:", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "Частота ядра:", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld МГц" +END diff --git a/dll/shellext/devcpux/processor.c b/dll/shellext/devcpux/processor.c index 8544af1c35..06c2667af2 100644 --- a/dll/shellext/devcpux/processor.c +++ b/dll/shellext/devcpux/processor.c @@ -92,11 +92,17 @@ ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) WCHAR szFeatures[MAX_PATH] = L""; WCHAR szModel[3]; WCHAR szStepping[3]; + WCHAR szMhz[16]; WCHAR szCurrentMhz[10]; BOOL bFirst = TRUE; SYSTEM_INFO SystemInfo; PROCESSOR_POWER_INFORMATION PowerInfo; + if (!LoadStringW(g_hInstance, IDS_MEGAHERTZ, szMhz, ARRAYSIZE(szMhz))) + { + StringCbCopyW(szMhz, sizeof(szMhz), L"%ld MHz"); + } + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) AddFeature(szFeatures, sizeof(szFeatures), L"MMX", &bFirst); if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) @@ -119,7 +125,7 @@ ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); - StringCbPrintfW(szCurrentMhz, sizeof(szCurrentMhz), L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + StringCbPrintfW(szCurrentMhz, sizeof(szCurrentMhz), szMhz, PowerInfo.CurrentMhz); SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); return TRUE; diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index e98f907589..0771485902 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -14,4 +14,7 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" -#endif \ No newline at end of file +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif diff --git a/dll/shellext/devcpux/resource.h b/dll/shellext/devcpux/resource.h index e3543d061e..2eee3a93e9 100644 --- a/dll/shellext/devcpux/resource.h +++ b/dll/shellext/devcpux/resource.h @@ -6,3 +6,5 @@ #define IDC_MODEL 302 #define IDC_STEPPING 303 #define IDC_CORESPEED 304 + +#define IDS_MEGAHERTZ 400

1 0

02/02: [NETCFGX] Add the most simple property sheet provider for network adapters
by Eric Kohl 26 Sep '18

26 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c1e5f7cb9896e36acc43… commit 3c1e5f7cb9896e36acc43493878c345ee206ed1e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 26 23:48:01 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 26 23:49:02 2018 +0200 [NETCFGX] Add the most simple property sheet provider for network adapters - Switch to WINE debug code. - Build the UNICODE version of the DLL by default. - Add the most simple property sheet provider. --- dll/win32/netcfgx/CMakeLists.txt | 3 +- dll/win32/netcfgx/lang/bg-BG.rc | 7 +++ dll/win32/netcfgx/lang/cs-CZ.rc | 7 +++ dll/win32/netcfgx/lang/da-DK.rc | 7 +++ dll/win32/netcfgx/lang/de-DE.rc | 7 +++ dll/win32/netcfgx/lang/el-GR.rc | 7 +++ dll/win32/netcfgx/lang/en-US.rc | 7 +++ dll/win32/netcfgx/lang/es-ES.rc | 7 +++ dll/win32/netcfgx/lang/fr-FR.rc | 7 +++ dll/win32/netcfgx/lang/he-IL.rc | 7 +++ dll/win32/netcfgx/lang/hu-HU.rc | 7 +++ dll/win32/netcfgx/lang/id-ID.rc | 7 +++ dll/win32/netcfgx/lang/it-IT.rc | 7 +++ dll/win32/netcfgx/lang/ja-JP.rc | 7 +++ dll/win32/netcfgx/lang/nl-NL.rc | 7 +++ dll/win32/netcfgx/lang/no-NO.rc | 7 +++ dll/win32/netcfgx/lang/pl-PL.rc | 7 +++ dll/win32/netcfgx/lang/ro-RO.rc | 7 +++ dll/win32/netcfgx/lang/ru-RU.rc | 7 +++ dll/win32/netcfgx/lang/sk-SK.rc | 7 +++ dll/win32/netcfgx/lang/sq-AL.rc | 7 +++ dll/win32/netcfgx/lang/sv-SE.rc | 7 +++ dll/win32/netcfgx/lang/tr-TR.rc | 7 +++ dll/win32/netcfgx/lang/uk-UA.rc | 7 +++ dll/win32/netcfgx/lang/zh-CN.rc | 7 +++ dll/win32/netcfgx/lang/zh-TW.rc | 7 +++ dll/win32/netcfgx/netcfgx.c | 98 ++++++++++++++++++++-------------------- dll/win32/netcfgx/netcfgx.spec | 4 +- dll/win32/netcfgx/precomp.h | 4 ++ dll/win32/netcfgx/propertypage.c | 83 ++++++++++++++++++++++++++++++++++ dll/win32/netcfgx/resource.h | 1 + 31 files changed, 315 insertions(+), 53 deletions(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index a2816b2181..f192cc8d18 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -10,6 +10,7 @@ list(APPEND SOURCE netcfg_iface.c inetcfgcomp_iface.c tcpipconf_notify.c + propertypage.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c) @@ -18,7 +19,7 @@ add_library(netcfgx SHARED netcfgx.rc ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) -set_module_type(netcfgx win32dll) +set_module_type(netcfgx win32dll UNICODE) target_link_libraries(netcfgx uuid wine) add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_pch(netcfgx precomp.h SOURCE) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 222032267a..03b8e8a043 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Мрежoвo свързване" diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index 3dee4adc4b..007a4e1dee 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -201,6 +201,13 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Síťové připojení" diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index 702a991572..5c0d0a5ac7 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index 98246876c9..19479ceac5 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "LAN-Verbindung" diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index dc577ad09c..3bb1fc04e7 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 1ae3d47847..feea1713ac 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 924a0b0de9..6ea5be2a73 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -197,6 +197,13 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Conexión de red" diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 946d51f400..b696364a18 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Connexion réseau" diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 97ebe3da4f..34716189bd 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "חיבור רשת" diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index d3d1d50c71..d89e15db9a 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index dbe7daeed4..5bf8d0ba8b 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index c5a3e952b4..1be24d196f 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Connessioni di rete" diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index 7a0f935b41..f546e31715 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 5d50ce161c..299c0fe5bb 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 6a6d1957b9..4b6b0d54ed 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Nettverk tilkobling" diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index df75350fa1..8ea8cf18d8 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -202,6 +202,13 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Połączenie sieciowe" diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index e9e0ce82df..299eaec46e 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -201,6 +201,13 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Conexiune de rețea" diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 590ad886b7..cfecc1b962 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Сетевое подключение" diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index a43de3133a..7ea1f8eb4f 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index 21138cf1f3..261a22a088 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -200,6 +200,13 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Lidhje rrjeti" diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index f7cf0fe263..dd2c3502d1 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Network Connection" diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 8e5edda248..3dcaa7a889 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -197,6 +197,13 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Ağ Bağlantısı" diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index 2cbd712d75..c4a0d1d37c 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -195,6 +195,13 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "Мережне підключення" diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index aa7c70fc29..755762a2f1 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -203,6 +203,13 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "网络连接" diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index ec52ad4966..82f1cc5238 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -203,6 +203,13 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_NET_CONNECT "網路連線" diff --git a/dll/win32/netcfgx/netcfgx.c b/dll/win32/netcfgx/netcfgx.c index 13ae0946a5..7438632ad2 100644 --- a/dll/win32/netcfgx/netcfgx.c +++ b/dll/win32/netcfgx/netcfgx.c @@ -15,8 +15,6 @@ #include <ndk/iofuncs.h> #include <ndk/rtlfuncs.h> -#define NDEBUG -#include <debug.h> HINSTANCE netcfgx_hInstance; const GUID CLSID_TcpipConfigNotifyObject = {0xA907657F, 0x6FDF, 0x11D0, {0x8E, 0xFB, 0x00, 0xC0, 0x4F, 0xD9, 0x12, 0xB2}}; @@ -244,7 +242,7 @@ InstallNetDevice( /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) { - DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); + ERR("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -252,7 +250,7 @@ InstallNetDevice( InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!InstanceId) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -260,7 +258,7 @@ InstallNetDevice( if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) { rc = GetLastError(); - DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -268,7 +266,7 @@ InstallNetDevice( DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!DeviceName) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -279,7 +277,7 @@ InstallNetDevice( ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!ExportName) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -290,14 +288,14 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -306,7 +304,7 @@ InstallNetDevice( rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hNetworkKey); @@ -315,21 +313,21 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -337,7 +335,7 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(DWORD)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -355,21 +353,21 @@ InstallNetDevice( { hKey = NULL; rc = GetLastError(); - DPRINT1("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); + ERR("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -378,7 +376,7 @@ InstallNetDevice( rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } } @@ -386,28 +384,28 @@ InstallNetDevice( rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } RegCloseKey(hKey); @@ -417,14 +415,14 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -433,7 +431,7 @@ InstallNetDevice( hKey = NULL; if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -445,14 +443,14 @@ InstallNetDevice( rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -460,7 +458,7 @@ InstallNetDevice( rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); if (rc != ERROR_SUCCESS) { - DPRINT1("RegSetValueExW() failed with error 0x%lx\n", rc); + ERR("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -468,25 +466,25 @@ InstallNetDevice( rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { - DPRINT1("RegCreateKeyExW() failed with error 0x%lx\n", rc); + ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); if (rc != ERROR_SUCCESS) { - DPRINT1("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; } @@ -511,7 +509,7 @@ static DWORD InstallNetClient(VOID) { - DPRINT1("Installation of network clients is not yet supported\n"); + FIXME("Installation of network clients is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -519,7 +517,7 @@ static DWORD InstallNetService(VOID) { - DPRINT1("Installation of network services is not yet supported\n"); + FIXME("Installation of network services is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -527,7 +525,7 @@ static DWORD InstallNetTransport(VOID) { - DPRINT1("Installation of network protocols is not yet supported\n"); + FIXME("Installation of network protocols is not yet supported\n"); return ERROR_GEN_FAILURE; } @@ -557,14 +555,14 @@ NetClassInstaller( if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; - DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + TRACE("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); /* Get driver info details */ DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData)) { rc = GetLastError(); - DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -573,7 +571,7 @@ NetClassInstaller( && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { rc = GetLastError(); - DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -581,14 +579,14 @@ NetClassInstaller( if (hInf == INVALID_HANDLE_VALUE) { rc = GetLastError(); - DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc); + ERR("SetupOpenInfFileW() failed with error 0x%lx\n", rc); goto cleanup; } if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName, LINE_LEN, NULL, NULL)) { rc = GetLastError(); - DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); + ERR("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); goto cleanup; } @@ -596,7 +594,7 @@ NetClassInstaller( if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) { rc = GetLastError(); - DPRINT("Unable to find key %S in section %S of file %S (error 0x%lx)\n", + ERR("Unable to find key %S in section %S of file %S (error 0x%lx)\n", L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc); goto cleanup; } @@ -604,7 +602,7 @@ NetClassInstaller( if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt)) { rc = GetLastError(); - DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc); + ERR("SetupGetIntField() failed with error 0x%lx\n", rc); goto cleanup; } @@ -616,14 +614,14 @@ NetClassInstaller( if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) { rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); goto cleanup; } BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!BusType) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -631,7 +629,7 @@ NetClassInstaller( if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) { rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); goto cleanup; } } @@ -641,7 +639,7 @@ NetClassInstaller( RpcStatus = UuidCreate(&Uuid); if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) { - DPRINT("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); + ERR("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -649,7 +647,7 @@ NetClassInstaller( RpcStatus = UuidToStringW(&Uuid, &UuidRpcString); if (RpcStatus != RPC_S_OK) { - DPRINT("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); + ERR("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); rc = ERROR_GEN_FAILURE; goto cleanup; } @@ -658,7 +656,7 @@ NetClassInstaller( UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!UuidString) { - DPRINT("HeapAlloc() failed\n"); + ERR("HeapAlloc() failed\n"); rc = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; } @@ -677,7 +675,7 @@ NetClassInstaller( rc = InstallNetTransport(); else { - DPRINT("Invalid class guid\n"); + ERR("Invalid class guid\n"); rc = ERROR_GEN_FAILURE; } @@ -691,6 +689,6 @@ cleanup: if (rc == ERROR_SUCCESS) rc = ERROR_DI_DO_DEFAULT; - DPRINT("Returning 0x%lx\n", rc); + TRACE("Returning 0x%lx\n", rc); return rc; } diff --git a/dll/win32/netcfgx/netcfgx.spec b/dll/win32/netcfgx/netcfgx.spec index 6a09c9d419..73261e4f0b 100644 --- a/dll/win32/netcfgx/netcfgx.spec +++ b/dll/win32/netcfgx/netcfgx.spec @@ -7,8 +7,8 @@ 8 stub ModemClassCoInstaller 9 stub NetCfgDiagFromCommandArgs 10 stub NetCfgDiagRepairRegistryBindings -11 stdcall NetClassInstaller (long ptr ptr) -12 stub NetPropPageProvider +11 stdcall NetClassInstaller(long ptr ptr) +12 stdcall NetPropPageProvider(ptr ptr long) 13 stub RasAddBindings 14 stub RasCountBindings 15 stub RasRemoveBindings diff --git a/dll/win32/netcfgx/precomp.h b/dll/win32/netcfgx/precomp.h index cda83aa9b0..b8c69a583e 100644 --- a/dll/win32/netcfgx/precomp.h +++ b/dll/win32/netcfgx/precomp.h @@ -21,8 +21,12 @@ #include <devguid.h> #include <commctrl.h> +#include <wine/debug.h> + #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); + typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { REFIID riid; diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c new file mode 100644 index 0000000000..65f667835b --- /dev/null +++ b/dll/win32/netcfgx/propertypage.c @@ -0,0 +1,83 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Network property page provider + * COPYRIGHT: Copyright 2018 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#include "precomp.h" + +static +INT_PTR +CALLBACK +NetPropertyPageDlgProc( + HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + ERR("NetPropertyPageDlgProc: WM_INITDIALOG\n"); + return TRUE; +// return OnInitDialog(hwnd, wParam, lParam); + +// case WM_DESTROY: +// OnDestroy(hwnd); +// break; + + default: + break; + } + + return FALSE; +} + + +BOOL +WINAPI +NetPropPageProvider( + PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + LPARAM lParam) +{ + PROPSHEETPAGEW PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + ERR("NetPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + { + ERR("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); + PropSheetPage.dwFlags = 0; + PropSheetPage.hInstance = netcfgx_hInstance; + PropSheetPage.u.pszTemplate = MAKEINTRESOURCE(IDD_NET_PROPERTY_DLG); + PropSheetPage.pfnDlgProc = NetPropertyPageDlgProc; + PropSheetPage.lParam = 0; + PropSheetPage.pfnCallback = NULL; + + hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); + if (hPropSheetPage == NULL) + { + ERR("CreatePropertySheetPageW() failed!\n"); + return FALSE; + } + + if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) + { + ERR("lpfnAddPropSheetPageProc() failed!\n"); + DestroyPropertySheetPage(hPropSheetPage); + return FALSE; + } + } + + ERR("Done!\n"); + + return TRUE; +} + +/* EOF */ diff --git a/dll/win32/netcfgx/resource.h b/dll/win32/netcfgx/resource.h index f8795d394d..cb32ceb787 100644 --- a/dll/win32/netcfgx/resource.h +++ b/dll/win32/netcfgx/resource.h @@ -12,6 +12,7 @@ #define IDD_TCPIPDNS_DLG 108 #define IDD_TCPIPSUFFIX_DLG 109 #define IDD_TCPIP_PORT_DLG 110 +#define IDD_NET_PROPERTY_DLG 111 /* controls */

1 0

01/02: [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Support class property sheet providers.
by Eric Kohl 26 Sep '18

26 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=986ce63c4c17e354c56aa… commit 986ce63c4c17e354c56aab068be87d32bbadb653 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Sep 26 23:42:00 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 26 23:49:01 2018 +0200 [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Support class property sheet providers. --- dll/win32/setupapi/devclass.c | 157 ++++++++++++++++++++++++++---------------- 1 file changed, 97 insertions(+), 60 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 5f88f40ab8..cc7446fdfd 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1228,6 +1228,42 @@ SETUP_GetClassDevPropertySheetsCallback( return PropPageData->DontCancel; } +static DWORD +SETUP_GetValueString( + IN HKEY hKey, + IN LPWSTR lpValueName, + OUT LPWSTR *lpString) +{ + LPWSTR lpBuffer; + DWORD dwLength = 0; + DWORD dwRegType; + DWORD rc; + + *lpString = NULL; + + RegQueryValueExW(hKey, lpValueName, NULL, &dwRegType, NULL, &dwLength); + + if (dwLength == 0 || dwRegType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); + if (lpBuffer == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + rc = RegQueryValueExW(hKey, lpValueName, NULL, NULL, (LPBYTE)lpBuffer, &dwLength); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, lpBuffer); + return rc; + } + + lpBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + + *lpString = lpBuffer; + + return ERROR_SUCCESS; +} + /*********************************************************************** * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) */ @@ -1240,7 +1276,8 @@ SetupDiGetClassDevPropertySheetsW( OUT PDWORD RequiredSize OPTIONAL, IN DWORD PropertySheetType) { - struct DeviceInfoSet *list; + struct DeviceInfoSet *devInfoSet = NULL; + struct DeviceInfo *devInfo = NULL; BOOL ret = FALSE; TRACE("%p %p %p 0%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, @@ -1251,7 +1288,7 @@ SetupDiGetClassDevPropertySheetsW( SetLastError(ERROR_INVALID_HANDLE); else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); - else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) + else if ((devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEVICE_INFO_SET_MAGIC) SetLastError(ERROR_INVALID_HANDLE); else if (!PropertySheetHeader) SetLastError(ERROR_INVALID_PARAMETER); @@ -1259,7 +1296,7 @@ SetupDiGetClassDevPropertySheetsW( SetLastError(ERROR_INVALID_FLAGS); else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL)) + else if (!DeviceInfoData && IsEqualIID(&devInfoSet->ClassGuid, &GUID_NULL)) SetLastError(ERROR_INVALID_PARAMETER); else if (PropertySheetType != DIGCDP_FLAG_ADVANCED && PropertySheetType != DIGCDP_FLAG_BASIC @@ -1274,74 +1311,66 @@ SetupDiGetClassDevPropertySheetsW( HMODULE hModule = NULL; PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; struct ClassDevPropertySheetsData PropPageData; - DWORD dwLength, dwRegType; DWORD InitialNumberOfPages; DWORD rc; if (DeviceInfoData) - hKey = SETUPDI_OpenDrvKey(list->HKLM, (struct DeviceInfo *)DeviceInfoData->Reserved, KEY_QUERY_VALUE); - else - { - hKey = SetupDiOpenClassRegKeyExW(&list->ClassGuid, KEY_QUERY_VALUE, - DIOCR_INSTALLER, list->MachineName + 2, NULL); - } - if (hKey == INVALID_HANDLE_VALUE) - goto cleanup; + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, &dwRegType, NULL, &dwLength); - if (rc == ERROR_FILE_NOT_FOUND) - { - /* No registry key. As it is optional, don't say it's a bad error */ - if (RequiredSize) - *RequiredSize = 0; - ret = TRUE; - goto cleanup; - } - else if (rc != ERROR_SUCCESS && dwRegType != REG_SZ) - { - SetLastError(rc); - goto cleanup; - } - - PropPageProvider = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); - if (!PropPageProvider) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - rc = RegQueryValueExW(hKey, REGSTR_VAL_ENUMPROPPAGES_32, NULL, NULL, (LPBYTE)PropPageProvider, &dwLength); - if (rc != ERROR_SUCCESS) + /* Get the class property page provider */ + if (devInfoSet->hmodClassPropPageProvider == NULL) { - SetLastError(rc); - goto cleanup; - } - PropPageProvider[dwLength / sizeof(WCHAR)] = 0; + hKey = SetupDiOpenClassRegKeyExW(devInfo ? &devInfo->ClassGuid : &devInfoSet->ClassGuid, KEY_QUERY_VALUE, + DIOCR_INSTALLER, NULL/*devInfoSet->MachineName + 2*/, NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + rc = SETUP_GetValueString(hKey, REGSTR_VAL_ENUMPROPPAGES_32, &PropPageProvider); + if (rc == ERROR_SUCCESS) + { + rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); + if (rc != ERROR_SUCCESS) + { + SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); + goto cleanup; + } - rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); - if (rc != ERROR_SUCCESS) - { - SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); - goto cleanup; - } + devInfoSet->hmodClassPropPageProvider = hModule; + devInfoSet->pClassPropPageProvider = pPropPageProvider; - if (DeviceInfoData) - { - struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + HeapFree(GetProcessHeap(), 0, PropPageProvider); + PropPageProvider = NULL; + } - if (devInfo->hmodDevicePropPageProvider == NULL) - { - devInfo->hmodDevicePropPageProvider = hModule; - devInfo->pDevicePropPageProvider = pPropPageProvider; + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; } } - else - { - struct DeviceInfoSet *devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; - if (devInfoSet->hmodClassPropPageProvider == NULL) + /* Get the device property page provider */ + if (devInfo != NULL && devInfo->hmodDevicePropPageProvider == NULL) + { + hKey = SETUPDI_OpenDrvKey(devInfoSet->HKLM, devInfo, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) { - devInfoSet->hmodClassPropPageProvider = hModule; - devInfoSet->pClassPropPageProvider = pPropPageProvider; + rc = SETUP_GetValueString(hKey, REGSTR_VAL_ENUMPROPPAGES_32, &PropPageProvider); + if (rc == ERROR_SUCCESS) + { + rc = GetFunctionPointer(PropPageProvider, &hModule, (PVOID*)&pPropPageProvider); + if (rc != ERROR_SUCCESS) + { + SetLastError(ERROR_INVALID_PROPPAGE_PROVIDER); + goto cleanup; + } + + devInfo->hmodDevicePropPageProvider = hModule; + devInfo->pDevicePropPageProvider = pPropPageProvider; + + HeapFree(GetProcessHeap(), 0, PropPageProvider); + PropPageProvider = NULL; + } + + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; } } @@ -1357,7 +1386,13 @@ SetupDiGetClassDevPropertySheetsW( PropPageData.NumberOfPages = 0; PropPageData.DontCancel = (RequiredSize != NULL) ? TRUE : FALSE; - pPropPageProvider(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + /* Call the class property page provider */ + if (devInfoSet->pClassPropPageProvider != NULL) + ((PROPERTY_PAGE_PROVIDER)devInfoSet->pClassPropPageProvider)(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + + /* Call the device property page provider */ + if (devInfo != NULL && devInfo->pDevicePropPageProvider != NULL) + ((PROPERTY_PAGE_PROVIDER)devInfo->pDevicePropPageProvider)(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); if (RequiredSize) *RequiredSize = PropPageData.NumberOfPages; @@ -1374,7 +1409,9 @@ SetupDiGetClassDevPropertySheetsW( cleanup: if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, PropPageProvider); + + if (PropPageProvider != NULL) + HeapFree(GetProcessHeap(), 0, PropPageProvider); } TRACE("Returning %d\n", ret);

1 0

01/01: [MSPORTS] Add russian translation
by Stanislav Motylkov 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68c6641781b353038c4af… commit 68c6641781b353038c4af6539a44f28ac19a8e6c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Sep 25 17:36:48 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 25 22:50:02 2018 +0200 [MSPORTS] Add russian translation Addendum to 69e834f. --- dll/win32/msports/lang/ru-RU.rc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dll/win32/msports/lang/ru-RU.rc b/dll/win32/msports/lang/ru-RU.rc index e4d593c166..d6ac1e7f60 100644 --- a/dll/win32/msports/lang/ru-RU.rc +++ b/dll/win32/msports/lang/ru-RU.rc @@ -1,4 +1,8 @@ -/* Russian translation by Kudratov Olimjon (olim98(a)bk.ru) */ +/* + Translators: + Kudratov Olimjon (olim98(a)bk.ru) + Stanislav Motylkov (binarymaster(a)mail.ru) +*/ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -11,7 +15,7 @@ BEGIN COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL RTEXT "Б&иты данных:", -1, 6, 40, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL - RTEXT "&Четность:", -1, 6, 61, 130, 8, WS_GROUP + RTEXT "&Чётность:", -1, 6, 61, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL RTEXT "С&топовые биты:", -1, 6, 82, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL @@ -37,7 +41,7 @@ END STRINGTABLE BEGIN - IDS_PARITY "Even,Odd,None,Mark,Space" + IDS_PARITY "Чёт,Нечёт,Нет,Маркер,Пробел" IDS_STOPBITS "1,1.5,2" - IDS_FLOWCONTROL "Xon / Xoff,Hardware,None" + IDS_FLOWCONTROL "Xon / Xoff,Аппаратное,Нет" END

1 0

01/01: [DEVCPUX] Make the CPU property sheet page a little nicer and make it translatable
by Eric Kohl 25 Sep '18

25 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793e2a38b4265deb673a9… commit 793e2a38b4265deb673a93f92ce91ad4f4e07c18 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 25 21:51:19 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 25 21:51:19 2018 +0200 [DEVCPUX] Make the CPU property sheet page a little nicer and make it translatable --- dll/shellext/devcpux/lang/en-US.rc | 36 ++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 20 ++++++-------------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dll/shellext/devcpux/lang/en-US.rc b/dll/shellext/devcpux/lang/en-US.rc new file mode 100644 index 0000000000..4ea9377e0a --- /dev/null +++ b/dll/shellext/devcpux/lang/en-US.rc @@ -0,0 +1,36 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "Model:", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "Stepping:", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "Core Speed:", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "<test>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "Model:", -1, 7, 49, 50, 8 + LTEXT "<test>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "Stepping:", -1, 7, 75, 50, 8 + LTEXT "<test>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "Core Speed:", -1, 7, 101, 50, 8 + LTEXT "<test>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ \ No newline at end of file diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index ffe16771bf..e98f907589 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -9,17 +9,9 @@ #define REACTOS_STR_ORIGINAL_FILENAME "processorext.dll" #include <reactos/version.rc> -DLG_PROCESSORINFO DIALOGEX 0, 0, 200, 220 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "CPU" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Features:", -1, 5, 23, 50, 51 - LTEXT "Test", IDC_FEATURES, 50, 23, 80, 51 - LTEXT "Model:", -1, 5, 33, 50, 51 - LTEXT "test", IDC_MODEL, 50, 33, 80, 51 - LTEXT "Stepping:", -1, 5, 43, 50, 51 - LTEXT "test", IDC_STEPPING, 50, 43, 80, 51 - LTEXT "Core Speed:", -1, 5, 53, 50, 51 - LTEXT "test", IDC_CORESPEED, 50, 53, 80, 51 -END +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif \ No newline at end of file

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018