November 2021 - Wine-devel - list.winehq.org

[PATCH 3/6] uxtheme: Support TMT_TRANSITIONDURATIONS property.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index a7928348304..c9a23429511 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -257,6 +257,7 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_BOOL, TMT_USERPICTURE, L"USERPICTURE"}, {TMT_RECT, TMT_DEFAULTPANESIZE, L"DEFAULTPANESIZE"}, {TMT_COLOR, TMT_BLENDCOLOR, L"BLENDCOLOR"}, + {TMT_INTLIST, TMT_TRANSITIONDURATIONS, L"TRANSITIONDURATIONS"}, {0, 0, L""} }; -- 2.32.0

1 0

[PATCH 2/6] uxtheme: Use vssym32.h instead of tmschema.h.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

tmschema.h is obsolete and missing some definitions. The deleted global and menu classes are not used anywhere and not in Windows headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 2 +- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/property.c | 2 +- dlls/uxtheme/stylemap.c | 62 ++++++----------------------------------- dlls/uxtheme/system.c | 2 +- include/tmschema.h | 28 ------------------- include/vsstyle.h | 7 +++++ 8 files changed, 20 insertions(+), 87 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a03217b65cf..bf294ed3cc8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -32,7 +32,7 @@ #include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" #include "uxthemedll.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 2d5a09d0256..b7c173740d7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -26,7 +26,7 @@ #include "winuser.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index f129d998d65..c0f626d54aa 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -28,7 +28,7 @@ #include "winnls.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 93a72ab9189..188f13836e2 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -26,7 +26,7 @@ #include "wingdi.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 4fe254c1e7a..a7928348304 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -23,9 +23,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "tmschema.h" +#include "vssym32.h" #define TMT_ENUM 200 +#define TMT_STOCKIMAGEFILE 3007 typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; @@ -332,24 +333,6 @@ static const MSSTYLES_ENUM_MAP mapEnum[] = { * Defined as PartID,StateID,TextName * If StateID == 0 then its a part being defined */ - -/* These are globals to all classes, but its treated as a separate class */ -static const MSSTYLES_CLASS_MAP classGlobals[] = { - {GP_BORDER, 0, L"BORDER"}, - {GP_BORDER, BSS_FLAT, L"FLAT"}, - {GP_BORDER, BSS_RAISED, L"RAISED"}, - {GP_BORDER, BSS_SUNKEN, L"SUNKEN"}, - {GP_LINEHORZ, 0, L"LINEHORZ"}, - {GP_LINEHORZ, LHS_FLAT, L"FLAT"}, - {GP_LINEHORZ, LHS_RAISED, L"RAISED"}, - {GP_LINEHORZ, LHS_SUNKEN, L"SUNKEN"}, - {GP_LINEVERT, 0, L"LINEVERT"}, - {GP_LINEVERT, LVS_FLAT, L"FLAT"}, - {GP_LINEVERT, LVS_RAISED, L"RAISED"}, - {GP_LINEVERT, LVS_SUNKEN, L"SUNKEN"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, 0, L"PUSHBUTTON"}, {BP_PUSHBUTTON, PBS_NORMAL, L"NORMAL"}, @@ -488,11 +471,12 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTITEM, 0, L"LISTITEM"}, - {LVP_LISTITEM, LIS_NORMAL, L"NORMAL"}, - {LVP_LISTITEM, LIS_HOT, L"HOT"}, - {LVP_LISTITEM, LIS_SELECTED, L"SELECTED"}, - {LVP_LISTITEM, LIS_DISABLED, L"DISABLED"}, - {LVP_LISTITEM, LIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_NORMAL, L"NORMAL"}, + {LVP_LISTITEM, LISS_HOT, L"HOT"}, + {LVP_LISTITEM, LISS_SELECTED, L"SELECTED"}, + {LVP_LISTITEM, LISS_DISABLED, L"DISABLED"}, + {LVP_LISTITEM, LISS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_HOTSELECTED, L"HOTSELECTED"}, {LVP_LISTGROUP, 0, L"LISTGROUP"}, {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, @@ -500,34 +484,6 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; -static const MSSTYLES_CLASS_MAP classMenu[] = { - {MP_MENUITEM, 0, L"MENUITEM"}, - {MP_MENUITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUDROPDOWN, 0, L"MENUDROPDOWN"}, - {MP_MENUDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARITEM, 0, L"MENUBARITEM"}, - {MP_MENUBARITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARDROPDOWN, 0, L"MENUBARDROPDOWN"}, - {MP_MENUBARDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_CHEVRON, 0, L"CHEVRON"}, - {MP_CHEVRON, MS_NORMAL, L"NORMAL"}, - {MP_CHEVRON, MS_SELECTED, L"SELECTED"}, - {MP_CHEVRON, MS_DEMOTED, L"DEMOTED"}, - {MP_SEPARATOR, 0, L"SEPARATOR"}, - {MP_SEPARATOR, MS_NORMAL, L"NORMAL"}, - {MP_SEPARATOR, MS_SELECTED, L"SELECTED"}, - {MP_SEPARATOR, MS_DEMOTED, L"DEMOTED"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1036,7 +992,6 @@ static const MSSTYLES_CLASS_MAP classWindow[] = { /* Map class names to part/state maps */ static const MSSTYLES_CLASS_NAME mapClass[] = { - {classGlobals, L"GLOBALS"}, {classButton, L"BUTTON"}, {classClock, L"CLOCK"}, {classCombobox, L"COMBOBOX"}, @@ -1044,7 +999,6 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, - {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 0298fe61d4a..ba579a02edc 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -28,7 +28,7 @@ #include "winreg.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "uxthemedll.h" #include "msstyles.h" diff --git a/include/tmschema.h b/include/tmschema.h index 47eb146ebdc..81bd606d11b 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -594,34 +594,6 @@ BEGIN_TM_PART_STATES(SPECIALGROUPEXPAND) TM_STATE(3, EBSGE, PRESSED) END_TM_PART_STATES() -/* GLOBALS parts */ -BEGIN_TM_CLASS_PARTS(GLOBALS) - TM_PART(1, GP, BORDER) - TM_PART(2, GP, LINEHORZ) - TM_PART(3, GP, LINEVERT) -END_TM_CLASS_PARTS() - -/* GLOBALS - BORDER states */ -BEGIN_TM_PART_STATES(BORDER) - TM_STATE(1, BSS, FLAT) - TM_STATE(2, BSS, RAISED) - TM_STATE(3, BSS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBALS - LINEHORZ states */ -BEGIN_TM_PART_STATES(LINEHORZ) - TM_STATE(1, LHS, FLAT) - TM_STATE(2, LHS, RAISED) - TM_STATE(3, LHS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBAL - LINEVERT states */ -BEGIN_TM_PART_STATES(LINEVERT) - TM_STATE(1, LVS, FLAT) - TM_STATE(2, LVS, RAISED) - TM_STATE(3, LVS, SUNKEN) -END_TM_PART_STATES() - /* HEADER parts */ BEGIN_TM_CLASS_PARTS(HEADER) TM_PART(1, HP, HEADERITEM) diff --git a/include/vsstyle.h b/include/vsstyle.h index c5850111fb3..d6ea9071f64 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1632,6 +1632,13 @@ enum MINBUTTONSTATES { MINBS_DISABLED = 4, }; +enum MAXBUTTONSTATES { + MAXBS_NORMAL = 1, + MAXBS_HOT = 2, + MAXBS_PUSHED = 3, + MAXBS_DISABLED = 4, +}; + enum RESTOREBUTTONSTATES { RBS_NORMAL = 1, RBS_HOT = 2, -- 2.32.0

