April 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : winegcc: Set page alignment to 4096 in all cases.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 395a94d308d77786809eee9eb77b4e35c78fbf9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=395a94d308d77786809eee9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 14:20:10 2018 +0200 winegcc: Set page alignment to 4096 in all cases. This avoids leaving holes in builtin dll mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 80dba4c..4be35d5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1136,13 +1136,13 @@ static void build(struct options* opts) default: if (opts->image_base) { - if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) - strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); else prelink = PRELINK; } + if (!try_link(opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) + strarray_add(link_args, "-Wl,-z,max-page-size=0x1000"); break; }

1 0

Louis Lenders : kernel32/tests: Add simple test for SetThreadUILanguage.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 92fde7f35242206ce3e3d557cad00be237439132 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fde7f35242206ce3e3d557… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 31 11:24:53 2018 +0200 kernel32/tests: Add simple test for SetThreadUILanguage. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d8f51d3..12769f7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -104,6 +104,8 @@ static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG* static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMTW *, LPWSTR, int); static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM); +static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); +static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static void InitFunctionPointers(void) { @@ -137,6 +139,8 @@ static void InitFunctionPointers(void) X(GetUserPreferredUILanguages); X(GetNumberFormatEx); X(FindNLSStringEx); + X(SetThreadUILanguage); + X(GetThreadUILanguage); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5444,6 +5448,28 @@ static void test_FindNLSStringEx(void) } } +static void test_SetThreadUILanguage(void) +{ + LANGID res; + + if (!pGetThreadUILanguage) + { + win_skip("GetThreadUILanguage isn't implemented, skipping SetThreadUILanguage tests for version < Vista\n"); + return; /* BTW SetThreadUILanguage is present on winxp/2003 but doesn`t set the LANGID anyway when tested */ + } + + res = pSetThreadUILanguage(0); + todo_wine ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); + + res = pSetThreadUILanguage(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN)); + ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), + "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); + + res = pSetThreadUILanguage(0); + todo_wine ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), + "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); +} + START_TEST(locale) { InitFunctionPointers(); @@ -5491,6 +5517,7 @@ START_TEST(locale) test_GetThreadPreferredUILanguages(); test_GetUserPreferredUILanguages(); test_FindNLSStringEx(); + test_SetThreadUILanguage(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Alexandre Julliard : user32: Partially implement GetWindowDpiAwarenessContext().
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 3f97ba3f463dfad41274f0bd64865267227d6b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f97ba3f463dfad41274f0bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 13:28:20 2018 +0200 user32: Partially implement GetWindowDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + dlls/user32/win.c | 27 +++++++++++++++++++ dlls/user32/win.h | 1 + include/winuser.h | 1 + 5 files changed, 90 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b541be4..876f84f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -44,6 +44,7 @@ static BOOL (WINAPI *pSetProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static DPI_AWARENESS_CONTEXT (WINAPI *pGetWindowDpiAwarenessContext)(HWND); static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; @@ -3067,6 +3068,63 @@ static void test_dpi_aware(void) test_GetSystemMetrics(); } +static void test_window_dpi(void) +{ + DPI_AWARENESS_CONTEXT context, orig; + DPI_AWARENESS awareness; + HWND hwnd; + + if (!pGetWindowDpiAwarenessContext) + { + win_skip( "GetWindowDpiAwarenessContext not supported\n" ); + return; + } + orig = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + ok( hwnd != 0, "failed to create window\n" ); + context = GetWindowDpiAwarenessContext( hwnd ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); + DestroyWindow( hwnd ); + + pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + ok( hwnd != 0, "failed to create window\n" ); + context = GetWindowDpiAwarenessContext( hwnd ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); + DestroyWindow( hwnd ); + + pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + ok( hwnd != 0, "failed to create window\n" ); + context = GetWindowDpiAwarenessContext( hwnd ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); + DestroyWindow( hwnd ); + + SetLastError( 0xdeadbeef ); + context = GetWindowDpiAwarenessContext( (HWND)0xdeadbeef ); + ok( !context, "got %p\n", context ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + context = GetWindowDpiAwarenessContext( GetDesktopWindow() ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); + + pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + SetLastError( 0xdeadbeef ); + context = GetWindowDpiAwarenessContext( GetDesktopWindow() ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); + + pSetThreadDpiAwarenessContext( orig ); +} + START_TEST(sysparams) { int argc; @@ -3084,6 +3142,7 @@ START_TEST(sysparams) pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); pGetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetThreadDpiAwarenessContext"); pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext"); + pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext"); pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext"); hInstance = GetModuleHandleA( NULL ); @@ -3136,4 +3195,5 @@ START_TEST(sysparams) ReleaseDC( 0, hdc); test_dpi_aware(); + test_window_dpi(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 85499b6..d407a18 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -394,6 +394,7 @@ @ stdcall GetWindowContextHelpId(long) @ stdcall GetWindowDC(long) @ stdcall GetWindowDisplayAffinity(long ptr) +@ stdcall GetWindowDpiAwarenessContext(long) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) @ stdcall -arch=win64 GetWindowLongPtrA(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 019b178..0272566 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1498,6 +1498,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->hIconSmall = 0; wndPtr->hIconSmall2 = 0; wndPtr->hSysMenu = 0; + wndPtr->dpi_awareness = GetThreadDpiAwarenessContext(); wndPtr->min_pos.x = wndPtr->min_pos.y = -1; wndPtr->max_pos.x = wndPtr->max_pos.y = -1; @@ -2215,6 +2216,32 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd ) } +/*********************************************************************** + * GetWindowDpiAwarenessContext (USER32.@) + */ +DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) +{ + WND *win; + DPI_AWARENESS_CONTEXT ret; + + if (!(win = WIN_GetPtr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; + if (win == WND_OTHER_PROCESS) + { + if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + ret = win->dpi_awareness; + WIN_ReleasePtr( win ); + return ret; +} + + /********************************************************************** * WIN_GetWindowLong * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f728d19..0c7fcc8 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -61,6 +61,7 @@ typedef struct tagWND HICON hIcon; /* window's icon */ HICON hIconSmall; /* window's small icon */ HICON hIconSmall2; /* window's secondary small icon, derived from hIcon */ + DPI_AWARENESS_CONTEXT dpi_awareness; /* DPI awareness context */ struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo;/* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ diff --git a/include/winuser.h b/include/winuser.h index 31ab49e..63cfd5c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3780,6 +3780,7 @@ WINUSERAPI HWND WINAPI GetWindow(HWND,UINT); WINUSERAPI DWORD WINAPI GetWindowContextHelpId(HWND); WINUSERAPI HDC WINAPI GetWindowDC(HWND); WINUSERAPI BOOL WINAPI GetWindowDisplayAffinity(HWND,DWORD*); +WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext(HWND); WINUSERAPI BOOL WINAPI GetWindowInfo(HWND, PWINDOWINFO); WINUSERAPI LONG WINAPI GetWindowLongA(HWND,INT); WINUSERAPI LONG WINAPI GetWindowLongW(HWND,INT);

1 0

Michael Stefaniuc : wsdapi: Remove redundant NULL checks before heap_free( ).
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: aae4f1142f81e7964f64859267cfe945cc9a29c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4f1142f81e7964f648592… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:47 2018 +0200 wsdapi: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index cfcae6b..bea63fb 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -215,7 +215,7 @@ BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, U ret = TRUE; cleanup: - if (adapter_addresses != NULL) heap_free(adapter_addresses); + heap_free(adapter_addresses); return ret; } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 7779317..970bc4f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -127,8 +127,7 @@ static inline void free_xml_string(WS_XML_STRING *value) if (value == NULL) return; - if (value->bytes != NULL) - heap_free(value->bytes); + heap_free(value->bytes); heap_free(value); }

1 0

Michael Stefaniuc : winex11.drv: Print a debugstr and not the pointer to it.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 121f20453bf18cbf274a0563e912e92e86bb9264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=121f20453bf18cbf274a0563… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:50 2018 +0200 winex11.drv: Print a debugstr and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f881b0f..c2c1c6a 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -335,7 +335,7 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ unsigned int i; VkResult res; - TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name)

1 0

Dmitry Timoshkov : taskschd: IRegistrationInfo::put_Description() should accept NULL input.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 19f4037dd5abcc40c92aea651e11570801d1f140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f4037dd5abcc40c92aea65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:26:51 2018 +0800 taskschd: IRegistrationInfo::put_Description() should accept NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 ++++----- dlls/taskschd/tests/scheduler.c | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 19546c0..933d833 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -581,15 +581,14 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, BSTR description) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(description)); - if (!description) return E_INVALIDARG; - + if (description && !(str = heap_strdupW(description))) return E_OUTOFMEMORY; heap_free(reginfo->description); - reginfo->description = heap_strdupW(description); - /* FIXME: update XML on the server side */ - return reginfo->description ? S_OK : E_OUTOFMEMORY; + reginfo->description = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR *author) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c0f691a..82f3315 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1602,6 +1602,13 @@ todo_wine ok(hr == S_OK, "get_Description error %#x\n", hr); ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = IRegistrationInfo_put_Description(reginfo, NULL); + ok(hr == S_OK, "put_Description error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + ok(hr == S_OK, "get_Description error %#x\n", hr); + ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Author(reginfo, &bstr); ok(hr == S_OK, "get_Author error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));

1 0

Dmitry Timoshkov : mstask: Store comment using IRegistrationInfo.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 6ff9f7e8700be0fb9924128c400501cc3b984a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff9f7e8700be0fb9924128c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:27:07 2018 +0800 mstask: Store comment using IRegistrationInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5a40236..d04666d 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -248,41 +248,56 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; TRACE("(%p, %s)\n", iface, debugstr_w(comment)); if (!comment || !comment[0]) comment = NULL; - return IExecAction_put_Id(This->action, (BSTR)comment); + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr == S_OK) + { + hr = IRegistrationInfo_put_Description(info, (BSTR)comment); + IRegistrationInfo_Release(info); + } + return hr; } static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; HRESULT hr; - BSTR id; + BSTR description; DWORD len; TRACE("(%p, %p)\n", iface, comment); - hr = IExecAction_get_Id(This->action, &id); + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); if (hr != S_OK) return hr; - len = id ? lstrlenW(id) + 1 : 1; - *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); - if (*comment) + hr = IRegistrationInfo_get_Description(info, &description); + if (hr == S_OK) { - if (!id) - *comment[0] = 0; + len = description ? lstrlenW(description) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!description) + *comment[0] = 0; + else + lstrcpyW(*comment, description); + hr = S_OK; + } else - lstrcpyW(*comment, id); - hr = S_OK; + hr = E_OUTOFMEMORY; + + SysFreeString(description); } - else - hr = E_OUTOFMEMORY; - SysFreeString(id); + IRegistrationInfo_Release(info); return hr; }

