August 2018 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : regedit: Don' t expand items on initial tree creation.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 006d3f336519289b4d297f080728628c313a5e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=006d3f336519289b4d297f08… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 20 22:49:20 2018 +0000 regedit: Don't expand items on initial tree creation. The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 15 ++++++++++----- programs/regedit/treeview.c | 3 --- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d8431f1..aa690f9 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -240,16 +240,21 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { + HTREEITEM selection = NULL; if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) { - HTREEITEM selection; - if (!strcmpW(wszVal, g_pChildWnd->szPath)) - selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); - else + if (strcmpW(wszVal, g_pChildWnd->szPath)) selection = FindPathInTree(hwndTV, wszVal); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); } + if(!selection) + { + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)selection ); + } + else + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); + RegCloseKey(hkey); } } diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; }

1 0

Henri Verbeet : d3d10core/tests: Run the tests in parallel.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 9a1580ac450ba0c6525cd9b17e7450a66f2fb91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a1580ac450ba0c6525cd9b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 21 17:22:24 2018 +0430 d3d10core/tests: Run the tests in parallel. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/{device.c => d3d10core.c} | 259 ++++++++++++++++--------- 2 files changed, 166 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a1580ac450ba0c6525c…

1 0

Henri Verbeet : dxgi/tests: Run the tests in parallel.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 8eb31f2e040927e57d1ba618a792e454f4292569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eb31f2e040927e57d1ba618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 21 19:03:29 2018 +0430 dxgi/tests: Run the tests in parallel. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/{device.c => dxgi.c} | 113 ++++++++++++++++++++++++++++------- 2 files changed, 93 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 2676bc9..1c99d70 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ - device.c + dxgi.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/dxgi.c similarity index 98% rename from dlls/dxgi/tests/device.c rename to dlls/dxgi/tests/dxgi.c index 81b231a..5606545 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/dxgi.c @@ -39,6 +39,73 @@ static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **fact static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; + +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -394,9 +461,6 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -665,8 +729,9 @@ static void test_adapter_luid(void) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - is_null_luid_adapter = !device_adapter_desc.AdapterLuid.HighPart - && !device_adapter_desc.AdapterLuid.LowPart; + is_null_luid_adapter = !device_adapter_desc.AdapterLuid.LowPart + && !device_adapter_desc.SubSysId && !device_adapter_desc.Revision + && !device_adapter_desc.VendorId && !device_adapter_desc.DeviceId; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); @@ -4040,7 +4105,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) ok(!refcount, "Device has %u references left.\n", refcount); } -START_TEST(device) +START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; BOOL enable_debug_layer = FALSE; @@ -4064,30 +4129,36 @@ START_TEST(device) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } - test_adapter_desc(); - test_adapter_luid(); - test_check_interface_support(); - test_create_surface(); - test_parents(); - test_output(); - test_find_closest_matching_mode(); + queue_test(test_adapter_desc); + queue_test(test_adapter_luid); + queue_test(test_check_interface_support); + queue_test(test_create_surface); + queue_test(test_parents); + queue_test(test_output); + queue_test(test_find_closest_matching_mode); + queue_test(test_get_containing_output); + queue_test(test_create_factory); + queue_test(test_private_data); + queue_test(test_swapchain_resize); + queue_test(test_swapchain_present); + queue_test(test_maximum_frame_latency); + queue_test(test_output_desc); + queue_test(test_object_wrapping); + + run_queued_tests(); + + /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_get_containing_output(); test_set_fullscreen(); test_default_fullscreen_target_output(); test_resize_target(); test_inexact_modes(); - test_create_factory(); - test_private_data(); - test_swapchain_resize(); test_swapchain_parameters(); - test_swapchain_present(); run_on_d3d10(test_swapchain_backbuffer_index); - test_maximum_frame_latency(); - test_output_desc(); - test_object_wrapping(); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) {

1 0

Nikolay Sivov : d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 7c4dc6699d08c824a507a0305a1fadbbd0a9c84e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4dc6699d08c824a507a030… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 15:28:04 2018 +0300 d2d1/tests: Add some tests for ID2D1Bitmap1::GetSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a8b67f1..f6846c0 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6529,6 +6529,237 @@ static void test_create_device(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +#define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +{ + D2D1_BITMAP_OPTIONS options; + IDXGISurface *surface; + HRESULT hr; + + options = ID2D1Bitmap1_GetOptions(bitmap); + ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", + options, expected_options); + + surface = (void *)0xdeadbeef; + hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + if (has_surface) + { + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + + todo_wine + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); + ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); + + if (SUCCEEDED(hr)) + { + /* Correlate with resource configuration. */ + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(texture, &desc); + ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage); + ok_(__FILE__, line)(desc.BindFlags == (options & D2D1_BITMAP_OPTIONS_TARGET ? + D3D10_BIND_RENDER_TARGET : D3D10_BIND_SHADER_RESOURCE), + "Unexpected bind flags %#x, bitmap options %#x.\n", desc.BindFlags, options); + ok_(__FILE__, line)(desc.CPUAccessFlags == 0, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); + ok_(__FILE__, line)(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); + } + } + else + { + todo_wine { + ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); + } + } +} + +#define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o) +static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, BOOL has_surface, DWORD options) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1RenderTarget *compatible_rt; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0x7f7f0000, + }; + + set_size_u(&size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) + { + /* Compatible target follows its parent. */ + hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, (ID2D1BitmapRenderTarget **)&compatible_rt); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap1, has_surface, options); + ID2D1RenderTarget_Release(compatible_rt); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1Bitmap_Release(bitmap); + } + else + ID2D1DeviceContext_Release(context); +} + +static void test_bitmap_surface(void) +{ + D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; + D2D1_RENDER_TARGET_PROPERTIES rt_desc; + ID3D10Device1 *d3d_device; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + IDXGISurface *surface; + ID2D1Device *device; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + ID2D1Bitmap1 *bitmap; + HWND window; + HRESULT hr; + + IWICBitmap *wic_bitmap; + IWICImagingFactory *wic_factory; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + /* DXGI target */ + window = create_window(); + swapchain = create_swapchain(d3d_device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + check_rt_bitmap_surface(rt, TRUE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* Bitmap created from DXGI surface. */ + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); +todo_wine + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + + check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); + + ID2D1DeviceContext_Release(device_context); +} + ID2D1Device_Release(device); + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface); + + /* DC target */ + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + rt_desc.dpiX = 96.0f; + rt_desc.dpiY = 96.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + /* HWND target */ + hwnd_rt_desc.hwnd = NULL; + hwnd_rt_desc.pixelSize.width = 64; + hwnd_rt_desc.pixelSize.height = 64; + hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE; + hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n"); + + hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + DestroyWindow(hwnd_rt_desc.hwnd); + + /* WIC target */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE); + ID2D1RenderTarget_Release(rt); + + CoUninitialize(); + + ID2D1Factory1_Release(factory); + ID3D10Device1_Release(d3d_device); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -6568,6 +6799,7 @@ START_TEST(d2d1) queue_test(test_layer); queue_test(test_bezier_intersect); queue_test(test_create_device); + queue_test(test_bitmap_surface); run_queued_tests(); }

1 0

Alistair Leslie-Hughes : dinput8: Share source with dinput.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 56345c8757887431ada9f2347b43fc372d72872a URL: https://source.winehq.org/git/wine.git/?a=commit;h=56345c8757887431ada9f234… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 20 10:25:26 2018 -0500 dinput8: Share source with dinput. Based on a patch by Andrew Wesie. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45568 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput_main.c | 62 ++++++++++- dlls/dinput8/Makefile.in | 17 ++- dlls/dinput8/dinput8_main.c | 247 -------------------------------------------- 4 files changed, 77 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56345c8757887431ada9…

1 0

Daniel Lehman : include/msvcrt: Include calling convention with function pointers.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 77ad8a477e48c77f97e0335e9457f24f42fdedaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=77ad8a477e48c77f97e0335e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 22 10:40:58 2016 -0700 include/msvcrt: Include calling convention with function pointers. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/search.h | 14 ++++++++------ include/msvcrt/stdlib.h | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h index 16a0850..458d860 100644 --- a/include/msvcrt/search.h +++ b/include/msvcrt/search.h @@ -26,17 +26,19 @@ extern "C" { #endif -void* __cdecl _lfind(const void*,const void*,unsigned int*,unsigned int,int (*)(const void*,const void*)); -void* __cdecl _lsearch(const void*,void*,unsigned int*,unsigned int,int (*)(const void*,const void*)); -void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*)); -void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*)); +void* __cdecl _lfind(const void*,const void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); +void* __cdecl _lsearch(const void*,void*,unsigned int*,unsigned int,int (__cdecl *)(const void*,const void*)); +void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); #ifdef __cplusplus } #endif -static inline void* lfind(const void* match, const void* start, unsigned int* array_size, unsigned int elem_size, int (*cf)(const void*,const void*)) { return _lfind(match, start, array_size, elem_size, cf); } -static inline void* lsearch(const void* match, void* start, unsigned int* array_size, unsigned int elem_size, int (*cf)(const void*,const void*) ) { return _lsearch(match, start, array_size, elem_size, cf); } +static inline void* lfind(const void* match, const void* start, unsigned int* array_size, unsigned int elem_size, int (__cdecl *cf)(const void*,const void*)) + { return _lfind(match, start, array_size, elem_size, cf); } +static inline void* lsearch(const void* match, void* start, unsigned int* array_size, unsigned int elem_size, int (__cdecl *cf)(const void*,const void*) ) + { return _lsearch(match, start, array_size, elem_size, cf); } #endif /* __WINE_SEARCH_H */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2db48c5..e8ca2fa 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -188,7 +188,7 @@ void __cdecl _Exit(int); void __cdecl _exit(int); void __cdecl abort(void); int __cdecl abs(int); -int __cdecl atexit(void (*)(void)); +int __cdecl atexit(void (__cdecl *)(void)); double __cdecl atof(const char*); int __cdecl atoi(const char*); int __cdecl _atoi_l(const char*,_locale_t); @@ -226,8 +226,8 @@ __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl _strtoui64(const char*,char**,int); unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); int __cdecl system(const char*); -void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*)); -void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*)); +void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED

1 0

Michael Stefaniuc : dxdiag: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: e011370f1329be6ee1ee3b7db25d67b95807d225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e011370f1329be6ee1ee3b7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Aug 21 23:10:19 2018 +0200 dxdiag: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/information.c | 6 +++--- programs/dxdiag/main.c | 10 +++++----- programs/dxdiag/output.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 5cc862b..ec2b2b5 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -156,7 +156,7 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i fill_system_property_list(dxdiag_info, property_list); - for (i = 0; i < sizeof(property_list)/sizeof(property_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(property_list); i++) { if (!property_to_string(container, property_list[i].property_name, property_list[i].output)) { @@ -193,7 +193,7 @@ void free_dxdiag_information(struct dxdiag_information *system_info) if (!system_info) return; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) filler_list[i].free_function(system_info); HeapFree(GetProcessHeap(), 0, system_info); @@ -230,7 +230,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) if (!ret) goto error; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) { IDxDiagContainer *child; BOOL success; diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d7d430b..b073674 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -43,8 +43,8 @@ static void usage(void) WCHAR title[MAX_STRING_LEN]; WCHAR usage[MAX_STRING_LEN]; - LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, sizeof(title)/sizeof(WCHAR)); - LoadStringW(hInstance, STRING_USAGE, usage, sizeof(usage)/sizeof(WCHAR)); + LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, ARRAY_SIZE(title)); + LoadStringW(hInstance, STRING_USAGE, usage, ARRAY_SIZE(usage)); MessageBoxW(NULL, usage, title, MB_OK | MB_ICONWARNING); @@ -126,7 +126,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { info->output_type = OUTPUT_TEXT; return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); } cmdline++; @@ -137,12 +137,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 't': info->output_type = OUTPUT_TEXT; return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'X': case 'x': info->output_type = OUTPUT_XML; return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c18c75d..b1e0f18 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -179,7 +179,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { const struct text_information_field *fields = output_table[i].fields; unsigned int j; @@ -313,7 +313,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const if (FAILED(hr)) goto error; - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); const struct xml_information_field *fields = output_table[i].fields; @@ -394,14 +394,14 @@ static struct output_backend const WCHAR *get_output_extension(enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].filename_ext; } BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].output_handler(dxdiag_info, filename); }