1 0

[PATCH 1/6] uxtheme/tests: Add GetThemeIntList() tests.
by Zhiyi Zhang 02 Nov '21

02 Nov '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 40 ++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f56c3d2c273..7992911bc19 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -28,7 +28,7 @@ #include "ddk/d3dkmthk.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "vsstyle.h" +#include "vssym32.h" #include "msg.h" #include "wine/test.h" @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); +static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -79,6 +80,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintDC) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) + GET_PROC(uxtheme, GetThemeIntList) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1263,6 +1265,41 @@ static void test_EnableTheming(void) } } +static void test_GetThemeIntList(void) +{ + INTLIST intlist; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeIntList) + { + win_skip("GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Check properties */ + /* TMT_TRANSITIONDURATIONS is a vista+ property */ + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr); + else + todo_wine + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1282,6 +1319,7 @@ START_TEST(system) test_GetThemePartSize(); test_CloseThemeData(); test_buffered_paint(); + test_GetThemeIntList(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); -- 2.32.0

1 0

[PATCH v8 1/3] robocopy/tests: Add basic conformance tests
by Florian Eder 02 Nov '21

02 Nov '21

Basic conformance tests create test source directories with files and sub folders, execute robocopy on it, checking whether the resulting destination directory, the remaining source directory and the exit code is as expected Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v8: Added helper functions to check the source folder to reduce amount of duplicated code, use only the relative path for DeleteFileW / RemoveDirectoryW and used string arrays to reduce the amount of code necessary for the tests. The remaining tests that are not using an array / loop structure either break not completly identical with the other tests or will not be fixed with the same patch (which would in turn break the tests when implementing the feature, as the test would succeed for most cmd strings, but not for all). For the cmd return value, this could be fixed with a todo_wine_if and hard coding the array entries that fail, but then the check_*_test functions would still fail as there are also differences in the resulting files. Another solution to this problem would be to also give the id of the specific array entry that is checked as an argument to the check_*_test functions, so that todo_wine_if could be used, but this would a) require hardcoding array entry ids, which could easily change if tests are added from the top instead of the end of the array, b) make the tests more complex, as an additional function is linked to the content of the cmd string array, c) deviate even further from other tests that are (AFAIK) seen as the "gold standard". However, if you prefer this solution, feel free to tell me. :-) Also, basic_copy_tests and absolute_copy_tests could be theoretically merged, as it should not hurt to use the strings in basic_copy_tests as format strings for swprintf (they don't contain any format specifiers, causing swprintf to do nothing). I think it's reasonable to seperate those tests anyway, as it's not directly visible what strings are added to the strings otherwise (it's IMO much more clear when talking about a test for absolute paths, which requires information only available at runtime), but if you think otherwise, I'll change it immediately. :-) --- configure | 1 + configure.ac | 1 + programs/robocopy/tests/Makefile.in | 4 + programs/robocopy/tests/robocopy.c | 342 ++++++++++++++++++++++++++++ 4 files changed, 348 insertions(+) create mode 100644 programs/robocopy/tests/Makefile.in create mode 100644 programs/robocopy/tests/robocopy.c diff --git a/configure b/configure index 0156a507439..542d0fb7233 100755 --- a/configure +++ b/configure @@ -19782,6 +19782,7 @@ wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 wine_fn_config_makefile programs/robocopy enable_robocopy +wine_fn_config_makefile programs/robocopy/tests enable_tests wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 diff --git a/configure.ac b/configure.ac index ab55c72a238..c5913721a3a 100644 --- a/configure.ac +++ b/configure.ac @@ -3679,6 +3679,7 @@ WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) WINE_CONFIG_MAKEFILE(programs/robocopy) +WINE_CONFIG_MAKEFILE(programs/robocopy/tests) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/tests/Makefile.in b/programs/robocopy/tests/Makefile.in new file mode 100644 index 00000000000..d86e70f4c43 --- /dev/null +++ b/programs/robocopy/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = robocopy.exe + +C_SRCS = \ + robocopy.c diff --git a/programs/robocopy/tests/robocopy.c b/programs/robocopy/tests/robocopy.c new file mode 100644 index 00000000000..48075709cf5 --- /dev/null +++ b/programs/robocopy/tests/robocopy.c @@ -0,0 +1,342 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <wchar.h> +#include <wine/test.h> + +WCHAR temp_path[MAX_PATH]; + +static BOOL run_cmd(const WCHAR *cmd, DWORD *exit_code) +{ + STARTUPINFOW startup_info; + PROCESS_INFORMATION process_info; + WCHAR cmd_copy[256]; + + memset(&startup_info, 0, sizeof(STARTUPINFOW)); + startup_info.dwFlags = STARTF_USESTDHANDLES; + startup_info.hStdInput = INVALID_HANDLE_VALUE; + startup_info.hStdOutput = INVALID_HANDLE_VALUE; + startup_info.hStdError = INVALID_HANDLE_VALUE; + + swprintf(cmd_copy, ARRAY_SIZE(cmd_copy), L"%s", cmd); + + if (!CreateProcessW(NULL, cmd_copy, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info)) + return FALSE; + + if (WaitForSingleObject(process_info.hProcess, 30000) == WAIT_TIMEOUT) + return FALSE; + + GetExitCodeProcess(process_info.hProcess, exit_code); + + CloseHandle(process_info.hThread); + CloseHandle(process_info.hProcess); + + return TRUE; +} + +static void create_test_file(const WCHAR *relative_path, size_t size) +{ + HANDLE handle; + WCHAR path[MAX_PATH]; + swprintf(path, ARRAY_SIZE(path), L"%s%s", temp_path, relative_path); + handle = CreateFileW(path, FILE_GENERIC_WRITE | FILE_GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, 0, NULL); + ok(handle != INVALID_HANDLE_VALUE, "creation of %s failed (0x%08x)\n", debugstr_w(path), GetLastError()); + if (size != 0) + { + BYTE *data; + DWORD bytes_written; + data = calloc(size, sizeof(BYTE)); + ok(WriteFile(handle, data, size, &bytes_written, NULL), "writing to %s failed (%d)\n", debugstr_w(path), GetLastError()); + } + CloseHandle(handle); +} + +static void create_test_folder(const WCHAR *relative_path) +{ + WCHAR path[MAX_PATH]; + swprintf(path, ARRAY_SIZE(path), L"%s%s", temp_path, relative_path); + + CreateDirectoryW(path, NULL); +} + +static void create_test_source_folder(void) +{ + create_test_folder(L"source"); + create_test_folder(L"source\\folderA"); + create_test_folder(L"source\\folderB"); + create_test_folder(L"source\\folderC"); + create_test_folder(L"source\\folderA\\folderD"); + create_test_folder(L"source\\folderA\\folderE"); + create_test_file(L"source\\fileA.a", 4000); + create_test_file(L"source\\fileB.b", 8000); + create_test_file(L"source\\folderA\\fileC.c", 60); + create_test_file(L"source\\folderA\\fileD.d", 80); + create_test_file(L"source\\folderA\\folderD\\fileE.e", 10000); + create_test_file(L"source\\folderB\\fileF.f", 10000); + create_test_file(L"source\\folderB\\fileG.g", 200); +} + +static void check_file(const WCHAR *relative_path, BOOL should_exist) +{ + ok (DeleteFileW(relative_path) == should_exist, "file %s expected exist to be %d, but is %d\n", debugstr_w(relative_path), should_exist, !should_exist); + if (!should_exist) + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, + "file %s DeleteFileW returned error %d, should not exist\n", + debugstr_w(relative_path), + GetLastError()); +} + +static void check_folder(const WCHAR *relative_path, BOOL should_exist) +{ + ok (RemoveDirectoryW(relative_path) == should_exist, "folder %s expected exist to be %d, but is %d\n", debugstr_w(relative_path), should_exist, !should_exist); + if (!should_exist) + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, + "folder %s RemoveDirectoryW returned error %d, should not exist\n", + debugstr_w(relative_path), + GetLastError()); +} + +static void check_source_folder_unchanged(void) +{ + check_file(L"source\\fileA.a", TRUE); + check_file(L"source\\fileB.b", TRUE); + check_file(L"source\\folderA\\fileC.c", TRUE); + check_file(L"source\\folderA\\fileD.d", TRUE); + check_file(L"source\\folderA\\folderD\\fileE.e", TRUE); + check_file(L"source\\folderB\\fileF.f", TRUE); + check_file(L"source\\folderB\\fileG.g", TRUE); + check_folder(L"source\\folderA\\folderD", TRUE); + check_folder(L"source\\folderA\\folderE", TRUE); + check_folder(L"source\\folderA", TRUE); + check_folder(L"source\\folderB", TRUE); + check_folder(L"source\\folderC", TRUE); + check_folder(L"source", TRUE); +} + +static void check_basic_copy_1_test(void) +{ + check_source_folder_unchanged(); + todo_wine check_file(L"destination\\fileA.a", TRUE); + todo_wine check_file(L"destination\\fileB.b", TRUE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + todo_wine check_folder(L"destination", TRUE); +} + +static void check_basic_copy_2_test(void) +{ + check_source_folder_unchanged(); + check_file(L"destination\\fileA.a", TRUE); + todo_wine check_file(L"destination\\fileB.b", TRUE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + check_folder(L"destination", TRUE); +} + +static void check_no_copy_test(void) +{ + check_source_folder_unchanged(); + check_file(L"destination\\fileA.a", FALSE); + check_file(L"destination\\fileB.b", FALSE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + check_folder(L"destination", FALSE); +} + +static void check_wildcard_1_test(void) +{ + check_source_folder_unchanged(); + todo_wine check_file(L"destination\\fileA.a", TRUE); + check_file(L"destination\\fileB.b", FALSE); + check_file(L"destination\\folderA\\fileC.c", FALSE); + check_file(L"destination\\folderA\\fileD.d", FALSE); + check_file(L"destination\\folderA\\folderD\\fileE.e", FALSE); + check_file(L"destination\\folderB\\fileF.f", FALSE); + check_file(L"destination\\folderB\\fileG.g", FALSE); + check_folder(L"destination\\folderA\\folderD", FALSE); + check_folder(L"destination\\folderA\\folderE", FALSE); + check_folder(L"destination\\folderA", FALSE); + check_folder(L"destination\\folderB", FALSE); + check_folder(L"destination\\folderC", FALSE); + todo_wine check_folder(L"destination", TRUE); +} + +START_TEST(robocopy) +{ + DWORD exit_code; + WCHAR temp_cmd[512]; + int i; + static const WCHAR *invalid_syntax_tests[] = + { + L"robocopy", + L"robocopy invalid_folder", + L"robocopy -flag invalid_folder", + L"robocopy invalid_folder destination", + L"robocopy -?", + L"robocopy invalid_folder -?", + L"robocopy invalid_folder /?", + }; + static const WCHAR *basic_copy_tests[] = + { + L"robocopy source destination /r:1 /w:0", + L"robocopy ./source destination /r:1 /w:0", + L"robocopy source ./destination /r:1 /w:0", + L"robocopy ./source ./destination /r:1 /w:0", + L"robocopy source third_folder/../destination /r:1 /w:0", + L"robocopy ./source third_folder/../destination /r:1 /w:0", + L"robocopy ./third_folder/../source third_folder/../destination /r:1 /w:0", + L"robocopy ./third_folder/../source ./destination /r:1 /w:0", + L"robocopy source destination *le?.? /r:1 /w:0", + L"robocopy source destination file?.? /r:1 /w:0", + L"robocopy source destination ?ile?.* /r:1 /w:0", + L"robocopy source destination f??e* /r:1 /w:0", + L"robocopy source destination file* /r:1 /w:0", + }; + static const WCHAR *absolute_copy_tests[] = + { + L"robocopy %s\\source %s\\destination /r:1 /w:0", + L"robocopy %s\\source destination /r:1 /w:0", + L"robocopy source %s\\destination /r:1 /w:0", + L"robocopy %s\\third_folder\\..\\source %s\\third_folder\\..\\destination /r:1 /w:0", + }; + static const WCHAR *parser_tests[] = + { + L"robocopy source /r:1 destination /r:1 /w:0", + L"robocopy /r:1 source destination /r:1 /w:0", + L"robocopy /r:1 /r:1 source destination /r:1 /w:0", + L"robocopy /r:1 source /r:1 destination /r:1 /w:0", + }; + + /* robocopy is only available from Vista onwards, abort test if not available */ + if (!run_cmd(L"robocopy", &exit_code)) return; + + ok(GetTempPathW(ARRAY_SIZE(temp_path), temp_path) != 0, "couldn't get temp folder path\n"); + wcscat(temp_path, L"robocopy_test\\"); + ok(CreateDirectoryW(temp_path, NULL), "couldn't create temp test folder %s, error %d\n", debugstr_w(temp_path), GetLastError()); + ok(SetCurrentDirectoryW(temp_path), "couldn't set CWD to temp folder %s\n", debugstr_w(temp_path)); + + for (i = 0; i < ARRAY_SIZE(invalid_syntax_tests); i++) + { + run_cmd(invalid_syntax_tests[i], &exit_code); + ok(exit_code == 16, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(invalid_syntax_tests[i])); + } + + for (i = 0; i < ARRAY_SIZE(basic_copy_tests); i++) + { + winetest_push_context("basic copy test %d", i + 1); + create_test_source_folder(); + run_cmd(basic_copy_tests[i], &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(basic_copy_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + winetest_push_context("basic copy test %d", ARRAY_SIZE(basic_copy_tests) + 1); + create_test_source_folder(); + create_test_folder(L"destination"); + create_test_file(L"destination\\fileA.a", 9000); + run_cmd(L"robocopy ./source source/../destination /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d\n", exit_code); + check_basic_copy_2_test(); + winetest_pop_context(); + + for (i = 0; i < ARRAY_SIZE(absolute_copy_tests); i++) + { + winetest_push_context("absolute copy test %d", i + 1); + create_test_source_folder(); + swprintf(temp_cmd, ARRAY_SIZE(temp_cmd), absolute_copy_tests[i], temp_path, temp_path); + run_cmd(temp_cmd, &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(absolute_copy_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(parser_tests); i++) + { + winetest_push_context("parser test %d", i + 1); + create_test_source_folder(); + run_cmd(parser_tests[i], &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d from command %s\n", exit_code, debugstr_w(parser_tests[i])); + check_basic_copy_1_test(); + winetest_pop_context(); + } + + winetest_push_context("invalid copy test 1"); + create_test_source_folder(); + run_cmd(L"robocopy source source /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 0, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("invalid copy test 2"); + create_test_source_folder(); + run_cmd(L"robocopy invalid_folder destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 1"); + create_test_source_folder(); + run_cmd(L"robocopy source destination *A.? /r:1 /w:0", &exit_code); + todo_wine ok(exit_code == 1, "unexpected exit code %d\n", exit_code); + check_wildcard_1_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 2"); + create_test_source_folder(); + run_cmd(L"robocopy sour?e destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + winetest_push_context("wildcard test 3"); + create_test_source_folder(); + run_cmd(L"robocopy s* destination /r:1 /w:0", &exit_code); + ok(exit_code == 16, "unexpected exit code %d\n", exit_code); + check_no_copy_test(); + winetest_pop_context(); + + SetCurrentDirectoryW(L".."); + ok(RemoveDirectoryW(temp_path), "could not remove temp path %s, error %d\n", debugstr_w(temp_path), GetLastError()); +} -- 2.32.0

2 4

[PATCH 1/7] winegstreamer: Set rcSource and rcTarget for WMF video formats.
by Zebediah Figura 02 Nov '21

02 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/quartz_parser.c | 29 +++++++++++++++++------------ dlls/winegstreamer/wm_reader.c | 4 ++-- dlls/wmvcore/tests/wmvcore.c | 4 ++-- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 109ce6ab28f..f11543d7fb2 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -101,7 +101,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format); +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); BOOL init_gstreamer(void) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 4e7e22a64ea..77a186bbb26 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -275,7 +275,7 @@ static unsigned int get_image_size(const struct wg_format *format) return 0; } -static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format *format) +static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { static const struct { @@ -322,6 +322,11 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * memset(video_format, 0, sizeof(*video_format)); + if (wm) + { + SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); + video_format->rcTarget = video_format->rcSource; + } if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) video_format->AvgTimePerFrame = frame_time; video_format->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -343,7 +348,7 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * return true; } -bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) +bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { memset(mt, 0, sizeof(*mt)); @@ -356,7 +361,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format) return amt_from_wg_format_audio(mt, format); case WG_MAJOR_TYPE_VIDEO: - return amt_from_wg_format_video(mt, format); + return amt_from_wg_format_video(mt, format, wm); } assert(0); @@ -1076,7 +1081,7 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, memset(mt, 0, sizeof(AM_MEDIA_TYPE)); - if (amt_from_wg_format(mt, &format)) + if (amt_from_wg_format(mt, &format, false)) { if (!index--) return S_OK; @@ -1086,14 +1091,14 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, if (format.major_type == WG_MAJOR_TYPE_VIDEO && index < ARRAY_SIZE(video_formats)) { format.u.video.format = video_formats[index]; - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } else if (format.major_type == WG_MAJOR_TYPE_AUDIO && !index) { format.u.audio.format = WG_AUDIO_FORMAT_S16LE; - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1613,7 +1618,7 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1628,7 +1633,7 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1699,7 +1704,7 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1714,7 +1719,7 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } @@ -1783,7 +1788,7 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons HRESULT hr; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(&pad_mt, &format)) + if (!amt_from_wg_format(&pad_mt, &format, false)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -1798,7 +1803,7 @@ static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, if (index > 0) return VFW_S_NO_MORE_ITEMS; wg_parser_stream_get_preferred_format(pin->wg_stream, &format); - if (!amt_from_wg_format(mt, &format)) + if (!amt_from_wg_format(mt, &format, false)) return E_OUTOFMEMORY; return S_OK; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 82f74318062..1d46db3fb0d 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -157,7 +157,7 @@ static IWMOutputMediaProps *output_props_create(const struct wg_format *format) object->IWMOutputMediaProps_iface.lpVtbl = &output_props_vtbl; object->refcount = 1; - if (!amt_from_wg_format(&object->mt, format)) + if (!amt_from_wg_format(&object->mt, format, true)) { free(object); return NULL; @@ -338,7 +338,7 @@ static HRESULT WINAPI stream_config_GetStreamType(IWMStreamConfig *iface, GUID * EnterCriticalSection(&reader->cs); - if (!amt_from_wg_format(&mt, &config->stream->format)) + if (!amt_from_wg_format(&mt, &config->stream->format, true)) { LeaveCriticalSection(&reader->cs); return E_OUTOFMEMORY; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6e196234208..469666161a4 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -629,8 +629,8 @@ static void check_video_type(const WM_MEDIA_TYPE *mt) todo_wine ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); - todo_wine ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); - todo_wine ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); + ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); + ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), -- 2.33.0

