Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SERVICES] Use a proper security descriptor for the control pipes
by Eric Kohl 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8abbdd28080615ffc1bf6… commit 8abbdd28080615ffc1bf6e39ae227a43605d11da Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 22:30:40 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 22:30:40 2019 +0200 [SERVICES] Use a proper security descriptor for the control pipes --- base/system/services/database.c | 7 +++- base/system/services/security.c | 91 ++++++++++++++++++++++++++++++++++++++++- base/system/services/services.h | 1 + 3 files changed, 97 insertions(+), 2 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 460b74886a5..7c41c54eb9f 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -44,6 +44,7 @@ static DWORD ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) { WCHAR szControlPipeName[MAX_PATH + 1]; + SECURITY_ATTRIBUTES SecurityAttributes; HKEY hServiceCurrentKey = INVALID_HANDLE_VALUE; DWORD ServiceCurrent = 0; DWORD KeyDisposition; @@ -97,6 +98,10 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) DPRINT("PipeName: %S\n", szControlPipeName); + SecurityAttributes.nLength = sizeof(SecurityAttributes); + SecurityAttributes.lpSecurityDescriptor = pPipeSD; + SecurityAttributes.bInheritHandle = FALSE; + pServiceImage->hControlPipe = CreateNamedPipeW(szControlPipeName, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, @@ -104,7 +109,7 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) 8000, 4, PipeTimeout, - NULL); + &SecurityAttributes); DPRINT("CreateNamedPipeW(%S) done\n", szControlPipeName); if (pServiceImage->hControlPipe == INVALID_HANDLE_VALUE) { diff --git a/base/system/services/security.c b/base/system/services/security.c index b6a54694143..b2639e95a20 100644 --- a/base/system/services/security.c +++ b/base/system/services/security.c @@ -14,14 +14,17 @@ #include <debug.h> static PSID pNullSid = NULL; +static PSID pWorldSid = NULL; static PSID pLocalSystemSid = NULL; static PSID pAuthenticatedUserSid = NULL; static PSID pAliasAdminsSid = NULL; static PACL pDefaultDacl = NULL; static PACL pDefaultSacl = NULL; +static PACL pPipeDacl = NULL; static PSECURITY_DESCRIPTOR pDefaultSD = NULL; +PSECURITY_DESCRIPTOR pPipeSD = NULL; /* FUNCTIONS ****************************************************************/ @@ -33,6 +36,9 @@ ScmFreeSids(VOID) if (pNullSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pNullSid); + if (pWorldSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pWorldSid); + if (pLocalSystemSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pLocalSystemSid); @@ -41,7 +47,6 @@ ScmFreeSids(VOID) if (pAliasAdminsSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pAliasAdminsSid); - } @@ -66,6 +71,17 @@ ScmCreateSids(VOID) pSubAuthority = RtlSubAuthoritySid(pNullSid, 0); *pSubAuthority = SECURITY_NULL_RID; + /* Create the World SID */ + pWorldSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength1); + if (pWorldSid == NULL) + { + return ERROR_OUTOFMEMORY; + } + + RtlInitializeSid(pWorldSid, &NullAuthority, 1); + pSubAuthority = RtlSubAuthoritySid(pWorldSid, 0); + *pSubAuthority = SECURITY_WORLD_RID; + /* Create the LocalSystem SID */ pLocalSystemSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength1); if (pLocalSystemSid == NULL) @@ -158,6 +174,21 @@ ScmCreateAcls(VOID) FALSE, TRUE); + /* Create the pipe DACL */ + ulLength = sizeof(ACL) + + (sizeof(ACE) + RtlLengthSid(pWorldSid)); + + pPipeDacl = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ulLength); + if (pPipeDacl == NULL) + return ERROR_OUTOFMEMORY; + + RtlCreateAcl(pPipeDacl, ulLength, ACL_REVISION); + + RtlAddAccessAllowedAce(pPipeDacl, + ACL_REVISION, + GENERIC_ALL, + pWorldSid); + return ERROR_SUCCESS; } @@ -171,6 +202,9 @@ ScmFreeAcls(VOID) if (pDefaultSacl != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pDefaultSacl); + + if (pPipeDacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pPipeDacl); } @@ -231,6 +265,56 @@ ScmFreeDefaultSD(VOID) } +static +DWORD +ScmCreatePipeSD(VOID) +{ + NTSTATUS Status; + + /* Create the absolute security descriptor */ + pPipeSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SECURITY_DESCRIPTOR)); + if (pPipeSD == NULL) + return ERROR_OUTOFMEMORY; + + DPRINT("pPipeSD %p\n", pDefaultSD); + + Status = RtlCreateSecurityDescriptor(pPipeSD, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + Status = RtlSetOwnerSecurityDescriptor(pPipeSD, + pLocalSystemSid, + FALSE); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + Status = RtlSetGroupSecurityDescriptor(pPipeSD, + pLocalSystemSid, + FALSE); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + Status = RtlSetDaclSecurityDescriptor(pPipeSD, + TRUE, + pPipeDacl, + FALSE); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + return ERROR_SUCCESS; +} + + +static +VOID +ScmFreePipeSD(VOID) +{ + if (pPipeSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pPipeSD); +} + + DWORD ScmCreateDefaultServiceSD( PSECURITY_DESCRIPTOR *ppSecurityDescriptor) @@ -301,6 +385,10 @@ ScmInitializeSecurity(VOID) if (dwError != ERROR_SUCCESS) return dwError; + dwError = ScmCreatePipeSD(); + if (dwError != ERROR_SUCCESS) + return dwError; + return ERROR_SUCCESS; } @@ -308,6 +396,7 @@ ScmInitializeSecurity(VOID) VOID ScmShutdownSecurity(VOID) { + ScmFreePipeSD(); ScmFreeDefaultSD(); ScmFreeAcls(); ScmFreeSids(); diff --git a/base/system/services/services.h b/base/system/services/services.h index 9297c7ce999..4a1a0c0827c 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -100,6 +100,7 @@ extern LIST_ENTRY GroupListHead; extern LIST_ENTRY ImageListHead; extern BOOL ScmInitialize; extern BOOL ScmShutdown; +extern PSECURITY_DESCRIPTOR pPipeSD; /* FUNCTIONS ***************************************************************/

1 0

[reactos] 01/01: [SERVICES] Do not try to start lsass.exe as a service.
by Eric Kohl 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b03d2b4d65477bce8d412… commit b03d2b4d65477bce8d4123d15d2d750375e7f460 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 20:58:12 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 20:58:12 2019 +0200 [SERVICES] Do not try to start lsass.exe as a service. Starting the security services (samss, netlogon, etc) requires special code in services.exe and lsasrv.dll. --- base/system/services/database.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 11e0d0d676b..460b74886a5 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -1852,18 +1852,26 @@ ScmStartUserModeService(PSERVICE Service, StartupInfo.lpDesktop = L"WinSta0\\Default"; } - Result = CreateProcessW(NULL, - Service->lpImage->pszImagePath, - NULL, - NULL, - FALSE, - CREATE_UNICODE_ENVIRONMENT | DETACHED_PROCESS | CREATE_SUSPENDED, - lpEnvironment, - NULL, - &StartupInfo, - &ProcessInformation); - if (!Result) - dwError = GetLastError(); + if (wcsstr(Service->lpImage->pszImagePath, L"\\system32\\lsass.exe") == NULL) + { + Result = CreateProcessW(NULL, + Service->lpImage->pszImagePath, + NULL, + NULL, + FALSE, + CREATE_UNICODE_ENVIRONMENT | DETACHED_PROCESS | CREATE_SUSPENDED, + lpEnvironment, + NULL, + &StartupInfo, + &ProcessInformation); + if (!Result) + dwError = GetLastError(); + } + else + { + Result = TRUE; + dwError = ERROR_SUCCESS; + } } if (lpEnvironment)

