February 2020 - Wine-commits

Alex Henrie : include: Add remaining MIB_TCP6 types.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 69649476618b4c064d3a5e204cc0e45858020fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69649476618b4c064d3a5e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 3 23:50:08 2020 -0700 include: Add remaining MIB_TCP6 types. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tcpmib.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/tcpmib.h b/include/tcpmib.h index 477500c4fb..6576f8afa5 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -115,6 +115,24 @@ typedef struct _MIB_TCPTABLE_OWNER_PID MIB_TCPROW_OWNER_PID table[1]; } MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID; +typedef struct _MIB_TCP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; +} MIB_TCP6ROW_OWNER_PID, *PMIB_TCP6ROW_OWNER_PID; + +typedef struct _MIB_TCP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_PID table[1]; +} MIB_TCP6TABLE_OWNER_PID, *PMIB_TCP6TABLE_OWNER_PID; + typedef struct _MIB_TCPROW_OWNER_MODULE { DWORD dwState; @@ -133,6 +151,26 @@ typedef struct _MIB_TCPTABLE_OWNER_MODULE MIB_TCPROW_OWNER_MODULE table[1]; } MIB_TCPTABLE_OWNER_MODULE, *PMIB_TCPTABLE_OWNER_MODULE; +typedef struct _MIB_TCP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_TCP6ROW_OWNER_MODULE, *PMIB_TCP6ROW_OWNER_MODULE; + +typedef struct _MIB_TCP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_MODULE table[1]; +} MIB_TCP6TABLE_OWNER_MODULE, *PMIB_TCP6TABLE_OWNER_MODULE; + typedef struct _MIB_TCPROW2 { DWORD dwState;

1 0

Alistair Leslie-Hughes : include: Add cdosys.idl.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: f3fc17363e369e2c5d977d51c746b370b5e20c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3fc17363e369e2c5d977d51… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 4 03:37:57 2020 +0000 include: Add cdosys.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cdosys.idl | 417 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3fc17363e369e2c5d97…

1 0

Daniel Lehman : msvcrt/tests: Add some wcstombs_s_l tests.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 05e335c103dce905a12e35777fe3a8763cf1b84c URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e335c103dce905a12e3577… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 3 11:15:54 2020 -0800 msvcrt/tests: Add some wcstombs_s_l tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8f97d8959e..32e264908a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -76,6 +76,7 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); +static int (__cdecl *p_wcstombs_s_l)(size_t*,char*,size_t,const wchar_t*,size_t,_locale_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); static int (__cdecl *p_mbsrtowcs_s)(size_t*,wchar_t*,size_t,const char**,size_t,mbstate_t*); @@ -2277,6 +2278,76 @@ static void test_mbstowcs(void) setlocale(LC_ALL, "C"); } +static void test__wcstombs_s_l(void) +{ + struct test { + const wchar_t *wstr; + size_t wlen; + const char *str; + size_t len; + size_t ret; + int err; + const char *locale; + BOOL todo_ret; + BOOL todo_err; + } tests[] = { + /* wstr str ret err locale */ + { L"", 0, NULL, 0, 1, 0, NULL }, + { L"\xfffd", 1, NULL, 0, 2, 0, NULL }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, NULL, TRUE }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, NULL, TRUE }, + { L"text", _TRUNCATE, "text", 5, 5, 0, NULL }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, NULL, FALSE, TRUE }, + { L"text", 5, "", 3, 0, ERANGE, NULL, TRUE }, + + { L"", 0, NULL, 0, 1, 0, "English_United States.1252", TRUE, TRUE }, + { L"\xfffd", 1, NULL, 0, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"text", _TRUNCATE, "text", 5, 5, 0, "English_United States.1252" }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, "English_United States.1252", FALSE, TRUE }, + { L"text", 5, "", 3, 0, ERANGE, "English_United States.1252", TRUE }, + }; + _locale_t locale; + char out[6]; + size_t ret; + int err; + int i; + + if(!p__create_locale) { + win_skip("_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if(tests[i].locale) + { + locale = p__create_locale(LC_ALL, tests[i].locale); + ok(locale != NULL, "_create_locale failed for %s\n", tests[i].locale); + } + else + locale = NULL; + + ret = ~0; + memset(out, 0xcc, sizeof(out)); + err = p_wcstombs_s_l(&ret, tests[i].str ? out : NULL, tests[i].len, + tests[i].wstr, tests[i].wlen, locale); + todo_wine_if(tests[i].todo_ret) + ok(ret == tests[i].ret, "%d: expected ret %d, got %d for '%s' in locale %s\n", i, tests[i].ret, ret, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + todo_wine_if(tests[i].todo_err) + ok(err == tests[i].err, "%d: expected err %d, got %d for '%s' in locale %s\n", i, tests[i].err, err, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + if(tests[i].str) + ok(!memcmp(out, tests[i].str, strlen(tests[i].str)+1), + "%d: expected out %s, got %s for '%s' in locale %s\n", i, tests[i].str, out, + wine_dbgstr_w(tests[i].wstr), tests[i].locale); + + p__free_locale(locale); + } +} + static void test_gcvt(void) { char buf[1024], *res; @@ -4196,6 +4267,7 @@ START_TEST(string) p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); + p_wcstombs_s_l = (void *)GetProcAddress(hMsvcrt, "_wcstombs_s_l"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); @@ -4272,6 +4344,7 @@ START_TEST(string) test__strtoi64(); test__strtod(); test_mbstowcs(); + test__wcstombs_s_l(); test_gcvt(); test__itoa_s(); test__strlwr_s();

1 0

Nikolay Sivov : dwrite: Return static axis values for weight/width/italic properties.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 282678cc70aff6512446c7c0e352c5b13e4d4a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=282678cc70aff6512446c7c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 4 13:15:09 2020 +0300 dwrite: Return static axis values for weight/width/italic properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 ++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc0af3c79e..353282bbd4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -80,6 +80,8 @@ struct dwrite_font_data FONTSIGNATURE fontsig; UINT32 flags; /* enum font_flags */ struct dwrite_font_propvec propvec; + /* Static axis for weight/width/italic. */ + DWRITE_FONT_AXIS_VALUE axis[3]; DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; @@ -2061,8 +2063,9 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr TRACE("%p, %p.\n", iface, reference); - return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)font->family->collection->factory, - font->data->file, font->data->face_index, font->data->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference(font->family->collection->factory, font->data->file, + font->data->face_index, font->data->simulations, font->data->axis, ARRAY_SIZE(font->data->axis), + (IDWriteFontFaceReference1 **)reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) @@ -3857,6 +3860,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_font_data **ret) { + static const float width_axis_values[] = + { + 0.0f, /* DWRITE_FONT_STRETCH_UNDEFINED */ + 50.0f, /* DWRITE_FONT_STRETCH_ULTRA_CONDENSED */ + 62.5f, /* DWRITE_FONT_STRETCH_EXTRA_CONDENSED */ + 75.0f, /* DWRITE_FONT_STRETCH_CONDENSED */ + 87.5f, /* DWRITE_FONT_STRETCH_SEMI_CONDENSED */ + 100.0f, /* DWRITE_FONT_STRETCH_NORMAL */ + 112.5f, /* DWRITE_FONT_STRETCH_SEMI_EXPANDED */ + 125.0f, /* DWRITE_FONT_STRETCH_EXPANDED */ + 150.0f, /* DWRITE_FONT_STRETCH_EXTRA_EXPANDED */ + 200.0f, /* DWRITE_FONT_STRETCH_ULTRA_EXPANDED */ + }; + struct file_stream_desc stream_desc; struct dwrite_font_props props; struct dwrite_font_data *data; @@ -3910,6 +3927,13 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); + data->axis[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + data->axis[0].value = props.weight; + data->axis[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + data->axis[1].value = width_axis_values[props.stretch]; + data->axis[2].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + data->axis[2].value = data->style == DWRITE_FONT_STYLE_ITALIC ? 1.0f : 0.0f; + *ret = data; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60c9b9c742..d21326f7c9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7929,7 +7929,6 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - todo_wine ok(axis_count > 0, "Unexpected axis value count.\n"); IDWriteFontFaceReference1_Release(ref2); }

1 0

Jacek Caban : ole32: Silence noisy ERRs.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 5ef5a79295cbb3bb486528a7bba9cdf7c4bbdfc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ef5a79295cbb3bb486528a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 14:46:43 2020 +0100 ole32: Silence noisy ERRs. Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 4b8945db6f..a7401e9095 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -165,7 +165,7 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", debugstr_guid(riid), hr); }else { - ERR("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); + WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); hr = E_NOINTERFACE; } @@ -303,7 +303,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL nonlocal_mqis, iids, &qiresults); IRemUnknown_Release(remunk); if (FAILED(hr)) - ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); } /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of

