May 2017 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Correctly handle phase instance ID register when ARB_shading_language_pack420 is not supported.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: d968d32a1b53bd4f8ff94de9a19bd657914a233b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d968d32a1b53bd4f8ff94de9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 31 11:43:20 2017 +0200 wined3d: Correctly handle phase instance ID register when ARB_shading_language_pack420 is not supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 27116d0..81b338c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2709,6 +2709,17 @@ static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifi } } +static void shader_glsl_fixup_scalar_register_variable(char *register_name, + const char *glsl_variable, const struct wined3d_gl_info *gl_info) +{ + /* The ARB_shading_language_420pack extension allows swizzle operations on + * scalars. */ + if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) + sprintf(register_name, "%s", glsl_variable); + else + sprintf(register_name, "ivec2(%s, 0)", glsl_variable); +} + /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, @@ -3031,18 +3042,14 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOCALTHREADINDEX: - if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) - sprintf(register_name, "int(gl_LocalInvocationIndex)"); - else - sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)"); + shader_glsl_fixup_scalar_register_variable(register_name, + "int(gl_LocalInvocationIndex)", gl_info); break; case WINED3DSPR_GSINSTID: case WINED3DSPR_OUTPOINTID: - if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) - sprintf(register_name, "gl_InvocationID"); - else - sprintf(register_name, "ivec2(gl_InvocationID, 0)"); + shader_glsl_fixup_scalar_register_variable(register_name, + "gl_InvocationID", gl_info); break; case WINED3DSPR_THREADID: @@ -3059,7 +3066,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_FORKINSTID: case WINED3DSPR_JOININSTID: - sprintf(register_name, "phase_instance_id"); + shader_glsl_fixup_scalar_register_variable(register_name, + "phase_instance_id", gl_info); break; case WINED3DSPR_TESSCOORD:

1 0

Akihiro Sagawa : kernel32/tests: Add more tests related to the zero_bits parameter.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 5bd58bb2751c843c9f87a3d4ce035d734511bed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd58bb2751c843c9f87a3d4c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 31 22:48:43 2017 +0900 kernel32/tests: Add more tests related to the zero_bits parameter. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 40de97a..d66644b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -386,6 +386,24 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* 21 zero bits is valid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); @@ -1146,6 +1164,18 @@ static void test_NtMapViewOfSection(void) ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); } + /* 22 zero bits isn't acceptable */ + ptr2 = NULL; + size = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + todo_wine + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtUnmapViewOfSection( hProcess, ptr2 ); + ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); + } + /* mapping at the same page conflicts */ ptr2 = ptr; size = 0;

1 0

Akihiro Sagawa : ntdll: Zero bits parameter must be less than 21.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 1afb369380ec2a5998ebe235c6def42632b64ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afb369380ec2a5998ebe235c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 31 22:48:45 2017 +0900 ntdll: Zero bits parameter must be less than 21. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 -- dlls/ntdll/virtual.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d66644b..7366ef1 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -400,7 +400,6 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); @@ -1168,7 +1167,6 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e826fa0..ee9c8d0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -279,6 +279,7 @@ static inline UINT_PTR get_mask( ULONG zero_bits ) { if (!zero_bits) return 0xffff; /* allocations are aligned to 64K by default */ if (zero_bits < page_shift) zero_bits = page_shift; + if (zero_bits > 21) return 0; return (1 << zero_bits) - 1; } @@ -1885,6 +1886,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); if (!size) return STATUS_INVALID_PARAMETER; + if (!mask) return STATUS_INVALID_PARAMETER_3; if (process != NtCurrentProcess()) { @@ -2550,7 +2552,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ - if (*addr_ptr && zero_bits) + if ((*addr_ptr && zero_bits) || !mask) return STATUS_INVALID_PARAMETER_4; #ifndef _WIN64

1 0

Hugh McMaster : regedit: Update the status bar when moving to the ' Computer' root node.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 2689792cd45fe79edc7ff7bea5822a749fb386f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2689792cd45fe79edc7ff7bea… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:06:55 2017 +0000 regedit: Update the status bar when moving to the 'Computer' root node. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2f77f2f..0e4ed57 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -180,6 +180,7 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO if (rootitem == hItem) { SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); + UpdateStatusBar(); return; }

1 0

