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

Henri Verbeet : wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: e7af1ea387f0133d12ccc979c13854c1040eb274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7af1ea387f0133d12ccc979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:13 2018 +0430 wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset(). Since we use this for ddraw now. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b17effe..adaa4f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,7 +4778,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); - if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) + if (swapchain_desc->backbuffer_usage && swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD

1 0

Dmitry Timoshkov : mstask: Implement setting and getting a task comment using IExecAction.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 52df130d29132578c8a5c2e2db6a77e50113c1fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52df130d29132578c8a5c2e2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 30 17:00:05 2018 +0800 mstask: Implement setting and getting a task comment using IExecAction. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 64 +++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0b984..5a40236 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -62,7 +61,6 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); - HeapFree(GetProcessHeap(), 0, This->comment); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -247,56 +245,45 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetComment( - ITask* iface, - LPCWSTR pwszComment) +static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_comment; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); + TRACE("(%p, %s)\n", iface, debugstr_w(comment)); - /* Empty comment */ - if (pwszComment[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = NULL; - return S_OK; - } + if (!comment || !comment[0]) + comment = NULL; - /* Set to pwszComment */ - n = (lstrlenW(pwszComment) + 1); - tmp_comment = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_comment) - return E_OUTOFMEMORY; - lstrcpyW(tmp_comment, pwszComment); - HeapFree(GetProcessHeap(), 0, This->comment); - This->comment = tmp_comment; - - return S_OK; + return IExecAction_put_Id(This->action, (BSTR)comment); } -static HRESULT WINAPI MSTASK_ITask_GetComment( - ITask* iface, - LPWSTR *ppwszComment) +static HRESULT WINAPI MSTASK_ITask_GetComment(ITask *iface, LPWSTR *comment) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR id; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszComment); + TRACE("(%p, %p)\n", iface, comment); - n = This->comment ? lstrlenW(This->comment) + 1 : 1; - *ppwszComment = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszComment) - return E_OUTOFMEMORY; + hr = IExecAction_get_Id(This->action, &id); + if (hr != S_OK) return hr; - if (!This->comment) - *ppwszComment[0] = 0; + len = id ? lstrlenW(id) + 1 : 1; + *comment = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*comment) + { + if (!id) + *comment[0] = 0; + else + lstrcpyW(*comment, id); + hr = S_OK; + } else - lstrcpyW(*ppwszComment, This->comment); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(id); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetCreator( @@ -798,7 +785,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->comment = NULL; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */

1 0

Dmitry Timoshkov : mstask: Implement setting and getting parameters using IExecAction.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: cad2e5e8e2de39346a895bed39b62b49e45d3525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad2e5e8e2de39346a895bed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 30 16:59:57 2018 +0800 mstask: Implement setting and getting parameters using IExecAction. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 62 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1a079cc..1aba435 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,7 +39,6 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - LPWSTR parameters; LPWSTR comment; DWORD maxRunTime; LPWSTR accountName; @@ -64,7 +63,6 @@ static void TaskDestructor(TaskImpl *This) HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); HeapFree(GetProcessHeap(), 0, This->comment); - HeapFree(GetProcessHeap(), 0, This->parameters); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -493,55 +491,46 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appn return hr; } -static HRESULT WINAPI MSTASK_ITask_SetParameters( - ITask* iface, - LPCWSTR pwszParameters) +static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); - LPWSTR tmp_parameters; - TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); + TRACE("(%p, %s)\n", iface, debugstr_w(params)); /* Empty parameter list */ - if (pwszParameters[0] == 0) - { - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = NULL; - return S_OK; - } + if (!params || !params[0]) + params = NULL; - /* Set to pwszParameters */ - n = (lstrlenW(pwszParameters) + 1); - tmp_parameters = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!tmp_parameters) - return E_OUTOFMEMORY; - lstrcpyW(tmp_parameters, pwszParameters); - HeapFree(GetProcessHeap(), 0, This->parameters); - This->parameters = tmp_parameters; - return S_OK; + return IExecAction_put_Arguments(This->action, (BSTR)params); } -static HRESULT WINAPI MSTASK_ITask_GetParameters( - ITask* iface, - LPWSTR *ppwszParameters) +static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) { - DWORD n; TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR args; + DWORD len; - TRACE("(%p, %p)\n", iface, ppwszParameters); + TRACE("(%p, %p)\n", iface, params); - n = This->parameters ? lstrlenW(This->parameters) + 1 : 1; - *ppwszParameters = CoTaskMemAlloc(n * sizeof(WCHAR)); - if (!*ppwszParameters) - return E_OUTOFMEMORY; + hr = IExecAction_get_Arguments(This->action, &args); + if (hr != S_OK) return hr; - if (!This->parameters) - *ppwszParameters[0] = 0; + len = args ? lstrlenW(args) + 1 : 1; + *params = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*params) + { + if (!args) + *params[0] = 0; + else + lstrcpyW(*params, args); + hr = S_OK; + } else - lstrcpyW(*ppwszParameters, This->parameters); + hr = E_OUTOFMEMORY; - return S_OK; + SysFreeString(args); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( @@ -784,7 +773,6 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); - This->parameters = NULL; This->comment = NULL; This->accountName = NULL;