1 0

[reactos] 01/01: [RPCSS] Prevent the RPCSS service from getting stopped
by Eric Kohl 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71408b531cf11e72a36ea… commit 71408b531cf11e72a36ea71ebe8d645fbc6e75be Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 19:58:50 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 19:59:30 2019 +0200 [RPCSS] Prevent the RPCSS service from getting stopped CORE-13500 --- base/services/rpcss/rpcss_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/base/services/rpcss/rpcss_main.c b/base/services/rpcss/rpcss_main.c index c515fa1a111..6eca3bab62e 100644 --- a/base/services/rpcss/rpcss_main.c +++ b/base/services/rpcss/rpcss_main.c @@ -91,7 +91,11 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SERVICE_STATUS status; status.dwServiceType = SERVICE_WIN32; +#ifdef __REACTOS__ + status.dwControlsAccepted = 0; +#else status.dwControlsAccepted = SERVICE_ACCEPT_STOP; +#endif status.dwWin32ExitCode = 0; status.dwServiceSpecificExitCode = 0; status.dwCheckPoint = 0; @@ -137,11 +141,19 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) status.dwServiceType = SERVICE_WIN32; status.dwCurrentState = SERVICE_RUNNING; +#ifdef __REACTOS__ + status.dwControlsAccepted = 0; +#else status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; +#endif status.dwWin32ExitCode = 0; status.dwServiceSpecificExitCode = 0; status.dwCheckPoint = 0; +#ifdef __REACTOS__ + status.dwWaitHint = 0; +#else status.dwWaitHint = 10000; +#endif SetServiceStatus( service_handle, &status ); #ifdef __REACTOS__