1 6

[PATCH 1/2] user32/tests: Add ALT+letter hotkey tests.
by Ziqing Hui 02 Nov '21

02 Nov '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/msg.c | 81 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4b2495f4197..73737eab98b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17359,6 +17359,29 @@ static const struct message WmHotkeyNew[] = { { WM_KEYUP, sent, 0, 0x80000001 }, /* lparam not checked so the sequence isn't a todo */ { 0 } }; +static const struct message WmHotkeyPressALT[] = { + { WM_SYSKEYDOWN, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x20000001 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 }, + { 0 } +}; +static const struct message WmHotkeyPressWithALT[] = { + { WM_SYSKEYDOWN, kbd_hook, 0, LLKHF_INJECTED|LLKHF_ALTDOWN }, /* lparam not checked */ + { WM_HOTKEY, sent|wparam, 6 }, + { 0 } +}; +static const struct message WmHotkeyReleaseWithALT[] = { + { WM_SYSKEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|lparam|optional, 0, 0xa0000001 }, + { WM_SYSKEYUP, sent|lparam, 0, 0xa0000001 }, + { 0 } +}; +static const struct message WmHotkeyReleaseALT[] = { + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, + { 0 } +}; static int hotkey_letter; @@ -17378,9 +17401,12 @@ static LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam msg.descr = "KeyboardHookProc"; add_message(&msg); - if (wParam == WM_KEYUP || wParam == WM_KEYDOWN) + if (wParam == WM_KEYUP || wParam == WM_KEYDOWN || + wParam == WM_SYSKEYUP || wParam == WM_SYSKEYDOWN) { - ok(kdbhookstruct->vkCode == VK_LWIN || kdbhookstruct->vkCode == hotkey_letter, + ok(kdbhookstruct->vkCode == VK_LWIN || + kdbhookstruct->vkCode == VK_LMENU || + kdbhookstruct->vkCode == hotkey_letter, "unexpected keycode %x\n", kdbhookstruct->vkCode); } } @@ -17635,6 +17661,56 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); + /* Search for an ALT + letter combination that hasn't been registered */ + for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + { + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 6, MOD_ALT, hotkey_letter); + + if (ret == TRUE) + { + break; + } + else + { + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + } + } + + if (hotkey_letter == 0x52) + { + ok(0, "Couldn't find any free ALT + letter combination\n"); + goto end; + } + + keybd_event(VK_LMENU, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyPressALT, "window hotkey press ALT", TRUE); + + keybd_event(hotkey_letter, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_ALT, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessageA(&msg); + } + ok_sequence(WmHotkeyPressWithALT, "window hotkey press with ALT", TRUE); + + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseWithALT, "window hotkey release with ALT", TRUE); + + keybd_event(VK_LMENU, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseALT, "window hotkey release ALT", FALSE); + /* Unregister thread hotkey */ ret = UnregisterHotKey(NULL, 5); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); @@ -17645,6 +17721,7 @@ static void test_hotkey(void) end: UnregisterHotKey(NULL, 5); UnregisterHotKey(test_window, 5); + UnregisterHotKey(test_window, 6); DestroyWindow(test_window); flush_sequence(); } -- 2.25.1