1 0

André Hentschel : schedsvc/tests: Recognize newer Windows 10's RPC version.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: b164e4dc8d9b61878a2a6ccacabfd9d223b7290e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b164e4dc8d9b61878a2a6cca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:46 2018 +0200 schedsvc/tests: Recognize newer Windows 10's RPC version. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index be1e5eb..a383538 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -115,7 +115,8 @@ START_TEST(rpcapi) hr = SchRpcHighestVersion(&version); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || - version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */, + version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */ || + version == 0x10006 /* win10 1709 */, "wrong version %#x\n", version); SetUnhandledExceptionFilter(old_exception_filter);

1 0

Dmitry Timoshkov : mstask: Improve stubs for ITask::GetTaskFlags and ITask ::GetFlags.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: a6866be9049f5e86418f3c2a12ef890ceebba549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6866be9049f5e86418f3c2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 30 16:58:39 2018 +0800 mstask: Improve stubs for ITask::GetTaskFlags and ITask::GetFlags. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 18 ++++++++---------- dlls/mstask/tests/task.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e77a959..97d7782 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -373,12 +373,11 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( @@ -588,12 +587,11 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTaskFlags( - ITask* iface, - DWORD *pdwFlags) +static HRESULT WINAPI MSTASK_ITask_GetTaskFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, pdwFlags); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, flags); + *flags = 0; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index d139207..956aa0b 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -496,6 +496,39 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } +static void test_GetFlags(void) +{ + BOOL setup; + HRESULT hr; + DWORD flags; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + if (0) /* crashes under Windows */ + hr = ITask_GetFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(test_task, &flags); + ok(hr == S_OK, "GetFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + if (0) /* crashes under Windows */ + hr = ITask_GetTaskFlags(test_task, NULL); + + flags = 0xdeadbeef; + hr = ITask_GetTaskFlags(test_task, &flags); + ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + cleanup_task(); +} + START_TEST(task) { CoInitialize(NULL); @@ -505,5 +538,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); + test_GetFlags(); CoUninitialize(); }

1 0

Dmitry Timoshkov : mstask: Implement setting and getting working directory using IExecAction.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 04e240b3a7ca4705f60fde64e8db6078b36fba81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04e240b3a7ca4705f60fde64… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 30 17:00:02 2018 +0800 mstask: Implement setting and getting working directory using IExecAction. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 1aba435..ed0b984 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -533,20 +533,45 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) return hr; } -static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory( - ITask* iface, - LPCWSTR pwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory(ITask * iface, LPCWSTR workdir) { - FIXME("(%p, %s): stub\n", iface, debugstr_w(pwszWorkingDirectory)); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %s)\n", iface, debugstr_w(workdir)); + + if (!workdir || !workdir[0]) + workdir = NULL; + + return IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); } -static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory( - ITask* iface, - LPWSTR *ppwszWorkingDirectory) +static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory(ITask *iface, LPWSTR *workdir) { - FIXME("(%p, %p): stub\n", iface, ppwszWorkingDirectory); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + BSTR dir; + DWORD len; + + TRACE("(%p, %p)\n", iface, workdir); + + hr = IExecAction_get_WorkingDirectory(This->action, &dir); + if (hr != S_OK) return hr; + + len = dir ? lstrlenW(dir) + 1 : 1; + *workdir = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (*workdir) + { + if (!dir) + *workdir[0] = 0; + else + lstrcpyW(*workdir, dir); + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + + SysFreeString(dir); + return hr; } static HRESULT WINAPI MSTASK_ITask_SetPriority(

1 0

André Hentschel : kernel32/tests: Fix check for invalid type value.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 3d8d811be165cd9586d1389206c568b5c6975305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8d811be165cd9586d13892… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:50 2018 +0200 kernel32/tests: Fix check for invalid type value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- include/winnls.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index efb4231..5d5cc17 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4720,7 +4720,7 @@ static void test_GetGeoInfo(void) /* try invalid type value */ SetLastError(0xdeadbeef); - ret = pGetGeoInfoA(203, GEO_CURRENCYSYMBOL + 1, NULL, 0, 0); + ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); } diff --git a/include/winnls.h b/include/winnls.h index 1191111..99a30e4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -826,7 +826,9 @@ enum SYSGEOTYPE GEO_PARENT, GEO_DIALINGCODE, GEO_CURRENCYCODE, - GEO_CURRENCYSYMBOL + GEO_CURRENCYSYMBOL, + GEO_NAME, + GEO_ID }; enum SYSGEOCLASS