1 0

Michael Stefaniuc : explorer: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 83e481fee20bc5c6598e65f8295be1b3f11fb70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=83e481fee20bc5c6598e65f8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Aug 21 23:10:20 2018 +0200 explorer: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 8 ++++---- programs/explorer/explorer.c | 32 +++++++++++++++----------------- programs/explorer/systray.c | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4f47ad0..ff58204 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -709,7 +709,7 @@ static const WCHAR *get_default_desktop_name(void) WCHAR *ret = NULL; HKEY hkey; - if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { if (strcmpiW( buffer, defaultW )) return buffer; } @@ -792,7 +792,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; + WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -809,7 +809,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) RegCloseKey( hkey ); } } - else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); + else lstrcpynW( buffer, driver, ARRAY_SIZE( buffer )); name = buffer; while (name) @@ -817,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = strchrW( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, sizeof(libname)/sizeof(WCHAR), drv_formatW, name ); + snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c509336..955678d 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -345,10 +345,8 @@ static void make_explorer_window(IShellFolder* startFolder) memset(nav_buttons,0,sizeof(nav_buttons)); - LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, - sizeof(explorer_title)/sizeof(WCHAR)); - LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, - sizeof(pathbox_label)/sizeof(WCHAR)); + LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, ARRAY_SIZE( explorer_title )); + LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, ARRAY_SIZE( pathbox_label )); hdc = GetDC(0); dpix = GetDeviceCaps(hdc, LOGPIXELSX); @@ -415,7 +413,7 @@ static void make_explorer_window(IShellFolder* startFolder) nav_buttons[2].fsState=TBSTATE_ENABLED; nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); - SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,ARRAY_SIZE( nav_buttons ),(LPARAM)nav_buttons); band_info.cbSize = sizeof(band_info); band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; @@ -738,38 +736,38 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) + if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; - p += sizeof(arg_n)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, sizeof(arg_e)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; - p += sizeof(arg_e)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) { - p += sizeof(arg_root)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) { - p += sizeof(arg_select)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, sizeof(arg_desktop)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { - p += sizeof(arg_desktop)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { - p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4..3d36f74 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -405,13 +405,13 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW( icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->display != -1) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; @@ -933,7 +933,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); + LoadStringW( NULL, IDS_START_LABEL, start_label, ARRAY_SIZE( start_label )); add_taskbar_button( 0 );

1 0

Nikolay Sivov : wmp: Implement GetClassInfo().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 470ea0d51bee73ca5012eb9ffe70f3f92add7506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470ea0d51bee73ca5012eb9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 21 10:19:39 2018 +0300 wmp: Implement GetClassInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 11 ++++++--- dlls/wmp/tests/oleobj.c | 10 ++++++++ dlls/wmp/wmp_main.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 15 +++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a90a0c2..cbbd965 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -760,11 +760,16 @@ static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) return IOleObject_Release(&This->IOleObject_iface); } -static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ti) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ti); + + if (!ti) + return E_POINTER; + + return get_typeinfo(WindowsMediaPlayer_tid, ti); } static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 472b985..2250b75 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1199,6 +1199,8 @@ static void test_wmp(void) IOleObject *oleobj; IWMPCore *wmpcore; DWORD misc_status; + TYPEATTR *attr; + ITypeInfo *ti; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; @@ -1232,6 +1234,14 @@ static void test_wmp(void) ok(hres == S_OK, "GetGUID failed: %08x\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); + ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + hres = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + IProvideClassInfo2_Release(class_info); test_QI((IUnknown*)oleobj); diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 273d193..2541fc5 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -27,6 +27,71 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); HINSTANCE wmp_instance; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static REFIID tid_ids[] = { +#define XIID(iface) &IID_ ## iface, +#define CTID(name) &CLSID_ ## name, +TID_LIST +#undef XIID +#undef CTID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) { + ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos + tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -93,6 +158,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: unregister_wmp_class(); unregister_player_msg_class(); + release_typelib(); break; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 9617be0..ab9c6d0 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -25,6 +25,21 @@ #include "dshow.h" #include "wmp.h" +#define TID_LIST \ + XIID(NULL) \ + CTID(WindowsMediaPlayer) + +typedef enum { +#define XIID(iface) iface ## _tid, +#define CTID(name) name ## _tid, +TID_LIST +#undef XIID +#undef CTID + LAST_tid +} typeinfo_id; + +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + typedef struct { IConnectionPoint IConnectionPoint_iface;

1 0

Gabriel Ivăncescu : comctl32/listbox: Fix scrolling for multi-column listboxes.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 3f266610d5e8d720e245c06a4115980dd6f70e1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f266610d5e8d720e245c06a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 16 18:03:49 2018 +0300 comctl32/listbox: Fix scrolling for multi-column listboxes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38565 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b3491bb..5235ffd 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -275,28 +275,27 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (descr->top_item == index) return LB_OKAY; if (scroll) { - INT diff; + INT dx = 0, dy = 0; if (descr->style & LBS_MULTICOLUMN) - diff = (descr->top_item - index) / descr->page_size * descr->column_width; + dx = (descr->top_item - index) / descr->page_size * descr->column_width; else if (descr->style & LBS_OWNERDRAWVARIABLE) { INT i; - diff = 0; if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - diff -= descr->items[i].height; + dy -= descr->items[i].height; } else { for (i = index; i < descr->top_item; i++) - diff += descr->items[i].height; + dy += descr->items[i].height; } } else - diff = (descr->top_item - index) * descr->item_height; + dy = (descr->top_item - index) * descr->item_height; - ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, + ScrollWindowEx( descr->self, dx, dy, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } else

1 0