2 2

[PATCH 6/6] msdasql: Trace unsupported rowset interfaces.
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 5345701a35e..0298c7e7424 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -472,6 +472,21 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index f10156aacfa..8b076ed4479 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -228,6 +228,7 @@ static void test_rowset_interfaces(IRowset *rowset) IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -245,6 +246,15 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsRowset_Release(col_rs); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 5/6] msdasql: Add IColumnsRowset support to rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 55 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f1e4eecb1ac..5345701a35e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -415,6 +415,7 @@ struct msdasql_rowset IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; + IColumnsRowset IColumnsRowset_iface; LONG refs; }; @@ -438,6 +439,11 @@ static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); } +static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -462,6 +468,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IAccessor_iface; } + else if(IsEqualGUID(&IID_IColumnsRowset, riid)) + { + *ppv = &rowset->IColumnsRowset_iface; + } if(*ppv) { @@ -700,6 +710,50 @@ struct IAccessorVtbl accessor_vtbl = rowset_accessor_ReleaseAccessor }; +static HRESULT WINAPI column_rs_QueryInterface(IColumnsRowset *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI column_rs_AddRef(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("%p, %p, %p\n", rowset, count, columns); + return E_NOTIMPL; +} + +static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, + const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **unk_rs) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("(%p)->(%p %ld %p %s %u, %p %p): stub\n", rowset, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, unk_rs); + return E_NOTIMPL; +} + +struct IColumnsRowsetVtbl columnrs_rs_vtbl = +{ + column_rs_QueryInterface, + column_rs_AddRef, + column_rs_Release, + column_rs_GetAvailableColumns, + column_rs_GetColumnsRowset +}; + + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -717,6 +771,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; + msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8acac93ddd8..f10156aacfa 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IColumnsRowset *col_rs; IAccessor *accessor; HRESULT hr; @@ -240,6 +241,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); ok(hr == S_OK, "got 0x%08x\n", hr); IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsRowset_Release(col_rs); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 4/6] msdasql: Add IAccessor to rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 71 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 +++ 2 files changed, 76 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 898cf6fa864..f1e4eecb1ac 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -414,6 +414,7 @@ struct msdasql_rowset IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; + IAccessor IAccessor_iface; LONG refs; }; @@ -432,6 +433,11 @@ static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); } +static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -452,6 +458,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -630,6 +640,66 @@ static struct IColumnsInfoVtbl rowset_columninfo_vtbll = rowset_colsinfo_MapColumnIDs }; +static HRESULT WINAPI rowset_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_accessor_Release(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +struct IAccessorVtbl accessor_vtbl = +{ + rowset_accessor_QueryInterface, + rowset_accessor_AddRef, + rowset_accessor_Release, + rowset_accessor_AddRefAccessor, + rowset_accessor_CreateAccessor, + rowset_accessor_GetBindings, + rowset_accessor_ReleaseAccessor +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -646,6 +716,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; + msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 708d6d22ed3..8acac93ddd8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IAccessor *accessor; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -235,6 +236,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsInfo_Release(col_info); + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); + ok(hr == S_OK, "got 0x%08x\n", hr); + IAccessor_Release(accessor); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0

[PATCH 3/6] msdasql: Support IColumnsInfo in Rowset
by Alistair Leslie-Hughes 02 Nov '21

02 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 56 ++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85b11670687..898cf6fa864 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -413,6 +413,7 @@ struct msdasql_rowset { IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -426,6 +427,11 @@ static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); } +static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -442,6 +448,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowsetInfo_iface; } + else if (IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &rowset->IColumnsInfo_iface; + } if(*ppv) { @@ -547,7 +557,7 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + FIXME("%p, %d, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); return E_NOTIMPL; } @@ -577,6 +587,49 @@ struct IRowsetInfoVtbl rowset_info_vtbl = rowset_info_GetSpecification }; +static HRESULT WINAPI rowset_colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_colsinfo_AddRef(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_colsinfo_Release(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", rowset, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", rowset, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl rowset_columninfo_vtbll = +{ + rowset_colsinfo_QueryInterface, + rowset_colsinfo_AddRef, + rowset_colsinfo_Release, + rowset_colsinfo_GetColumnInfo, + rowset_colsinfo_MapColumnIDs +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -592,6 +645,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; + msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 604815b1ee5..708d6d22ed3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -225,11 +225,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; + IColumnsInfo *col_info; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); IRowsetInfo_Release(info); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(col_info); } static void test_command_rowset(IUnknown *cmd) -- 2.33.0

1 0