1 0

Jacek Caban : guiddef.h: Remove GUID_NULL declaration.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: c041605b0074e6b12e5ea1df0cc645e772a220a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c041605b0074e6b12e5ea1df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 15:21:11 2020 +0100 guiddef.h: Remove GUID_NULL declaration. It's declared in cguid.h with proper extern "C". Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 1 + dlls/rpcrt4/ndr_contexthandle.c | 1 + dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 1 + include/guiddef.h | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 0fcaf757b2..4637d62f8b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -30,6 +30,7 @@ #undef CLSID_DOMDocument #include "msxml2did.h" #include "dispex.h" +#include "cguid.h" #include "wine/test.h" diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 848d924e97..36deb41d81 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -22,6 +22,7 @@ #include "ndr_misc.h" #include "rpc_assoc.h" #include "rpcndr.h" +#include "cguid.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f8a4e93efc..0840341b7d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -37,6 +37,7 @@ #include "winioctl.h" #include "rpc.h" #include "rpcdce.h" +#include "cguid.h" #include "setupapi_private.h" diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..b887bd8977 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -31,6 +31,7 @@ #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" +#include "cguid.h" #include "wine/heap.h" #include "wine/test.h" diff --git a/include/guiddef.h b/include/guiddef.h index ba39dd87b4..cc26e8b3a5 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -167,6 +167,4 @@ inline bool operator!=(const GUID& guidOne, const GUID& guidOther) } #endif -extern const IID GUID_NULL; - #endif /* _GUIDDEF_H_ */

