May 2018 - Wine-devel - list.winehq.org

[PATCH v2 3/3] widl: Don't remove the FDUAL flag from non-dispatchable interfaces.
by Huw Davies 29 May '18

29 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.idl | 2 -- dlls/oleaut32/tests/typelib.c | 31 +++++++++++-------------------- tools/widl/write_msft.c | 4 ---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 12c0bd5b5c..996e948b85 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -208,9 +208,7 @@ library TestTypelib [ odl, uuid(a028db05-30f0-4b93-b17a-41c72f831d84), -#if 0 /* FIXME: commented out as causes widl to generate incorrect typelib */ dual, -#endif oleautomation ] interface IKindaEnumWidget : IUnknown diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 05476a3976..f4ad8f928d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1507,16 +1507,10 @@ static void test_inheritance(void) FUNCDESC *pFD; WCHAR path[MAX_PATH]; CHAR pathA[MAX_PATH]; - static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; - - BOOL use_midl_tlb = FALSE; GetModuleFileNameA(NULL, pathA, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - if(use_midl_tlb) - memcpy(path, tl_path, sizeof(tl_path)); - hr = LoadTypeLib(path, &pTL); if(FAILED(hr)) return; @@ -1592,17 +1586,13 @@ static void test_inheritance(void) hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); - if (hr == S_OK) - { - ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); - if(use_midl_tlb) { - ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); - } - ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); - ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); - ITypeInfo_ReleaseTypeAttr(pTI, pTA); - } + ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(pTI, pTA); + hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -4903,8 +4893,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FOLEAUTOMATION }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION }, - { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ }, - { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ }, + { TKIND_DISPATCH, TYPEFLAG_FDUAL }, + { TKIND_DISPATCH, TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, @@ -4979,7 +4969,8 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); ok(dual_attr->typekind == TKIND_INTERFACE, "%d: got kind %d\n", i, dual_attr->typekind); - ok(dual_attr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FDUAL), "%d: got flags %04x\n", i, dual_attr->wTypeFlags); + ok(dual_attr->wTypeFlags == (attrs[i].flags | TYPEFLAG_FOLEAUTOMATION), + "%d: got flags %04x\n", i, dual_attr->wTypeFlags); ITypeInfo_ReleaseTypeAttr(dual_info, dual_attr); ITypeInfo_Release(dual_info); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3775a31ad7..52c68b4d4b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2166,10 +2166,6 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if (derived->name && !strcmp(derived->name, "IDispatch")) msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ - /* can't be dual if it doesn't derive from IDispatch */ - if (!(msft_typeinfo->typeinfo->flags & 0x1000)) /* TYPEFLAG_FDISPATCHABLE */ - msft_typeinfo->typeinfo->flags &= ~0x40; /* TYPEFLAG_FDUAL */ - if(type_iface_get_inherit(interface)) add_impl_type(msft_typeinfo, type_iface_get_inherit(interface), ref_importinfo); -- 2.16.2

2 2

[PATCH] wmiutils/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmiutils/tests/path.c | 100 ++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 3709748174..ecb42aa647 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -137,7 +137,7 @@ static void test_IWbemPath_SetText(void) hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE(test); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); todo_wine_if (test[i].todo) @@ -149,7 +149,7 @@ static void test_IWbemPath_SetText(void) ULONG len; memset( buf, 0x55, sizeof(buf) ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); ok( hr == S_OK, "%u got %08x\n", i, hr ); ok( !lstrcmpW( buf, test[i].path ), "%u unexpected path %s\n", i, wine_dbgstr_w(buf) ); @@ -185,12 +185,12 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_GetText( path, 0, NULL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, 0, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf)/sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -200,19 +200,19 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, NULL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf)/sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -227,35 +227,35 @@ static void test_IWbemPath_GetText(void) ok( hr == S_OK, "got %08x\n", hr ); ok( count == 2, "got %u\n", count ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, path9 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( path9 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, path13 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( path13 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, path14 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( path14 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, path15 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( path15 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -283,7 +283,7 @@ static void test_IWbemPath_GetText(void) ok( hr == S_OK, "got %08x\n", hr ); ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -293,21 +293,21 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, path17 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, expected1W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( expected1W ) + 1, "unexpected length %u\n", len ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -317,7 +317,7 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path15 ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -339,7 +339,7 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -352,7 +352,7 @@ static void test_IWbemPath_GetText(void) hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf)/sizeof(buf[0]); + len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -379,14 +379,14 @@ static void test_IWbemPath_GetClassName(void) hr = IWbemPath_GetClassName( path, &len, NULL ); ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -395,13 +395,13 @@ static void test_IWbemPath_GetClassName(void) hr = IWbemPath_GetClassName( path, &len, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -432,7 +432,7 @@ static void test_IWbemPath_SetClassName(void) ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -465,14 +465,14 @@ static void test_IWbemPath_GetServer(void) hr = IWbemPath_GetServer( path, &len, NULL ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -481,13 +481,13 @@ static void test_IWbemPath_GetServer(void) hr = IWbemPath_GetServer( path, &len, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, dotW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -574,7 +574,7 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_SetServer( path, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); @@ -585,7 +585,7 @@ static void test_IWbemPath_SetServer(void) ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, serverW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -601,7 +601,7 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_SetServer( path, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); @@ -632,14 +632,14 @@ static void test_IWbemPath_GetNamespaceAt(void) hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -648,20 +648,20 @@ static void test_IWbemPath_GetNamespaceAt(void) hr = IWbemPath_GetNamespaceAt( path, 2, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -706,7 +706,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -760,7 +760,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) ok( count == 1, "got %u\n", count ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -781,7 +781,7 @@ static void test_IWbemPath_RemoveNamespaceAt(void) ok( !count, "got %u\n", count ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -825,7 +825,7 @@ static void test_IWbemPath_SetNamespaceAt(void) "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); @@ -846,14 +846,14 @@ static void test_IWbemPath_SetNamespaceAt(void) ok( count == 2, "got %u\n", count ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); buf[0] = 0; - len = sizeof(buf) / sizeof(buf[0]); + len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); -- 2.14.3

2 1

[PATCH] winspool.drv/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3c28bc0e84..bfc80ce0f6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -219,7 +219,7 @@ static struct monitor_entry * find_installed_monitor(void) if (entry) return entry; - num_tests = (sizeof(monitor_table)/sizeof(struct monitor_entry)); + num_tests = ARRAY_SIZE(monitor_table); /* cleanup */ DeleteMonitorA(NULL, env_x64, winetest); -- 2.14.3

2 1

[PATCH 1/3] widl: Try to import typedefs instead of redefining them.
by Zebediah Figura 29 May '18

29 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/write_msft.c | 71 ++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4b09317..1b05159 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -990,40 +990,51 @@ static int encode_type( case VT_USERDEFINED: { + importinfo_t *importinfo; int typeinfo_offset; - /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type_alias_get_aliasee(type); - - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); - - if(type->typelib_idx == -1) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); - } + if ((importinfo = find_importinfo(typelib, type->name))) + { + chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", + type->name, importinfo->importlib->name); + alloc_importinfo(typelib, importinfo); + typeinfo_offset = importinfo->offset | 0x1; } + else + { + /* typedef'd types without public attribute aren't included in the typelib */ + while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + type = type_alias_get_aliasee(type); - typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, + type->name, type_get_type(type), type->typelib_idx); + + if(type->typelib_idx == -1) { + chat("encode_type: trying to ref not added type\n"); + switch (type_get_type(type)) { + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); + } + } + + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; if ((typedata[0] == ((0x7fff << 16) | VT_USERDEFINED)) && (typedata[1] == typeinfo_offset)) break; -- 2.7.4

2 3

[PATCH v2 2/3] widl: Properly implement syntax 2 dispinterfaces.
by Huw Davies 29 May '18

29 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 18 ------------------ tools/widl/typetree.c | 13 +++++++++++-- tools/widl/typetree.h | 7 +++++++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 40 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 58 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b518e1ad1c..05476a3976 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1530,13 +1530,10 @@ static void test_inheritance(void) ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); -if(use_midl_tlb) { ok(pTA->cFuncs == 6, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); -} ITypeInfo_ReleaseTypeAttr(pTI, pTA); -if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -1555,7 +1552,6 @@ if(use_midl_tlb) { ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); -} ITypeInfo_Release(pTI); @@ -1616,12 +1612,10 @@ if(use_midl_tlb) { ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1); ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); ITypeInfo_Release(pTI_p); -if(use_midl_tlb) { hr = ITypeInfo_GetFuncDesc(pTI, 6, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x1234, "memid %08x\n", pFD->memid); ITypeInfo_ReleaseFuncDesc(pTI, pFD); -} ITypeInfo_Release(pTI); /* ItestIF7 is dual with inherited ifaces which derive from Dispatch */ @@ -1662,13 +1656,10 @@ if(use_midl_tlb) { ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); -if(use_midl_tlb) { ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); -} ITypeInfo_ReleaseTypeAttr(pTI, pTA); -if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, -1, &href); ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); @@ -1689,7 +1680,6 @@ if(use_midl_tlb) { ok(pFD->memid == 0x60010000, "memid %08x\n", pFD->memid); ok(pFD->oVft == 2 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); -} ITypeInfo_Release(pTI); /* ItestIF11 is a syntax 2 dispinterface which derives from IDispatch */ @@ -1701,13 +1691,10 @@ if(use_midl_tlb) { ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); -if(use_midl_tlb) { ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); -} ITypeInfo_ReleaseTypeAttr(pTI, pTA); -if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -1736,7 +1723,6 @@ if(use_midl_tlb) { ok(hr == S_OK, "hr %08x\n", hr); if (SUCCEEDED(hr)) ITypeInfo_Release(pTI_p); ITypeInfo_ReleaseFuncDesc(pTI, pFD); -} ITypeInfo_Release(pTI); @@ -1749,13 +1735,10 @@ if(use_midl_tlb) { ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); ok(pTA->cbSizeVft == 6 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == 0, "typeflags %x\n", pTA->wTypeFlags); -if(use_midl_tlb) { ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); -} ITypeInfo_ReleaseTypeAttr(pTI, pTA); -if(use_midl_tlb) { /* Should have one method */ hr = ITypeInfo_GetFuncDesc(pTI, 1, &pFD); ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr); @@ -1764,7 +1747,6 @@ if(use_midl_tlb) { ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); -} ITypeInfo_Release(pTI); ITypeLib_Release(pTL); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e3166145b6..baf53a11a6 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -442,6 +442,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm iface->details.iface->disp_methods = NULL; iface->details.iface->stmts = stmts; iface->details.iface->inherit = inherit; + iface->details.iface->disp_inherit = NULL; iface->defined = TRUE; compute_method_indexes(iface); } @@ -454,14 +455,22 @@ void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *met iface->details.iface->stmts = NULL; iface->details.iface->inherit = find_type("IDispatch", NULL, 0); if (!iface->details.iface->inherit) error_loc("IDispatch is undefined\n"); + iface->details.iface->disp_inherit = NULL; iface->defined = TRUE; compute_method_indexes(iface); } void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface) { - type_dispinterface_define(dispiface, iface->details.iface->disp_props, - iface->details.iface->disp_methods); + dispiface->details.iface = xmalloc(sizeof(*dispiface->details.iface)); + dispiface->details.iface->disp_props = NULL; + dispiface->details.iface->disp_methods = NULL; + dispiface->details.iface->stmts = NULL; + dispiface->details.iface->inherit = find_type("IDispatch", NULL, 0); + if (!dispiface->details.iface->inherit) error_loc("IDispatch is undefined\n"); + dispiface->details.iface->disp_inherit = iface; + dispiface->defined = TRUE; + compute_method_indexes(dispiface); } void type_module_define(type_t *module, statement_list_t *stmts) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index bf05f25951..fc134cd575 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -176,6 +176,13 @@ static inline var_list_t *type_dispiface_get_methods(const type_t *type) return type->details.iface->disp_methods; } +static inline type_t *type_dispiface_get_inherit(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); + return type->details.iface->disp_inherit; +} + static inline int type_is_defined(const type_t *type) { return type->defined; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 1f4a9dd10f..0387846137 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -343,6 +343,7 @@ struct iface_details var_list_t *disp_methods; var_list_t *disp_props; struct _type_t *inherit; + struct _type_t *disp_inherit; }; struct module_details diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 8ce34d9566..3775a31ad7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2040,11 +2040,29 @@ static void add_dispatch(msft_typelib_t *typelib) static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface) { + int num_parents = 0, num_funcs = 0; + importinfo_t *importinfo = NULL; + const statement_t *stmt_func; + type_t *inherit, *ref; int idx = 0; var_t *func; var_t *var; msft_typeinfo_t *msft_typeinfo; + if (-1 < dispinterface->typelib_idx) + return; + + inherit = type_dispiface_get_inherit(dispinterface); + + if (inherit) + { + importinfo = find_importinfo(typelib, inherit->name); + + if (!importinfo && type_iface_get_inherit(inherit) && inherit->typelib_idx == -1) + add_interface_typeinfo(typelib, inherit); + } + + /* check typelib_idx again, it could have been added while resolving the parent interface */ if (-1 < dispinterface->typelib_idx) return; @@ -2057,7 +2075,27 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ add_dispatch(typelib); - msft_typeinfo->typeinfo->cImplTypes = 1; + + if (inherit) + { + add_impl_type(msft_typeinfo, inherit, importinfo); + msft_typeinfo->typeinfo->typekind |= 0x10; + } + + /* count the number of inherited interfaces and non-local functions */ + for (ref = inherit; ref; ref = type_iface_get_inherit(ref)) + { + num_parents++; + STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(ref) ) + { + var_t *func = stmt_func->u.var; + if (!is_local(func->attrs)) num_funcs++; + } + } + msft_typeinfo->typeinfo->datatype2 = num_funcs << 16 | num_parents; + msft_typeinfo->typeinfo->cbSizeVft = num_funcs * pointer_size; + + msft_typeinfo->typeinfo->cImplTypes = 1; /* IDispatch */ /* count the no of methods, as the variable indices come after the funcs */ if (dispinterface->details.iface->disp_methods) -- 2.16.2

1 0

[PATCH 1/4] msi/tests: Simplify key access flags in test_register_product().
by Zebediah Figura 29 May '18

29 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 80 ++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 980ed50..cefa1d7 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2633,12 +2633,9 @@ static void test_register_product(void) LPSTR usersid; char date[MAX_PATH], temp[MAX_PATH], keypath[MAX_PATH], path[MAX_PATH]; DWORD size, type; - REGSAM access = KEY_ALL_ACCESS; static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; - static const CHAR uninstall_32node[] = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion" - "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; static const CHAR userdata[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" "\\UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR ugkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" @@ -2663,9 +2660,6 @@ static void test_register_product(void) create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); - if (is_wow64) - access |= KEY_WOW64_64KEY; - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); /* RegisterProduct */ @@ -2682,16 +2676,8 @@ static void test_register_product(void) res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(!res, "got %d\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2718,14 +2704,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, usersid); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2758,26 +2745,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); /* RegisterProduct, machine */ @@ -2786,19 +2778,11 @@ static void test_register_product(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2825,14 +2809,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, "S-1-5-18"); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2865,26 +2850,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); error: -- 2.7.4

3 8

[PATCH 1/6] d3d10core/tests: Add test for clearing 1D render target views.
by Józef Kucia 29 May '18

29 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 123 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 819285ee228b..99a375eb5e1a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -570,6 +570,49 @@ static void get_buffer_readback(ID3D10Buffer *buffer, struct resource_readback * ID3D10Device_Release(device); } +static void get_texture1d_readback(ID3D10Texture1D *texture, unsigned int sub_resource_idx, + struct resource_readback *rb) +{ + D3D10_TEXTURE1D_DESC texture_desc; + unsigned int miplevel; + ID3D10Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + rb->dimension = D3D10_RESOURCE_DIMENSION_TEXTURE1D; + + ID3D10Texture1D_GetDevice(texture, &device); + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, (ID3D10Texture1D **)&rb->resource))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D10Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = 1; + rb->sub_resource_idx = sub_resource_idx; + + ID3D10Device_CopyResource(device, rb->resource, (ID3D10Resource *)texture); + if (FAILED(hr = ID3D10Texture1D_Map((ID3D10Texture1D *)rb->resource, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->map_desc.pData))) + { + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); + ID3D10Resource_Release(rb->resource); + rb->resource = NULL; + } + rb->map_desc.RowPitch = 0; + + ID3D10Device_Release(device); +} + static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, struct resource_readback *rb) { @@ -644,6 +687,9 @@ static void release_resource_readback(struct resource_readback *rb) case D3D10_RESOURCE_DIMENSION_BUFFER: ID3D10Buffer_Unmap((ID3D10Buffer *)rb->resource); break; + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + ID3D10Texture1D_Unmap((ID3D10Texture1D *)rb->resource, rb->sub_resource_idx); + break; case D3D10_RESOURCE_DIMENSION_TEXTURE2D: ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, rb->sub_resource_idx); break; @@ -724,6 +770,30 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } +#define check_texture1d_sub_resource_color(a, b, c, d, e) check_texture1d_sub_resource_color_(__LINE__, a, b, c, d, e) +static void check_texture1d_sub_resource_color_(unsigned int line, ID3D10Texture1D *texture, + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) +{ + struct resource_readback rb; + + get_texture1d_readback(texture, sub_resource_idx, &rb); + check_readback_data_color_(line, &rb, rect, expected_color, max_diff); + release_resource_readback(&rb); +} + +#define check_texture1d_color(t, c, d) check_texture1d_color_(__LINE__, t, c, d) +static void check_texture1d_color_(unsigned int line, ID3D10Texture1D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE1D_DESC texture_desc; + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture1d_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); +} + #define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) @@ -10182,7 +10252,49 @@ static void test_swapchain_flip(void) DestroyWindow(window); } -static void test_clear_render_target_view(void) +static void test_clear_render_target_view_1d(void) +{ + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + + struct d3d10core_test_context test_context; + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture1D *texture; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture1D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture1d_color(texture, 0xbf4c7f19, 1); + + ID3D10Device_ClearRenderTargetView(device, rtv, green); + check_texture1d_color(texture, 0x8000ff00, 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture1D_Release(texture); + release_test_context(&test_context); +} + +static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; @@ -10215,11 +10327,11 @@ static void test_clear_render_target_view(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); @@ -10253,7 +10365,7 @@ static void test_clear_render_target_view(void) texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; @@ -16964,7 +17076,8 @@ START_TEST(device) test_swapchain_formats(); test_swapchain_views(); test_swapchain_flip(); - test_clear_render_target_view(); + test_clear_render_target_view_1d(); + test_clear_render_target_view_2d(); test_clear_depth_stencil_view(); test_initial_depth_stencil_state(); test_draw_depth_only(); -- 2.16.1

3 12

[PATCH 4/4 v3 resend] riched20: Partially implement ITextServices_TxGetNaturalSize().
by Jactry Zeng 29 May '18

29 May '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 65 ++++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/txtsrv.c | 32 ++++++++++++++++++++-- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index f97cd39d18..f9cdfc0945 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -424,9 +424,10 @@ static HRESULT WINAPI ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWORD *pdwBits) { ITextHostTestImpl *This = impl_from_ITextHost(iface); + DWORD bits = TXTBIT_MULTILINE | TXTBIT_WORDWRAP; TRACECALL("Call to TxGetPropertyBits(%p, dwMask=0x%08x, pdwBits=%p)\n", This, dwMask, pdwBits); - *pdwBits = 0; + *pdwBits = bits & dwMask; return S_OK; } @@ -809,6 +810,13 @@ static void test_TxGetNaturalSize(void) HRESULT result; SIZEL psizelExtent = {-1,-1}; static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + static const WCHAR long_text[] = {'T','e','s','t','W','i','t','h','A','L','o','n','g', + 'L','i','n','e','S','t','r','i','n','g',0}; + static const WCHAR long_text1[] = {'T','e','s','t','W','i','t','h','Y','e','t','A','n', + 'o','t','h','o','r','L', 'o','n','g','L','i','n','e', + 'S','t','r','i','n','g','W','h','i','c','h','H','a', + 's','M','o','r','e','T','h','a','n','T','w','o','L', + 'i','n','e','s',0}; LONG width, height, expected_width, expected_height, lines; HDC hdcDraw; HWND hwnd; @@ -846,7 +854,60 @@ static void test_TxGetNaturalSize(void) height = 0; result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); - todo_wine CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); + CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); + + psizelExtent.cx = 1; psizelExtent.cy = 1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); + + psizelExtent.cx = 0; psizelExtent.cy = 0; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, 0, 0); + + psizelExtent.cx = -1; psizelExtent.cy = -1; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, NULL, NULL); + ok(result == E_INVALIDARG, "ITextServices_TxGetNaturalSize should fail: 0x%08x.\n", result); + + /* Test with a long line string */ + result = ITextServices_TxSetText(txtserv, long_text); + ok(result == S_OK, "ITextServices_TxSetText failed result: 0x%08x.\n", result); + + old_hf = SelectObject(hdcDraw, hf); + expected_width = get_max_width(hdcDraw, long_text, rect.right - rect.left, &lines); + GetTextMetricsA(hdcDraw, &tm); + expected_height = (tm.tmAscent + tm.tmDescent) * lines; + SelectObject(hdcDraw, old_hf); + + psizelExtent.cx = -1; psizelExtent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); + + /* Test with string which has more than two lines */ + result = ITextServices_TxSetText(txtserv, long_text1); + ok(result == S_OK, "ITextServices_TxSetText failed result: 0x%08x.\n", result); + + old_hf = SelectObject(hdcDraw, hf); + expected_width = get_max_width(hdcDraw, long_text1, rect.right - rect.left, &lines); + GetTextMetricsA(hdcDraw, &tm); + expected_height = (tm.tmAscent + tm.tmDescent) * lines; + SelectObject(hdcDraw, old_hf); + + psizelExtent.cx = -1; psizelExtent.cy = -1; + width = rect.right - rect.left; + height = 0; + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, &width, &height); + CHECK_TXGETNATURALSIZE(result, width, height, expected_width, expected_height); ReleaseDC(hwnd, hdcDraw); DestroyWindow(hwnd); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4eff6..a621e7e6e9 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -319,9 +319,37 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetNaturalSize(ITextServices *iface, const SIZEL *psizelExtent, LONG *pwidth, LONG *pheight) { ITextServicesImpl *This = impl_from_ITextServices(iface); + if (!pwidth || !pheight) + return E_INVALIDARG; + + TRACE("(%p)->(%p, %x, %p, %p, %p, %x, %p, %p, %p\n)", This, iface, dwAspect, hdcDraw, + hicTargetDev, ptd, dwMode, psizelExtent, pwidth, pheight); + + if (dwAspect != DVASPECT_CONTENT) + FIXME("Unsupported aspect: %x\n", dwAspect); + if (hicTargetDev) + FIXME("Unsupported hicTargetDev: %p\n", hicTargetDev); + if (ptd) + FIXME("Unsupported ptd: %p\n", ptd); + if (dwMode != TXTNS_FITTOCONTENT) + FIXME("Unsupported mode: %x\n", dwMode); + + if (!psizelExtent->cy) + { + *pwidth = 0; + *pheight = 0; + return S_OK; + } - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + SetRectEmpty(&This->editor->rcFormat); + This->editor->rcFormat.right = *pwidth; + This->editor->rcFormat.bottom = *pheight; + ME_MarkAllForWrapping(This->editor); + ME_WrapMarkedParagraphs(This->editor, hdcDraw); + *pwidth = This->editor->nTotalWidth; + *pheight = This->editor->nTotalLength; + + return S_OK; } DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) -- 2.15.1 (Apple Git-101)