1 0

André Hentschel : kernel32/tests: Allow GetLastError to be unchanged in a test.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: d28628e9204e684bb695d1580abbf06eab89a2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28628e9204e684bb695d158… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:57 2018 +0200 kernel32/tests: Allow GetLastError to be unchanged in a test. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5d5cc17..d8f51d3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4660,7 +4660,8 @@ static void test_GetGeoInfo(void) SetLastError(0xdeadbeef); ret = pGetGeoInfoA(344, GEO_ISO2, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef /* Win10 */), "got %d\n", GetLastError()); ret = pGetGeoInfoA(203, GEO_ISO2, NULL, 0, 0); ok(ret == 3, "got %d\n", ret);

1 0

Stefan Leichter : wiaservc: Add some tests for SelectDeviceDlg.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: daf7f3c4ae41c5547e88ef40971e3adc1f9aab06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf7f3c4ae41c5547e88ef40… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:29 2018 +0200 wiaservc: Add some tests for SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 16 ++++++++++++++++ include/wiadef.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index c7c2fd9..6183cef 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -25,6 +25,8 @@ #include "objbase.h" #include "initguid.h" #include "wia_lh.h" +#include "sti.h" +#include "wiadef.h" #include "wine/test.h" @@ -54,6 +56,19 @@ todo_wine IEnumWIA_DEV_INFO_Release(devenum); } +static void test_SelectDeviceDlg(void) +{ + HRESULT hr; + IWiaItem *root; + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); +todo_wine + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); +todo_wine + ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); +} + START_TEST(wia) { HRESULT hr; @@ -68,6 +83,7 @@ START_TEST(wia) } test_EnumDeviceInfo(); + test_SelectDeviceDlg(); IWiaDevMgr_Release(devmanager); CoUninitialize(); diff --git a/include/wiadef.h b/include/wiadef.h index 28e43e0..bd95872 100644 --- a/include/wiadef.h +++ b/include/wiadef.h @@ -20,3 +20,9 @@ #define WIA_DEVINFO_ENUM_ALL 0x0000000f #define WIA_DEVINFO_ENUM_LOCAL 0x00000010 + +#define FACILITY_WIA 33 + +#define BASE_VAL_WIA_ERROR 0x00000000 + +#define WIA_S_NO_DEVICE_AVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIA, (BASE_VAL_WIA_ERROR + 21))

1 0

Alexandre Julliard : user32: Implement IsValidDpiAwarenessContext().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 4e752086d7d9331dba7434b8f1c124572b17ea0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e752086d7d9331dba7434b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 12:33:14 2018 +0200 user32: Implement IsValidDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 11 +++++++++++ dlls/user32/user32.spec | 1 + include/windef.h | 14 ++++++++++++++ include/winuser.h | 1 + 4 files changed, 27 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 34e0a37..565838f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2943,6 +2943,17 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, } /*********************************************************************** + * IsValidDpiAwarenessContext (USER32.@) + */ +BOOL WINAPI IsValidDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + return (context == DPI_AWARENESS_CONTEXT_UNAWARE || + context == DPI_AWARENESS_CONTEXT_SYSTEM_AWARE || + context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE || + context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); +} + +/*********************************************************************** * SetProcessDPIAware (USER32.@) */ BOOL WINAPI SetProcessDPIAware(void) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e0fdd3a..6ace359 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -460,6 +460,7 @@ @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow @ stdcall IsTouchWindow(long ptr) +@ stdcall IsValidDpiAwarenessContext(long) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) diff --git a/include/windef.h b/include/windef.h index df0eb77..40028f3 100644 --- a/include/windef.h +++ b/include/windef.h @@ -433,6 +433,20 @@ typedef struct _RECTL typedef const RECTL *LPCRECTL; +/* DPI awareness */ +typedef enum DPI_AWARENESS +{ + DPI_AWARENESS_INVALID = -1, + DPI_AWARENESS_UNAWARE = 0, + DPI_AWARENESS_SYSTEM_AWARE, + DPI_AWARENESS_PER_MONITOR_AWARE +} DPI_AWARENESS; + +#define DPI_AWARENESS_CONTEXT_UNAWARE ((DPI_AWARENESS_CONTEXT)-1) +#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4) + #ifdef __cplusplus } #endif diff --git a/include/winuser.h b/include/winuser.h index ece0109..90c257d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3848,6 +3848,7 @@ WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); WINUSERAPI BOOL WINAPI IsProcessDPIAware(void); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); +WINUSERAPI BOOL WINAPI IsValidDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); WINUSERAPI BOOL WINAPI IsWindowEnabled(HWND);

1 0