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

[PATCH] shell32/tests: Fix some failures in test_contextmenu().
by Zebediah Figura Jan. 18, 2020

Jan. 18, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 43cbbfda2c..14d243a03b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4356,23 +4356,19 @@ if (hr == S_OK) static void test_contextmenu(IContextMenu *menu, BOOL background) { HMENU hmenu = CreatePopupMenu(); - const int id_upper_limit = 32767; - const int baseItem = 0x40; - INT max_id, max_id_check; - UINT count, i; + UINT count, i, max_id; HRESULT hr; test_contextmenu_qi(menu, FALSE); - hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, 64, 32767, CMF_NORMAL); ok(SUCCEEDED(hr), "Failed to query the menu, hr %#x.\n", hr); max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ - ok(max_id <= id_upper_limit, "Got %d\n", max_id); + ok(max_id <= 32767, "Got %d\n", max_id); count = GetMenuItemCount(hmenu); ok(count, "Got %d\n", count); - max_id_check = 0; for (i = 0; i < count; i++) { MENUITEMINFOA mii; @@ -4387,26 +4383,20 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(res, "Failed to get menu item info, error %d.\n", GetLastError()); - ok((mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if (!(mii.fType & MFT_SEPARATOR)) { - max_id_check = (mii.wID > max_id_check) ? mii.wID : max_id_check; - hr = IContextMenu_GetCommandString(menu, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + ok(mii.wID >= 64 && mii.wID <= 64 + max_id, + "Expected between 64 and %d, got %d.\n", 64 + max_id, mii.wID); + hr = IContextMenu_GetCommandString(menu, mii.wID - 64, GCS_VERBA, 0, buf, sizeof(buf)); todo_wine_if(background) - ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); - if (SUCCEEDED(hr)) - trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); - else if (hr == E_NOTIMPL) - trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, + "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); + if (hr == S_OK) + trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); + else + trace("Got ID %d, hr %#x, string %s.\n", mii.wID, hr, debugstr_a(mii.dwTypeData)); } } - max_id_check -= baseItem; - ok((max_id_check == max_id) || - (max_id_check == max_id-1) || /* Win 7 */ - (max_id_check == max_id-2) || /* Win 8 */ - (max_id_check == max_id-3), - "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); if (count) { -- 2.25.0

2 1

[PATCH] add: SetEnvironmentStringsW
by Frank Uhlig Jan. 17, 2020

Jan. 17, 2020

Please find attached my suggestion for an implementation of SetEnvironmentStringsW with tests. Currently cannot get sendmail to work properly, so sorry for the inconvenience. Frank

3 3

[RFC 0/2] Refactor FileSchemeHandler and add stub MPEG4ByteStreamHandler.
by Derek Lesho Jan. 17, 2020

Jan. 17, 2020

I'm submitting these patches as RFCs as I'm new to this API, and I'm not sure about the best way to abstract functionality in COM classes when using C. Derek Lesho (2): mf: Move generic handler to code to helper functions. mf: Implement stub MPEG4 ByteStream handler. dlls/mf/Makefile.in | 2 + dlls/mf/handler.c | 360 +++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 371 +++++-------------------------------------- dlls/mf/mf.idl | 7 + dlls/mf/mf.rgs | 7 + dlls/mf/mf_private.h | 26 +++ dlls/mf/mpeg4.c | 149 +++++++++++++++++ 7 files changed, 593 insertions(+), 329 deletions(-) create mode 100644 dlls/mf/handler.c create mode 100644 dlls/mf/mpeg4.c -- 2.25.0

1 2

Wine32 requires 32bit libraries? No fix?
by Klaus-J. Wolf Jan. 17, 2020

Jan. 17, 2020

I recently noted that some Linux* distributions stop their x86 32bit flavor because 32bit care occupies lots of time (apparently more and more since AMD64 mechanisms are missing) not outweighed by the number of 32bit platform users remaining. I also noted that apparently, there is no way to compile/link the Wine32 executable with 64bit libs. Since I’m a developer by profession, I would like to ask what the main problems are and if I can help. Any notes welcome.

8 8

[PATCH] urlmon: Fix CoInternetParse{Url,IUri} spec entry.
by Piotr Caban Jan. 17, 2020

Jan. 17, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/urlmon/urlmon.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] urlmon/tests: Avoid testing that only certain interfaces are queried.
by Zebediah Figura Jan. 17, 2020

Jan. 17, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/urlmon/tests/url.c | 46 +++++++---------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c8d1abdb76..3a6ad1390fa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ @@ -366,7 +365,7 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if (winetest_debug > 1) trace("IInternetProtocol::QueryInterface(%s)\n", debugstr_guid(riid)); *ppv = NULL; @@ -383,15 +382,6 @@ static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID r return S_OK; } - if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) - return E_NOINTERFACE; /* TODO */ - - if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(%s)\n", wine_dbgstr_guid(riid)); - return E_NOINTERFACE; /* TODO */ - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1403,6 +1393,10 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { + if (winetest_debug > 1) + trace("IServiceProvider::QueryService(service %s, iid %s)\n", + debugstr_guid(guidService), debugstr_guid(riid)); + if(IsEqualGUID(&IID_IAuthenticate, guidService)) { CHECK_EXPECT(QueryService_IAuthenticate); return E_NOTIMPL; @@ -1430,19 +1424,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return S_OK; } - if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { - trace("QueryService(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { - trace("QueryService(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + *ppv = NULL; return E_NOINTERFACE; } @@ -1505,7 +1487,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0xf286fa56,0xc1fd,0x4270,{0x8e,0x67,0xb3,0xeb,0x79,0x0a,0x81,0xe8}}; + if (winetest_debug > 1) trace("IBindStatusCallback::QueryInterface(%s)\n", debugstr_guid(riid)); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); @@ -1554,20 +1536,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) { CHECK_EXPECT2(QueryInterface_IHttpSecurity); return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_IGetBindHandle, riid)) { - trace("QI(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(IID_undocumentedIE10)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { - trace("QI(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else { - ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); } return E_NOINTERFACE; -- 2.24.1

3 5

[PATCH] comctl32/datetime: Simplify last digits calculation.
by Gabriel Ivăncescu Jan. 17, 2020

Jan. 17, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 05ae3a6..51c20a7 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -472,10 +472,10 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[1] = 0; break; case ONEDIGITYEAR: - wsprintfW (result, fmt_dW, date.wYear-10* (int) floor(date.wYear/10)); + wsprintfW (result, fmt_dW, date.wYear % 10); break; case TWODIGITYEAR: - wsprintfW (result, fmt__2dW, date.wYear-100* (int) floor(date.wYear/100)); + wsprintfW (result, fmt__2dW, date.wYear % 100); break; case INVALIDFULLYEAR: case FULLYEAR: -- 2.21.0

1 0

[PATCH 1/2] msi/tests: Fix test_feature_override() to properly clean up its features on removal.
by Zebediah Figura Jan. 17, 2020

Jan. 17, 2020

This was leaving behind registry entries (as well as the already accounted-for program files), which apparently caused subsequent test failures when running msi:action. While Wine is not behaving exactly correctly here (i.e. and removing the feature anyway), I suspect it is not sufficiently interesting to test whether we behave correctly with what is essentially a buggy package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- For reference: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/Using-Conditi… dlls/msi/tests/install.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 365f1d3a756..0bd82a621fc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -966,8 +966,8 @@ static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescriptio static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" "Condition\tFeature_\tLevel\n" - "preselected\t0\tPreselected\n" - "notpreselected\t0\tNOT Preselected\n"; + "preselected\t0\tPreselected AND NOT REMOVE\n" + "notpreselected\t0\tNOT Preselected AND NOT REMOVE\n"; static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -5464,10 +5464,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5480,10 +5478,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access); -- 2.24.1

3 5

[PATCH] msctf/tests: Fix some test failures on Windows 10.
by Zebediah Figura Jan. 16, 2020

Jan. 16, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea409..b9a225af588 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2405,6 +2405,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; @@ -2421,11 +2422,13 @@ static void test_AssociateFocus(void) ok(olddm == dm1, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(olddm); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_OnSetFocus = SINK_IGNORE; /* OnSetFocus fires a couple of times on Win7 */ test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; SetFocus(wnd2); processPendingMessages(); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ SetFocus(wnd1); processPendingMessages(); test_OnSetFocus = SINK_UNEXPECTED; @@ -2433,6 +2436,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); ITfDocumentMgr_Release(dm2); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; @@ -2443,8 +2447,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ DestroyWindow(wnd2); - test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnPopContext = SINK_IGNORE; /* Vista+, twice Win10 1709+ */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); test_CurrentFocus = NULL; -- 2.24.1

2 1

[PATCH] user32/tests: Fix some test failures with Windows 10.
by Zebediah Figura Jan. 16, 2020

Jan. 16, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This doesn't fix SM_CXMIN(TRACK) or SM_C[XY]SMICON. The former seems to be scaled in a similar manner to SM_CYMIN, but I was unable to easily figure out how to adapt the text width algorithm. The latter probably interacts with DPI in ways I was unable to sufficiently test. dlls/user32/tests/sysparams.c | 55 ++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index e40d49e8f80..431b87cde14 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -664,19 +664,17 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro rc=SystemParametersInfoA( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); if (0) { @@ -2921,7 +2919,7 @@ static void test_GetSystemMetrics( void) static void compare_font( const LOGFONTW *lf1, const LOGFONTW *lf2, int dpi, int custom_dpi, int line ) { - ok_(__FILE__,line)( lf1->lfHeight == MulDiv( lf2->lfHeight, dpi, custom_dpi ), + ok_(__FILE__,line)( lf2->lfHeight == (dpi == custom_dpi) ? lf1->lfHeight : MulDiv( lf1->lfHeight, custom_dpi, 2 * dpi ), "wrong lfHeight %d vs %d\n", lf1->lfHeight, lf2->lfHeight ); ok_(__FILE__,line)( abs( lf1->lfWidth - MulDiv( lf2->lfWidth, dpi, custom_dpi )) <= 1, "wrong lfWidth %d vs %d\n", lf1->lfWidth, lf2->lfWidth ); @@ -3015,6 +3013,13 @@ static void test_metrics_for_dpi( int custom_dpi ) "%u: wrong value %u vs %u font %u vs %u\n", i, ret1, ret2, get_tmheightW( &ncm1.lfMenuFont, 1 ), get_tmheightW( &ncm2.lfMenuFont, 1 )); break; + case SM_CYMIN: + case SM_CYMINTRACK: + val = pGetSystemMetricsForDpi( SM_CYCAPTION, custom_dpi ); + val += 2 * pGetSystemMetricsForDpi( SM_CYFRAME, custom_dpi ); + val += 2 * ncm2.iPaddedBorderWidth; + ok( ret1 == ret2 || ret2 == val /* Win10 1709+ */, "%u: expected %u or %u, got %u\n", i, ret1, val, ret2 ); + break; default: ok( ret1 == ret2, "%u: wrong value %u vs %u\n", i, ret1, ret2 ); break; @@ -3684,32 +3689,48 @@ static void test_dpi_context(void) switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: not valid\n", i ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: valid\n", i ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + i, (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i | 0x80000000, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: not valid\n", i | 0x80000000 ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: valid\n", i | 0x80000000 ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + (i | 0x80000000), (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); switch (~i) { -- 2.24.1

2 1