Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 01/01: [SHELL32_APITEST] Add SHChangeNotify testcase (#2378)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe397602069ea128a8605… commit fe397602069ea128a8605146897722933a7e1a52 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 25 00:45:44 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 25 00:45:44 2020 +0900 [SHELL32_APITEST] Add SHChangeNotify testcase (#2378) Add a testcase for shell32!SHChangeNotify function to investigate the shell notification mechanism. CORE-13950 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/SHChangeNotify.cpp | 474 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 477 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index e467b5cc4e5..aab3e8bcfb8 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -22,6 +22,7 @@ list(APPEND SOURCE IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp + SHChangeNotify.cpp SHCreateDataObject.cpp SHCreateFileExtractIconW.cpp SHParseDisplayName.cpp diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp new file mode 100644 index 00000000000..c4257b993ec --- /dev/null +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -0,0 +1,474 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for SHChangeNotify + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" +#include <shlwapi.h> +#include <stdio.h> + +#define WM_SHELL_NOTIFY (WM_USER + 100) + +#define ID_TEST 1000 + +static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" +static WCHAR s_dir2[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir2" +static WCHAR s_dir3[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir3" +static WCHAR s_file1[MAX_PATH]; // "%TEMP%\\WatchDir1\\File1.txt" +static WCHAR s_file2[MAX_PATH]; // "%TEMP%\\WatchDir1\\File2.txt" + +static HWND s_hwnd = NULL; +static WCHAR s_szName[] = L"SHChangeNotify testcase"; +static LPITEMIDLIST s_pidl = NULL; +static UINT s_uRegID = 0; +static SHChangeNotifyEntry s_entry; + +static CHAR s_path1[MAX_PATH], s_path2[MAX_PATH]; + +typedef enum TYPE +{ + TYPE_RENAMEITEM, + TYPE_CREATE, + TYPE_DELETE, + TYPE_MKDIR, + TYPE_RMDIR, + TYPE_UPDATEDIR, + TYPE_UPDATEITEM, + TYPE_RENAMEFOLDER, + TYPE_FREESPACE +} TYPE; + +static BYTE s_counters[TYPE_FREESPACE + 1]; + +static LPCSTR +DoGetPattern(void) +{ + size_t i; + static char buf[TYPE_FREESPACE + 1 + 1]; + for (i = 0; i < TYPE_FREESPACE + 1; ++i) + { + buf[i] = (char)('0' + s_counters[i]); + } + buf[i] = 0; + return buf; +} + +typedef void (*ACTION)(void); + +typedef struct TEST_ENTRY +{ + INT line; + LONG event; + LPCVOID item1; + LPCVOID item2; + LPCSTR pattern; + ACTION action; +} TEST_ENTRY; + +static BOOL +DoCreateEmptyFile(LPCWSTR pszFileName) +{ + FILE *fp = _wfopen(pszFileName, L"wb"); + fclose(fp); + return fp != NULL; +} + +static void +DoAction1(void) +{ + ok_int(CreateDirectoryW(s_dir2, NULL), TRUE); +} + +static void +DoAction2(void) +{ + ok_int(RemoveDirectoryW(s_dir2), TRUE); +} + +static void +DoAction3(void) +{ + ok_int(MoveFileExW(s_dir2, s_dir3, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING), TRUE); +} + +static void +DoAction4(void) +{ + ok_int(DoCreateEmptyFile(s_file1), TRUE); +} + +static void +DoAction5(void) +{ + ok_int(MoveFileExW(s_file1, s_file2, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING), TRUE); +} + +static void +DoAction6(void) +{ + ok_int(DeleteFileW(s_file2), TRUE); +} + +static void +DoAction7(void) +{ + DeleteFileW(s_file1); + DeleteFileW(s_file2); + ok_int(RemoveDirectoryW(s_dir3), TRUE); +} + +static void +DoAction8(void) +{ + ok_int(RemoveDirectoryW(s_dir1), TRUE); +} + +static const TEST_ENTRY s_TestEntries[] = { + {__LINE__, SHCNE_MKDIR, s_dir1, NULL, "000100000", NULL}, + {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "000100000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", NULL}, + {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "000100000", DoAction1}, + {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", DoAction2}, + {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "000100000", DoAction1}, + {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "000000010", NULL}, + {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, NULL, "000000010", NULL}, + {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "000000010", DoAction3}, + {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, NULL, "000000010", NULL}, + {__LINE__, SHCNE_CREATE, s_file1, NULL, "010000000", NULL}, + {__LINE__, SHCNE_CREATE, s_file1, s_file2, "010000000", NULL}, + {__LINE__, SHCNE_CREATE, s_file1, NULL, "010000000", DoAction4}, + {__LINE__, SHCNE_RENAMEITEM, s_file1, NULL, "100000000", NULL}, + {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", NULL}, + {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", DoAction5}, + {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", NULL}, + {__LINE__, SHCNE_UPDATEITEM, s_file1, NULL, "000000100", NULL}, + {__LINE__, SHCNE_UPDATEITEM, s_file2, NULL, "000000100", NULL}, + {__LINE__, SHCNE_UPDATEITEM, s_file1, s_file2, "000000100", NULL}, + {__LINE__, SHCNE_UPDATEITEM, s_file2, s_file1, "000000100", NULL}, + {__LINE__, SHCNE_DELETE, s_file1, NULL, "001000000", NULL}, + {__LINE__, SHCNE_DELETE, s_file2, NULL, "001000000", NULL}, + {__LINE__, SHCNE_DELETE, s_file2, s_file1, "001000000", NULL}, + {__LINE__, SHCNE_DELETE, s_file1, s_file2, "001000000", NULL}, + {__LINE__, SHCNE_DELETE, s_file2, NULL, "001000000", DoAction6}, + {__LINE__, SHCNE_DELETE, s_file2, NULL, "001000000", NULL}, + {__LINE__, SHCNE_DELETE, s_file1, NULL, "001000000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_file1, NULL, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_file2, NULL, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_file1, s_file2, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_file2, s_file1, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_dir1, NULL, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_dir2, NULL, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_dir1, s_dir2, "000001000", NULL}, + {__LINE__, SHCNE_UPDATEDIR, s_dir2, s_dir1, "000001000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir3, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir1, s_dir2, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir1, s_dir3, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir2, s_dir1, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir2, s_dir3, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir3, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir3, NULL, "000010000", DoAction7}, + {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", NULL}, + {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", DoAction8}, +}; +static const size_t s_nTestEntries = _countof(s_TestEntries); +static size_t s_iTest = 0; + +static void +DoTestEntry1(const TEST_ENTRY *entry) +{ + if (entry->action) + { + (*entry->action)(); + } + + SHChangeNotify(entry->event, SHCNF_PATHW | SHCNF_FLUSH, entry->item1, entry->item2); + SendMessageW(s_hwnd, WM_COMMAND, ID_TEST + s_iTest, 0); + + ZeroMemory(&s_counters, sizeof(s_counters)); +} + +static void +DoTestEntry2(const TEST_ENTRY *entry) +{ + LPCSTR pattern = DoGetPattern(); + ok(lstrcmpA(pattern, entry->pattern) == 0, "Line %d: pattern mismatch '%s'\n", entry->line, pattern); +} + +static BOOL +DoInit(HWND hwnd) +{ + WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; + + GetTempPathW(_countof(szTemp), szTemp); + GetLongPathNameW(szTemp, szPath, _countof(szPath)); + + lstrcpyW(s_dir1, szPath); + PathAppendW(s_dir1, L"WatchDir1"); + CreateDirectoryW(s_dir1, NULL); + + lstrcpyW(s_dir2, s_dir1); + PathAppendW(s_dir2, L"Dir2"); + + lstrcpyW(s_dir3, s_dir1); + PathAppendW(s_dir3, L"Dir3"); + + lstrcpyW(s_file1, s_dir1); + PathAppendW(s_file1, L"File1.txt"); + + lstrcpyW(s_file2, s_dir1); + PathAppendW(s_file2, L"File2.txt"); + + s_pidl = ILCreateFromPathW(s_dir1); + + s_entry.pidl = s_pidl; + s_entry.fRecursive = TRUE; + LONG fEvents = SHCNE_ALLEVENTS; + s_uRegID = SHChangeNotifyRegister(hwnd, SHCNRF_ShellLevel, fEvents, WM_SHELL_NOTIFY, + 1, &s_entry); + return s_uRegID != 0; +} + +static DWORD WINAPI ThreadFunc(LPVOID) +{ + for (size_t i = 0; i < s_nTestEntries; ++i) + { + s_iTest = i; + DoTestEntry1(&s_TestEntries[i]); + } + + SendMessageW(s_hwnd, WM_COMMAND, IDOK, 0); + return 0; +} + +static BOOL +OnCreate(HWND hwnd) +{ + s_hwnd = hwnd; + + BOOL bOK = DoInit(hwnd); + if (!bOK) + { + skip("SHChangeNotifyRegister failed\n"); + return FALSE; + } + + DWORD tid; + HANDLE hThread = CreateThread(NULL, 0, ThreadFunc, NULL, 0, &tid); + if (hThread == NULL) + { + skip("CreateThread failed\n"); + return FALSE; + } + CloseHandle(hThread); + + return TRUE; +} + +static void +OnCommand(HWND hwnd, UINT id) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + DestroyWindow(hwnd); + break; + default: + if (ID_TEST <= id && id < ID_TEST + 1000) + { + DoTestEntry2(&s_TestEntries[s_iTest]); + } + break; + } +} + +static void +OnDestroy(HWND hwnd) +{ + SHChangeNotifyDeregister(s_uRegID); + CoTaskMemFree(s_pidl); + DeleteFileW(s_file1); + DeleteFileW(s_file2); + RemoveDirectoryW(s_dir3); + RemoveDirectoryW(s_dir2); + RemoveDirectoryW(s_dir1); + PostQuitMessage(0); + s_hwnd = NULL; +} + +static void +DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lEvent) +{ + if (pidl1) + SHGetPathFromIDListA(pidl1, s_path1); + else + s_path1[0] = 0; + + if (pidl2) + SHGetPathFromIDListA(pidl2, s_path2); + else + s_path2[0] = 0; + + switch (lEvent) + { + case SHCNE_RENAMEITEM: + trace("SHCNE_RENAMEITEM('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_RENAMEITEM] = 1; + break; + case SHCNE_CREATE: + trace("SHCNE_CREATE('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_CREATE] = 1; + break; + case SHCNE_DELETE: + trace("SHCNE_DELETE('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_DELETE] = 1; + break; + case SHCNE_MKDIR: + trace("SHCNE_MKDIR('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_MKDIR] = 1; + break; + case SHCNE_RMDIR: + trace("SHCNE_RMDIR('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_RMDIR] = 1; + break; + case SHCNE_MEDIAINSERTED: + trace("SHCNE_MEDIAINSERTED('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_MEDIAREMOVED: + trace("SHCNE_MEDIAREMOVED('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_DRIVEREMOVED: + trace("SHCNE_DRIVEREMOVED('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_DRIVEADD: + trace("SHCNE_DRIVEADD('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_NETSHARE: + trace("SHCNE_NETSHARE('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_NETUNSHARE: + trace("SHCNE_NETUNSHARE('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_ATTRIBUTES: + trace("SHCNE_ATTRIBUTES('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_UPDATEDIR: + trace("SHCNE_UPDATEDIR('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_UPDATEDIR] = 1; + break; + case SHCNE_UPDATEITEM: + trace("SHCNE_UPDATEITEM('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_UPDATEITEM] = 1; + break; + case SHCNE_SERVERDISCONNECT: + trace("SHCNE_SERVERDISCONNECT('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_UPDATEIMAGE: + trace("SHCNE_UPDATEIMAGE('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_DRIVEADDGUI: + trace("SHCNE_DRIVEADDGUI('%s', '%s')\n", s_path1, s_path2); + break; + case SHCNE_RENAMEFOLDER: + trace("SHCNE_RENAMEFOLDER('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_RENAMEFOLDER] = 1; + break; + case SHCNE_FREESPACE: + trace("SHCNE_FREESPACE('%s', '%s')\n", s_path1, s_path2); + s_counters[TYPE_FREESPACE] = 1; + break; + case SHCNE_EXTENDED_EVENT: + trace("SHCNE_EXTENDED_EVENT('%p', '%p')\n", pidl1, pidl2); + break; + case SHCNE_ASSOCCHANGED: + trace("SHCNE_ASSOCCHANGED('%s', '%s')\n", s_path1, s_path2); + break; + default: + trace("(lEvent:%08lX)('%s', '%s')\n", lEvent, s_path1, s_path2); + break; + } +} + +static INT_PTR +OnShellNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + LONG lEvent; + PIDLIST_ABSOLUTE *pidlAbsolute; + HANDLE hLock = SHChangeNotification_Lock((HANDLE)wParam, (DWORD)lParam, &pidlAbsolute, &lEvent); + if (hLock) + { + DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lEvent); + SHChangeNotification_Unlock(hLock); + } + else + { + pidlAbsolute = (PIDLIST_ABSOLUTE *)wParam; + DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lParam); + } + return TRUE; +} + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + return (OnCreate(hwnd) ? 0 : -1); + + case WM_COMMAND: + OnCommand(hwnd, LOWORD(wParam)); + break; + + case WM_SHELL_NOTIFY: + return OnShellNotify(hwnd, wParam, lParam); + + case WM_DESTROY: + OnDestroy(hwnd); + break; + + default: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +START_TEST(SHChangeNotify) +{ + WNDCLASSW wc; + ZeroMemory(&wc, sizeof(wc)); + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassW(&wc)) + { + skip("RegisterClassW failed\n"); + return; + } + + HWND hwnd = CreateWindowW(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, GetModuleHandleW(NULL), NULL); + if (!hwnd) + { + skip("CreateWindowW failed\n"); + return; + } + ShowWindow(hwnd, SW_SHOWNORMAL); + UpdateWindow(hwnd); + + MSG msg; + while (GetMessageW(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index add2d94af93..0fde3735434 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -17,6 +17,7 @@ extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); extern void func_PathResolve(void); +extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecCmdLine(void); @@ -42,6 +43,7 @@ const struct test winetest_testlist[] = { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL }, { "PathResolve", func_PathResolve }, + { "SHChangeNotify", func_SHChangeNotify }, { "SHCreateDataObject", func_SHCreateDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "ShellExecCmdLine", func_ShellExecCmdLine },

4 years, 7 months

[reactos] 01/01: [TIMEDATE] Implement the dynamic NTP status notification (#2352)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a81a5bc1426f7728b9d5… commit 5a81a5bc1426f7728b9d5fda3d8a7de66d66ed41 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Feb 24 11:56:02 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 24 19:56:02 2020 +0900 [TIMEDATE] Implement the dynamic NTP status notification (#2352) Time/Date control panel applet displays the status of the NTP server synchronization with the system informing the user the actual condition of the said sync, if it has failed or suceeded. The commit also implements IDS_INETTIMEWELCOME which serves as a placeholder as Time/Date loads the last successful attempt of NTP synchronization which I don't know how the CPL remembers it. With that said, IDS_INETTIMEWELCOME will stay for a while until someone figures out how timedate.cpl works i [...] CORE-16684 --- dll/cpl/timedate/internettime.c | 104 +++++++++++++++++++++++++++++++++++++--- dll/cpl/timedate/lang/bg-BG.rc | 2 + dll/cpl/timedate/lang/cs-CZ.rc | 2 + dll/cpl/timedate/lang/da-DK.rc | 2 + dll/cpl/timedate/lang/de-DE.rc | 2 + dll/cpl/timedate/lang/el-GR.rc | 2 + dll/cpl/timedate/lang/en-US.rc | 2 + dll/cpl/timedate/lang/es-ES.rc | 2 + dll/cpl/timedate/lang/et-EE.rc | 2 + dll/cpl/timedate/lang/eu-ES.rc | 2 + dll/cpl/timedate/lang/fr-FR.rc | 2 + dll/cpl/timedate/lang/he-IL.rc | 2 + dll/cpl/timedate/lang/hu-HU.rc | 2 + dll/cpl/timedate/lang/id-ID.rc | 2 + dll/cpl/timedate/lang/it-IT.rc | 2 + dll/cpl/timedate/lang/ja-JP.rc | 2 + dll/cpl/timedate/lang/nl-NL.rc | 2 + dll/cpl/timedate/lang/no-NO.rc | 2 + dll/cpl/timedate/lang/pl-PL.rc | 2 + dll/cpl/timedate/lang/pt-BR.rc | 2 + dll/cpl/timedate/lang/ro-RO.rc | 2 + dll/cpl/timedate/lang/ru-RU.rc | 2 + dll/cpl/timedate/lang/sk-SK.rc | 2 + dll/cpl/timedate/lang/sq-AL.rc | 2 + dll/cpl/timedate/lang/sv-SE.rc | 2 + dll/cpl/timedate/lang/th-TH.rc | 2 + dll/cpl/timedate/lang/tr-TR.rc | 2 + dll/cpl/timedate/lang/uk-UA.rc | 2 + dll/cpl/timedate/lang/zh-CN.rc | 2 + dll/cpl/timedate/lang/zh-TW.rc | 2 + dll/cpl/timedate/resource.h | 2 + dll/cpl/timedate/timedate.h | 11 +++++ 32 files changed, 168 insertions(+), 7 deletions(-) diff --git a/dll/cpl/timedate/internettime.c b/dll/cpl/timedate/internettime.c index 88e95ae0f6e..c1ee0294b0f 100644 --- a/dll/cpl/timedate/internettime.c +++ b/dll/cpl/timedate/internettime.c @@ -11,6 +11,7 @@ #include <stdlib.h> DWORD WINAPI W32TimeSyncNow(LPCWSTR cmdline, UINT blocking, UINT flags); +SYNC_STATUS SyncStatus; static VOID CreateNTPServerList(HWND hwnd) @@ -89,7 +90,7 @@ CreateNTPServerList(HWND hwnd) /* Set the selected server in the registry */ static VOID -SetNTPServer(HWND hwnd) +SetNTPServer(HWND hwnd, BOOL bBeginUpdate) { HKEY hKey; HWND hList; @@ -97,6 +98,7 @@ SetNTPServer(HWND hwnd) WCHAR szSel[4]; LONG lRet; WCHAR buffer[256]; + WCHAR szFormat[BUFSIZE]; hList = GetDlgItem(hwnd, IDC_SERVERLIST); @@ -105,6 +107,15 @@ SetNTPServer(HWND hwnd) SendDlgItemMessageW(hwnd, IDC_SERVERLIST, WM_GETTEXT, _countof(buffer), (LPARAM)buffer); + /* If the condition is true that means the user wants to update (synchronize) the time */ + if (bBeginUpdate) + { + /* Inform the user that the synchronization is about to begin (depending on how reachable the NTP server is) */ + StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncWait, buffer); + SyncStatus.lpszSyncStatus = szFormat; + SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus); + } + /* If there is new data entered then save it in the registry The same key name of "0" is used to store all user entered values */ @@ -177,6 +188,87 @@ EnableDialogText(HWND hwnd) EnableWindow(GetDlgItem(hwnd, IDC_NEXTSYNC), bChecked); } +static VOID +SyncNTPStatusInit(HWND hwnd) +{ + /* Initialize the Synchronization NTP status members */ + LoadStringW(hApplet, IDS_INETTIMEWELCOME, SyncStatus.szSyncInit, _countof(SyncStatus.szSyncInit)); + LoadStringW(hApplet, IDS_INETTIMESUCSYNC, SyncStatus.szSyncSuc, _countof(SyncStatus.szSyncSuc)); + LoadStringW(hApplet, IDS_INETTIMESYNCING, SyncStatus.szSyncWait, _countof(SyncStatus.szSyncWait)); + LoadStringW(hApplet, IDS_INETTIMEERROR, SyncStatus.szSyncErr, _countof(SyncStatus.szSyncErr)); + LoadStringW(hApplet, IDS_INETTIMESUCFILL, SyncStatus.szSyncType, _countof(SyncStatus.szSyncType)); + + /* + * TODO: XP's and Server 2003's timedate.cpl loads the last successful attempt of the NTP synchronization + * displaying the last time and date of the said sync. I have no idea how does timedate.cpl remember its last + * successful sync so for the time being, we will only load the initial remark string. + */ + SyncStatus.lpszSyncStatus = SyncStatus.szSyncInit; + SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus); +} + +static VOID +UpdateNTPStatus(HWND hwnd, DWORD dwReason) +{ + WCHAR szFormat[BUFSIZE]; + WCHAR szNtpServerName[MAX_VALUE_NAME]; + WCHAR szLocalDate[BUFSIZE]; + WCHAR szLocalTime[BUFSIZE]; + HWND hDlgComboList; + + /* Retrieve the server NTP name from the edit box */ + hDlgComboList = GetDlgItem(hwnd, IDC_SERVERLIST); + SendMessageW(hDlgComboList, WM_GETTEXT, _countof(szNtpServerName), (LPARAM)szNtpServerName); + + /* Iterate over the case reasons so we can compute the exact status of the NTP synchronization */ + switch (dwReason) + { + /* The NTP time synchronization has completed successfully */ + case ERROR_SUCCESS: + { + /* Get the current date based on the locale identifier */ + GetDateFormatW(LOCALE_USER_DEFAULT, + DATE_SHORTDATE, + NULL, + NULL, + szLocalDate, + _countof(szLocalDate)); + + /* Get the current time based on the locale identifier */ + GetTimeFormatW(LOCALE_USER_DEFAULT, + TIME_NOSECONDS, + NULL, + NULL, + szLocalTime, + _countof(szLocalTime)); + + /* Format the resource sting with the given NTP server name and the current time data */ + StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncSuc, szNtpServerName, szLocalDate, szLocalTime); + SyncStatus.lpszSyncStatus = szFormat; + SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus); + break; + } + + /* Empty field data has been caught -- simply tell the user to write the NTP name to continue */ + case ERROR_INVALID_DATA: + { + SyncStatus.lpszSyncStatus = SyncStatus.szSyncType; + SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus); + DPRINT("UpdateNTPStatus(): The user didn't submit any NTP server name!\n"); + break; + } + + /* General failure -- the NTP synchronization has failed for whatever reason */ + default: + { + StringCchPrintfW(szFormat, _countof(szFormat), SyncStatus.szSyncErr, szNtpServerName); + SyncStatus.lpszSyncStatus = szFormat; + SetDlgItemTextW(hwnd, IDC_SUCSYNC, SyncStatus.lpszSyncStatus); + DPRINT("UpdateNTPStatus(): Failed to synchronize the time! (Error: %lu).\n", dwReason); + break; + } + } +} static VOID GetSyncSetting(HWND hwnd) @@ -216,6 +308,7 @@ OnInitDialog(HWND hwnd) GetSyncSetting(hwnd); EnableDialogText(hwnd); CreateNTPServerList(hwnd); + SyncNTPStatusInit(hwnd); } static VOID @@ -273,13 +366,10 @@ InetTimePageProc(HWND hwndDlg, { DWORD dwError; - SetNTPServer(hwndDlg); + SetNTPServer(hwndDlg, TRUE); dwError = W32TimeSyncNow(L"localhost", 0, 0); - if (dwError != ERROR_SUCCESS) - { - DPRINT("Failed to synchronize the time! Invalid NTP server name has been caught or no server name could be found (Error: %lu).\n", dwError); - } + UpdateNTPStatus(hwndDlg, dwError); } break; @@ -313,7 +403,7 @@ InetTimePageProc(HWND hwndDlg, switch (lpnm->code) { case PSN_APPLY: - SetNTPServer(hwndDlg); + SetNTPServer(hwndDlg, FALSE); if (SendDlgItemMessageW(hwndDlg, IDC_AUTOSYNC, BM_GETCHECK, 0, 0) == BST_CHECKED) OnAutoSync(TRUE); diff --git a/dll/cpl/timedate/lang/bg-BG.rc b/dll/cpl/timedate/lang/bg-BG.rc index 2ae40c9ed15..98187f865e2 100644 --- a/dll/cpl/timedate/lang/bg-BG.rc +++ b/dll/cpl/timedate/lang/bg-BG.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Следващо сверяване: %s at %s" IDS_INETTIMESYNCING "Почакайте, докато РеактОС сверява времето с %s" IDS_INETTIMEERROR "Възникна грешка при сверяване на времето %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/cs-CZ.rc b/dll/cpl/timedate/lang/cs-CZ.rc index f4470649051..acc05cb7acb 100644 --- a/dll/cpl/timedate/lang/cs-CZ.rc +++ b/dll/cpl/timedate/lang/cs-CZ.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Další synchronizace: %s v %s" IDS_INETTIMESYNCING "Prosím čekejte, zatímco systém ReactOS synchronizuje čas s %s" IDS_INETTIMEERROR "Při synchronizaci času s %s nastala chyba" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/da-DK.rc b/dll/cpl/timedate/lang/da-DK.rc index 59c0d5472bc..47f7207be07 100644 --- a/dll/cpl/timedate/lang/da-DK.rc +++ b/dll/cpl/timedate/lang/da-DK.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/de-DE.rc b/dll/cpl/timedate/lang/de-DE.rc index 7afc80ecfcc..29936291053 100644 --- a/dll/cpl/timedate/lang/de-DE.rc +++ b/dll/cpl/timedate/lang/de-DE.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Nächste Synchronisierung am %s um %s." IDS_INETTIMESYNCING "Bitte warten Sie, während ReactOS die Zeit mit %s synchronisiert." IDS_INETTIMEERROR "Ein Fehler trat beim Synchronisieren mit %s auf." + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/el-GR.rc b/dll/cpl/timedate/lang/el-GR.rc index abc8550b662..ae402546fd4 100644 --- a/dll/cpl/timedate/lang/el-GR.rc +++ b/dll/cpl/timedate/lang/el-GR.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/en-US.rc b/dll/cpl/timedate/lang/en-US.rc index 59e83fee61b..84fd7fdfbb7 100644 --- a/dll/cpl/timedate/lang/en-US.rc +++ b/dll/cpl/timedate/lang/en-US.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/es-ES.rc b/dll/cpl/timedate/lang/es-ES.rc index bd5a908058d..097bfce12ef 100644 --- a/dll/cpl/timedate/lang/es-ES.rc +++ b/dll/cpl/timedate/lang/es-ES.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Próxima sincronización: %s a las %s" IDS_INETTIMESYNCING "Por favor espere mientras ReactOS sincroniza la hora con %s" IDS_INETTIMEERROR "Ha ocurrido un error mientras ReactOS se sincronizaba con %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/et-EE.rc b/dll/cpl/timedate/lang/et-EE.rc index b1c465cb1cc..49b1d41c5d9 100644 --- a/dll/cpl/timedate/lang/et-EE.rc +++ b/dll/cpl/timedate/lang/et-EE.rc @@ -61,4 +61,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Palun oodake, kuni ReactOS sünkroonib serveriga %s" IDS_INETTIMEERROR "ReactOSi sünkroonimisel serveriga %s ilmnes tõrge." + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/eu-ES.rc b/dll/cpl/timedate/lang/eu-ES.rc index 1b7a482b3e5..1ada2669c3b 100644 --- a/dll/cpl/timedate/lang/eu-ES.rc +++ b/dll/cpl/timedate/lang/eu-ES.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Hurrengo sinkronizatzea: %s-n %s-etan" IDS_INETTIMESYNCING "Mesedez itxoin ReactOSek %s-rekin ordua sinkronizatu arte" IDS_INETTIMEERROR "Errore bat gertatu da ReactOS %s-kin sinkronizatzen zen bitartean" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/fr-FR.rc b/dll/cpl/timedate/lang/fr-FR.rc index 9cd145884a9..6cc76bcabcd 100644 --- a/dll/cpl/timedate/lang/fr-FR.rc +++ b/dll/cpl/timedate/lang/fr-FR.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Prochaine synchronisation: %s à %s" IDS_INETTIMESYNCING "Veuillez patienter pendant que ReactOS synchronise l'heure avec %s" IDS_INETTIMEERROR "Une erreur a eu lieu pendant que ReactOS synchronisait avec %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/he-IL.rc b/dll/cpl/timedate/lang/he-IL.rc index f1ebafdc00e..3af8a1fd367 100644 --- a/dll/cpl/timedate/lang/he-IL.rc +++ b/dll/cpl/timedate/lang/he-IL.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "הסנכרון הבא: %s ב %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/hu-HU.rc b/dll/cpl/timedate/lang/hu-HU.rc index 1a37ed95198..e4c110a43ec 100644 --- a/dll/cpl/timedate/lang/hu-HU.rc +++ b/dll/cpl/timedate/lang/hu-HU.rc @@ -56,4 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "A következő szinkronizálás: %s %s-kor" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/id-ID.rc b/dll/cpl/timedate/lang/id-ID.rc index 224d5609f82..580febab484 100644 --- a/dll/cpl/timedate/lang/id-ID.rc +++ b/dll/cpl/timedate/lang/id-ID.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Penyelarasan berikutnya: %s pada %s" IDS_INETTIMESYNCING "Harap menunggu saat ReactOS menyelaraskan waktu dengan %s" IDS_INETTIMEERROR "Kesalahan terjadi ketika ReactOS menyelaraskan dengan %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/it-IT.rc b/dll/cpl/timedate/lang/it-IT.rc index 201ea28496f..7df5e6a2bcc 100644 --- a/dll/cpl/timedate/lang/it-IT.rc +++ b/dll/cpl/timedate/lang/it-IT.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Prossima sincronizzazione: %s alle %s" IDS_INETTIMESYNCING "Sincronizzazione ora con %s" IDS_INETTIMEERROR "E' stato rilevato un errore mentre ReactOS si stava sincronizzando con %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/ja-JP.rc b/dll/cpl/timedate/lang/ja-JP.rc index 99263dff8e9..17e19ad38f1 100644 --- a/dll/cpl/timedate/lang/ja-JP.rc +++ b/dll/cpl/timedate/lang/ja-JP.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "次回の同期: %s %s" IDS_INETTIMESYNCING "ReactOSが %s と同期する間、お待ちください" IDS_INETTIMEERROR "ReactOSが %s と同期中にエラーが発生しました" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/nl-NL.rc b/dll/cpl/timedate/lang/nl-NL.rc index dddf6e95763..12b950f4126 100644 --- a/dll/cpl/timedate/lang/nl-NL.rc +++ b/dll/cpl/timedate/lang/nl-NL.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Volgende synchronisatie: %s om %s" IDS_INETTIMESYNCING "ReactOS voert een synchronisatie met %s uit. Een ogenblik geduld." IDS_INETTIMEERROR "Er is een fout opgetreden bij een poging om een synchronisatie met %s uit te voeren." + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/no-NO.rc b/dll/cpl/timedate/lang/no-NO.rc index 1b43ef6f27f..34808eb71da 100644 --- a/dll/cpl/timedate/lang/no-NO.rc +++ b/dll/cpl/timedate/lang/no-NO.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Neste synkonisering: %s med %s" IDS_INETTIMESYNCING "Vennligst vent mens ReactOS sykroniserer tiden med %s" IDS_INETTIMEERROR "En feil har oppstatt mens ReactOS ble sykronisert med %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/pl-PL.rc b/dll/cpl/timedate/lang/pl-PL.rc index a2a93d17cb5..e0dc3256b19 100644 --- a/dll/cpl/timedate/lang/pl-PL.rc +++ b/dll/cpl/timedate/lang/pl-PL.rc @@ -63,4 +63,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Następna synchronizacja w dniu %s o %s" IDS_INETTIMESYNCING "Proszę czekać, gdy ReactOS zsynchronizuje czas z %s" IDS_INETTIMEERROR "Wystąpił błąd podczas próby synchronizacji czasu z %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/pt-BR.rc b/dll/cpl/timedate/lang/pt-BR.rc index b84d407bae8..420ceb8169c 100644 --- a/dll/cpl/timedate/lang/pt-BR.rc +++ b/dll/cpl/timedate/lang/pt-BR.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Próxima sincronização: %s às %s" IDS_INETTIMESYNCING "Aguarde enquanto o ReactOS é sincronizado com %s" IDS_INETTIMEERROR "Erro enquanto o ReactOS estava sincronizando com %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/ro-RO.rc b/dll/cpl/timedate/lang/ro-RO.rc index 308c45c7668..9589fb56d2b 100644 --- a/dll/cpl/timedate/lang/ro-RO.rc +++ b/dll/cpl/timedate/lang/ro-RO.rc @@ -56,4 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Următoarea sincronizare: %s la %s" IDS_INETTIMESYNCING "Așteptați sincronizarea cu %s" IDS_INETTIMEERROR "A survenit o eroare la sincronizarea cu %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/ru-RU.rc b/dll/cpl/timedate/lang/ru-RU.rc index 9ad368508bd..8d2360003a4 100644 --- a/dll/cpl/timedate/lang/ru-RU.rc +++ b/dll/cpl/timedate/lang/ru-RU.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Следующая синхронизация через: %s в %s" IDS_INETTIMESYNCING "Подождите, пока РеактОС синхронизирует время с %s" IDS_INETTIMEERROR "Возникла ошибка во время синхронизации с %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/sk-SK.rc b/dll/cpl/timedate/lang/sk-SK.rc index cd011f73803..64b9ead94f3 100644 --- a/dll/cpl/timedate/lang/sk-SK.rc +++ b/dll/cpl/timedate/lang/sk-SK.rc @@ -61,4 +61,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Ďalšia synchronizácia: %s o %s" IDS_INETTIMESYNCING "Počkajte prosím, kým ReactOS zosynchronizuje čas s %s" IDS_INETTIMEERROR "Počas synchronizácie systému ReactOS s %s sa vyskytla chyba." + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/sq-AL.rc b/dll/cpl/timedate/lang/sq-AL.rc index 82ab28654cd..053a867ecd8 100644 --- a/dll/cpl/timedate/lang/sq-AL.rc +++ b/dll/cpl/timedate/lang/sq-AL.rc @@ -58,4 +58,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Sinkronizimi tjetër: %s në %s" IDS_INETTIMESYNCING "Ju lutem prisni ndërkohë që ReactOS sinkronizon orën me %s" IDS_INETTIMEERROR "Një gabim ndodhi gjatë sinkronizimit të ReactOS me %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/sv-SE.rc b/dll/cpl/timedate/lang/sv-SE.rc index 129c4457e39..55d81eca4bf 100644 --- a/dll/cpl/timedate/lang/sv-SE.rc +++ b/dll/cpl/timedate/lang/sv-SE.rc @@ -56,4 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/th-TH.rc b/dll/cpl/timedate/lang/th-TH.rc index f3c8a210ea8..fc643b1e278 100644 --- a/dll/cpl/timedate/lang/th-TH.rc +++ b/dll/cpl/timedate/lang/th-TH.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "การปรับเทียบต่อไป: %s ใน %s" IDS_INETTIMESYNCING "โปรดรอ ReactOS กำลังปรับเทียบเวลาภายใน %s" IDS_INETTIMEERROR "เกิดการผิดพลาดในขณะที่ ReactOS กำลังปรับเทียบเวลาภายใน %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/tr-TR.rc b/dll/cpl/timedate/lang/tr-TR.rc index ebfcfee1461..1b04b964ebe 100644 --- a/dll/cpl/timedate/lang/tr-TR.rc +++ b/dll/cpl/timedate/lang/tr-TR.rc @@ -56,4 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Bir Sonraki Eşleştirme: %s.%s" IDS_INETTIMESYNCING "ReactOS, saati %s ile eşleştirirken lütfen bekleyiniz." IDS_INETTIMEERROR "ReactOS, %s ile eşleştirirken bir yanlışlık oldu." + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/uk-UA.rc b/dll/cpl/timedate/lang/uk-UA.rc index 454e68396b8..18bda28d237 100644 --- a/dll/cpl/timedate/lang/uk-UA.rc +++ b/dll/cpl/timedate/lang/uk-UA.rc @@ -62,4 +62,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Наступна синхронізація: %s в %s" IDS_INETTIMESYNCING "Будь ласка зачекайте, поки ReactOS синхронізує час з %s" IDS_INETTIMEERROR "Помилка під час синхронізації з %s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/zh-CN.rc b/dll/cpl/timedate/lang/zh-CN.rc index a83db551000..73e00ff8828 100644 --- a/dll/cpl/timedate/lang/zh-CN.rc +++ b/dll/cpl/timedate/lang/zh-CN.rc @@ -54,4 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "下次同步:%s 在 %s" IDS_INETTIMESYNCING "请稍候，ReactOS 正在同步 %s" IDS_INETTIMEERROR "在 ReactOS 同步时发生了一个错误。%s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/lang/zh-TW.rc b/dll/cpl/timedate/lang/zh-TW.rc index 7f06777504c..08d3b824afb 100644 --- a/dll/cpl/timedate/lang/zh-TW.rc +++ b/dll/cpl/timedate/lang/zh-TW.rc @@ -56,4 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "下次同步:%s 在 %s" IDS_INETTIMESYNCING "請等待，ReactOS 正在同步 %s" IDS_INETTIMEERROR "在 ReactOS 同步時發生了一個錯誤。%s" + IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" + IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" END diff --git a/dll/cpl/timedate/resource.h b/dll/cpl/timedate/resource.h index c51bc0b084d..f23b9a4316a 100644 --- a/dll/cpl/timedate/resource.h +++ b/dll/cpl/timedate/resource.h @@ -36,3 +36,5 @@ #define IDS_INETTIMENEXTSYNC 1007 #define IDS_INETTIMESYNCING 1008 #define IDS_INETTIMEERROR 1009 +#define IDS_INETTIMESUCFILL 1010 +#define IDS_INETTIMEWELCOME 1011 diff --git a/dll/cpl/timedate/timedate.h b/dll/cpl/timedate/timedate.h index 500421758b7..306889fe159 100644 --- a/dll/cpl/timedate/timedate.h +++ b/dll/cpl/timedate/timedate.h @@ -17,6 +17,7 @@ #include <commctrl.h> #include <cpl.h> #include <debug.h> +#include <strsafe.h> #include "resource.h" @@ -34,6 +35,16 @@ typedef struct APPLET_PROC AppletProc; } APPLET, *PAPPLET; +typedef struct +{ + WCHAR szSyncSuc[BUFSIZE]; + WCHAR szSyncWait[BUFSIZE]; + WCHAR szSyncErr[BUFSIZE]; + WCHAR szSyncType[BUFSIZE]; + WCHAR szSyncInit[BUFSIZE]; + LPWSTR lpszSyncStatus; +} SYNC_STATUS, *PSYNC_STATUS; + extern HINSTANCE hApplet;

4 years, 7 months

[reactos] 02/02: [CMAKE] Enable C4101 (unreferenced local variable) for MSVC builds.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11ecf5c969bffb4f245bd… commit 11ecf5c969bffb4f245bd84e86e25a6ec70509c9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Feb 24 10:48:24 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Feb 24 11:01:43 2020 +0100 [CMAKE] Enable C4101 (unreferenced local variable) for MSVC builds. This is already an error in GCC builds, so will make it harder for the MSVC crowd to accidentally break GCC build. --- sdk/cmake/msvc.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 3b576cf867d..c1aad7a01fe 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -95,6 +95,7 @@ add_compile_flags("/wd4018") # - TODO: C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) # - C4098: void function returning a value +# - C4101: unreferenced local variable # - C4113: parameter lists differ # - C4129: unrecognized escape sequence # - C4133: incompatible types - from '<x> *' to '<y> *' @@ -108,7 +109,7 @@ add_compile_flags("/wd4018") # - C4700: uninitialized variable usage # - C4715: 'function': not all control paths return a value # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

4 years, 7 months

[reactos] 01/02: [TRAVIS] Disable code format checker in CI.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdb6af05a7236ed45ee96… commit cdb6af05a7236ed45ee96326a33511953469f529 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Feb 24 10:12:30 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Feb 24 11:01:09 2020 +0100 [TRAVIS] Disable code format checker in CI. The configuration is not final yet and we have a lot of files that don't follow the suggested style. At this point, having it active in CI means builds are essentially always red, and we miss actual compilation errors. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01e6d118601..d80547d7242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ env: - CLFORMAT_BINARY=clang-format-9 jobs: - DO_BUILD=1 - - DO_CHECK=1 before_install: - ln -s /usr/share/clang/clang-format-9/clang-format-diff.py ./sdk/tools/;

4 years, 7 months

[reactos] 01/01: [MSVCRT_WINETEST] Fix build by adding '-Wno-format'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1ac13c64bfaad8fbfee0… commit d1ac13c64bfaad8fbfee0520de286fda21edddb7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 24 09:43:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Feb 24 09:43:58 2020 +0900 [MSVCRT_WINETEST] Fix build by adding '-Wno-format' ed909ba broke build. --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index f69446b084c..f63fa637a9b 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -27,6 +27,10 @@ list(APPEND SOURCE add_executable(msvcrt_winetest ${SOURCE} testlist.c) +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(msvcrt_winetest "-Wno-format") +endif() + set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32)

4 years, 7 months

[reactos] 01/01: [HAL] Fix debug prints in ShowSize() and its caller (#2377)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbeaef63c1b8253fd4ede… commit dbeaef63c1b8253fd4edefe643d1f6a96bd69174 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Feb 24 01:02:40 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 23 23:02:40 2020 +0100 [HAL] Fix debug prints in ShowSize() and its caller (#2377) --- hal/halx86/legacy/bussupp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index ba44b4cec91..87fe6cbab72 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -792,7 +792,7 @@ ShowSize(ULONG x) { DbgPrint("%d", x); } - DbgPrint("]\n"); + DbgPrint("]"); } /* @@ -980,6 +980,7 @@ HalpDebugPciDumpBus(IN ULONG i, (Mem & PCI_ADDRESS_MEMORY_PREFETCHABLE) ? "" : "non-"); ShowSize(Size); } + DbgPrint("\n"); } } }

4 years, 7 months

[reactos] 01/01: More very serious issue pointed out by gcc

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60e89359c19acafffdadc… commit 60e89359c19acafffdadc01a3b930776cb572762 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 23 22:41:13 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 22:41:42 2020 +0100 More very serious issue pointed out by gcc --- base/applications/rapps/gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 0804b4a614f..43f27202e91 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1868,7 +1868,7 @@ public: if (current < 0) current = (_countof(Controls) - 1); - else if (current >= _countof(Controls)) + else if ((UINT)current >= _countof(Controls)) current = 0; ::SetFocus(Controls[current]);

4 years, 7 months

[reactos] 01/01: [CONSRV] Fix setting the default screenbuffer and console view sizes when creating a new screenbuffer.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d3fb3e370be7e206762e… commit 1d3fb3e370be7e206762e23fa6c2d5b12dc86c6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 23 21:45:55 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 23 22:43:02 2020 +0100 [CONSRV] Fix setting the default screenbuffer and console view sizes when creating a new screenbuffer. For more information, see: https://docs.microsoft.com/en-us/windows/console/createconsolescreenbuffer#… --- win32ss/user/winsrv/consrv/condrv/conoutput.c | 2 +- win32ss/user/winsrv/consrv/condrv/console.c | 9 +++-- win32ss/user/winsrv/consrv/condrv/text.c | 34 +++++++++++-------- win32ss/user/winsrv/consrv/conoutput.c | 48 +++++++++++++++------------ win32ss/user/winsrv/consrv/include/conio.h | 9 ++--- 5 files changed, 59 insertions(+), 43 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/conoutput.c b/win32ss/user/winsrv/consrv/condrv/conoutput.c index 3e6f2407607..bec9903f814 100644 --- a/win32ss/user/winsrv/consrv/condrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/condrv/conoutput.c @@ -82,7 +82,7 @@ ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN ULONG BufferType, IN PVOID ScreenBufferInfo) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_UNSUCCESSFUL; if ( Console == NULL || Buffer == NULL || (BufferType != CONSOLE_TEXTMODE_BUFFER && BufferType != CONSOLE_GRAPHICS_BUFFER) ) diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index f888b755c2c..50542ec3025 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -185,9 +185,11 @@ ConDrvInitConsole(OUT PCONSOLE* NewConsole, } /* - * Fix the screen buffer size if needed. The rule is: - * ScreenBufferSize >= ConsoleSize + * Set and fix the screen buffer size if needed. + * The rule is: ScreenBufferSize >= ConsoleSize */ + if (ConsoleInfo->ScreenBufferSize.X == 0) ConsoleInfo->ScreenBufferSize.X = 1; + if (ConsoleInfo->ScreenBufferSize.Y == 0) ConsoleInfo->ScreenBufferSize.Y = 1; if (ConsoleInfo->ScreenBufferSize.X < ConsoleInfo->ConsoleSize.X) ConsoleInfo->ScreenBufferSize.X = ConsoleInfo->ConsoleSize.X; if (ConsoleInfo->ScreenBufferSize.Y < ConsoleInfo->ConsoleSize.Y) @@ -224,10 +226,11 @@ ConDrvInitConsole(OUT PCONSOLE* NewConsole, /* Initialize a new text-mode screen buffer with default settings */ ScreenBufferInfo.ScreenBufferSize = ConsoleInfo->ScreenBufferSize; + ScreenBufferInfo.ViewSize = ConsoleInfo->ConsoleSize; ScreenBufferInfo.ScreenAttrib = ConsoleInfo->ScreenAttrib; ScreenBufferInfo.PopupAttrib = ConsoleInfo->PopupAttrib; - ScreenBufferInfo.IsCursorVisible = TRUE; ScreenBufferInfo.CursorSize = ConsoleInfo->CursorSize; + ScreenBufferInfo.IsCursorVisible = TRUE; InitializeListHead(&Console->BufferList); Status = ConDrvCreateScreenBuffer(&NewBuffer, diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index 33abb74b642..d38317de29a 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -76,6 +76,12 @@ TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, if (Console == NULL || Buffer == NULL || TextModeInfo == NULL) return STATUS_INVALID_PARAMETER; + if ((TextModeInfo->ScreenBufferSize.X == 0) || + (TextModeInfo->ScreenBufferSize.Y == 0)) + { + return STATUS_INVALID_PARAMETER; + } + *Buffer = NULL; Status = CONSOLE_SCREEN_BUFFER_Initialize((PCONSOLE_SCREEN_BUFFER*)&NewBuffer, @@ -95,10 +101,16 @@ TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, return STATUS_INSUFFICIENT_RESOURCES; } - NewBuffer->ScreenBufferSize = NewBuffer->OldScreenBufferSize - = TextModeInfo->ScreenBufferSize; - NewBuffer->ViewSize = NewBuffer->OldViewSize - = Console->ConsoleSize; + NewBuffer->ScreenBufferSize = TextModeInfo->ScreenBufferSize; + NewBuffer->OldScreenBufferSize = NewBuffer->ScreenBufferSize; + + /* + * Set and fix the view size if needed. + * The rule is: ScreenBufferSize >= ViewSize (== ConsoleSize) + */ + NewBuffer->ViewSize.X = min(max(TextModeInfo->ViewSize.X, 1), NewBuffer->ScreenBufferSize.X); + NewBuffer->ViewSize.Y = min(max(TextModeInfo->ViewSize.Y, 1), NewBuffer->ScreenBufferSize.Y); + NewBuffer->OldViewSize = NewBuffer->ViewSize; NewBuffer->ViewOrigin.X = NewBuffer->ViewOrigin.Y = 0; NewBuffer->VirtualY = 0; @@ -465,15 +477,11 @@ ConioResizeBuffer(PCONSOLE Console, ScreenBuffer->ScreenBufferSize = ScreenBuffer->OldScreenBufferSize = Size; ScreenBuffer->VirtualY = 0; - /* Ensure cursor and window are within buffer */ - if (ScreenBuffer->CursorPosition.X >= Size.X) - ScreenBuffer->CursorPosition.X = Size.X - 1; - if (ScreenBuffer->CursorPosition.Y >= Size.Y) - ScreenBuffer->CursorPosition.Y = Size.Y - 1; - if (ScreenBuffer->ViewOrigin.X > Size.X - ScreenBuffer->ViewSize.X) - ScreenBuffer->ViewOrigin.X = Size.X - ScreenBuffer->ViewSize.X; - if (ScreenBuffer->ViewOrigin.Y > Size.Y - ScreenBuffer->ViewSize.Y) - ScreenBuffer->ViewOrigin.Y = Size.Y - ScreenBuffer->ViewSize.Y; + /* Ensure the cursor and the view are within the buffer */ + ScreenBuffer->CursorPosition.X = min(ScreenBuffer->CursorPosition.X, Size.X - 1); + ScreenBuffer->CursorPosition.Y = min(ScreenBuffer->CursorPosition.Y, Size.Y - 1); + ScreenBuffer->ViewOrigin.X = min(ScreenBuffer->ViewOrigin.X, Size.X - ScreenBuffer->ViewSize.X); + ScreenBuffer->ViewOrigin.Y = min(ScreenBuffer->ViewOrigin.Y, Size.Y - ScreenBuffer->ViewSize.Y); /* * Trigger a buffer resize event diff --git a/win32ss/user/winsrv/consrv/conoutput.c b/win32ss/user/winsrv/consrv/conoutput.c index 079d781514c..15fd4ff5ede 100644 --- a/win32ss/user/winsrv/consrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/conoutput.c @@ -204,6 +204,7 @@ CSR_API(SrvCreateConsoleScreenBuffer) PVOID ScreenBufferInfo = NULL; TEXTMODE_BUFFER_INFO TextModeInfo = {{80, 25}, + {80, 25}, DEFAULT_SCREEN_ATTRIB, DEFAULT_POPUP_ATTRIB , TRUE, @@ -221,29 +222,18 @@ CSR_API(SrvCreateConsoleScreenBuffer) ScreenBufferInfo = &TextModeInfo; /* - if (Console->ActiveBuffer) - { - TextModeInfo.ScreenBufferSize = Console->ActiveBuffer->ScreenBufferSize; - if (TextModeInfo.ScreenBufferSize.X == 0) TextModeInfo.ScreenBufferSize.X = 80; - if (TextModeInfo.ScreenBufferSize.Y == 0) TextModeInfo.ScreenBufferSize.Y = 25; - - TextModeInfo.ScreenAttrib = Console->ActiveBuffer->ScreenBuffer.TextBuffer.ScreenDefaultAttrib; - TextModeInfo.PopupAttrib = Console->ActiveBuffer->ScreenBuffer.TextBuffer.PopupDefaultAttrib; - - TextModeInfo.IsCursorVisible = Console->ActiveBuffer->CursorInfo.bVisible; - TextModeInfo.CursorSize = Console->ActiveBuffer->CursorInfo.dwSize; - } - */ - - /* - * This is Windows behaviour. + * This is Windows behaviour, as described by MSDN and verified manually: + * + * The newly created screen buffer will copy some properties from the + * active screen buffer at the time that this function is called. + * The behavior is as follows: + * Font - copied from active screen buffer. + * Display Window Size - copied from active screen buffer. + * Buffer Size - matched to Display Window Size (NOT copied). + * Default Attributes (colors) - copied from active screen buffer. + * Default Popup Attributes (colors) - copied from active screen buffer. */ - /* Use the current console size. Normalize it if needed */ - TextModeInfo.ScreenBufferSize = Console->ConsoleSize; - if (TextModeInfo.ScreenBufferSize.X == 0) TextModeInfo.ScreenBufferSize.X = 1; - if (TextModeInfo.ScreenBufferSize.Y == 0) TextModeInfo.ScreenBufferSize.Y = 1; - /* If we have an active screen buffer, use its attributes as the new ones */ if (Console->ActiveBuffer && GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) { @@ -252,9 +242,23 @@ CSR_API(SrvCreateConsoleScreenBuffer) TextModeInfo.ScreenAttrib = Buffer->ScreenDefaultAttrib; TextModeInfo.PopupAttrib = Buffer->PopupDefaultAttrib; - TextModeInfo.IsCursorVisible = Buffer->CursorInfo.bVisible; TextModeInfo.CursorSize = Buffer->CursorInfo.dwSize; + TextModeInfo.IsCursorVisible = Buffer->CursorInfo.bVisible; + + /* Use the current view size */ + TextModeInfo.ScreenBufferSize = Buffer->ViewSize; + TextModeInfo.ViewSize = Buffer->ViewSize; } + else + { + /* Use the current console size */ + TextModeInfo.ScreenBufferSize = Console->ConsoleSize; + TextModeInfo.ViewSize = Console->ConsoleSize; + } + + /* Normalize the screen buffer size if needed */ + if (TextModeInfo.ScreenBufferSize.X == 0) TextModeInfo.ScreenBufferSize.X = 1; + if (TextModeInfo.ScreenBufferSize.Y == 0) TextModeInfo.ScreenBufferSize.Y = 1; } else if (CreateScreenBufferRequest->ScreenBufferType == CONSOLE_GRAPHICS_BUFFER) { diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index 17837c643f1..cff5de40975 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -105,8 +105,8 @@ struct _CONSOLE_SCREEN_BUFFER HPALETTE PaletteHandle; /* Handle to the color palette associated to this buffer */ UINT PaletteUsage; /* The new use of the system palette. See SetSystemPaletteUse 'uUsage' parameter */ -// WORD ScreenDefaultAttrib; /* Default screen char attribute */ -// WORD PopupDefaultAttrib; /* Default popup char attribute */ +// USHORT ScreenDefaultAttrib; /* Default screen char attribute */ +// USHORT PopupDefaultAttrib; /* Default popup char attribute */ USHORT Mode; /* Output buffer modes */ }; @@ -141,6 +141,7 @@ struct _CONSOLE_SCREEN_BUFFER typedef struct _TEXTMODE_BUFFER_INFO { COORD ScreenBufferSize; + COORD ViewSize; USHORT ScreenAttrib; USHORT PopupAttrib; ULONG CursorSize; @@ -153,8 +154,8 @@ typedef struct _TEXTMODE_SCREEN_BUFFER PCHAR_INFO Buffer; /* Pointer to UNICODE screen buffer (Buffer->Char.UnicodeChar only is valid, not Char.AsciiChar) */ - WORD ScreenDefaultAttrib; /* Default screen char attribute */ - WORD PopupDefaultAttrib; /* Default popup char attribute */ + USHORT ScreenDefaultAttrib; /* Default screen char attribute */ + USHORT PopupDefaultAttrib; /* Default popup char attribute */ } TEXTMODE_SCREEN_BUFFER, *PTEXTMODE_SCREEN_BUFFER;

4 years, 7 months

[reactos] 01/01: gcc is crying again

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=309f7e94430f65e7270e8… commit 309f7e94430f65e7270e82a1646804e9d610367a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 23 22:36:03 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 22:36:03 2020 +0100 gcc is crying again --- base/applications/rapps/gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 182d1068665..0804b4a614f 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1857,7 +1857,7 @@ public: // When there is no control found, go to the first or last (depending on tab vs shift-tab) int current = direction > 0 ? 0 : (_countof(Controls) - 1); HWND hActive = ::GetFocus(); - for (int n = 0; n < _countof(Controls); ++n) + for (size_t n = 0; n < _countof(Controls); ++n) { if (hActive == Controls[n]) {

4 years, 7 months

[reactos] 01/01: [NTOS:CONFIG] Fix NtSetValueKey data probing

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=482eb909fe8bc1dfcb9cb… commit 482eb909fe8bc1dfcb9cbfa5c55c8d4060a565ea Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 23 21:35:57 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 23 21:35:57 2020 +0100 [NTOS:CONFIG] Fix NtSetValueKey data probing Probe the data before allocating a copy buffer. Otherwise NtSetValueKey returns an unexpected status code in case of too large data size. This fixes the NtSetValueKey ntdll api tests. --- ntoskrnl/config/ntapi.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index b672a9bc889..5e8f356a229 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -890,16 +890,35 @@ NtSetValueKey(IN HANDLE KeyHandle, /* Probe and copy the data */ if ((PreviousMode != KernelMode) && (DataSize != 0)) { - PVOID DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM); + PVOID DataCopy = NULL; + + _SEH2_TRY + { + ProbeForRead(Data, DataSize, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; + } + + DataCopy = ExAllocatePoolWithTag(PagedPool, DataSize, TAG_CM); if (!DataCopy) { /* Dereference and return status */ ObDereferenceObject(KeyObject); return STATUS_INSUFFICIENT_RESOURCES; } + _SEH2_TRY { - ProbeForRead(Data, DataSize, 1); RtlCopyMemory(DataCopy, Data, DataSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -915,6 +934,7 @@ NtSetValueKey(IN HANDLE KeyHandle, ObDereferenceObject(KeyObject); return Status; } + Data = DataCopy; }

4 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
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 February 2020