June 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : ntdll: Implement NtRenameKey().
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 1fb6f271447bd827148521a913c9aea99b02abc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb6f271447bd827148521a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 22:41:56 2022 +0300 ntdll: Implement NtRenameKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 10 +++--- dlls/ntdll/unix/registry.c | 19 +++++++++-- include/wine/server_protocol.h | 18 +++++++++- server/protocol.def | 7 ++++ server/registry.c | 74 ++++++++++++++++++++++++++++++++++++++++++ server/request.h | 4 +++ server/trace.c | 9 +++++ 7 files changed, 131 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb6f271447bd8271485…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ listview parts.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 5b563c21a9173bea0946a499b999e3c5c11592d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b563c21a9173bea0946a499… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 8 19:14:48 2022 +0800 light.msstyles: Add Vista+ listview parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 27 +++ .../blue_listview_collapse_button_15px.bmp | Bin 0 -> 2838 bytes .../blue_listview_collapse_button_15px.svg | 17 ++ .../blue_listview_collapse_button_19px.bmp | Bin 0 -> 4470 bytes .../blue_listview_collapse_button_19px.svg | 13 ++ .../blue_listview_collapse_button_23px.bmp | Bin 0 -> 6486 bytes .../blue_listview_collapse_button_23px.svg | 11 + .../blue_listview_collapse_button_30px.bmp | Bin 0 -> 10938 bytes .../blue_listview_collapse_button_30px.svg | 17 ++ .../blue_listview_collapse_button_37px.bmp | Bin 0 -> 16566 bytes .../blue_listview_collapse_button_37px.svg | 13 ++ .../blue_listview_collapse_button_45px.bmp | Bin 0 -> 24438 bytes .../blue_listview_collapse_button_45px.svg | 11 + .../blue_listview_collapse_button_60px.bmp | Bin 0 -> 43338 bytes .../blue_listview_collapse_button_60px.svg | 17 ++ .../light.msstyles/blue_listview_column_detail.bmp | Bin 0 -> 146 bytes .../light.msstyles/blue_listview_column_detail.svg | 5 + .../blue_listview_expand_button_15px.bmp | Bin 0 -> 2838 bytes .../blue_listview_expand_button_15px.svg | 17 ++ .../blue_listview_expand_button_19px.bmp | Bin 0 -> 4470 bytes .../blue_listview_expand_button_19px.svg | 13 ++ .../blue_listview_expand_button_23px.bmp | Bin 0 -> 6486 bytes .../blue_listview_expand_button_23px.svg | 11 + .../blue_listview_expand_button_30px.bmp | Bin 0 -> 10938 bytes .../blue_listview_expand_button_30px.svg | 17 ++ .../blue_listview_expand_button_37px.bmp | Bin 0 -> 16566 bytes .../blue_listview_expand_button_37px.svg | 13 ++ .../blue_listview_expand_button_45px.bmp | Bin 0 -> 24438 bytes .../blue_listview_expand_button_45px.svg | 11 + .../blue_listview_expand_button_60px.bmp | Bin 0 -> 43338 bytes .../blue_listview_expand_button_60px.svg | 17 ++ .../blue_listview_group_header_close_hot.bmp | Bin 0 -> 334 bytes .../blue_listview_group_header_close_hot.svg | 4 + ...listview_group_header_close_mixed_selection.bmp | Bin 0 -> 334 bytes ...listview_group_header_close_mixed_selection.svg | 4 + ...view_group_header_close_mixed_selection_hot.bmp | Bin 0 -> 334 bytes ...view_group_header_close_mixed_selection_hot.svg | 4 + .../blue_listview_group_header_close_selected.bmp | Bin 0 -> 334 bytes .../blue_listview_group_header_close_selected.svg | 4 + ...ue_listview_group_header_close_selected_hot.bmp | Bin 0 -> 334 bytes ...ue_listview_group_header_close_selected_hot.svg | 5 + ...iew_group_header_close_selected_not_focused.bmp | Bin 0 -> 334 bytes ...iew_group_header_close_selected_not_focused.svg | 4 + ...group_header_close_selected_not_focused_hot.bmp | Bin 0 -> 334 bytes ...group_header_close_selected_not_focused_hot.svg | 5 + .../blue_listview_group_header_line.bmp | Bin 0 -> 202 bytes .../blue_listview_group_header_line.svg | 9 + .../blue_listview_group_header_open_hot.bmp | Bin 0 -> 334 bytes .../blue_listview_group_header_open_hot.svg | 4 + ...tview_group_header_open_mixed_selection_hot.bmp | Bin 0 -> 334 bytes ...tview_group_header_open_mixed_selection_hot.svg | 4 + ...lue_listview_group_header_open_selected_hot.bmp | Bin 0 -> 334 bytes ...lue_listview_group_header_open_selected_hot.svg | 4 + ..._group_header_open_selected_not_focused_hot.bmp | Bin 0 -> 334 bytes ..._group_header_open_selected_not_focused_hot.svg | 4 + dlls/light.msstyles/light.rc | 242 +++++++++++++++++++++ 56 files changed, 527 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b563c21a9173bea0946…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ menu parts.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 51f488919dd331197501ed377fc22cd6ea152877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f488919dd331197501ed37… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 20 16:29:48 2022 +0800 light.msstyles: Add Vista+ menu parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 52 +++- dlls/light.msstyles/blue_menu_bar_background.bmp | Bin 0 -> 738 bytes dlls/light.msstyles/blue_menu_bar_background.svg | 9 + dlls/light.msstyles/blue_menu_bar_item.bmp | Bin 0 -> 2082 bytes dlls/light.msstyles/blue_menu_bar_item.svg | 15 + dlls/light.msstyles/blue_menu_popup_background.bmp | Bin 0 -> 142 bytes dlls/light.msstyles/blue_menu_popup_background.svg | 6 + dlls/light.msstyles/blue_menu_popup_borders.bmp | Bin 0 -> 174 bytes dlls/light.msstyles/blue_menu_popup_borders.svg | 14 + dlls/light.msstyles/blue_menu_popup_check_16px.bmp | Bin 4234 -> 4234 bytes dlls/light.msstyles/blue_menu_popup_check_16px.svg | 8 +- dlls/light.msstyles/blue_menu_popup_check_18px.bmp | Bin 5322 -> 5322 bytes dlls/light.msstyles/blue_menu_popup_check_18px.svg | 10 +- dlls/light.msstyles/blue_menu_popup_check_25px.bmp | Bin 0 -> 10138 bytes dlls/light.msstyles/blue_menu_popup_check_25px.svg | 9 + dlls/light.msstyles/blue_menu_popup_check_32px.bmp | Bin 0 -> 16522 bytes dlls/light.msstyles/blue_menu_popup_check_32px.svg | 9 + dlls/light.msstyles/blue_menu_popup_check_40px.bmp | Bin 0 -> 25738 bytes dlls/light.msstyles/blue_menu_popup_check_40px.svg | 9 + dlls/light.msstyles/blue_menu_popup_check_48px.bmp | Bin 0 -> 37002 bytes dlls/light.msstyles/blue_menu_popup_check_48px.svg | 9 + dlls/light.msstyles/blue_menu_popup_check_64px.bmp | Bin 0 -> 65674 bytes dlls/light.msstyles/blue_menu_popup_check_64px.svg | 7 + .../blue_menu_popup_check_background.bmp | Bin 0 -> 726 bytes .../blue_menu_popup_check_background.svg | 5 + dlls/light.msstyles/blue_menu_popup_gutter.bmp | Bin 0 -> 150 bytes dlls/light.msstyles/blue_menu_popup_gutter.svg | 4 + dlls/light.msstyles/blue_menu_popup_item.bmp | Bin 0 -> 922 bytes dlls/light.msstyles/blue_menu_popup_item.svg | 5 + dlls/light.msstyles/blue_menu_popup_separator.bmp | Bin 162 -> 158 bytes dlls/light.msstyles/blue_menu_popup_separator.svg | 5 +- .../blue_menu_popup_submenu_11px.bmp | Bin 0 -> 1106 bytes .../blue_menu_popup_submenu_11px.svg | 9 + .../blue_menu_popup_submenu_14px.bmp | Bin 0 -> 1650 bytes .../blue_menu_popup_submenu_14px.svg | 9 + .../blue_menu_popup_submenu_18px.bmp | Bin 0 -> 2730 bytes .../blue_menu_popup_submenu_18px.svg | 9 + .../blue_menu_popup_submenu_23px.bmp | Bin 0 -> 4370 bytes .../blue_menu_popup_submenu_23px.svg | 7 + .../blue_menu_popup_submenu_27px.bmp | Bin 0 -> 5970 bytes .../blue_menu_popup_submenu_27px.svg | 9 + .../blue_menu_popup_submenu_36px.bmp | Bin 0 -> 10506 bytes .../blue_menu_popup_submenu_36px.svg | 9 + ...submenu.bmp => blue_menu_popup_submenu_9px.bmp} | Bin 786 -> 786 bytes ...submenu.svg => blue_menu_popup_submenu_9px.svg} | 4 +- dlls/light.msstyles/blue_menu_system_close.bmp | Bin 1018 -> 0 bytes dlls/light.msstyles/blue_menu_system_close.svg | 5 - .../light.msstyles/blue_menu_system_close_11px.bmp | Bin 0 -> 1018 bytes .../light.msstyles/blue_menu_system_close_11px.svg | 5 + .../light.msstyles/blue_menu_system_close_14px.bmp | Bin 0 -> 1594 bytes .../light.msstyles/blue_menu_system_close_14px.svg | 5 + .../light.msstyles/blue_menu_system_close_17px.bmp | Bin 0 -> 2178 bytes .../light.msstyles/blue_menu_system_close_17px.svg | 5 + .../light.msstyles/blue_menu_system_close_22px.bmp | Bin 0 -> 3658 bytes .../light.msstyles/blue_menu_system_close_22px.svg | 5 + .../light.msstyles/blue_menu_system_close_28px.bmp | Bin 0 -> 5962 bytes .../light.msstyles/blue_menu_system_close_28px.svg | 5 + .../light.msstyles/blue_menu_system_close_34px.bmp | Bin 0 -> 8298 bytes .../light.msstyles/blue_menu_system_close_34px.svg | 5 + .../light.msstyles/blue_menu_system_close_44px.bmp | Bin 0 -> 14218 bytes .../light.msstyles/blue_menu_system_close_44px.svg | 5 + ...mize.bmp => blue_menu_system_maximize_11px.bmp} | Bin 1018 -> 1018 bytes ...mize.svg => blue_menu_system_maximize_11px.svg} | 4 +- .../blue_menu_system_maximize_14px.bmp | Bin 0 -> 1594 bytes .../blue_menu_system_maximize_14px.svg | 5 + .../blue_menu_system_maximize_17px.bmp | Bin 0 -> 2178 bytes .../blue_menu_system_maximize_17px.svg | 5 + .../blue_menu_system_maximize_22px.bmp | Bin 0 -> 3658 bytes .../blue_menu_system_maximize_22px.svg | 5 + .../blue_menu_system_maximize_28px.bmp | Bin 0 -> 5962 bytes .../blue_menu_system_maximize_28px.svg | 5 + .../blue_menu_system_maximize_34px.bmp | Bin 0 -> 8298 bytes .../blue_menu_system_maximize_34px.svg | 5 + .../blue_menu_system_maximize_44px.bmp | Bin 0 -> 14218 bytes .../blue_menu_system_maximize_44px.svg | 5 + ...mize.bmp => blue_menu_system_minimize_11px.bmp} | Bin ...mize.svg => blue_menu_system_minimize_11px.svg} | 0 .../blue_menu_system_minimize_14px.bmp | Bin 0 -> 1594 bytes .../blue_menu_system_minimize_14px.svg | 5 + .../blue_menu_system_minimize_17px.bmp | Bin 0 -> 2178 bytes .../blue_menu_system_minimize_17px.svg | 5 + .../blue_menu_system_minimize_22px.bmp | Bin 0 -> 3658 bytes .../blue_menu_system_minimize_22px.svg | 5 + .../blue_menu_system_minimize_28px.bmp | Bin 0 -> 5962 bytes .../blue_menu_system_minimize_28px.svg | 5 + .../blue_menu_system_minimize_34px.bmp | Bin 0 -> 8298 bytes .../blue_menu_system_minimize_34px.svg | 5 + .../blue_menu_system_minimize_44px.bmp | Bin 0 -> 14218 bytes .../blue_menu_system_minimize_44px.svg | 5 + ...store.bmp => blue_menu_system_restore_11px.bmp} | Bin 1018 -> 1018 bytes ...store.svg => blue_menu_system_restore_11px.svg} | 8 +- .../blue_menu_system_restore_14px.bmp | Bin 0 -> 1594 bytes .../blue_menu_system_restore_14px.svg | 13 + .../blue_menu_system_restore_17px.bmp | Bin 0 -> 2178 bytes .../blue_menu_system_restore_17px.svg | 11 + .../blue_menu_system_restore_22px.bmp | Bin 0 -> 3658 bytes .../blue_menu_system_restore_22px.svg | 11 + .../blue_menu_system_restore_28px.bmp | Bin 0 -> 5962 bytes .../blue_menu_system_restore_28px.svg | 11 + .../blue_menu_system_restore_34px.bmp | Bin 0 -> 8298 bytes .../blue_menu_system_restore_34px.svg | 11 + .../blue_menu_system_restore_44px.bmp | Bin 0 -> 14218 bytes .../blue_menu_system_restore_44px.svg | 11 + dlls/light.msstyles/light.rc | 325 +++++++++++++++++---- 104 files changed, 650 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51f488919dd331197501…