1 0

Puetz Kevin A : objbase.h: Add COWAIT_DEFAULT declaration.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 7039631c78170750586460500195551e52da653d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7039631c7817075058646050… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 4 14:31:56 2020 +0100 objbase.h: Add COWAIT_DEFAULT declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/objbase.h b/include/objbase.h index 75280d6de7..0eae397b43 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -392,6 +392,7 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID ExtensionGuid, IChannelHook *pChann typedef enum tagCOWAIT_FLAGS { + COWAIT_DEFAULT = 0x00000000, COWAIT_WAITALL = 0x00000001, COWAIT_ALERTABLE = 0x00000002, COWAIT_INPUTAVAILABLE = 0x00000004

1 0

Francois Gouget : kernel32: Export kernel32's FlushFileBuffers() implementation.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: b29d9301a38426a6b76b7b73dfb3ecb0e6ca171c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29d9301a38426a6b76b7b73… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 4 12:13:54 2020 +0100 kernel32: Export kernel32's FlushFileBuffers() implementation. kernel32 should export its own implementation now that it has been moved back from kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9295dc3ee..47c7d63761 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -516,7 +516,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) -@ stdcall -import FlushFileBuffers(long) +@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() @ stdcall -import FlushViewOfFile(ptr long)

1 0

Zhiyi Zhang : setupapi: Implement SetupDiOpenDeviceInterfaceRegKey().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 4a3cd01bd150c27d7fd40d04fc92b173f2f988af URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a3cd01bd150c27d7fd40d04… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 4 15:52:54 2020 +0800 setupapi: Implement SetupDiOpenDeviceInterfaceRegKey(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 25 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0840341b7d..268965f0fe 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3525,6 +3525,31 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA( return FALSE; } +/*********************************************************************** + * SetupDiOpenDeviceInterfaceRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO devinfo, PSP_DEVICE_INTERFACE_DATA iface_data, + DWORD reserved, REGSAM access) +{ + struct device_iface *iface; + LSTATUS lr; + HKEY key; + + TRACE("devinfo %p, iface_data %p, reserved %d, access %#x.\n", devinfo, iface_data, reserved, access); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return INVALID_HANDLE_VALUE; + + lr = RegOpenKeyExW(iface->refstr_key, DeviceParameters, 0, access, &key); + if (lr) + { + SetLastError(lr); + return INVALID_HANDLE_VALUE; + } + + return key; +} + /*********************************************************************** * SetupDiSetClassInstallParamsA (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 74c252c6fd..33ccc48097 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -380,7 +380,7 @@ @ stdcall SetupDiOpenDeviceInfoA(ptr str ptr long ptr) @ stdcall SetupDiOpenDeviceInfoW(ptr wstr ptr long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b887bd8977..dcfe5cd231 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2011,6 +2011,7 @@ static void test_device_interface_key(void) ok(!ret, "key should exist: %u\n", ret); ret = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!ret, "RegSetValue failed: %u\n", ret); sz = sizeof(buffer); ret = RegQueryValueA(dikey, NULL, buffer, &sz); ok(!ret, "RegQueryValue failed: %u\n", ret); @@ -2031,6 +2032,64 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_interface_key(void) +{ + SP_DEVICE_INTERFACE_DATA iface; + SP_DEVINFO_DATA device; + CHAR buffer[5]; + HDEVINFO set; + LSTATUS lr; + LONG size; + HKEY key; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x\n", GetLastError()); + + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + iface.cbSize = sizeof(iface); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + /* Test open before creation */ + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + /* Test opened key is from SetupDiCreateDeviceInterfaceRegKey */ + key = SetupDiCreateDeviceInterfaceRegKeyW(set, &iface, 0, KEY_ALL_ACCESS, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Failed to create interface registry key, error %#x\n", GetLastError()); + + lr = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!lr, "RegSetValue failed, error %#x\n", lr); + + RegCloseKey(key); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key != INVALID_HANDLE_VALUE, "Failed to open interface registry key, error %#x\n", GetLastError()); + + size = sizeof(buffer); + lr = RegQueryValueA(key, NULL, buffer, &size); + ok(!lr, "RegQueryValue failed, error %#x\n", lr); + ok(!strcmp(buffer, "test"), "got wrong data %s\n", buffer); + + RegCloseKey(key); + + /* Test open after removal */ + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to remove device interface, error %#x.\n", GetLastError()); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); +} + static void test_device_install_params(void) { SP_DEVINFO_DATA device = {sizeof(device)}; @@ -3142,6 +3201,7 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_open_device_interface_key(); test_device_install_params(); test_driver_list(); test_call_class_installer();

1 0

Zhiyi Zhang : user32/tests: Add more ChangeDisplaySettings tests.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 0097035698959787fbe0084f61ac8ba11f404c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0097035698959787fbe0084f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 4 15:54:34 2020 +0800 user32/tests: Add more ChangeDisplaySettings tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 581 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 528 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0097035698959787fbe0…

1 0