1 0

Dmitry Timoshkov : mstask: Store creator using IRegistrationInfo.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 8f81fa82d53c92023e766e353f1a0e8dc34dcece URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f81fa82d53c92023e766e35… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 2 13:27:10 2018 +0800 mstask: Store creator using IRegistrationInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 60 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d04666d..34d1fa0 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -301,20 +301,60 @@ static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetCreator( - ITask* iface, - LPCWSTR pwszCreator) +static HRESULT WINAPI MSTASK_ITask_SetCreator(ITask *iface, LPCWSTR creator) { - FIXME("(%p, %p): stub\n", iface, pwszCreator); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; + + TRACE("(%p, %s)\n", iface, debugstr_w(creator)); + + if (!creator || !creator[0]) + creator = NULL; + + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr == S_OK) + { + hr = IRegistrationInfo_put_Author(info, (BSTR)creator); + IRegistrationInfo_Release(info); + } + return hr; } -static HRESULT WINAPI MSTASK_ITask_GetCreator( - ITask* iface, - LPWSTR *ppwszCreator) +static HRESULT WINAPI MSTASK_ITask_GetCreator(ITask *iface, LPWSTR *creator) { - FIXME("(%p, %p): stub\n", iface, ppwszCreator); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + IRegistrationInfo *info; + HRESULT hr; + BSTR author; + DWORD len; + + TRACE("(%p, %p)\n", iface, creator); + + hr = ITaskDefinition_get_RegistrationInfo(This->task, &info); + if (hr != S_OK) return hr; + + hr = IRegistrationInfo_get_Author(info, &author); + if (hr == S_OK) + { + len = author ? lstrlenW(author) + 1 : 1; + *creator = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*creator) + { + if (!author) + *creator[0] = 0; + else + lstrcpyW(*creator, author); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(author); + } + + IRegistrationInfo_Release(info); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(

1 0

Alexandre Julliard : user32: Implement Get/SetThreadDpiAwarenessContext().
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 478814ed95cdbb2aa89ef0af0903fd88dd10195c URL: https://source.winehq.org/git/wine.git/?a=commit;h=478814ed95cdbb2aa89ef0af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 12:48:29 2018 +0200 user32: Implement Get/SetThreadDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 23 +++++++++++++++++++++-- dlls/user32/tests/sysparams.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + dlls/user32/user_private.h | 1 + include/winuser.h | 1 + 5 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7780293..a018dfc 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3042,12 +3042,31 @@ UINT WINAPI GetDpiForWindow( HWND hwnd ) } /********************************************************************** + * GetThreadDpiAwarenessContext (USER32.@) + */ +DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) +{ + struct user_thread_info *info = get_user_thread_info(); + + if (info->dpi_awareness) return info->dpi_awareness; + if (dpi_awareness) return dpi_awareness; + return DPI_AWARENESS_CONTEXT_SYSTEM_AWARE; /* FIXME: should default to unaware */ +} + +/********************************************************************** * SetThreadDpiAwarenessContext (USER32.@) */ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) { - FIXME("(%p): stub\n", context); - return NULL; + DPI_AWARENESS_CONTEXT prev = GetThreadDpiAwarenessContext(); + + if (!IsValidDpiAwarenessContext( context )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + get_user_thread_info()->dpi_awareness = context; + return prev; } /********************************************************************** diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 03fa8d5..b541be4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -42,6 +42,9 @@ static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void); +static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; @@ -2998,6 +3001,13 @@ static void test_dpi_aware(void) if (pSetProcessDpiAwarenessContext) { + DPI_AWARENESS awareness; + DPI_AWARENESS_CONTEXT context; + + context = pGetThreadDpiAwarenessContext(); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + todo_wine + ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); SetLastError( 0xdeadbeef ); ret = pSetProcessDpiAwarenessContext( NULL ); ok( !ret, "got %d\n", ret ); @@ -3018,7 +3028,34 @@ static void test_dpi_aware(void) ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); ret = pIsProcessDPIAware(); ok(ret, "got %d\n", ret); + context = pGetThreadDpiAwarenessContext(); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); + SetLastError( 0xdeadbeef ); + context = pSetThreadDpiAwarenessContext( 0 ); + ok( !context, "got %p\n", context ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-5 ); + ok( !context, "got %p\n", context ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); + context = pGetThreadDpiAwarenessContext(); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); + context = pGetThreadDpiAwarenessContext(); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); } + else win_skip( "SetProcessDPIAware not supported\n" ); ret = pSetProcessDPIAware(); ok(ret, "got %d\n", ret); @@ -3045,6 +3082,9 @@ START_TEST(sysparams) pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); + pGetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetThreadDpiAwarenessContext"); + pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext"); + pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index b0109cb..85499b6 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -379,6 +379,7 @@ @ stdcall GetTabbedTextExtentW(long wstr long long ptr) @ stdcall GetTaskmanWindow () @ stdcall GetThreadDesktop(long) +@ stdcall GetThreadDpiAwarenessContext() @ stdcall GetTitleBarInfo(long ptr) @ stdcall GetTopWindow(long) @ stdcall GetTouchInputInfo(long long ptr long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5d54cb1..7d33d9d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -169,6 +169,7 @@ struct wm_char_mapping_data /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info { + DPI_AWARENESS_CONTEXT dpi_awareness; /* DPI awareness context */ HANDLE server_queue; /* Handle to server-side queue */ DWORD wake_mask; /* Current queue wake mask */ DWORD changed_mask; /* Current queue changed mask */ diff --git a/include/winuser.h b/include/winuser.h index 24d9e57..31ab49e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3766,6 +3766,7 @@ WINUSERAPI DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT #define GetTabbedTextExtent WINELIB_NAME_AW(GetTabbedTextExtent) WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); WINUSERAPI HDESK WINAPI GetThreadDesktop(DWORD); +WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void); WINUSERAPI HWND WINAPI GetTopWindow(HWND); WINUSERAPI BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT,UINT,TOUCHINPUT*,int); WINUSERAPI BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL);

1 0

Alexandre Julliard : user32: Support forcing the DPI awareness through the image file execution options.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: c440af11bd53afda74635be679c89e1014c4fe81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c440af11bd53afda74635be6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 11:19:17 2018 +0200 user32: Support forcing the DPI awareness through the image file execution options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 057c7aa..418359a 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -219,11 +219,23 @@ static const WCHAR *get_default_desktop(void) static void dpiaware_init(void) { WCHAR buffer[256]; + DWORD option; static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; static const WCHAR namespace2005W[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; static const WCHAR namespace2016W[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','6','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + if (!LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, + dpiAwarenessW, REG_DWORD, &option, sizeof(option), NULL )) + { + TRACE( "got option %x\n", option ); + if (option <= 2) + { + SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~(ULONG_PTR)option ); + return; + } + } + if (QueryActCtxSettingsW( 0, NULL, namespace2016W, dpiAwarenessW, buffer, ARRAY_SIZE(buffer), NULL )) { static const WCHAR unawareW[] = {'u','n','a','w','a','r','e',0};

1 0