1 0

Zhiyi Zhang : light.msstyles: Add navigation class.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 9b3b64de8570f577f489a8d55b7019ef268c010b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3b64de8570f577f489a8d5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 21 23:27:20 2022 +0800 light.msstyles: Add navigation class. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 21 ++++ .../blue_navigation_back_button_120px.bmp | Bin 0 -> 230538 bytes .../blue_navigation_back_button_120px.svg | 17 +++ .../blue_navigation_back_button_30px.bmp | Bin 0 -> 14538 bytes .../blue_navigation_back_button_30px.svg | 17 +++ .../blue_navigation_back_button_38px.bmp | Bin 0 -> 23242 bytes .../blue_navigation_back_button_38px.svg | 17 +++ .../blue_navigation_back_button_45px.bmp | Bin 0 -> 32538 bytes .../blue_navigation_back_button_45px.svg | 17 +++ .../blue_navigation_back_button_60px.bmp | Bin 0 -> 57738 bytes .../blue_navigation_back_button_60px.svg | 17 +++ .../blue_navigation_back_button_74px.bmp | Bin 0 -> 87754 bytes .../blue_navigation_back_button_74px.svg | 17 +++ .../blue_navigation_back_button_90px.bmp | Bin 0 -> 129738 bytes .../blue_navigation_back_button_90px.svg | 17 +++ .../blue_navigation_forward_button_120px.bmp | Bin 0 -> 230538 bytes .../blue_navigation_forward_button_120px.svg | 17 +++ .../blue_navigation_forward_button_30px.bmp | Bin 0 -> 14538 bytes .../blue_navigation_forward_button_30px.svg | 17 +++ .../blue_navigation_forward_button_38px.bmp | Bin 0 -> 23242 bytes .../blue_navigation_forward_button_38px.svg | 17 +++ .../blue_navigation_forward_button_45px.bmp | Bin 0 -> 32538 bytes .../blue_navigation_forward_button_45px.svg | 17 +++ .../blue_navigation_forward_button_60px.bmp | Bin 0 -> 57738 bytes .../blue_navigation_forward_button_60px.svg | 17 +++ .../blue_navigation_forward_button_74px.bmp | Bin 0 -> 87754 bytes .../blue_navigation_forward_button_74px.svg | 17 +++ .../blue_navigation_forward_button_90px.bmp | Bin 0 -> 129738 bytes .../blue_navigation_forward_button_90px.svg | 17 +++ .../blue_navigation_menu_button_13px.bmp | Bin 0 -> 5754 bytes .../blue_navigation_menu_button_13px.svg | 25 ++++ .../blue_navigation_menu_button_17px.bmp | Bin 0 -> 9386 bytes .../blue_navigation_menu_button_17px.svg | 23 ++++ .../blue_navigation_menu_button_19px.bmp | Bin 0 -> 12298 bytes .../blue_navigation_menu_button_19px.svg | 23 ++++ .../blue_navigation_menu_button_26px.bmp | Bin 0 -> 22602 bytes .../blue_navigation_menu_button_26px.svg | 23 ++++ .../blue_navigation_menu_button_32px.bmp | Bin 0 -> 34442 bytes .../blue_navigation_menu_button_32px.svg | 23 ++++ .../blue_navigation_menu_button_39px.bmp | Bin 0 -> 50682 bytes .../blue_navigation_menu_button_39px.svg | 23 ++++ .../blue_navigation_menu_button_52px.bmp | Bin 0 -> 89994 bytes .../blue_navigation_menu_button_52px.svg | 23 ++++ dlls/light.msstyles/light.rc | 138 +++++++++++++++++++++ 44 files changed, 560 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b3b64de8570f577f489…

