January 2018 - Wine-commits

Józef Kucia : dxgi: Implement dxgi_swapchain_GetDesc1 ().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 0e4250c59581b2d6e893b6f4c3bbbe93eabd134f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4250c59581b2d6e893b6f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:54 2018 +0100 dxgi: Implement dxgi_swapchain_GetDesc1(). 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/dxgi/swapchain.c | 32 ++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 10 ++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ec9b2b4..fe7e5cc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -429,9 +429,37 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetLastPresentCount(IDXGISwapCha static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_DESC1 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring Stereo, BufferUsage, Scaling, SwapEffect and AlphaMode.\n"); + + desc->Width = wined3d_desc.backbuffer_width; + desc->Height = wined3d_desc.backbuffer_height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); + desc->Stereo = FALSE; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, + wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferCount = wined3d_desc.backbuffer_count; + desc->Scaling = DXGI_SCALING_STRETCH; + desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; + desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 18306db..ea10ff5 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; IUnknown *obj, *obj2, *parent; @@ -968,6 +969,15 @@ static void test_create_swapchain(void) "Failed to query IDXGISwapChain1 interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) { + hr = IDXGISwapChain1_GetDesc1(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetDesc1(swapchain1, &swapchain_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!swapchain_desc.Stereo, "Got unexpected stereo %#x.\n", swapchain_desc.Stereo); + ok(swapchain_desc.Scaling == DXGI_SCALING_STRETCH, + "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); + ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, + "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetFullscreenDesc().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 05b11380e8fa3e11f8b8813f048e1aa1e820c459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b11380e8fa3e11f8b8813f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:55 2018 +0100 dxgi: Implement dxgi_swapchain_GetFullscreenDesc(). 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/dxgi/swapchain.c | 25 +++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fe7e5cc..8e7dccb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -465,9 +465,30 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); + + desc->RefreshRate.Numerator = wined3d_desc.refresh_rate; + desc->RefreshRate.Denominator = 1; + desc->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc->Windowed = wined3d_desc.windowed; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ea10ff5..899a063 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; @@ -978,6 +979,12 @@ static void test_create_swapchain(void) "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, &fullscreen_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fullscreen_desc.Windowed == creation_desc.Windowed, + "Got unexpected windowed %#x.\n", fullscreen_desc.Windowed); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Lucian Poston : d2d1: Implement ID2D1Factory1.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 9d9fbc0e4adbaadf92d740cf588db412ea2f633d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9fbc0e4adbaadf92d740cf… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Mon Jan 22 15:58:45 2018 +0330 d2d1: Implement ID2D1Factory1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d9fbc0e4adbaadf92d7…

1 0

Henri Verbeet : d2d1: Introduce a registry key to limit the maximum supported factory version.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 8247c13aaed2586948e70d124931d2ae15a2d279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8247c13aaed2586948e70d12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 15:58:46 2018 +0330 d2d1: Introduce a registry key to limit the maximum supported factory version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/factory.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 51b9627..20d3f26 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite C_SRCS = \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3b21bc1..f876cbf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ enum d2d_shape_type D2D_SHAPE_TYPE_COUNT, }; +struct d2d_settings +{ + unsigned int max_version_factory; +}; +extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; + struct d2d_clip_stack { D2D1_RECT_F *stack; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index da2b892..f202332 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -22,8 +22,14 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_settings d2d_settings = +{ + ~0u, /* No ID2D1Factory version limit by default. */ +}; + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -62,7 +68,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { @@ -537,3 +543,71 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } + +static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (application_key && !RegQueryValueExA(application_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + size = sizeof(data); + if (default_key && !RegQueryValueExA(default_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + return FALSE; + +success: + *value = data; + return TRUE; +} + +static void d2d_settings_init(void) +{ + HKEY default_key, tmp_key, application_key = NULL; + char buffer[MAX_PATH + 10]; + DWORD len; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct2D", &default_key)) + default_key = NULL; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + char *p, *appname = buffer; + + if ((p = strrchr(appname, '/'))) + appname = p + 1; + if ((p = strrchr(appname, '\\'))) + appname = p + 1; + strcat(appname, "\\Direct2D"); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmp_key)) + { + if (RegOpenKeyA(tmp_key, appname, &application_key)) + application_key = NULL; + RegCloseKey(tmp_key); + } + } + + if (!default_key && !application_key) + return; + + if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); + + if (application_key) + RegCloseKey(application_key); + if (default_key) + RegCloseKey(default_key); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + d2d_settings_init(); + return TRUE; +}

1 0

Nikolay Sivov : user32/edit: Fix EM_SETWORDBREAKPROC return value.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 6aa853ae393ed0155607333e9640183bc736a74c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa853ae393ed0155607333e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 22 16:54:16 2018 +0300 user32/edit: Fix EM_SETWORDBREAKPROC return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/edit.c | 1 + dlls/user32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 7711683..262ea72 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2982,6 +2982,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3022,6 +3053,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 114d842..5e161c5 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4839,6 +4839,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case EM_SETWORDBREAKPROC: EDIT_EM_SetWordBreakProc(es, (void *)lParam); + result = 1; break; case EM_GETWORDBREAKPROC: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index de8a349..01418bf 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2999,6 +2999,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { BOOL b; @@ -3034,6 +3065,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); }

1 0

Martin Storsjo : ntdll: Implement NtFlushInstructionCache using __clear_cache where available.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 4415653f842ae145178703a643cc1f62ee70b648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4415653f842ae145178703a6… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:05:09 2018 +0200 ntdll: Implement NtFlushInstructionCache using __clear_cache where available. The configure check needs to be done with a more elaborate test than just AC_CHECK_FUNC, since it's a built-in function in clang and errors out if invoked with no parameters. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++++ dlls/ntdll/process.c | 24 ++++++++++++++---------- include/config.h.in | 4 ++++ 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/configure b/configure index f62b9e3..bcba635 100755 --- a/configure +++ b/configure @@ -17759,6 +17759,39 @@ $as_echo "#define HAVE___BUILTIN_POPCOUNT 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __clear_cache" >&5 +$as_echo_n "checking for __clear_cache... " >&6; } +if ${ac_cv_have___clear_cache+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +__clear_cache((void*)0, (void*)0); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have___clear_cache="yes" +else + ac_cv_have___clear_cache="no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___clear_cache" >&5 +$as_echo "$ac_cv_have___clear_cache" >&6; } +if test "$ac_cv_have___clear_cache" = "yes" +then + +$as_echo "#define HAVE___CLEAR_CACHE 1" >>confdefs.h + +fi + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 9aa3228..db666b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,6 +2706,14 @@ then AC_DEFINE(HAVE___BUILTIN_POPCOUNT, 1, [Define to 1 if you have the `__builtin_popcount' built-in function.]) fi +AC_CACHE_CHECK([for __clear_cache], ac_cv_have___clear_cache, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[__clear_cache((void*)0, (void*)0); return 0;]])], + [ac_cv_have___clear_cache="yes"], [ac_cv_have___clear_cache="no"])) +if test "$ac_cv_have___clear_cache" = "yes" +then + AC_DEFINE(HAVE___CLEAR_CACHE, 1, [Define to 1 if you have the `__clear_cache' (potentially built-in) function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f615ce2..40034b4 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -653,20 +653,24 @@ NTSTATUS WINAPI NtSetInformationProcess( * NtFlushInstructionCache [NTDLL.@] * ZwFlushInstructionCache [NTDLL.@] */ -NTSTATUS WINAPI NtFlushInstructionCache( - IN HANDLE ProcessHandle, - IN LPCVOID BaseAddress, - IN SIZE_T Size) +NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T size ) { - static int once; - if (!once++) - { #if defined(__x86_64__) || defined(__i386__) - TRACE("%p %p %ld - no-op on x86 and x86_64\n", ProcessHandle, BaseAddress, Size ); + /* no-op */ +#elif defined(HAVE___CLEAR_CACHE) + if (handle == GetCurrentProcess()) + { + __clear_cache( (char *)addr, (char *)addr + size ); + } + else + { + static int once; + if (!once++) FIXME( "%p %p %ld other process not supported\n", handle, addr, size ); + } #else - FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); + static int once; + if (!once++) FIXME( "%p %p %ld\n", handle, addr, size ); #endif - } return STATUS_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index 9224837..4db349c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1407,6 +1407,10 @@ /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT +/* Define to 1 if you have the `__clear_cache' (potentially built-in) + function. */ +#undef HAVE___CLEAR_CACHE + /* Define to 1 if you have the `__res_getservers' function. */ #undef HAVE___RES_GETSERVERS

1 0

Jacek Caban : schtasks: Added support for /f argument in create command.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: a6a5bca50942fe3b8a432ea99673bad00ef5013f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a5bca50942fe3b8a432ea9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:35:55 2018 +0100 schtasks: Added support for /f argument in create command. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 7 ++++++- programs/schtasks/tests/schtasks.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 5967e4a..c6b8586 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -183,6 +183,7 @@ static int create_command(int argc, WCHAR *argv[]) { const WCHAR *task_name = NULL, *xml_file = NULL; ITaskFolder *root = NULL; + LONG flags = TASK_CREATE; IRegisteredTask *task; VARIANT empty; BSTR str, xml; @@ -217,6 +218,10 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; + }else if(!strcmpiW(argv[0], f_optW)) { + flags = TASK_CREATE_OR_UPDATE; + argc--; + argv++; }else { FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); return 1; @@ -245,7 +250,7 @@ static int create_command(int argc, WCHAR *argv[]) V_VT(&empty) = VT_EMPTY; str = SysAllocString(task_name); - hres = ITaskFolder_RegisterTask(root, str, xml, TASK_CREATE, empty, empty, + hres = ITaskFolder_RegisterTask(root, str, xml, flags, empty, empty, TASK_LOGON_NONE, empty, &task); SysFreeString(str); SysFreeString(xml); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 9f1b920..8f7176a 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -211,6 +211,9 @@ START_TEST(schtasks) r = run_command("schtasks /change /tn wine\\winetest /enable"); ok(r == 0, "r = %u\n", r); + r = run_command("schtasks /create /xml test.xml /f /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); /* task already exists, but /f argument provided */ + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); ok(r == 1, "r = %u\n", r); /* task already exists */

1 0

Nikolay Sivov : comctl32/updown: Remove window subclass right before window is destroyed.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 2859e7d143d40a5cec330cd6c5b37b919a04a9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2859e7d143d40a5cec330cd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:51:36 2018 +0300 comctl32/updown: Remove window subclass right before window is destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/updown.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 4f44b90..67b646d 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -592,14 +592,22 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, switch(uMsg) { case WM_KEYDOWN: - UPDOWN_KeyPressed(infoPtr, (int)wParam); - if ((wParam == VK_UP) || (wParam == VK_DOWN)) return 0; - break; + if (infoPtr) + { + UPDOWN_KeyPressed(infoPtr, (int)wParam); + if (wParam == VK_UP || wParam == VK_DOWN) + return 0; + } + break; case WM_MOUSEWHEEL: - UPDOWN_MouseWheel(infoPtr, (int)wParam); - break; + if (infoPtr) + UPDOWN_MouseWheel(infoPtr, (int)wParam); + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID); + break; default: break; } @@ -607,6 +615,11 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static void UPDOWN_ResetSubclass (UPDOWN_INFO *infoPtr) +{ + SetWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID, 0); +} + /*********************************************************************** * UPDOWN_SetBuddy * @@ -628,9 +641,8 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) old_buddy = infoPtr->Buddy; - /* there is already a buddy assigned */ - if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); + if (!IsWindow(bud)) bud = NULL; /* Store buddy window handle */ @@ -942,10 +954,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_DESTROY: Free (infoPtr->AccelVect); - - if (infoPtr->Buddy) - RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, - BUDDY_SUBCLASSID); + UPDOWN_ResetSubclass (infoPtr); Free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd);