Hugh McMaster : regedit: Never disable the 'Find' and 'Find Next' menu items.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 948278cb7b517e84fb67e2ba180109412aac1219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948278cb7b517e84fb67e2ba1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:05 2017 +0000 regedit: Never disable the 'Find' and 'Find Next' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 -- programs/regedit/regedit.rc | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 8e9f604..3fd048b 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -146,8 +146,6 @@ static void UpdateMenuItems(HMENU hMenu) { } update_expand_or_collapse_item(hwndTV, selection, hMenu); - EnableMenuItem(hMenu, ID_EDIT_FIND, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_FINDNEXT, MF_ENABLED | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_EDIT_DELETE, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index d711c2c..d7ba600 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -59,8 +59,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "Find Ne&xt\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&Find...\tCtrl+F", ID_EDIT_FIND + MENUITEM "Find Ne&xt\tF3", ID_EDIT_FINDNEXT END POPUP "&View" BEGIN @@ -105,7 +105,7 @@ BEGIN MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTI_STRINGVALUE MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDVALUE END - MENUITEM "&Find...\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "&Find...\tCtrl+F", ID_EDIT_FIND MENUITEM SEPARATOR MENUITEM "&Delete\tDel", ID_EDIT_DELETE MENUITEM "&Rename\tF2", ID_EDIT_RENAME

1 0

Hugh McMaster : regedit: Update handling of the 'Delete' menu item.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 4144847aa59aa71b2c26bc05af2b0a63fb4d3f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4144847aa59aa71b2c26bc05a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:15 2017 +0000 regedit: Update handling of the 'Delete' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 3fd048b..f63b1e1 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,6 +132,25 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } +static void update_delete_item(HMENU hMenu, WCHAR *keyName) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel) + { + if (!keyName || !*keyName) + state = MF_GRAYED; + } + else + { + if (SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)) == -1) + state = MF_GRAYED; + } + + EnableMenuItem(hMenu, ID_EDIT_DELETE, state | MF_BYCOMMAND); +} + static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; BOOL bAllowEdit = FALSE; @@ -147,7 +166,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_DELETE, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + update_delete_item(hMenu, keyName); EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE,

1 0