1 0

Nikolay Sivov : advapi32/tests: Add some tests for RegRenameKey().
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 440d37172d7c4ee299f4df54448322e57a19ff76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440d37172d7c4ee299f4df54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 20:31:08 2022 +0300 advapi32/tests: Add some tests for RegRenameKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 73 ++++++++++++++++++++++++++++++++++++++++++ include/winreg.h | 1 + 2 files changed, 74 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6152a313803..c2e78192f2e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4475,6 +4475,78 @@ static void test_EnumDynamicTimeZoneInformation(void) RegCloseKey(key); } +static void test_RegRenameKey(void) +{ + HKEY key, key2; + LSTATUS ret; + + ret = RegRenameKey(NULL, NULL, NULL); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(NULL, NULL, L"newname"); + todo_wine + ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(NULL, L"oldname", NULL); + todo_wine + ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(NULL, L"oldname", L"newname"); + todo_wine + ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); + + ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_READ, NULL, &key, NULL); + ok(!ret, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); + todo_wine + ok(ret == ERROR_ACCESS_DENIED, "Unexpected return value %ld.\n", ret); + RegCloseKey(key); + + /* Rename itself. */ + ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); + ok(!ret, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(key, NULL, NULL); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); + todo_wine + ok(!ret, "Unexpected return value %ld.\n", ret); + RegCloseKey(key); + + ret = RegDeleteKeyA(hkey_main, "TestNewRenameKey"); + todo_wine + ok(!ret, "Unexpected return value %ld.\n", ret); + ret = RegDeleteKeyA(hkey_main, "TestRenameKey"); + todo_wine + ok(ret, "Unexpected return value %ld.\n", ret); + + /* Subkey does not exist. */ + ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); + ok(!ret, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(key, L"unknown_subkey", NULL); + todo_wine + ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); + ret = RegRenameKey(key, L"unknown_subkey", L"known_subkey"); + todo_wine + ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); + + /* Rename existing subkey. */ + ret = RegCreateKeyExA(key, "known_subkey", 0, NULL, 0, KEY_WRITE, NULL, &key2, NULL); + ok(!ret, "Unexpected return value %ld.\n", ret); + RegCloseKey(key2); + + ret = RegRenameKey(key, L"known_subkey", L"renamed_subkey"); + todo_wine + ok(!ret, "Unexpected return value %ld.\n", ret); + + ret = RegDeleteKeyA(key, "renamed_subkey"); + todo_wine + ok(!ret, "Unexpected return value %ld.\n", ret); + ret = RegDeleteKeyA(key, "known_subkey"); + todo_wine + ok(ret, "Unexpected return value %ld.\n", ret); + + RegCloseKey(key); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -4514,6 +4586,7 @@ START_TEST(registry) test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); test_perflib_key(); + test_RegRenameKey(); /* cleanup */ delete_key( hkey_main ); diff --git a/include/winreg.h b/include/winreg.h index 00bc8c02dc8..da92fb11f94 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -178,6 +178,7 @@ WINADVAPI LSTATUS WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG); WINADVAPI LSTATUS WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); WINADVAPI LSTATUS WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); #define RegQueryValueEx WINELIB_NAME_AW(RegQueryValueEx) +WINADVAPI LSTATUS WINAPI RegRenameKey(HKEY,LPCWSTR,LPCWSTR); WINADVAPI LSTATUS WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR); WINADVAPI LSTATUS WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR); #define RegReplaceKey WINELIB_NAME_AW(RegReplaceKey)

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ spin parts.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 8e12b359f71249acca006780f72e70d021cb9b33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e12b359f71249acca006780… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 13 20:49:47 2022 +0800 light.msstyles: Add Vista+ spin parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 33 +++- dlls/light.msstyles/blue_spin_background.bmp | Bin 446 -> 0 bytes dlls/light.msstyles/blue_spin_background.svg | 16 -- dlls/light.msstyles/blue_spin_glyph_down.bmp | Bin 810 -> 0 bytes dlls/light.msstyles/blue_spin_glyph_down.svg | 24 --- dlls/light.msstyles/blue_spin_glyph_down_11px.bmp | Bin 0 -> 1722 bytes dlls/light.msstyles/blue_spin_glyph_down_11px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_down_14px.bmp | Bin 0 -> 2826 bytes dlls/light.msstyles/blue_spin_glyph_down_14px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_down_18px.bmp | Bin 0 -> 4458 bytes dlls/light.msstyles/blue_spin_glyph_down_18px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_down_21px.bmp | Bin 0 -> 6186 bytes dlls/light.msstyles/blue_spin_glyph_down_21px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_down_28px.bmp | Bin 0 -> 10890 bytes dlls/light.msstyles/blue_spin_glyph_down_28px.svg | 23 +++ .../light.msstyles/blue_spin_glyph_down_7x16px.bmp | Bin 0 -> 586 bytes .../light.msstyles/blue_spin_glyph_down_7x16px.svg | 21 +++ .../light.msstyles/blue_spin_glyph_down_7x24px.bmp | Bin 0 -> 810 bytes .../light.msstyles/blue_spin_glyph_down_7x24px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left.bmp | Bin 810 -> 0 bytes dlls/light.msstyles/blue_spin_glyph_left.svg | 24 --- dlls/light.msstyles/blue_spin_glyph_left_12px.bmp | Bin 0 -> 2826 bytes dlls/light.msstyles/blue_spin_glyph_left_12px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_15px.bmp | Bin 0 -> 3978 bytes dlls/light.msstyles/blue_spin_glyph_left_15px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_18px.bmp | Bin 0 -> 6186 bytes dlls/light.msstyles/blue_spin_glyph_left_18px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_24px.bmp | Bin 0 -> 10890 bytes dlls/light.msstyles/blue_spin_glyph_left_24px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_4px.bmp | Bin 0 -> 586 bytes dlls/light.msstyles/blue_spin_glyph_left_4px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_6px.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_left_6px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_left_9px.bmp | Bin 0 -> 1722 bytes dlls/light.msstyles/blue_spin_glyph_left_9px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right.bmp | Bin 810 -> 0 bytes dlls/light.msstyles/blue_spin_glyph_right.svg | 24 --- dlls/light.msstyles/blue_spin_glyph_right_12px.bmp | Bin 0 -> 2826 bytes dlls/light.msstyles/blue_spin_glyph_right_12px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_15px.bmp | Bin 0 -> 3978 bytes dlls/light.msstyles/blue_spin_glyph_right_15px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_18px.bmp | Bin 0 -> 6186 bytes dlls/light.msstyles/blue_spin_glyph_right_18px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_24px.bmp | Bin 0 -> 10890 bytes dlls/light.msstyles/blue_spin_glyph_right_24px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_4px.bmp | Bin 0 -> 586 bytes dlls/light.msstyles/blue_spin_glyph_right_4px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_6px.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_right_6px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_right_9px.bmp | Bin 0 -> 1722 bytes dlls/light.msstyles/blue_spin_glyph_right_9px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up.bmp | Bin 810 -> 0 bytes dlls/light.msstyles/blue_spin_glyph_up.svg | 24 --- dlls/light.msstyles/blue_spin_glyph_up_11px.bmp | Bin 0 -> 1722 bytes dlls/light.msstyles/blue_spin_glyph_up_11px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_14px.bmp | Bin 0 -> 2826 bytes dlls/light.msstyles/blue_spin_glyph_up_14px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_18px.bmp | Bin 0 -> 4458 bytes dlls/light.msstyles/blue_spin_glyph_up_18px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_21px.bmp | Bin 0 -> 6186 bytes dlls/light.msstyles/blue_spin_glyph_up_21px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_28px.bmp | Bin 0 -> 10890 bytes dlls/light.msstyles/blue_spin_glyph_up_28px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_7x20px.bmp | Bin 0 -> 698 bytes dlls/light.msstyles/blue_spin_glyph_up_7x20px.svg | 21 +++ dlls/light.msstyles/blue_spin_glyph_up_7x24px.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_up_7x24px.svg | 21 +++ dlls/light.msstyles/light.rc | 179 ++++++++++++++++++--- 68 files changed, 772 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e12b359f71249acca00…