1 0

[reactos] 04/04: [FREELDR] Some initialization fixes.
by Hermès Bélusca-Maïto 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=909bfff46049ff1309b56… commit 909bfff46049ff1309b564b04d0fe8c12fc02d19 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 4 17:35:46 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:04 2019 +0200 [FREELDR] Some initialization fixes. - Initialize BootPath and BootOptions buffers when fallback behaviour is not taken. - Correctly skip all the understood whitespace (space & tabs) and the quotes before reading the boot options when using the alternative syntax: [Operating Systems] section_name = "ReactOS" /bootoptions Fixes the minor regression introduced in 370e8564 (r43875). --- boot/freeldr/freeldr/ntldr/setupldr.c | 21 +++++++++++++++------ boot/freeldr/freeldr/ntldr/winldr.c | 27 ++++++++++++++++++--------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 20a7eff355e..68841f8cda6 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -191,6 +191,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); /* Read the system path is set in the .ini file */ + BootPath[0] = ANSI_NULL; if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { /* @@ -231,15 +232,23 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, if ((strlen(BootPath) == 0) || BootPath[strlen(BootPath) - 1] != '\\') strcat(BootPath, "\\"); - /* Read booting options */ + /* Read boot options */ + BootOptions2[0] = ANSI_NULL; if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions2, sizeof(BootOptions2))) { - /* Get options after the title */ + /* Retrieve the options after the quoted title */ PCSTR p = SettingsValue; - while (*p == ' ' || *p == '"') - p++; - while (*p != '\0' && *p != '"') - p++; + + /* Trim any leading whitespace and quotes */ + while (*p == ' ' || *p == '\t' || *p == '"') + ++p; + /* Skip all the text up to the first last quote */ + while (*p != ANSI_NULL && *p != '"') + ++p; + /* Trim any trailing whitespace and quotes */ + while (*p == ' ' || *p == '\t' || *p == '"') + ++p; + strcpy(BootOptions2, p); TRACE("BootOptions: '%s'\n", BootOptions2); } diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index d888634da98..e8e2eb2fbff 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -652,13 +652,13 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, { ULONG_PTR SectionId; PCSTR SectionName = OperatingSystem->SystemPartition; - CHAR SettingsValue[80]; + PCHAR File; + BOOLEAN Success; BOOLEAN HasSection; + CHAR SettingsValue[80]; CHAR BootPath[MAX_PATH]; CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; - PCHAR File; - BOOLEAN Success; PLOADER_PARAMETER_BLOCK LoaderBlock; /* Get OS setting value */ @@ -673,6 +673,7 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading NT..."); /* Read the system path is set in the .ini file */ + BootPath[0] = ANSI_NULL; if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { strcpy(BootPath, SectionName); @@ -704,15 +705,23 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, if ((BootPath[0] == 0) || BootPath[strlen(BootPath) - 1] != '\\') strcat(BootPath, "\\"); - /* Read booting options */ + /* Read boot options */ + BootOptions[0] = ANSI_NULL; if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) { - /* Get options after the title */ + /* Retrieve the options after the quoted title */ PCSTR p = SettingsValue; - while (*p == ' ' || *p == '"') - p++; - while (*p != '\0' && *p != '"') - p++; + + /* Trim any leading whitespace and quotes */ + while (*p == ' ' || *p == '\t' || *p == '"') + ++p; + /* Skip all the text up to the first last quote */ + while (*p != ANSI_NULL && *p != '"') + ++p; + /* Trim any trailing whitespace and quotes */ + while (*p == ' ' || *p == '\t' || *p == '"') + ++p; + strcpy(BootOptions, p); TRACE("BootOptions: '%s'\n", BootOptions); }

1 0

[reactos] 03/04: [FREELDR] Whitespace, minor code styles and comments fixes only.
by Hermès Bélusca-Maïto 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b978d42bd9ef8d0992947… commit b978d42bd9ef8d099294716828881ec52225a9ad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 4 17:29:07 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:04 2019 +0200 [FREELDR] Whitespace, minor code styles and comments fixes only. --- boot/freeldr/freeldr/ntldr/setupldr.c | 9 ++++----- boot/freeldr/freeldr/ntldr/winldr.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 10bfe3dff37..20a7eff355e 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -73,7 +73,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR return; } - TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); + TRACE("NLS data '%s' '%s' '%s'\n", AnsiName, OemName, LangName); #if DBG { @@ -130,7 +130,7 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR S ServiceName); if (!Success) { - ERR("could not add boot driver %s, %s\n", SearchPath, DriverName); + ERR("Could not add boot driver '%s', '%s'\n", SearchPath, DriverName); return; } } @@ -191,8 +191,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); /* Read the system path is set in the .ini file */ - if (!HasSection || - !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { /* * IMPROVE: I don't want to call MachDiskGetBootPath here as a @@ -203,7 +202,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, */ // MachDiskGetBootPath(BootPath, sizeof(BootPath)); // strcpy(BootPath, SectionName); - BootPath[0] = '\0'; + BootPath[0] = ANSI_NULL; } /* diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index c9bdd84b0ea..d888634da98 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -99,9 +99,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, strncpy(ArcBoot, BootPath, PathSeparator); ArcBoot[PathSeparator] = ANSI_NULL; - TRACE("ArcBoot: %s\n", ArcBoot); - TRACE("SystemRoot: %s\n", SystemRoot); - TRACE("Options: %s\n", Options); + TRACE("ArcBoot: '%s'\n", ArcBoot); + TRACE("SystemRoot: '%s'\n", SystemRoot); + TRACE("Options: '%s'\n", Options); /* Fill ARC BootDevice */ LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; @@ -122,7 +122,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH); LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); - /* Fill LoadOptions and strip the '/' commutator symbol in front of each option */ + /* Fill LoadOptions and strip the '/' switch symbol in front of each option */ NewLoadOptions = LoadOptions = LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH); @@ -252,7 +252,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, DriverPath[0] = ANSI_NULL; } - TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); + TRACE("DriverPath: '%s', DllName: '%s', LPB\n", DriverPath, DllName); // Check if driver is already loaded Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); @@ -506,7 +506,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Skip possible initial whitespace */ Options += strspn(Options, " \t"); - /* Check whether a new commutator starts and it is either KERNEL or HAL */ + /* Check whether a new option starts and it is either KERNEL or HAL */ if (*Options != '/' || (++Options, !(_strnicmp(Options, "KERNEL=", 7) == 0 || _strnicmp(Options, "HAL=", 4) == 0)) ) @@ -524,7 +524,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, break; } - /* We have found either KERNEL or HAL commutator */ + /* We have found either KERNEL or HAL options */ if (_strnicmp(Options, "KERNEL=", 7) == 0) { Options += 7; i -= 7; @@ -589,7 +589,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Skip possible initial whitespace */ Options += strspn(Options, " \t"); - /* Check whether a new commutator starts and it is the DEBUGPORT one */ + /* Check whether a new option starts and it is the DEBUGPORT one */ if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) { /* Search for another whitespace */ @@ -598,7 +598,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, } else { - /* We found the DEBUGPORT commutator. Move to the port name. */ + /* We found the DEBUGPORT option. Move to the port name. */ Options += 10; break; } @@ -607,7 +607,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, if (Options) { /* - * We have found the DEBUGPORT commutator. Parse the port name. + * We have found the DEBUGPORT option. Parse the port name. * Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". */ @@ -673,8 +673,7 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading NT..."); /* Read the system path is set in the .ini file */ - if (!HasSection || - !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { strcpy(BootPath, SectionName); }

