Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [FONTS] Add Selawik as a substitution for Segoe UI

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97fb49a3d2bfdbbf5f03e… commit 97fb49a3d2bfdbbf5f03e193f922a80dd39ca9ba Author: William Kent <wjk011(a)gmail.com> AuthorDate: Sun Apr 26 08:31:16 2020 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 15:31:16 2020 +0300 [FONTS] Add Selawik as a substitution for Segoe UI --- base/setup/lib/muifonts.h | 1 + boot/bootdata/livecd.inf | 1 + media/fonts/CMakeLists.txt | 5 ++ media/fonts/Selawik-Bold.ttf | Bin 0 -> 58228 bytes media/fonts/Selawik-ExtraLight.ttf | Bin 0 -> 58956 bytes media/fonts/Selawik-Light.ttf | Bin 0 -> 59240 bytes media/fonts/Selawik-Regular.ttf | Bin 0 -> 58284 bytes media/fonts/Selawik-SemiBold.ttf | Bin 0 -> 58448 bytes media/fonts/doc/Selawik/LICENSE.txt | 93 ++++++++++++++++++++++++++++++++++++ media/fonts/doc/Selawik/README.txt | 3 ++ 10 files changed, 103 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 258cae7e1b5..30ccfa87899 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -29,6 +29,7 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, + { L"Segoe UI", L"Selawik" }, { NULL, NULL } }; diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index eae91147fa4..363066e595d 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -58,6 +58,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI",0x00000000,"Selawik" ; FIXME: Registration diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index ef0284283c6..159eec1f7cc 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -37,6 +37,11 @@ list(APPEND FONT_FILES palab.ttf palabi.ttf palai.ttf + Selawik-Regular.ttf + Selawik-SemiBold.ttf + Selawik-Bold.ttf + Selawik-Light.ttf + Selawik-ExtraLight.ttf SourceSansPro-Regular.ttf SourceSansPro-Bold.ttf SourceSansPro-BoldIt.ttf diff --git a/media/fonts/Selawik-Bold.ttf b/media/fonts/Selawik-Bold.ttf new file mode 100644 index 00000000000..7f5484094a0 Binary files /dev/null and b/media/fonts/Selawik-Bold.ttf differ diff --git a/media/fonts/Selawik-ExtraLight.ttf b/media/fonts/Selawik-ExtraLight.ttf new file mode 100644 index 00000000000..cff82b75a52 Binary files /dev/null and b/media/fonts/Selawik-ExtraLight.ttf differ diff --git a/media/fonts/Selawik-Light.ttf b/media/fonts/Selawik-Light.ttf new file mode 100644 index 00000000000..bf01cf4ccfd Binary files /dev/null and b/media/fonts/Selawik-Light.ttf differ diff --git a/media/fonts/Selawik-Regular.ttf b/media/fonts/Selawik-Regular.ttf new file mode 100644 index 00000000000..a474725c9d5 Binary files /dev/null and b/media/fonts/Selawik-Regular.ttf differ diff --git a/media/fonts/Selawik-SemiBold.ttf b/media/fonts/Selawik-SemiBold.ttf new file mode 100644 index 00000000000..069bd1adf14 Binary files /dev/null and b/media/fonts/Selawik-SemiBold.ttf differ diff --git a/media/fonts/doc/Selawik/LICENSE.txt b/media/fonts/doc/Selawik/LICENSE.txt new file mode 100644 index 00000000000..7525d224635 --- /dev/null +++ b/media/fonts/doc/Selawik/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2015, Microsoft Corporation (www.microsoft.com), with Reserved Font Name Selawik. All Rights Reserved. Selawik is a trademark of Microsoft Corporation in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media/fonts/doc/Selawik/README.txt b/media/fonts/doc/Selawik/README.txt new file mode 100644 index 00000000000..06d41c97555 --- /dev/null +++ b/media/fonts/doc/Selawik/README.txt @@ -0,0 +1,3 @@ +The Selawik font files come from this GitHub repo: + +https://github.com/vv-monsalve/Selawik/tree/QA-Selawik

4 years, 5 months