Hugh McMaster : regedit: Update handling of the 'Rename' menu item.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 2aff2f612ac42a9e8b1f79199bfbe9076f7d98e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aff2f612ac42a9e8b1f79199… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:25 2017 +0000 regedit: Update handling of the 'Rename' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index f63b1e1..d8f3e6d 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,23 +132,26 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } -static void update_delete_item(HMENU hMenu, WCHAR *keyName) +static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) { - unsigned int state = MF_ENABLED; + unsigned int state_d = MF_ENABLED, state_r = MF_ENABLED; if (!g_pChildWnd->nFocusPanel) { if (!keyName || !*keyName) - state = MF_GRAYED; + state_d = state_r = MF_GRAYED; } else { - if (SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)) == -1) - state = MF_GRAYED; + int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + + if (index == -1) state_d = MF_GRAYED; + if (index < 1) state_r = MF_GRAYED; } - EnableMenuItem(hMenu, ID_EDIT_DELETE, state | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_DELETE, state_d | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } static void UpdateMenuItems(HMENU hMenu) { @@ -166,8 +169,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - update_delete_item(hMenu, keyName); - EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + update_delete_and_rename_items(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Hugh McMaster : regedit: Update handling of the 'Copy Key Name' menu item.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 48716cba984d5462f876962e5582c1825d0e9a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48716cba984d5462f876962e5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:36 2017 +0000 regedit: Update handling of the 'Copy Key Name' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d8f3e6d..0aec59a 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -154,6 +154,16 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } +static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel && !keyName) + state = MF_GRAYED; + + EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND); +} + static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; BOOL bAllowEdit = FALSE; @@ -170,6 +180,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); update_delete_and_rename_items(hMenu, keyName); + update_copy_keyname_item(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Nikolay Sivov : comctl32/toolbar: Don't add NULL imagelist entries.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: ece34a1319f47cb7cd242c0f95d57cd1d35ae8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece34a1319f47cb7cd242c0f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:38 2017 +0300 comctl32/toolbar: Don't add NULL imagelist entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c57707b..4da3008 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6904,6 +6904,10 @@ static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIS /* Check if the entry already exists */ c = TOOLBAR_GetImageListEntry(*pies, *cies, id); + /* Don't add new entry for NULL imagelist */ + if (!c && !himl) + return NULL; + /* If this is a new entry we must create it and insert into the array */ if (!c) {

1 0

Nikolay Sivov : comctl32/toolbar: Support undocumented IDs for standard bitmap lists.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: d93ae6ff346d0a84ad0db2cc034b72f0595e59e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93ae6ff346d0a84ad0db2cc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:39 2017 +0300 comctl32/toolbar: Support undocumented IDs for standard bitmap lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 93 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 7 +++- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2d12732..e2c29f4 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -490,13 +490,81 @@ static void add_128x15_bitmap(HWND hToolbar, int nCmds) static void test_add_bitmap(void) { + TBADDBITMAP stdsmall, std; HWND hToolbar = NULL; TBADDBITMAP bmp128; TBADDBITMAP bmp80; - TBADDBITMAP stdsmall; TBADDBITMAP addbmp; HIMAGELIST himl; - INT ret; + INT ret, id; + + /* Test default bitmaps range */ + for (id = IDB_STD_SMALL_COLOR; id < IDB_HIST_LARGE_COLOR; id++) + { + HIMAGELIST himl; + int cx, cy, count; + + rebuild_toolbar(&hToolbar); + + std.hInst = HINST_COMMCTRL; + std.nID = id; + + ret = SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&std); + ok(ret == 0, "Got %d\n", ret); + + himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); + ok(himl != NULL, "Got %p\n", himl); + + ret = ImageList_GetIconSize(himl, &cx, &cy); + ok(ret, "Got %d\n", ret); + ok(cx == cy, "Got %d x %d\n", cx, cy); + + count = ImageList_GetImageCount(himl); + + /* Image count */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case IDB_STD_LARGE_COLOR: + case 2: + case 3: + ok(count == 15, "got count %d\n", count); + break; + case IDB_VIEW_SMALL_COLOR: + case IDB_VIEW_LARGE_COLOR: + case 6: + case 7: + ok(count == 12, "got count %d\n", count); + break; + case IDB_HIST_SMALL_COLOR: + case IDB_HIST_LARGE_COLOR: + ok(count == 5, "got count %d\n", count); + break; + default: + ok(0, "id %d, count %d\n", id, count); + } + + /* Image sizes */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case 2: + case IDB_VIEW_SMALL_COLOR: + case 6: + case IDB_HIST_SMALL_COLOR: + ok(cx == 16, "got size %d\n", cx); + break; + case IDB_STD_LARGE_COLOR: + case 3: + case IDB_VIEW_LARGE_COLOR: + case 7: + case IDB_HIST_LARGE_COLOR: + ok(cx == 24, "got size %d\n", cx); + break; + default: + ok(0, "id %d, size %d\n", id, cx); + } + } /* empty 128x15 bitmap */ bmp128.hInst = GetModuleHandleA(NULL); @@ -2409,6 +2477,26 @@ todo_wine DestroyWindow(hwnd); } +static void test_imagelist(void) +{ + HIMAGELIST imagelist; + HWND hwnd = NULL; + int ret; + + rebuild_toolbar(&hwnd); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + ret = SendMessageA(hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(16, 16)); + ok(ret, "got %d\n", ret); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2454,6 +2542,7 @@ START_TEST(toolbar) test_noresize(); test_save(); test_drawtext_flags(); + test_imagelist(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4da3008..8a03597 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2810,18 +2810,22 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp switch (lpAddBmp->nID) { case IDB_STD_SMALL_COLOR: + case 2: info.nButtons = 15; info.nID = IDB_STD_SMALL; break; case IDB_STD_LARGE_COLOR: + case 3: info.nButtons = 15; info.nID = IDB_STD_LARGE; break; case IDB_VIEW_SMALL_COLOR: + case 6: info.nButtons = 12; info.nID = IDB_VIEW_SMALL; break; case IDB_VIEW_LARGE_COLOR: + case 7: info.nButtons = 12; info.nID = IDB_VIEW_LARGE; break; @@ -2834,6 +2838,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nID = IDB_HIST_LARGE; break; default: + WARN("unknown bitmap id, %ld\n", lpAddBmp->nID); return -1; } @@ -4346,7 +4351,7 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam);

1 0