1 0

Nikolay Sivov : shell32: Reduce code duplication in GetCommandString().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: ce5fb75f7f920cabf7c3ae7efae6fe5d076848ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5fb75f7f920cabf7c3ae7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:53:05 2018 +0300 shell32: Reduce code duplication in GetCommandString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 167 ++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 5c5ba1b..3f09413 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -471,111 +471,80 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( return S_OK; } -static HRESULT WINAPI ItemMenu_GetCommandString( - IContextMenu3 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) +static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR cmdid, UINT flags, + UINT *reserved, LPSTR name, UINT maxlen) { - ContextMenu *This = impl_from_IContextMenu3(iface); - HRESULT hr = E_INVALIDARG; + static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; + static const WCHAR cutW[] = {'c','u','t',0}; + static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR linkW[] = {'l','i','n','k',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; + static const WCHAR renameW[] = {'r','e','n','a','m','e',0}; + ContextMenu *This = impl_from_IContextMenu3(iface); + const WCHAR *cmdW = NULL; + HRESULT hr = S_OK; - TRACE("(%p)->(%lx flags=%x %p name=%p len=%x)\n", This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(%lx, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); - switch(uFlags) - { - case GCS_HELPTEXTA: - case GCS_HELPTEXTW: - hr = E_NOTIMPL; - break; + switch (flags) + { + case GCS_HELPTEXTA: + case GCS_HELPTEXTW: + hr = E_NOTIMPL; + break; + + case GCS_VERBA: + case GCS_VERBW: + switch (cmdid) + { + case FCIDM_SHVIEW_OPEN: + cmdW = openW; + break; + case FCIDM_SHVIEW_EXPLORE: + cmdW = exploreW; + break; + case FCIDM_SHVIEW_CUT: + cmdW = cutW; + break; + case FCIDM_SHVIEW_COPY: + cmdW = copyW; + break; + case FCIDM_SHVIEW_CREATELINK: + cmdW = linkW; + break; + case FCIDM_SHVIEW_DELETE: + cmdW = deleteW; + break; + case FCIDM_SHVIEW_PROPERTIES: + cmdW = propertiesW; + break; + case FCIDM_SHVIEW_RENAME: + cmdW = renameW; + break; + } - case GCS_VERBA: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - strcpy(lpszName, "open"); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - strcpy(lpszName, "explore"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - strcpy(lpszName, "cut"); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - strcpy(lpszName, "copy"); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - strcpy(lpszName, "link"); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - strcpy(lpszName, "delete"); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - strcpy(lpszName, "properties"); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - strcpy(lpszName, "rename"); - hr = S_OK; - break; - } - break; + if (!cmdW) + { + hr = E_INVALIDARG; + break; + } - /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This - case, you need to do the lstrcpyW to the pointer passed.*/ - case GCS_VERBW: - switch(idCommand) - { - case FCIDM_SHVIEW_OPEN: - MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_EXPLORE: - MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CUT: - MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_COPY: - MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_CREATELINK: - MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_DELETE: - MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_PROPERTIES: - MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); - hr = S_OK; - break; - case FCIDM_SHVIEW_RENAME: - MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = S_OK; - break; - } - break; + if (flags == GCS_VERBA) + WideCharToMultiByte(CP_ACP, 0, cmdW, -1, name, maxlen, NULL, NULL); + else + lstrcpynW((WCHAR *)name, cmdW, maxlen); - case GCS_VALIDATEA: - case GCS_VALIDATEW: - hr = S_OK; - break; - } - TRACE("-- (%p)->(name=%s)\n", This, lpszName); - return hr; + TRACE("name %s\n", flags == GCS_VERBA ? debugstr_a(name) : debugstr_w((WCHAR *)name)); + break; + + case GCS_VALIDATEA: + case GCS_VALIDATEW: + break; + } + + return hr; } /**************************************************************************

1 0

Nikolay Sivov : comctl32/listview: Always return zero state mask for subitems.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 6b2675dc8fefde3d12675762581f23b1f544f6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2675dc8fefde3d12675762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:53:30 2018 +0300 comctl32/listview: Always return zero state mask for subitems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 11 +++++++---- dlls/comctl32/tests/listview.c | 43 ++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 589d5c4..c085578 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6679,16 +6679,19 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* make a local copy */ isubitem = lpLVItem->iSubItem; + if (isubitem && (lpLVItem->mask & LVIF_STATE)) + lpLVItem->state = 0; + /* a quick optimization if all we're asked is the focus state * these queries are worth optimising since they are common, * and can be answered in constant time, without the heavy accesses */ if ( (lpLVItem->mask == LVIF_STATE) && (lpLVItem->stateMask == LVIS_FOCUSED) && !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { - lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem) - lpLVItem->state |= LVIS_FOCUSED; - return TRUE; + lpLVItem->state = 0; + if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + lpLVItem->state |= LVIS_FOCUSED; + return TRUE; } ZeroMemory(&dispInfo, sizeof(dispInfo)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8efd3da..18e874a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6152,16 +6152,17 @@ static void test_state_image(void) insert_column(hwnd, 0); insert_column(hwnd, 1); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; item.pszText = text; + item.lParam = 123456; r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(r == 0, "Failed to insert an item.\n"); item.mask = LVIF_STATE; - item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED | LVIS_FOCUSED; item.iItem = 0; item.iSubItem = 0; r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); @@ -6174,27 +6175,49 @@ static void test_state_image(void) r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); ok(r, "Failed to set subitem text.\n"); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; item.state = 0; item.iItem = 0; item.iSubItem = 0; + item.lParam = 0; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get item state.\n"); - ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED), + "Unexpected item state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = 0; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 1; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + item.lParam = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 2;

1 0