January 2018 - Wine-Devel - list.winehq.org

[PATCH 2/5] wined3d: Use the resource access flags in wined3d_surface_blt().
by Henri Verbeet Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f34ad0..388b803 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { TRACE("Depth/stencil blit.\n"); - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, @@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blit_op = WINED3D_BLIT_OP_RAW_BLIT; } - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, -- 2.1.4

1 0

[PATCH 1/5] wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().
by Henri Verbeet Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f91c21..5f34ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2744,14 +2744,16 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) - return resource->pool == WINED3D_POOL_SYSTEM_MEM; + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU); texture = texture_from_resource(resource); locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) - return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, -- 2.1.4

1 0

[PATCH] comctl32/tests: Add test for v6 combobox dropdown size
by Fabian Maurer Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d9429b4..74cbe7851e 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -33,6 +33,8 @@ #define EDITBOX_ID 0 #define COMBO_ID 1995 +#define COMBO_YBORDERSIZE() 2 + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ @@ -1151,6 +1153,137 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } + +static void test_listbox_size(DWORD style) +{ + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + UINT x, y; + BOOL ret; + int i, test; + const char wine_test[] = "Wine Test"; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + BOOL todo_regular; + BOOL todo_nointegral; + } info_height[] = { + {2, 24, -1, TRUE, TRUE}, + {2, 41, -1, TRUE, TRUE}, + {2, 300, -1, TRUE}, + {6, 50, -1, TRUE, TRUE}, + {6, 1, -1, TRUE, TRUE}, + {6, 800, -1, TRUE}, + {80, 10, -1, TRUE, TRUE}, + {100, 900, -1, TRUE, TRUE}, + {2, 100, -1, TRUE}, + + {2, 12, 30, FALSE, TRUE}, + {100, 12, 30, TRUE, TRUE}, + {2, 12, 1, TRUE, TRUE}, + {100, 12, 1, TRUE, TRUE}, + {2, 12, 100, FALSE, TRUE}, + {100, 12, 100, TRUE, TRUE}, + {15, 12, 4, TRUE, TRUE}, + {15, 12, 15, TRUE, TRUE}, + + {10, 24, -1, TRUE, TRUE}, + {10, 41, -1, TRUE, TRUE}, + {10, 42, -1, TRUE, TRUE}, + {10, 50, -1, TRUE, TRUE}, + }; + + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Expected maximum of visible items to be 30, got %d\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = GetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + + if(info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "Expected maximum of visible items to be %d, got %d\n", + min_visible_expected, min_visible_actual); + } + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + ret = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(ret, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if(style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo + - (cbInfo.rcItem.bottom + COMBO_YBORDERSIZE()) + - list_height_nonclient + - 1; + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if( expected_height_list < 0) + expected_height_list = 0; + + todo_wine_if(info_test->todo_nointegral) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine_if(info_test->todo_regular) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1325,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_listbox_size(CBS_DROPDOWN); + test_listbox_size(CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx); -- 2.16.1

4 6

[PATCH] msscript.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e55a1..1f706f5380 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -28,6 +28,7 @@ #include "msscript.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); @@ -103,16 +104,6 @@ struct ScriptControl { static HINSTANCE msscript_instance; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - typedef enum tid_t { IScriptControl_tid, LAST_tid -- 2.14.3

1 0

[PATCH] msident: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msident/msident.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 3efb190a39..8b9842f960 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,19 +24,10 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE msident_instance; typedef struct { -- 2.14.3

1 0

[PATCH] jsproxy: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jsproxy/main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index a52fbb4df7..d1ac903eb6 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -51,6 +51,7 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" static HINSTANCE instance; @@ -87,16 +88,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; -- 2.14.3

1 0

[PATCH] inseng: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inseng/inseng_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c95d2c7321..93649e20e9 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -33,19 +33,10 @@ #include "inseng.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE instance; struct InstallEngine { -- 2.14.3

1 0

[PATCH] inetcpl.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/inetcpl.h | 19 ------------------- dlls/inetcpl.cpl/security.c | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 4aae2922f3..50d4bd1e66 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -31,25 +31,6 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - -/* ######### */ - #define NUM_PROPERTY_PAGES 8 /* icons */ diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 6d7905785b..543ada433d 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,6 +37,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -- 2.14.3

1 0

[PATCH] inetcomm: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/inetcomm_private.h | 10 ---------- dlls/inetcomm/mimeole.c | 1 + dlls/inetcomm/protocol.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 816493bb0b..b27cbd7bc1 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -83,13 +83,3 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDD HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186ca1f..681ca820d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -33,6 +33,7 @@ #include "mimeole.h" #include "propvarutil.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index b7b01d4aaf..028463a269 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -25,6 +25,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); -- 2.14.3

1 0

[PATCH] hlink: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Jan. 31, 2018

Jan. 31, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/hlink_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 33b58ac42f..1b7847bb74 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,12 @@ #include "ole2.h" #include "hlink.h" +#include "wine/heap.h" #include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR hlink_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0