1 0

Nikolay Sivov : ntdll/tests: Add some tests for NtRenameKey().
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 4bd160da5e7ce759ef25a6581f167ec10a4f0fb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd160da5e7ce759ef25a658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 19:54:32 2022 +0300 ntdll/tests: Add some tests for NtRenameKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..b0cbf137086 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2115,6 +2115,74 @@ static void test_RtlCreateRegistryKey(void) pRtlFreeUnicodeString(&str); } +static void test_NtRenameKey(void) +{ + KEY_NAME_INFORMATION *info = NULL; + UNICODE_STRING str, str2; + OBJECT_ATTRIBUTES attr; + HANDLE key, subkey; + char buffer[200]; + NTSTATUS status; + DWORD size; + + status = NtRenameKey(NULL, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#lx.\n", status); + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtCreateKey(&key, KEY_READ|DELETE, &attr, 0, 0, 0, 0); + ok(!status, "Unexpected status %#lx.\n", status); + + attr.RootDirectory = key; + attr.ObjectName = &str; + + pRtlCreateUnicodeStringFromAsciiz(&str, "rename_subkey"); + status = pNtCreateKey(&subkey, KEY_READ|DELETE, &attr, 0, 0, 0, 0); + ok(!status, "Unexpected status %#lx.\n", status); + + pRtlCreateUnicodeStringFromAsciiz(&str2, "renamed_subkey"); + + status = NtRenameKey(subkey, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#lx.\n", status); + status = NtRenameKey(NULL, &str); + todo_wine + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status); + + status = NtRenameKey(subkey, &str2); + todo_wine + ok(status == STATUS_ACCESS_DENIED, "Unexpected status %#lx.\n", status); + pNtClose(subkey); + + status = pNtCreateKey(&subkey, KEY_WRITE|DELETE, &attr, 0, 0, 0, 0); + ok(!status, "Unexpected status %#lx.\n", status); + /* Rename to itself. */ + status = NtRenameKey(subkey, &str); + todo_wine + ok(status == STATUS_CANNOT_DELETE, "Unexpected status %#lx.\n", status); + status = NtRenameKey(subkey, &str2); + todo_wine + ok(!status, "Unexpected status %#lx.\n", status); + + pRtlFreeUnicodeString(&str2); + pRtlFreeUnicodeString(&str); + + info = (KEY_NAME_INFORMATION *)buffer; + status = pNtQueryKey(subkey, KeyNameInformation, info, sizeof(buffer), &size); + todo_wine + ok(!status, "Unexpected status %#lx.\n", status); + if (status == STATUS_SUCCESS) + { + info->Name[info->NameLength/sizeof(WCHAR)] = 0; + ok(!!wcsstr(info->Name, L"renamed_subkey"), "Unexpected subkey name %s.\n", wine_dbgstr_w(info->Name)); + } + + pNtDeleteKey(subkey); + pNtDeleteKey(key); + pNtClose(subkey); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -2144,6 +2212,7 @@ START_TEST(reg) test_NtDeleteKey(); test_symlinks(); test_redirection(); + test_NtRenameKey(); pRtlFreeUnicodeString(&winetestpath);

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ scrollbar parts.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 4cb229a97c1cf6d430a99f3b976064aa10ff3d96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb229a97c1cf6d430a99f3b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 17:22:09 2022 +0800 light.msstyles: Add Vista+ scrollbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 32 ++- .../blue_scrollbar_arrow_glyphs_13px.bmp | Bin 0 -> 13658 bytes .../blue_scrollbar_arrow_glyphs_13px.svg | 67 ++++++ .../blue_scrollbar_arrow_glyphs_16px.bmp | Bin 0 -> 20618 bytes .../blue_scrollbar_arrow_glyphs_16px.svg | 71 +++++++ .../blue_scrollbar_arrow_glyphs_20px.bmp | Bin 0 -> 32138 bytes .../blue_scrollbar_arrow_glyphs_20px.svg | 85 ++++++++ .../blue_scrollbar_arrow_glyphs_26px.bmp | Bin 0 -> 54218 bytes .../blue_scrollbar_arrow_glyphs_26px.svg | 67 ++++++ .../blue_scrollbar_arrow_glyphs_32px.bmp | Bin 0 -> 82058 bytes .../blue_scrollbar_arrow_glyphs_32px.svg | 75 +++++++ .../blue_scrollbar_arrow_glyphs_39px.bmp | Bin 0 -> 121818 bytes .../blue_scrollbar_arrow_glyphs_39px.svg | 67 ++++++ .../blue_scrollbar_arrow_glyphs_52px.bmp | Bin 0 -> 216458 bytes .../blue_scrollbar_arrow_glyphs_52px.svg | 69 ++++++ .../blue_scrollbar_arrow_glyphs_7px.bmp | Bin 3274 -> 0 bytes .../blue_scrollbar_arrow_glyphs_7px.svg | 54 ----- .../blue_scrollbar_arrow_glyphs_9px.bmp | Bin 5322 -> 0 bytes .../blue_scrollbar_arrow_glyphs_9px.svg | 54 ----- dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 14282 -> 17818 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 17 +- .../blue_scrollbar_gripper_horizontal_10px.bmp | Bin 0 -> 1938 bytes .../blue_scrollbar_gripper_horizontal_10px.svg | 2 + .../blue_scrollbar_gripper_horizontal_12px.bmp | Bin 0 -> 2778 bytes .../blue_scrollbar_gripper_horizontal_12px.svg | 2 + ... => blue_scrollbar_gripper_horizontal_16px.bmp} | Bin 6410 -> 4618 bytes .../blue_scrollbar_gripper_horizontal_16px.svg | 2 + .../blue_scrollbar_gripper_horizontal_20px.bmp | Bin 0 -> 7338 bytes .../blue_scrollbar_gripper_horizontal_20px.svg | 2 + .../blue_scrollbar_gripper_horizontal_25px.bmp | Bin 0 -> 11338 bytes .../blue_scrollbar_gripper_horizontal_25px.svg | 2 + .../blue_scrollbar_gripper_horizontal_30px.bmp | Bin 0 -> 16338 bytes .../blue_scrollbar_gripper_horizontal_30px.svg | 2 + .../blue_scrollbar_gripper_horizontal_40px.bmp | Bin 0 -> 28938 bytes .../blue_scrollbar_gripper_horizontal_40px.svg | 2 + .../blue_scrollbar_gripper_vertical_11px.bmp | Bin 0 -> 2778 bytes .../blue_scrollbar_gripper_vertical_11px.svg | 2 + .../blue_scrollbar_gripper_vertical_14px.bmp | Bin 0 -> 4618 bytes .../blue_scrollbar_gripper_vertical_14px.svg | 2 + ...mp => blue_scrollbar_gripper_vertical_22px.bmp} | Bin 10506 -> 11138 bytes .../blue_scrollbar_gripper_vertical_22px.svg | 2 + .../blue_scrollbar_gripper_vertical_27px.bmp | Bin 0 -> 16338 bytes .../blue_scrollbar_gripper_vertical_27px.svg | 2 + .../blue_scrollbar_gripper_vertical_36px.bmp | Bin 0 -> 28938 bytes .../blue_scrollbar_gripper_vertical_36px.svg | 2 + .../blue_scrollbar_gripper_vertical_9px.bmp | Bin 0 -> 1938 bytes .../blue_scrollbar_gripper_vertical_9px.svg | 2 + .../blue_scrollbar_lower_track_horizontal.bmp | Bin 0 -> 298 bytes ...g => blue_scrollbar_lower_track_horizontal.svg} | 5 +- ...bmp => blue_scrollbar_lower_track_vertical.bmp} | Bin 490 -> 358 bytes ...svg => blue_scrollbar_lower_track_vertical.svg} | 5 +- .../blue_scrollbar_resizebox_grip_16px.bmp | Bin 2186 -> 8330 bytes .../blue_scrollbar_resizebox_grip_16px.svg | 63 ++++-- .../blue_scrollbar_resizebox_grip_20px.bmp | Bin 3338 -> 12938 bytes .../blue_scrollbar_resizebox_grip_20px.svg | 63 ++++-- .../blue_scrollbar_resizebox_grip_24px.bmp | Bin 4746 -> 18570 bytes .../blue_scrollbar_resizebox_grip_24px.svg | 61 ++++-- .../blue_scrollbar_resizebox_grip_28px.svg | 26 --- .../blue_scrollbar_resizebox_grip_32px.bmp | Bin 8330 -> 32906 bytes .../blue_scrollbar_resizebox_grip_32px.svg | 63 ++++-- .../blue_scrollbar_resizebox_grip_36px.svg | 26 --- .../blue_scrollbar_resizebox_grip_40px.bmp | Bin 12938 -> 51338 bytes .../blue_scrollbar_resizebox_grip_40px.svg | 63 ++++-- .../blue_scrollbar_resizebox_grip_48px.bmp | Bin 0 -> 73866 bytes .../blue_scrollbar_resizebox_grip_48px.svg | 69 ++++++ .../blue_scrollbar_resizebox_grip_64px.bmp | Bin 0 -> 131210 bytes .../blue_scrollbar_resizebox_grip_64px.svg | 61 ++++++ .../blue_scrollbar_shaft_horizontal.bmp | Bin 394 -> 0 bytes .../blue_scrollbar_thumb_horizontal.bmp | Bin 4762 -> 5238 bytes .../blue_scrollbar_thumb_horizontal.svg | 18 +- .../blue_scrollbar_thumb_vertical.bmp | Bin 4714 -> 2998 bytes .../blue_scrollbar_thumb_vertical.svg | 14 +- .../blue_scrollbar_upper_track_horizontal.bmp | Bin 0 -> 298 bytes .../blue_scrollbar_upper_track_horizontal.svg | 12 ++ .../blue_scrollbar_upper_track_vertical.bmp | Bin 0 -> 358 bytes .../blue_scrollbar_upper_track_vertical.svg | 12 ++ dlls/light.msstyles/light.rc | 234 +++++++++++++++------ 77 files changed, 1157 insertions(+), 322 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4cb229a97c1cf6d430a9…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ rebar parts.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 7110384741a232d4c794d58e9d1a5acb13643734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7110384741a232d4c794d58e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 9 11:54:17 2022 +0800 light.msstyles: Add Vista+ rebar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 15 +++- dlls/light.msstyles/blue_rebar_chevron.bmp | Bin 2298 -> 0 bytes dlls/light.msstyles/blue_rebar_chevron.svg | 28 ------ .../blue_rebar_chevron_background.bmp | Bin 0 -> 5382 bytes .../blue_rebar_chevron_background.svg | 15 ++++ .../blue_rebar_chevron_glyph_10px.bmp | Bin 0 -> 1218 bytes .../blue_rebar_chevron_glyph_10px.svg | 29 ++++++ .../blue_rebar_chevron_glyph_13px.bmp | Bin 0 -> 1854 bytes .../blue_rebar_chevron_glyph_13px.svg | 31 +++++++ .../blue_rebar_chevron_glyph_15px.bmp | Bin 0 -> 2658 bytes .../blue_rebar_chevron_glyph_15px.svg | 29 ++++++ .../blue_rebar_chevron_glyph_20px.bmp | Bin 0 -> 4458 bytes .../blue_rebar_chevron_glyph_20px.svg | 29 ++++++ .../blue_rebar_chevron_glyph_25px.bmp | Bin 0 -> 6738 bytes .../blue_rebar_chevron_glyph_25px.svg | 29 ++++++ .../blue_rebar_chevron_glyph_30px.bmp | Bin 0 -> 9858 bytes .../blue_rebar_chevron_glyph_30px.svg | 29 ++++++ .../blue_rebar_chevron_glyph_40px.bmp | Bin 0 -> 17418 bytes .../blue_rebar_chevron_glyph_40px.svg | 29 ++++++ .../blue_rebar_chevron_vertical_background.bmp | Bin 0 -> 5382 bytes .../blue_rebar_chevron_vertical_background.svg | 15 ++++ .../blue_rebar_chevron_vertical_glyph_10px.bmp | Bin 0 -> 1218 bytes .../blue_rebar_chevron_vertical_glyph_10px.svg | 29 ++++++ .../blue_rebar_chevron_vertical_glyph_13px.bmp | Bin 0 -> 1854 bytes .../blue_rebar_chevron_vertical_glyph_13px.svg | 31 +++++++ .../blue_rebar_chevron_vertical_glyph_15px.bmp | Bin 0 -> 2658 bytes .../blue_rebar_chevron_vertical_glyph_15px.svg | 29 ++++++ dlls/light.msstyles/blue_rebar_splitter.bmp | Bin 0 -> 246 bytes dlls/light.msstyles/blue_rebar_splitter.svg | 15 ++++ .../blue_rebar_splitter_vertical.bmp | Bin 0 -> 246 bytes .../blue_rebar_splitter_vertical.svg | 15 ++++ dlls/light.msstyles/light.rc | 97 ++++++++++++++++++--- 32 files changed, 453 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7110384741a232d4c794…