1 0

[reactos] 02/04: [FREELDR] Unload freeldr.ini file before booting.
by Hermès Bélusca-Maïto 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e79e7bf53c491f8c2dce0… commit e79e7bf53c491f8c2dce064746feffdec72cb7b2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 02:11:26 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:03 2019 +0200 [FREELDR] Unload freeldr.ini file before booting. --- boot/freeldr/freeldr/bootmgr.c | 1 + boot/freeldr/freeldr/linuxboot.c | 1 + boot/freeldr/freeldr/miscboot.c | 3 +++ boot/freeldr/freeldr/ntldr/winldr.c | 13 +++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 69b7d98359c..5df8182c901 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -280,5 +280,6 @@ VOID RunLoader(VOID) Reboot: UiUnInitialize("Rebooting..."); + IniCleanup(); return; } diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index 23258941eb8..d59ae161801 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -164,6 +164,7 @@ LoadAndBootLinux(IN OperatingSystemItem* OperatingSystem, RtlCopyMemory((PVOID)0x99000, LinuxCommandLine, LinuxCommandLineSize); UiUnInitialize("Booting Linux..."); + IniCleanup(); DiskStopFloppyMotor(); diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 50f68e9afc5..4ad2daa90c6 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -73,6 +73,7 @@ LoadAndBootBootSector(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we @@ -148,6 +149,7 @@ LoadAndBootPartition(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we @@ -206,6 +208,7 @@ LoadAndBootDrive(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 1127f2e88c7..c9bdd84b0ea 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -103,12 +103,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("SystemRoot: %s\n", SystemRoot); TRACE("Options: %s\n", Options); - /* Fill Arc BootDevice */ + /* Fill ARC BootDevice */ LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; strncpy(LoaderBlock->ArcBootDeviceName, ArcBoot, MAX_PATH); LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); - /* Fill Arc HalDevice, it matches ArcBoot path */ + /* Fill ARC HalDevice, it matches ArcBoot path */ LoaderBlock->ArcHalDeviceName = WinLdrSystemBlock->ArcBootDeviceName; LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); @@ -136,7 +136,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); - /* Arc devices */ + /* ARC devices */ LoaderBlock->ArcDiskInformation = &WinLdrSystemBlock->ArcDiskInformation; InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); @@ -784,6 +784,7 @@ LoadAndBootWindowsCommon( PLDR_DATA_TABLE_ENTRY KernelDTE; KERNEL_ENTRY_POINT KiSystemStartup; LPCSTR SystemRoot; + TRACE("LoadAndBootWindowsCommon()\n"); #ifdef _M_IX86 @@ -820,6 +821,9 @@ LoadAndBootWindowsCommon( Success = WinLdrLoadBootDrivers(LoaderBlock, BootPath); TRACE("Boot drivers loading %s\n", Success ? "successful" : "failed"); + /* Cleanup ini file */ + IniCleanup(); + /* Initialize Phase 1 - no drivers loading anymore */ WinLdrInitializePhase1(LoaderBlock, BootOptions, @@ -834,9 +838,6 @@ LoadAndBootWindowsCommon( /* "Stop all motors", change videomode */ MachPrepareForReactOS(); - /* Cleanup ini file */ - IniCleanup(); - /* Debugging... */ //DumpMemoryAllocMap();

1 0

[reactos] 01/04: [FREELDR] Use NOGUIBOOT when booting in Safe-Mode.
by Hermès Bélusca-Maïto 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cdb76094cafa93cb3537… commit 5cdb76094cafa93cb35371470b33ebaf1ad09ad7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 01:49:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:03 2019 +0200 [FREELDR] Use NOGUIBOOT when booting in Safe-Mode. --- boot/freeldr/freeldr/options.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 0300b025af4..78338f2c5d5 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -246,15 +246,15 @@ VOID AppendBootTimeOptions(PCHAR BootOptions) switch (BootOptionChoice) { case SAFE_MODE: - strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS /NOGUIBOOT"); break; case SAFE_MODE_WITH_NETWORKING: - strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS /NOGUIBOOT"); break; case SAFE_MODE_WITH_COMMAND_PROMPT: - strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS /NOGUIBOOT"); break; case LAST_KNOWN_GOOD_CONFIGURATION:

1 0

[reactos] 01/01: [NTOSKRNL] Implement SeRegisterLogonSessionTerminatedRoutine() and SeUnregisterLogonSessionTerminatedRoutine().
by Eric Kohl 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4614c5b57c5b1652499e1… commit 4614c5b57c5b1652499e105109f099cc6ceae656 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 13:59:39 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 14:01:26 2019 +0200 [NTOSKRNL] Implement SeRegisterLogonSessionTerminatedRoutine() and SeUnregisterLogonSessionTerminatedRoutine(). --- ntoskrnl/se/srm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index d67305036a9..6517d997c1d 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -20,6 +20,7 @@ extern LUID SeAnonymousAuthenticationId; /* PRIVATE DEFINITIONS ********************************************************/ #define SEP_LOGON_SESSION_TAG 'sLeS' +#define SEP_LOGON_NOTIFICATION_TAG 'nLeS' typedef struct _SEP_LOGON_SESSION_REFERENCES { @@ -31,6 +32,12 @@ typedef struct _SEP_LOGON_SESSION_REFERENCES LIST_ENTRY TokenList; } SEP_LOGON_SESSION_REFERENCES, *PSEP_LOGON_SESSION_REFERENCES; +typedef struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION +{ + struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION *Next; + PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine; +} SEP_LOGON_SESSION_TERMINATED_NOTIFICATION, *PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION; + VOID NTAPI SepRmCommandServerThread( @@ -61,7 +68,8 @@ ULONG SepAdtMaxListLength = 0x3000; UCHAR SeAuditingState[POLICY_AUDIT_EVENT_TYPE_COUNT]; KGUARDED_MUTEX SepRmDbLock; -PSEP_LOGON_SESSION_REFERENCES SepLogonSessions; +PSEP_LOGON_SESSION_REFERENCES SepLogonSessions = NULL; +PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION SepLogonNotifications = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -1118,26 +1126,96 @@ SeMarkLogonSessionForTerminationNotification( /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeRegisterLogonSessionTerminatedRoutine( IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION Notification; + PAGED_CODE(); + + /* Fail, if we don not have a callback routine */ + if (CallbackRoutine == NULL) + return STATUS_INVALID_PARAMETER; + + /* Allocate a new notification item */ + Notification = ExAllocatePoolWithTag(PagedPool, + sizeof(SEP_LOGON_SESSION_TERMINATED_NOTIFICATION), + SEP_LOGON_NOTIFICATION_TAG); + if (Notification == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Acquire the database lock */ + KeAcquireGuardedMutex(&SepRmDbLock); + + /* Set the callback routine */ + Notification->CallbackRoutine = CallbackRoutine; + + /* Insert the new notification item into the list */ + Notification->Next = SepLogonNotifications; + SepLogonNotifications = Notification; + + /* Release the database lock */ + KeReleaseGuardedMutex(&SepRmDbLock); + + return STATUS_SUCCESS; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeUnregisterLogonSessionTerminatedRoutine( IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION Current, Previous = NULL; + NTSTATUS Status; + PAGED_CODE(); + + /* Fail, if we don not have a callback routine */ + if (CallbackRoutine == NULL) + return STATUS_INVALID_PARAMETER; + + /* Acquire the database lock */ + KeAcquireGuardedMutex(&SepRmDbLock); + + /* Loop all registered notification items */ + for (Current = SepLogonNotifications; + Current != NULL; + Current = Current->Next) + { + /* Check if the callback routine matches the provided one */ + if (Current->CallbackRoutine == CallbackRoutine) + break; + + Previous = Current; + } + + if (Current == NULL) + { + Status = STATUS_NOT_FOUND; + } + else + { + /* Remove the current notification item from the list */ + if (Previous == NULL) + SepLogonNotifications = Current->Next; + else + Previous->Next = Current->Next; + + /* Free the current notification item */ + ExFreePoolWithTag(Current, + SEP_LOGON_NOTIFICATION_TAG); + + Status = STATUS_SUCCESS; + } + + /* Release the database lock */ + KeReleaseGuardedMutex(&SepRmDbLock); + + return Status; }

1 0

[reactos] 01/01: [CODEOWNERS] Remove 'CMakeLists.txt' rule, which is too noisy.
by Thomas Faber 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f370ea5fdfe43115b2a8… commit 4f370ea5fdfe43115b2a82134ae13869ba7a2405 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 4 12:55:45 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 4 12:55:51 2019 +0200 [CODEOWNERS] Remove 'CMakeLists.txt' rule, which is too noisy. --- CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 07865197b38..852cba37869 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -123,7 +123,6 @@ # R: ThFabba, Thomas Faber # S: Maintained /sdk/cmake/ @learn-more @ThFabba -CMakeLists.txt @learn-more @ThFabba *.cmake @learn-more @ThFabba # File Patch API

1 0

[reactos] 01/01: [DEVMGR] Add the code to uninstall a device from the property page
by Eric Kohl 04 Aug '19

04 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7550e9efbf6786319480a… commit 7550e9efbf6786319480a7893514da5cd9b931ef Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 11:18:42 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 11:20:04 2019 +0200 [DEVMGR] Add the code to uninstall a device from the property page --- dll/win32/devmgr/lang/bg-BG.rc | 11 +++ dll/win32/devmgr/lang/cs-CZ.rc | 11 +++ dll/win32/devmgr/lang/de-DE.rc | 12 +++- dll/win32/devmgr/lang/el-GR.rc | 11 +++ dll/win32/devmgr/lang/en-US.rc | 12 ++++ dll/win32/devmgr/lang/es-ES.rc | 11 +++ dll/win32/devmgr/lang/et-EE.rc | 12 ++++ dll/win32/devmgr/lang/fr-FR.rc | 11 +++ dll/win32/devmgr/lang/he-IL.rc | 11 +++ dll/win32/devmgr/lang/hu-HU.rc | 11 +++ dll/win32/devmgr/lang/id-ID.rc | 11 +++ dll/win32/devmgr/lang/it-IT.rc | 12 +++- dll/win32/devmgr/lang/ja-JP.rc | 12 ++++ dll/win32/devmgr/lang/no-NO.rc | 12 +++- dll/win32/devmgr/lang/pl-PL.rc | 12 +++- dll/win32/devmgr/lang/pt-BR.rc | 12 +++- dll/win32/devmgr/lang/pt-PT.rc | 12 +++- dll/win32/devmgr/lang/ro-RO.rc | 12 +++- dll/win32/devmgr/lang/ru-RU.rc | 11 +++ dll/win32/devmgr/lang/sk-SK.rc | 11 +++ dll/win32/devmgr/lang/sq-AL.rc | 11 +++ dll/win32/devmgr/lang/tr-TR.rc | 11 +++ dll/win32/devmgr/lang/uk-UA.rc | 11 +++ dll/win32/devmgr/lang/zh-CN.rc | 12 ++++ dll/win32/devmgr/lang/zh-TW.rc | 12 ++++ dll/win32/devmgr/properties/advprop.cpp | 117 +++++++++++++++++++++++++++++++- dll/win32/devmgr/resource.h | 1 + 27 files changed, 396 insertions(+), 9 deletions(-) diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 47ca6224d5d..b85967b01d7 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index e5f8a3903a0..0cc466fd7ff 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -245,6 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 529044e83a5..115a3df9a8b 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Entfernen des Geräts bestätigen" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warnung: Sie sind dabei, das Gerät aus der Systemkonfiguration zu deinstalleren.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 166, 100, 50, 14 +END /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 8aabbd38839..fbdb1cea4d9 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index faaadd6af82..f239176dbf7 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -240,6 +240,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 1a011c8ba7c..9a7d536b91f 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -249,6 +249,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index 498e86a6611..ef09d0d5320 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -247,6 +247,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 79c33bba606..25424994447 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index c8d0401390b..ac762438d4d 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 3e8f7f8443b..cda88fb50ac 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index a7d33717db7..1a4426ce1c3 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index 2920ecab544..65efa6c68b6 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 3ddfe6f5d50..636bde2dd78 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -240,6 +240,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index f6ef8e0face..ec6f3c51665 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index e85ee6b6371..9446c0f3310 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -250,7 +250,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index 204129cee1b..03cb0496efc 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index 55986eb0356..b178c102192 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index c5fd765ac33..6c8612b840f 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -245,7 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 0c0612f76d4..e3c3cf8e57b 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index c41ee067209..97460c1c198 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -245,6 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index 84cfc841ff1..86cf64be38d 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -244,6 +244,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index 9af97e2193c..a42c7f3328a 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index eb8b5ba55b3..40e7b3549a7 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -248,6 +248,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index b4bd5e427b3..706d2a42f19 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -242,6 +242,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "宋体" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 31af160a308..7b61164998b 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -242,6 +242,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "新細明體" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/properties/advprop.cpp b/dll/win32/devmgr/properties/advprop.cpp index 29a3579bcba..8df086fe4ba 100644 --- a/dll/win32/devmgr/properties/advprop.cpp +++ b/dll/win32/devmgr/properties/advprop.cpp @@ -429,6 +429,104 @@ DriverDetailsDlgProc(IN HWND hwndDlg, } +static +INT_PTR +CALLBACK +UninstallDriverDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVADVPROP_INFO dap; + INT_PTR Ret = FALSE; + + dap = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, DWLP_USER); + + if (dap != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_INITDIALOG: + dap = (PDEVADVPROP_INFO)lParam; + if (dap != NULL) + { + SetWindowLongPtr(hwndDlg, DWLP_USER, (DWORD_PTR)dap); + + /* Set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* Set the device name */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); + } + + Ret = TRUE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, IDOK); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + + return Ret; +} + + +static +VOID +UninstallDriver( + _In_ HWND hwndDlg, + _In_ PDEVADVPROP_INFO dap) +{ + SP_REMOVEDEVICE_PARAMS RemoveDevParams; + + if (DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_UNINSTALLDRIVER), + hwndDlg, + UninstallDriverDlgProc, + (ULONG_PTR)dap) == IDCANCEL) + return; + + RemoveDevParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + RemoveDevParams.ClassInstallHeader.InstallFunction = DIF_REMOVE; + RemoveDevParams.Scope = DI_REMOVEDEVICE_GLOBAL; + RemoveDevParams.HwProfile = 0; + + SetupDiSetClassInstallParamsW(dap->DeviceInfoSet, + &dap->DeviceInfoData, + &RemoveDevParams.ClassInstallHeader, + sizeof(SP_REMOVEDEVICE_PARAMS)); + + SetupDiCallClassInstaller(DIF_REMOVE, + dap->DeviceInfoSet, + &dap->DeviceInfoData); + + SetupDiSetClassInstallParamsW(dap->DeviceInfoSet, + &dap->DeviceInfoData, + NULL, + 0); +} + + static VOID UpdateDriver( @@ -500,6 +598,9 @@ UpdateDriverDlg(IN HWND hwndDlg, { HDEVINFO DeviceInfoSet; PSP_DEVINFO_DATA DeviceInfoData; + DWORD dwStatus = 0; + DWORD dwProblem = 0; + CONFIGRET cr; if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) { @@ -556,6 +657,19 @@ UpdateDriverDlg(IN HWND hwndDlg, IDC_DRVVERSION, dap->szTemp); } + + /* Disable the Uninstall button if the driver cannot be removed */ + cr = CM_Get_DevNode_Status_Ex(&dwStatus, + &dwProblem, + dap->DeviceInfoData.DevInst, + 0, + dap->hMachine); + if (cr == CR_SUCCESS) + { + if ((dwStatus & DN_ROOT_ENUMERATED) != 0 && + (dwStatus & DN_DISABLEABLE) == 0) + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALLDRIVER), FALSE); + } } @@ -596,7 +710,7 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, break; case IDC_UNINSTALLDRIVER: - // FIXME + UninstallDriver(hwndDlg, dap); break; } break; @@ -624,7 +738,6 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, dap); } EnableWindow(GetDlgItem(hwndDlg, IDC_ROLLBACKDRIVER), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALLDRIVER), FALSE); Ret = TRUE; break; } diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index bdb4c460718..f8054f38ccb 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -217,6 +217,7 @@ #define IDD_DRIVERDETAILS 0x404 #define IDD_DEVICEDETAILS 0x405 #define IDD_DEVICEPOWER 0x406 +#define IDD_UNINSTALLDRIVER 0x407 #define IDC_DEVICON 0x57B #define IDC_DEVNAME 0x57C

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs