Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32_APITEST] Disable SHChangeNotify testcase by DISABLE_THIS_TESTCASE macro
by Katayama Hirofumi MZ 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=691139c0902640835aa54… commit 691139c0902640835aa5414c97491495ed128157 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 27 09:57:11 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 27 09:58:35 2021 +0900 [SHELL32_APITEST] Disable SHChangeNotify testcase by DISABLE_THIS_TESTCASE macro SHChangeNotify testcase takes 6min. Too heavy. CORE-13950 --- modules/rostests/apitests/shell32/SHChangeNotify.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index 50481848357..71fd9b54e15 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -14,7 +14,7 @@ #include <versionhelpers.h> // --- The selection of tests --- -//#define DISABLE_THIS_TESTCASE +#define DISABLE_THIS_TESTCASE #define NO_TRIVIAL //#define NO_INTERRUPT_LEVEL //#define NO_SHELL_LEVEL

1 0

[reactos] 01/01: [SHELL32_APITEST] Strengthen SHChangeNotify testcase more and more (#4174)
by Katayama Hirofumi MZ 27 Dec '21

27 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9cf359675f0ab4c71dd… commit 7e9cf359675f0ab4c71dd459fea955d509cf4449 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 27 09:45:44 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 27 09:45:44 2021 +0900 [SHELL32_APITEST] Strengthen SHChangeNotify testcase more and more (#4174) CORE-13950 --- .../rostests/apitests/shell32/SHChangeNotify.cpp | 1035 +++++++++++++++----- modules/rostests/apitests/shell32/SHChangeNotify.h | 79 +- .../apitests/shell32/shell32_apitest_sub.cpp | 162 +-- 3 files changed, 916 insertions(+), 360 deletions(-) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index 377b9ce1cec..50481848357 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -2,213 +2,502 @@ * 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) + * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -// NOTE: This test program closes the Explorer cabinets before tests. +// NOTE: This test program closes the Explorer windows before tests. #include "shelltest.h" -#include <shlwapi.h> -#include <stdio.h> #include "SHChangeNotify.h" - -#define DONT_SEND 0x24242424 +#include <time.h> +#include <process.h> +#include <versionhelpers.h> + +// --- The selection of tests --- +//#define DISABLE_THIS_TESTCASE +#define NO_TRIVIAL +//#define NO_INTERRUPT_LEVEL +//#define NO_SHELL_LEVEL +#define NEW_DELIVERY_ONLY +//#define RANDOM_HALF +#define RANDOM_QUARTER + +// --- Show the elapsed time by GetTickCount() --- +//#define ENTRY_TICK +#define GROUP_TICK +#define TOTAL_TICK static HWND s_hwnd = NULL; -static const WCHAR s_szName[] = L"SHChangeNotify testcase"; static WCHAR s_szSubProgram[MAX_PATH]; +static HANDLE s_hThread = NULL; +static HANDLE s_hEvent = NULL; + +static HWND DoWaitForWindow(LPCWSTR clsname, LPCWSTR text, BOOL bClosing, BOOL bForce) +{ + HWND hwnd = NULL; + for (INT i = 0; i < 50; ++i) + { + hwnd = FindWindowW(clsname, text); + if (bClosing) + { + if (!hwnd) + break; + + if (bForce) + PostMessage(hwnd, WM_CLOSE, 0, 0); + } + else + { + if (hwnd) + break; + } + + Sleep(1); + } + return hwnd; +} + +static BOOL DoCreateEmptyFile(LPCWSTR pszFileName) +{ + FILE *fp = _wfopen(pszFileName, L"wb"); + if (fp) + fclose(fp); + return fp != NULL; +} -typedef void (*ACTION)(void); +struct TEST_ENTRY; + +typedef BOOL (*ACTION)(const struct TEST_ENTRY *entry); typedef struct TEST_ENTRY { INT line; - DWORD event; - LPCVOID item1; - LPCVOID item2; + DIRTYPE iWriteDir; LPCSTR pattern; - ACTION action; LPCWSTR path1; LPCWSTR path2; + ACTION action; } TEST_ENTRY; -static BOOL -DoCreateEmptyFile(LPCWSTR pszFileName) +#define TEST_FILE L"_TEST_.txt" +#define TEST_FILE_KAI L"_TEST_KAI_.txt" +#define TEST_DIR L"_TESTDIR_" +#define TEST_DIR_KAI L"_TESTDIR_KAI_" +#define MOVE_FILE(from, to) MoveFileW((from), (to)) + +static BOOL DoAction1(const TEST_ENTRY *entry) { - FILE *fp = _wfopen(pszFileName, L"wb"); - fclose(fp); - return fp != NULL; + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_FILE); + ok(DoCreateEmptyFile(pszPath), "Line %d: DoCreateEmptyFile failed\n", entry->line); + return TRUE; } -static void -DoAction1(void) +static BOOL DoAction2(const TEST_ENTRY *entry) { - ok_int(CreateDirectoryW(s_dir2, NULL), TRUE); + LPWSTR pszPath1 = DoGetDir(entry->iWriteDir), pszPath2 = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath1, TEST_FILE); + PathAppendW(pszPath2, TEST_FILE_KAI); + ok(MOVE_FILE(pszPath1, pszPath2), "Line %d: MOVE_FILE(%ls, %ls) failed (%ld)\n", + entry->line, pszPath1, pszPath2, GetLastError()); + return TRUE; } -static void -DoAction2(void) +static BOOL DoAction3(const TEST_ENTRY *entry) { - ok_int(RemoveDirectoryW(s_dir2), TRUE); + LPWSTR pszPath1 = DoGetDir(entry->iWriteDir), pszPath2 = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath1, TEST_FILE_KAI); + PathAppendW(pszPath2, TEST_FILE); + ok(MOVE_FILE(pszPath1, pszPath2), "Line %d: MOVE_FILE(%ls, %ls) failed (%ld)\n", + entry->line, pszPath1, pszPath2, GetLastError()); + return TRUE; } -static void -DoAction3(void) +static BOOL DoAction4(const TEST_ENTRY *entry) { - ok_int(MoveFileExW(s_dir2, s_dir3, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING), TRUE); + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_FILE); + ok(DeleteFileW(pszPath), "Line %d: DeleteFileW(%ls) failed (%ld)\n", + entry->line, pszPath, GetLastError()); + return TRUE; } -static void -DoAction4(void) +static BOOL DoAction5(const TEST_ENTRY *entry) { - ok_int(DoCreateEmptyFile(s_file1), TRUE); + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_DIR); + ok(CreateDirectoryW(pszPath, NULL), "Line %d: CreateDirectoryW(%ls) failed (%ld)\n", + entry->line, pszPath, GetLastError()); + return TRUE; } -static void -DoAction5(void) +static BOOL DoAction6(const TEST_ENTRY *entry) { - ok_int(MoveFileExW(s_file1, s_file2, MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING), TRUE); + LPWSTR pszPath1 = DoGetDir(entry->iWriteDir), pszPath2 = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath1, TEST_DIR); + PathAppendW(pszPath2, TEST_DIR_KAI); + ok(MOVE_FILE(pszPath1, pszPath2), "Line %d: MOVE_FILE(%ls, %ls) failed (%ld)\n", + entry->line, pszPath1, pszPath2, GetLastError()); + return TRUE; } -static void -DoAction6(void) +static BOOL DoAction7(const TEST_ENTRY *entry) { - ok_int(DeleteFileW(s_file2), TRUE); + LPWSTR pszPath1 = DoGetDir(entry->iWriteDir), pszPath2 = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath1, TEST_DIR_KAI); + PathAppendW(pszPath2, TEST_DIR); + ok(MOVE_FILE(pszPath1, pszPath2), "Line %d: MOVE_FILE(%ls, %ls) failed (%ld)\n", + entry->line, pszPath1, pszPath2, GetLastError()); + return TRUE; } -static void -DoAction7(void) +static BOOL DoAction8(const TEST_ENTRY *entry) { - DeleteFileW(s_file1); - DeleteFileW(s_file2); - ok_int(RemoveDirectoryW(s_dir3), TRUE); + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_DIR); + ok(RemoveDirectoryW(pszPath), "Line %d: RemoveDirectoryW(%ls) failed (%ld)\n", + entry->line, pszPath, GetLastError()); + return TRUE; } -static void -DoAction8(void) +static BOOL DoAction9(const TEST_ENTRY *entry) +{ + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_FILE); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW | SHCNF_FLUSH, pszPath, NULL); + return FALSE; +} + +static BOOL DoAction10(const TEST_ENTRY *entry) { - BOOL ret = RemoveDirectoryW(s_dir1); - ok(ret, "RemoveDirectoryW failed. GetLastError() == %ld\n", GetLastError()); + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_FILE); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW | SHCNF_FLUSH, pszPath, NULL); + return FALSE; } -static const TEST_ENTRY s_TestEntriesMode0[] = -{ - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, NULL, DoAction1, NULL, NULL}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00001000", NULL, s_dir2, L""}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00001000", DoAction2, s_dir2, L""}, - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00010000", DoAction1, s_dir2, L""}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "00000001", NULL, s_dir2, s_dir3}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "00000001", DoAction3, s_dir2, s_dir3}, - {__LINE__, SHCNE_CREATE, s_file1, NULL, "01000000", NULL, s_file1, L""}, - {__LINE__, SHCNE_CREATE, s_file1, s_file2, "01000000", NULL, s_file1, s_file2}, - {__LINE__, SHCNE_CREATE, s_file1, NULL, "01000000", DoAction4, s_file1, L""}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "10000000", NULL, s_file1, s_file2}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "10000000", DoAction5, s_file1, s_file2}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "10000000", NULL, s_file1, s_file2}, - {__LINE__, SHCNE_UPDATEITEM, s_file1, NULL, "00000010", NULL, s_file1, L""}, - {__LINE__, SHCNE_UPDATEITEM, s_file2, NULL, "00000010", NULL, s_file2, L""}, - {__LINE__, SHCNE_DELETE, s_file1, NULL, "00100000", NULL, s_file1, L""}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00100000", NULL, s_file2, L""}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00100000", DoAction6, s_file2, L""}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00100000", NULL, s_file2, L""}, - {__LINE__, SHCNE_DELETE, s_file1, NULL, "00100000", NULL, s_file1, L""}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00001000", NULL, s_dir2, L""}, - {__LINE__, SHCNE_RMDIR, s_dir3, NULL, "00001000", DoAction7, s_dir3, L""}, - {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "00001000", NULL, s_dir1, L""}, - {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "00001000", DoAction8, s_dir1, L""}, +static BOOL DoAction11(const TEST_ENTRY *entry) +{ + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_DIR); + SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW | SHCNF_FLUSH, pszPath, NULL); + return FALSE; +} + +static BOOL DoAction12(const TEST_ENTRY *entry) +{ + LPWSTR pszPath = DoGetDir(entry->iWriteDir); + PathAppendW(pszPath, TEST_DIR); + SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW | SHCNF_FLUSH, pszPath, NULL); + return FALSE; +} + +#define WRITEDIR_0 DIRTYPE_DESKTOP +static WCHAR s_szDesktop[MAX_PATH]; +static WCHAR s_szTestFile0[MAX_PATH]; +static WCHAR s_szTestFile0Kai[MAX_PATH]; +static WCHAR s_szTestDir0[MAX_PATH]; +static WCHAR s_szTestDir0Kai[MAX_PATH]; + +#define WRITEDIR_1 DIRTYPE_MYDOCUMENTS +static WCHAR s_szDocuments[MAX_PATH]; +static WCHAR s_szTestFile1[MAX_PATH]; +static WCHAR s_szTestFile1Kai[MAX_PATH]; +static WCHAR s_szTestDir1[MAX_PATH]; +static WCHAR s_szTestDir1Kai[MAX_PATH]; + +static void DoDeleteFilesAndDirs(void) +{ + DeleteFileW(TEMP_FILE); + DeleteFileW(s_szTestFile0); + DeleteFileW(s_szTestFile0Kai); + DeleteFileW(s_szTestFile1); + DeleteFileW(s_szTestFile1Kai); + RemoveDirectoryW(s_szTestDir0); + RemoveDirectoryW(s_szTestDir0Kai); + RemoveDirectoryW(s_szTestDir1); + RemoveDirectoryW(s_szTestDir1Kai); +} + +static const TEST_ENTRY s_group_00[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction12 }, }; -#define s_TestEntriesMode1 s_TestEntriesMode0 -#define s_TestEntriesMode2 s_TestEntriesMode0 - -static const TEST_ENTRY s_TestEntriesMode3[] = -{ - {__LINE__, DONT_SEND, s_dir2, NULL, NULL, DoAction1, NULL, NULL}, - {__LINE__, DONT_SEND, s_dir2, NULL, "00001000", DoAction2, s_dir2, L""}, - {__LINE__, DONT_SEND, s_dir2, NULL, "00010000", DoAction1, s_dir2, L""}, - {__LINE__, DONT_SEND, s_dir2, s_dir3, "00000001", DoAction3, s_dir2, s_dir3}, - {__LINE__, DONT_SEND, s_file1, NULL, "01000000", DoAction4, s_file1, L""}, - {__LINE__, DONT_SEND, s_file1, s_file2, "10000000", DoAction5, s_file1, s_file2}, - {__LINE__, DONT_SEND, s_file2, NULL, "00100000", DoAction6, s_file2, L""}, - {__LINE__, DONT_SEND, s_dir3, NULL, "00001000", DoAction7, s_dir3, L""}, - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_MKDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, +static const TEST_ENTRY s_group_01[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction12 }, }; -static const TEST_ENTRY s_TestEntriesMode4[] = -{ - {__LINE__, DONT_SEND, s_dir2, NULL, NULL, DoAction1, NULL, NULL}, - {__LINE__, DONT_SEND, s_dir2, NULL, "00001000", DoAction2, s_dir2, L""}, - {__LINE__, DONT_SEND, s_dir2, NULL, "00010000", DoAction1, s_dir2, L""}, - {__LINE__, DONT_SEND, s_dir2, s_dir3, "00000001", DoAction3, s_dir2, s_dir3}, - {__LINE__, DONT_SEND, s_file1, NULL, "01000000", DoAction4, s_file1, L""}, - {__LINE__, DONT_SEND, s_file1, s_file2, "10000000", DoAction5, s_file1, s_file2}, - {__LINE__, DONT_SEND, s_file2, NULL, "00100000", DoAction6, s_file2, L""}, - {__LINE__, DONT_SEND, s_dir3, NULL, "00001000", DoAction7, s_dir3, L""}, - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_MKDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, +static const TEST_ENTRY s_group_02[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction12 }, }; -static const TEST_ENTRY s_TestEntriesMode5[] = -{ - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00000000", DoAction1, NULL, NULL}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "00000000", DoAction2, NULL, NULL}, - {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "00000000", DoAction1, NULL, NULL}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "00000000", DoAction3, NULL, NULL}, - {__LINE__, SHCNE_CREATE, s_file1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_CREATE, s_file1, s_file2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_CREATE, s_file1, NULL, "00000000", DoAction4, NULL, NULL}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "00000000", DoAction5, NULL, NULL}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_UPDATEITEM, s_file1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_UPDATEITEM, s_file2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_UPDATEITEM, s_file1, s_file2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_UPDATEITEM, s_file2, s_file1, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file2, s_file1, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file1, s_file2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00000000", DoAction6, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_DELETE, s_file1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir2, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir3, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir1, s_dir2, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir1, s_dir3, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir2, s_dir1, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir2, s_dir3, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir3, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir3, NULL, "00000000", DoAction7, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir1, NULL, "00000000", NULL, NULL, NULL}, - {__LINE__, SHCNE_INTERRUPT | SHCNE_RMDIR, s_dir1, NULL, "00000000", DoAction8, NULL, NULL}, +static const TEST_ENTRY s_group_03[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction12 }, }; -LPCSTR PatternFromFlags(DWORD flags) +static const TEST_ENTRY s_group_04[] = { - static char s_buf[TYPE_RENAMEFOLDER + 1 + 1]; - DWORD i; - for (i = 0; i <= TYPE_RENAMEFOLDER; ++i) - { + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0, s_szTestFile0Kai, DoAction2 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0Kai, s_szTestFile0, DoAction3 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0, s_szTestDir0Kai, DoAction6 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0Kai, s_szTestDir0, DoAction7 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction12 }, +}; + +static const TEST_ENTRY s_group_05[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "1000000", s_szTestFile1, s_szTestFile1Kai, DoAction2 }, + { __LINE__, WRITEDIR_1, "1000000", s_szTestFile1Kai, s_szTestFile1, DoAction3 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000010", s_szTestDir1, s_szTestDir1Kai, DoAction6 }, + { __LINE__, WRITEDIR_1, "0000010", s_szTestDir1Kai, s_szTestDir1, DoAction7 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction12 }, +}; + +static const TEST_ENTRY s_group_06[] = +{ + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0, s_szTestFile0Kai, DoAction2 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0Kai, s_szTestFile0, DoAction3 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0, s_szTestDir0Kai, DoAction6 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0Kai, s_szTestDir0, DoAction7 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction12 }, +}; + +static const TEST_ENTRY s_group_07[] = +{ + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0, s_szTestFile0Kai, DoAction2 }, + { __LINE__, WRITEDIR_0, "1000000", s_szTestFile0Kai, s_szTestFile0, DoAction3 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0, s_szTestDir0Kai, DoAction6 }, + { __LINE__, WRITEDIR_0, "0000010", s_szTestDir0Kai, s_szTestDir0, DoAction7 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0100000", s_szTestFile0, L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0010000", s_szTestFile0, L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0001000", s_szTestDir0, L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000100", s_szTestDir0, L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000000", L"", L"", DoAction12 }, +}; + +static const TEST_ENTRY s_group_08[] = +{ + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction1 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction2 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction3 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction4 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction5 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction6 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction7 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction8 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction9 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction10 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction11 }, + { __LINE__, WRITEDIR_0, "0000000", L"", L"", DoAction12 }, + + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction1 }, + { __LINE__, WRITEDIR_1, "1000000", s_szTestFile1, s_szTestFile1Kai, DoAction2 }, + { __LINE__, WRITEDIR_1, "1000000", s_szTestFile1Kai, s_szTestFile1, DoAction3 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction4 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction5 }, + { __LINE__, WRITEDIR_1, "0000010", s_szTestDir1, s_szTestDir1Kai, DoAction6 }, + { __LINE__, WRITEDIR_1, "0000010", s_szTestDir1Kai, s_szTestDir1, DoAction7 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction8 }, + { __LINE__, WRITEDIR_1, "0100000", s_szTestFile1, L"", DoAction9 }, + { __LINE__, WRITEDIR_1, "0010000", s_szTestFile1, L"", DoAction10 }, + { __LINE__, WRITEDIR_1, "0001000", s_szTestDir1, L"", DoAction11 }, + { __LINE__, WRITEDIR_1, "0000100", s_szTestDir1, L"", DoAction12 }, +}; + +static LPCSTR PatternFromFlags(DWORD flags) +{ + static CHAR s_buf[(TYPE_MAX + 1) + 1]; + for (INT i = 0; i < (TYPE_MAX + 1); ++i) s_buf[i] = (char)('0' + !!(flags & (1 << i))); - } - s_buf[i] = 0; + + s_buf[TYPE_MAX + 1] = 0; return s_buf; } -static BOOL -DoGetPaths(LPWSTR pszPath1, LPWSTR pszPath2) +static BOOL DoGetPaths(LPWSTR pszPath1, LPWSTR pszPath2) { pszPath1[0] = pszPath2[0] = 0; WCHAR szText[MAX_PATH * 2]; szText[0] = 0; - if (FILE *fp = fopen(TEMP_FILE, "rb")) + FILE *fp = _wfopen(TEMP_FILE, L"rb"); + if (fp) { fread(szText, 1, sizeof(szText), fp); fclose(fp); @@ -219,56 +508,77 @@ DoGetPaths(LPWSTR pszPath1, LPWSTR pszPath2) return FALSE; *pch = 0; - lstrcpynW(pszPath1, szText, MAX_PATH); - lstrcpynW(pszPath2, pch + 1, MAX_PATH); + StringCchCopyW(pszPath1, MAX_PATH, szText); + StringCchCopyW(pszPath2, MAX_PATH, pch + 1); return TRUE; } -static void -DoTestEntry(const TEST_ENTRY *entry) +static void DoTestEntry(INT iEntry, const TEST_ENTRY *entry, INT nSources) { +#ifdef ENTRY_TICK + DWORD dwOldTick = GetTickCount(); +#endif + + BOOL bInterrupting = FALSE; if (entry->action) - { - (*entry->action)(); - } + bInterrupting = entry->action(entry); - if (entry->event != DONT_SEND) + DWORD flags; + LPCSTR pattern; + if ((nSources & SHCNRF_InterruptLevel) && bInterrupting) { - SHChangeNotify(entry->event, SHCNF_PATHW | SHCNF_FLUSH, entry->item1, entry->item2); + // The event won't work at here. Manually waiting... + UINT cTry = ((iEntry == 0) ? 100 : 60); + for (UINT iTry = 0; iTry < cTry; ++iTry) + { + flags = SendMessageW(s_hwnd, WM_GET_NOTIFY_FLAGS, 0, 0); + pattern = PatternFromFlags(flags); + if (strcmp(pattern, "0000000") != 0) + break; + + Sleep(1); + } } else { - SHChangeNotify(0, SHCNF_FLUSH, NULL, NULL); - } + if (WaitForSingleObject(s_hEvent, 100) == WAIT_OBJECT_0) + Sleep(1); - DWORD flags = SendMessageW(s_hwnd, WM_GET_NOTIFY_FLAGS, 0, 0); - LPCSTR pattern = PatternFromFlags(flags); - - if (entry->pattern) - { - ok(lstrcmpA(pattern, entry->pattern) == 0 || - lstrcmpA(pattern, "00000100") == 0, // SHCNE_UPDATEDIR - "Line %d: pattern mismatch '%s'\n", entry->line, pattern); + flags = SendMessageW(s_hwnd, WM_GET_NOTIFY_FLAGS, 0, 0); + pattern = PatternFromFlags(flags); } SendMessageW(s_hwnd, WM_SET_PATHS, 0, 0); - Sleep(50); WCHAR szPath1[MAX_PATH], szPath2[MAX_PATH]; szPath1[0] = szPath2[0] = 0; BOOL bOK = DoGetPaths(szPath1, szPath2); - if (lstrcmpA(pattern, "00000100") == 0) // SHCNE_UPDATEDIR + static UINT s_cCalmDown = 0; + + if (pattern[TYPE_UPDATEDIR] == '1') { + trace("Line %d: SHCNE_UPDATEDIR: Calm down (%u)...\n", entry->line, s_cCalmDown); + + if (++s_cCalmDown < 3) + Sleep(3000); + + if (entry->pattern) + ok(TRUE, "Line %d:\n", entry->line); if (entry->path1) - ok(bOK && lstrcmpiW(s_dir1, szPath1) == 0, - "Line %d: path1 mismatch '%S' (%d)\n", entry->line, szPath1, bOK); + ok(TRUE, "Line %d:\n", entry->line); if (entry->path2) - ok(bOK && lstrcmpiW(L"", szPath2) == 0, - "Line %d: path2 mismatch '%S' (%d)\n", entry->line, szPath2, bOK); + ok(TRUE, "Line %d:\n", entry->line); } else { + s_cCalmDown = 0; + if (entry->pattern) + { + ok(strcmp(pattern, entry->pattern) == 0, + "Line %d: pattern mismatch '%s', tick=0x%08lX\n", + entry->line, pattern, GetTickCount()); + } if (entry->path1) ok(bOK && lstrcmpiW(entry->path1, szPath1) == 0, "Line %d: path1 mismatch '%S' (%d)\n", entry->line, szPath1, bOK); @@ -278,43 +588,108 @@ DoTestEntry(const TEST_ENTRY *entry) } SendMessageW(s_hwnd, WM_CLEAR_FLAGS, 0, 0); + ResetEvent(s_hEvent); + +#ifdef ENTRY_TICK + DWORD dwNewTick = GetTickCount(); + DWORD dwTick = dwNewTick - dwOldTick; + trace("DoTestEntry: Line %d: tick=%lu.%lu sec\n", entry->line, + (dwTick / 1000), (dwTick / 100 % 10)); +#endif } -static BOOL -DoInit(void) +static void DoQuitTest(BOOL bForce) { - DoInitPaths(); + PostMessageW(s_hwnd, WM_COMMAND, IDOK, 0); - CreateDirectoryW(s_dir1, NULL); + DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, bForce); + s_hwnd = NULL; - // close Explorer before tests - INT i, nCount = 50; - for (i = 0; i < nCount; ++i) + if (s_hEvent) { - HWND hwnd = FindWindowW(L"CabinetWClass", NULL); - if (hwnd == NULL) - break; + CloseHandle(s_hEvent); + s_hEvent = NULL; + } - PostMessage(hwnd, WM_CLOSE, 0, 0); - Sleep(100); + DoDeleteFilesAndDirs(); +} + +static void DoAbortThread(void) +{ + skip("Aborting the thread...\n"); + if (s_hThread) + { + TerminateThread(s_hThread, -1); + s_hThread = NULL; } - if (i == nCount) - skip("Unable to close Explorer cabinet\n"); +} - return PathIsDirectoryW(s_dir1); +static BOOL CALLBACK HandlerRoutine(DWORD dwCtrlType) +{ + switch (dwCtrlType) + { + case CTRL_C_EVENT: + case CTRL_BREAK_EVENT: + DoAbortThread(); + DoQuitTest(TRUE); + return TRUE; + } + return FALSE; } -static void -DoEnd(HWND hwnd) +static BOOL DoInitTest(void) { - DeleteFileW(s_file1); - DeleteFileW(s_file2); - RemoveDirectoryW(s_dir3); - RemoveDirectoryW(s_dir2); - RemoveDirectoryW(s_dir1); - DeleteFileA(TEMP_FILE); + // DIRTYPE_DESKTOP + LPWSTR psz = DoGetDir(DIRTYPE_DESKTOP); + StringCchCopyW(s_szDesktop, _countof(s_szDesktop), psz); + + PathAppendW(psz, TEST_FILE); + StringCchCopyW(s_szTestFile0, _countof(s_szTestFile0), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_FILE_KAI); + StringCchCopyW(s_szTestFile0Kai, _countof(s_szTestFile0Kai), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_DIR); + StringCchCopyW(s_szTestDir0, _countof(s_szTestDir0), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_DIR_KAI); + StringCchCopyW(s_szTestDir0Kai, _countof(s_szTestDir0Kai), psz); + + // DIRTYPE_MYDOCUMENTS + psz = DoGetDir(DIRTYPE_MYDOCUMENTS); + StringCchCopyW(s_szDocuments, _countof(s_szDocuments), psz); + + PathAppendW(psz, TEST_FILE); + StringCchCopyW(s_szTestFile1, _countof(s_szTestFile1), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_FILE_KAI); + StringCchCopyW(s_szTestFile1Kai, _countof(s_szTestFile1Kai), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_DIR); + StringCchCopyW(s_szTestDir1, _countof(s_szTestDir1), psz); + + PathRemoveFileSpecW(psz); + PathAppendW(psz, TEST_DIR_KAI); + StringCchCopyW(s_szTestDir1Kai, _countof(s_szTestDir1Kai), psz); + + // prepare for files and dirs + DoDeleteFilesAndDirs(); + DoCreateEmptyFile(TEMP_FILE); - SendMessageW(s_hwnd, WM_COMMAND, IDOK, 0); + // Ctrl+C + SetConsoleCtrlHandler(HandlerRoutine, TRUE); + + // close Explorer windows + trace("Closing Explorer windows...\n"); + DoWaitForWindow(L"CabinetWClass", NULL, TRUE, TRUE); + + // close the CLASSNAME windows + return DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE) == NULL; } static BOOL @@ -330,28 +705,69 @@ GetSubProgramPath(void) PathAppendW(s_szSubProgram, L"testdata\\shell32_apitest_sub.exe"); if (!PathFileExistsW(s_szSubProgram)) - { return FALSE; - } } return TRUE; } +#define SRC_00 0 +#define SRC_01 SHCNRF_ShellLevel +#define SRC_02 (SHCNRF_NewDelivery) +#define SRC_03 (SHCNRF_NewDelivery | SHCNRF_ShellLevel) +#define SRC_04 SHCNRF_InterruptLevel +#define SRC_05 (SHCNRF_InterruptLevel | SHCNRF_ShellLevel) +#define SRC_06 (SHCNRF_InterruptLevel | SHCNRF_NewDelivery) +#define SRC_07 (SHCNRF_InterruptLevel | SHCNRF_NewDelivery | SHCNRF_ShellLevel) +#define SRC_08 (SHCNRF_RecursiveInterrupt | SHCNRF_InterruptLevel) +#define SRC_09 (SHCNRF_RecursiveInterrupt | SHCNRF_InterruptLevel | SHCNRF_ShellLevel) +#define SRC_10 (SHCNRF_RecursiveInterrupt | SHCNRF_InterruptLevel | SHCNRF_NewDelivery) +#define SRC_11 (SHCNRF_RecursiveInterrupt | SHCNRF_InterruptLevel | SHCNRF_NewDelivery | SHCNRF_ShellLevel) + +#define WATCHDIR_0 DIRTYPE_NULL +#define WATCHDIR_1 DIRTYPE_DESKTOP +#define WATCHDIR_2 DIRTYPE_MYCOMPUTER +#define WATCHDIR_3 DIRTYPE_MYDOCUMENTS + static void -JustDoIt(INT nMode) +DoTestGroup(INT line, UINT cEntries, const TEST_ENTRY *pEntries, BOOL fRecursive, + INT nSources, DIRTYPE iWatchDir) { - trace("nMode: %d\n", nMode); - SHChangeNotify(0, SHCNF_FLUSH, NULL, NULL); +#ifdef NO_INTERRUPT_LEVEL + if (nSources & SHCNRF_InterruptLevel) + return; +#endif +#ifdef NO_SHELL_LEVEL + if (nSources & SHCNRF_ShellLevel) + return; +#endif +#ifdef NEW_DELIVERY_ONLY + if (!(nSources & SHCNRF_NewDelivery)) + return; +#endif +#ifdef GROUP_TICK + DWORD dwOldTick = GetTickCount(); +#endif +#ifdef RANDOM_QUARTER + if ((rand() & 3) == 0) + return; +#elif defined(RANDOM_HALF) + if (rand() & 1) + return; +#endif - if (!DoInit()) + trace("DoTestGroup: Line %d: fRecursive:%u, iWatchDir:%u, nSources:0x%X\n", + line, fRecursive, iWatchDir, nSources); + + if (s_hEvent) { - skip("Unable to initialize.\n"); - return; + CloseHandle(s_hEvent); + s_hEvent = NULL; } + s_hEvent = CreateEventW(NULL, TRUE, FALSE, EVENT_NAME); - WCHAR szParams[8]; - wsprintfW(szParams, L"%u", nMode); + WCHAR szParams[64]; + StringCchPrintfW(szParams, _countof(szParams), L"%u,%u,%u", fRecursive, iWatchDir, nSources); HINSTANCE hinst = ShellExecuteW(NULL, NULL, s_szSubProgram, szParams, NULL, SW_SHOWNORMAL); if ((INT_PTR)hinst <= 32) @@ -360,74 +776,189 @@ JustDoIt(INT nMode) return; } - for (int i = 0; i < 15; ++i) - { - s_hwnd = FindWindowW(s_szName, s_szName); - if (s_hwnd) - break; - - Sleep(50); - } - + s_hwnd = DoWaitForWindow(CLASSNAME, CLASSNAME, FALSE, FALSE); if (!s_hwnd) { skip("Unable to find window.\n"); return; } - switch (nMode) + for (UINT i = 0; i < cEntries; ++i) { - case 0: - case 1: - case 2: - for (size_t i = 0; i < _countof(s_TestEntriesMode0); ++i) - { - DoTestEntry(&s_TestEntriesMode0[i]); - } - break; - case 3: - for (size_t i = 0; i < _countof(s_TestEntriesMode3); ++i) - { - DoTestEntry(&s_TestEntriesMode3[i]); - } - break; - case 4: - for (size_t i = 0; i < _countof(s_TestEntriesMode4); ++i) - { - DoTestEntry(&s_TestEntriesMode4[i]); - } - break; - case 5: - for (size_t i = 0; i < _countof(s_TestEntriesMode5); ++i) - { - DoTestEntry(&s_TestEntriesMode5[i]); - } + if (!IsWindow(s_hwnd)) + { + DoAbortThread(); + DoQuitTest(TRUE); break; + } + + DoTestEntry(i, &pEntries[i], nSources); } - DoEnd(s_hwnd); + DoQuitTest(FALSE); - for (int i = 0; i < 15; ++i) - { - s_hwnd = FindWindowW(s_szName, s_szName); - if (!s_hwnd) - break; +#ifdef GROUP_TICK + DWORD dwNewTick = GetTickCount(); + DWORD dwTick = dwNewTick - dwOldTick; + trace("DoTestGroup: Line %d: %lu.%lu sec\n", line, (dwTick / 1000), (dwTick / 100 % 10)); +#endif +} - Sleep(50); - } +static unsigned __stdcall TestThreadProc(void *) +{ + srand(time(NULL)); +#ifdef RANDOM_QUARTER + skip("RANDOM_QUARTER\n"); +#elif defined(RANDOM_HALF) + skip("RANDOM_HALF\n"); +#endif + + // fRecursive == FALSE. + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_00, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, FALSE, SRC_01, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_02, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, FALSE, SRC_03, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, FALSE, SRC_04, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, FALSE, SRC_05, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, FALSE, SRC_06, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, FALSE, SRC_07, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, FALSE, SRC_08, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, FALSE, SRC_09, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, FALSE, SRC_10, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, FALSE, SRC_11, WATCHDIR_0); + + BOOL bTarget = IsWindowsXPOrGreater() && !IsWindowsVistaOrGreater(); + +#define SWITCH(x, y) (bTarget ? (x) : (y)) + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_00, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_03), s_group_03, FALSE, SRC_01, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_02, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_03), s_group_03, FALSE, SRC_03, WATCHDIR_1); + DoTestGroup(__LINE__, SWITCH(_countof(s_group_00), _countof(s_group_04)), SWITCH(s_group_00, s_group_04), FALSE, SRC_04, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_07), s_group_07, FALSE, SRC_05, WATCHDIR_1); + DoTestGroup(__LINE__, SWITCH(_countof(s_group_00), _countof(s_group_04)), SWITCH(s_group_00, s_group_04), FALSE, SRC_06, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_07), s_group_07, FALSE, SRC_07, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, FALSE, SRC_08, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_07), s_group_07, FALSE, SRC_09, WATCHDIR_1); + DoTestGroup(__LINE__, SWITCH(_countof(s_group_00), _countof(s_group_04)), SWITCH(s_group_00, s_group_04), FALSE, SRC_06, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_07), s_group_07, FALSE, SRC_11, WATCHDIR_1); +#undef SWITCH + +#ifndef NO_TRIVIAL + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_00, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_01, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_02, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_03, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_04, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_05, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_06, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_07, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_08, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_09, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_10, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_11, WATCHDIR_2); +#endif + + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_00, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_02), s_group_02, FALSE, SRC_01, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, FALSE, SRC_02, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_02), s_group_02, FALSE, SRC_03, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, FALSE, SRC_04, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, FALSE, SRC_05, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, FALSE, SRC_06, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, FALSE, SRC_07, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, FALSE, SRC_08, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, FALSE, SRC_09, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, FALSE, SRC_10, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, FALSE, SRC_11, WATCHDIR_3); + + // fRecursive == TRUE. + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_00, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_01, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_02, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_03, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_04, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_05, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_06, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_07, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_08, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_09, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_10, WATCHDIR_0); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_11, WATCHDIR_0); + + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_00, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_01, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_02, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_03, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_04, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_05, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_06, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_07, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_08, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_09, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_10, WATCHDIR_1); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_11, WATCHDIR_1); + + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_00, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_01, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_02, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_01), s_group_01, TRUE, SRC_03, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_04, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_05, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_06, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_07, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_08, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_09, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_04), s_group_04, TRUE, SRC_10, WATCHDIR_2); + DoTestGroup(__LINE__, _countof(s_group_06), s_group_06, TRUE, SRC_11, WATCHDIR_2); + + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_00, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_02), s_group_02, TRUE, SRC_01, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_00), s_group_00, TRUE, SRC_02, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_02), s_group_02, TRUE, SRC_03, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, TRUE, SRC_04, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, TRUE, SRC_05, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, TRUE, SRC_06, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, TRUE, SRC_07, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, TRUE, SRC_08, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, TRUE, SRC_09, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_05), s_group_05, TRUE, SRC_10, WATCHDIR_3); + DoTestGroup(__LINE__, _countof(s_group_08), s_group_08, TRUE, SRC_11, WATCHDIR_3); + + return 0; } START_TEST(SHChangeNotify) { +#ifdef DISABLE_THIS_TESTCASE + skip("This testcase is disabled by DISABLE_THIS_TESTCASE macro.\n"); +#endif +#ifdef TOTAL_TICK + DWORD dwOldTick = GetTickCount(); +#endif + + trace("Please don't operate your PC while testing...\n"); + if (!GetSubProgramPath()) { skip("shell32_apitest_sub.exe not found\n"); + return; } - JustDoIt(0); - JustDoIt(1); - JustDoIt(2); - JustDoIt(3); - JustDoIt(4); - JustDoIt(5); + if (!DoInitTest()) + { + skip("Unable to initialize.\n"); + DoQuitTest(TRUE); + return; + } + + s_hThread = (HANDLE)_beginthreadex(NULL, 0, TestThreadProc, NULL, 0, NULL); + WaitForSingleObject(s_hThread, INFINITE); + CloseHandle(s_hThread); + +#ifdef TOTAL_TICK + DWORD dwNewTick = GetTickCount(); + DWORD dwTick = dwNewTick - dwOldTick; + trace("SHChangeNotify: Total %lu.%lu sec\n", (dwTick / 1000), (dwTick / 100 % 10)); +#endif } diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.h b/modules/rostests/apitests/shell32/SHChangeNotify.h index 71389513eb2..e20b6b7a74c 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.h +++ b/modules/rostests/apitests/shell32/SHChangeNotify.h @@ -1,6 +1,18 @@ #pragma once -#define TEMP_FILE "shell-notify-temporary.txt" +#include <shlwapi.h> +#include <stdlib.h> +#include <stdio.h> +#include <strsafe.h> + +#define TEMP_FILE L"shell-notify-temporary.txt" +#define CLASSNAME L"SHChangeNotify testcase window" +#define EVENT_NAME L"SHChangeNotify testcase event" + +#define WM_SHELL_NOTIFY (WM_USER + 100) +#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) +#define WM_CLEAR_FLAGS (WM_USER + 102) +#define WM_SET_PATHS (WM_USER + 103) typedef enum TYPE { @@ -9,40 +21,53 @@ typedef enum TYPE TYPE_DELETE, TYPE_MKDIR, TYPE_RMDIR, + TYPE_RENAMEFOLDER, TYPE_UPDATEDIR, - TYPE_UPDATEITEM, - TYPE_RENAMEFOLDER + TYPE_MAX = TYPE_UPDATEDIR } TYPE; -#define WM_SHELL_NOTIFY (WM_USER + 100) -#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) -#define WM_CLEAR_FLAGS (WM_USER + 102) -#define WM_SET_PATHS (WM_USER + 103) - -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" +typedef enum DIRTYPE +{ + DIRTYPE_NULL = 0, + DIRTYPE_DESKTOP, + DIRTYPE_MYCOMPUTER, + DIRTYPE_MYDOCUMENTS +} DIRTYPE; -inline void DoInitPaths(void) +inline LPITEMIDLIST DoGetPidl(DIRTYPE iDir) { - WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; - GetTempPathW(_countof(szTemp), szTemp); - GetLongPathNameW(szTemp, szPath, _countof(szPath)); + LPITEMIDLIST ret = NULL; + + switch (iDir) + { + case DIRTYPE_NULL: + break; - lstrcpyW(s_dir1, szPath); - PathAppendW(s_dir1, L"WatchDir1"); + case DIRTYPE_DESKTOP: + SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &ret); + break; - lstrcpyW(s_dir2, s_dir1); - PathAppendW(s_dir2, L"Dir2"); + case DIRTYPE_MYCOMPUTER: + SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &ret); + break; - lstrcpyW(s_dir3, s_dir1); - PathAppendW(s_dir3, L"Dir3"); + case DIRTYPE_MYDOCUMENTS: + SHGetSpecialFolderLocation(NULL, CSIDL_PERSONAL, &ret); + break; + } - lstrcpyW(s_file1, s_dir1); - PathAppendW(s_file1, L"File1.txt"); + return ret; +} - lstrcpyW(s_file2, s_dir1); - PathAppendW(s_file2, L"File2.txt"); +inline LPWSTR DoGetDir(DIRTYPE iDir) +{ + static size_t s_index = 0; + static WCHAR s_pathes[3][MAX_PATH]; + LPWSTR psz = s_pathes[s_index]; + LPITEMIDLIST pidl = DoGetPidl(iDir); + psz[0] = 0; + SHGetPathFromIDListW(pidl, psz); + CoTaskMemFree(pidl); + s_index = (s_index + 1) % _countof(s_pathes); + return psz; } diff --git a/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp index 127ecaf687f..1b90c7ae39a 100644 --- a/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp +++ b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp @@ -6,72 +6,28 @@ */ #include "shelltest.h" -#include <shlwapi.h> -#include <stdio.h> #include "SHChangeNotify.h" static HWND s_hwnd = NULL; -static const WCHAR s_szName[] = L"SHChangeNotify testcase"; -static INT s_nMode; - -static BYTE s_counters[TYPE_RENAMEFOLDER + 1]; static UINT s_uRegID = 0; - -static WCHAR s_path1[MAX_PATH], s_path2[MAX_PATH]; - +static BOOL s_fRecursive = FALSE; +static DIRTYPE s_iWatchDir = DIRTYPE_NULL; +static INT s_nSources = 0; static LPITEMIDLIST s_pidl = NULL; -static SHChangeNotifyEntry s_entry; +static WCHAR s_path1[MAX_PATH], s_path2[MAX_PATH]; +static BYTE s_counters[TYPE_MAX + 1]; +static HANDLE s_hEvent = NULL; static BOOL OnCreate(HWND hwnd) { s_hwnd = hwnd; + s_pidl = DoGetPidl(s_iWatchDir); - DoInitPaths(); - - s_pidl = ILCreateFromPathW(s_dir1); - s_entry.pidl = s_pidl; - - INT nSources; - switch (s_nMode) - { - case 0: - s_entry.fRecursive = TRUE; - nSources = SHCNRF_ShellLevel; - break; - - case 1: - s_entry.fRecursive = TRUE; - nSources = SHCNRF_ShellLevel | SHCNRF_InterruptLevel; - break; - - case 2: - s_entry.fRecursive = FALSE; - nSources = SHCNRF_ShellLevel | SHCNRF_NewDelivery; - break; - - case 3: - s_entry.fRecursive = TRUE; - nSources = SHCNRF_InterruptLevel | SHCNRF_RecursiveInterrupt | SHCNRF_NewDelivery; - break; - - case 4: - s_entry.fRecursive = FALSE; - nSources = SHCNRF_InterruptLevel | SHCNRF_NewDelivery; - break; - - case 5: - s_entry.fRecursive = TRUE; - nSources = SHCNRF_InterruptLevel | SHCNRF_RecursiveInterrupt | SHCNRF_NewDelivery; - s_entry.pidl = NULL; - break; - - default: - return FALSE; - } - LONG fEvents = SHCNE_ALLEVENTS; - s_uRegID = SHChangeNotifyRegister(hwnd, nSources, fEvents, WM_SHELL_NOTIFY, - 1, &s_entry); + SHChangeNotifyEntry entry; + entry.pidl = s_pidl; + entry.fRecursive = s_fRecursive; + s_uRegID = SHChangeNotifyRegister(hwnd, s_nSources, SHCNE_ALLEVENTS, WM_SHELL_NOTIFY, 1, &entry); return s_uRegID != 0; } @@ -100,35 +56,54 @@ OnDestroy(HWND hwnd) s_hwnd = NULL; } -static void -DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lEvent) +static BOOL DoPathes(PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2) { - if (pidl1) - SHGetPathFromIDListW(pidl1, s_path1); - else - s_path1[0] = 0; + WCHAR path[MAX_PATH]; + if (!SHGetPathFromIDListW(pidl1, path)) + { + s_path1[0] = s_path2[0] = 0; + return FALSE; + } - if (pidl2) - SHGetPathFromIDListW(pidl2, s_path2); - else + if (wcsstr(path, L"Recent") != NULL) + return FALSE; + + StringCchCopyW(s_path1, _countof(s_path1), path); + + if (!SHGetPathFromIDListW(pidl2, s_path2)) s_path2[0] = 0; + return TRUE; +} + +static VOID DoPathesAndFlags(UINT type, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2) +{ + if (DoPathes(pidl1, pidl2)) + { + s_counters[type] = 1; + SetEvent(s_hEvent); + } +} + +static void +DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lEvent) +{ switch (lEvent) { case SHCNE_RENAMEITEM: - s_counters[TYPE_RENAMEITEM] = 1; + DoPathesAndFlags(TYPE_RENAMEITEM, pidl1, pidl2); break; case SHCNE_CREATE: - s_counters[TYPE_CREATE] = 1; + DoPathesAndFlags(TYPE_CREATE, pidl1, pidl2); break; case SHCNE_DELETE: - s_counters[TYPE_DELETE] = 1; + DoPathesAndFlags(TYPE_DELETE, pidl1, pidl2); break; case SHCNE_MKDIR: - s_counters[TYPE_MKDIR] = 1; + DoPathesAndFlags(TYPE_MKDIR, pidl1, pidl2); break; case SHCNE_RMDIR: - s_counters[TYPE_RMDIR] = 1; + DoPathesAndFlags(TYPE_RMDIR, pidl1, pidl2); break; case SHCNE_MEDIAINSERTED: break; @@ -145,10 +120,9 @@ DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lE case SHCNE_ATTRIBUTES: break; case SHCNE_UPDATEDIR: - s_counters[TYPE_UPDATEDIR] = 1; + DoPathesAndFlags(TYPE_UPDATEDIR, pidl1, pidl2); break; case SHCNE_UPDATEITEM: - s_counters[TYPE_UPDATEITEM] = 1; break; case SHCNE_SERVERDISCONNECT: break; @@ -157,7 +131,7 @@ DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lE case SHCNE_DRIVEADDGUI: break; case SHCNE_RENAMEFOLDER: - s_counters[TYPE_RENAMEFOLDER] = 1; + DoPathesAndFlags(TYPE_RENAMEFOLDER, pidl1, pidl2); break; case SHCNE_FREESPACE: break; @@ -208,13 +182,14 @@ static void DoSetPaths(HWND hwnd) { WCHAR szText[MAX_PATH * 2]; - lstrcpyW(szText, s_path1); - lstrcatW(szText, L"|"); - lstrcatW(szText, s_path2); + StringCchCopyW(szText, _countof(szText), s_path1); + StringCchCatW(szText, _countof(szText), L"|"); + StringCchCatW(szText, _countof(szText), s_path2); - if (FILE *fp = fopen(TEMP_FILE, "wb")) + FILE *fp = _wfopen(TEMP_FILE, L"wb"); + if (fp) { - fwrite(szText, (lstrlenW(szText) + 1) * sizeof(WCHAR), 1, fp); + fwrite(szText, (wcslen(szText) + 1) * sizeof(WCHAR), 1, fp); fflush(fp); fclose(fp); } @@ -244,6 +219,7 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CLEAR_FLAGS: ZeroMemory(&s_counters, sizeof(s_counters)); + s_path1[0] = s_path2[0] = 0; break; case WM_SET_PATHS: @@ -256,6 +232,25 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +static BOOL ParseCommandLine(LPWSTR lpCmdLine) +{ + LPWSTR pch = lpCmdLine; // fRecursive,iWatchDir,nSources + s_fRecursive = !!wcstoul(pch, NULL, 0); + pch = wcschr(pch, L','); + if (!pch) + return FALSE; + ++pch; + + s_iWatchDir = (DIRTYPE)wcstoul(pch, NULL, 0); + pch = wcschr(pch, L','); + if (!pch) + return FALSE; + ++pch; + + s_nSources = wcstoul(pch, NULL, 0); + return TRUE; +} + INT APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -265,7 +260,10 @@ wWinMain(HINSTANCE hInstance, if (lstrcmpiW(lpCmdLine, L"") == 0 || lstrcmpiW(lpCmdLine, L"TEST") == 0) return 0; - s_nMode = _wtoi(lpCmdLine); + if (!ParseCommandLine(lpCmdLine)) + return -1; + + s_hEvent = OpenEventW(EVENT_ALL_ACCESS, TRUE, EVENT_NAME); WNDCLASSW wc; ZeroMemory(&wc, sizeof(wc)); @@ -274,12 +272,12 @@ wWinMain(HINSTANCE hInstance, wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - wc.lpszClassName = s_szName; + wc.lpszClassName = CLASSNAME; if (!RegisterClassW(&wc)) return -1; - HWND hwnd = CreateWindowW(s_szName, s_szName, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + HWND hwnd = CreateWindowW(CLASSNAME, CLASSNAME, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, NULL, GetModuleHandleW(NULL), NULL); if (!hwnd) return -1; @@ -294,5 +292,7 @@ wWinMain(HINSTANCE hInstance, DispatchMessageW(&msg); } + CloseHandle(s_hEvent); + return 0; }

1 0

[reactos] 01/01: [MSPAINT] Revert PostMessage to SendMessage
by Katayama Hirofumi MZ 26 Dec '21

26 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c163bf163d5f315e4869… commit 1c163bf163d5f315e4869cff3286df946fb0a637 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 27 08:26:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 27 08:26:33 2021 +0900 [MSPAINT] Revert PostMessage to SendMessage https://github.com/reactos/reactos/commit/614354ccb55d5aed2aa8244efdc54efb0… CORE-17931 --- base/applications/mspaint/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 83e9f9d37e8..fe77e8ae097 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -322,7 +322,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sizeboxCenterBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); sizeboxRightBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ - imageArea.PostMessage(WM_SIZE, 0, 0); + imageArea.SendMessage(WM_SIZE, 0, 0); /* by moving the window, the things in WM_SIZE are done */ mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement));

1 0

[reactos] 01/01: [MSPAINT] Define GRIP_SIZE macro and use it (#4192)
by Katayama Hirofumi MZ 26 Dec '21

26 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=614354ccb55d5aed2aa82… commit 614354ccb55d5aed2aa8244efdc54efb0d2b0205 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 26 23:05:47 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 26 23:05:47 2021 +0900 [MSPAINT] Define GRIP_SIZE macro and use it (#4192) Reduce magic numbers. CORE-17931 --- base/applications/mspaint/common.h | 2 ++ base/applications/mspaint/imgarea.cpp | 30 +++++++++++---------- base/applications/mspaint/main.cpp | 6 ++--- base/applications/mspaint/mouse.cpp | 3 ++- base/applications/mspaint/scrollbox.cpp | 14 +++++----- base/applications/mspaint/selection.cpp | 47 ++++++++++++++------------------- base/applications/mspaint/winproc.cpp | 2 +- 7 files changed, 51 insertions(+), 53 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 5c1f01cbdd9..bfea7368523 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -23,3 +23,5 @@ static inline int UnZoomed(int xy) { return xy * 1000 / toolsModel.GetZoom(); } + +#define GRIP_SIZE 3 diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index f34b15ede38..99a6c72d177 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -23,7 +23,7 @@ updateCanvasAndScrollbars() int zoomedWidth = Zoomed(imageModel.GetWidth()); int zoomedHeight = Zoomed(imageModel.GetHeight()); - imageArea.MoveWindow(3, 3, zoomedWidth, zoomedHeight, FALSE); + imageArea.MoveWindow(GRIP_SIZE, GRIP_SIZE, zoomedWidth, zoomedHeight, FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE); @@ -74,28 +74,30 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH int imgYRes = imageModel.GetHeight(); sizeboxLeftTop.MoveWindow( 0, - 0, 3, 3, TRUE); + 0, GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxCenterTop.MoveWindow( - Zoomed(imgXRes) / 2 + 3 * 3 / 4, - 0, 3, 3, TRUE); + GRIP_SIZE + (Zoomed(imgXRes) - GRIP_SIZE) / 2, + 0, GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxRightTop.MoveWindow( - Zoomed(imgXRes) + 3, - 0, 3, 3, TRUE); + GRIP_SIZE + Zoomed(imgXRes), + 0, GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxLeftCenter.MoveWindow( 0, - Zoomed(imgYRes) / 2 + 3 * 3 / 4, 3, 3, TRUE); + GRIP_SIZE + (Zoomed(imgYRes) - GRIP_SIZE) / 2, + GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxRightCenter.MoveWindow( - Zoomed(imgXRes) + 3, - Zoomed(imgYRes) / 2 + 3 * 3 / 4, 3, 3, TRUE); + GRIP_SIZE + Zoomed(imgXRes), + GRIP_SIZE + (Zoomed(imgYRes) - GRIP_SIZE) / 2, + GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxLeftBottom.MoveWindow( 0, - Zoomed(imgYRes) + 3, 3, 3, TRUE); + GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxCenterBottom.MoveWindow( - Zoomed(imgXRes) / 2 + 3 * 3 / 4, - Zoomed(imgYRes) + 3, 3, 3, TRUE); + GRIP_SIZE + (Zoomed(imgXRes) - GRIP_SIZE) / 2, + GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); sizeboxRightBottom.MoveWindow( - Zoomed(imgXRes) + 3, - Zoomed(imgYRes) + 3, 3, 3, TRUE); + GRIP_SIZE + Zoomed(imgXRes), + GRIP_SIZE + Zoomed(imgYRes), GRIP_SIZE, GRIP_SIZE, TRUE); UpdateScrollbox(); return 0; } diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index f1145d7f179..83e9f9d37e8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -248,7 +248,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument selectionWindow.Create(scrlClientWindow.m_hWnd, selectionWindowPos, NULL, WS_CHILD | BS_OWNERDRAW); /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ - RECT imageAreaPos = {3, 3, 3 + imageModel.GetWidth(), 3 + imageModel.GetHeight()}; + RECT imageAreaPos = {GRIP_SIZE, GRIP_SIZE, GRIP_SIZE + imageModel.GetWidth(), GRIP_SIZE + imageModel.GetHeight()}; imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); if (__argc >= 2) @@ -312,7 +312,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument } /* creating the size boxes */ - RECT sizeboxPos = {0, 0, 0 + 3, 0 + 3}; + RECT sizeboxPos = {0, 0, GRIP_SIZE, GRIP_SIZE}; sizeboxLeftTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); sizeboxCenterTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); sizeboxRightTop.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); @@ -322,7 +322,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sizeboxCenterBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); sizeboxRightBottom.Create(scrlClientWindow.m_hWnd, sizeboxPos, NULL, WS_CHILD | WS_VISIBLE); /* placing the size boxes around the image */ - imageArea.SendMessage(WM_SIZE, 0, 0); + imageArea.PostMessage(WM_SIZE, 0, 0); /* by moving the window, the things in WM_SIZE are done */ mainWindow.SetWindowPlacement(&(registrySettings.WindowPlacement)); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 10b5202dda4..0f2f1b36312 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -16,7 +16,8 @@ void placeSelWin() { selectionWindow.MoveWindow(Zoomed(selectionModel.GetDestRectLeft()), Zoomed(selectionModel.GetDestRectTop()), - Zoomed(selectionModel.GetDestRectWidth()) + 6, Zoomed(selectionModel.GetDestRectHeight()) + 6, TRUE); + Zoomed(selectionModel.GetDestRectWidth()) + 2 * GRIP_SIZE, + Zoomed(selectionModel.GetDestRectHeight()) + 2 * GRIP_SIZE, TRUE); selectionWindow.BringWindowToTop(); imageArea.InvalidateRect(NULL, FALSE); } diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index 6466b8b7f85..c2354c0cc10 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -52,8 +52,6 @@ CONST INT VSCROLL_WIDTH = ::GetSystemMetrics(SM_CXVSCROLL); void UpdateScrollbox() { - CONST INT EXTRASIZE = 5; /* 3 px of selection markers + 2 px of border */ - CRect tempRect; CSize sizeImageArea; CSize sizeScrollBox; @@ -65,7 +63,7 @@ UpdateScrollbox() imageArea.GetClientRect(&tempRect); sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); - sizeImageArea += CSize(EXTRASIZE * 2, EXTRASIZE * 2); + sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2); /* show/hide the scrollbars */ vmode = (sizeScrollBox.cy < sizeImageArea.cy ? 0 : @@ -132,8 +130,9 @@ LRESULT CScrollboxWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } scrollboxWindow.SetScrollInfo(SB_HORZ, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), Zoomed(imageModel.GetWidth()) + 6, - Zoomed(imageModel.GetHeight()) + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), + Zoomed(imageModel.GetWidth()) + 2 * GRIP_SIZE, + Zoomed(imageModel.GetHeight()) + 2 * GRIP_SIZE, TRUE); } return 0; } @@ -167,8 +166,9 @@ LRESULT CScrollboxWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), Zoomed(imageModel.GetWidth()) + 6, - Zoomed(imageModel.GetHeight()) + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), + Zoomed(imageModel.GetWidth()) + 2 * GRIP_SIZE, + Zoomed(imageModel.GetHeight()) + 2 * GRIP_SIZE, TRUE); } return 0; } diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index e058da3e67c..c9155be1cf0 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -65,31 +65,24 @@ ForceRefreshSelectionContents() int CSelectionWindow::IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight) { - if (iYPos < 3) - { - if (iXPos < 3) - return ACTION_RESIZE_TOP_LEFT; - if ((iXPos < iWidth / 2 + 2) && (iXPos >= iWidth / 2 - 1)) - return ACTION_RESIZE_TOP; - if (iXPos >= iWidth - 3) - return ACTION_RESIZE_TOP_RIGHT; - } - if ((iYPos < iHeight / 2 + 2) && (iYPos >= iHeight / 2 - 1)) - { - if (iXPos < 3) - return ACTION_RESIZE_LEFT; - if (iXPos >= iWidth - 3) - return ACTION_RESIZE_RIGHT; - } - if (iYPos >= iHeight - 3) - { - if (iXPos < 3) - return ACTION_RESIZE_BOTTOM_LEFT; - if ((iXPos < iWidth / 2 + 2) && (iXPos >= iWidth / 2 - 1)) - return ACTION_RESIZE_BOTTOM; - if (iXPos >= iWidth - 3) - return ACTION_RESIZE_BOTTOM_RIGHT; - } + POINT pt = { iXPos, iYPos }; + HWND hwndChild = ChildWindowFromPointEx(pt, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED); + if (hwndChild == sizeboxLeftTop) + return ACTION_RESIZE_TOP_LEFT; + if (hwndChild == sizeboxCenterTop) + return ACTION_RESIZE_TOP; + if (hwndChild == sizeboxRightTop) + return ACTION_RESIZE_TOP_RIGHT; + if (hwndChild == sizeboxRightCenter) + return ACTION_RESIZE_RIGHT; + if (hwndChild == sizeboxLeftCenter) + return ACTION_RESIZE_LEFT; + if (hwndChild == sizeboxCenterBottom) + return ACTION_RESIZE_BOTTOM; + if (hwndChild == sizeboxRightBottom) + return ACTION_RESIZE_BOTTOM_RIGHT; + if (hwndChild == sizeboxLeftBottom) + return ACTION_RESIZE_BOTTOM_LEFT; return 0; } @@ -197,8 +190,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B } else { - int w = Zoomed(selectionModel.GetDestRectWidth()) + 6; - int h = Zoomed(selectionModel.GetDestRectHeight()) + 6; + int w = Zoomed(selectionModel.GetDestRectWidth()) + 2 * GRIP_SIZE; + int h = Zoomed(selectionModel.GetDestRectHeight()) + 2 * GRIP_SIZE; m_ptPos.x = GET_X_LPARAM(lParam); m_ptPos.y = GET_Y_LPARAM(lParam); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 1303b258c92..be060047ac3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -39,7 +39,7 @@ zoomTo(int newZoom, int mouseX, int mouseY) toolsModel.SetZoom(newZoom); selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()), FALSE); + imageArea.MoveWindow(GRIP_SIZE, GRIP_SIZE, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()), FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE);

1 0

[reactos] 01/01: [MSPAINT] Add Zoomed and UnZoomed and use them (#4188)
by Katayama Hirofumi MZ 26 Dec '21

26 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e1386db43f64ac405b4e… commit 9e1386db43f64ac405b4ebf04f025227221e9c2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 26 19:49:56 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 26 19:49:56 2021 +0900 [MSPAINT] Add Zoomed and UnZoomed and use them (#4188) - Define Zoomed and UnZoomed helper functions. - Use them. CORE-17931 --- base/applications/mspaint/common.h | 13 +++++++- base/applications/mspaint/imgarea.cpp | 54 ++++++++++++++++---------------- base/applications/mspaint/mouse.cpp | 4 +-- base/applications/mspaint/precomp.h | 2 +- base/applications/mspaint/scrollbox.cpp | 8 ++--- base/applications/mspaint/selection.cpp | 16 +++++----- base/applications/mspaint/sizebox.cpp | 4 +-- base/applications/mspaint/toolsmodel.cpp | 2 +- base/applications/mspaint/toolsmodel.h | 2 +- base/applications/mspaint/winproc.cpp | 2 +- 10 files changed, 59 insertions(+), 48 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 45cde747b86..5c1f01cbdd9 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -5,10 +5,21 @@ * PURPOSE: Commonly used functions * PROGRAMMERS: Benedikt Freisen * Stanislav Motylkov + * Katayama Hirofumi MZ */ #pragma once /* FUNCTIONS ********************************************************/ -extern BOOL zoomTo(int, int, int); +BOOL zoomTo(int newZoom, int mouseX, int mouseY); + +static inline int Zoomed(int xy) +{ + return xy * toolsModel.GetZoom() / 1000; +} + +static inline int UnZoomed(int xy) +{ + return xy * 1000 / toolsModel.GetZoom(); +} diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index b31f7642c74..f34b15ede38 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -21,8 +21,8 @@ updateCanvasAndScrollbars() { selectionWindow.ShowWindow(SW_HIDE); - int zoomedWidth = imageModel.GetWidth() * toolsModel.GetZoom() / 1000; - int zoomedHeight = imageModel.GetHeight() * toolsModel.GetZoom() / 1000; + int zoomedWidth = Zoomed(imageModel.GetWidth()); + int zoomedHeight = Zoomed(imageModel.GetHeight()); imageArea.MoveWindow(3, 3, zoomedWidth, zoomedHeight, FALSE); scrollboxWindow.Invalidate(TRUE); @@ -76,26 +76,26 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH 0, 0, 3, 3, TRUE); sizeboxCenterTop.MoveWindow( - imgXRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, + Zoomed(imgXRes) / 2 + 3 * 3 / 4, 0, 3, 3, TRUE); sizeboxRightTop.MoveWindow( - imgXRes * toolsModel.GetZoom() / 1000 + 3, + Zoomed(imgXRes) + 3, 0, 3, 3, TRUE); sizeboxLeftCenter.MoveWindow( 0, - imgYRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, 3, 3, TRUE); + Zoomed(imgYRes) / 2 + 3 * 3 / 4, 3, 3, TRUE); sizeboxRightCenter.MoveWindow( - imgXRes * toolsModel.GetZoom() / 1000 + 3, - imgYRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, 3, 3, TRUE); + Zoomed(imgXRes) + 3, + Zoomed(imgYRes) / 2 + 3 * 3 / 4, 3, 3, TRUE); sizeboxLeftBottom.MoveWindow( 0, - imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); + Zoomed(imgYRes) + 3, 3, 3, TRUE); sizeboxCenterBottom.MoveWindow( - imgXRes * toolsModel.GetZoom() / 2000 + 3 * 3 / 4, - imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); + Zoomed(imgXRes) / 2 + 3 * 3 / 4, + Zoomed(imgYRes) + 3, 3, 3, TRUE); sizeboxRightBottom.MoveWindow( - imgXRes * toolsModel.GetZoom() / 1000 + 3, - imgYRes * toolsModel.GetZoom() / 1000 + 3, 3, 3, TRUE); + Zoomed(imgXRes) + 3, + Zoomed(imgYRes) + 3, 3, 3, TRUE); UpdateScrollbox(); return 0; } @@ -106,7 +106,7 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b HDC hdc = GetDC(); int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); - StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, imageModel.GetDC(), 0, 0, imgXRes, + StretchBlt(hdc, 0, 0, Zoomed(imgXRes), Zoomed(imgYRes), imageModel.GetDC(), 0, 0, imgXRes, imgYRes, SRCCOPY); if (showGrid && (toolsModel.GetZoom() >= 4000)) { @@ -114,13 +114,13 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b int counter; for(counter = 0; counter <= imgYRes; counter++) { - MoveToEx(hdc, 0, counter * toolsModel.GetZoom() / 1000, NULL); - LineTo(hdc, imgXRes * toolsModel.GetZoom() / 1000, counter * toolsModel.GetZoom() / 1000); + MoveToEx(hdc, 0, Zoomed(counter), NULL); + LineTo(hdc, Zoomed(imgXRes), Zoomed(counter)); } for(counter = 0; counter <= imgXRes; counter++) { - MoveToEx(hdc, counter * toolsModel.GetZoom() / 1000, 0, NULL); - LineTo(hdc, counter * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000); + MoveToEx(hdc, Zoomed(counter), 0, NULL); + LineTo(hdc, Zoomed(counter), Zoomed(imgYRes)); } DeleteObject(SelectObject(hdc, oldPen)); } @@ -161,7 +161,7 @@ LRESULT CImgAreaWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, B { SetCapture(); drawing = TRUE; - startPaintingL(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + startPaintingL(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam)), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else @@ -181,7 +181,7 @@ LRESULT CImgAreaWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, B { SetCapture(); drawing = TRUE; - startPaintingR(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + startPaintingR(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam)), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else @@ -199,13 +199,13 @@ LRESULT CImgAreaWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { if (drawing) { - endPaintingL(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingL(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam)), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); + GetPixel(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam))); if (tempColor != CLR_INVALID) paletteModel.SetFgColor(tempColor); } @@ -234,12 +234,12 @@ void CImgAreaWindow::cancelDrawing() // FIXME: dirty hack if (GetKeyState(VK_LBUTTON) < 0) { - endPaintingL(imageModel.GetDC(), pt.x * 1000 / toolsModel.GetZoom(), pt.y * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingL(imageModel.GetDC(), UnZoomed(pt.x), UnZoomed(pt.y), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else if (GetKeyState(VK_RBUTTON) < 0) { - endPaintingR(imageModel.GetDC(), pt.x * 1000 / toolsModel.GetZoom(), pt.y * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingR(imageModel.GetDC(), UnZoomed(pt.x), UnZoomed(pt.y), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } imageModel.Undo(); @@ -283,13 +283,13 @@ LRESULT CImgAreaWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { if (drawing) { - endPaintingR(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingR(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam)), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); + GetPixel(imageModel.GetDC(), UnZoomed(GET_X_LPARAM(lParam)), UnZoomed(GET_Y_LPARAM(lParam))); if (tempColor != CLR_INVALID) paletteModel.SetBgColor(tempColor); } @@ -302,8 +302,8 @@ LRESULT CImgAreaWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - LONG xNow = GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(); - LONG yNow = GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(); + LONG xNow = UnZoomed(GET_X_LPARAM(lParam)); + LONG yNow = UnZoomed(GET_Y_LPARAM(lParam)); if ((!drawing) || (toolsModel.GetActiveTool() <= TOOL_AIRBRUSH)) { TRACKMOUSEEVENT tme; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index b5c09b092af..10b5202dda4 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -15,8 +15,8 @@ void placeSelWin() { - selectionWindow.MoveWindow(selectionModel.GetDestRectLeft() * toolsModel.GetZoom() / 1000, selectionModel.GetDestRectTop() * toolsModel.GetZoom() / 1000, - selectionModel.GetDestRectWidth() * toolsModel.GetZoom() / 1000 + 6, selectionModel.GetDestRectHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); + selectionWindow.MoveWindow(Zoomed(selectionModel.GetDestRectLeft()), Zoomed(selectionModel.GetDestRectTop()), + Zoomed(selectionModel.GetDestRectWidth()) + 6, Zoomed(selectionModel.GetDestRectHeight()) + 6, TRUE); selectionWindow.BringWindowToTop(); imageArea.InvalidateRect(NULL, FALSE); } diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index f4720837fff..6bdbafceb30 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,7 +21,6 @@ #include <shellapi.h> #include <htmlhelp.h> -#include "common.h" #include "definitions.h" #include "drawing.h" #include "dib.h" @@ -43,5 +42,6 @@ #include "toolsettings.h" #include "toolsmodel.h" #include "winproc.h" +#include "common.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index 351c59c717d..6466b8b7f85 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -132,8 +132,8 @@ LRESULT CScrollboxWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } scrollboxWindow.SetScrollInfo(SB_HORZ, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, - imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), Zoomed(imageModel.GetWidth()) + 6, + Zoomed(imageModel.GetHeight()) + 6, TRUE); } return 0; } @@ -167,8 +167,8 @@ LRESULT CScrollboxWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), imageModel.GetWidth() * toolsModel.GetZoom() / 1000 + 6, - imageModel.GetHeight() * toolsModel.GetZoom() / 1000 + 6, TRUE); + -scrollboxWindow.GetScrollPos(SB_VERT), Zoomed(imageModel.GetWidth()) + 6, + Zoomed(imageModel.GetHeight()) + 6, TRUE); } return 0; } diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 45d72e8fb21..e058da3e67c 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -99,8 +99,8 @@ LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { HDC hDC = GetDC(); DefWindowProc(WM_PAINT, wParam, lParam); - SelectionFrame(hDC, 1, 1, selectionModel.GetDestRectWidth() * toolsModel.GetZoom() / 1000 + 5, - selectionModel.GetDestRectHeight() * toolsModel.GetZoom() / 1000 + 5, + SelectionFrame(hDC, 1, 1, Zoomed(selectionModel.GetDestRectWidth()) + 5, + Zoomed(selectionModel.GetDestRectHeight()) + 5, m_dwSystemSelectionColor); ReleaseDC(hDC); } @@ -161,8 +161,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B imageModel.ResetToPrevious(); m_ptFrac.x += GET_X_LPARAM(lParam) - m_ptPos.x; m_ptFrac.y += GET_Y_LPARAM(lParam) - m_ptPos.y; - m_ptDelta.x += m_ptFrac.x * 1000 / toolsModel.GetZoom(); - m_ptDelta.y += m_ptFrac.y * 1000 / toolsModel.GetZoom(); + m_ptDelta.x += UnZoomed(m_ptFrac.x); + m_ptDelta.y += UnZoomed(m_ptFrac.y); if (toolsModel.GetZoom() < 1000) { m_ptFrac.x = 0; @@ -170,8 +170,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B } else { - m_ptFrac.x -= (m_ptFrac.x * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000; - m_ptFrac.y -= (m_ptFrac.y * 1000 / toolsModel.GetZoom()) * toolsModel.GetZoom() / 1000; + m_ptFrac.x -= Zoomed(UnZoomed(m_ptFrac.x)); + m_ptFrac.y -= Zoomed(UnZoomed(m_ptFrac.y)); } selectionModel.ModifyDestRect(m_ptDelta, m_iAction); @@ -197,8 +197,8 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B } else { - int w = selectionModel.GetDestRectWidth() * toolsModel.GetZoom() / 1000 + 6; - int h = selectionModel.GetDestRectHeight() * toolsModel.GetZoom() / 1000 + 6; + int w = Zoomed(selectionModel.GetDestRectWidth()) + 6; + int h = Zoomed(selectionModel.GetDestRectHeight()) + 6; m_ptPos.x = GET_X_LPARAM(lParam); m_ptPos.y = GET_Y_LPARAM(lParam); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index 71fcb6aca2d..2ebbbcc70a3 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -48,8 +48,8 @@ LRESULT CSizeboxWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO short yRel; int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); - xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); - yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); + xRel = UnZoomed(GET_X_LPARAM(lParam) - xOrig); + yRel = UnZoomed(GET_Y_LPARAM(lParam) - yOrig); if (m_hWnd == sizeboxLeftTop.m_hWnd) strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes - yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index ebd7fee883b..26621e75ee8 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -101,7 +101,7 @@ void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) NotifyToolSettingsChanged(); } -int ToolsModel::GetZoom() +int ToolsModel::GetZoom() const { return m_zoom; } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 49ab71bcc38..3b7205634f6 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -42,6 +42,6 @@ public: void SetRubberRadius(int nRubberRadius); BOOL IsBackgroundTransparent(); void SetBackgroundTransparent(BOOL bTransparent); - int GetZoom(); + int GetZoom() const; void SetZoom(int nZoom); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 686f2eec5d0..1303b258c92 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -39,7 +39,7 @@ zoomTo(int newZoom, int mouseX, int mouseY) toolsModel.SetZoom(newZoom); selectionWindow.ShowWindow(SW_HIDE); - imageArea.MoveWindow(3, 3, imageModel.GetWidth() * toolsModel.GetZoom() / 1000, imageModel.GetHeight() * toolsModel.GetZoom() / 1000, FALSE); + imageArea.MoveWindow(3, 3, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()), FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE);

1 0

[reactos] 01/01: [MSPAINT] Delete filename extension .png from IDS_DEFAULTFILENAME
by Katayama Hirofumi MZ 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50cb4b3cb76da023bb836… commit 50cb4b3cb76da023bb83676fd4dc4e6b2f116aaa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 25 22:52:56 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 25 22:52:56 2021 +0900 [MSPAINT] Delete filename extension .png from IDS_DEFAULTFILENAME --- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/ja-JP.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index dc910abb2a2..92c323ac436 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Рисувач (Paint) за РеактОС" IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?" - IDS_DEFAULTFILENAME "Без име.png" + IDS_DEFAULTFILENAME "Без име" IDS_MINIATURETITLE "Изображенийце" IDS_TOOLTIP1 "Свободно избиране" IDS_TOOLTIP2 "Избор" diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 9d10d56cfad..edec2e6e387 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS Malování" IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?" - IDS_DEFAULTFILENAME "Bez názvu.png" + IDS_DEFAULTFILENAME "Bez názvu" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Volný výběr" IDS_TOOLTIP2 "Výběr" diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 3deddc804a5..e04703b521f 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint für ReactOS" IDS_INFOTEXT "Unter der GNU Lesser General Public License stehen (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" - IDS_DEFAULTFILENAME "Unbenannt.png" + IDS_DEFAULTFILENAME "Unbenannt" IDS_MINIATURETITLE "Miniaturansicht" IDS_TOOLTIP1 "Freie Auswahl" IDS_TOOLTIP2 "Auswahl" diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index f693c30c324..dfd26d3fa3e 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" - IDS_DEFAULTFILENAME "Unnamed.png" + IDS_DEFAULTFILENAME "Unnamed" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Free selection" IDS_TOOLTIP2 "Selection" diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 997aeb272b1..28e99c10520 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" - IDS_DEFAULTFILENAME "Unnamed.png" + IDS_DEFAULTFILENAME "Unnamed" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Free selection" IDS_TOOLTIP2 "Selection" diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index c01966069da..1c625d8720e 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -200,7 +200,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?" - IDS_DEFAULTFILENAME "Sin título.png" + IDS_DEFAULTFILENAME "Sin título" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Selección de forma libre" IDS_TOOLTIP2 "Selección" diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 7d9bb78cff2..8c9a13f8a99 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint ReactOS'ile" IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" - IDS_DEFAULTFILENAME "Nimetu.png" + IDS_DEFAULTFILENAME "Nimetu" IDS_MINIATURETITLE "Miniatuur" IDS_TOOLTIP1 "Vaba valik" IDS_TOOLTIP2 "Valik" diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index ee3420337a0..1229441af00 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "ReactOS-ko Paint" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "%s aldaketak gorde nahi duzu?" - IDS_DEFAULTFILENAME "Izegabea.png" + IDS_DEFAULTFILENAME "Izegabea" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Hautatu forma librea" IDS_TOOLTIP2 "Hautatu" diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 817d56c68d7..2be2fa59f89 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint pour ReactOS" IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" - IDS_DEFAULTFILENAME "Sans titre.png" + IDS_DEFAULTFILENAME "Sans titre" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Sélection libre" IDS_TOOLTIP2 "Sélection" diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 69be3cc28e7..1e16cb261cb 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -193,7 +193,7 @@ BEGIN IDS_INFOTITLE "צייר עבור ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?" - IDS_DEFAULTFILENAME "ללא שם.png" + IDS_DEFAULTFILENAME "ללא שם" IDS_MINIATURETITLE "ממוזער" IDS_TOOLTIP1 "בחירה חופשית" IDS_TOOLTIP2 "בחירה" diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index eeaf93d4e4f..dcdce5c35c2 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "ReactOS Paint" IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhető el (lásd www.gnu.org)" IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?" - IDS_DEFAULTFILENAME "Névtelen.png" + IDS_DEFAULTFILENAME "Névtelen" IDS_MINIATURETITLE "Miniatúra" IDS_TOOLTIP1 "Szabadkézi kijelölés" IDS_TOOLTIP2 "Kijelölés" diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 47626c79a07..771ff0d1753 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint untuk ReactOS" IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?" - IDS_DEFAULTFILENAME "Tanpa Nama.png" + IDS_DEFAULTFILENAME "Tanpa Nama" IDS_MINIATURETITLE "Miniatur" IDS_TOOLTIP1 "Pilihan Bebas" IDS_TOOLTIP2 "Pilihan" diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index e07ee23a48b..d69c4253f4a 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint per ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" - IDS_DEFAULTFILENAME "SenzaNome.png" + IDS_DEFAULTFILENAME "SenzaNome" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Selezione libera" IDS_TOOLTIP2 "Selezione" diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 72269792c6e..bd41821e3fb 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS ペイント" IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。" IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか？" - IDS_DEFAULTFILENAME "無題.png" + IDS_DEFAULTFILENAME "無題" IDS_MINIATURETITLE "縮小図" IDS_TOOLTIP1 "自由選択" IDS_TOOLTIP2 "選択" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 40068652119..d6ad4ed0279 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" - IDS_DEFAULTFILENAME "Naamloos.png" + IDS_DEFAULTFILENAME "Naamloos" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Vrij selecteren" IDS_TOOLTIP2 "Selecteren" diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index de234ed221c..2864a8c7099 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" - IDS_DEFAULTFILENAME "Utennavn.png" + IDS_DEFAULTFILENAME "Utennavn" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Frihåndmerking" IDS_TOOLTIP2 "Merk" diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 451cb9f3945..f0ed2ece509 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Paint dla ReactOS" IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do %s?" - IDS_DEFAULTFILENAME "bez tytułu.png" + IDS_DEFAULTFILENAME "bez tytułu" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Zaznaczenie dowolne" IDS_TOOLTIP2 "Zaznaczenie" diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index bf705b32809..1a6dd890930 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?" - IDS_DEFAULTFILENAME "Imagem.png" + IDS_DEFAULTFILENAME "Imagem" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Selecionar forma livre" IDS_TOOLTIP2 "Selecionar" diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index ca1fd97733b..9395d3deaba 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" - IDS_DEFAULTFILENAME "Imagem.png" + IDS_DEFAULTFILENAME "Imagem" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Selecionar forma livre" IDS_TOOLTIP2 "Selecionar" diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 51211054951..2bd8bf0efe9 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Pictare pentru ReactOS" IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?" - IDS_DEFAULTFILENAME "FărăNume.png" + IDS_DEFAULTFILENAME "FărăNume" IDS_MINIATURETITLE "Miniatură" IDS_TOOLTIP1 "Golire selecție" IDS_TOOLTIP2 "Selecție" diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index ad5787f95f6..10910b337ed 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?" - IDS_DEFAULTFILENAME "Безымянный.png" + IDS_DEFAULTFILENAME "Безымянный" IDS_MINIATURETITLE "Эскиз" IDS_TOOLTIP1 "Выделение произвольной области" IDS_TOOLTIP2 "Выделение" diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 94e70e76a2b..4eadabc96c3 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Skicár systému ReactOS" IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?" - IDS_DEFAULTFILENAME "Bez názvu.png" + IDS_DEFAULTFILENAME "Bez názvu" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Voľný výber" IDS_TOOLTIP2 "Výber" diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 9c7cbcc8462..25446b39bbc 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint për ReactOS" IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?" - IDS_DEFAULTFILENAME "Unnamed.png" + IDS_DEFAULTFILENAME "Unnamed" IDS_MINIATURETITLE "Miniaturë" IDS_TOOLTIP1 "Zgjedhje e lire" IDS_TOOLTIP2 "Zgjedhje" diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 3323e87c56c..f883a7d9177 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint för ReactOS" IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?" - IDS_DEFAULTFILENAME "Namnlös.png" + IDS_DEFAULTFILENAME "Namnlös" IDS_MINIATURETITLE "Miniatyr" IDS_TOOLTIP1 "Lasso" IDS_TOOLTIP2 "Markering" diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 346e8ba5e49..735894e6de8 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS için Paint" IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altındadır." IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri kaydetmek ister misiniz?" - IDS_DEFAULTFILENAME "Adsız.png" + IDS_DEFAULTFILENAME "Adsız" IDS_MINIATURETITLE "Küçük Resim" IDS_TOOLTIP1 "Serbest seçim" IDS_TOOLTIP2 "Seçim" diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 5e5c0dd1dac..08660706f12 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?" - IDS_DEFAULTFILENAME "Без_імені.png" + IDS_DEFAULTFILENAME "Без_імені" IDS_MINIATURETITLE "Мініатюра" IDS_TOOLTIP1 "Виділення довільної області" IDS_TOOLTIP2 "Виділення" diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 08cc40b5b97..9a0d7d03290 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Trình Vẽ cho ReactOS" IDS_INFOTEXT "Được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)" IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?" - IDS_DEFAULTFILENAME "Khongten.png" + IDS_DEFAULTFILENAME "Khongten" IDS_MINIATURETITLE "Ảnh nhỏ" IDS_TOOLTIP1 "Chọn tự do" IDS_TOOLTIP2 "Chọn" diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index ca12cbb1199..c991b85b5cf 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "ReactOS 画图" IDS_INFOTEXT "GNU LGPL 许可证下发布的 (详见 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" - IDS_DEFAULTFILENAME "未命名.png" + IDS_DEFAULTFILENAME "未命名" IDS_MINIATURETITLE "缩略图" IDS_TOOLTIP1 "自由选择" IDS_TOOLTIP2 "选择" diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 3e642fad5dc..8bc305e3159 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "ReactOS 畫圖" IDS_INFOTEXT "GNU LGPL 下發佈的 (詳見 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把變更儲存到 %s 嗎？" - IDS_DEFAULTFILENAME "未命名.png" + IDS_DEFAULTFILENAME "未命名" IDS_MINIATURETITLE "縮圖" IDS_TOOLTIP1 "自由選擇" IDS_TOOLTIP2 "選擇"

1 0

[reactos] 01/01: [MSPAINT] Make PNG default instead of BMP (#4182)
by Katayama Hirofumi MZ 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e6e22e63858c5ed92d16… commit 4e6e22e63858c5ed92d165991226864773c0d799 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 25 22:23:25 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 22:23:25 2021 +0900 [MSPAINT] Make PNG default instead of BMP (#4182) --- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/ja-JP.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/mspaint/main.cpp | 15 ++++++++++++--- 30 files changed, 41 insertions(+), 32 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index de891b5254f..dc910abb2a2 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Рисувач (Paint) за РеактОС" IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?" - IDS_DEFAULTFILENAME "Без име.bmp" + IDS_DEFAULTFILENAME "Без име.png" IDS_MINIATURETITLE "Изображенийце" IDS_TOOLTIP1 "Свободно избиране" IDS_TOOLTIP2 "Избор" diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 06f9a1a2604..9d10d56cfad 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS Malování" IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?" - IDS_DEFAULTFILENAME "Bez názvu.bmp" + IDS_DEFAULTFILENAME "Bez názvu.png" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Volný výběr" IDS_TOOLTIP2 "Výběr" diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 029f5f632b7..3deddc804a5 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint für ReactOS" IDS_INFOTEXT "Unter der GNU Lesser General Public License stehen (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" - IDS_DEFAULTFILENAME "Unbenannt.bmp" + IDS_DEFAULTFILENAME "Unbenannt.png" IDS_MINIATURETITLE "Miniaturansicht" IDS_TOOLTIP1 "Freie Auswahl" IDS_TOOLTIP2 "Auswahl" diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index f77bc942d2b..f693c30c324 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" - IDS_DEFAULTFILENAME "Unnamed.bmp" + IDS_DEFAULTFILENAME "Unnamed.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Free selection" IDS_TOOLTIP2 "Selection" diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index a48eed9516f..997aeb272b1 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" - IDS_DEFAULTFILENAME "Unnamed.bmp" + IDS_DEFAULTFILENAME "Unnamed.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Free selection" IDS_TOOLTIP2 "Selection" diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 7c4d1f7f1c1..c01966069da 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -200,7 +200,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?" - IDS_DEFAULTFILENAME "Sin título.bmp" + IDS_DEFAULTFILENAME "Sin título.png" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Selección de forma libre" IDS_TOOLTIP2 "Selección" diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 336c54d225b..7d9bb78cff2 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint ReactOS'ile" IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" - IDS_DEFAULTFILENAME "Nimetu.bmp" + IDS_DEFAULTFILENAME "Nimetu.png" IDS_MINIATURETITLE "Miniatuur" IDS_TOOLTIP1 "Vaba valik" IDS_TOOLTIP2 "Valik" diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 23591b4d793..ee3420337a0 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "ReactOS-ko Paint" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "%s aldaketak gorde nahi duzu?" - IDS_DEFAULTFILENAME "Izegabea.bmp" + IDS_DEFAULTFILENAME "Izegabea.png" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Hautatu forma librea" IDS_TOOLTIP2 "Hautatu" diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index c6cfc2b8b38..817d56c68d7 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint pour ReactOS" IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" - IDS_DEFAULTFILENAME "Sans titre.bmp" + IDS_DEFAULTFILENAME "Sans titre.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Sélection libre" IDS_TOOLTIP2 "Sélection" diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index c30e98586f0..69be3cc28e7 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -193,7 +193,7 @@ BEGIN IDS_INFOTITLE "צייר עבור ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?" - IDS_DEFAULTFILENAME "ללא שם.bmp" + IDS_DEFAULTFILENAME "ללא שם.png" IDS_MINIATURETITLE "ממוזער" IDS_TOOLTIP1 "בחירה חופשית" IDS_TOOLTIP2 "בחירה" diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index c2b9d4ff32c..eeaf93d4e4f 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "ReactOS Paint" IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhető el (lásd www.gnu.org)" IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?" - IDS_DEFAULTFILENAME "Névtelen.bmp" + IDS_DEFAULTFILENAME "Névtelen.png" IDS_MINIATURETITLE "Miniatúra" IDS_TOOLTIP1 "Szabadkézi kijelölés" IDS_TOOLTIP2 "Kijelölés" diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 794ecce0431..47626c79a07 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint untuk ReactOS" IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?" - IDS_DEFAULTFILENAME "Tanpa Nama.bmp" + IDS_DEFAULTFILENAME "Tanpa Nama.png" IDS_MINIATURETITLE "Miniatur" IDS_TOOLTIP1 "Pilihan Bebas" IDS_TOOLTIP2 "Pilihan" diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 7179b1696df..e07ee23a48b 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint per ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" - IDS_DEFAULTFILENAME "SenzaNome.bmp" + IDS_DEFAULTFILENAME "SenzaNome.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Selezione libera" IDS_TOOLTIP2 "Selezione" diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 1d86c2bb915..72269792c6e 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS ペイント" IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。" IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか？" - IDS_DEFAULTFILENAME "無題.bmp" + IDS_DEFAULTFILENAME "無題.png" IDS_MINIATURETITLE "縮小図" IDS_TOOLTIP1 "自由選択" IDS_TOOLTIP2 "選択" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index c87ffa6c91e..40068652119 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" - IDS_DEFAULTFILENAME "Naamloos.bmp" + IDS_DEFAULTFILENAME "Naamloos.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Vrij selecteren" IDS_TOOLTIP2 "Selecteren" diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 8c5ee64c77a..de234ed221c 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" - IDS_DEFAULTFILENAME "Utennavn.bmp" + IDS_DEFAULTFILENAME "Utennavn.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Frihåndmerking" IDS_TOOLTIP2 "Merk" diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 47293bd2bbf..451cb9f3945 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Paint dla ReactOS" IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do %s?" - IDS_DEFAULTFILENAME "bez tytułu.bmp" + IDS_DEFAULTFILENAME "bez tytułu.png" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Zaznaczenie dowolne" IDS_TOOLTIP2 "Zaznaczenie" diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 135a82ec3bd..bf705b32809 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?" - IDS_DEFAULTFILENAME "Imagem.bmp" + IDS_DEFAULTFILENAME "Imagem.png" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Selecionar forma livre" IDS_TOOLTIP2 "Selecionar" diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 69ff9a2de61..ca1fd97733b 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" - IDS_DEFAULTFILENAME "Imagem.bmp" + IDS_DEFAULTFILENAME "Imagem.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Selecionar forma livre" IDS_TOOLTIP2 "Selecionar" diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 68cb073bc0a..51211054951 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Pictare pentru ReactOS" IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?" - IDS_DEFAULTFILENAME "FărăNume.bmp" + IDS_DEFAULTFILENAME "FărăNume.png" IDS_MINIATURETITLE "Miniatură" IDS_TOOLTIP1 "Golire selecție" IDS_TOOLTIP2 "Selecție" diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 0740f4bf693..ad5787f95f6 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?" - IDS_DEFAULTFILENAME "Безымянный.bmp" + IDS_DEFAULTFILENAME "Безымянный.png" IDS_MINIATURETITLE "Эскиз" IDS_TOOLTIP1 "Выделение произвольной области" IDS_TOOLTIP2 "Выделение" diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 18b9a78f357..94e70e76a2b 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "Skicár systému ReactOS" IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?" - IDS_DEFAULTFILENAME "Bez názvu.bmp" + IDS_DEFAULTFILENAME "Bez názvu.png" IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Voľný výber" IDS_TOOLTIP2 "Výber" diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 812dbf2d457..9c7cbcc8462 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint për ReactOS" IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?" - IDS_DEFAULTFILENAME "Unnamed.bmp" + IDS_DEFAULTFILENAME "Unnamed.png" IDS_MINIATURETITLE "Miniaturë" IDS_TOOLTIP1 "Zgjedhje e lire" IDS_TOOLTIP2 "Zgjedhje" diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index fecb9d1c175..3323e87c56c 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -190,7 +190,7 @@ BEGIN IDS_INFOTITLE "Paint för ReactOS" IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?" - IDS_DEFAULTFILENAME "Namnlös.bmp" + IDS_DEFAULTFILENAME "Namnlös.png" IDS_MINIATURETITLE "Miniatyr" IDS_TOOLTIP1 "Lasso" IDS_TOOLTIP2 "Markering" diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index e0d3b2f03e9..346e8ba5e49 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "ReactOS için Paint" IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altındadır." IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri kaydetmek ister misiniz?" - IDS_DEFAULTFILENAME "Adsız.bmp" + IDS_DEFAULTFILENAME "Adsız.png" IDS_MINIATURETITLE "Küçük Resim" IDS_TOOLTIP1 "Serbest seçim" IDS_TOOLTIP2 "Seçim" diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index f98ee55c9b1..5e5c0dd1dac 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?" - IDS_DEFAULTFILENAME "Без_імені.bmp" + IDS_DEFAULTFILENAME "Без_імені.png" IDS_MINIATURETITLE "Мініатюра" IDS_TOOLTIP1 "Виділення довільної області" IDS_TOOLTIP2 "Виділення" diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index a02c75351f0..08cc40b5b97 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -198,7 +198,7 @@ BEGIN IDS_INFOTITLE "Trình Vẽ cho ReactOS" IDS_INFOTEXT "Được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)" IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?" - IDS_DEFAULTFILENAME "Khongten.bmp" + IDS_DEFAULTFILENAME "Khongten.png" IDS_MINIATURETITLE "Ảnh nhỏ" IDS_TOOLTIP1 "Chọn tự do" IDS_TOOLTIP2 "Chọn" diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index b560d1b3320..ca12cbb1199 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "ReactOS 画图" IDS_INFOTEXT "GNU LGPL 许可证下发布的 (详见 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" - IDS_DEFAULTFILENAME "未命名.bmp" + IDS_DEFAULTFILENAME "未命名.png" IDS_MINIATURETITLE "缩略图" IDS_TOOLTIP1 "自由选择" IDS_TOOLTIP2 "选择" diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index daf5a584b02..3e642fad5dc 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -199,7 +199,7 @@ BEGIN IDS_INFOTITLE "ReactOS 畫圖" IDS_INFOTEXT "GNU LGPL 下發佈的 (詳見 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把變更儲存到 %s 嗎？" - IDS_DEFAULTFILENAME "未命名.bmp" + IDS_DEFAULTFILENAME "未命名.png" IDS_MINIATURETITLE "縮圖" IDS_TOOLTIP1 "自由選擇" IDS_TOOLTIP2 "選擇" diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index f176f3b7c86..f1145d7f179 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -264,7 +264,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument choosecolor.lpCustColors = custColors; /* initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName */ - CopyMemory(ofnFilename, filepathname, sizeof(filepathname)); + ofnFilename[0] = 0; CString strImporters; CSimpleArray<GUID> aguidFileTypesI; CString strAllPictureFiles; @@ -283,7 +283,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument ofn.lpstrFileTitle = ofnFiletitle; ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY; - ofn.lpstrDefExt = L"bmp"; + ofn.lpstrDefExt = L"png"; CopyMemory(sfnFilename, filepathname, sizeof(filepathname)); CString strExporters; @@ -300,7 +300,16 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.lpfnHook = OFNHookProc; - sfn.lpstrDefExt = L"bmp"; + sfn.lpstrDefExt = L"png"; + // Choose PNG + for (INT i = 0; i < aguidFileTypesE.GetSize(); ++i) + { + if (aguidFileTypesE[i] == Gdiplus::ImageFormatPNG) + { + sfn.nFilterIndex = i + 1; + break; + } + } /* creating the size boxes */ RECT sizeboxPos = {0, 0, 0 + 3, 0 + 3};

1 0

[reactos] 01/01: [SCHEDSVC] Use a timer to start jobs
by Eric Kohl 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa607733cb063d233ca04… commit fa607733cb063d233ca04c090b03e328d8645be7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 25 14:18:53 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 25 14:18:53 2021 +0100 [SCHEDSVC] Use a timer to start jobs This enables the service to start multiple jobs at the same time. --- base/services/schedsvc/job.c | 220 +++++++++++++++---------------------- base/services/schedsvc/precomp.h | 12 +- base/services/schedsvc/rpcserver.c | 4 - base/services/schedsvc/schedsvc.c | 26 +++-- 4 files changed, 110 insertions(+), 152 deletions(-) diff --git a/base/services/schedsvc/job.c b/base/services/schedsvc/job.c index 558ac3797dd..e29d2732716 100644 --- a/base/services/schedsvc/job.c +++ b/base/services/schedsvc/job.c @@ -31,60 +31,59 @@ RTL_RESOURCE JobListLock; LIST_ENTRY StartListHead; RTL_RESOURCE StartListLock; +FILETIME NextJobStartTime; +BOOL bValidNextJobStartTime = FALSE; + static WORD wDaysArray[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* FUNCTIONS *****************************************************************/ -DWORD -GetNextJobTimeout(VOID) +VOID +GetNextJobTimeout(HANDLE hTimer) { - FILETIME FileTime; - SYSTEMTIME SystemTime; - ULARGE_INTEGER CurrentTime, Timeout; - PJOB pNextJob; + PLIST_ENTRY CurrentEntry; + FILETIME DueTime; + PJOB CurrentJob; - if (IsListEmpty(&StartListHead)) + bValidNextJobStartTime = FALSE; + CurrentEntry = JobListHead.Flink; + while (CurrentEntry != &JobListHead) { - TRACE("No job in list! Wait until next update.\n"); - return INFINITE; - } - - pNextJob = CONTAINING_RECORD((&StartListHead)->Flink, JOB, StartEntry); - - FileTime.dwLowDateTime = pNextJob->StartTime.u.LowPart; - FileTime.dwHighDateTime = pNextJob->StartTime.u.HighPart; - FileTimeToSystemTime(&FileTime, &SystemTime); - - TRACE("Start next job (%lu) at %02hu:%02hu %02hu.%02hu.%hu\n", - pNextJob->JobId, SystemTime.wHour, SystemTime.wMinute, - SystemTime.wDay, SystemTime.wMonth, SystemTime.wYear); - - GetLocalTime(&SystemTime); - SystemTimeToFileTime(&SystemTime, &FileTime); + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, JobEntry); - CurrentTime.u.LowPart = FileTime.dwLowDateTime; - CurrentTime.u.HighPart = FileTime.dwHighDateTime; + if (bValidNextJobStartTime == FALSE) + { + CopyMemory(&NextJobStartTime, &CurrentJob->StartTime, sizeof(FILETIME)); + bValidNextJobStartTime = TRUE; + } + else + { + if (CompareFileTime(&NextJobStartTime, &CurrentJob->StartTime) > 0) + CopyMemory(&NextJobStartTime, &CurrentJob->StartTime, sizeof(FILETIME)); + } - if (CurrentTime.QuadPart >= pNextJob->StartTime.QuadPart) - { - TRACE("Next event has already gone by!\n"); - return 0; + CurrentEntry = CurrentEntry->Flink; } - Timeout.QuadPart = (pNextJob->StartTime.QuadPart - CurrentTime.QuadPart) / 10000; - if (Timeout.u.HighPart != 0) + if (bValidNextJobStartTime == FALSE) { - TRACE("Event happens too far in the future!\n"); - return INFINITE; + TRACE("No valid job!\n"); + return; } - TRACE("Timeout: %lu\n", Timeout.u.LowPart); - return Timeout.u.LowPart; -} + LocalFileTimeToFileTime(&DueTime, &NextJobStartTime); + SetWaitableTimer(hTimer, + (PLARGE_INTEGER)&DueTime, + 0, + NULL, + NULL, + TRUE); +} +#if 0 static VOID ReScheduleJob( @@ -117,59 +116,61 @@ ReScheduleJob( DumpStartList(&StartListHead); #endif } - +#endif VOID -RunNextJob(VOID) +RunCurrentJobs(VOID) { PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; + PLIST_ENTRY CurrentEntry; + PJOB CurrentJob; BOOL bRet; - PJOB pNextJob; - if (IsListEmpty(&StartListHead)) + CurrentEntry = JobListHead.Flink; + while (CurrentEntry != &JobListHead) { - ERR("No job in list!\n"); - return; - } + CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, JobEntry); - pNextJob = CONTAINING_RECORD((&StartListHead)->Flink, JOB, StartEntry); + if (CompareFileTime(&NextJobStartTime, &CurrentJob->StartTime) == 0) + { + TRACE("Run job %ld: %S\n", CurrentJob->JobId, CurrentJob->Command); - TRACE("Run job %ld: %S\n", pNextJob->JobId, pNextJob->Command); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpTitle = CurrentJob->Command; + StartupInfo.dwFlags = STARTF_USESHOWWINDOW; + StartupInfo.wShowWindow = SW_SHOWDEFAULT; - ZeroMemory(&StartupInfo, sizeof(StartupInfo)); - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpTitle = pNextJob->Command; - StartupInfo.dwFlags = STARTF_USESHOWWINDOW; - StartupInfo.wShowWindow = SW_SHOWDEFAULT; + if ((CurrentJob->Flags & JOB_NONINTERACTIVE) == 0) + { + StartupInfo.dwFlags |= STARTF_INHERITDESKTOP; + StartupInfo.lpDesktop = L"WinSta0\\Default"; + } - if ((pNextJob->Flags & JOB_NONINTERACTIVE) == 0) - { - StartupInfo.dwFlags |= STARTF_INHERITDESKTOP; - StartupInfo.lpDesktop = L"WinSta0\\Default"; - } + bRet = CreateProcessW(NULL, + CurrentJob->Command, + NULL, + NULL, + FALSE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (bRet == FALSE) + { + ERR("CreateProcessW() failed (Error %lu)\n", GetLastError()); + } + else + { + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + } + } - bRet = CreateProcessW(NULL, - pNextJob->Command, - NULL, - NULL, - FALSE, - CREATE_NEW_CONSOLE, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (bRet == FALSE) - { - ERR("CreateProcessW() failed (Error %lu)\n", GetLastError()); - } - else - { - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); + CurrentEntry = CurrentEntry->Flink; } - - ReScheduleJob(pNextJob); } @@ -420,8 +421,6 @@ LoadJobs(VOID) /* Calculate the next start time */ CalculateNextStartTime(pJob); - /* Insert the job into the start list */ - InsertJobIntoStartList(&StartListHead, pJob); #if 0 DumpStartList(&StartListHead); #endif @@ -473,6 +472,7 @@ CalculateNextStartTime( WORD wDaysOffset, wTempOffset, i, wJobDayOfWeek, wJobDayOfMonth; DWORD_PTR CurrentTimeMs; BOOL bDaysOffsetValid; + ULARGE_INTEGER LocalStartTime; TRACE("CalculateNextStartTime(%p)\n", pJob); TRACE("JobTime: %lu\n", pJob->JobTime); @@ -590,66 +590,18 @@ CalculateNextStartTime( SystemTimeToFileTime(&StartSystemTime, &StartFileTime); - pJob->StartTime.u.LowPart = StartFileTime.dwLowDateTime; - pJob->StartTime.u.HighPart = StartFileTime.dwHighDateTime; + LocalStartTime.u.LowPart = StartFileTime.dwLowDateTime; + LocalStartTime.u.HighPart = StartFileTime.dwHighDateTime; if (bDaysOffsetValid && wDaysOffset != 0) { - pJob->StartTime.QuadPart += ((ULONGLONG)wDaysOffset * 24 * 60 * 60 * 10000); - } -} - - -VOID -InsertJobIntoStartList( - _In_ PLIST_ENTRY StartListHead, - _In_ PJOB pJob) -{ - PLIST_ENTRY CurrentEntry, PreviousEntry; - PJOB CurrentJob; - - if (IsListEmpty(StartListHead)) - { - InsertHeadList(StartListHead, &pJob->StartEntry); - return; + LocalStartTime.QuadPart += ((ULONGLONG)wDaysOffset * 24 * 60 * 60 * 10000); } - CurrentEntry = StartListHead->Flink; - while (CurrentEntry != StartListHead) - { - CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); - - if ((CurrentEntry == StartListHead->Flink) && - (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart)) - { - /* Insert before the first entry */ - InsertHeadList(StartListHead, &pJob->StartEntry); - return; - } - - if (pJob->StartTime.QuadPart < CurrentJob->StartTime.QuadPart) - { - /* Insert between the previous and the current entry */ - PreviousEntry = CurrentEntry->Blink; - pJob->StartEntry.Blink = PreviousEntry; - pJob->StartEntry.Flink = CurrentEntry; - PreviousEntry->Flink = &pJob->StartEntry; - CurrentEntry->Blink = &pJob->StartEntry; - return; - } - - if ((CurrentEntry->Flink == StartListHead) && - (pJob->StartTime.QuadPart >= CurrentJob->StartTime.QuadPart)) - { - /* Insert after the last entry */ - InsertTailList(StartListHead, &pJob->StartEntry); - return; - } - - CurrentEntry = CurrentEntry->Flink; - } + pJob->StartTime.dwLowDateTime = LocalStartTime.u.LowPart; + pJob->StartTime.dwHighDateTime = LocalStartTime.u.HighPart; } - +#if 0 VOID DumpStartList( _In_ PLIST_ENTRY StartListHead) @@ -657,8 +609,8 @@ DumpStartList( PLIST_ENTRY CurrentEntry; PJOB CurrentJob; - CurrentEntry = StartListHead->Flink; - while (CurrentEntry != StartListHead) + CurrentEntry = JobListHead->Flink; + while (CurrentEntry != &JobListHead) { CurrentJob = CONTAINING_RECORD(CurrentEntry, JOB, StartEntry); @@ -667,5 +619,5 @@ DumpStartList( CurrentEntry = CurrentEntry->Flink; } } - +#endif /* EOF */ diff --git a/base/services/schedsvc/precomp.h b/base/services/schedsvc/precomp.h index 992e16796d8..f3c3e4255cf 100644 --- a/base/services/schedsvc/precomp.h +++ b/base/services/schedsvc/precomp.h @@ -32,8 +32,7 @@ typedef struct _JOB { LIST_ENTRY JobEntry; - LIST_ENTRY StartEntry; - ULARGE_INTEGER StartTime; + FILETIME StartTime; WCHAR Name[JOB_NAME_LENGTH]; DWORD JobId; @@ -54,16 +53,17 @@ extern RTL_RESOURCE JobListLock; extern LIST_ENTRY StartListHead; extern RTL_RESOURCE StartListLock; -extern HANDLE Events[2]; +extern HANDLE Events[3]; /* job.c */ -DWORD -GetNextJobTimeout(VOID); +VOID +GetNextJobTimeout( + HANDLE hTimer); VOID -RunNextJob(VOID); +RunCurrentJobs(VOID); LONG SaveJob( diff --git a/base/services/schedsvc/rpcserver.c b/base/services/schedsvc/rpcserver.c index 4ae657f6a2a..ca3c8fd5b99 100644 --- a/base/services/schedsvc/rpcserver.c +++ b/base/services/schedsvc/rpcserver.c @@ -121,8 +121,6 @@ NetrJobAdd( /* Calculate the next start time */ CalculateNextStartTime(pJob); - /* Insert the job into the start list */ - InsertJobIntoStartList(&StartListHead, pJob); #if 0 DumpStartList(&StartListHead); #endif @@ -169,8 +167,6 @@ NetrJobDel( if ((CurrentJob->JobId >= MinJobId) && (CurrentJob->JobId <= MaxJobId)) { - /* Remove the job from the start list */ - RemoveEntryList(&CurrentJob->StartEntry); #if 0 DumpStartList(&StartListHead); #endif diff --git a/base/services/schedsvc/schedsvc.c b/base/services/schedsvc/schedsvc.c index ba96195839f..dea78455141 100644 --- a/base/services/schedsvc/schedsvc.c +++ b/base/services/schedsvc/schedsvc.c @@ -37,7 +37,7 @@ static WCHAR ServiceName[] = L"Schedule"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; -HANDLE Events[2] = {NULL, NULL}; // StopEvent, UpdateEvent +HANDLE Events[3] = {NULL, NULL, NULL}; // StopEvent, UpdateEvent, Timer /* FUNCTIONS *****************************************************************/ @@ -181,6 +181,15 @@ ServiceInit(VOID) return GetLastError(); } + Events[2] = CreateWaitableTimerW(NULL, FALSE, NULL); + if (Events[2] == NULL) + { + ERR("Could not create the timer\n"); + CloseHandle(Events[1]); + CloseHandle(Events[0]); + return GetLastError(); + } + return ERROR_SUCCESS; } @@ -188,7 +197,7 @@ ServiceInit(VOID) VOID WINAPI SchedServiceMain(DWORD argc, LPTSTR *argv) { - DWORD dwWait, dwTimeout, dwError; + DWORD dwWait, dwError; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); @@ -216,13 +225,13 @@ SchedServiceMain(DWORD argc, LPTSTR *argv) UpdateServiceStatus(SERVICE_RUNNING); - dwTimeout = GetNextJobTimeout(); + GetNextJobTimeout(Events[2]); for (;;) { /* Wait for the next event */ TRACE("Wait for next event!\n"); - dwWait = WaitForMultipleObjects(2, Events, FALSE, dwTimeout); + dwWait = WaitForMultipleObjects(3, Events, FALSE, INFINITE); if (dwWait == WAIT_OBJECT_0) { TRACE("Stop event signaled!\n"); @@ -233,16 +242,16 @@ SchedServiceMain(DWORD argc, LPTSTR *argv) TRACE("Update event signaled!\n"); RtlAcquireResourceShared(&JobListLock, TRUE); - dwTimeout = GetNextJobTimeout(); + GetNextJobTimeout(Events[2]); RtlReleaseResource(&JobListLock); } - else if (dwWait == WAIT_TIMEOUT) + else if (dwWait == WAIT_OBJECT_0 + 2) { TRACE("Timeout: Start the next job!\n"); RtlAcquireResourceExclusive(&JobListLock, TRUE); - RunNextJob(); - dwTimeout = GetNextJobTimeout(); + RunCurrentJobs(); + GetNextJobTimeout(Events[2]); RtlReleaseResource(&JobListLock); } } @@ -250,6 +259,7 @@ SchedServiceMain(DWORD argc, LPTSTR *argv) /* Close the start and update event handles */ CloseHandle(Events[0]); CloseHandle(Events[1]); + CloseHandle(Events[2]); /* Stop the service */ UpdateServiceStatus(SERVICE_STOPPED);

1 0

[reactos] 05/05: [MSV1_0] Implement LsaApLogonUserEx2_Network (5/5)
by Andreas Maier 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99dcd6f71cb72a973e858… commit 99dcd6f71cb72a973e85888903b5ed31241ad5c3 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Jul 16 20:44:01 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 25 15:55:43 2021 +0300 [MSV1_0] Implement LsaApLogonUserEx2_Network (5/5) This is a part of the Partial Network Login Implementation PR. --- dll/win32/msv1_0/CMakeLists.txt | 1 + dll/win32/msv1_0/lsa.c | 1 - dll/win32/msv1_0/lsa.h | 3 - dll/win32/msv1_0/msv1_0.c | 209 +++++++++++++++++----- dll/win32/msv1_0/msv1_0.h | 58 +++++++ dll/win32/msv1_0/ntlm/global.c | 41 +++++ dll/win32/msv1_0/ntlm/global.h | 22 ++- dll/win32/msv1_0/ntlm/protocol.h | 24 +++ dll/win32/msv1_0/ntlm/util.c | 367 +++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/ntlm/util.h | 64 +++++++ dll/win32/msv1_0/precomp.h | 2 + dll/win32/msv1_0/sam.c | 2 + dll/win32/msv1_0/sam.h | 12 ++ 13 files changed, 758 insertions(+), 48 deletions(-) diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt index 50fa39aa44b..a336c7a6a4e 100644 --- a/dll/win32/msv1_0/CMakeLists.txt +++ b/dll/win32/msv1_0/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE lsa.c msv1_0.c ntlm/global.c + ntlm/util.c sam.c user.c usercontext.c diff --git a/dll/win32/msv1_0/lsa.c b/dll/win32/msv1_0/lsa.c index 0bbf4699c66..e8e4da8854e 100644 --- a/dll/win32/msv1_0/lsa.c +++ b/dll/win32/msv1_0/lsa.c @@ -10,7 +10,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); -SECPKG_FUNCTION_TABLE NtlmLsaFn[1]; NTSTATUS NTAPI diff --git a/dll/win32/msv1_0/lsa.h b/dll/win32/msv1_0/lsa.h index 2df98a710c6..3577dbce361 100644 --- a/dll/win32/msv1_0/lsa.h +++ b/dll/win32/msv1_0/lsa.h @@ -7,9 +7,6 @@ #pragma once -// functions we provide to LSA in SpLsaModeInitialize -extern SECPKG_FUNCTION_TABLE NtlmLsaFn[1]; - NTSTATUS NTAPI SpInitialize( diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index eefddf3d0e0..63aad086fd9 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -13,11 +13,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); -/* GLOBALS *****************************************************************/ - -LSA_DISPATCH_TABLE DispatchTable; - - /* FUNCTIONS ***************************************************************/ static @@ -176,6 +171,110 @@ done: } +static +NTSTATUS +BuildLm20LogonProfileBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PSAMPR_USER_INFO_BUFFER UserInfo, + _In_ PLSA_SAM_PWD_DATA LogonPwdData, + _Out_ PMSV1_0_LM20_LOGON_PROFILE *ProfileBuffer, + _Out_ PULONG ProfileBufferLength) +{ + PMSV1_0_LM20_LOGON_PROFILE LocalBuffer; + NTLM_CLIENT_BUFFER Buffer; + PBYTE PtrOffset; + ULONG BufferLength; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ComputerNameUCS; + + *ProfileBuffer = NULL; + *ProfileBufferLength = 0; + + if (!NtlmUStrAlloc(&ComputerNameUCS, LogonPwdData->ComputerName->Length + sizeof(WCHAR) * 3, 0)) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + Status = RtlAppendUnicodeToString(&ComputerNameUCS, L"\\\\"); + if (!NT_SUCCESS(Status)) + { + ERR("RtlAppendUnicodeToString failed 0x%lx\n", Status); + goto done; + } + Status = RtlAppendUnicodeStringToString(&ComputerNameUCS, LogonPwdData->ComputerName); + if (!NT_SUCCESS(Status)) + { + ERR("RtlAppendUnicodeStringToString failed 0x%lx\n", Status); + goto done; + } + + BufferLength = sizeof(MSV1_0_LM20_LOGON_PROFILE) + ComputerNameUCS.Length + sizeof(WCHAR); + + Status = NtlmAllocateClientBuffer(ClientRequest, BufferLength, &Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("DispatchTable.AllocateClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + TRACE("ClientBaseAddress: %p\n", Buffer.ClientBaseAddress); + + LocalBuffer = (PMSV1_0_LM20_LOGON_PROFILE)Buffer.LocalBuffer; + PtrOffset = (PBYTE)(LocalBuffer + 1); + + LocalBuffer->MessageType = MsV1_0Lm20LogonProfile; + LocalBuffer->KickOffTime.LowPart = UserInfo->All.AccountExpires.LowPart; + LocalBuffer->KickOffTime.HighPart = UserInfo->All.AccountExpires.HighPart; + LocalBuffer->LogoffTime.LowPart = UserInfo->All.AccountExpires.LowPart; + LocalBuffer->LogoffTime.HighPart = UserInfo->All.AccountExpires.HighPart; + + memcpy(LocalBuffer->UserSessionKey, + &LogonPwdData->UserSessionKey, + MSV1_0_USER_SESSION_KEY_LENGTH); + + //FIXME: Set Domainname if we domain joined + // what to do if not? WORKGROUP + RtlInitUnicodeString(&LocalBuffer->LogonDomainName, NULL); + + memcpy(LocalBuffer->LanmanSessionKey, + &LogonPwdData->LanmanSessionKey, + MSV1_0_LANMAN_SESSION_KEY_LENGTH); + + if (!NtlmUStrWriteToStruct(LocalBuffer, + BufferLength, + &LocalBuffer->LogonServer, + &ComputerNameUCS, + &PtrOffset, + TRUE)) + { + ERR("NtlmStructWriteUCS failed.\n"); + Status = ERROR_INTERNAL_ERROR; + goto done; + } + /* not supported */ + RtlInitUnicodeString(&LocalBuffer->UserParameters, NULL); + /* Build user flags */ + LocalBuffer->UserFlags = 0x0; + if (LogonPwdData->LogonType == NetLogonLmKey) + LocalBuffer->UserFlags |= LOGON_USED_LM_PASSWORD; + + /* copy data to client buffer */ + Status = NtlmCopyToClientBuffer(ClientRequest, BufferLength, &Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("DispatchTable.CopyToClientBuffer failed (Status 0x%08lx)\n", Status); + goto done; + } + + *ProfileBuffer = (PMSV1_0_LM20_LOGON_PROFILE)Buffer.ClientBaseAddress; + *ProfileBufferLength = BufferLength; +done: + /* On success Buffer.ClientBaseAddress will not be free */ + NtlmFreeClientBuffer(ClientRequest, !NT_SUCCESS(Status), &Buffer); + NtlmUStrFree(&ComputerNameUCS); + return Status; +} + static PSID AppendRidToSid(PSID SrcSid, @@ -931,7 +1030,72 @@ LsaApLogonUserEx2_Network( _Out_ PULONG LogonProfileSize, _Out_ PNTSTATUS SubStatus) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PMSV1_0_LM20_LOGON LogonInfo; + ULONG_PTR PtrOffset; + + *LogonProfile = NULL; + *LogonProfileSize = 0; + *UserInfoPtr = NULL; + *AccountDomainSidPtr = NULL; + *SpecialAccount = FALSE; + LogonInfo = ProtocolSubmitBuffer; + + if (SubmitBufferSize < sizeof(MSV1_0_LM20_LOGON)) + { + ERR("Invalid SubmitBufferSize %lu\n", SubmitBufferSize); + return STATUS_INVALID_PARAMETER; + } + + /* Fix-up pointers in the authentication info */ + PtrOffset = (ULONG_PTR)ProtocolSubmitBuffer - (ULONG_PTR)ClientBufferBase; + + if ((!NtlmFixupAndValidateUStr(&LogonInfo->LogonDomainName, PtrOffset)) || + (!NtlmFixupAndValidateUStr(&LogonInfo->UserName, PtrOffset)) || + (!NtlmFixupAndValidateUStr(&LogonInfo->Workstation, PtrOffset)) || + (!NtlmFixupAStr(&LogonInfo->CaseSensitiveChallengeResponse, PtrOffset)) || + (!NtlmFixupAStr(&LogonInfo->CaseInsensitiveChallengeResponse, PtrOffset))) + { + return STATUS_INVALID_PARAMETER; + } + + LogonPwdData->IsNetwork = TRUE; + LogonPwdData->LogonInfo = LogonInfo; + LogonPwdData->ComputerName = ComputerName; + Status = SamValidateUser(Network, + &LogonInfo->UserName, + &LogonInfo->LogonDomainName, + LogonPwdData, + ComputerName, + SpecialAccount, + AccountDomainSidPtr, + UserHandlePtr, + UserInfoPtr, + SubStatus); + if (!NT_SUCCESS(Status)) + { + ERR("SamValidateUser failed with 0x%lx\n", Status); + return Status; + } + + if (LogonInfo->ParameterControl & MSV1_0_RETURN_PROFILE_PATH) + { + Status = BuildLm20LogonProfileBuffer(ClientRequest, + *UserInfoPtr, + LogonPwdData, + LogonProfile, + LogonProfileSize); + if (!NT_SUCCESS(Status)) + { + ERR("BuildLm20LogonProfileBuffer failed with 0x%lx\n", Status); + return Status; + } + } + + *LogonUserRef = &LogonInfo->UserName; + *LogonDomainRef = &LogonInfo->LogonDomainName; + + return Status; } /* @@ -1325,39 +1489,6 @@ SpLsaModeInitialize( *PackageVersion = SECPKG_INTERFACE_VERSION; - RtlZeroMemory(NtlmLsaFn, sizeof(NtlmLsaFn)); - - /* msv1_0 (XP, win2k) returns NULL for - * InitializePackage, LsaLogonUser,LsaLogonUserEx, - * SpQueryContextAttributes and SpAddCredentials */ - NtlmLsaFn[0].InitializePackage = NULL; - NtlmLsaFn[0].LsaLogonUser = NULL; - NtlmLsaFn[0].CallPackage = LsaApCallPackage; - NtlmLsaFn[0].LogonTerminated = LsaApLogonTerminated; - NtlmLsaFn[0].CallPackageUntrusted = LsaApCallPackageUntrusted; - NtlmLsaFn[0].CallPackagePassthrough = LsaApCallPackagePassthrough; - NtlmLsaFn[0].LogonUserEx = NULL; - NtlmLsaFn[0].LogonUserEx2 = LsaApLogonUserEx2; - NtlmLsaFn[0].Initialize = SpInitialize; - NtlmLsaFn[0].Shutdown = LsaSpShutDown; - NtlmLsaFn[0].GetInfo = LsaSpGetInfoW; - NtlmLsaFn[0].AcceptCredentials = SpAcceptCredentials; - NtlmLsaFn[0].SpAcquireCredentialsHandle = LsaSpAcquireCredentialsHandle; - NtlmLsaFn[0].SpQueryCredentialsAttributes = LsaSpQueryCredentialsAttributes; - NtlmLsaFn[0].FreeCredentialsHandle = LsaSpFreeCredentialsHandle; - NtlmLsaFn[0].SaveCredentials = LsaSpSaveCredentials; - NtlmLsaFn[0].GetCredentials = LsaSpGetCredentials; - NtlmLsaFn[0].DeleteCredentials = LsaSpDeleteCredentials; - NtlmLsaFn[0].InitLsaModeContext = LsaSpInitLsaModeContext; - NtlmLsaFn[0].AcceptLsaModeContext = LsaSpAcceptLsaModeContext; - NtlmLsaFn[0].DeleteContext = LsaSpDeleteContext; - NtlmLsaFn[0].ApplyControlToken = LsaSpApplyControlToken; - NtlmLsaFn[0].GetUserInfo = LsaSpGetUserInfo; - NtlmLsaFn[0].GetExtendedInformation = LsaSpGetExtendedInformation; - NtlmLsaFn[0].SpQueryContextAttributes = NULL; - NtlmLsaFn[0].SpAddCredentials = NULL; - NtlmLsaFn[0].SetExtendedInformation = LsaSpSetExtendedInformation; - *ppTables = NtlmLsaFn; *pcTables = 1; diff --git a/dll/win32/msv1_0/msv1_0.h b/dll/win32/msv1_0/msv1_0.h index 1b656bca4f1..40b6c6bfc75 100644 --- a/dll/win32/msv1_0/msv1_0.h +++ b/dll/win32/msv1_0/msv1_0.h @@ -326,4 +326,62 @@ SystemFunction012(const BYTE *in, const BYTE *key, LPBYTE out); +NTSTATUS +NTAPI +LsaApCallPackage( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferLength, + _Out_ PVOID *ProtocolReturnBuffer, + _Out_ PULONG ReturnBufferLength, + _Out_ PNTSTATUS ProtocolStatus); + +NTSTATUS +NTAPI +LsaApCallPackagePassthrough( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferLength, + _Out_ PVOID *ProtocolReturnBuffer, + _Out_ PULONG ReturnBufferLength, + _Out_ PNTSTATUS ProtocolStatus); + +NTSTATUS +NTAPI +LsaApCallPackageUntrusted( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferLength, + _Out_ PVOID *ProtocolReturnBuffer, + _Out_ PULONG ReturnBufferLength, + _Out_ PNTSTATUS ProtocolStatus); + +VOID +NTAPI +LsaApLogonTerminated( + _In_ PLUID LogonId); + +NTSTATUS +NTAPI +LsaApLogonUserEx2( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ SECURITY_LOGON_TYPE LogonType, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferSize, + _Out_ PVOID *ProfileBuffer, + _Out_ PULONG ProfileBufferSize, + _Out_ PLUID LogonId, + _Out_ PNTSTATUS SubStatus, + _Out_ PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, + _Out_ PVOID *TokenInformation, + _Out_ PUNICODE_STRING *AccountName, + _Out_ PUNICODE_STRING *AuthenticatingAuthority, + _Out_ PUNICODE_STRING *MachineName, + _Out_ PSECPKG_PRIMARY_CRED PrimaryCredentials, + _Out_ PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials); + /* EOF */ diff --git a/dll/win32/msv1_0/ntlm/global.c b/dll/win32/msv1_0/ntlm/global.c index ba1082f9ff9..12057fd2084 100644 --- a/dll/win32/msv1_0/ntlm/global.c +++ b/dll/win32/msv1_0/ntlm/global.c @@ -12,6 +12,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); /* globals */ +NTLM_MODE NtlmMode = NtlmUnknownMode; + +LSA_DISPATCH_TABLE DispatchTable; + +PLSA_SECPKG_FUNCTION_TABLE LsaFunctions = NULL; +/* msv1_0 (XP, win2k) returns NULL for + * InitializePackage, LsaLogonUser,LsaLogonUserEx, + * SpQueryContextAttributes and SpAddCredentials */ +SECPKG_FUNCTION_TABLE NtlmLsaFn[1] = +{ + { + .InitializePackage = NULL, + .LsaLogonUser = NULL, + .CallPackage = LsaApCallPackage, + .LogonTerminated = LsaApLogonTerminated, + .CallPackageUntrusted = LsaApCallPackageUntrusted, + .CallPackagePassthrough = LsaApCallPackagePassthrough, + .LogonUserEx = NULL, + .LogonUserEx2 = LsaApLogonUserEx2, + .Initialize = SpInitialize, + .Shutdown = LsaSpShutDown, + .GetInfo = LsaSpGetInfoW, + .AcceptCredentials = SpAcceptCredentials, + .SpAcquireCredentialsHandle = LsaSpAcquireCredentialsHandle, + .SpQueryCredentialsAttributes = LsaSpQueryCredentialsAttributes, + .FreeCredentialsHandle = LsaSpFreeCredentialsHandle, + .SaveCredentials = LsaSpSaveCredentials, + .GetCredentials = LsaSpGetCredentials, + .DeleteCredentials = LsaSpDeleteCredentials, + .InitLsaModeContext = LsaSpInitLsaModeContext, + .AcceptLsaModeContext = LsaSpAcceptLsaModeContext, + .DeleteContext = LsaSpDeleteContext, + .ApplyControlToken = LsaSpApplyControlToken, + .GetUserInfo = LsaSpGetUserInfo, + .GetExtendedInformation = LsaSpGetExtendedInformation, + .SpQueryContextAttributes = NULL, + .SpAddCredentials = NULL, + .SetExtendedInformation = LsaSpSetExtendedInformation + } +}; + PSECPKG_DLL_FUNCTIONS UsrFunctions = NULL; SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1] = { diff --git a/dll/win32/msv1_0/ntlm/global.h b/dll/win32/msv1_0/ntlm/global.h index 2ee2f1092dd..4b83d232bc4 100644 --- a/dll/win32/msv1_0/ntlm/global.h +++ b/dll/win32/msv1_0/ntlm/global.h @@ -1,17 +1,29 @@ /* * PROJECT: Authentication Package DLL * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: ntlm globals definitions (header) + * PURPOSE: NTLM globals definitions (header) * COPYRIGHT: Copyright 2011 Samuel Serapión - * Copyright 2020 Andreas Maier (staubim(a)quantentunnel.de) + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> */ -#ifndef _MSV1_0_NTLM_GLOBALS_H_ -#define _MSV1_0_NTLM_GLOBALS_H_ +#pragma once +/* functions provided by LSA in SpInitialize */ +extern PLSA_SECPKG_FUNCTION_TABLE LsaFunctions; +/* functions we provide to LSA in SpLsaModeInitialize */ +extern SECPKG_FUNCTION_TABLE NtlmLsaFn[1]; /* functions provided by LSA in SpInstanceInit */ extern PSECPKG_DLL_FUNCTIONS UsrFunctions; /* functions we provide to LSA in SpUserModeInitialize */ extern SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1]; -#endif +extern LSA_DISPATCH_TABLE DispatchTable; + +typedef enum _NTLM_MODE +{ + NtlmUnknownMode = 0, + NtlmLsaMode = 1, + NtlmUserMode +} NTLM_MODE, *PNTLM_MODE; + +extern NTLM_MODE NtlmMode; diff --git a/dll/win32/msv1_0/ntlm/protocol.h b/dll/win32/msv1_0/ntlm/protocol.h new file mode 100644 index 00000000000..e379845eb80 --- /dev/null +++ b/dll/win32/msv1_0/ntlm/protocol.h @@ -0,0 +1,24 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM protocol definitions (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +typedef struct _CYPHER_BLOCK +{ + CHAR data[8]; +} CYPHER_BLOCK, *PCYPHER_BLOCK; + +typedef struct _USER_SESSION_KEY +{ + CYPHER_BLOCK data[2]; +} USER_SESSION_KEY, *PUSER_SESSION_KEY; + +typedef struct _LANMAN_SESSION_KEY +{ + UINT8 data[MSV1_0_LANMAN_SESSION_KEY_LENGTH]; +} LANMAN_SESSION_KEY, *PLANMAN_SESSION_KEY; diff --git a/dll/win32/msv1_0/ntlm/util.c b/dll/win32/msv1_0/ntlm/util.c new file mode 100644 index 00000000000..948a0b72e09 --- /dev/null +++ b/dll/win32/msv1_0/ntlm/util.c @@ -0,0 +1,367 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Utils for msv1_0 + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#include "../precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +#define NTLM_ALLOC_TAG "NTLM" +#define NTLM_ALLOC_TAG_SIZE strlen(NTLM_ALLOC_TAG) + +PVOID +NtlmAllocate( + _In_ size_t Size, + _In_ bool UsePrivateLsaHeap) +{ + PVOID buffer = NULL; + + if (Size == 0) + { + ERR("Allocating 0 bytes!\n"); + return NULL; + } + + Size += NTLM_ALLOC_TAG_SIZE; + + switch (NtlmMode) + { + case NtlmLsaMode: + { + if (UsePrivateLsaHeap) + buffer = LsaFunctions->AllocatePrivateHeap(Size); + else + buffer = LsaFunctions->AllocateLsaHeap(Size); + + if (buffer != NULL) + RtlZeroMemory(buffer, Size); + break; + } + case NtlmUserMode: + { + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + break; + } + default: + { + ERR("NtlmState unknown!\n"); + break; + } + } + + memcpy(buffer, NTLM_ALLOC_TAG, NTLM_ALLOC_TAG_SIZE); + buffer = (PBYTE)buffer + NTLM_ALLOC_TAG_SIZE; + + return buffer; +} + +VOID +NtlmFree( + _In_ PVOID Buffer, + _In_ bool FromPrivateLsaHeap) +{ + if (Buffer) + { + Buffer = (PBYTE)Buffer - NTLM_ALLOC_TAG_SIZE; + ASSERT(memcmp(Buffer, NTLM_ALLOC_TAG, NTLM_ALLOC_TAG_SIZE) == 0); + *(char*)Buffer = 'D'; + + switch (NtlmMode) + { + case NtlmLsaMode: + { + if (FromPrivateLsaHeap) + LsaFunctions->FreePrivateHeap(Buffer); + else + LsaFunctions->FreeLsaHeap(Buffer); + break; + } + case NtlmUserMode: + { + HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, Buffer); + break; + } + default: + { + ERR("NtlmState unknown!\n"); + break; + } + } + } + else + { + ERR("Trying to free NULL!\n"); + } +} + +bool +NtlmUStrAlloc( + _Inout_ PUNICODE_STRING Dst, + _In_ UINT16 SizeInBytes, + _In_ UINT16 InitLength) +{ + Dst->Length = InitLength; + Dst->MaximumLength = SizeInBytes; + Dst->Buffer = NtlmAllocate(SizeInBytes, false); + return (Dst->Buffer != NULL); +} + +VOID +NtlmUStrFree( + _In_ PUNICODE_STRING String) +{ + if (String == NULL || String->Buffer == NULL || String->MaximumLength == 0) + return; + + NtlmFree(String->Buffer, false); + String->Buffer = NULL; + String->MaximumLength = 0; +} + +/** + * @brief Helper to fill a WCHAR-String in a struct. + * The stringdata is appended to the struct. + * The function does not allocate memory. + * + * @param[in] DataStart + * Start address of the struct + * + * @param[in] DataSize + * Size of allocated memory (including payload) + * + * @param[out] DstDataWPtr + * Pointer to the WCHAR* datafield. The address of the data will be written to it. + * + * @param[in] SrcDataW + * Data to write/append at pOffset (payload). pOffset will be increased after writing data. + * + * @param[in] SrcDataLen + * SrcDataLen is the length in bytes without terminator. + * if 0 it will be autodetected by assuming a 0-terminating string. + * + * @param[in,out] AbsoluteOffsetPtr + * Current absolute offset. Will be increased by data length. + * + * @param[in] TerminateWith0 + * Whether to terminate the string with a NULL-char. + * + * @return FALSE if something went wrong + */ +static +bool +NtlmStructWriteStrW( + _In_ PVOID DataStart, + _In_ ULONG DataSize, + _Out_ PWCHAR* DstDataWPtr, + _In_ const WCHAR* SrcDataW, + _In_ ULONG SrcDataLen, + _Inout_ PBYTE* AbsoluteOffsetPtr, + _In_ bool TerminateWith0) +{ + ULONG SrcDataMaxLen; + + if (SrcDataLen == 0) + SrcDataLen = wcslen(SrcDataW) * sizeof(WCHAR); + + SrcDataMaxLen = SrcDataLen; + if (TerminateWith0) + SrcDataMaxLen += sizeof(WCHAR); + + if (*AbsoluteOffsetPtr < (PBYTE)DataStart) + { + ERR("Invalid offset\n"); + return false; + } + + if (*AbsoluteOffsetPtr + SrcDataMaxLen > (PBYTE)DataStart + DataSize) + { + ERR("Out of bounds!\n"); + return false; + } + + memcpy(*AbsoluteOffsetPtr, SrcDataW, SrcDataLen); + *DstDataWPtr = (WCHAR*)*AbsoluteOffsetPtr; + if (TerminateWith0) + (*DstDataWPtr)[SrcDataLen / sizeof(WCHAR)] = 0; + *AbsoluteOffsetPtr += SrcDataMaxLen; + + return true; +} + +bool +NtlmUStrWriteToStruct( + _In_ PVOID DataStart, + _In_ ULONG DataSize, + _Out_ PUNICODE_STRING DstData, + _In_ const PUNICODE_STRING SrcData, + _Inout_ PBYTE* AbsoluteOffsetPtr, + _In_ bool TerminateWith0) +{ + if (!NtlmStructWriteStrW(DataStart, + DataSize, + &DstData->Buffer, + SrcData->Buffer, + SrcData->Length, + AbsoluteOffsetPtr, + TerminateWith0)) + return false; + + DstData->Length = SrcData->Length; + DstData->MaximumLength = SrcData->Length; + if (TerminateWith0) + SrcData->MaximumLength += sizeof(WCHAR); + + return true; +} + +bool +NtlmFixupAndValidateUStr( + _Inout_ PUNICODE_STRING String, + _In_ ULONG_PTR FixupOffset) +{ + NTSTATUS Status; + + if (String->Length) + { + String->Buffer = FIXUP_POINTER(String->Buffer, FixupOffset); + String->MaximumLength = String->Length; + } + else + { + String->Buffer = NULL; + String->MaximumLength = 0; + } + + Status = RtlValidateUnicodeString(0, String); + return NT_SUCCESS(Status); +} + +bool +NtlmFixupAStr( + _Inout_ PSTRING String, + _In_ ULONG_PTR FixupOffset) +{ + if (String->Length) + { + String->Buffer = (PCHAR)FIXUP_POINTER(String->Buffer, FixupOffset); + String->MaximumLength = String->Length; + } + else + { + String->Buffer = NULL; + String->MaximumLength = 0; + } + + return true; +} + +NTSTATUS +NtlmAllocateClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ ULONG BufferLength, + _Inout_ PNTLM_CLIENT_BUFFER Buffer) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (!Buffer) + return STATUS_NO_MEMORY; + + Buffer->LocalBuffer = NtlmAllocate(BufferLength, false); + if (!Buffer->LocalBuffer) + return STATUS_NO_MEMORY; + + if ((HANDLE)ClientRequest == INVALID_HANDLE_VALUE) + { + Buffer->ClientBaseAddress = Buffer->LocalBuffer; + //if (!ClientBaseAddress) + // return STATUS_INSUFFICIENT_RESOURCES; + } + else + { + Status = DispatchTable.AllocateClientBuffer(ClientRequest, + BufferLength, + &Buffer->ClientBaseAddress); + if (!NT_SUCCESS(Status)) + { + NtlmFree(Buffer->LocalBuffer, false); + Buffer->LocalBuffer = NULL; + } + //FIXME: Maybe we have to free ClientBaseAddress if something + // goes wrong ...? I'm not sure about that ... + } + return Status; +} + +NTSTATUS +NtlmCopyToClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ ULONG BufferLength, + _Inout_ PNTLM_CLIENT_BUFFER Buffer) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if ((HANDLE)ClientRequest == INVALID_HANDLE_VALUE) + { + // If ClientRequest ist INVALID_HANDLE_VALUE + // Buffer->LocalBuffer == Buffer->ClientBaseAddress + if (Buffer->ClientBaseAddress != Buffer->LocalBuffer) + { + ERR("Buffer->ClientBaseAddress != Buffer->LocalBuffer (something must be wrong!)\n"); + return STATUS_INTERNAL_ERROR; + } + } + else + { + if (!Buffer->ClientBaseAddress || + !Buffer->LocalBuffer) + { + ERR("Invalid Buffer - not allocated!\n"); + return STATUS_NO_MEMORY; + } + Status = DispatchTable.CopyToClientBuffer(ClientRequest, + BufferLength, + Buffer->ClientBaseAddress, + Buffer->LocalBuffer); + } + return Status; +} + +VOID +NtlmFreeClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ bool FreeClientBuffer, + _Inout_ PNTLM_CLIENT_BUFFER Buffer) +{ + if (!Buffer->ClientBaseAddress) + return; + + if ((HANDLE)ClientRequest == INVALID_HANDLE_VALUE) + { + if (Buffer->ClientBaseAddress != Buffer->LocalBuffer) + { + ERR("Buffer->ClientBaseAddress != Buffer->LocalBuffer (something must be wrong!)\n"); + return; + } + // LocalBuffer and ClientBaseAddress is the same + // so we have only to free it if FreeClientBuffer is TRUE. + Buffer->LocalBuffer = NULL; + if (FreeClientBuffer) + { + NtlmFree(Buffer->ClientBaseAddress, false); + Buffer->ClientBaseAddress = NULL; + } + } + else + { + NtlmFree(Buffer->LocalBuffer, false); + Buffer->LocalBuffer = NULL; + if (FreeClientBuffer) + DispatchTable.FreeClientBuffer(ClientRequest, Buffer->ClientBaseAddress); + Buffer->ClientBaseAddress = NULL; + } +} diff --git a/dll/win32/msv1_0/ntlm/util.h b/dll/win32/msv1_0/ntlm/util.h new file mode 100644 index 00000000000..69cfa5077ce --- /dev/null +++ b/dll/win32/msv1_0/ntlm/util.h @@ -0,0 +1,64 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Utils for msv1_0 (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +bool +NtlmUStrAlloc( + _Out_ PUNICODE_STRING Dst, + _In_ UINT16 SizeInBytes, + _In_ UINT16 InitLength); + +VOID +NtlmUStrFree( + _In_ PUNICODE_STRING String); + +bool +NtlmUStrWriteToStruct( + _In_ PVOID DataStart, + _In_ ULONG DataSize, + _Out_ PUNICODE_STRING DstData, + _In_ const PUNICODE_STRING SrcData, + _In_ OUT PBYTE* AbsoluteOffsetPtr, + _In_ bool TerminateWith0); + +/* misc */ +bool +NtlmFixupAndValidateUStr( + _Inout_ PUNICODE_STRING String, + _In_ ULONG_PTR FixupOffset); + +bool +NtlmFixupAStr( + _Inout_ PSTRING String, + _In_ ULONG_PTR FixupOffset); + +/* ClientBuffer */ +typedef struct _NTLM_CLIENT_BUFFER +{ + PVOID ClientBaseAddress; + PVOID LocalBuffer; +} NTLM_CLIENT_BUFFER, *PNTLM_CLIENT_BUFFER; + +NTSTATUS +NtlmAllocateClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ ULONG BufferLength, + _Inout_ PNTLM_CLIENT_BUFFER Buffer); + +NTSTATUS +NtlmCopyToClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ ULONG BufferLength, + _In_ OUT PNTLM_CLIENT_BUFFER Buffer); + +VOID +NtlmFreeClientBuffer( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ bool FreeClientBuffer, + _Inout_ PNTLM_CLIENT_BUFFER Buffer); diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index cf7b0842d50..71b2524844c 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -32,6 +32,8 @@ //#include <lsass/lsasrv.h> #include "ntlm/global.h" +#include "ntlm/protocol.h" +#include "ntlm/util.h" #include "lsa.h" #include "msv1_0.h" #include "sam.h" diff --git a/dll/win32/msv1_0/sam.c b/dll/win32/msv1_0/sam.c index 0ffcf20d4f7..684a9f89506 100644 --- a/dll/win32/msv1_0/sam.c +++ b/dll/win32/msv1_0/sam.c @@ -476,6 +476,8 @@ SamValidateUser( NTSTATUS Status = STATUS_SUCCESS; *SpecialAccount = FALSE; + *UserInfoPtr = NULL; + *SubStatus = STATUS_SUCCESS; /* Check for special accounts */ // FIXME: Windows does not do this that way!! (msv1_0 does not contain these hardcoded values) diff --git a/dll/win32/msv1_0/sam.h b/dll/win32/msv1_0/sam.h index 2f82f0e1c6f..d02f2263751 100644 --- a/dll/win32/msv1_0/sam.h +++ b/dll/win32/msv1_0/sam.h @@ -7,6 +7,13 @@ #pragma once +typedef enum _LSA_SAM_NETLOGON_TYPE +{ + NetLogonAnonymous = 0, + NetLogonLmKey, + NetLogonNtKey +} LSA_SAM_NETLOGON_TYPE; + typedef struct _LSA_SAM_PWD_DATA { /* TRUE: PlainPwd is filled, @@ -15,7 +22,12 @@ typedef struct _LSA_SAM_PWD_DATA PUNICODE_STRING PlainPwd; /* Input (IsNetwork = TRUE) */ + PMSV1_0_LM20_LOGON LogonInfo; PUNICODE_STRING ComputerName; + /* Result (IsNetwork = TRUE) */ + LSA_SAM_NETLOGON_TYPE LogonType; + LANMAN_SESSION_KEY LanmanSessionKey; + USER_SESSION_KEY UserSessionKey; } LSA_SAM_PWD_DATA, *PLSA_SAM_PWD_DATA; /**

1 0

[reactos] 04/05: [MSV1_0] Stub LsaApLogonUserEx2_Network (4/5)
by Andreas Maier 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbca423cf889a2efd18b3… commit dbca423cf889a2efd18b3e1108c3cf5fe4c7570f Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Mon Jun 22 19:25:47 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 25 15:55:43 2021 +0300 [MSV1_0] Stub LsaApLogonUserEx2_Network (4/5) This is a part of the Partial Network Login Implementation PR. --- dll/win32/msv1_0/msv1_0.c | 70 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index c60453f1745..eefddf3d0e0 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -909,6 +909,31 @@ LsaApLogonTerminated(IN PLUID LogonId) } +/* + * Handle Network logon + */ +static +NTSTATUS +LsaApLogonUserEx2_Network( + _In_ PLSA_CLIENT_REQUEST ClientRequest, + _In_ PVOID ProtocolSubmitBuffer, + _In_ PVOID ClientBufferBase, + _In_ ULONG SubmitBufferSize, + _In_ PUNICODE_STRING ComputerName, + _Out_ PUNICODE_STRING* LogonUserRef, + _Out_ PUNICODE_STRING* LogonDomainRef, + _Inout_ PLSA_SAM_PWD_DATA LogonPwdData, + _Out_ SAMPR_HANDLE* UserHandlePtr, + _Out_ PSAMPR_USER_INFO_BUFFER* UserInfoPtr, + _Out_ PRPC_SID* AccountDomainSidPtr, + _Out_ PBOOL SpecialAccount, + _Out_ PMSV1_0_LM20_LOGON_PROFILE *LogonProfile, + _Out_ PULONG LogonProfileSize, + _Out_ PNTSTATUS SubStatus) +{ + return STATUS_NOT_IMPLEMENTED; +} + /* * @implemented */ @@ -1080,6 +1105,26 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, // TODO: If LogonType == Service, do some extra work using LogonInfo->Password. } + else if (LogonType == Network) + { + Status = LsaApLogonUserEx2_Network(ClientRequest, + ProtocolSubmitBuffer, + ClientBufferBase, + SubmitBufferSize, + &ComputerName, + &LogonUserName, + &LogonDomain, + &LogonPwdData, + &UserHandle, + &UserInfo, + &AccountDomainSid, + &SpecialAccount, + (PMSV1_0_LM20_LOGON_PROFILE*)ProfileBuffer, + ProfileBufferSize, + SubStatus); + if (!NT_SUCCESS(Status)) + goto done; + } else { FIXME("LogonType %lu is not supported yet!\n", LogonType); @@ -1120,16 +1165,23 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, SessionCreated = TRUE; - /* Build and fill the interactive profile buffer */ - Status = BuildInteractiveProfileBuffer(ClientRequest, - UserInfo, - ComputerNameData, - (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, - ProfileBufferSize); - if (!NT_SUCCESS(Status)) + if (LogonType == Interactive || LogonType == Batch || LogonType == Service) { - TRACE("BuildInteractiveProfileBuffer failed (Status %08lx)\n", Status); - goto done; + /* Build and fill the interactive profile buffer */ + Status = BuildInteractiveProfileBuffer(ClientRequest, + UserInfo, + ComputerName.Buffer, + (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, + ProfileBufferSize); + if (!NT_SUCCESS(Status)) + { + TRACE("BuildInteractiveProfileBuffer failed (Status %08lx)\n", Status); + goto done; + } + } + else if (LogonType == Network) + { + //FIXME: no need to do anything, its already done ... } /* Return the token information type */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs