April 2021 - Wine-Devel - list.winehq.org

[PATCH 01/11] dhtmled.ocx: Add IConnectionPointContainer stub interface.
by Vijay Kiran Kamuju April 7, 2021

April 7, 2021

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/edit.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index fc518de7323..7772ec1538b 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -31,6 +31,7 @@ typedef struct IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; + IConnectionPointContainer IConnectionPointContainer_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -56,6 +57,11 @@ static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); } +static inline DHTMLEditImpl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IConnectionPointContainer_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -95,6 +101,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleControl_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IConnectionPointContainer)) + { + dhtml_edit_addref(This); + *out = &This->IConnectionPointContainer_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -923,6 +935,47 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IConnectionPointContainer(iface), iid, out); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return dhtml_edit_addref(impl_from_IConnectionPointContainer(iface)); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return dhtml_edit_release(impl_from_IConnectionPointContainer(iface)); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return CONNECT_E_NOCONNECTION; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -940,6 +993,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; + This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

2 20

[PATCH v2 09/11] dhtmled.ocx: Add IDispatch support for IDHTMLEdit.
by Vijay Kiran Kamuju April 7, 2021

April 7, 2021

This makes RSSedit to work, no error dialog is shown. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/dhtmled_private.h | 1 + dlls/dhtmled.ocx/edit.c | 112 ++++++++++++++++++++++++++--- dlls/dhtmled.ocx/main.c | 3 + 4 files changed, 108 insertions(+), 10 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index bbe397dc401..47d57f5b1f9 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid ole32 user32 gdi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/dhtmled_private.h b/dlls/dhtmled.ocx/dhtmled_private.h index 5a9e89b9977..763f1f4fd1b 100644 --- a/dlls/dhtmled.ocx/dhtmled_private.h +++ b/dlls/dhtmled.ocx/dhtmled_private.h @@ -17,3 +17,4 @@ */ extern HRESULT dhtml_edit_create(REFIID iid, void **out); +void release_typelib(void); diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index b96630c73e5..4d39f247be0 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -25,6 +25,78 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); +typedef enum tid_t { + NULL_tid, + IDHTMLEdit_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IDHTMLEdit +}; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_DHTMLEDLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + typedef struct { IDHTMLEdit IDHTMLEdit_iface; @@ -239,33 +311,55 @@ static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%p) stub\n", This, count); - *count = 0; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, count); + *count = 1; + return S_OK; } static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index, LCID lcid, ITypeInfo **type_info) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%u, %08x, %p) stub\n", This, type_index, lcid, type_info); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%u, %08x, %p)\n", This, type_index, lcid, type_info); + + hr = get_typeinfo(IDHTMLEdit_tid, type_info); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*type_info); + return hr; } static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLECHAR **names, UINT name_count, LCID lcid, DISPID *disp_ids) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%s, %p, %u, %08x, %p) stub\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %u, %08x, %p)\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_GetIDsOfNames(ti, names, name_count, disp_ids); } static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID iid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *ret, EXCEPINFO *exception_info, UINT *error_index) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p) stub\n", + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p)\n", This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index); - return E_NOTIMPL; + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_Invoke(ti, iface, member, flags, params, ret, exception_info, error_index); } static HRESULT WINAPI DHTMLEdit_ExecCommand(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, OLECMDEXECOPT options, diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c index b7409cf61a5..e4be35dd14b 100644 --- a/dlls/dhtmled.ocx/main.c +++ b/dlls/dhtmled.ocx/main.c @@ -107,6 +107,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved) DisableThreadLibraryCalls(instance); dhtmled_instance = instance; break; + case DLL_PROCESS_DETACH: + release_typelib(); + break; } return TRUE; -- 2.31.1

1 2

[PATCH] advapi32/tests: Use wide character string literals in registry.c.
by Giovanni Mascellani April 7, 2021

April 7, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 120 +++++++++++++++------------------ 1 file changed, 53 insertions(+), 67 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index dfadd13ea8c..534982565d9 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -248,12 +248,12 @@ static void test_set_value(void) { DWORD ret; - static const WCHAR name1W[] = {'C','l','e','a','n','S','i','n','g','l','e','S','t','r','i','n','g', 0}; - static const WCHAR name2W[] = {'S','o','m','e','I','n','t','r','a','Z','e','r','o','e','d','S','t','r','i','n','g', 0}; - static const WCHAR emptyW[] = {0}; - static const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; - static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 'L','o','t', 0 , 0 , 0 , 0, 0}; - static const WCHAR substring2W[] = {'T','h','i','s',0}; + static const WCHAR name1W[] = L"CleanSingleString"; + static const WCHAR name2W[] = L"SomeIntraZeroedString"; + static const WCHAR emptyW[] = L""; + static const WCHAR string1W[] = L"ThisNeverBreaks"; + static const WCHAR string2W[] = L"This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; + static const WCHAR substring2W[] = L"This"; static const char name1A[] = "CleanSingleString"; static const char name2A[] = "SomeIntraZeroedString"; @@ -412,7 +412,6 @@ static void test_set_value(void) win_skip("RegSetKeyValue() is not supported.\n"); else { - static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; DWORD len, type; HKEY subkey; @@ -421,10 +420,10 @@ static void test_set_value(void) test_hkey_main_Value_A(name1A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name1W, string2W, sizeof(string2W)); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, string1W, sizeof(string1W)); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ret = RegOpenKeyExW(hkey_main, subkeyW, 0, KEY_QUERY_VALUE, &subkey); + ret = RegOpenKeyExW(hkey_main, L"subkey", 0, KEY_QUERY_VALUE, &subkey); ok(ret == ERROR_SUCCESS, "got %d\n", ret); type = len = 0; ret = RegQueryValueExW(subkey, name1W, 0, &type, NULL, &len); @@ -432,13 +431,13 @@ static void test_set_value(void) ok(len == sizeof(string1W), "got %d\n", len); ok(type == REG_SZ, "got type %d\n", type); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, NULL, 0); ok(ret == ERROR_SUCCESS, "got %d\n", ret); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 4); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_SZ, NULL, 4); ok(ret == ERROR_NOACCESS, "got %d\n", ret); - ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_DWORD, NULL, 4); + ret = pRegSetKeyValueW(hkey_main, L"subkey", name1W, REG_DWORD, NULL, 4); ok(ret == ERROR_NOACCESS, "got %d\n", ret); RegCloseKey(subkey); @@ -475,9 +474,6 @@ static void test_enum_value(void) char value[20], data[20]; WCHAR valueW[20], dataW[20]; DWORD val_count, data_count, type; - static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; - static const WCHAR testW[] = {'T','e','s','t',0}; - static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -511,15 +507,15 @@ static void test_enum_value(void) val_count = 20; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 0, "data_count set to %d instead of 0\n", data_count ); ok( type == REG_BINARY, "type %d is not REG_BINARY\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data is not 'xxxxxxxxxx'\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data is not 'xxxxxxxx'\n" ); res = RegSetValueExA( test_key, "Test", 0, REG_SZ, (const BYTE *)"foobar", 7 ); ok( res == 0, "RegSetValueExA failed error %d\n", res ); @@ -628,7 +624,7 @@ static void test_enum_value(void) /* Unicode tests */ SetLastError(0xdeadbeef); - res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)foobarW, 7*sizeof(WCHAR) ); + res = RegSetValueExW( test_key, L"Test", 0, REG_SZ, (const BYTE *)L"foobar", 7*sizeof(WCHAR) ); if (res==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("RegSetValueExW is not implemented\n"); @@ -640,64 +636,64 @@ static void test_enum_value(void) val_count = 2; data_count = 2; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"xxxxxxxx" ), "value modified\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* overflow name */ val_count = 3; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"xxxxxxxx" ), "value modified\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* overflow data */ val_count = 20; data_count = 2; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"xxxxxxxx" ), "data modified\n" ); /* no overflow */ val_count = 20; data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); ok( val_count == 4, "val_count set to %d instead of 4\n", val_count ); ok( data_count == 7*sizeof(WCHAR), "data_count set to %d instead of 7*sizeof(WCHAR)\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); - ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + ok( !wcscmp( valueW, L"Test" ), "value is not 'Test'\n" ); + ok( !wcscmp( dataW, L"foobar" ), "data is not 'foobar'\n" ); if (pRegGetValueA) /* avoid a crash on Windows 2000 */ { /* no valueW and no val_count parameter */ data_count = 20; type = 1234; - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); @@ -705,15 +701,15 @@ static void test_enum_value(void) val_count = 20; data_count = 20; type = 1234; - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); /* no val_count parameter */ data_count = 20; type = 1234; - memcpy( valueW, xxxW, sizeof(xxxW) ); - memcpy( dataW, xxxW, sizeof(xxxW) ); + wcscpy( valueW, L"xxxxxxxx" ); + wcscpy( dataW, L"xxxxxxxx" ); res = RegEnumValueW( test_key, 0, valueW, NULL, NULL, &type, (BYTE*)dataW, &data_count ); ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); } @@ -1660,8 +1656,6 @@ static void test_reg_query_value(void) WCHAR valW[5]; LONG size, ret; - static const WCHAR expected[] = {'d','a','t','a',0}; - ret = RegCreateKeyA(hkey_main, "subkey", &subkey); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -1741,7 +1735,7 @@ static void test_reg_query_value(void) ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(!valW[0], "Expected valW to be untouched\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - try size in WCHARS */ SetLastError(0xdeadbeef); @@ -1750,17 +1744,17 @@ static void test_reg_query_value(void) ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(!valW[0], "Expected valW to be untouched\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - successfully read the value */ size = sizeof(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!lstrcmpW(valW, expected), "Got wrong value\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(!lstrcmpW(valW, L"data"), "Got wrong value\n"); + ok(size == 10, "Got wrong size: %d\n", size); /* unicode - set the value without a NULL terminator */ - ret = RegSetValueW(subkey, NULL, REG_SZ, expected, sizeof(expected)-sizeof(WCHAR)); + ret = RegSetValueW(subkey, NULL, REG_SZ, L"data", 8); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* unicode - read the unterminated value, value is terminated for us */ @@ -1768,8 +1762,8 @@ static void test_reg_query_value(void) size = sizeof(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!lstrcmpW(valW, expected), "Got wrong value\n"); - ok(size == sizeof(expected), "Got wrong size: %d\n", size); + ok(!lstrcmpW(valW, L"data"), "Got wrong value\n"); + ok(size == 10, "Got wrong size: %d\n", size); cleanup: RegDeleteKeyA(subkey, ""); @@ -1786,7 +1780,7 @@ static void test_reg_query_info(void) char expectbuffer[32]; WCHAR expectbufferW[32]; char subkey_class[] = "subkey class"; - WCHAR subkey_classW[] = {'s','u','b','k','e','y',' ','c','l','a','s','s',0}; + WCHAR subkey_classW[] = L"subkey class"; char subsubkey_class[] = "subsubkey class"; DWORD classlen; DWORD subkeys, maxsubkeylen, maxclasslen; @@ -2330,8 +2324,7 @@ static void test_rw_order(void) static void test_symlinks(void) { - static const WCHAR targetW[] = {'\\','S','o','f','t','w','a','r','e','\\','W','i','n','e', - '\\','T','e','s','t','\\','t','a','r','g','e','t',0}; + static const WCHAR targetW[] = L"\\Software\\Wine\\Test\\target"; BYTE buffer[1024]; UNICODE_STRING target_str; WCHAR *target; @@ -3613,8 +3606,6 @@ static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, in static void test_RegQueryValueExPerformanceData(void) { - static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; - static const WCHAR dummyW[5] = { 'd','u','m','m','y' }; static const char * const names[] = { NULL, "", "Global", "2", "invalid counter name" }; DWORD cbData, len, i, type; BYTE *value; @@ -3628,7 +3619,7 @@ static void test_RegQueryValueExPerformanceData(void) dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); - dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); + dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, L"Global", NULL, NULL, NULL, &cbData ); ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); /* Test ERROR_MORE_DATA, start with small buffer */ @@ -3809,7 +3800,7 @@ todo_wine if (pRegSetKeyValueW) { - dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, globalW, REG_SZ, dummyW, sizeof(dummyW)); + dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); todo_wine ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); } @@ -3831,7 +3822,7 @@ static void test_RegLoadMUIString(void) WCHAR textW[64], bufW[64]; WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; const static char tz_value[] = "MUI_Std"; - const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + const static WCHAR tz_valueW[] = L"MUI_Std"; struct { const char* value; DWORD type; @@ -4026,11 +4017,6 @@ static void test_EnumDynamicTimeZoneInformation(void) WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; - static const WCHAR stdW[] = {'S','t','d',0}; - static const WCHAR dltW[] = {'D','l','t',0}; - static const WCHAR tziW[] = {'T','Z','I',0}; - static const WCHAR mui_stdW[] = {'M','U','I','_','S','t','d',0}; - static const WCHAR mui_dltW[] = {'M','U','I','_','D','l','t',0}; struct tz_reg_data { LONG bias; @@ -4093,9 +4079,9 @@ static void test_EnumDynamicTimeZoneInformation(void) size = sizeof(name); memset(name, 0, sizeof(name)); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, mui_stdW, name, size, &size, 0, sysdir); + status = pRegLoadMUIStringW(subkey, L"MUI_Std", name, size, &size, 0, sysdir); else - status = pRegGetValueW(subkey, NULL, stdW, RRF_RT_REG_SZ, NULL, name, &size); + status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.StandardName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); @@ -4103,9 +4089,9 @@ static void test_EnumDynamicTimeZoneInformation(void) size = sizeof(name); memset(name, 0, sizeof(name)); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, mui_dltW, name, size, &size, 0, sysdir); + status = pRegLoadMUIStringW(subkey, L"MUI_Dlt", name, size, &size, 0, sysdir); else - status = pRegGetValueW(subkey, NULL, dltW, RRF_RT_REG_SZ, NULL, name, &size); + status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); @@ -4119,7 +4105,7 @@ static void test_EnumDynamicTimeZoneInformation(void) ok(!dtzi.DynamicDaylightTimeDisabled, "got %d\n", dtzi.DynamicDaylightTimeDisabled); size = sizeof(tz_data); - status = pRegGetValueW(key, keyname, tziW, RRF_RT_REG_BINARY, NULL, &tz_data, &size); + status = pRegGetValueW(key, keyname, L"TZI", RRF_RT_REG_BINARY, NULL, &tz_data, &size); ok(status == ERROR_SUCCESS, "got %d\n", status); ok(dtzi.Bias == tz_data.bias, "expected %d, got %d\n", -- 2.31.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_blt_sub_resource().
by Zebediah Figura April 7, 2021

April 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 20 +++++++++++++------- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 462e6d8a93b..f7b947616dd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -474,6 +474,12 @@ static inline void wined3d_device_context_submit(struct wined3d_device_context * context->ops->submit(context, queue_id); } +static inline void wined3d_device_context_finish(struct wined3d_device_context *context, + enum wined3d_cs_queue_id queue_id) +{ + context->ops->finish(context, queue_id); +} + static const char *debug_cs_op(enum wined3d_cs_op op) { switch (op) @@ -2425,14 +2431,14 @@ error: wined3d_resource_release(op->dst_resource); } -void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, - unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, + unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { struct wined3d_cs_blt_sub_resource *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_BLT_SUB_RESOURCE; op->dst_resource = dst_resource; op->dst_sub_resource_idx = dst_sub_resource_idx; @@ -2451,9 +2457,9 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso if (src_resource) wined3d_resource_acquire(src_resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) - wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c03621c706a..004d3ec8d2a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4613,7 +4613,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < layer_count; ++j) { - wined3d_cs_emit_blt_sub_resource(device->cs, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, &dst_texture->resource, j * dst_level_count + i, &box, &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, 0, NULL, WINED3D_TEXF_POINT); @@ -4659,7 +4659,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, wined3d_texture_get_level_depth(src_texture, src_level)); } - wined3d_cs_emit_blt_sub_resource(device->cs, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, &dst_texture->resource, i * dst_level_count + j, &box, &src_texture->resource, i * src_level_count + src_level, &box, 0, NULL, WINED3D_TEXF_POINT); @@ -4893,7 +4893,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1); - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &src_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, 0, &src_box, src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4918,7 +4918,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { unsigned int idx = j * dst_texture->level_count + i; - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &dst_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, idx, &dst_box, src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } @@ -5079,7 +5079,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } } - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, dst_sub_resource_idx, &dst_box, src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return WINED3D_OK; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0736f612f12..363f4641b3f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3911,8 +3911,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return E_NOTIMPL; } - wined3d_cs_emit_blt_sub_resource(dst_texture->resource.device->cs, &dst_texture->resource, dst_sub_resource_idx, - &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); + wined3d_device_context_emit_blt_sub_resource(&dst_texture->resource.device->cs->c, &dst_texture->resource, + dst_sub_resource_idx, &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 957290c7ece..38f19b21fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4723,10 +4723,6 @@ void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; -void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, - unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, @@ -4781,6 +4777,10 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, + unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -- 2.30.2

3 12

[PATCH] winhttp: Invalid url decomposition should return failure when it fails.
by Haoyang Chen April 7, 2021

April 7, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/winhttp/session.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 319066db55b..f052c3c569c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1854,7 +1854,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX uc.dwStructSize = sizeof(uc); uc.dwHostNameLength = -1; - if (WinHttpCrackUrl( url, 0, 0, &uc )) + if ((ret = WinHttpCrackUrl( url, 0, 0, &uc ))) { char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); @@ -1868,7 +1868,8 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( hostnameA ); } heap_free( urlA ); - return InternetDeInitializeAutoProxyDll( NULL, 0 ); + InternetDeInitializeAutoProxyDll( NULL, 0 ); + return ret; } /*********************************************************************** diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a61a23ec02..56f35252615 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4974,6 +4974,9 @@ static void test_WinHttpGetProxyForUrl(void) trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); } options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; @@ -4990,6 +4993,13 @@ static void test_WinHttpGetProxyForUrl(void) GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); } + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); + WinHttpCloseHandle( session ); } -- 2.20.1

3 2

[PATCH 1/5] ntoskrnl/tests: Test discovery of the root PnP device via setupapi.
by Zebediah Figura April 7, 2021

April 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 ++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c9f680f01e8..73f96789f06 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -34,6 +34,8 @@ #include "mssip.h" #include "setupapi.h" #include "newdev.h" +#include "initguid.h" +#include "devguid.h" #include "wine/test.h" #include "wine/heap.h" #include "wine/mssign.h" @@ -990,6 +992,49 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) } } +static void test_pnp_devices(void) +{ + static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; + + char buffer[200]; + SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + HANDLE bus; + BOOL ret; + + set = SetupDiGetClassDevsA(&control_class, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 0, &device); + ok(ret, "failed to get device, error %#x\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &GUID_DEVCLASS_SYSTEM), "wrong class %s\n", debugstr_guid(&device.ClassGuid)); + + ret = SetupDiGetDeviceInstanceIdA(set, &device, buffer, sizeof(buffer), NULL); + ok(ret, "failed to get device ID, error %#x\n", GetLastError()); + ok(!strcasecmp(buffer, "root\\winetest\\0"), "got ID %s\n", debugstr_a(buffer)); + + ret = SetupDiEnumDeviceInterfaces(set, NULL, &control_class, 0, &iface); + ok(ret, "failed to get interface, error %#x\n", GetLastError()); + ok(IsEqualGUID(&iface.InterfaceClassGuid, &control_class), + "wrong class %s\n", debugstr_guid(&iface.InterfaceClassGuid)); + ok(iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); + ok(ret, "failed to get interface path, error %#x\n", GetLastError()); + ok(!strcasecmp(iface_detail->DevicePath, "\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"), + "wrong path %s\n", debugstr_a(iface_detail->DevicePath)); + + SetupDiDestroyDeviceInfoList(set); + + bus = CreateFileA(iface_detail->DevicePath, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(bus != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + CloseHandle(bus); +} + static void test_pnp_driver(struct testsign_context *ctx) { static const char hardware_id[] = "test_hardware_id\0"; @@ -1116,9 +1161,7 @@ static void test_pnp_driver(struct testsign_context *ctx) /* Tests. */ - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - CloseHandle(file); + test_pnp_devices(); /* Clean up. */ -- 2.30.2

5 10

[PATCH 2/2] msvcrt: Add helpers for creating base class RTTI.
by Piotr Caban April 7, 2021

April 7, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] msvcp: Remove MSVCP_ prefix from RTTI and vtable related code.
by Piotr Caban April 7, 2021

April 7, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- It's meant to make the msvcrt/cxx.h and msvcp90/cxx.h more similar. dlls/msvcirt/msvcirt.c | 116 ++++++++-------- dlls/msvcirt/msvcirt.spec | 46 +++---- dlls/msvcp100/msvcp100.spec | 72 +++++----- dlls/msvcp110/msvcp110.spec | 78 +++++------ dlls/msvcp120/msvcp120.spec | 78 +++++------ dlls/msvcp140/msvcp140.spec | 76 +++++------ dlls/msvcp140_1/msvcp140_1.c | 12 +- dlls/msvcp60/ios.c | 240 ++++++++++++++++---------------- dlls/msvcp60/msvcp60.spec | 136 +++++++++---------- dlls/msvcp60/string.c | 10 +- dlls/msvcp70/msvcp70.spec | 138 +++++++++---------- dlls/msvcp71/msvcp71.spec | 132 +++++++++--------- dlls/msvcp80/msvcp80.spec | 136 +++++++++---------- dlls/msvcp90/cxx.h | 30 ++-- dlls/msvcp90/exception.c | 158 ++++++++++----------- dlls/msvcp90/ios.c | 256 +++++++++++++++++------------------ dlls/msvcp90/locale.c | 158 ++++++++++----------- dlls/msvcp90/misc.c | 28 ++-- dlls/msvcp90/msvcp90.spec | 134 +++++++++--------- 19 files changed, 1017 insertions(+), 1017 deletions(-)

