Ros-diffs October 2022

ros-diffs@reactos.org

23 participants
162 discussions

[reactos] 01/01: [SHELL32_APITEST] Improve PathResolve testcase
by Katayama Hirofumi MZ 31 Oct '22

31 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83e690cd927ff00b2afb4… commit 83e690cd927ff00b2afb46eddd697ca4270d39c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 1 08:55:42 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 1 08:55:42 2022 +0900 [SHELL32_APITEST] Improve PathResolve testcase - Use line numbers instead of entry numbers. - Add LFN check. - Delete some test entries outside of test data directory. - Add some test entries. CORE-18080 --- modules/rostests/apitests/shell32/CMakeLists.txt | 2 +- modules/rostests/apitests/shell32/PathResolve.cpp | 1020 +++++++++------------ modules/rostests/apitests/shell32/shelltest.h | 1 + 3 files changed, 431 insertions(+), 592 deletions(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 3f5c4b33ad5..16b020510f3 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -49,7 +49,7 @@ set_target_properties(shell32_apitest target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB} cpprt atl_classes) set_module_type(shell32_apitest win32cui) -add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(shell32_apitest user32 gdi32 shell32 shlwapi ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) add_pch(shell32_apitest shelltest.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET shell32_apitest) diff --git a/modules/rostests/apitests/shell32/PathResolve.cpp b/modules/rostests/apitests/shell32/PathResolve.cpp index c0a6d97e35f..28bea79afcc 100644 --- a/modules/rostests/apitests/shell32/PathResolve.cpp +++ b/modules/rostests/apitests/shell32/PathResolve.cpp @@ -7,6 +7,7 @@ #include "shelltest.h" +#include <stdio.h> #include <assert.h> /* @@ -15,14 +16,19 @@ */ /* PathResolve */ -typedef int (WINAPI *PATHRESOLVE)(LPWSTR, LPWSTR *, UINT); +typedef int (WINAPI *PATHRESOLVE)(LPWSTR, LPWSTR*, UINT); + +/* IsLFNDriveW */ +typedef BOOL (WINAPI *ISLFNDRIVEW)(LPCWSTR); static HINSTANCE s_hShell32 = NULL; static PATHRESOLVE s_pPathResolve = NULL; -static WCHAR s_TestDataPath[MAX_PATH]; -static WCHAR s_LinkFilePath[MAX_PATH]; -static WCHAR s_LinkTargetPath[MAX_PATH]; -static LPWSTR s_Dirs[2]; +static ISLFNDRIVEW s_pIsLFNDriveW = NULL; +static WCHAR s_TestDir[MAX_PATH]; +static WCHAR s_ShortcutLongName[MAX_PATH]; +static WCHAR s_ShortcutShortName[MAX_PATH]; +static WCHAR s_LinkTarget[MAX_PATH]; +static LPWSTR s_Dirs[2] = { s_TestDir, NULL }; /* PathResolve flags */ #ifndef PRF_VERIFYEXISTS @@ -36,6 +42,7 @@ static LPWSTR s_Dirs[2]; #define PRF_REQUIREABSOLUTE 0x10 #endif +/* Abstraction of PathResolve flags to manage the test entries */ #define FLAGS0 0 #define FLAGS1 PRF_VERIFYEXISTS #define FLAGS2 PRF_EXECUTABLE @@ -51,18 +58,10 @@ static LPWSTR s_Dirs[2]; #define FLAGS12 (PRF_REQUIREABSOLUTE | PRF_FIRSTDIRDEF | PRF_TRYPROGRAMEXTENSIONS) #define FLAGS13 0xFFFFFFFF -#define EF_FULLPATH 1 -#define EF_TESTDATA 2 -#define EF_WINDOWS_DIR 4 -#define EF_SYSTEM_DIR 8 -#define EF_TYPE_MASK 0xF - -#define EF_NAME_ONLY 16 -#define EF_APP_PATH 32 - -typedef struct ENTRY +/* The test entry structure */ +typedef struct tagTEST_ENTRY { - INT EntryNumber; /* # */ + INT LineNumber; /* # */ INT Ret; DWORD Error; UINT EF_; @@ -70,495 +69,339 @@ typedef struct ENTRY LPCWSTR NameExpected; UINT Flags; LPWSTR *Dirs; -} ENTRY; - -#define BEEF 0xBEEF /* Error Code 48879 */ -#define DEAD 0xDEAD /* Error Code 57005 */ -#define IGNORE_ERR 0x7F7F7F7F /* Ignore Error Code */ -#define RAISED 9999 /* exception raised */ - -static const ENTRY s_Entries[] = +} TEST_ENTRY, *PTEST_ENTRY; + +/* Flags for TEST_ENTRY */ +#define EF_FULLPATH 0x01 +#define EF_TESTDATA 0x02 +#define EF_TYPE_MASK 0x0F +#define EF_NAME_ONLY 0x10 +#define EF_APP_PATH 0x20 + +/* Special error codes */ +#define ERR_NO_CHANGE 0xBEEF /* Error Code 48879 */ +#define ERR_DEAD 0xDEAD /* Error Code 57005 */ +#define ERR_IGNORE 0x7F7F7F7F /* Ignore Error Code */ +#define RAISED 9999 /* exception raised */ + +/* The test entries for long file name (LFN) */ +static const TEST_ENTRY s_LFNEntries[] = { /* null path */ - { 0, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS0 }, - { 1, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS1 }, - { 2, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS2 }, - { 3, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS3 }, - { 4, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS4 }, - { 5, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS5 }, - { 6, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS6 }, - { 7, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS7 }, - { 8, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS8 }, - { 9, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS9 }, - { 10, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS10 }, - { 11, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS11 }, - { 12, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS12 }, - { 13, RAISED, DEAD, EF_FULLPATH, NULL, NULL, FLAGS13 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS0 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS1 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS2 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS6 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS7 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS8 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS13 }, /* empty path */ - { 14, 1, BEEF, EF_FULLPATH, L"", NULL, FLAGS0 }, - { 15, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS1 }, - { 16, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS2 }, - { 17, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS3 }, - { 18, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS4 }, - { 19, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS5 }, - { 20, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS6 }, - { 21, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS7 }, - { 22, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS8 }, - { 23, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS9 }, - { 24, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS10 }, - { 25, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS11 }, - { 26, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS12 }, - { 27, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS13 }, - /* Fonts folder (path) */ - { 28, 1, IGNORE_ERR, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS0 }, - { 29, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS1 }, - { 30, 1, BEEF, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS2 }, - { 31, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS3 }, - { 32, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS4 }, - { 33, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS5 }, - { 34, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS6 }, - { 35, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS7 }, - { 36, 1, BEEF, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS8 }, - { 37, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS9 }, - { 38, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS10 }, - { 39, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS11 }, - { 40, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS12 }, - { 41, RAISED, DEAD, EF_WINDOWS_DIR, L"Fonts", L"Fonts", FLAGS13 }, - /* Fonts folder (name only) */ - { 42, 1, ERROR_FILE_NOT_FOUND, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS0 }, - { 43, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS1 }, - { 44, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS2 }, - { 45, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS3 }, - { 46, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS4 }, - { 47, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS5 }, - { 48, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS6 }, - { 49, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS7 }, - { 50, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS8 }, - { 51, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS9 }, - { 52, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS10 }, - { 53, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS11 }, - { 54, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS12 }, - { 55, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS13 }, - /* Fonts folder with dirs (name only) */ - { 56, 1, ERROR_FILE_NOT_FOUND, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS0, s_Dirs }, - { 57, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS1, s_Dirs }, - { 58, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS2, s_Dirs }, - { 59, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS3, s_Dirs }, - { 60, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS4, s_Dirs }, - { 61, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS5, s_Dirs }, - { 62, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS6, s_Dirs }, - { 63, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS7, s_Dirs }, - { 64, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS8, s_Dirs }, - { 65, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS9, s_Dirs }, - { 66, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS10, s_Dirs }, - { 67, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS11, s_Dirs }, - { 68, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS12, s_Dirs }, - { 69, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"Fonts", L"Fonts", FLAGS13, s_Dirs }, - /* system32 folder (path) */ - { 70, 1, BEEF, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS0 }, - { 71, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS1 }, - { 72, 1, BEEF, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS2 }, - { 73, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS3 }, - { 74, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS4 }, - { 75, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS5 }, - { 76, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS6 }, - { 77, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS7 }, - { 78, 1, BEEF, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS8 }, - { 79, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS9 }, - { 80, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS10 }, - { 81, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS11 }, - { 82, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS12 }, - { 83, RAISED, DEAD, EF_WINDOWS_DIR, L"system32", L"system32", FLAGS13 }, - /* system32 folder (name only) */ - { 84, 1, ERROR_FILE_NOT_FOUND, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS0 }, - { 85, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS1 }, - { 86, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS2 }, - { 87, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS3 }, - { 88, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS4 }, - { 89, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS5 }, - { 90, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS6 }, - { 91, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS7 }, - { 92, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS8 }, - { 93, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS9 }, - { 94, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS10 }, - { 95, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS11 }, - { 96, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS12 }, - { 97, 1, ERROR_NO_MORE_FILES, EF_WINDOWS_DIR | EF_NAME_ONLY, L"system32", L"system32", FLAGS13 }, - /* notepad (path) */ - { 98, 1, BEEF, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS0 }, - { 99, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR, L"notepad", L"notepad.exe", FLAGS1 }, - { 100, 1, BEEF, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS2 }, - { 101, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR, L"notepad", L"notepad.exe", FLAGS3 }, - { 102, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS4 }, - { 103, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS5 }, - { 104, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS6 }, - { 105, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR, L"notepad", L"notepad.exe", FLAGS7 }, - { 106, 1, BEEF, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS8 }, - { 107, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR, L"notepad", L"notepad.exe", FLAGS9 }, - { 108, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS10 }, - { 109, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS11 }, - { 110, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS12 }, - { 111, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad", L"notepad", FLAGS13 }, - /* notepad (name only) */ - { 112, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS0 }, - { 113, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS1 }, - { 114, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS2 }, - { 115, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS3 }, - { 116, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS4 }, - { 117, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS5 }, - { 118, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS6 }, - { 119, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS7 }, - { 120, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS8 }, - { 121, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS9 }, - { 122, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS10 }, - { 123, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS11 }, - { 124, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS12 }, - { 125, 1, ERROR_NO_MORE_FILES, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad", NULL, FLAGS13 }, - /* notepad.exe (path) */ - { 126, 1, BEEF, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS0 }, - { 127, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS1 }, - { 128, 1, BEEF, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS2 }, - { 129, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS3 }, - { 130, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS4 }, - { 131, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS5 }, - { 132, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS6 }, - { 133, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS7 }, - { 134, 1, BEEF, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS8 }, - { 135, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS9 }, - { 136, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS10 }, - { 137, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS11 }, - { 138, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS12 }, - { 139, RAISED, DEAD, EF_SYSTEM_DIR, L"notepad.exe", L"notepad.exe", FLAGS13 }, - /* notepad.exe (name only) */ - { 140, 1, BEEF, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS0 }, - { 141, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS1 }, - { 142, 1, BEEF, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS2 }, - { 143, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS3 }, - { 144, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS4 }, - { 145, 1, BEEF, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS5 }, - { 146, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS6 }, - { 147, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS7 }, - { 148, 1, BEEF, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS8 }, - { 149, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS9 }, - { 150, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS10 }, - { 151, 1, BEEF, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS11 }, - { 152, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS12 }, - { 153, 1, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.exe", L"notepad.exe", FLAGS13 }, - /* notepad.com (name only) */ - { 154, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS0 }, - { 155, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS1 }, - { 156, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS2 }, - { 157, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS3 }, - { 158, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS4 }, - { 159, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS5 }, - { 160, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS6 }, - { 161, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS7 }, - { 162, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS8 }, - { 163, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS9 }, - { 164, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS10 }, - { 165, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS11 }, - { 166, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS12 }, - { 167, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY, L"notepad.com", NULL, FLAGS13 }, - /* GhostProgram.exe -> notepad.exe (name only, app path) */ - { 168, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS0 }, - { 169, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS1 }, - { 170, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS2 }, - { 171, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS3 }, - { 172, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS4 }, - { 173, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS5 }, - { 174, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS6 }, - { 175, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS7 }, - { 176, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS8 }, - { 177, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS9 }, - { 178, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS10 }, - { 179, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS11 }, - { 180, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS12 }, - { 181, 0, ERROR_FILE_NOT_FOUND, EF_SYSTEM_DIR | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"notepad.exe", FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"", NULL, FLAGS0 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS1 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS2 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS3 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS4 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS5 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS6 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS7 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS8 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS9 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS10 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS11 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS12 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS13 }, /* invalid name */ - { 182, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS0 }, - { 183, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS1 }, - { 184, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS2 }, - { 185, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS3 }, - { 186, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS4 }, - { 187, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS5 }, - { 188, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS6 }, - { 189, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS7 }, - { 190, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS8 }, - { 191, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS9 }, - { 192, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS10 }, - { 193, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS11 }, - { 194, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS12 }, - { 195, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS13 }, /* testdata/2PRONG (path) */ - { 196, 1, BEEF, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS0 }, - { 197, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS1 }, - { 198, 1, BEEF, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS2 }, - { 199, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS3 }, - { 200, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS4 }, - { 201, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS5 }, - { 202, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS6 }, - { 203, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS7 }, - { 204, 1, BEEF, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS8 }, - { 205, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS9 }, - { 206, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS10 }, - { 207, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS11 }, - { 208, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS12 }, - { 209, RAISED, DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS13 }, /* testdata/2PRONG (name only) */ - { 210, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0 }, - { 211, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1 }, - { 212, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2 }, - { 213, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS3 }, - { 214, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS4 }, - { 215, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS5 }, - { 216, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS6 }, - { 217, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS7 }, - { 218, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS8 }, - { 219, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS9 }, - { 220, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS10 }, - { 221, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11 }, - { 222, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12 }, - { 223, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13 }, /* testdata/2PRONG with dirs (name only) */ - { 224, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0, s_Dirs }, - { 225, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1, s_Dirs }, - { 226, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2, s_Dirs }, - { 227, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS3, s_Dirs }, - { 228, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS4, s_Dirs }, - { 229, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS5, s_Dirs }, - { 230, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS6, s_Dirs }, - { 231, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS7, s_Dirs }, - { 232, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS8, s_Dirs }, - { 233, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS9, s_Dirs }, - { 234, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS10, s_Dirs }, - { 235, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11, s_Dirs }, - { 236, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12, s_Dirs }, - { 237, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS3, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS4, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS5, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS6, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS7, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS8, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS9, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS10, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13, s_Dirs }, /* testdata/2PRONG (name only, app path) */ - { 238, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS0 }, - { 239, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS1 }, - { 240, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS2 }, - { 241, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS3 }, - { 242, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS4 }, - { 243, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS5 }, - { 244, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS6 }, - { 245, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS7 }, - { 246, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS8 }, - { 247, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS9 }, - { 248, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS10 }, - { 249, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS11 }, - { 250, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS12 }, - { 251, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS13 }, - /* testdata/2PRONG.txt (path) */ - { 252, 1, BEEF, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS0 }, - { 253, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS1 }, - { 254, 1, BEEF, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS2 }, - { 255, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS3 }, - { 256, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS4 }, - { 257, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS5 }, - { 258, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS6 }, - { 259, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS7 }, - { 260, 1, BEEF, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS8 }, - { 261, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS9 }, - { 262, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS10 }, - { 263, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS11 }, - { 264, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS12 }, - { 265, RAISED, DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS13 }, + /* 2PRONG.txt */ + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS0 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS2 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS6 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS8 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS13 }, + /* 2PRONG.txt with dirs */ + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, /* 2PRONG.txt (name only) */ - { 266, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS0 }, - { 267, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS1 }, - { 268, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS2 }, - { 269, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS3 }, - { 270, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS4 }, - { 271, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS5 }, - { 272, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS6 }, - { 273, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS7 }, - { 274, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS8 }, - { 275, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS9 }, - { 276, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS10 }, - { 277, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS11 }, - { 278, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS12 }, - { 279, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS13 }, /* 2PRONG.txt with dirs (name only) */ - { 280, 1, BEEF, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS0, s_Dirs }, - { 281, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS1, s_Dirs }, - { 282, 1, BEEF, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS2, s_Dirs }, - { 283, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS3, s_Dirs }, - { 284, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS4, s_Dirs }, - { 285, 1, BEEF, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS5, s_Dirs }, - { 286, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS6, s_Dirs }, - { 287, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS7, s_Dirs }, - { 288, 1, BEEF, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS8, s_Dirs }, - { 289, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS9, s_Dirs }, - { 290, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS10, s_Dirs }, - { 291, 1, BEEF, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, - { 292, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, - { 293, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, /* testdata/CmdLineUtils (path) */ - { 294, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 }, - { 295, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS1 }, - { 296, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 }, - { 297, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS3 }, - { 298, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS4 }, - { 299, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS5 }, - { 300, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS6 }, - { 301, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS7 }, - { 302, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS8 }, - { 303, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS9 }, - { 304, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS10 }, - { 305, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 }, - { 306, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 }, - { 307, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS6 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS8 }, + { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 }, /* testdata/CmdLineUtils with PRF_DONTFINDLNK (path) */ - { 308, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 | PRF_DONTFINDLNK }, - { 309, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS1 | PRF_DONTFINDLNK }, - { 310, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 | PRF_DONTFINDLNK }, - { 311, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS3 | PRF_DONTFINDLNK }, - { 312, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS4 | PRF_DONTFINDLNK }, - { 313, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS5 | PRF_DONTFINDLNK }, - { 314, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS6 | PRF_DONTFINDLNK }, - { 315, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS7 | PRF_DONTFINDLNK }, - { 316, 1, BEEF, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS8 | PRF_DONTFINDLNK }, - { 317, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS9 | PRF_DONTFINDLNK }, - { 318, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS10 | PRF_DONTFINDLNK }, - { 319, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 | PRF_DONTFINDLNK }, - { 320, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 | PRF_DONTFINDLNK }, - { 321, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 | PRF_DONTFINDLNK }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS1 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 | PRF_DONTFINDLNK }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS3 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS4 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS5 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS6 | PRF_DONTFINDLNK }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS7 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS8 | PRF_DONTFINDLNK }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS9 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS10 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 | PRF_DONTFINDLNK }, /* testdata/CmdLineUtils (name only) */ - { 222, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS0 }, - { 323, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS1 }, - { 324, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS2 }, - { 325, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS3 }, - { 326, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS4 }, - { 327, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS5 }, - { 328, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS6 }, - { 329, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS7 }, - { 330, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS8 }, - { 331, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS9 }, - { 332, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS10 }, - { 333, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS11 }, - { 334, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS12 }, - { 335, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS13 }, /* testdata/CmdLineUtils.exe (path) */ - { 336, 1, BEEF, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS0 }, - { 337, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS1 }, - { 338, 1, BEEF, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS2 }, - { 339, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS3 }, - { 340, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS4 }, - { 341, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS5 }, - { 342, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS6 }, - { 343, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS7 }, - { 344, 1, BEEF, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS8 }, - { 345, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS9 }, - { 346, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS10 }, - { 347, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS11 }, - { 348, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS12 }, - { 349, RAISED, DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS13 }, /* testdata/CmdLineUtils.exe (name only) */ - { 350, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0 }, - { 351, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1 }, - { 352, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2 }, - { 353, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3 }, - { 354, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4 }, - { 355, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5 }, - { 356, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6 }, - { 357, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7 }, - { 358, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8 }, - { 359, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9 }, - { 360, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10 }, - { 361, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11 }, - { 362, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12 }, - { 363, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13 }, /* testdata/CmdLineUtils.exe with dirs (name only) */ - { 364, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, - { 365, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, - { 366, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, - { 367, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3, s_Dirs }, - { 368, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4, s_Dirs }, - { 369, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5, s_Dirs }, - { 370, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6, s_Dirs }, - { 371, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7, s_Dirs }, - { 372, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8, s_Dirs }, - { 373, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9, s_Dirs }, - { 374, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10, s_Dirs }, - { 375, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, - { 376, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, - { 377, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, /* testdata/CmdLineUtils.exe with dirs (name only) */ - { 378, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, - { 379, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, - { 380, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, - { 381, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3, s_Dirs }, - { 382, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4, s_Dirs }, - { 383, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5, s_Dirs }, - { 384, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6, s_Dirs }, - { 385, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7, s_Dirs }, - { 386, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8, s_Dirs }, - { 387, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9, s_Dirs }, - { 388, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10, s_Dirs }, - { 389, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, - { 390, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, - { 391, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS3, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS4, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS5, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS6, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS7, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS8, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS9, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS10, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, /* GhostProgram.exe -> testdata/CmdLineUtils.exe (name only, app path) */ - { 392, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS0 }, - { 393, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS1 }, - { 394, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS2 }, - { 395, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS3 }, - { 396, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS4 }, - { 397, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS5 }, - { 398, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS6 }, - { 399, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS7 }, - { 400, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS8 }, - { 401, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS9 }, - { 402, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS10 }, - { 403, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS11 }, - { 404, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS12 }, - { 405, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS13 }, - /* C:\ */ - { 406, 1, BEEF, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS0 }, - { 407, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS1 }, - { 408, 1, BEEF, EF_FULLPATH, L"C:\\", NULL, FLAGS2 }, - { 409, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS3 }, - { 410, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS4 }, - { 411, 1, BEEF, EF_FULLPATH, L"C:\\", NULL, FLAGS5 }, - { 412, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS6 }, - { 413, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS7 }, - { 414, 1, BEEF, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS8 }, - { 415, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS9 }, - { 416, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS10 }, - { 417, 1, BEEF, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS11 }, - { 418, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS12 }, - { 419, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"C:\\", L"C:\\", FLAGS13 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS0 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS1 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS2 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS3 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS4 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS5 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS6 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS7 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS8 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS9 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS10 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS11 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS12 }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS13 }, /* CmdLineUtils.lnk */ - { 420, 1, BEEF, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS0 }, - { 421, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS1 }, - { 422, 1, BEEF, EF_FULLPATH, s_LinkFilePath, NULL, FLAGS2 }, - { 423, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS3 }, - { 424, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS4 }, - { 425, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS5 }, - { 426, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS6 }, - { 427, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS7 }, - { 428, 1, BEEF, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS8 }, - { 429, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS9 }, - { 430, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS10 }, - { 431, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS11 }, - { 432, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS12 }, - { 433, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS0 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, NULL, FLAGS2 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS6 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS8 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS13 }, /* CmdLineUtils.lnk (with PRF_DONTFINDLNK) */ - { 434, 1, BEEF, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS0 | PRF_DONTFINDLNK }, - { 435, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS1 | PRF_DONTFINDLNK }, - { 436, 1, BEEF, EF_FULLPATH, s_LinkFilePath, NULL, FLAGS2 | PRF_DONTFINDLNK }, - { 437, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS3 | PRF_DONTFINDLNK }, - { 438, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS4 | PRF_DONTFINDLNK }, - { 439, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS5 | PRF_DONTFINDLNK }, - { 440, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS6 | PRF_DONTFINDLNK }, - { 441, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS7 | PRF_DONTFINDLNK }, - { 442, 1, BEEF, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS8 | PRF_DONTFINDLNK }, - { 443, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS9 | PRF_DONTFINDLNK }, - { 444, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS10 | PRF_DONTFINDLNK }, - { 445, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS11 | PRF_DONTFINDLNK }, - { 446, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS12 | PRF_DONTFINDLNK }, - { 447, RAISED, DEAD, EF_FULLPATH, s_LinkFilePath, s_LinkFilePath, FLAGS13 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS0 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS1 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, NULL, FLAGS2 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS3 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS4 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS5 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS6 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS7 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS8 | PRF_DONTFINDLNK }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS9 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS10 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS11 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS12 | PRF_DONTFINDLNK }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_ShortcutLongName, s_ShortcutLongName, FLAGS13 | PRF_DONTFINDLNK }, }; static BOOL @@ -593,7 +436,7 @@ CreateShortcut(LPCWSTR pszLnkFileName, } static BOOL -CreateRegAppPath(INT EntryNumber, const WCHAR* Name, const WCHAR* Value) +CreateRegAppPath(INT LineNumber, const WCHAR* Name, const WCHAR* Value) { HKEY RegistryKey; LONG Result; @@ -606,13 +449,13 @@ CreateRegAppPath(INT EntryNumber, const WCHAR* Name, const WCHAR* Value) 0, KEY_WRITE, NULL, &RegistryKey, &Disposition); if (Result != ERROR_SUCCESS) { - trace("#%d: Could not create test key. Status: %lu\n", EntryNumber, Result); + trace("#%d: Could not create test key. Status: %lu\n", LineNumber, Result); return FALSE; } Result = RegSetValueW(RegistryKey, NULL, REG_SZ, Value, 0); if (Result != ERROR_SUCCESS) { - trace("#%d: Could not set value of the test key. Status: %lu\n", EntryNumber, Result); + trace("#%d: Could not set value of the test key. Status: %lu\n", LineNumber, Result); RegCloseKey(RegistryKey); return FALSE; } @@ -621,7 +464,7 @@ CreateRegAppPath(INT EntryNumber, const WCHAR* Name, const WCHAR* Value) } static BOOL -DeleteRegAppPath(INT EntryNumber, const WCHAR* Name) +DeleteRegAppPath(INT LineNumber, const WCHAR* Name) { LONG Result; WCHAR Buffer[1024]; @@ -630,13 +473,13 @@ DeleteRegAppPath(INT EntryNumber, const WCHAR* Name) Result = RegDeleteKeyW(HKEY_LOCAL_MACHINE, Buffer); if (Result != ERROR_SUCCESS) { - trace("#%d: Could not remove the test key. Status: %lu\n", EntryNumber, Result); + trace("#%d: Could not remove the test key. Status: %lu\n", LineNumber, Result); return FALSE; } return TRUE; } -static void DoEntry(INT EntryNumber, const ENTRY *pEntry) +static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) { WCHAR Path[MAX_PATH], PathExpected[MAX_PATH]; INT Ret; @@ -667,54 +510,14 @@ static void DoEntry(INT EntryNumber, const ENTRY *pEntry) } else { - lstrcpyW(Path, s_TestDataPath); + lstrcpyW(Path, s_TestDir); lstrcatW(Path, L"\\"); lstrcatW(Path, pEntry->NameBefore); } if (pEntry->NameExpected) { - lstrcpyW(PathExpected, s_TestDataPath); - lstrcatW(PathExpected, L"\\"); - lstrcatW(PathExpected, pEntry->NameExpected); - } - break; - - case EF_WINDOWS_DIR: - if (pEntry->EF_ & EF_NAME_ONLY) - { - lstrcpyW(Path, pEntry->NameBefore); - } - else - { - GetWindowsDirectoryW(Path, _countof(Path)); - lstrcatW(Path, L"\\"); - lstrcatW(Path, pEntry->NameBefore); - } - - if (pEntry->NameExpected) - { - GetWindowsDirectoryW(PathExpected, _countof(PathExpected)); - lstrcatW(PathExpected, L"\\"); - lstrcatW(PathExpected, pEntry->NameExpected); - } - break; - - case EF_SYSTEM_DIR: - if (pEntry->EF_ & EF_NAME_ONLY) - { - lstrcpyW(Path, pEntry->NameBefore); - } - else - { - GetSystemDirectoryW(Path, _countof(Path)); - lstrcatW(Path, L"\\"); - lstrcatW(Path, pEntry->NameBefore); - } - - if (pEntry->NameExpected) - { - GetSystemDirectoryW(PathExpected, _countof(PathExpected)); + lstrcpyW(PathExpected, s_TestDir); lstrcatW(PathExpected, L"\\"); lstrcatW(PathExpected, pEntry->NameExpected); } @@ -723,16 +526,16 @@ static void DoEntry(INT EntryNumber, const ENTRY *pEntry) if (pEntry->EF_ & EF_APP_PATH) { - if (!CreateRegAppPath(EntryNumber, pEntry->NameBefore, PathExpected)) + if (!CreateRegAppPath(LineNumber, pEntry->NameBefore, PathExpected)) { - skip("#%d: CreateRegAppPath failure\n", EntryNumber); + skip("Section %d, Line %d: CreateRegAppPath failure\n", SectionNumber, LineNumber); return; } } _SEH2_TRY { - SetLastError(BEEF); + SetLastError(ERR_NO_CHANGE); if (pEntry->NameBefore) { Ret = (*s_pPathResolve)(Path, pEntry->Dirs, pEntry->Flags); @@ -746,85 +549,79 @@ static void DoEntry(INT EntryNumber, const ENTRY *pEntry) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Ret = RAISED; - Error = DEAD; + Error = ERR_DEAD; } _SEH2_END; if (pEntry->EF_ & EF_APP_PATH) { - ok(DeleteRegAppPath(EntryNumber, pEntry->NameBefore), - "#%d: DeleteRegAppPath failed\n", EntryNumber); + ok(DeleteRegAppPath(LineNumber, pEntry->NameBefore), + "Section %d, Line %d: DeleteRegAppPath failed\n", SectionNumber, LineNumber); } - ok(Ret == pEntry->Ret, "#%d: Ret expected %d, was %d.\n", - EntryNumber, pEntry->Ret, Ret); - if (pEntry->Error != IGNORE_ERR) + ok(Ret == pEntry->Ret, "Section %d, Line %d: Ret expected %d, was %d.\n", + SectionNumber, LineNumber, pEntry->Ret, Ret); + if (pEntry->Error != ERR_IGNORE) { - ok(Error == pEntry->Error, "#%d: last error expected %ld, was %ld.\n", - EntryNumber, pEntry->Error, Error); + ok(Error == pEntry->Error, "Section %d, Line %d: last error expected %ld, was %ld.\n", + SectionNumber, LineNumber, pEntry->Error, Error); } if (pEntry->NameExpected && !(pEntry->EF_ & EF_APP_PATH)) { - ok(lstrcmpW(Path, PathExpected) == 0, "#%d: Path expected %s, was %s.\n", - EntryNumber, wine_dbgstr_w(PathExpected), wine_dbgstr_w(Path)); + ok(lstrcmpW(Path, PathExpected) == 0, "Section %d, Line%d: Path expected %s, was %s.\n", + SectionNumber, LineNumber, wine_dbgstr_w(PathExpected), wine_dbgstr_w(Path)); } } static void TestMain_PathResolve(void) { - UINT i; + UINT i, cEntries; + const TEST_ENTRY *pEntries; WCHAR Saved[128], *pPathExtSaved; + pEntries = s_LFNEntries; + cEntries = _countof(s_LFNEntries); + /* save PATHEXT */ if (GetEnvironmentVariableW(L"PATHEXT", Saved, _countof(Saved))) - { pPathExtSaved = Saved; - } else - { pPathExtSaved = NULL; - } - /* normal */ - for (i = 0; i < _countof(s_Entries); ++i) + /* Section 1 */ + for (i = 0; i < cEntries; ++i) { - DoEntry(s_Entries[i].EntryNumber, &s_Entries[i]); + DoEntry(1, pEntries[i].LineNumber, &pEntries[i]); } - /* +#1000: reset PATHEXT */ + /* Section 2: reset PATHEXT */ if (SetEnvironmentVariableW(L"PATHEXT", NULL)) { - for (i = 0; i < _countof(s_Entries); ++i) - { - DoEntry(s_Entries[i].EntryNumber + 1000, &s_Entries[i]); - } + for (i = 0; i < cEntries; ++i) + DoEntry(2, pEntries[i].LineNumber, &pEntries[i]); } else { skip("SetEnvironmentVariableW failed\n"); } - /* +#2000: set PATHEXT to ".COM;.EXE;.BAT" */ + /* Section 3: set PATHEXT to ".COM;.EXE;.BAT" */ if (SetEnvironmentVariableW(L"PATHEXT", L".COM;.EXE;.BAT")) { - for (i = 0; i < _countof(s_Entries); ++i) - { - DoEntry(s_Entries[i].EntryNumber + 2000, &s_Entries[i]); - } + for (i = 0; i < cEntries; ++i) + DoEntry(3, pEntries[i].LineNumber, &pEntries[i]); } else { skip("SetEnvironmentVariableW failed\n"); } - /* +#3000: set PATHEXT to ".TXT" */ + /* Section 4: set PATHEXT to ".TXT" */ if (SetEnvironmentVariableW(L"PATHEXT", L".TXT")) { - for (i = 0; i < _countof(s_Entries); ++i) - { - DoEntry(s_Entries[i].EntryNumber + 3000, &s_Entries[i]); - } + for (i = 0; i < cEntries; ++i) + DoEntry(4, pEntries[i].LineNumber, &pEntries[i]); } else { @@ -838,58 +635,99 @@ static void TestMain_PathResolve(void) START_TEST(PathResolve) { LPWSTR pch; + WCHAR szRoot[MAX_PATH]; - GetModuleFileNameW(NULL, s_TestDataPath, _countof(s_TestDataPath)); - pch = wcsrchr(s_TestDataPath, L'\\'); - if (pch == NULL) - pch = wcsrchr(s_TestDataPath, L'/'); + /* Get this program's path */ + GetModuleFileNameW(NULL, s_TestDir, _countof(s_TestDir)); + + /* Add '\testdata' to the path */ + pch = wcsrchr(s_TestDir, L'\\'); if (pch == NULL) { skip("GetModuleFileName and/or wcsrchr are insane.\n"); return; } lstrcpyW(pch, L"\\testdata"); - if (GetFileAttributesW(s_TestDataPath) == INVALID_FILE_ATTRIBUTES) + + /* Create the testdata directory */ + CreateDirectoryW(s_TestDir, NULL); + if (GetFileAttributesW(s_TestDir) == INVALID_FILE_ATTRIBUTES) { skip("testdata is not found.\n"); return; } - s_Dirs[0] = s_TestDataPath; - s_Dirs[1] = NULL; + /* Build s_LinkTarget path */ + lstrcpyW(s_LinkTarget, s_TestDir); + lstrcatW(s_LinkTarget, L"\\"); + lstrcatW(s_LinkTarget, L"2PRONG.txt"); - lstrcpyW(s_LinkFilePath, s_TestDataPath); - lstrcatW(s_LinkFilePath, L"\\"); - lstrcatW(s_LinkFilePath, L"CmdLineUtils.lnk"); + /* Create the file */ + fclose(_wfopen(s_LinkTarget, L"wb")); + ok(GetFileAttributesW(s_LinkTarget) != INVALID_FILE_ATTRIBUTES, "s_LinkTarget not found\n"); - lstrcpyW(s_LinkTargetPath, s_TestDataPath); - lstrcatW(s_LinkTargetPath, L"\\"); - lstrcatW(s_LinkTargetPath, L"2PRONG.txt"); + /* Build s_ShortcutLongName path */ + lstrcpyW(s_ShortcutLongName, s_TestDir); + lstrcatW(s_ShortcutLongName, L"\\"); + lstrcatW(s_ShortcutLongName, L"CmdLineUtils.lnk"); /* in Long File Name */ - ok(CreateShortcut(s_LinkFilePath, s_LinkTargetPath), + /* Create s_ShortcutLongName shortcut file */ + ok(CreateShortcut(s_ShortcutLongName, s_LinkTarget), "CreateShortcut(%s, %s) failed.\n", - wine_dbgstr_w(s_LinkFilePath), wine_dbgstr_w(s_LinkTargetPath)); + wine_dbgstr_w(s_ShortcutLongName), wine_dbgstr_w(s_LinkTarget)); + /* Build s_ShortcutShortName path */ + lstrcpyW(s_ShortcutShortName, s_TestDir); + lstrcatW(s_ShortcutShortName, L"\\"); + GetShortPathNameW(s_ShortcutShortName, s_ShortcutShortName, _countof(s_ShortcutShortName)); + lstrcatW(s_ShortcutShortName, L"CmdLineU.lnk"); /* in Short File Name */ + + /* Create s_ShortcutShortName shortcut file */ + ok(CreateShortcut(s_ShortcutShortName, s_LinkTarget), + "CreateShortcut(%s, %s) failed.\n", + wine_dbgstr_w(s_ShortcutShortName), wine_dbgstr_w(s_LinkTarget)); + + /* Load shell32.dll */ s_hShell32 = LoadLibraryA("shell32"); if (s_hShell32 == NULL) { skip("Unable to load shell32.\n"); - return; + goto Cleanup; } + /* Get PathResolve procedure */ s_pPathResolve = (PATHRESOLVE)GetProcAddress(s_hShell32, "PathResolve"); if (s_pPathResolve == NULL) { skip("Unable to get PathResolve address.\n"); - return; + goto Cleanup; } - TestMain_PathResolve(); + /* Get IsLFNDriveW procedure */ + s_pIsLFNDriveW = (ISLFNDRIVEW)GetProcAddress(s_hShell32, (LPCSTR)(INT_PTR)42); + if (s_pIsLFNDriveW == NULL) + { + skip("Unable to get IsLFNDriveW address.\n"); + goto Cleanup; + } - ok(DeleteFileW(s_LinkFilePath), "DeleteFileW(%s) failed\n", - wine_dbgstr_w(s_LinkFilePath)); + /* Is LFN supported? */ + lstrcpyW(szRoot, s_TestDir); + PathStripToRootW(szRoot); + if (!s_pIsLFNDriveW(szRoot)) + { + skip("LFN is not supported in this drive %s.\n", wine_dbgstr_w(szRoot)); + goto Cleanup; + } + + /* Do tests */ + TestMain_PathResolve(); + /* Clean up */ +Cleanup: + DeleteFileW(s_LinkTarget); + DeleteFileW(s_ShortcutLongName); + DeleteFileW(s_ShortcutShortName); + RemoveDirectoryW(s_TestDir); FreeLibrary(s_hShell32); - s_hShell32 = NULL; - s_pPathResolve = NULL; } diff --git a/modules/rostests/apitests/shell32/shelltest.h b/modules/rostests/apitests/shell32/shelltest.h index 2271b51aa4d..1f7612d3fdc 100644 --- a/modules/rostests/apitests/shell32/shelltest.h +++ b/modules/rostests/apitests/shell32/shelltest.h @@ -10,6 +10,7 @@ #include <winreg.h> #include <shlobj.h> #include <shellapi.h> +#include <shlwapi.h> #include <atlbase.h> #include <atlcom.h>

1 0

[reactos] 01/01: [SETUP][INF] Delete obsolete font substitutions "DejaVu Serif" (#4827)
by Joachim Henze 31 Oct '22

31 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4615c824db153724da055… commit 4615c824db153724da055ec3479c5c0452ac1460 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Oct 31 02:00:01 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 31 02:00:01 2022 +0100 [SETUP][INF] Delete obsolete font substitutions "DejaVu Serif" (#4827) [INF] These 2 lines are nonsense now for 2 different reasons even: Since 0.4.13-dev-764-g dbb4432b25dc65b9d65f02bfc09d47d63b8cd5e5 we do have a proper "Times New Roman" font, so there is no need for substitution any longer. And since 0.4.14-dev-20-g 2f4fb903b46207ab380365908401ded63752a108 we don't even have the substitution-target "DejaVu Serif" anymore. [SETUP] Similar glitch in muifonts.h [ROSTESTS] Thin out gdi32:GetTextMetrics test Deletes tests for 3 fonts that we do not longer have --- base/setup/lib/muifonts.h | 3 - media/inf/font.inf | 2 - modules/rostests/apitests/gdi32/GetTextMetrics.c | 156 ----------------------- 3 files changed, 161 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 9c471192638..32a9b1cc33c 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -118,7 +118,6 @@ MUI_SUBFONT HebrewFonts[] = { L"System", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -367,7 +366,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, @@ -402,7 +400,6 @@ MUI_SUBFONT HindiFonts[] = { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, - { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 55a0bed0cd0..4c505f3c505 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -71,7 +71,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma" @@ -107,7 +106,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" ; cp1252/cp437 US diff --git a/modules/rostests/apitests/gdi32/GetTextMetrics.c b/modules/rostests/apitests/gdi32/GetTextMetrics.c index b6b33aef545..3c9ee92d402 100644 --- a/modules/rostests/apitests/gdi32/GetTextMetrics.c +++ b/modules/rostests/apitests/gdi32/GetTextMetrics.c @@ -124,156 +124,6 @@ static const TEST_ENTRY g_FREEMONO[] = }; #define g_FREEMONO_count _countof(g_FREEMONO) -static const TEST_ENTRY g_DEJAVUSERIF[] = -{ - { __LINE__, 400, 0, 2323, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1743, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1162, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 580, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 370, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 190, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 66, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 63, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -125, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 26, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 36, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 42, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 49, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 56, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 63, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 66, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 77, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 82, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 103, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 114, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 214, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 431, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 674, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1352, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 2026, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2702, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSERIF_count _countof(g_DEJAVUSERIF) - -static const TEST_ENTRY g_DEJAVUSANS[] = -{ - { __LINE__, 400, 0, 2286, 400, 400, 319, 81, 56, 0 }, - { __LINE__, 300, 0, 1715, 300, 300, 239, 61, 42, 0 }, - { __LINE__, 200, 0, 1145, 200, 200, 159, 41, 28, 0 }, - { __LINE__, 100, 0, 573, 100, 100, 80, 20, 14, 0 }, - { __LINE__, 64, 0, 366, 64, 64, 51, 13, 9, 0 }, - { __LINE__, 32, 0, 188, 32, 32, 26, 6, 4, 0 }, - { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, 14, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, 13, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, 12, 0, 62, 12, 12, 10, 2, 2, 0 }, - { __LINE__, 11, 0, 64, 11, 11, 9, 2, 2, 0 }, - { __LINE__, 10, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, 9, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, 8, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, 7, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, 6, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, 5, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -116, -21, -21, -17, -4, -3, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, - { __LINE__, -4, 0, 25, 5, 5, 4, 1, 1, 0 }, - { __LINE__, -5, 0, 35, 6, 6, 5, 1, 1, 0 }, - { __LINE__, -6, 0, 41, 7, 7, 6, 1, 1, 0 }, - { __LINE__, -7, 0, 46, 8, 8, 6, 2, 1, 0 }, - { __LINE__, -8, 0, 54, 9, 9, 7, 2, 1, 0 }, - { __LINE__, -9, 0, 64, 10, 10, 8, 2, 1, 0 }, - { __LINE__, -10, 0, 62, 11, 11, 9, 2, 1, 0 }, - { __LINE__, -11, 0, 79, 13, 13, 10, 3, 2, 0 }, - { __LINE__, -12, 0, 84, 14, 14, 11, 3, 2, 0 }, - { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, - { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, - { __LINE__, -15, 0, 98, 18, 18, 14, 4, 3, 0 }, - { __LINE__, -16, 0, 102, 19, 19, 15, 4, 3, 0 }, - { __LINE__, -32, 0, 215, 38, 38, 30, 8, 6, 0 }, - { __LINE__, -64, 0, 423, 74, 74, 59, 15, 10, 0 }, - { __LINE__, -100, 0, 665, 117, 117, 93, 24, 17, 0 }, - { __LINE__, -200, 0, 1331, 233, 233, 186, 47, 33, 0 }, - { __LINE__, -300, 0, 1992, 349, 349, 278, 71, 49, 0 }, - { __LINE__, -400, 0, 2657, 465, 465, 371, 94, 65, 0 }, -}; -#define g_DEJAVUSANS_count _countof(g_DEJAVUSANS) - -static const TEST_ENTRY g_UBUNTUMONO[] = -{ - { __LINE__, 400, 0, 3000, 400, 400, 332, 68, 0, 0 }, - { __LINE__, 300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, 200, 0, 1500, 200, 200, 166, 34, 1, 0 }, - { __LINE__, 100, 0, 735, 100, 100, 83, 17, 2, 0 }, - { __LINE__, 64, 0, 465, 63, 63, 53, 10, 2, 0 }, - { __LINE__, 32, 0, 240, 31, 31, 26, 5, 0, 0 }, - { __LINE__, 16, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, 15, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, 14, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, 13, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, 12, 0, 60, 12, 12, 10, 2, 5, 0 }, - { __LINE__, 11, 0, 60, 11, 11, 9, 2, 4, 0 }, - { __LINE__, 10, 0, 60, 10, 10, 8, 2, 3, 0 }, - { __LINE__, 9, 0, 60, 9, 9, 7, 2, 2, 0 }, - { __LINE__, 8, 0, 60, 8, 8, 7, 1, 1, 0 }, - { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, 3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, 0, 0, -135, -19, -19, -16, -3, -1, 0 }, - { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, - { __LINE__, -3, 0, 30, 3, 3, 2, 1, 0, 0 }, - { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, - { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, - { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, - { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, - { __LINE__, -8, 0, 60, 13, 13, 10, 3, 5, 0 }, - { __LINE__, -9, 0, 75, 14, 14, 11, 3, 5, 0 }, - { __LINE__, -10, 0, 75, 14, 14, 11, 3, 4, 0 }, - { __LINE__, -11, 0, 90, 15, 15, 12, 3, 4, 0 }, - { __LINE__, -12, 0, 90, 15, 15, 12, 3, 3, 0 }, - { __LINE__, -13, 0, 105, 16, 16, 13, 3, 3, 0 }, - { __LINE__, -14, 0, 105, 17, 17, 14, 3, 3, 0 }, - { __LINE__, -15, 0, 105, 17, 17, 14, 3, 2, 0 }, - { __LINE__, -16, 0, 120, 18, 18, 15, 3, 2, 0 }, - { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, - { __LINE__, -64, 0, 480, 66, 66, 55, 11, 2, 0 }, - { __LINE__, -100, 0, 750, 101, 101, 84, 17, 1, 0 }, - { __LINE__, -200, 0, 1500, 201, 201, 167, 34, 1, 0 }, - { __LINE__, -300, 0, 2250, 300, 300, 249, 51, 0, 0 }, - { __LINE__, -400, 0, 3000, 400, 400, 332, 68, 0, 0 }, -}; -#define g_UBUNTUMONO_count _countof(g_UBUNTUMONO) - static const TEST_ENTRY g_MSGOTHIC[] = { { __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 }, @@ -439,17 +289,11 @@ static FONT_ENTRY g_font_entries[] = { #ifdef EMIT_TESTCASES { "FREEMONO", "FreeMono", "FreeMono.ttf" }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf" }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf" }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf" }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc" }, { "MSMINCHO", "MS Mincho", "msmincho.ttc" }, { "TAHOMA", "Tahoma", "tahoma.ttf" }, #else { "FREEMONO", "FreeMono", "FreeMono.ttf", g_FREEMONO_count, g_FREEMONO }, - { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf", g_DEJAVUSERIF_count, g_DEJAVUSERIF }, - { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf", g_DEJAVUSANS_count, g_DEJAVUSANS }, - { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf", g_UBUNTUMONO_count, g_UBUNTUMONO }, { "MSGOTHIC", "MS Gothic", "msgothic.ttc", g_MSGOTHIC_count, g_MSGOTHIC }, { "MSMINCHO", "MS Mincho", "msmincho.ttc", g_MSMINCHO_count, g_MSMINCHO }, { "TAHOMA", "Tahoma", "Tahoma.ttf", g_TAHOMA_count, g_TAHOMA },

1 0

[reactos] 01/01: [WIN32K:NTUSER] Fix parameter check in NtUserGetAsyncKeyState. CORE-18124
by Thomas Faber 30 Oct '22

30 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=885459d8b4327be84d009… commit 885459d8b4327be84d009532688227f9c008975e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 10 18:29:10 2022 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Oct 30 10:46:33 2022 -0400 [WIN32K:NTUSER] Fix parameter check in NtUserGetAsyncKeyState. CORE-18124 --- modules/rostests/apitests/win32nt/CMakeLists.txt | 1 + .../win32nt/ntuser/NtUserGetAsyncKeyState.c | 80 ++++++++++++++++++++++ modules/rostests/apitests/win32nt/testlist.c | 2 + win32ss/user/ntuser/keyboard.c | 2 +- 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 7060f79f219..a861830bbc0 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -52,6 +52,7 @@ list(APPEND SOURCE # ntuser/NtUserEnumDisplayMonitors.c ntuser/NtUserEnumDisplaySettings.c ntuser/NtUserFindExistingCursorIcon.c + ntuser/NtUserGetAsyncKeyState.c ntuser/NtUserGetClassInfo.c # ntuser/NtUserGetIconInfo.c ntuser/NtUserGetKeyboardLayoutName.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c new file mode 100644 index 00000000000..8e5e4cab544 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS Win32k tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtUserGetAsyncKeyState + * COPYRIGHT: Copyright 2022 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <win32nt.h> + +START_TEST(NtUserGetAsyncKeyState) +{ + SHORT Ret; + DWORD Error; + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == 0xdeadbeef, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(1); // VK_LBUTTON + Error = GetLastError(); + ok(Ret == 0 || Ret == 1, "Ret = %d\n", Ret); + ok(Error == 0xdeadbeef, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0xfe); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == 0xdeadbeef, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0xff); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == 0xdeadbeef, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0x100); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0x101); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0x10000000); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0x7fffffff); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(0x80000000); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(-2); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); + + SetLastError(0xdeadbeef); + Ret = NtUserGetAsyncKeyState(-1); + Error = GetLastError(); + ok(Ret == 0, "Ret = %d\n", Ret); + ok(Error == ERROR_INVALID_PARAMETER, "Error = %lu\n", Error); +} diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index 8d2be31fc2c..c63cc42c101 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -52,6 +52,7 @@ extern void func_NtUserCreateWindowEx(void); //extern void func_NtUserEnumDisplayMonitors(void); extern void func_NtUserEnumDisplaySettings(void); extern void func_NtUserFindExistingCursorIcon(void); +extern void func_NtUserGetAsyncKeyState(void); extern void func_NtUserGetClassInfo(void); //extern void func_NtUserGetIconInfo(void); extern void func_NtUserGetKeyboardLayoutName(void); @@ -120,6 +121,7 @@ const struct test winetest_testlist[] = //{ "NtUserEnumDisplayMonitors", func_NtUserEnumDisplayMonitors }, { "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings }, { "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon }, + { "NtUserGetAsyncKeyState", func_NtUserGetAsyncKeyState }, { "NtUserGetClassInfo", func_NtUserGetClassInfo }, //{ "NtUserGetIconInfo", func_NtUserGetIconInfo }, { "NtUserGetKeyboardLayoutName", func_NtUserGetKeyboardLayoutName }, diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 3d427d1cb0b..61f59296be0 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -635,7 +635,7 @@ NtUserGetAsyncKeyState(INT Key) TRACE("Enter NtUserGetAsyncKeyState\n"); - if (Key >= 0x100) + if (Key >= 0x100 || Key < 0) { EngSetLastError(ERROR_INVALID_PARAMETER); ERR("Invalid parameter Key\n");

1 0

[reactos] 01/01: [DESK] Do not load system-defined class name
by Stanislav Motylkov 30 Oct '22

30 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c21d0c12438b9dc34621… commit 9c21d0c12438b9dc3462100dae37e88c0f522c60 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Oct 30 15:04:41 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Oct 30 15:04:41 2022 +0300 [DESK] Do not load system-defined class name In fact Windows XP/2003 desk.cpl uses only user-defined values, and performs fallback to shell32.dll strings in case they are missing. CORE-18565 CORE-8427 --- dll/cpl/desk/desktop.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/dll/cpl/desk/desktop.c b/dll/cpl/desk/desktop.c index 351eea1ee85..ed16eba7eeb 100644 --- a/dll/cpl/desk/desktop.c +++ b/dll/cpl/desk/desktop.c @@ -285,20 +285,11 @@ DesktopOnInitDialog(IN HWND hwndDlg, IN PDESKTOP_DATA pData) if (SHGetValue(HKEY_CURRENT_USER, szClassPath, IconChange[i].IconName, &dwType, pData->LocalIcon[i].szTitle, &cbData) != ERROR_SUCCESS || dwType != REG_SZ) { - /* Try loading system-defined class icon title */ - StringCchCopy(szClassPath, _countof(szClassPath), szSysClass); - StringCchCat(szClassPath, _countof(szClassPath), IconChange[i].CLSID); - cbData = sizeof(pData->LocalIcon[i].szTitle); - - if (SHGetValue(HKEY_CLASSES_ROOT, szClassPath, IconChange[i].IconName, &dwType, - pData->LocalIcon[i].szTitle, &cbData) != ERROR_SUCCESS || dwType != REG_SZ) - { - /* Fallback to predefined strings */ - LoadString(GetModuleHandle(TEXT("shell32.dll")), - IconChange[i].TitleId, - pData->LocalIcon[i].szTitle, - _countof(pData->LocalIcon[i].szTitle)); - } + /* Fallback to predefined strings */ + LoadString(GetModuleHandle(TEXT("shell32.dll")), + IconChange[i].TitleId, + pData->LocalIcon[i].szTitle, + _countof(pData->LocalIcon[i].szTitle)); } hIcon = GetIconFromLocation(pData->LocalIcon[i].szPath);

1 0

[reactos] 01/01: [KBSWITCH] Don't activate target window on WM_CREATE
by Katayama Hirofumi MZ 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f03be85700bc80803c80… commit 6f03be85700bc80803c80cb02273fdbfdd10d337 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 30 08:29:03 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Oct 30 08:30:10 2022 +0900 [KBSWITCH] Don't activate target window on WM_CREATE CORE-10667 --- base/applications/kbswitch/kbswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 67e250d4259..29f59db2f4c 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -708,7 +708,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) AddTrayIcon(hwnd); - ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, FALSE); + ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, TRUE); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); break; }

1 0

[reactos] 01/01: [CPL:INPUT] Return TRUE against WM_INITDIALOG and add WS_TABSTOP
by Katayama Hirofumi MZ 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d9026c852546896b3fc0… commit 4d9026c852546896b3fc099afe9c15997bcf4c87 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 30 08:01:50 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Oct 30 08:01:57 2022 +0900 [CPL:INPUT] Return TRUE against WM_INITDIALOG and add WS_TABSTOP This affects control focus. --- dll/cpl/input/add_dialog.c | 2 +- dll/cpl/input/edit_dialog.c | 2 +- dll/cpl/input/key_sequence_dialog.c | 2 +- dll/cpl/input/key_settings_dialog.c | 4 +--- dll/cpl/input/lang/bg-BG.rc | 6 +++--- dll/cpl/input/lang/cs-CZ.rc | 6 +++--- dll/cpl/input/lang/de-DE.rc | 6 +++--- dll/cpl/input/lang/el-GR.rc | 6 +++--- dll/cpl/input/lang/en-US.rc | 6 +++--- dll/cpl/input/lang/es-ES.rc | 6 +++--- dll/cpl/input/lang/fr-FR.rc | 6 +++--- dll/cpl/input/lang/he-IL.rc | 6 +++--- dll/cpl/input/lang/id-ID.rc | 6 +++--- dll/cpl/input/lang/it-IT.rc | 6 +++--- dll/cpl/input/lang/ja-JP.rc | 6 +++--- dll/cpl/input/lang/no-NO.rc | 6 +++--- dll/cpl/input/lang/pl-PL.rc | 6 +++--- dll/cpl/input/lang/pt-BR.rc | 6 +++--- dll/cpl/input/lang/pt-PT.rc | 6 +++--- dll/cpl/input/lang/ro-RO.rc | 6 +++--- dll/cpl/input/lang/ru-RU.rc | 6 +++--- dll/cpl/input/lang/sk-SK.rc | 6 +++--- dll/cpl/input/lang/sq-AL.rc | 6 +++--- dll/cpl/input/lang/tr-TR.rc | 6 +++--- dll/cpl/input/lang/uk-UA.rc | 6 +++--- dll/cpl/input/lang/zh-CN.rc | 6 +++--- dll/cpl/input/lang/zh-HK.rc | 6 +++--- dll/cpl/input/lang/zh-TW.rc | 6 +++--- dll/cpl/input/settings_page.c | 2 +- 29 files changed, 77 insertions(+), 79 deletions(-) diff --git a/dll/cpl/input/add_dialog.c b/dll/cpl/input/add_dialog.c index 96567cf8d8a..3074ea2960f 100644 --- a/dll/cpl/input/add_dialog.c +++ b/dll/cpl/input/add_dialog.c @@ -180,7 +180,7 @@ AddDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: OnInitAddDialog(hwndDlg); - break; + return TRUE; case WM_COMMAND: OnCommandAddDialog(hwndDlg, wParam); diff --git a/dll/cpl/input/edit_dialog.c b/dll/cpl/input/edit_dialog.c index 4acd2c0a321..7e0956bf51e 100644 --- a/dll/cpl/input/edit_dialog.c +++ b/dll/cpl/input/edit_dialog.c @@ -45,8 +45,8 @@ EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } ComboBox_SelectString(hwndList, 0, pInput->pLayout->pszName); + return TRUE; } - break; case WM_COMMAND: { diff --git a/dll/cpl/input/key_sequence_dialog.c b/dll/cpl/input/key_sequence_dialog.c index 81bc82edbae..3864175d7ad 100644 --- a/dll/cpl/input/key_sequence_dialog.c +++ b/dll/cpl/input/key_sequence_dialog.c @@ -63,8 +63,8 @@ ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } } } + return TRUE; } - break; case WM_COMMAND: { diff --git a/dll/cpl/input/key_settings_dialog.c b/dll/cpl/input/key_settings_dialog.c index 7a1076c4641..aa3ca4d0e09 100644 --- a/dll/cpl/input/key_settings_dialog.c +++ b/dll/cpl/input/key_settings_dialog.c @@ -228,10 +228,8 @@ KeySettingsDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: - { OnInitKeySettingsDialog(hwndDlg); - } - break; + return TRUE; case WM_COMMAND: { diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 9833958bd6e..3e7c9840a37 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -52,9 +52,9 @@ CAPTION "Добавяне език на писане" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Език на &въвеждане:", -1, 7, 7, 90, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Клавиатурна подредба/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 116, 68, 50, 14 PUSHBUTTON "Отказ", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Език на писане", -1, 7, 7, 55, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "Клавиатурна подредба/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 116, 53, 52, 14 PUSHBUTTON "Отказ", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index f1046fab271..53b16411a2b 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -57,9 +57,9 @@ CAPTION "Přidat vstupní jazyk" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Vstupní jazyk:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Rozložení kláves/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 169, 68, 50, 14 END @@ -92,7 +92,7 @@ BEGIN LTEXT "Vstupní jazyk:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Rozložení kláves/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Storno", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index b23641e5cee..9ab6280cbb1 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -52,9 +52,9 @@ CAPTION "Eingabesprache hinzufügen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Eingabesprache:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index 464aaa58581..5cee8ff4129 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -52,9 +52,9 @@ CAPTION "Προσθήκη γλώσσας εισαγωγής" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Γλώσσα εισαγωγής:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Διάταξη πληκτρολογίου/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Άκυρο", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Γλώσσα εισαγωγής:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Διάταξη πληκτρολογίου/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Άκυρο", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 41e07463b91..554002777ee 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -52,9 +52,9 @@ CAPTION "Add Input language" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Input language:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index c4dd0b014bd..9af3acc9d5a 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -61,9 +61,9 @@ CAPTION "Agregar idioma de entrada" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Idioma de dispositivo de entrada:", -1, 7, 7, 120, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Distribución del teclado/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END @@ -96,7 +96,7 @@ BEGIN LTEXT "&Idioma de dispositivo de entrada:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Distribución del teclado/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 116, 53, 52, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index d3796a9639a..1a47da41c22 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -52,9 +52,9 @@ CAPTION "Ajouter une langue de saisie" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Langue de sa&isie :", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Configuration du clavier/IME :", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Langue de saisie :", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "Configuration clavier/IME :", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index b88284c27ca..ca527b1a91d 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -54,9 +54,9 @@ CAPTION "הוספת שפת כתיבה" FONT 8, "MS Shell Dlg" BEGIN LTEXT "שפת כתיבה:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "אישור", IDOK, 116, 68, 50, 14 PUSHBUTTON "ביטול", IDCANCEL, 169, 68, 50, 14 END @@ -89,7 +89,7 @@ BEGIN LTEXT "שפת כתיבה:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "אישור", IDOK, 116, 53, 52, 14 PUSHBUTTON "ביטול", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc index 0c65a242953..589692618d1 100644 --- a/dll/cpl/input/lang/id-ID.rc +++ b/dll/cpl/input/lang/id-ID.rc @@ -52,9 +52,9 @@ CAPTION "Tambah Bahasa Masukan" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Bahasa masukan:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Tata leta&k papan ketik/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Bahasa masukan:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "Tata leta&k papan ketik/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Batal", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 872727901f6..3c6c92d98fd 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -52,9 +52,9 @@ CAPTION "Aggiunta lingua" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Lingua:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Layout/IME tastiera:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Lingua:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Layout/IME tastiera:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Annulla", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 7fe83d20e85..7e63602e126 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -52,9 +52,9 @@ CAPTION "入力言語の追加" FONT 9, "MS UI Gothic" BEGIN LTEXT "入力言語(&I):", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "キーボードレイアウト/IME(&K):", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "入力言語:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "キーボードレイアウト/IME(&K):", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "キャンセル", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index fa996580e08..fb6df7ec2b5 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -52,9 +52,9 @@ CAPTION "Teksttjenester og inndataspråk" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Inndataspråk:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Tastaturoppsett/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Inndataspråk:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Tastaturoppsett/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Avbryt", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 11603d4c4cb..35475621d38 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -60,9 +60,9 @@ CAPTION "Dodawanie języków" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Język:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Układ klawiatury/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 169, 68, 50, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "Język:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Układ klawiatury/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Anuluj", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index af1929f8f9f..64cd9a42c75 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -52,9 +52,9 @@ CAPTION "Adicionar idioma de entrada" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "L&ayout do teclado/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "L&ayout do teclado/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index 58c10e99ca0..2fd58f5f788 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -52,9 +52,9 @@ CAPTION "Adicionar idioma de entrada" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Esquema do teclado/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Esquema do teclado/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index 081e94a6a42..16e888bd4b4 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -60,9 +60,9 @@ CAPTION "Adăguare limbă de intrare" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Limbă:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Aranjament de tastatură/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 116, 68, 50, 14 PUSHBUTTON "A&nulează", IDCANCEL, 169, 68, 50, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "Limbă:", -1, 7, 7, 37, 8 LTEXT "", IDC_INPUT_LANG_STR, 30, 7, 129, 8 LTEXT "&Aranjament de tastatură/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 116, 53, 52, 14 PUSHBUTTON "A&nulează", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 94b549c2db9..413869214c3 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -52,9 +52,9 @@ CAPTION "Добавление языка ввода" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Язык ввода:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Раскладка клавиатуры:", -1, 7, 36, 170, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "ОК", IDOK, 116, 68, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 169, 68, 50, 14 END @@ -87,7 +87,7 @@ BEGIN LTEXT "Язык ввода:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Раскладка клавиатуры:", -1, 7, 21, 170, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "ОК", IDOK, 114, 53, 52, 14 PUSHBUTTON "Отмена", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 6b93972ee18..5479d745f6f 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -57,9 +57,9 @@ CAPTION "Add Input language" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 169, 68, 50, 14 END @@ -92,7 +92,7 @@ BEGIN LTEXT "Input language:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index a2d95b4a527..12d1d071018 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -56,9 +56,9 @@ CAPTION "Shto gjuhën hyrese" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Gjuha hyrese:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 169, 68, 50, 14 END @@ -91,7 +91,7 @@ BEGIN LTEXT "Gjuha hyrese:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Anulo", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index fcfab5246f8..23f848337b5 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -54,9 +54,9 @@ CAPTION "Giriş Dili Ekle" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Giriş Dili:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Klavye Düzeni/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 116, 68, 50, 14 PUSHBUTTON "İptal", IDCANCEL, 169, 68, 50, 14 END @@ -89,7 +89,7 @@ BEGIN LTEXT "&Giriş Dili:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Klavye Düzeni/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 116, 53, 52, 14 PUSHBUTTON "İptal", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 2d91e093aa6..72964a71507 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -60,9 +60,9 @@ CAPTION "Додавання мови вводу" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Мова вводу:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Розкладка клавіатури або засіб вводу (IME):", -1, 7, 36, 140, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Скасувати", IDCANCEL, 169, 68, 50, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "Мова вводу:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Розкладка клавіатури або засіб вводу (IME):", -1, 7, 21, 150, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Скасувати", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index 3a6e20841c4..ae5cc27d299 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -54,9 +54,9 @@ CAPTION "添加输入语言" FONT 9, "宋体" BEGIN LTEXT "输入语言(&I)：", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "键盘布局/输入法(&K)：", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 116, 68, 50, 14 PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14 END @@ -89,7 +89,7 @@ BEGIN LTEXT "输入语言：", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "键盘布局/输入法(&K)：", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 116, 53, 52, 14 PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc index 9430e0ff36e..4f7ac992dc4 100644 --- a/dll/cpl/input/lang/zh-HK.rc +++ b/dll/cpl/input/lang/zh-HK.rc @@ -60,9 +60,9 @@ CAPTION "新增輸入語言" FONT 9, "新細明體" BEGIN LTEXT "輸入語言(&I)：", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "鍵盤佈局／輸入法(&K)：", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 116, 68, 50, 14 PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "輸入語言：", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "鍵盤佈局／輸入法(&K)：", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 116, 53, 52, 14 PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index e7ddb4a0ce0..ec81477e1f9 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -60,9 +60,9 @@ CAPTION "新增輸入語言" FONT 9, "新細明體" BEGIN LTEXT "輸入語言(&I)：", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "鍵盤布局／輸入法(&K)：", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 116, 68, 50, 14 PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14 END @@ -95,7 +95,7 @@ BEGIN LTEXT "輸入語言：", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "鍵盤布局／輸入法(&K)：", -1, 7, 21, 110, 10 - COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 116, 53, 52, 14 PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14 END diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index a100cfcd3d9..bf10b057623 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -650,7 +650,7 @@ SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: OnInitSettingsPage(hwndDlg); - break; + return TRUE; case WM_DESTROY: OnDestroySettingsPage(hwndDlg);

1 0

[reactos] 01/01: [KBSWITCH] Menu with icons (#4822)
by Katayama Hirofumi MZ 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06cd45353b1acd836449c… commit 06cd45353b1acd836449c3c3509ac2c76cace690 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 30 06:18:58 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 30 06:18:58 2022 +0900 [KBSWITCH] Menu with icons (#4822) Add icons to the left-click menu. CORE-10667 --- base/applications/kbswitch/kbswitch.c | 42 ++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 89159701fc7..67e250d4259 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -236,6 +236,27 @@ static HICON FakeExtractIcon(LPCTSTR szIconPath, INT cxIcon, INT cyIcon) return LoadIcon.hIcon; } +static HBITMAP BitmapFromIcon(HICON hIcon) +{ + HDC hdcScreen = GetDC(NULL); + HDC hdc = CreateCompatibleDC(hdcScreen); + INT cxIcon = GetSystemMetrics(SM_CXSMICON); + INT cyIcon = GetSystemMetrics(SM_CYSMICON); + HBITMAP hbm = CreateCompatibleBitmap(hdcScreen, cxIcon, cyIcon); + HGDIOBJ hbmOld; + + if (hbm != NULL) + { + hbmOld = SelectObject(hdc, hbm); + DrawIconEx(hdc, 0, 0, hIcon, cxIcon, cyIcon, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL); + SelectObject(hdc, hbmOld); + } + + DeleteDC(hdc); + ReleaseDC(NULL, hdcScreen); + return hbm; +} + static HICON CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) { @@ -447,6 +468,9 @@ BuildLeftPopupMenu(VOID) HKEY hKey; DWORD dwIndex, dwSize; TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szName[MAX_PATH]; + TCHAR szLCID[CCH_LAYOUT_ID + 1], szImeFile[80]; + HICON hIcon; + MENUITEMINFO mii = { sizeof(mii) }; /* Add the keyboard layouts to the popup menu */ if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, @@ -461,10 +485,26 @@ BuildLeftPopupMenu(VOID) break; } + GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + if (!GetLayoutName(szLayoutNum, szName, ARRAYSIZE(szName))) continue; - AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName); + mii.fMask = MIIM_ID | MIIM_STRING; + mii.wID = _ttoi(szLayoutNum); + mii.dwTypeData = szName; + + hIcon = CreateTrayIcon(szLCID, szImeFile); + if (hIcon) + { + mii.hbmpItem = BitmapFromIcon(hIcon); + if (mii.hbmpItem) + mii.fMask |= MIIM_BITMAP; + } + + InsertMenuItem(hMenu, -1, TRUE, &mii); + DestroyIcon(hIcon); } CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED);

1 0

[reactos] 01/01: [CSRLIB] Remove old hack in CsrpConnectToServer(). ObjectDirectory cannot be NULL (otherwise it's caller's bug).
by Hermès Bélusca-Maïto 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6259be3afad261ec1035e… commit 6259be3afad261ec1035e1da33fe9b9a2e0d472a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 29 18:52:34 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 29 18:52:34 2022 +0200 [CSRLIB] Remove old hack in CsrpConnectToServer(). ObjectDirectory cannot be NULL (otherwise it's caller's bug). --- subsystems/csr/csrlib/connect.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/subsystems/csr/csrlib/connect.c b/subsystems/csr/csrlib/connect.c index 9765ac19a75..5b7c84c3e13 100644 --- a/subsystems/csr/csrlib/connect.c +++ b/subsystems/csr/csrlib/connect.c @@ -58,12 +58,6 @@ CsrpConnectToServer( DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); - /* Binary compatibility with MS KERNEL32 */ - if (NULL == ObjectDirectory) - { - ObjectDirectory = L"\\Windows"; - } - /* Calculate the total port name size */ PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + sizeof(CSR_PORT_NAME);

1 0

[reactos] 01/01: [CSRLIB] Add comments regarding the calculation of the data and total message lengths in CsrClientCallServer().
by Hermès Bélusca-Maïto 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=141daf4de84fba27c121c… commit 141daf4de84fba27c121c3cc4324cb6290c52596 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 29 00:26:41 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 29 17:36:09 2022 +0200 [CSRLIB] Add comments regarding the calculation of the data and total message lengths in CsrClientCallServer(). --- subsystems/csr/csrlib/connect.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/subsystems/csr/csrlib/connect.c b/subsystems/csr/csrlib/connect.c index c93f80075d7..9765ac19a75 100644 --- a/subsystems/csr/csrlib/connect.c +++ b/subsystems/csr/csrlib/connect.c @@ -386,10 +386,13 @@ CsrClientCallServer( /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = (CSHORT)DataLength + - sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + /* DataLength = user_data_size + anything between + * header and data, including intermediate padding */ ApiMessage->Header.u1.s1.DataLength = (CSHORT)DataLength + - FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); // ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); + /* TotalLength = header_size + DataLength + any structure trailing padding */ + ApiMessage->Header.u1.s1.TotalLength = (CSHORT)DataLength + + sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber;

1 0

[reactos] 02/02: [CSRLIB] Add SAL annotations to the CSR client functions.
by Hermès Bélusca-Maïto 29 Oct '22

29 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cd01eaf2566c3ed22352… commit 8cd01eaf2566c3ed223525251da339e545a86e61 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 03:09:41 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 29 17:17:30 2022 +0200 [CSRLIB] Add SAL annotations to the CSR client functions. --- sdk/include/reactos/subsys/csr/csr.h | 103 ++++++++++++++++++++--------------- subsystems/csr/csrlib/api.c | 5 +- subsystems/csr/csrlib/capture.c | 69 +++++++++++++---------- subsystems/csr/csrlib/connect.c | 34 ++++++------ 4 files changed, 121 insertions(+), 90 deletions(-) diff --git a/sdk/include/reactos/subsys/csr/csr.h b/sdk/include/reactos/subsys/csr/csr.h index ae531e2a0ae..bfa59b60465 100644 --- a/sdk/include/reactos/subsys/csr/csr.h +++ b/sdk/include/reactos/subsys/csr/csr.h @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Client/Server Runtime SubSystem - * FILE: include/reactos/subsys/csr/csr.h - * PURPOSE: Public definitions for CSR Clients - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Client/Server Runtime SubSystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Public definitions for CSR Clients + * COPYRIGHT: Copyright 2005 Alex Ionescu <alex(a)relsoft.net> + * Copyright 2012-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #ifndef _CSR_H @@ -14,71 +13,88 @@ NTSTATUS NTAPI -CsrClientConnectToServer(IN PWSTR ObjectDirectory, - IN ULONG ServerId, - IN PVOID ConnectionInfo, - IN OUT PULONG ConnectionInfoSize, - OUT PBOOLEAN ServerToServerCall); +CsrClientConnectToServer( + _In_ PCWSTR ObjectDirectory, + _In_ ULONG ServerId, + _In_ PVOID ConnectionInfo, + _Inout_ PULONG ConnectionInfoSize, + _Out_ PBOOLEAN ServerToServerCall); NTSTATUS NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN CSR_API_NUMBER ApiNumber, - IN ULONG DataLength); +CsrClientCallServer( + _Inout_ PCSR_API_MESSAGE ApiMessage, + _Inout_opt_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_ CSR_API_NUMBER ApiNumber, + _In_ ULONG DataLength); PCSR_CAPTURE_BUFFER NTAPI -CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, - IN ULONG BufferSize); +CsrAllocateCaptureBuffer( + _In_ ULONG ArgumentCount, + _In_ ULONG BufferSize); ULONG NTAPI -CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN ULONG MessageLength, - OUT PVOID* CapturedData); +CsrAllocateMessagePointer( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_ ULONG MessageLength, + _Out_ PVOID* CapturedData); VOID NTAPI -CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PVOID MessageBuffer OPTIONAL, - IN ULONG MessageLength, - OUT PVOID* CapturedData); +CsrCaptureMessageBuffer( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_opt_ PVOID MessageBuffer, + _In_ ULONG MessageLength, + _Out_ PVOID* CapturedData); VOID NTAPI -CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer); +CsrFreeCaptureBuffer( + _In_ _Frees_ptr_ PCSR_CAPTURE_BUFFER CaptureBuffer); VOID NTAPI -CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PCSTR String OPTIONAL, - IN ULONG StringLength, - IN ULONG MaximumLength, - OUT PSTRING CapturedString); +CsrCaptureMessageString( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_opt_ PCSTR String, + _In_ ULONG StringLength, + _In_ ULONG MaximumLength, + _Out_ PSTRING CapturedString); + +VOID +NTAPI +CsrCaptureMessageUnicodeStringInPlace( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _Inout_ PUNICODE_STRING String); NTSTATUS NTAPI -CsrCaptureMessageMultiUnicodeStringsInPlace(OUT PCSR_CAPTURE_BUFFER* CaptureBuffer, - IN ULONG StringsCount, - IN PUNICODE_STRING* MessageStrings); +CsrCaptureMessageMultiUnicodeStringsInPlace( + _Inout_ PCSR_CAPTURE_BUFFER* CaptureBuffer, + _In_ ULONG StringsCount, + _In_ PUNICODE_STRING* MessageStrings); PLARGE_INTEGER NTAPI -CsrCaptureTimeout(IN ULONG Milliseconds, - OUT PLARGE_INTEGER Timeout); +CsrCaptureTimeout( + _In_ ULONG Milliseconds, + _Out_ PLARGE_INTEGER Timeout); VOID NTAPI -CsrProbeForRead(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); +CsrProbeForRead( + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment); VOID NTAPI -CsrProbeForWrite(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); +CsrProbeForWrite( + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment); HANDLE NTAPI @@ -94,8 +110,9 @@ CsrIdentifyAlertableThread(VOID); NTSTATUS NTAPI -CsrSetPriorityClass(IN HANDLE Process, - IN OUT PULONG PriorityClass); +CsrSetPriorityClass( + _In_ HANDLE Process, + _Inout_ PULONG PriorityClass); #endif // _CSR_H diff --git a/subsystems/csr/csrlib/api.c b/subsystems/csr/csrlib/api.c index b1611d1f34f..2241e9ef652 100644 --- a/subsystems/csr/csrlib/api.c +++ b/subsystems/csr/csrlib/api.c @@ -64,8 +64,9 @@ CsrIdentifyAlertableThread(VOID) */ NTSTATUS NTAPI -CsrSetPriorityClass(IN HANDLE Process, - IN OUT PULONG PriorityClass) +CsrSetPriorityClass( + _In_ HANDLE Process, + _Inout_ PULONG PriorityClass) { #if (NTDDI_VERSION < NTDDI_WS03) NTSTATUS Status; diff --git a/subsystems/csr/csrlib/capture.c b/subsystems/csr/csrlib/capture.c index c5b6b10cb59..2a7855f4c76 100644 --- a/subsystems/csr/csrlib/capture.c +++ b/subsystems/csr/csrlib/capture.c @@ -20,9 +20,10 @@ */ VOID NTAPI -CsrProbeForRead(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment) +CsrProbeForRead( + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment) { volatile UCHAR *Pointer; UCHAR Data; @@ -52,9 +53,10 @@ CsrProbeForRead(IN PVOID Address, */ VOID NTAPI -CsrProbeForWrite(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment) +CsrProbeForWrite( + _In_ PVOID Address, + _In_ ULONG Length, + _In_ ULONG Alignment) { volatile UCHAR *Pointer; @@ -82,8 +84,9 @@ CsrProbeForWrite(IN PVOID Address, */ PCSR_CAPTURE_BUFFER NTAPI -CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, - IN ULONG BufferSize) +CsrAllocateCaptureBuffer( + _In_ ULONG ArgumentCount, + _In_ ULONG BufferSize) { PCSR_CAPTURE_BUFFER CaptureBuffer; ULONG OffsetsArraySize; @@ -146,9 +149,10 @@ CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, */ ULONG NTAPI -CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN ULONG MessageLength, - OUT PVOID* CapturedData) +CsrAllocateMessagePointer( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_ ULONG MessageLength, + _Out_ PVOID* CapturedData) { if (MessageLength == 0) { @@ -182,10 +186,11 @@ CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, */ VOID NTAPI -CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PVOID MessageBuffer OPTIONAL, - IN ULONG MessageLength, - OUT PVOID* CapturedData) +CsrCaptureMessageBuffer( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_opt_ PVOID MessageBuffer, + _In_ ULONG MessageLength, + _Out_ PVOID* CapturedData) { /* Simply allocate a message pointer in the buffer */ CsrAllocateMessagePointer(CaptureBuffer, MessageLength, CapturedData); @@ -202,7 +207,8 @@ CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, */ VOID NTAPI -CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer) +CsrFreeCaptureBuffer( + _In_ _Frees_ptr_ PCSR_CAPTURE_BUFFER CaptureBuffer) { /* Free it from the heap */ RtlFreeHeap(CsrPortHeap, 0, CaptureBuffer); @@ -213,11 +219,12 @@ CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer) */ VOID NTAPI -CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PCSTR String OPTIONAL, - IN ULONG StringLength, - IN ULONG MaximumLength, - OUT PSTRING CapturedString) +CsrCaptureMessageString( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_opt_ PCSTR String, + _In_ ULONG StringLength, + _In_ ULONG MaximumLength, + _Out_ PSTRING CapturedString) { ASSERT(CapturedString != NULL); @@ -259,9 +266,11 @@ CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, CapturedString->Buffer[CapturedString->Length] = ANSI_NULL; } -static VOID -CsrCaptureMessageUnicodeStringInPlace(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PUNICODE_STRING String) +VOID +NTAPI +CsrCaptureMessageUnicodeStringInPlace( + _Inout_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _Inout_ PUNICODE_STRING String) { ASSERT(String != NULL); @@ -282,9 +291,10 @@ CsrCaptureMessageUnicodeStringInPlace(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, */ NTSTATUS NTAPI -CsrCaptureMessageMultiUnicodeStringsInPlace(OUT PCSR_CAPTURE_BUFFER* CaptureBuffer, - IN ULONG StringsCount, - IN PUNICODE_STRING* MessageStrings) +CsrCaptureMessageMultiUnicodeStringsInPlace( + _Inout_ PCSR_CAPTURE_BUFFER* CaptureBuffer, + _In_ ULONG StringsCount, + _In_ PUNICODE_STRING* MessageStrings) { ULONG Count; @@ -328,8 +338,9 @@ CsrCaptureMessageMultiUnicodeStringsInPlace(OUT PCSR_CAPTURE_BUFFER* CaptureBuff */ PLARGE_INTEGER NTAPI -CsrCaptureTimeout(IN ULONG Milliseconds, - OUT PLARGE_INTEGER Timeout) +CsrCaptureTimeout( + _In_ ULONG Milliseconds, + _Out_ PLARGE_INTEGER Timeout) { /* Validate the time */ if (Milliseconds == -1) return NULL; diff --git a/subsystems/csr/csrlib/connect.c b/subsystems/csr/csrlib/connect.c index 51d7c006f75..c93f80075d7 100644 --- a/subsystems/csr/csrlib/connect.c +++ b/subsystems/csr/csrlib/connect.c @@ -31,16 +31,17 @@ ULONG_PTR CsrPortMemoryDelta; BOOLEAN InsideCsrProcess = FALSE; typedef NTSTATUS -(NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, - IN PPORT_MESSAGE Reply); +(NTAPI *PCSR_SERVER_API_ROUTINE)( + _In_ PCSR_API_MESSAGE Request, + _Inout_ PCSR_API_MESSAGE Reply); PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; /* FUNCTIONS ******************************************************************/ -NTSTATUS -NTAPI -CsrpConnectToServer(IN PWSTR ObjectDirectory) +static NTSTATUS +CsrpConnectToServer( + _In_ PCWSTR ObjectDirectory) { NTSTATUS Status; SIZE_T PortNameLength; @@ -198,11 +199,12 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory) */ NTSTATUS NTAPI -CsrClientConnectToServer(IN PWSTR ObjectDirectory, - IN ULONG ServerId, - IN PVOID ConnectionInfo, - IN OUT PULONG ConnectionInfoSize, - OUT PBOOLEAN ServerToServerCall) +CsrClientConnectToServer( + _In_ PCWSTR ObjectDirectory, + _In_ ULONG ServerId, + _In_ PVOID ConnectionInfo, + _Inout_ PULONG ConnectionInfoSize, + _Out_ PBOOLEAN ServerToServerCall) { NTSTATUS Status; PIMAGE_NT_HEADERS NtHeader; @@ -367,10 +369,11 @@ C_ASSERT((sizeof(TEST) - sizeof(TEST_EMBEDDED)) != FIELD_OFFSET(TEST, Three)); */ NTSTATUS NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, - IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN CSR_API_NUMBER ApiNumber, - IN ULONG DataLength) +CsrClientCallServer( + _Inout_ PCSR_API_MESSAGE ApiMessage, + _Inout_opt_ PCSR_CAPTURE_BUFFER CaptureBuffer, + _In_ CSR_API_NUMBER ApiNumber, + _In_ ULONG DataLength) { NTSTATUS Status; @@ -484,8 +487,7 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; /* Do a direct call */ - Status = CsrServerApiRoutine(&ApiMessage->Header, - &ApiMessage->Header); + Status = CsrServerApiRoutine(ApiMessage, ApiMessage); /* Check for success */ if (!NT_SUCCESS(Status))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2022