[reactos] 02/02: [SHELL32] DoGetProductType(): Use RegGetValueW()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7e4d66be52c7affd7ee1… commit a7e4d66be52c7affd7ee1f0ea88a72b1c625d423 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Feb 13 03:25:42 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 14:16:59 2020 +0200 [SHELL32] DoGetProductType(): Use RegGetValueW() instead of RegQueryValueExW(), to enforce a null terminator. Addendum to 9f4e8ef25b53d27494efab569288452fbaa1cdfa. --- dll/win32/shell32/wine/shellpath.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 17a6877edad..892748d56b7 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -70,8 +70,8 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) static const WCHAR ProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; HKEY hKey; LONG error; - WCHAR szValue[32]; - DWORD cbValue, dwType; + WCHAR szValue[9]; + DWORD cbValue; static DWORD s_dwProductType = 0; if (s_dwProductType != 0) @@ -87,8 +87,8 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) return FALSE; cbValue = sizeof(szValue); - error = RegQueryValueExW(hKey, L"ProductType", NULL, &dwType, (LPBYTE)szValue, &cbValue); - if (!error && dwType == REG_SZ) + error = RegGetValueW(hKey, NULL, L"ProductType", RRF_RT_REG_SZ, NULL, (PVOID)szValue, &cbValue); + if (!error) { if (lstrcmpW(szValue, L"WinNT") == 0) *ProductType = NtProductWinNt;

4 years, 5 months

[reactos] 01/02: [ROSPERF] PrintOSVersion(): Fix RegQueryValueExW() use

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2505bd3a4312f42a413cf… commit 2505bd3a4312f42a413cfc2e06b2227f92183126 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Feb 13 03:25:42 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 14:16:59 2020 +0200 [ROSPERF] PrintOSVersion(): Fix RegQueryValueExW() use --- .../applications/sysutils/utils/rosperf/rosperf.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/rosperf/rosperf.c b/modules/rosapps/applications/sysutils/utils/rosperf/rosperf.c index 8f9acf4c7be..85fa34e1cb3 100644 --- a/modules/rosapps/applications/sysutils/utils/rosperf/rosperf.c +++ b/modules/rosapps/applications/sysutils/utils/rosperf/rosperf.c @@ -290,12 +290,11 @@ ProcessTest(PTEST Test, PPERF_INFO PerfInfo) static void PrintOSVersion(void) { -#define BUFSIZE 160 OSVERSIONINFOEXW VersionInfo; BOOL OsVersionInfoEx; HKEY hKey; - WCHAR ProductType[BUFSIZE]; - DWORD BufLen; + WCHAR ProductType[9] = { L'\0' }; + DWORD BufLen, dwType; LONG Ret; unsigned RosVersionLen; LPWSTR RosVersion; @@ -423,8 +422,6 @@ PrintOSVersion(void) } else /* Test for specific product on Windows NT 4.0 SP5 and earlier */ { - BufLen = BUFSIZE; - Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_QUERY_VALUE, &hKey); @@ -433,15 +430,17 @@ PrintOSVersion(void) return; } - Ret = RegQueryValueExW(hKey, L"ProductType", NULL, NULL, + BufLen = sizeof(ProductType); + Ret = RegQueryValueExW(hKey, L"ProductType", NULL, &dwType, (LPBYTE) ProductType, &BufLen); - if (ERROR_SUCCESS != Ret || BUFSIZE < BufLen) + + RegCloseKey(hKey); + + if (Ret != ERROR_SUCCESS || dwType != REG_SZ) { return; } - RegCloseKey(hKey); - if (0 == lstrcmpiW(L"WINNT", ProductType)) { wprintf(L"Workstation ");

4 years, 5 months

[reactos] 01/01: [UTILMAN] Properly annotate some variables (#2561)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4f70e5434af2b6dfaac0… commit e4f70e5434af2b6dfaac02f39f2afad2bb5a997a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 26 14:14:17 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 14:14:17 2020 +0200 [UTILMAN] Properly annotate some variables (#2561) Previously the code had a mixture of 'sz', 'wsz', 'lp' and 'lpwsz' Hungarian annotation prefixes which could bring confusions about the nature of the annotated variables. From now on all of these variables have a well defined annotation. Furthermore, add a missing argument annotation to LaunchProcess(). --- base/applications/utilman/umandlg/about.c | 6 +++--- base/applications/utilman/umandlg/process.c | 22 +++++++++---------- base/applications/utilman/umandlg/registry.c | 32 ++++++++++++++-------------- base/applications/utilman/umandlg/umandlg.c | 14 ++++++------ base/applications/utilman/umandlg/umandlg.h | 32 ++++++++++++++-------------- base/applications/utilman/utilman.c | 14 ++++++------ 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/base/applications/utilman/umandlg/about.c b/base/applications/utilman/umandlg/about.c index 84615679c09..ea66987296a 100644 --- a/base/applications/utilman/umandlg/about.c +++ b/base/applications/utilman/umandlg/about.c @@ -43,11 +43,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: { - WCHAR wszAppPath[MAX_BUFFER]; + WCHAR szAppPath[MAX_BUFFER]; /* Extract the icon resource from the executable process */ - GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath)); - Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0); + GetModuleFileNameW(NULL, szAppPath, _countof(szAppPath)); + Globals.hIcon = ExtractIconW(Globals.hInstance, szAppPath, 0); /* Set the icon within the dialog's title bar */ if (Globals.hIcon) diff --git a/base/applications/utilman/umandlg/process.c b/base/applications/utilman/umandlg/process.c index c5444ff2883..ab3403ffa39 100644 --- a/base/applications/utilman/umandlg/process.c +++ b/base/applications/utilman/umandlg/process.c @@ -16,14 +16,14 @@ * * Returns the process executable ID based on the given executable name. * - * @param[in] lpProcessName + * @param[in] lpszProcessName * The name of the executable process. * * @return * Returns the ID number of the process, otherwise 0. * */ -DWORD GetProcessID(IN LPCWSTR lpProcessName) +DWORD GetProcessID(IN LPCWSTR lpszProcessName) { PROCESSENTRY32W Process; @@ -41,7 +41,7 @@ DWORD GetProcessID(IN LPCWSTR lpProcessName) { do { - if (_wcsicmp(Process.szExeFile, lpProcessName) == 0) + if (_wcsicmp(Process.szExeFile, lpszProcessName) == 0) { /* The names match, return the process ID we're interested */ CloseHandle(hSnapshot); @@ -60,7 +60,7 @@ DWORD GetProcessID(IN LPCWSTR lpProcessName) * * Checks if a process is running. * - * @param[in] lpProcessName + * @param[in] lpszProcessName * The name of the executable process. * * @return @@ -68,13 +68,13 @@ DWORD GetProcessID(IN LPCWSTR lpProcessName) * FALSE otherwise. * */ -BOOL IsProcessRunning(IN LPCWSTR lpProcessName) +BOOL IsProcessRunning(IN LPCWSTR lpszProcessName) { DWORD dwReturn, dwProcessID; HANDLE hProcess; /* Get the process ID */ - dwProcessID = GetProcessID(lpProcessName); + dwProcessID = GetProcessID(lpszProcessName); if (dwProcessID == 0) { return FALSE; @@ -114,7 +114,7 @@ BOOL IsProcessRunning(IN LPCWSTR lpProcessName) * FALSE otherwise. * */ -BOOL LaunchProcess(LPCWSTR lpProcessName) +BOOL LaunchProcess(IN LPCWSTR lpszProcessName) { STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -123,7 +123,7 @@ BOOL LaunchProcess(LPCWSTR lpProcessName) WCHAR ExpandedCmdLine[MAX_PATH]; /* Expand the process path string */ - ExpandEnvironmentStringsW(lpProcessName, ExpandedCmdLine, ARRAYSIZE(ExpandedCmdLine)); + ExpandEnvironmentStringsW(lpszProcessName, ExpandedCmdLine, ARRAYSIZE(ExpandedCmdLine)); ZeroMemory(&pi, sizeof(pi)); ZeroMemory(&si, sizeof(si)); @@ -181,7 +181,7 @@ BOOL LaunchProcess(LPCWSTR lpProcessName) * * Closes a process. * - * @param[in] lpProcessName + * @param[in] lpszProcessName * The name of the executable process. * * @return @@ -189,13 +189,13 @@ BOOL LaunchProcess(LPCWSTR lpProcessName) * FALSE otherwise. * */ -BOOL CloseProcess(IN LPCWSTR lpProcessName) +BOOL CloseProcess(IN LPCWSTR lpszProcessName) { HANDLE hProcess; DWORD dwProcessID; /* Get the process ID */ - dwProcessID = GetProcessID(lpProcessName); + dwProcessID = GetProcessID(lpszProcessName); if (dwProcessID == 0) { return FALSE; diff --git a/base/applications/utilman/umandlg/registry.c b/base/applications/utilman/umandlg/registry.c index bd96d3592a4..f00d8948221 100644 --- a/base/applications/utilman/umandlg/registry.c +++ b/base/applications/utilman/umandlg/registry.c @@ -34,7 +34,7 @@ REGISTRY_SETTINGS Settings; * @param[in] hPredefinedKey * The predefined key (e.g. HKEY_CLASSES_ROOT). * - * @param[in] lpwszSubKey + * @param[in] lpszSubKey * The path to the sub key to be created. * * @param[out] phKey @@ -49,14 +49,14 @@ REGISTRY_SETTINGS Settings; * */ BOOL InitAppRegKey(IN HKEY hPredefinedKey, - IN LPCWSTR lpwszSubKey, + IN LPCWSTR lpszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition) { LONG lResult; lResult = RegCreateKeyExW(hPredefinedKey, - lpwszSubKey, + lpszSubKey, 0, NULL, 0, @@ -66,7 +66,7 @@ BOOL InitAppRegKey(IN HKEY hPredefinedKey, lpdwDisposition); if (lResult != ERROR_SUCCESS) { - DPRINT("InitAppRegKey(): Failed to create the following key (or open the key) of path \"%S\". The error code is \"%li\".\n", lpwszSubKey, lResult); + DPRINT("InitAppRegKey(): Failed to create the following key (or open the key) of path \"%S\". The error code is \"%li\".\n", lpszSubKey, lResult); return FALSE; } @@ -81,10 +81,10 @@ BOOL InitAppRegKey(IN HKEY hPredefinedKey, * @param[in] hKey * A handle to a key. * - * @param[in] lpwszSubKey + * @param[in] lpszSubKey * The path to a sub-key. * - * @param[in] lpwszRegValue + * @param[in] lpszRegValue * The registry value where we need to get the data from. * * @param[out] ReturnedData @@ -101,8 +101,8 @@ BOOL InitAppRegKey(IN HKEY hPredefinedKey, * */ BOOL QueryAppSettings(IN HKEY hKey, - IN LPCWSTR lpwszSubKey, - IN LPCWSTR lpwszRegValue, + IN LPCWSTR lpszSubKey, + IN LPCWSTR lpszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData) { @@ -110,25 +110,25 @@ BOOL QueryAppSettings(IN HKEY hKey, HKEY hKeyQueryValue; lResult = RegOpenKeyExW(hKey, - lpwszSubKey, + lpszSubKey, 0, KEY_READ, &hKeyQueryValue); if (lResult != ERROR_SUCCESS) { - DPRINT("QueryAppSettings(): Failed to open the key of path \"%S\". The error code is \"%li\".\n", lpwszSubKey, lResult); + DPRINT("QueryAppSettings(): Failed to open the key of path \"%S\". The error code is \"%li\".\n", lpszSubKey, lResult); return FALSE; } lResult = RegQueryValueExW(hKeyQueryValue, - lpwszRegValue, + lpszRegValue, NULL, NULL, (LPBYTE)&ReturnedData, lpdwSizeData); if (lResult != ERROR_SUCCESS) { - DPRINT("QueryAppSettings(): Failed to query the data from value \"%S\". The error code is \"%li\".\n", lpwszRegValue, lResult); + DPRINT("QueryAppSettings(): Failed to query the data from value \"%S\". The error code is \"%li\".\n", lpszRegValue, lResult); RegCloseKey(hKeyQueryValue); return FALSE; } @@ -145,7 +145,7 @@ BOOL QueryAppSettings(IN HKEY hKey, * @param[in] hKey * A handle to a key. * - * @param[in] lpwszRegValue + * @param[in] lpszRegValue * The path to the sub key where the value needs to be created. * * @param[out] dwRegType @@ -165,7 +165,7 @@ BOOL QueryAppSettings(IN HKEY hKey, * */ BOOL SaveAppSettings(IN HKEY hKey, - IN LPCWSTR lpwszRegValue, + IN LPCWSTR lpszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize) @@ -185,14 +185,14 @@ BOOL SaveAppSettings(IN HKEY hKey, } lResult = RegSetValueExW(hKeySetValue, - lpwszRegValue, + lpszRegValue, 0, dwRegType, (LPBYTE)&Data, cbSize); if (lResult != ERROR_SUCCESS) { - DPRINT("SaveAppSettings(): Failed to set the \"%S\" value with data, the error code is \"%li\"!\n", lpwszRegValue, lResult); + DPRINT("SaveAppSettings(): Failed to set the \"%S\" value with data, the error code is \"%li\"!\n", lpszRegValue, lResult); RegCloseKey(hKeySetValue); return FALSE; } diff --git a/base/applications/utilman/umandlg/umandlg.c b/base/applications/utilman/umandlg/umandlg.c index 694ae06c030..0902f3b972f 100644 --- a/base/applications/utilman/umandlg/umandlg.c +++ b/base/applications/utilman/umandlg/umandlg.c @@ -65,7 +65,7 @@ VOID InitUtilsList(BOOL bInitGui) /* Add the utilities in the listbox */ for (i = 0; i < _countof(EntriesList); ++i) { - bIsRunning = IsProcessRunning(EntriesList[i].lpProgram); + bIsRunning = IsProcessRunning(EntriesList[i].lpszProgram); EntriesList[i].bState = bIsRunning; /* Load the string and append the utility's name to the format */ @@ -99,7 +99,7 @@ BOOL DlgInitHandler(IN HWND hDlg) INT PosX, PosY; RECT rc; WCHAR szAboutDlg[MAX_BUFFER]; - WCHAR wszAppPath[MAX_BUFFER]; + WCHAR szAppPath[MAX_BUFFER]; HMENU hSysMenu; /* Save the dialog handle */ @@ -112,8 +112,8 @@ BOOL DlgInitHandler(IN HWND hDlg) SetWindowPos(hDlg, 0, PosX, PosY, 0, 0, SWP_NOZORDER | SWP_NOSIZE); /* Extract the icon resource from the executable process */ - GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath)); - Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0); + GetModuleFileNameW(NULL, szAppPath, _countof(szAppPath)); + Globals.hIcon = ExtractIconW(Globals.hInstance, szAppPath, 0); /* Set the icon within the dialog's title bar */ if (Globals.hIcon) @@ -213,7 +213,7 @@ INT ListBoxRefreshContents(VOID) for (i = 0; i < _countof(EntriesList); ++i) { /* Check the utility's state */ - bIsRunning = IsProcessRunning(EntriesList[i].lpProgram); + bIsRunning = IsProcessRunning(EntriesList[i].lpszProgram); if (bIsRunning != EntriesList[i].bState) { /* The utility's state has changed, save it */ @@ -315,11 +315,11 @@ INT_PTR APIENTRY DlgProc( } case IDC_START: - LaunchProcess(EntriesList[Globals.iSelectedIndex].lpProgram); + LaunchProcess(EntriesList[Globals.iSelectedIndex].lpszProgram); break; case IDC_STOP: - CloseProcess(EntriesList[Globals.iSelectedIndex].lpProgram); + CloseProcess(EntriesList[Globals.iSelectedIndex].lpszProgram); break; default: diff --git a/base/applications/utilman/umandlg/umandlg.h b/base/applications/utilman/umandlg/umandlg.h index d90b8520e26..6705761239b 100644 --- a/base/applications/utilman/umandlg/umandlg.h +++ b/base/applications/utilman/umandlg/umandlg.h @@ -44,7 +44,7 @@ typedef struct typedef struct _UTILMAN_STATE { - LPCWSTR lpProgram; + LPCWSTR lpszProgram; UINT uNameId; WCHAR szResource[MAX_BUFFER]; BOOL bState; @@ -53,15 +53,15 @@ typedef struct _UTILMAN_STATE typedef struct _REGISTRY_SETTINGS { /* Accessibility Registry settings */ - LPCWSTR wszAppPath; + LPCWSTR lpszAppPath; DWORD dwAppType; DWORD dwClientControlCode; - LPCWSTR wszAppName; - LPCWSTR wszErrorOnLaunch; + LPCWSTR lpszAppName; + LPCWSTR lpszErrorOnLaunch; BOOL bHideClient; BOOL bStartWithUtilman; BOOL bStartWithROS; - LPCWSTR wszHungRespondAction; + LPCWSTR lpszHungRespondAction; DWORD dwHungTimeOut; /* Utility Manager Registry settings */ @@ -71,12 +71,12 @@ typedef struct _REGISTRY_SETTINGS typedef struct _REGISTRY_DATA { /* On-Screen Keyboard Registry data */ - LPCWSTR lpwsOskPath; - LPCWSTR lpwszOskDisplayName; + LPCWSTR lpszOskPath; + LPCWSTR lpszOskDisplayName; /* Magnify Registry data */ - LPCWSTR lpwszMagnifyPath; - LPCWSTR lpwszMagnifyDisplayName; + LPCWSTR lpszMagnifyPath; + LPCWSTR lpszMagnifyDisplayName; } REGISTRY_DATA, *PREGISTRY_DATA; /* ENUMERATIONS ***************************************************************/ @@ -97,19 +97,19 @@ VOID CheckUtilityState(BOOL bUtilState); BOOL WINAPI UManStartDlg(VOID); /* process.c */ -DWORD GetProcessID(IN LPCWSTR lpProcessName); -BOOL IsProcessRunning(IN LPCWSTR lpProcessName); -BOOL LaunchProcess(LPCWSTR lpProcessName); -BOOL CloseProcess(IN LPCWSTR lpProcessName); +DWORD GetProcessID(IN LPCWSTR lpszProcessName); +BOOL IsProcessRunning(IN LPCWSTR lpszProcessName); +BOOL LaunchProcess(IN LPCWSTR lpszProcessName); +BOOL CloseProcess(IN LPCWSTR lpszProcessName); /* about.c */ VOID ShowAboutDlg(HWND hDlgParent); INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); /* registry.c */ -BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpwszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition); -BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpwszSubKey, IN LPCWSTR lpwszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData); -BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpwszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize); +BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition); +BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpszSubKey, IN LPCWSTR lpszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData); +BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize); /* Struct variable declaration */ extern UTILMAN_GLOBALS Globals; diff --git a/base/applications/utilman/utilman.c b/base/applications/utilman/utilman.c index a857b51eaa3..a99899e63b6 100644 --- a/base/applications/utilman/utilman.c +++ b/base/applications/utilman/utilman.c @@ -38,9 +38,9 @@ INT WINAPI wWinMain(IN HINSTANCE hInstance, IN INT nCmdShow) { HMODULE hModule; - WCHAR wszFormat[MAX_BUFFER]; - WCHAR wszFailLoad[MAX_BUFFER]; - WCHAR wszTitle[MAX_BUFFER]; + WCHAR szFormat[MAX_BUFFER]; + WCHAR szFailLoad[MAX_BUFFER]; + WCHAR szTitle[MAX_BUFFER]; EXECDLGROUTINE UManStartDlg; UNREFERENCED_PARAMETER(hPrevInstance); @@ -51,11 +51,11 @@ INT WINAPI wWinMain(IN HINSTANCE hInstance, hModule = LoadLibraryW(L"UManDlg.dll"); if (!hModule) { - LoadStringW(hInstance, IDS_FAIL_INIT, wszFormat, _countof(wszFormat)); - LoadStringW(hInstance, IDS_FAIL_INIT_TITLE, wszTitle, _countof(wszTitle)); + LoadStringW(hInstance, IDS_FAIL_INIT, szFormat, _countof(szFormat)); + LoadStringW(hInstance, IDS_FAIL_INIT_TITLE, szTitle, _countof(szTitle)); - StringCchPrintfW(wszFailLoad, _countof(wszFailLoad), wszFormat, GetLastError()); - MessageBoxW(GetDesktopWindow(), wszFailLoad, wszTitle, MB_ICONERROR | MB_OK); + StringCchPrintfW(szFailLoad, _countof(szFailLoad), szFormat, GetLastError()); + MessageBoxW(GetDesktopWindow(), szFailLoad, szTitle, MB_ICONERROR | MB_OK); return -1; }

4 years, 5 months

[reactos] 01/01: [NDK][NTDLL] RtlGetNtProductType(): Update it with SAL2 annotations

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f44cb6de96e8fc9a519e5… commit f44cb6de96e8fc9a519e589f24e46ed1a7b84cab Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Feb 28 13:14:36 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 26 14:08:58 2020 +0200 [NDK][NTDLL] RtlGetNtProductType(): Update it with SAL2 annotations --- dll/ntdll/rtl/version.c | 2 +- sdk/include/ndk/rtlfuncs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c index 37f0960ec66..f7d44e5f209 100644 --- a/dll/ntdll/rtl/version.c +++ b/dll/ntdll/rtl/version.c @@ -93,7 +93,7 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) * @implemented */ BOOLEAN NTAPI -RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType) +RtlGetNtProductType(_Out_ PNT_PRODUCT_TYPE ProductType) { *ProductType = SharedUserData->NtProductType; return TRUE; diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index d8764771eb7..4fa1bde2747 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4526,7 +4526,7 @@ RtlGetVersion( NTSYSAPI BOOLEAN NTAPI -RtlGetNtProductType(OUT PNT_PRODUCT_TYPE ProductType); +RtlGetNtProductType(_Out_ PNT_PRODUCT_TYPE ProductType); // // Secure Memory Functions

4 years, 5 months

[reactos] 01/01: Update zh-CN.rc (#2522)

by 郑

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47b0f9a9077ce921d1e06… commit 47b0f9a9077ce921d1e067472a532b8bb48c123f Author: 郑 <robsean(a)126.com> AuthorDate: Sun Apr 26 20:00:02 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 15:00:02 2020 +0300 Update zh-CN.rc (#2522) --- base/setup/reactos/lang/zh-CN.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 2af64b966ed..6e804d1bbaa 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -132,7 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序完成" FONT 9, "宋体" BEGIN - LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "正在完成 ReactOS 安装程序向导", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "您成功完成 ReactOS 第一阶段安装过程。", IDC_STATIC, 20, 50, 277, 10 LTEXT "点击完成后，您的电脑将会重新启动。", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8

4 years, 5 months

[reactos] 01/01: [SHIMGVW] Update Polish translation (#2666)

by Saibamen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79c932078d449b2b0f366… commit 79c932078d449b2b0f3663c099074a328f8453c6 Author: Saibamen <saibamenppl(a)gmail.com> AuthorDate: Sun Apr 26 13:56:46 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 13:56:46 2020 +0200 [SHIMGVW] Update Polish translation (#2666) After PR #2606 --- dll/win32/shimgvw/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shimgvw/lang/pl-PL.rc b/dll/win32/shimgvw/lang/pl-PL.rc index 2bb921f4fae..01c03a2b6fc 100644 --- a/dll/win32/shimgvw/lang/pl-PL.rc +++ b/dll/win32/shimgvw/lang/pl-PL.rc @@ -9,7 +9,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Przeglądarka obrazów i faksów ReactOS" IDS_SETASDESKBG "Ustaw jako tło pulpitu" - IDS_NOPREVIEW "No preview available." + IDS_NOPREVIEW "Podgląd niedostępny." IDS_PREVIEW "Podgląd" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Następny obraz"

4 years, 5 months

[reactos] 01/01: [DESK.CPL] Update Polish translation (#2664)

by Saibamen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55e742119ca85a2b1bb32… commit 55e742119ca85a2b1bb32742755db8e0753fdb0d Author: Saibamen <saibamenppl(a)gmail.com> AuthorDate: Sun Apr 26 13:56:17 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 13:56:17 2020 +0200 [DESK.CPL] Update Polish translation (#2664) After PR #2591 --- dll/cpl/desk/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 6d6be0c3e15..e7f562332a0 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -85,7 +85,7 @@ CAPTION "Ustawienia zaawansowane" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Jeśli wybierzesz motyw inny niż ReactOS classic, zastąpi on następujące ustawienia, z wyjątkiem niektórych starszych programów.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP

4 years, 5 months

[reactos] 07/07: [NTDLL_APITEST] Add test for RTL_DEBUG_QUERY_MODULES

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=804b7830b7af7642f3c71… commit 804b7830b7af7642f3c7100599ca319c4e7f8170 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 21 22:10:49 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 13:44:02 2020 +0200 [NTDLL_APITEST] Add test for RTL_DEBUG_QUERY_MODULES --- .../rostests/apitests/ntdll/RtlDebugInformation.c | 41 +++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/RtlDebugInformation.c b/modules/rostests/apitests/ntdll/RtlDebugInformation.c index 19d73211e54..c87c58a4d6c 100644 --- a/modules/rostests/apitests/ntdll/RtlDebugInformation.c +++ b/modules/rostests/apitests/ntdll/RtlDebugInformation.c @@ -81,8 +81,47 @@ static void Test_Buffersizes() } } + +static void Test_ProcessModules(void) +{ + PRTL_DEBUG_INFORMATION Buffer; + NTSTATUS Status; + ULONG RequiredSize = 0; + PRTL_PROCESS_MODULES ExpectedModules; + + Buffer = RtlCreateQueryDebugBuffer(0, FALSE); + ok(Buffer != NULL, "Unable to create default buffer\n"); + if (!Buffer) + return; + + Status = LdrQueryProcessModuleInformation(NULL, 0, &RequiredSize); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + RequiredSize; + ExpectedModules = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, RequiredSize); + + Status = LdrQueryProcessModuleInformation(ExpectedModules, RequiredSize, &RequiredSize); + ok_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + + Status = RtlQueryProcessDebugInformation(GetCurrentProcessId(), RTL_DEBUG_QUERY_MODULES, Buffer); + ok_hex(Status, STATUS_SUCCESS); + if (SUCCEEDED(Status)) + { + ok(!memcmp(ExpectedModules, Buffer->Modules, RequiredSize), "Unexpected difference!\n"); + } + } + if (ExpectedModules) + HeapFree(GetProcessHeap(), 0, ExpectedModules); + + Status = RtlDestroyQueryDebugBuffer(Buffer); + ok_hex(Status, STATUS_SUCCESS); +} + + START_TEST(RtlDebugInformation) { Test_Buffersizes(); - skip("No test for remote debug information yet!\n"); + Test_ProcessModules(); }

4 years, 5 months

[reactos] 06/07: [RTL] Partially implement RtlCreateQueryDebugBuffer and RtlDestroyQueryDebugBuffer

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26b670b3831a92acb2d8… commit f26b670b3831a92acb2d873d97f3112cb6cf106a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Apr 16 19:59:53 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 13:44:02 2020 +0200 [RTL] Partially implement RtlCreateQueryDebugBuffer and RtlDestroyQueryDebugBuffer --- sdk/lib/rtl/dbgbuffer.c | 112 +++++++++++++++++++++++++++++++++++------------- sdk/lib/rtl/rtlp.h | 5 +++ 2 files changed, 88 insertions(+), 29 deletions(-) diff --git a/sdk/lib/rtl/dbgbuffer.c b/sdk/lib/rtl/dbgbuffer.c index e51682e10da..51e742850a4 100644 --- a/sdk/lib/rtl/dbgbuffer.c +++ b/sdk/lib/rtl/dbgbuffer.c @@ -1,8 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/dbgbuffer.c - * PROGRAMER: James Tabor + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: RTL_DEBUG_INFORMATION implementation + * COPYRIGHT: Copyright James Tabor + * Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,30 +15,80 @@ /* FUNCTIONS *****************************************************************/ +PVOID +NTAPI +RtlpDebugBufferCommit(_Inout_ PRTL_DEBUG_INFORMATION Buffer, + _In_ SIZE_T Size) +{ + ULONG Remaining = Buffer->CommitSize - Buffer->OffsetFree; + PVOID Result; + NTSTATUS Status; + + if (Size > MAXLONG) + return NULL; + + if (Remaining < Size) + { + PVOID Buf; + SIZE_T CommitSize; + + Buf = (PVOID)((ULONG_PTR)Buffer->ViewBaseClient + Buffer->CommitSize); + CommitSize = Size - Remaining; + + /* this is not going to end well.. */ + if (CommitSize > MAXLONG) + return NULL; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), (PVOID*)&Buf, 0, &CommitSize, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + return NULL; + + Buffer->CommitSize += CommitSize; + Remaining = Buffer->CommitSize - Buffer->OffsetFree; + /* Sanity check */ + ASSERT(Remaining >= Size); + if (Remaining < Size) + return NULL; + } + + Result = (PBYTE)Buffer->ViewBaseClient + Buffer->OffsetFree; + Buffer->OffsetFree += Size; + + return Result; +} + + /* * @unimplemented */ PRTL_DEBUG_INFORMATION NTAPI -RtlCreateQueryDebugBuffer(IN ULONG Size, - IN BOOLEAN EventPair) +RtlCreateQueryDebugBuffer(_In_ ULONG Size, + _In_ BOOLEAN EventPair) { NTSTATUS Status; PRTL_DEBUG_INFORMATION Buf = NULL; - SIZE_T ViewSize = 100 * PAGE_SIZE; + SIZE_T AllocationSize = Size ? Size : 0x400 * PAGE_SIZE; + SIZE_T CommitSize = sizeof(*Buf); - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&Buf, - 0, - &ViewSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return NULL; + /* Reserve the memory */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), (PVOID*)&Buf, 0, &AllocationSize, MEM_RESERVE, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + return NULL; - Buf->ViewBaseClient = Buf; - Buf->ViewSize = (ULONG)ViewSize; + /* Commit the first data, CommitSize is updated with the actual committed data */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), (PVOID*)&Buf, 0, &CommitSize, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + RtlDestroyQueryDebugBuffer(Buf); + return NULL; + } - DPRINT("RtlCQDB: BA: %p BS: 0x%lx\n", Buf->ViewBaseClient, Buf->ViewSize); + /* Fill out the minimum data required */ + Buf->ViewBaseClient = Buf; + Buf->ViewSize = (ULONG)AllocationSize; + Buf->CommitSize = CommitSize; + Buf->OffsetFree = sizeof(*Buf); return Buf; } @@ -47,7 +98,7 @@ RtlCreateQueryDebugBuffer(IN ULONG Size, */ NTSTATUS NTAPI -RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) +RtlDestroyQueryDebugBuffer(_In_ PRTL_DEBUG_INFORMATION Buf) { NTSTATUS Status = STATUS_SUCCESS; SIZE_T ViewSize = 0; @@ -265,25 +316,27 @@ RtlQueryProcessDebugInformation(IN ULONG ProcessId, { PRTL_PROCESS_MODULES Mp; ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PRTL_PROCESS_MODULES)((PUCHAR)Buf + Buf->OffsetFree); /* I like this better than the do & while loop. */ Status = LdrQueryProcessModuleInformation(NULL, 0, &ReturnSize); + + Mp = RtlpDebugBufferCommit(Buf, ReturnSize); + if (!Mp) + { + DPRINT1("RtlQueryProcessDebugInformation: Unable to commit %u\n", ReturnSize); + } + Status = LdrQueryProcessModuleInformation(Mp, - ReturnSize , + ReturnSize, &ReturnSize); if (!NT_SUCCESS(Status)) { return Status; } - MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); Buf->Modules = Mp; - Buf->OffsetFree = Buf->OffsetFree + MSize; } if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) @@ -349,15 +402,18 @@ RtlQueryProcessDebugInformation(IN ULONG ProcessId, { PRTL_PROCESS_MODULES Mp; ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PRTL_PROCESS_MODULES)((PUCHAR)Buf + Buf->OffsetFree); Status = RtlpQueryRemoteProcessModules(hProcess, NULL, 0, &ReturnSize); + Mp = RtlpDebugBufferCommit(Buf, ReturnSize); + if (!Mp) + { + DPRINT1("RtlQueryProcessDebugInformation: Unable to commit %u\n", ReturnSize); + } + Status = RtlpQueryRemoteProcessModules(hProcess, Mp, ReturnSize , @@ -367,9 +423,7 @@ RtlQueryProcessDebugInformation(IN ULONG ProcessId, return Status; } - MSize = Mp->NumberOfModules * (sizeof(RTL_PROCESS_MODULES) + 8); Buf->Modules = Mp; - Buf->OffsetFree = Buf->OffsetFree + MSize; } if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) diff --git a/sdk/lib/rtl/rtlp.h b/sdk/lib/rtl/rtlp.h index c1cc8dc7ebf..be1c7372e96 100644 --- a/sdk/lib/rtl/rtlp.h +++ b/sdk/lib/rtl/rtlp.h @@ -248,5 +248,10 @@ VOID NTAPI LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData); +PVOID +NTAPI +RtlpDebugBufferCommit(_Inout_ PRTL_DEBUG_INFORMATION Buffer, + _In_ SIZE_T Size); + /* EOF */

4 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020