Ros-diffs

ros-diffs@reactos.org

19 participants
81100 discussions

[reactos] 01/01: [SHIMGVW] Display filename in taskbar even if the file isn't loaded (#5379)

by Yukinari Mitsu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3801acb914f56a52cffe7… commit 3801acb914f56a52cffe792dfa0b50d51741a920 Author: Yukinari Mitsu <bimy1280163(a)gn.iwasaki.ac.jp> AuthorDate: Sun Jul 2 01:22:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 1 19:22:03 2023 +0300 [SHIMGVW] Display filename in taskbar even if the file isn't loaded (#5379) If the file could not be loaded, its name wasn't displayed in the taskbar. Now, always display the file name in all cases. CORE-18954 --- dll/win32/shimgvw/shimgvw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 47a34662826..8fad7c1a7b6 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -524,9 +524,10 @@ pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) pLoadImage(node->FileName); LoadStringW(hInstance, IDS_APPTITLE, szResStr, _countof(szResStr)); - if (image != NULL) + + pchFileTitle = PathFindFileNameW(node->FileName); + if (pchFileTitle && *pchFileTitle) { - pchFileTitle = PathFindFileNameW(node->FileName); StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls%ls%ls", szResStr, L" - ", pchFileTitle); SetWindowTextW(hwnd, szTitleBuf);

1 year, 6 months

[reactos] 01/01: [IPCONFIG] Replace some DNS related strings by resources

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4328b858e50fc30c283a3… commit 4328b858e50fc30c283a3cd80dd202fa7b794c6e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 1 15:32:47 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 1 15:32:47 2023 +0200 [IPCONFIG] Replace some DNS related strings by resources --- base/applications/network/ipconfig/ipconfig.c | 11 ++++++++--- base/applications/network/ipconfig/lang/bg-BG.rc | 8 ++++++++ base/applications/network/ipconfig/lang/de-DE.rc | 8 ++++++++ base/applications/network/ipconfig/lang/el-GR.rc | 8 ++++++++ base/applications/network/ipconfig/lang/en-US.rc | 8 ++++++++ base/applications/network/ipconfig/lang/es-ES.rc | 8 ++++++++ base/applications/network/ipconfig/lang/fr-FR.rc | 8 ++++++++ base/applications/network/ipconfig/lang/id-ID.rc | 8 ++++++++ base/applications/network/ipconfig/lang/it-IT.rc | 8 ++++++++ base/applications/network/ipconfig/lang/no-NO.rc | 8 ++++++++ base/applications/network/ipconfig/lang/pl-PL.rc | 8 ++++++++ base/applications/network/ipconfig/lang/ro-RO.rc | 8 ++++++++ base/applications/network/ipconfig/lang/ru-RU.rc | 8 ++++++++ base/applications/network/ipconfig/lang/sk-SK.rc | 8 ++++++++ base/applications/network/ipconfig/lang/sq-AL.rc | 8 ++++++++ base/applications/network/ipconfig/lang/sv-SE.rc | 8 ++++++++ base/applications/network/ipconfig/lang/tr-TR.rc | 8 ++++++++ base/applications/network/ipconfig/lang/uk-UA.rc | 8 ++++++++ base/applications/network/ipconfig/lang/zh-CN.rc | 8 ++++++++ base/applications/network/ipconfig/lang/zh-TW.rc | 8 ++++++++ base/applications/network/ipconfig/resource.h | 7 ++++++- 21 files changed, 166 insertions(+), 4 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index a3db75726eb..43c7b89a531 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -927,9 +927,14 @@ FlushDns(VOID) ConResPrintf(StdOut, IDS_HEADER); if (DnsFlushResolverCache()) - _tprintf(_T("The DNS Resolver Cache has been deleted.\n")); + { + ConResPrintf(StdOut, IDS_DNSFLUSHSUCCESS); + } else + { + ConResPrintf(StdOut, IDS_DNSFLUSHERROR); DoFormatMessage(GetLastError()); + } } VOID @@ -965,11 +970,11 @@ DisplayDnsRecord( { if (Status == DNS_ERROR_RCODE_NAME_ERROR) { - _tprintf(_T("\tName does not exist\n\n")); + ConResPrintf(StdOut, IDS_DNSNONAME); } else if (Status == DNS_INFO_NO_RECORDS) { - _tprintf(_T("\tNo records of type %s\n\n"), GetRecordTypeName(wType)); + ConResPrintf(StdOut, IDS_DNSNORECORD, GetRecordTypeName(wType)); } return; } diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index ebcbc711495..a91a4b04c10 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 398c8aa8ecd..3ac1118752e 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -81,6 +81,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV-Eintrag . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tKeine Einträge vom Typ %ls\n\n" + IDS_DNSNONAME "\tName existiert nicht.\n\n" + IDS_DNSFLUSHERROR "Der DNS-Auflösungscache konnte nicht geleert werden: " + IDS_DNSFLUSHSUCCESS "Der DNS-Auflösungscache wurde geleert.\n" +END + STRINGTABLE BEGIN IDS_USAGE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 64da46ab416..2278736e48d 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index b94319498f3..454e0ff118c 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index ddf0d3dfcc8..a1ee73c5a51 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index e5cc7ffa209..fdc4dbc2969 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -81,6 +81,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index 089c52a8926..728c47ade57 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index fe17082f6e6..0e4e9e1c0e9 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index 3421238c16f..c117bc3407b 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index ecb98ed6201..920683fa194 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -58,6 +58,14 @@ BEGIN IDS_WIFI "\nKarta bezprzewodowej sieci LAN: %ls\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN IDS_DNSNAME "\t%ls\n" diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 7295b605bfa..75f99443de1 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tÎnregistrarea SRV . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index de83c309f37..ad13270a593 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV-запись . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index d42a9aa4e90..3c50220c492 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index f50a4aa7416..9c2f193c1d0 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -79,6 +79,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index d2e3de4ce88..379b5b7e01e 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index 1e917493a6b..bddb634ab9e 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index 1812be9d3d1..d75d697cef3 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index 98460251aff..a976f0e6af3 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index afc38e013fa..53825808d57 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -80,6 +80,14 @@ BEGIN IDS_DNSTYPESRV "\tSRV Record. . . . . . : %ls\n\t %hu\n\t %hu\n\t %hu\n" END +STRINGTABLE +BEGIN + IDS_DNSNORECORD "\tNo records of type %ls\n\n" + IDS_DNSNONAME "\tName does not exist.\n\n" + IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " + IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 216757465a4..5b356fa5f3c 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -65,4 +65,9 @@ #define IDS_DNSTYPEATMA 178 #define IDS_DNSTYPESRV 179 -#define IDS_USAGE 180 +#define IDS_USAGE 180 + +#define IDS_DNSNORECORD 200 +#define IDS_DNSNONAME 201 +#define IDS_DNSFLUSHERROR 202 +#define IDS_DNSFLUSHSUCCESS 203

1 year, 6 months

[reactos] 01/01: [IPCONFIG] Implement globbing for the Release and Renew options

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edd332c9525b183284277… commit edd332c9525b18328427784f65eb90e607db5abf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 1 10:28:33 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 1 10:28:33 2023 +0200 [IPCONFIG] Implement globbing for the Release and Renew options - Add a simple Wildcard Matcher. - Use the Wildcard Matcher in the Release and Renew functions. --- base/applications/network/ipconfig/ipconfig.c | 277 +++++++++++++++++--------- 1 file changed, 178 insertions(+), 99 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index d4cdeb7a84c..a3db75726eb 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -8,7 +8,6 @@ * TODO: * fix renew / release * implement registerdns, showclassid, setclassid - * allow globbing on adapter names */ #define WIN32_NO_STATUS @@ -225,7 +224,7 @@ VOID GetAdapterFriendlyName( _In_ LPSTR lpClass, _In_ DWORD cchFriendlyNameLength, - _Out_ PWSTR pszFriendlyName) + _Out_ LPWSTR pszFriendlyName) { HKEY hKey = NULL; CHAR Path[256]; @@ -261,6 +260,49 @@ GetAdapterFriendlyName( RegCloseKey(hKey); } +VOID +GetInterfaceFriendlyName( + _In_ LPWSTR lpDeviceName, + _In_ DWORD cchFriendlyNameLength, + _Out_ LPWSTR pszFriendlyName) +{ + HKEY hKey = NULL; + WCHAR Path[256]; + LPWSTR PrePath = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"; + LPWSTR PostPath = L"\\Connection"; + LPWSTR DevicePrefix = L"\\DEVICE\\TCPIP_"; + DWORD PathSize; + DWORD dwType; + DWORD dwDataSize; + + DWORD dwPrefixLength = wcslen(DevicePrefix); + + /* don't overflow the buffer */ + PathSize = wcslen(PrePath) + wcslen(lpDeviceName) - dwPrefixLength + wcslen(PostPath) + 1; + if (PathSize >= 255) + return; + + swprintf(Path, L"%s%s%s", PrePath, &lpDeviceName[dwPrefixLength], PostPath); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + Path, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + dwDataSize = cchFriendlyNameLength * sizeof(WCHAR); + RegQueryValueExW(hKey, + L"Name", + NULL, + &dwType, + (PBYTE)pszFriendlyName, + &dwDataSize); + } + + if (hKey != NULL) + RegCloseKey(hKey); +} + static VOID PrintAdapterDescription(LPSTR lpClass) @@ -716,129 +758,167 @@ done: HeapFree(ProcessHeap, 0, pAdapterInfo); } -VOID Release(LPTSTR Index) +static +BOOL +MatchWildcard( + _In_ PWSTR pszExpression, + _In_ PWSTR pszName) { - IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD ret; - DWORD i; + WCHAR *pCharE, *pCharN, charE, charN; - /* if interface is not given, query GetInterfaceInfo */ - if (Index == NULL) - { - PIP_INTERFACE_INFO pInfo = NULL; - ULONG ulOutBufLen = 0; + if (pszExpression == NULL) + return TRUE; - if (GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) - { - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); - if (pInfo == NULL) - return; + if (pszName == NULL) + return FALSE; - if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) - { - for (i = 0; i < pInfo->NumAdapters; i++) - { - CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); - - /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), AdapterInfo.Name); - DoFormatMessage(ret); - } - } + pCharE = pszExpression; + pCharN = pszName; + while (*pCharE != UNICODE_NULL) + { + charE = towlower(*pCharE); + charN = towlower(*pCharN); - HeapFree(ProcessHeap, 0, pInfo); - } + if (charE == L'*') + { + if (*(pCharE + 1) != charN) + pCharN++; else - { - DoFormatMessage(0); - HeapFree(ProcessHeap, 0, pInfo); - return; - } + pCharE++; + } + else if (charE == L'?') + { + pCharE++; + pCharN++; + } + else if (charE == charN) + { + pCharE++; + pCharN++; } else { - DoFormatMessage(0); - return; + return FALSE; } } - else - { - ; - /* FIXME: - * we need to be able to release connections by name with support for globbing - * i.e. ipconfig /release Eth* will release all cards starting with Eth... - * ipconfig /release *con* will release all cards with 'con' in their name - */ - } + + return TRUE; } -VOID Renew(LPTSTR Index) +VOID +Release( + LPWSTR pszAdapterName) { IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD i; + DWORD i, ret; + PIP_INTERFACE_INFO pInfo = NULL; + ULONG ulOutBufLen = 0; + WCHAR szFriendlyName[MAX_PATH]; + + ConResPrintf(StdOut, IDS_HEADER); - /* if interface is not given, query GetInterfaceInfo */ - if (Index == NULL) + if (GetInterfaceInfo(pInfo, &ulOutBufLen) != ERROR_INSUFFICIENT_BUFFER) { - PIP_INTERFACE_INFO pInfo; - ULONG ulOutBufLen = 0; + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(0); + return; + } - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO)); - if (pInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); + if (pInfo == NULL) + { + _tprintf(_T("memory allocation error")); + return; + } + + if (GetInterfaceInfo(pInfo, &ulOutBufLen) != NO_ERROR) + { + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(0); + goto done; + } + + for (i = 0; i < pInfo->NumAdapters; i++) + { + GetInterfaceFriendlyName(pInfo->Adapter[i].Name, MAX_PATH, szFriendlyName); - /* Make an initial call to GetInterfaceInfo to get - * the necessary size into the ulOutBufLen variable */ - if (GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + if ((pszAdapterName == NULL) || MatchWildcard(pszAdapterName, szFriendlyName)) { - HeapFree(ProcessHeap, 0, pInfo); - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); - if (pInfo == NULL) + /* TODO: Check for enabled DHCP and connected medium */ + + CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); + + /* Call IpReleaseAddress to release the IP address on the specified adapter. */ + ret = IpReleaseAddress(&AdapterInfo); + if (ret != NO_ERROR) { - _tprintf(_T("memory allocation error")); - return; + _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), szFriendlyName); + DoFormatMessage(ret); } } + } - /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR) - { - for (i = 0; i < pInfo->NumAdapters; i++) - { - CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); +done: + HeapFree(ProcessHeap, 0, pInfo); +} - /* Call IpRenewAddress to renew the IP address on the specified adapter. */ - if (IpRenewAddress(&AdapterInfo) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); - DoFormatMessage(0); - } - } - } - else - { - _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(0); - } +VOID +Renew( + LPWSTR pszAdapterName) +{ + IP_ADAPTER_INDEX_MAP AdapterInfo; + DWORD i, ret; + PIP_INTERFACE_INFO pInfo = NULL; + ULONG ulOutBufLen = 0; + WCHAR szFriendlyName[MAX_PATH]; - HeapFree(ProcessHeap, 0, pInfo); + ConResPrintf(StdOut, IDS_HEADER); + + if (GetInterfaceInfo(pInfo, &ulOutBufLen) != ERROR_INSUFFICIENT_BUFFER) + { + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(0); + return; } - else + + pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); + if (pInfo == NULL) { - ; - /* FIXME: - * we need to be able to renew connections by name with support for globbing - * i.e. ipconfig /renew Eth* will renew all cards starting with Eth... - * ipconfig /renew *con* will renew all cards with 'con' in their name - */ + _tprintf(_T("memory allocation error")); + return; } + + /* Make a second call to GetInterfaceInfo to get the actual data we want */ + if (GetInterfaceInfo(pInfo, &ulOutBufLen) != NO_ERROR) + { + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(0); + goto done; + } + + for (i = 0; i < pInfo->NumAdapters; i++) + { + GetInterfaceFriendlyName(pInfo->Adapter[i].Name, MAX_PATH, szFriendlyName); + + if ((pszAdapterName == NULL) || MatchWildcard(pszAdapterName, szFriendlyName)) + { + /* TODO: Check for enabled DHCP and connected medium */ + + CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + + /* Call IpRenewAddress to renew the IP address on the specified adapter. */ + ret = IpRenewAddress(&AdapterInfo); + if (ret != NO_ERROR) + { + _tprintf(_T("\nAn error occured while renew interface %ls : "), szFriendlyName); + DoFormatMessage(ret); + } + } + } + +done: + HeapFree(ProcessHeap, 0, pInfo); } VOID @@ -1112,10 +1192,9 @@ int wmain(int argc, wchar_t *argv[]) break; case 3: /* Process all the options that can have 1 parameter */ if (DoRelease) - _tprintf(_T("\nSorry /release [adapter] is not implemented yet\n")); - //Release(argv[2]); + Release(argv[2]); else if (DoRenew) - _tprintf(_T("\nSorry /renew [adapter] is not implemented yet\n")); + Renew(argv[2]); else if (DoShowclassid) _tprintf(_T("\nSorry /showclassid adapter is not implemented yet\n")); else if (DoSetclassid)

1 year, 6 months

[reactos] 01/01: [NETSTAT] Fix crash when parsing the protocol CORE-19005 (#5363)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40864bc15cb77ceb07e73… commit 40864bc15cb77ceb07e73f8625486c120192bb18 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Jun 29 22:33:53 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 29 22:33:53 2023 +0200 [NETSTAT] Fix crash when parsing the protocol CORE-19005 (#5363) fixes symptom CORE-19005 [NETSTAT] crashes when called with -abnop and no further argument (protocol name missing). The crash was a regression of 0.4.11-dev-814-g 2b5507336017cdea726f146a225823a932df54c2 also meticulously try to match Windows exact screen output and ERRORLEVEL then instead of e.g.: simply showing the usage help which means: ERRORLEVEL 0 for 'netstat -abnop' and displaying Active-string + table header *but without any sane contents* ERRORLEVEL 1 for 'netstat -abnop bullshit' and displaying usage help ERRORLEVEL 0 for 'netstat -abnop tcp' and displaying Active-string + table header + contents ERRORLEVEL 0 for 'netstat -abnop udp' and displaying Active-string + table header + contents while touching the file do also some unrelated whitespace tweaks. --- base/applications/network/netstat/netstat.c | 75 +++++++++++++---------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index b1d177effec..f9f05046d92 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -1,16 +1,13 @@ /* * PROJECT: ReactOS netstat utility * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/network/netstat/netstat.c * PURPOSE: display IP stack statistics * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> */ /* * TODO: - * sort function return values. * implement -b, -t and -v * clean up GetIpHostName - * command line parser needs more work */ #include <stdio.h> @@ -62,9 +59,19 @@ VOID DoFormatMessage(DWORD ErrorCode) } /* - * + * Display table header + */ +VOID DisplayTableHeader(VOID) +{ + ConResPuts(StdOut, IDS_DISPLAY_THEADER); + if (bDoShowProcessId) + ConResPuts(StdOut, IDS_DISPLAY_PROCESS); + else + ConPuts(StdOut, L"\n"); +} + +/* * Parse command line parameters and set any options - * */ BOOL ParseCmdline(int argc, wchar_t* argv[]) { @@ -103,6 +110,13 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) break; case L'p': bDoShowProtoCons = TRUE; + if (i+1 >= argc) + { + ConResPuts(StdOut, IDS_ACTIVE_CONNECT); + DisplayTableHeader(); + return TRUE; + } + Proto = argv[i+1]; if (!_wcsicmp(L"IP", Proto)) Protocol = IP; @@ -113,10 +127,7 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) else if (!_wcsicmp(L"UDP", Proto)) Protocol = UDP; else - { - ConResPuts(StdErr, IDS_USAGE); - return FALSE; - } + goto StopParsingAndShowUsageHelp; break; case L'r': bDoShowRouteTable = TRUE; @@ -133,7 +144,8 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) ConPuts(StdErr, L"'v' option is FIXME (Accepted option though unimplemented feature).\n"); bDoDispSeqComp = TRUE; break; - default : + default: +StopParsingAndShowUsageHelp: ConResPuts(StdErr, IDS_USAGE); return FALSE; } @@ -146,28 +158,11 @@ BOOL ParseCmdline(int argc, wchar_t* argv[]) else return FALSE; } -// else -// { -// ConResPrintf(StdErr, IDS_USAGE); -// return FALSE; -// } } return TRUE; } -/* - * Display table header - */ -VOID DisplayTableHeader(VOID) -{ - ConResPuts(StdOut, IDS_DISPLAY_THEADER); - if (bDoShowProcessId) - ConResPuts(StdOut, IDS_DISPLAY_PROCESS); - else - ConPuts(StdOut, L"\n"); -} - /* * Simulate Microsofts netstat utility output */ @@ -248,7 +243,7 @@ VOID ShowIpStatistics(VOID) PMIB_IPSTATS pIpStats; DWORD dwRetVal; - pIpStats = (MIB_IPSTATS*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPSTATS)); + pIpStats = (MIB_IPSTATS*)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPSTATS)); if ((dwRetVal = GetIpStatistics(pIpStats)) == NO_ERROR) { @@ -284,7 +279,7 @@ VOID ShowIcmpStatistics(VOID) PMIB_ICMP pIcmpStats; DWORD dwRetVal; - pIcmpStats = (MIB_ICMP*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_ICMP)); + pIcmpStats = (MIB_ICMP*)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_ICMP)); if ((dwRetVal = GetIcmpStatistics(pIcmpStats)) == NO_ERROR) { @@ -323,7 +318,6 @@ VOID ShowIcmpStatistics(VOID) } HeapFree(GetProcessHeap(), 0, pIcmpStats); - } VOID ShowTcpStatistics(VOID) @@ -374,12 +368,12 @@ VOID ShowEthernetStatistics(VOID) DWORD dwSize = 0; DWORD dwRetVal = 0; - pIfTable = (MIB_IFTABLE*) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IFTABLE)); + pIfTable = (MIB_IFTABLE*)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IFTABLE)); if (GetIfTable(pIfTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { HeapFree(GetProcessHeap(), 0, pIfTable); - pIfTable = (MIB_IFTABLE*) HeapAlloc(GetProcessHeap(), 0, dwSize); + pIfTable = (MIB_IFTABLE*)HeapAlloc(GetProcessHeap(), 0, dwSize); if ((dwRetVal = GetIfTable(pIfTable, &dwSize, 0)) == NO_ERROR) { @@ -418,17 +412,17 @@ BOOL ShowTcpTable(VOID) CHAR PID[64]; /* Get the table of TCP endpoints */ - dwSize = sizeof (MIB_TCPTABLE_OWNER_PID); + dwSize = sizeof(MIB_TCPTABLE_OWNER_PID); /* Should also work when we get new connections between 2 GetTcpTable() * calls: */ do { - tcpTable = (PMIB_TCPTABLE_OWNER_PID) HeapAlloc(GetProcessHeap(), 0, dwSize); + tcpTable = (PMIB_TCPTABLE_OWNER_PID)HeapAlloc(GetProcessHeap(), 0, dwSize); error = GetExtendedTcpTable(tcpTable, &dwSize, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0); - if ( error != NO_ERROR ) + if (error != NO_ERROR) HeapFree(GetProcessHeap(), 0, tcpTable); } - while ( error == ERROR_INSUFFICIENT_BUFFER ); + while (error == ERROR_INSUFFICIENT_BUFFER); if (error != NO_ERROR) { @@ -498,7 +492,7 @@ BOOL ShowUdpTable(VOID) DoFormatMessage(error); return FALSE; } - udpTable = (PMIB_UDPTABLE_OWNER_PID) HeapAlloc(GetProcessHeap(), 0, dwSize); + udpTable = (PMIB_UDPTABLE_OWNER_PID)HeapAlloc(GetProcessHeap(), 0, dwSize); error = GetExtendedUdpTable(udpTable, &dwSize, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0); if (error) { @@ -511,7 +505,6 @@ BOOL ShowUdpTable(VOID) /* Dump the UDP table */ for (i = 0; i < udpTable->dwNumEntries; i++) { - /* I've split this up so it's easier to follow */ GetIpHostName(TRUE, udpTable->table[i].dwLocalAddr, HostIp, sizeof(HostIp)); GetPortName(udpTable->table[i].dwLocalPort, "udp", HostPort, sizeof(HostPort)); @@ -549,7 +542,7 @@ GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen) } /* Try to translate to a name */ if ((pServent = getservbyport(Port, Proto))) - strcpy(Name, pServent->s_name ); + strcpy(Name, pServent->s_name); else sprintf(Name, "%d", htons((WORD)Port)); return Name; @@ -609,10 +602,8 @@ GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], INT NameLen) } /* - * * Parse command line parameters and set any options - * Run display output, looping over set intervals if a number is given - * + * Run display output, looping over set interval if a number is given */ int wmain(int argc, wchar_t *argv[]) {

1 year, 6 months

[reactos] 01/01: [ADVAPI32_APITEST] Add new RegCreateKeyEx tests (#5234)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40233a364435882d9c361… commit 40233a364435882d9c361b9065c0ab2dc5380157 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Jun 29 14:33:44 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 29 21:33:44 2023 +0200 [ADVAPI32_APITEST] Add new RegCreateKeyEx tests (#5234) * [ADVAPI32_APITEST] Add new RegCreateKeyEx tests * Remove trailing spaces. * Initialize SECURITY_ATTRIBUTES sa with zeroes. Add a set of tests for RegCreateKeyExW and -A. Created to prove the correctness of the already merged PR (#5230) JIRA issue: CORE-15471 --- modules/rostests/apitests/advapi32/CMakeLists.txt | 1 + .../rostests/apitests/advapi32/RegCreateKeyEx.c | 230 +++++++++++++++++++++ modules/rostests/apitests/advapi32/testlist.c | 2 + 3 files changed, 233 insertions(+) diff --git a/modules/rostests/apitests/advapi32/CMakeLists.txt b/modules/rostests/apitests/advapi32/CMakeLists.txt index c5bccc3b0d0..8a9bab7abd6 100644 --- a/modules/rostests/apitests/advapi32/CMakeLists.txt +++ b/modules/rostests/apitests/advapi32/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE IsTextUnicode.c LockServiceDatabase.c QueryServiceConfig2.c + RegCreateKeyEx.c RegEnumKey.c RegEnumValueW.c RegOpenKeyExW.c diff --git a/modules/rostests/apitests/advapi32/RegCreateKeyEx.c b/modules/rostests/apitests/advapi32/RegCreateKeyEx.c new file mode 100644 index 00000000000..18ffd88c779 --- /dev/null +++ b/modules/rostests/apitests/advapi32/RegCreateKeyEx.c @@ -0,0 +1,230 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for RegCreateKeyExW. + * COPYRIGHT: Copyright 2023 Doug Lyons <douglyons(a)douglyons.com> + */ + +/* + * Idea based loosely on code from the following: + * https://learn.microsoft.com/en-us/windows/win32/secauthz/creating-a-securit… + */ + +#include <apitest.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <aclapi.h> + + +START_TEST(RegCreateKeyEx) +{ + HKEY hkey_main; + DWORD dwRes, dwDisposition; + PACL pACL = NULL; + PSECURITY_DESCRIPTOR pSD = NULL; + PSID pEveryoneSID = NULL, pAdminSID = NULL; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = {SECURITY_WORLD_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = {SECURITY_NT_AUTHORITY}; + EXPLICIT_ACCESSW ea[2]; + SECURITY_ATTRIBUTES sa = { 0 }; + LONG lRes; + BOOL bRes; + LONG ErrorCode = 0; + HKEY hkSub = NULL; + + // If any of the test keys already exist, delete them to ensure proper testing + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"mykey", 0, KEY_ALL_ACCESS, &hkey_main) == ERROR_SUCCESS) + { + RegCloseKey(hkey_main); + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey"); + ok_dec(ErrorCode, ERROR_SUCCESS); + if (ErrorCode != ERROR_SUCCESS) + { + skip("'HKCU\\mykey' cannot be deleted. Terminating test\n"); + goto Cleanup; + } + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"mykey1", 0, KEY_ALL_ACCESS, &hkey_main) == ERROR_SUCCESS) + { + RegCloseKey(hkey_main); + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey1"); + ok_dec(ErrorCode, ERROR_SUCCESS); + if (ErrorCode != ERROR_SUCCESS) + { + skip("'HKCU\\mykey1' cannot be deleted. Terminating test\n"); + goto Cleanup; + } + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"mykey2", 0, KEY_ALL_ACCESS, &hkey_main) == ERROR_SUCCESS) + { + RegCloseKey(hkey_main); + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey2"); + ok_dec(ErrorCode, ERROR_SUCCESS); + if (ErrorCode != ERROR_SUCCESS) + { + skip("'HKCU\\mykey2' cannot be deleted. Terminating test\n"); + goto Cleanup; + } + } + + // Setup GetLastError to known value for tests + SetLastError(0xdeadbeef); + + // Create a well-known SID for the Everyone group. + bRes = AllocateAndInitializeSid(&SIDAuthWorld, 1, + SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, + &pEveryoneSID); + ok(bRes, "AllocateAndInitializeSid Error %ld\n", GetLastError()); + if (!bRes) + { + skip("EveryoneSID not initialized. Terminating test\n"); + goto Cleanup; + } + + // Initialize an EXPLICIT_ACCESS structure for an ACE. + // The ACE will allow Everyone read access to the key. + ZeroMemory(&ea, sizeof(ea)); + ea[0].grfAccessPermissions = KEY_READ; + ea[0].grfAccessMode = SET_ACCESS; + ea[0].grfInheritance= NO_INHERITANCE; + ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID; + ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + ea[0].Trustee.ptstrName = pEveryoneSID; + + // Create a SID for the BUILTIN\Administrators group. + bRes = AllocateAndInitializeSid(&SIDAuthNT, 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pAdminSID); + ok(bRes, "AllocateAndInitializeSid Error %ld\n", GetLastError()); + if (!bRes) + { + skip("AdminSID not initialized. Terminating test\n"); + goto Cleanup; + } + + // Initialize an EXPLICIT_ACCESS structure for an ACE. + // The ACE will allow the Administrators group full access to the key. + ea[1].grfAccessPermissions = KEY_ALL_ACCESS; + ea[1].grfAccessMode = SET_ACCESS; + ea[1].grfInheritance= NO_INHERITANCE; + ea[1].Trustee.TrusteeForm = TRUSTEE_IS_SID; + ea[1].Trustee.TrusteeType = TRUSTEE_IS_GROUP; + ea[1].Trustee.ptstrName = pAdminSID; + + // Create a new ACL that contains the new ACEs. + dwRes = SetEntriesInAclW(_countof(ea), ea, NULL, &pACL); + ok(dwRes == ERROR_SUCCESS, "SetEntriesInAcl Error %ld\n", GetLastError()); + if (dwRes != ERROR_SUCCESS) + goto Cleanup; + + // Initialize a security descriptor. + pSD = LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); + ok(pSD != NULL, "LocalAlloc Error %ld\n", GetLastError()); + if (pSD == NULL) + goto Cleanup; + + bRes = InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + ok(bRes, "InitializeSecurityDescriptor Error %ld\n", GetLastError()); + if (!bRes) + goto Cleanup; + + // Add the ACL to the security descriptor. + bRes = SetSecurityDescriptorDacl(pSD, + TRUE, // bDaclPresent flag + pACL, + FALSE); // not a default DACL + ok(bRes, "SetSecurityDescriptorDacl Error %ld\n", GetLastError()); + if (!bRes) + goto Cleanup; + + // Initialize a security attributes structure. + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = FALSE; + + // Use the security attributes to set the security descriptor + // with an nlength that is 0. + sa.nLength = 0; + lRes = RegCreateKeyExW(HKEY_CURRENT_USER, L"mykey", 0, L"", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExW returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_CREATED_NEW_KEY, "Should have created NEW key\n"); + if (dwDisposition != REG_CREATED_NEW_KEY) + goto Cleanup; + + // Test the -A function + lRes = RegCreateKeyExA(HKEY_CURRENT_USER, "mykey", 0, "", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExA returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_OPENED_EXISTING_KEY, "Should have opened EXISTING key\n"); + if (dwDisposition != REG_OPENED_EXISTING_KEY) + goto Cleanup; + + // Use the security attributes to set the security descriptor + // with an nlength that is too short, but not 0. + sa.nLength = sizeof(SECURITY_ATTRIBUTES) / 2; + lRes = RegCreateKeyExW(HKEY_CURRENT_USER, L"mykey1", 0, L"", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExW returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_CREATED_NEW_KEY, "Should have created NEW key\n"); + if (dwDisposition != REG_CREATED_NEW_KEY) + goto Cleanup; + + // Test the -A function + lRes = RegCreateKeyExA(HKEY_CURRENT_USER, "mykey1", 0, "", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExA returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_OPENED_EXISTING_KEY, "Should have opened EXISTING key\n"); + if (dwDisposition != REG_OPENED_EXISTING_KEY) + goto Cleanup; + + // Use the security attributes to set the security descriptor + // with an nlength that is too long. + sa.nLength = sizeof(SECURITY_ATTRIBUTES) + 10; + lRes = RegCreateKeyExW(HKEY_CURRENT_USER, L"mykey2", 0, L"", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExW returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_CREATED_NEW_KEY, "Should have created NEW key\n"); + if (dwDisposition != REG_CREATED_NEW_KEY) + goto Cleanup; + + // Test the -A function + lRes = RegCreateKeyExA(HKEY_CURRENT_USER, "mykey2", 0, "", 0, + KEY_READ | KEY_WRITE, &sa, &hkSub, &dwDisposition); + ok(lRes == ERROR_SUCCESS, "RegCreateKeyExA returned '%ld', expected 0", lRes); + ok(dwDisposition == REG_OPENED_EXISTING_KEY, "Should have opened EXISTING key\n"); + if (dwDisposition != REG_OPENED_EXISTING_KEY) + goto Cleanup; + +Cleanup: + + if (pEveryoneSID) + FreeSid(pEveryoneSID); + if (pAdminSID) + FreeSid(pAdminSID); + if (pACL) + LocalFree(pACL); + if (pSD) + LocalFree(pSD); + if (hkSub) + RegCloseKey(hkSub); + + // Delete the subkeys created for testing + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey"); + ok_dec(ErrorCode, ERROR_SUCCESS); + + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey1"); + ok_dec(ErrorCode, ERROR_SUCCESS); + + ErrorCode = RegDeleteKeyW(HKEY_CURRENT_USER, L"mykey2"); + ok_dec(ErrorCode, ERROR_SUCCESS); +} + diff --git a/modules/rostests/apitests/advapi32/testlist.c b/modules/rostests/apitests/advapi32/testlist.c index dadd2f6ac18..67764a03204 100644 --- a/modules/rostests/apitests/advapi32/testlist.c +++ b/modules/rostests/apitests/advapi32/testlist.c @@ -10,6 +10,7 @@ extern void func_HKEY_CLASSES_ROOT(void); extern void func_IsTextUnicode(void); extern void func_LockServiceDatabase(void); extern void func_QueryServiceConfig2(void); +extern void func_RegCreateKeyEx(void); extern void func_RegEnumKey(void); extern void func_RegEnumValueW(void); extern void func_RegOpenKeyExW(void); @@ -30,6 +31,7 @@ const struct test winetest_testlist[] = { "IsTextUnicode" , func_IsTextUnicode }, { "LockServiceDatabase" , func_LockServiceDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 }, + { "RegCreateKeyEx", func_RegCreateKeyEx }, { "RegEnumKey", func_RegEnumKey }, { "RegEnumValueW", func_RegEnumValueW }, { "RegQueryInfoKey", func_RegQueryInfoKey },

1 year, 6 months

[reactos] 03/03: [NTOS:PNP] Complete the PlugPlayControlInitializeDevice control class

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cfc4a3376e5f731bfa4b… commit 8cfc4a3376e5f731bfa4b8a961fc900999dc8b90 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 26 01:26:08 2023 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Jun 29 19:25:28 2023 +0300 [NTOS:PNP] Complete the PlugPlayControlInitializeDevice control class Besides creating the PDO and device node for it, it has to set up the necessary registry keys, and register PDO at PnP root driver properly. CORE-18989 --- ntoskrnl/io/pnpmgr/plugplay.c | 48 ++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 461328c8651..9220b30dc9e 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -32,6 +32,9 @@ static KEVENT IopPnpNotifyEvent; /* FUNCTIONS *****************************************************************/ +NTSTATUS +IopSetDeviceInstanceData(HANDLE InstanceKey, PDEVICE_NODE DeviceNode); + CODE_SEG("INIT") NTSTATUS IopInitPlugPlayEvents(VOID) @@ -198,15 +201,16 @@ IopCaptureUnicodeString(PUNICODE_STRING DstName, PUNICODE_STRING SrcName) static NTSTATUS -IopInitializeDevice( +PiControlInitializeDevice( _In_ PPLUGPLAY_CONTROL_DEVICE_CONTROL_DATA ControlData) { UNICODE_STRING DeviceInstance; PDEVICE_OBJECT DeviceObject; PDEVICE_NODE DeviceNode; NTSTATUS Status = STATUS_SUCCESS; + HANDLE InstanceKey; - DPRINT("IopInitializeDevice(%p)\n", ControlData); + DPRINT("PiControlInitializeDevice(%p)\n", ControlData); Status = IopCaptureUnicodeString(&DeviceInstance, &ControlData->DeviceInstance); if (!NT_SUCCESS(Status)) @@ -229,13 +233,7 @@ IopInitializeDevice( DPRINT("Device %wZ does not exist!\n", &DeviceInstance); /* Create a device node for the device instance */ - Status = IoCreateDevice(IopRootDriverObject, - 0, - NULL, - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &DeviceObject); + Status = PnpRootCreateDeviceObject(&DeviceObject); if (!NT_SUCCESS(Status)) { DPRINT1("IoCreateDevice() failed (Status 0x%08lx)\n", Status); @@ -252,8 +250,12 @@ IopInitializeDevice( goto done; } - /* Set the device instance of the device node */ - Status = RtlDuplicateUnicodeString(0, &DeviceInstance, &DeviceNode->InstancePath); + // Set the device instance of the device node + // NOTE: a NULL-terminated string is required for PnpRootRegisterDevice + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceInstance, + &DeviceNode->InstancePath); if (!NT_SUCCESS(Status)) { DPRINT1("RtlDuplicateUnicodeString() failed (Status 0x%08lx)\n", Status); @@ -262,9 +264,31 @@ IopInitializeDevice( goto done; } + DeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; + DeviceNode->Flags |= DNF_MADEUP | DNF_IDS_QUERIED | DNF_ENUMERATED; + PiSetDevNodeState(DeviceNode, DeviceNodeInitialized); + + Status = IopCreateDeviceKeyPath(&DeviceInstance, REG_OPTION_NON_VOLATILE, &InstanceKey); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); + IopFreeDeviceNode(DeviceNode); + IoDeleteDevice(DeviceObject); + goto done; + } + + /* Write the resource information to the registry */ + IopSetDeviceInstanceData(InstanceKey, DeviceNode); + + // Finish the root device registration + PnpRootRegisterDevice(DeviceObject); + /* Insert as a root enumerated device node */ PiInsertDevNode(DeviceNode, IopRootDeviceNode); + IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, &DeviceInstance); + + ZwClose(InstanceKey); done: ExFreePool(DeviceInstance.Buffer); @@ -1431,7 +1455,7 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, case PlugPlayControlInitializeDevice: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)) return STATUS_INVALID_PARAMETER; - return IopInitializeDevice((PPLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)Buffer); + return PiControlInitializeDevice((PPLUGPLAY_CONTROL_DEVICE_CONTROL_DATA)Buffer); case PlugPlayControlStartDevice: case PlugPlayControlResetDevice:

1 year, 6 months

[reactos] 02/03: [NTOS:PNP] Refactor PnpRootCreateDevice

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cac5b8c9e70abaea48f8… commit 6cac5b8c9e70abaea48f808cd9085418c2f33a74 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Jun 29 19:24:51 2023 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Jun 29 19:25:28 2023 +0300 [NTOS:PNP] Refactor PnpRootCreateDevice - Remove unused "DriverObject" argument - Make "FullInstancePath" mandatory - Extract the PDO creation into separate function, it will be used later --- ntoskrnl/include/internal/io.h | 7 +++-- ntoskrnl/io/pnpmgr/pnpreport.c | 7 +++-- ntoskrnl/io/pnpmgr/pnproot.c | 70 ++++++++++++++++++++++-------------------- 3 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index c4cb5c366cb..680e20ef4e0 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1063,12 +1063,15 @@ PnpRootDriverEntry( IN PUNICODE_STRING RegistryPath ); +NTSTATUS +PnpRootCreateDeviceObject( + OUT PDEVICE_OBJECT *DeviceObject); + NTSTATUS PnpRootCreateDevice( IN PUNICODE_STRING ServiceName, - IN OPTIONAL PDRIVER_OBJECT DriverObject, OUT PDEVICE_OBJECT *PhysicalDeviceObject, - OUT OPTIONAL PUNICODE_STRING FullInstancePath + OUT PUNICODE_STRING FullInstancePath ); NTSTATUS diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 9f6f06688bd..735760f8c4f 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -223,7 +223,7 @@ IoReportDetectedDevice( } /* We use the caller's PDO if they supplied one */ - UNICODE_STRING instancePath; + UNICODE_STRING instancePath = {0}; if (DeviceObject && *DeviceObject) { Pdo = *DeviceObject; @@ -231,7 +231,7 @@ IoReportDetectedDevice( else { /* Create the PDO */ - Status = PnpRootCreateDevice(&ServiceName, NULL, &Pdo, &instancePath); + Status = PnpRootCreateDevice(&ServiceName, &Pdo, &instancePath); if (!NT_SUCCESS(Status)) { DPRINT("PnpRootCreateDevice() failed (Status 0x%08lx)\n", Status); @@ -247,7 +247,8 @@ IoReportDetectedDevice( return STATUS_INSUFFICIENT_RESOURCES; } - Status = RtlDuplicateUnicodeString(0, &instancePath, &DeviceNode->InstancePath); + // The string comes from PnpRootCreateDevice, so it can be used right away + DeviceNode->InstancePath = instancePath; /* Open a handle to the instance path key */ Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index 4a9ae6607b5..b0948da4882 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -108,6 +108,7 @@ PnpRootRegisterDevice( IN PDEVICE_OBJECT DeviceObject) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension = &PnpRootDOExtension; + PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; PPNPROOT_DEVICE Device; PDEVICE_NODE DeviceNode; PWSTR InstancePath; @@ -147,6 +148,10 @@ PnpRootRegisterDevice( Device->Pdo = DeviceObject; + PdoDeviceExtension = DeviceObject->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); + PdoDeviceExtension->DeviceInfo = Device; + KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); InsertTailList(&DeviceExtension->DeviceListHead, &Device->ListEntry); @@ -158,13 +163,28 @@ PnpRootRegisterDevice( return STATUS_SUCCESS; } +NTSTATUS +PnpRootCreateDeviceObject( + OUT PDEVICE_OBJECT *DeviceObject) +{ + NTSTATUS status = IoCreateDevice( + IopRootDriverObject, + sizeof(PNPROOT_PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + DeviceObject); + + return status; +} + /* Creates a new PnP device for a legacy driver */ NTSTATUS PnpRootCreateDevice( IN PUNICODE_STRING ServiceName, - IN OPTIONAL PDRIVER_OBJECT DriverObject, OUT PDEVICE_OBJECT *PhysicalDeviceObject, - OUT OPTIONAL PUNICODE_STRING FullInstancePath) + OUT PUNICODE_STRING FullInstancePath) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; @@ -172,7 +192,6 @@ PnpRootCreateDevice( WCHAR InstancePath[5]; PPNPROOT_DEVICE Device = NULL; NTSTATUS Status; - UNICODE_STRING PathSep = RTL_CONSTANT_STRING(L"\\"); ULONG NextInstance; UNICODE_STRING EnumKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM); HANDLE EnumHandle, DeviceKeyHandle = NULL, InstanceKeyHandle; @@ -207,7 +226,7 @@ PnpRootCreateDevice( goto cleanup; } RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); - Device->DeviceID = DevicePath; + Device->DeviceID = DevicePath; // "Root\<service_name>" RtlInitEmptyUnicodeString(&DevicePath, NULL, 0); Status = IopOpenRegistryKeyEx(&EnumHandle, NULL, &EnumKeyName, KEY_READ); @@ -278,6 +297,7 @@ tryagain: goto cleanup; } + // "0000" or higher if (!RtlCreateUnicodeString(&Device->InstanceID, InstancePath)) { Status = STATUS_NO_MEMORY; @@ -300,31 +320,22 @@ tryagain: /* Just close the handle */ ObCloseHandle(InstanceKeyHandle, KernelMode); - if (FullInstancePath) + // generate the full device instance path + FullInstancePath->MaximumLength = Device->DeviceID.Length + sizeof(L'\\') + Device->InstanceID.Length; + FullInstancePath->Length = 0; + FullInstancePath->Buffer = ExAllocatePool(PagedPool, FullInstancePath->MaximumLength); + if (!FullInstancePath->Buffer) { - FullInstancePath->MaximumLength = Device->DeviceID.Length + PathSep.Length + Device->InstanceID.Length; - FullInstancePath->Length = 0; - FullInstancePath->Buffer = ExAllocatePool(PagedPool, FullInstancePath->MaximumLength); - if (!FullInstancePath->Buffer) - { - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - RtlAppendUnicodeStringToString(FullInstancePath, &Device->DeviceID); - RtlAppendUnicodeStringToString(FullInstancePath, &PathSep); - RtlAppendUnicodeStringToString(FullInstancePath, &Device->InstanceID); + Status = STATUS_NO_MEMORY; + goto cleanup; } + RtlAppendUnicodeStringToString(FullInstancePath, &Device->DeviceID); + RtlAppendUnicodeToString(FullInstancePath, L"\\"); + RtlAppendUnicodeStringToString(FullInstancePath, &Device->InstanceID); + /* Initialize a device object */ - Status = IoCreateDevice( - DriverObject ? DriverObject : IopRootDeviceNode->PhysicalDeviceObject->DriverObject, - sizeof(PNPROOT_PDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &Device->Pdo); + Status = PnpRootCreateDeviceObject(&Device->Pdo); if (!NT_SUCCESS(Status)) { DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); @@ -923,14 +934,7 @@ PnpRootQueryDeviceRelations( { /* Create a physical device object for the * device as it does not already have one */ - Status = IoCreateDevice( - DeviceObject->DriverObject, - sizeof(PNPROOT_PDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &Device->Pdo); + Status = PnpRootCreateDeviceObject(&Device->Pdo); if (!NT_SUCCESS(Status)) { DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status);

1 year, 6 months

[reactos] 01/03: [NTOS:PNP] Do not create an extra "PDO" device inside PnP root driver

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbf64c0cc49c3f1ab6514… commit bbf64c0cc49c3f1ab651435c4ed8b6519ecbd84b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 26 01:47:40 2023 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Jun 29 19:25:25 2023 +0300 [NTOS:PNP] Do not create an extra "PDO" device inside PnP root driver The root device object is in fact a PDO and a FDO at the same time. Thus there is no need in creating two device objects here, one is enough. This commit also removes the explicit device extension for the root DO, because the only reason it existed is to distinguish the root driver's FDO from its PDOs. This can easily be done by comparing with IopRootDeviceNode. Also collect some unused garbage while we are here. --- ntoskrnl/include/internal/io.h | 3 + ntoskrnl/io/pnpmgr/pnpinit.c | 16 +--- ntoskrnl/io/pnpmgr/pnproot.c | 171 ++++++++--------------------------------- 3 files changed, 37 insertions(+), 153 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 13b0b6364ea..c4cb5c366cb 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1075,6 +1075,9 @@ NTSTATUS PnpRootRegisterDevice( IN PDEVICE_OBJECT DeviceObject); +VOID +PnpRootInitializeDevExtension(VOID); + // // Driver Routines // diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index b1a5e24c8e5..7c7c1209fd2 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -14,12 +14,6 @@ /* GLOBALS ********************************************************************/ -typedef struct _IOPNP_DEVICE_EXTENSION -{ - PWCHAR CompatibleIdList; - ULONG CompatibleIdListSize; -} IOPNP_DEVICE_EXTENSION, *PIOPNP_DEVICE_EXTENSION; - PUNICODE_STRING PiInitGroupOrderTable; USHORT PiInitGroupOrderTableCount; INTERFACE_TYPE PnpDefaultInterfaceType; @@ -412,7 +406,7 @@ IopInitializePlugPlayServices(VOID) /* Create the root PDO */ Status = IoCreateDevice(IopRootDriverObject, - sizeof(IOPNP_DEVICE_EXTENSION), + 0, NULL, FILE_DEVICE_CONTROLLER, 0, @@ -441,9 +435,7 @@ IopInitializePlugPlayServices(VOID) KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } - /* Call the add device routine */ - IopRootDriverObject->DriverExtension->AddDevice(IopRootDriverObject, - IopRootDeviceNode->PhysicalDeviceObject); + PnpRootInitializeDevExtension(); PiSetDevNodeState(IopRootDeviceNode, DeviceNodeStarted); @@ -457,7 +449,7 @@ IopInitializePlugPlayServices(VOID) ExInitializeFastMutex(&PnpBusTypeGuidList->Lock); /* Initialize PnP root relations (this is a syncronous operation) */ - PiQueueDeviceAction(IopRootDeviceNode->PhysicalDeviceObject, PiActionEnumRootDevices, NULL, NULL); + PiQueueDeviceAction(Pdo, PiActionEnumRootDevices, NULL, NULL); /* Launch the firmware mapper */ Status = IopUpdateRootKey(); @@ -467,7 +459,7 @@ IopInitializePlugPlayServices(VOID) NtClose(KeyHandle); /* Initialize PnP root relations (this is a syncronous operation) */ - PiQueueDeviceAction(IopRootDeviceNode->PhysicalDeviceObject, PiActionEnumRootDevices, NULL, NULL); + PiQueueDeviceAction(Pdo, PiActionEnumRootDevices, NULL, NULL); /* We made it */ return STATUS_SUCCESS; diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index 58d740b7d3b..4a9ae6607b5 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -38,26 +38,9 @@ typedef struct _PNPROOT_DEVICE ULONG ResourceListSize; } PNPROOT_DEVICE, *PPNPROOT_DEVICE; -typedef enum -{ - dsStopped, - dsStarted, - dsPaused, - dsRemoved, - dsSurpriseRemoved -} PNPROOT_DEVICE_STATE; - -typedef struct _PNPROOT_COMMON_DEVICE_EXTENSION -{ - // Wether this device extension is for an FDO or PDO - BOOLEAN IsFDO; -} PNPROOT_COMMON_DEVICE_EXTENSION, *PPNPROOT_COMMON_DEVICE_EXTENSION; - /* Physical Device Object device extension for a child device */ typedef struct _PNPROOT_PDO_DEVICE_EXTENSION { - // Common device data - PNPROOT_COMMON_DEVICE_EXTENSION Common; // Informations about the device PPNPROOT_DEVICE DeviceInfo; } PNPROOT_PDO_DEVICE_EXTENSION, *PPNPROOT_PDO_DEVICE_EXTENSION; @@ -65,12 +48,6 @@ typedef struct _PNPROOT_PDO_DEVICE_EXTENSION /* Physical Device Object device extension for the Root bus device object */ typedef struct _PNPROOT_FDO_DEVICE_EXTENSION { - // Common device data - PNPROOT_COMMON_DEVICE_EXTENSION Common; - // Lower device object - PDEVICE_OBJECT Ldo; - // Current state of the driver - PNPROOT_DEVICE_STATE State; // Namespace device list LIST_ENTRY DeviceListHead; // Number of (not removed) devices in device list @@ -85,7 +62,7 @@ typedef struct _BUFFER PULONG Length; } BUFFER, *PBUFFER; -static PDEVICE_OBJECT PnpRootDeviceObject = NULL; +static PNPROOT_FDO_DEVICE_EXTENSION PnpRootDOExtension; /* FUNCTIONS *****************************************************************/ @@ -130,7 +107,7 @@ NTSTATUS PnpRootRegisterDevice( IN PDEVICE_OBJECT DeviceObject) { - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension = PnpRootDeviceObject->DeviceExtension; + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension = &PnpRootDOExtension; PPNPROOT_DEVICE Device; PDEVICE_NODE DeviceNode; PWSTR InstancePath; @@ -202,7 +179,7 @@ PnpRootCreateDevice( RTL_QUERY_REGISTRY_TABLE QueryTable[2]; OBJECT_ATTRIBUTES ObjectAttributes; - DeviceExtension = PnpRootDeviceObject->DeviceExtension; + DeviceExtension = &PnpRootDOExtension; KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); DPRINT("Creating a PnP root device for service '%wZ'\n", ServiceName); @@ -341,7 +318,7 @@ tryagain: /* Initialize a device object */ Status = IoCreateDevice( - DriverObject ? DriverObject : PnpRootDeviceObject->DriverObject, + DriverObject ? DriverObject : IopRootDeviceNode->PhysicalDeviceObject->DriverObject, sizeof(PNPROOT_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_CONTROLLER, @@ -357,7 +334,6 @@ tryagain: PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); - PdoDeviceExtension->Common.IsFDO = FALSE; PdoDeviceExtension->DeviceInfo = Device; Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; @@ -679,7 +655,7 @@ EnumerateDevices( DPRINT("EnumerateDevices(FDO %p)\n", DeviceObject); - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = &PnpRootDOExtension; KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); /* Should hold most key names, but we reallocate below if it's too small */ @@ -909,7 +885,7 @@ PnpRootQueryDeviceRelations( return Status; } - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = &PnpRootDOExtension; Size = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) * DeviceExtension->DeviceListCount; if (OtherRelations) @@ -963,7 +939,6 @@ PnpRootQueryDeviceRelations( PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); - PdoDeviceExtension->Common.IsFDO = FALSE; PdoDeviceExtension->DeviceInfo = Device; Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; @@ -1010,11 +985,9 @@ PnpRootFdoPnpControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION IrpSp; NTSTATUS Status; - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1025,29 +998,9 @@ PnpRootFdoPnpControl( Status = PnpRootQueryDeviceRelations(DeviceObject, Irp); break; - case IRP_MN_START_DEVICE: - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - if (!IoForwardIrpSynchronously(DeviceExtension->Ldo, Irp)) - Status = STATUS_UNSUCCESSFUL; - else - { - Status = Irp->IoStatus.Status; - if (NT_SUCCESS(Status)) - DeviceExtension->State = dsStarted; - } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - - case IRP_MN_STOP_DEVICE: - DPRINT("IRP_MJ_PNP / IRP_MN_STOP_DEVICE\n"); - /* Root device cannot be stopped */ - Irp->IoStatus.Status = Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - default: + // The root device object can receive only IRP_MN_QUERY_DEVICE_RELATIONS + ASSERT(FALSE); DPRINT("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); break; } @@ -1330,7 +1283,7 @@ PnpRootPdoPnpControl( NTSTATUS Status; DeviceExtension = DeviceObject->DeviceExtension; - FdoDeviceExtension = PnpRootDeviceObject->DeviceExtension; + FdoDeviceExtension = &PnpRootDOExtension; Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1439,12 +1392,9 @@ PnpRootPnpControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DeviceExtension = (PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->IsFDO) + if (IopRootDeviceNode == IopGetDeviceNode(DeviceObject)) Status = PnpRootFdoPnpControl(DeviceObject, Irp); else Status = PnpRootPdoPnpControl(DeviceObject, Irp); @@ -1465,100 +1415,39 @@ PnpRootPowerControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - - DeviceExtension = DeviceObject->DeviceExtension; - Status = Irp->IoStatus.Status; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - /* - * We must handle power IRPs based on whether it is a function driver - * or not from the device extension, so it cannot be NULL. - */ - ASSERT(DeviceExtension); + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status = Irp->IoStatus.Status; - if (DeviceExtension->Common.IsFDO) - { - ASSERT(!DeviceExtension->Common.IsFDO); - PoStartNextPowerIrp(Irp); - IoCopyCurrentIrpStackLocationToNext(Irp); - Status = PoCallDriver(DeviceExtension->Ldo, Irp); - } - else + switch (IrpSp->MinorFunction) { - switch (IrpSp->MinorFunction) - { - case IRP_MN_QUERY_POWER: - case IRP_MN_SET_POWER: - Status = STATUS_SUCCESS; - break; - } - Irp->IoStatus.Status = Status; - PoStartNextPowerIrp(Irp); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + case IRP_MN_QUERY_POWER: + case IRP_MN_SET_POWER: + Status = STATUS_SUCCESS; + break; } + Irp->IoStatus.Status = Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } +VOID +PnpRootInitializeDevExtension(VOID) +{ + PnpRootDOExtension.DeviceListCount = 0; + InitializeListHead(&PnpRootDOExtension.DeviceListHead); + KeInitializeGuardedMutex(&PnpRootDOExtension.DeviceListLock); +} + NTSTATUS NTAPI PnpRootAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DPRINT("PnpRootAddDevice(DriverObject %p, Pdo %p)\n", DriverObject, PhysicalDeviceObject); - - if (!PhysicalDeviceObject) - { - DPRINT("PhysicalDeviceObject 0x%p\n", PhysicalDeviceObject); - Status = STATUS_INSUFFICIENT_RESOURCES; - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IoCreateDevice( - DriverObject, - sizeof(PNPROOT_FDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_DEVICE_SECURE_OPEN, - TRUE, - &PnpRootDeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - DPRINT("Created FDO %p\n", PnpRootDeviceObject); - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(PNPROOT_FDO_DEVICE_EXTENSION)); - - DeviceExtension->Common.IsFDO = TRUE; - DeviceExtension->State = dsStopped; - InitializeListHead(&DeviceExtension->DeviceListHead); - DeviceExtension->DeviceListCount = 0; - KeInitializeGuardedMutex(&DeviceExtension->DeviceListLock); - - Status = IoAttachDeviceToDeviceStackSafe( - PnpRootDeviceObject, - PhysicalDeviceObject, - &DeviceExtension->Ldo); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - PnpRootDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - DPRINT("Done AddDevice()\n"); - + // AddDevice must never be called for the root driver + ASSERT(FALSE); return STATUS_SUCCESS; }

1 year, 6 months

[reactos] 01/01: [UMPNPMGR] PNP_Get(First/Next)LogConf: return proper tags for the resource list case

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1eb9e3620b03e753f7a4… commit e1eb9e3620b03e753f7a4755cbcf4fcb786da5e2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 29 18:06:02 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 29 18:06:02 2023 +0200 [UMPNPMGR] PNP_Get(First/Next)LogConf: return proper tags for the resource list case --- base/services/umpnpmgr/rpcserver.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 355bd75e4e3..4e57e261e13 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -4237,7 +4237,7 @@ PNP_GetFirstLogConf( goto done; } - DPRINT("Data size %lu\n", ulDataSize); + DPRINT1("Data size %lu\n", ulDataSize); if (ulDataSize == 0 || lpData == NULL) { DPRINT1("No config data available!\n"); @@ -4248,21 +4248,15 @@ PNP_GetFirstLogConf( /* Get the first tag */ if (RegDataType == REG_RESOURCE_LIST) { - DPRINT("REG_RESOURCE_LIST\n"); + DPRINT("REG_RESOURCE_LIST->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count); - DPRINT("ResourceList->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count); + /* Indicate that we reached the end of the list */ if (((PCM_RESOURCE_LIST)lpData)->Count == 0) { DPRINT1("No resource descriptors!\n"); ret = CR_NO_MORE_LOG_CONF; goto done; } - - DPRINT("lpData %p\n", lpData); - DPRINT("&List[0] %p\n", &(((PCM_RESOURCE_LIST)lpData)->List[0])); - - *pulLogConfTag = (DWORD)((DWORD_PTR)&(((PCM_RESOURCE_LIST)lpData)->List[0]) - (DWORD_PTR)lpData); - DPRINT("Offset (Tag): 0x%08lx\n", *pulLogConfTag); } else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) { @@ -4347,13 +4341,24 @@ PNP_GetNextLogConf( goto done; } - /* FIXME: Get the next tag */ + /* Check if the next entry is available */ if (RegDataType == REG_RESOURCE_LIST) { - DPRINT1("FIXME: REG_RESOURCE_LIST\n"); - /* FIXME */ - ret = CR_NO_MORE_LOG_CONF; - goto done; + DPRINT("REG_RESOURCE_LIST->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count); + + /* Fail, if we are beyond the end of the list */ + if (ulCurrentTag >= ((PCM_RESOURCE_LIST)lpData)->Count) + { + ret = CR_INVALID_LOG_CONF; + goto done; + } + + /* Indicate that we reached the end of the list */ + if (ulCurrentTag == ((PCM_RESOURCE_LIST)lpData)->Count - 1) + { + ret = CR_NO_MORE_LOG_CONF; + goto done; + } } else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) { @@ -4363,6 +4368,9 @@ PNP_GetNextLogConf( goto done; } + /* Return the next tag value */ + *pulNextTag = ulCurrentTag + 1; + done: if (lpData != NULL) HeapFree(GetProcessHeap(), 0, lpData);

1 year, 6 months

[reactos] 01/01: [BROWSEUI] Add status bar view state persistence (#5366)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=209439a5aed328b59cd52… commit 209439a5aed328b59cd52c0c54901a7ca5033af8 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Jun 29 09:50:43 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 29 18:50:43 2023 +0300 [BROWSEUI] Add status bar view state persistence (#5366) - Use `HKCU\Software\Microsoft\Internet Explorer\Main\StatusBarOther` registry key for the setting persistence. - Set its value to 1 when the status bar is visible, and to 0 when the status bar is hidden. - Query it when the file browser is initialized to set the correct view state for the status bar. - Set the default state of the status bar to hidden if the registry key does not exist, matching the behavior of Windows Server 2003. CORE-19010 --- dll/win32/browseui/shellbrowser.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index b12fc20e82d..3aec6c38272 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -709,7 +709,10 @@ CShellBrowser::CShellBrowser() fCurrentShellViewWindow = NULL; fCurrentDirectoryPIDL = NULL; fStatusBar = NULL; - fStatusBarVisible = true; + fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"StatusBarOther", + FALSE, + FALSE); fCurrentMenuBar = NULL; fHistoryObject = NULL; fHistoryStream = NULL; @@ -788,8 +791,6 @@ HRESULT CShellBrowser::Initialize() fStatusBar = CreateWindow(STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, _AtlBaseModule.GetModuleInstance(), 0); - fStatusBarVisible = true; - ShowWindow(SW_SHOWNORMAL); UpdateWindow(); @@ -3663,6 +3664,15 @@ LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND ::ShowWindow(fStatusBar, fStatusBarVisible ? SW_SHOW : SW_HIDE); RepositionBars(); } + + DWORD dwStatusBarVisible = fStatusBarVisible; + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"StatusBarOther", + REG_DWORD, + &dwStatusBarVisible, + sizeof(dwStatusBarVisible), + SHREGSET_FORCE_HKCU); + return 0; }

1 year, 6 months

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