1 0

[PATCH 3/4 v3 resend] riched20: Support external HDC in ME_WrapMarkedParagraphs().
by Jactry Zeng 29 May '18

29 May '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 13 +++++++------ dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 10 +++++----- dlls/riched20/table.c | 4 ++-- dlls/riched20/wrap.c | 11 +++++++++-- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 820b0380c7..82132761f0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3028,6 +3028,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hWnd = NULL; ed->hwndParent = NULL; + ed->hdcDraw = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; ed->reOle = NULL; @@ -3494,7 +3495,7 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) } ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_MoveCaret(editor); return 0; } @@ -3645,7 +3646,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, cf.yHeight = size * 20; /* convert twips to points */ ME_SetSelectionCharFormat(editor, &cf); ME_CommitUndo(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); @@ -3934,7 +3935,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); if (bRepaint) { - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); } @@ -3959,7 +3960,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETPARAFORMAT: { BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); ME_CommitUndo(editor); @@ -4054,7 +4055,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); if (bRepaint) ME_Repaint(editor); @@ -4714,7 +4715,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bDefaultFormatRect = TRUE; } ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); if (msg != EM_SETRECTNP) ME_Repaint(editor); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0f0e56ecd1..425a34f0c2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -182,7 +182,7 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDD void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ -BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; +BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor, HDC hdc) DECLSPEC_HIDDEN; void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 206ce85287..1d811e1c2a 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -383,6 +383,7 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { HWND hWnd, hwndParent; + HDC hdcDraw; ITextHost *texthost; IRichEditOle *reOle; BOOL bEmulateVersion10; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index fcc4e105a3..f2429081fc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -105,7 +105,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) void ME_Repaint(ME_TextEditor *editor) { - if (ME_WrapMarkedParagraphs(editor)) + if (ME_WrapMarkedParagraphs(editor, NULL)) { ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); @@ -118,7 +118,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) /* Should be called whenever the contents of the control have changed */ BOOL wrappedParagraphs; - wrappedParagraphs = ME_WrapMarkedParagraphs(editor); + wrappedParagraphs = ME_WrapMarkedParagraphs(editor, NULL); if (wrappedParagraphs) ME_UpdateScrollBar(editor); @@ -145,7 +145,7 @@ ME_RewrapRepaint(ME_TextEditor *editor) * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_UpdateScrollBar(editor); ME_Repaint(editor); } @@ -1163,7 +1163,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) SCROLLINFO si; BOOL bScrollBarWasVisible, bScrollBarWillBeVisible; - if (ME_WrapMarkedParagraphs(editor)) + if (ME_WrapMarkedParagraphs(editor, NULL)) FIXME("ME_UpdateScrollBar had to call ME_WrapMarkedParagraphs\n"); si.cbSize = sizeof(si); @@ -1336,7 +1336,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) there's no (inverted) area to be repainted, neither old nor new */ if (nStart == nEnd && editor->nLastSelStart == editor->nLastSelEnd) return; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); ME_GetSelectionParas(editor, &sel_start, &sel_end); assert(sel_start->type == diParagraph); assert(sel_end->type == diParagraph); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 4cd77eb399..5457935dfa 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -499,7 +499,7 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); return; } } @@ -544,7 +544,7 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_WrapMarkedParagraphs(editor); + ME_WrapMarkedParagraphs(editor, NULL); return; } } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e3a70f07d1..4c92252547 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -980,14 +980,21 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) +BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor, HDC hdc) { ME_DisplayItem *item; ME_Context c; int totalWidth = 0; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + if (!hdc) + hdc = ITextHost_TxGetDC(editor->texthost); + if (hdc != editor->hdcDraw) + { + ME_MarkAllForWrapping(editor); + editor->hdcDraw = hdc; + } + ME_InitContext(&c, editor, hdc); c.pt.x = 0; item = editor->pBuffer->pFirst->next; while(item != editor->pBuffer->pLast) { -- 2.15.1 (Apple Git-101)

1 0

[PATCH 2/4 v3 resend] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng 29 May '18

29 May '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 5 ++++ dlls/riched20/tests/txtsrv.c | 59 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..2a702a869a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,6 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; + const CHARFORMATW *host_cf; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -44,6 +45,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Style *style; int eol_len; WCHAR cr_lf[] = {'\r','\n',0}; + HRESULT hr; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -73,6 +75,9 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) cf.bCharSet = lf.lfCharSet; cf.lcid = GetSystemDefaultLCID(); + hr = ITextHost_TxGetCharFormat(editor->texthost, (const CHARFORMATW **)&host_cf); + if (hr == S_OK && host_cf->cbSize) + ME_ToCF2W(&cf, (CHARFORMAT2W *)host_cf); style = ME_MakeStyle(&cf); text->pDefaultStyle = style; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 76b4eb34f6..f97cd39d18 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -86,6 +86,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMATW char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -331,7 +332,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = &This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -610,6 +612,8 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + LOGFONTW lf; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -618,6 +622,19 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_FACE | CFM_SIZE | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT; + hf = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + lstrcpyW(dummyTextHost->char_format.szFaceName, lf.lfFaceName); + dummyTextHost->char_format.yHeight = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + if (lf.lfWeight > FW_NORMAL) dummyTextHost->char_format.dwEffects |= CFE_BOLD; + if (lf.lfItalic) dummyTextHost->char_format.dwEffects |= CFE_ITALIC; + if (lf.lfUnderline) dummyTextHost->char_format.dwEffects |= CFE_UNDERLINE; + if (lf.lfStrikeOut) dummyTextHost->char_format.dwEffects |= CFE_SUBSCRIPT; + dummyTextHost->char_format.bPitchAndFamily = lf.lfPitchAndFamily; + dummyTextHost->char_format.bCharSet = lf.lfCharSet; /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -1011,6 +1028,45 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + HFONT hf; + LOGFONTW lf; + LONG expected_height; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + hf = (HFONT)GetStockObject(DEFAULT_GUI_FONT); + GetObjectW(hf, sizeof(LOGFONTW), &lf); + expected_height = MulDiv(abs(lf.lfHeight), 1440, GetDeviceCaps(GetDC(NULL), LOGPIXELSY)); + ok(!lstrcmpW(lf.lfFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == expected_height, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, expected_height); + if (lf.lfWeight > FW_NORMAL) + ok(cf2.dwEffects & CFE_BOLD, "got dwEffects without CFE_BOLD: %x.\n", cf2.dwEffects); + if (lf.lfItalic) + ok(cf2.dwEffects & CFE_ITALIC, "got dwEffects without CFE_ITALIC: %x.\n", cf2.dwEffects); + if (lf.lfUnderline) + ok(cf2.dwEffects & CFE_UNDERLINE, "got dwEffects without CFE_UNDERLINE: %x.\n", cf2.dwEffects); + if (lf.lfStrikeOut) + ok(cf2.dwEffects & CFE_STRIKEOUT, "got dwEffects without CFE_STRIKEOUT: %x.\n", cf2.dwEffects); + ok(cf2.bPitchAndFamily == lf.lfPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, lf.lfPitchAndFamily); + ok(cf2.bCharSet == lf.lfCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, lf.lfCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1041,6 +1097,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.15.1 (Apple Git-101)

1 0