1 0

Giovanni Mascellani : mfplat/tests: Use a more unique pattern when testing image formats.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 496073d5062e8f286649696fe99d2e7c1460a35d URL: https://source.winehq.org/git/wine.git/?a=commit;h=496073d5062e8f286649696f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:48:04 2022 +0200 mfplat/tests: Use a more unique pattern when testing image formats. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 82 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6ad667a7404..f09ae368ccc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5994,7 +5994,48 @@ static void test_MFCreate2DMediaBuffer(void) ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %lu for %u x %u, format %s.\n", i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - memset(data, 0xff, length2); + hr = pMFGetStrideForBitmapInfoHeader(ptr->fourcc, ptr->width, &stride); + ok(hr == S_OK, "Failed to get stride, hr %#lx.\n", hr); + stride = abs(stride); + + /* primary plane */ + ok(ptr->height * stride <= length2, "Insufficient buffer space: expected at least %lu bytes, got only %lu\n", + ptr->height * stride, length2); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride; k++) + data[j * stride + k] = ((j % 16) << 4) + (k % 16); + + data += ptr->height * stride; + + /* secondary planes */ + switch (ptr->fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + ok(2 * ptr->height * stride <= length2, "Insufficient buffer space: expected at least %lu bytes, got only %lu\n", + 2 * ptr->height * stride, length2); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride / 2; k++) + data[j * stride + k] = (((j + ptr->height) % 16) << 4) + (k % 16); + break; + + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + ok(stride * 3 / 2 * ptr->height <= length2, "Insufficient buffer space: expected at least %lu bytes, got only %lu\n", + stride * 3 / 2 * ptr->height, length2); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride / 2; k++) + data[j * (stride / 2) + k] = (((j + ptr->height) % 16) << 4) + (k % 16); + break; + + case MAKEFOURCC('N','V','1','2'): + ok(stride * ptr->height * 3 / 2 <= length2, "Insufficient buffer space: expected at least %lu bytes, got only %lu\n", + stride * ptr->height * 3 / 2, length2); + for (j = 0; j < ptr->height / 2; j++) + for (k = 0; k < stride; k++) + data[j * stride + k] = (((j + ptr->height) % 16) << 4) + (k % 16); + break; + } hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); @@ -6008,37 +6049,42 @@ static void test_MFCreate2DMediaBuffer(void) ok(pitch == pitch2, "Unexpected pitch.\n"); /* primary plane */ - for(j = 0; j < ptr->height; j++) - for (k = 0; k < ptr->width; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride; k++) + ok(data[j * pitch + k] == ((j % 16) << 4) + (k % 16), + "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", + data[j * pitch + k], ((j % 16) << 4) + (k % 16), i, j, k); - hr = pMFGetStrideForBitmapInfoHeader(ptr->fourcc, ptr->width, &stride); - ok(hr == S_OK, "Failed to get stride, hr %#lx.\n", hr); + data += ptr->height * pitch; /* secondary planes */ switch (ptr->fourcc) { case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): - for (j = ptr->height; j < length2 / stride; j++) - for (k = 0; k < ptr->width / 2; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride / 2; k++) + ok(data[j * pitch + k] == (((j + ptr->height) % 16) << 4) + (k % 16), + "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", + data[j * pitch + k], (((j + ptr->height) % 16) << 4) + (k % 16), i, j + ptr->height, k); break; case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): - for (j = ptr->height; j < length2 / stride; j++) - for (k = 0; k < ptr->width / 2; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); - for (j = ptr->height; j < length2 / stride; j++) - for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = 0; j < ptr->height; j++) + for (k = 0; k < stride / 2; k++) + todo_wine_if(ptr->height % 2 == 1 && j >= 2) + ok(data[j * (pitch / 2) + k] == (((j + ptr->height) % 16) << 4) + (k % 16), + "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", + data[j * (pitch / 2) + k], (((j + ptr->height) % 16) << 4) + (k % 16), i, j + ptr->height, k); break; case MAKEFOURCC('N','V','1','2'): - for (j = ptr->height; j < length2 / stride; j++) - for (k = 0; k < ptr->width; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + for (j = 0; j < ptr->height / 2; j++) + for (k = 0; k < stride; k++) + ok(data[j * pitch + k] == (((j + ptr->height) % 16) << 4) + (k % 16), + "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", + data[j * pitch + k], (((j + ptr->height) % 16) << 4) + (k % 16), i, j + ptr->height, k); break; default:

1 0