1 0

[tools] winetest/dissect: Allow an error code on the 'version error' lines.
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 4f0e95b36..2c89abaa2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -427,7 +427,7 @@ while ($line = <IN> || "") my ($dll, $info) = ($1, $2); $dllinfo{$dll} = { version => $info }; if ($info =~ /^dll is (?:missing|native|a stub)/ or - $info =~ /^(?:load error|version error \d+|version not (?:found|present))$/ or + $info =~ /^(?:(?:load|version) error \d+|version not (?:found|present))/ or # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) { -- 2.20.1

1 0

[tools] testbot/PatchUtils: Rerun the tests when the Makefile is modified.
by Francois Gouget April 7, 2021

April 7, 2021

Makefile changes are less likely to cause tests to fail but they are also quite rare so they are not worth special-casing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It also means that adding a new test unit causes all of that module's test units to be rerun. But that's not very frequent either. --- testbot/lib/WineTestBot/PatchUtils.pm | 3 --- 1 file changed, 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a7d33f685..eb9fa09bb 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -570,9 +570,6 @@ sub GetPatchImpacts($) my $TestFiles = $Module->{TestFiles}; foreach my $File (sort keys %$TestFiles) { - # Assume makefile modifications may break the build but not the tests - next if ($File eq "Makefile.in"); - my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) { -- 2.20.1

1 0