June 2018 - Wine-Devel - list.winehq.org

[PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators
by Jeff Latimer June 5, 2018

June 5, 2018

Resend to wine-devel. --- dlls/netapi32/netapi32.c | 11 +++++++---- dlls/netapi32/tests/access.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

2 1

Re: netapi32/tests: Fix a memory leak
by Marvin June 5, 2018

June 5, 2018

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38962 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: netapi32: NetUserGetInfo should return Admin priviledge - wine users run as Administrators
by Marvin June 5, 2018

June 5, 2018

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38961 Your paranoid android. === wxppro (32 bit access) === 0b40:access: unhandled exception c0000005 at 004025C6 === w2003std (32 bit access) === 06ac:access: unhandled exception c0000005 at 004025C6 === wvistau64 (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_zh_CN (32 bit access) === 0bbc:access: unhandled exception c0000005 at 004025C6 === wvistau64_fr (32 bit access) === 072c:access: unhandled exception c0000005 at 004025C6 === wvistau64_he (32 bit access) === 0bd8:access: unhandled exception c0000005 at 004025C6 === w2008s64 (32 bit access) === 086c:access: unhandled exception c0000005 at 004025C6 === w7u (32 bit access) === 0e48:access: unhandled exception c0000005 at 004025C6 === w7pro64 (32 bit access) === 0be0:access: unhandled exception c0000005 at 004025C6 === w8 (32 bit access) === 0d48:access: unhandled exception c0000005 at 004025C6 === w864 (32 bit access) === 0ad8:access: unhandled exception c0000005 at 004025C6 === w1064 (32 bit access) === 0784:access: unhandled exception c0000005 at 004025C6 === wvistau64 (64 bit access) === 073c:access: unhandled exception c0000005 at 00000000004022FB === w2008s64 (64 bit access) === 086c:access: unhandled exception c0000005 at 00000000004022FB === w7pro64 (64 bit access) === 0ab4:access: unhandled exception c0000005 at 00000000004022FB The previous 1 run(s) terminated abnormally === w864 (64 bit access) === 0264:access: unhandled exception c0000005 at 00000000004022FB === w1064 (64 bit access) === 0138:access: unhandled exception c0000005 at 00000000004022FB

1 0

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Marvin June 5, 2018

June 5, 2018

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38960 Your paranoid android. === wvistau64_zh_CN (32 bit msvcp120) === msvcp120.c:846: Test failed: cvtvec.isleadbyte[16] = fe msvcp120.c:846: Test failed: cvtvec.isleadbyte[17] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[18] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[19] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[20] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[21] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[22] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[23] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[24] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[25] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[26] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[27] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[28] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[29] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[30] = ff msvcp120.c:846: Test failed: cvtvec.isleadbyte[31] = 7f

1 0

[PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Hua Meng June 5, 2018

June 5, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c old mode 100644 new mode 100755 index dfd2d06..84e20bd --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -35,6 +35,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Move_item); DEFINE_EXPECT(queue_char__Copy_item); DEFINE_EXPECT(queue_char__Assign_and_destroy_item); + DEFINE_EXPECT(concurrent_vector_int_alloc); }; #define SET_EXPECT(func) \ @@ -105,6 +106,8 @@ struct thiscall_thunk static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, + const void *b ); static void init_thiscall_thunk(void) { @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; + call_thiscall_func3 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) - +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ + (const void*)(b)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) - +#define call_func3(func,_this,a,b) func(_this,a,b) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); +typedef struct vector_base_v4 +{ + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); + void *storage[3]; + size_t first_block; + size_t early_size; + void **segment; +} vector_base_v4; + +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -493,7 +511,13 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAA_NPEAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAAXXZ"); - } else { + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBA_KXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z"); +} else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); SET(p_tr2_sys__File_size_wchar, @@ -596,6 +620,12 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAE_NPAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -627,6 +657,12 @@ static BOOL init(void) "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAA_NPAX(a)Z"); SET(p_queue_base_v4__Internal_finish_clear, "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAAXXZ"); + SET(p_vector_base_v4_dtor, + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAA(a)XZ"); + SET(p_vector_base_v4__Internal_capacity, + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAIXZ"); + SET(p_vector_base_v4__Internal_push_back, + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIAAI(a)Z"); #endif } SET(p__Thrd_equal, @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) return 0; } +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) +{ + CHECK_EXPECT(concurrent_vector_int_alloc); + return malloc(n*sizeof(int)); +} + +static void concurrent_vector_int_ctor(vector_base_v4 *this) +{ + memset(this, 0, sizeof(*this)); + this->allocator = concurrent_vector_int_alloc; + this->segment = &this->storage[0]; +} + +static void test_vector_base_v4(void) +{ + vector_base_v4 vector; + size_t idx; + size_t size; + int *data; + + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ + concurrent_vector_int_ctor(&vector); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + if(!data){ + skip("_Internal_capacity not yet implemented\n"); + return; + } + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); + *data = 1; + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); + *data = 2; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); + *data = 3; + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); + + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); + + call_func1(p_vector_base_v4_dtor, &vector); +} static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) test_vector_base_v4__Segment_index_of(); test_queue_base_v4(); + test_vector_base_v4(); test_vbtable_size_exports(); -- 2.11.0

1 0

[PATCH 2/2] wbemdisp/tests: Add ISWbemSecurity tests
by Alistair Leslie-Hughes June 5, 2018

June 5, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/tests/wbemdisp.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91e..b8cd5c8 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum level; + WbemAuthenticationLevelEnum authenication; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,21 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelImpersonate ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelPktPrivacy ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +336,16 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + hr = ISWbemSecurity_get_ImpersonationLevel( security, &level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( level == wbemImpersonationLevelImpersonate, "got %d\n", level ); + hr = ISWbemSecurity_get_AuthenticationLevel( security, &authenication ); + ok( hr == S_OK, "got %x\n", hr ); + ok( authenication == wbemAuthenticationLevelPktPrivacy, "got %d\n", authenication ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 1.9.1

1 0

[PATCH 1/2] wbemdisp: Add ISWbemSecurity stub interface.
by Alistair Leslie-Hughes June 5, 2018

June 5, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f..cdc0ab4 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 1.9.1

1 0

[PATCH 1/4] oleaut32/tests: Fix alignment for generated tests on 64-bit.
by Zebediah Figura June 4, 2018

June 4, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 66 ++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f4ad8f9..e4fe91e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3964,6 +3964,38 @@ static char *print_size(BSTR name, TYPEATTR *attr) return buf; } +static char *print_align(BSTR name, TYPEATTR *attr) +{ + static char buf[256]; + + switch (attr->typekind) + { + case TKIND_DISPATCH: + case TKIND_INTERFACE: + sprintf(buf, "TYPE_ALIGNMENT(%s*)", dump_string(name)); + break; + + case TKIND_RECORD: + sprintf(buf, "TYPE_ALIGNMENT(struct %s)", dump_string(name)); + break; + + case TKIND_UNION: + sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name)); + break; + + case TKIND_ENUM: + case TKIND_ALIAS: + sprintf(buf, "4"); + break; + + default: + assert(0); + return NULL; + } + + return buf; +} + static const char *dump_param_flags(DWORD flags) { static char buf[256]; @@ -4072,10 +4104,10 @@ static void test_dump_typelib(const char *name) printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid)); - printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n" + printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n" " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d", map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags), - attr->cbAlignment, print_size(name, attr), + print_align(name, attr), print_size(name, attr), help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum), attr->cbSizeVft/sizeof(void*), attr->cFuncs); @@ -4175,13 +4207,13 @@ static const type_info info[] = { { "g", "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4203,7 +4235,7 @@ static const type_info info[] = { { "parent_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1, { { @@ -4225,7 +4257,7 @@ static const type_info info[] = { { "child_iface", "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1, { { @@ -4245,7 +4277,7 @@ static const type_info info[] = { { "_n", "{016fe2ec-b2c8-45f8-b23b-39e53a753903}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n), /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4263,7 +4295,7 @@ static const type_info info[] = { { "_m", "{016fe2ec-b2c8-45f8-b23b-39e53a753906}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m), /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4281,7 +4313,7 @@ static const type_info info[] = { { "IDualIface", "{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}", - /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4, /*size*/ sizeof(IDualIface*), + /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8, { { @@ -4423,7 +4455,7 @@ static const type_info info[] = { { "ISimpleIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ISimpleIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1, { { @@ -4443,13 +4475,13 @@ static const type_info info[] = { { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "test_struct2", "{4029f190-ca4a-4611-aeb9-673983cb96de}", - /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), + /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4533,13 +4565,13 @@ static const type_info info[] = { { "_e", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct _e), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ee", "{016fe2ec-b2c8-45f8-b23b-39e53a753971}", - /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct ee), + /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { @@ -4551,19 +4583,19 @@ static const type_info info[] = { { "_f", "{00000000-0000-0000-0000-000000000000}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union _f), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ff", "{016fe2ec-b2c8-45f8-b23b-39e53a753973}", - /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union ff), + /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0 }, { "ITestIface", "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", - /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*), /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6, { { -- 2.7.4

4 8

[PATCH 1/5] dbghelp: Read the ELF program header corresponding to the target's architecture.
by Zebediah Figura June 4, 2018

June 4, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 31 ++++++++++++++++++++++++------- dlls/dbghelp/image_private.h | 2 -- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8049210..f84df83 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -332,7 +332,6 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; unsigned int i; - Elf_Phdr phdr; size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; @@ -429,13 +428,31 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && - phdr.p_type == PT_LOAD) + if (fmap->addr_size == 32) { - tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; - if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; - if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + Elf32_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } + } + else + { + Elf64_Phdr phdr; + + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && + phdr.p_type == PT_LOAD) + { + tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; + if (fmap->u.elf.elf_size < tmp) fmap->u.elf.elf_size = tmp; + if (phdr.p_vaddr < fmap->u.elf.elf_start) fmap->u.elf.elf_start = phdr.p_vaddr; + } } } /* if non relocatable ELF, then remove fixed address from computation diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 42781e4..3951464 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,12 +59,10 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym #define Elf_auxv_t Elf32_auxv_t -- 2.7.4

1 4

[PATCH] jscript: Fix MSVC build.
by Thomas Faber June 4, 2018

June 4, 2018

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9b47368cf89..65ca47a5151 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1793,6 +1793,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) { - property_desc_t prop_desc = { flags, flags, TRUE, value }; + property_desc_t prop_desc = { flags, flags, TRUE }; + prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); } -- 2.16.1.windows.2

2 1

[PATCH] dism: add stub program
by Austin English June 4, 2018

June 4, 2018

For https://bugs.winehq.org/show_bug.cgi?id=43509 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + programs/dism/Makefile.in | 4 ++++ programs/dism/dism.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 programs/dism/Makefile.in create mode 100644 programs/dism/dism.c diff --git a/configure.ac b/configure.ac index 600cb63b9f..469fa8d729 100644 --- a/configure.ac +++ b/configure.ac @@ -3869,6 +3869,7 @@ WINE_CONFIG_MAKEFILE(programs/cmd/tests) WINE_CONFIG_MAKEFILE(programs/conhost) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) +WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in new file mode 100644 index 0000000000..834d1439a8 --- /dev/null +++ b/programs/dism/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dism.exe +APPMODE = -mconsole -municode + +C_SRCS = dism.c diff --git a/programs/dism/dism.c b/programs/dism/dism.c new file mode 100644 index 0000000000..86d5d2e6a3 --- /dev/null +++ b/programs/dism/dism.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dism); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} -- 2.16.1

1 0

[PATCH 1/2] testbot: Make sure optional enum properties are not used.
by Francois Gouget June 4, 2018

June 4, 2018

They are not supported and trying to set them to an undefined value will trigger errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index d5850698e..d8f0d391b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -42,6 +42,10 @@ sub _initialize($$) $self->{Class} = "Enum"; $self->{Values} = $Values; + if (!$self->{IsRequired}) + { + die "Optional enum properties are not supported\n"; + } $self->SUPER::_initialize(); } -- 2.17.0

1 1

[PATCH] user32: add stub for RegisterPointerDeviceNotifications
by Louis Lenders June 4, 2018

June 4, 2018

See https://bugs.winehq.org/show_bug.cgi?id=45284 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 895ccce312..be4b71a4bc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -837,6 +837,15 @@ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UIN return ERROR_NOT_SUPPORTED; } +/********************************************************************** + * RegisterPointerDeviceNotifications [USER32.@] + */ +BOOL WINAPI RegisterPointerDeviceNotifications(HWND hwnd, BOOL notifyrange) +{ + FIXME("(%p %d): stub\n", hwnd, notifyrange); + return FALSE; +} + static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index eb71e3b00b..2e5b203a85 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -598,6 +598,7 @@ @ stdcall RegisterLogonProcess(long long) # @ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities +@ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) diff --git a/include/winuser.h b/include/winuser.h index 8e9e91bf65..648efbe0e2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4004,6 +4004,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD); WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); #define RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification) WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); -- 2.17.0

1 0

[PATCH 2/2] user32: Respect margins more in DrawTextExW().
by Zhiyi Zhang June 4, 2018

June 4, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 286c4f52d0..118dbeb559 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -943,6 +943,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, { lmargin = dtp->iLeftMargin; rmargin = dtp->iRightMargin; + width -= lmargin + rmargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */ @@ -978,9 +979,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, retstr, tabwidth, &prefix_offset, &ellip); - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; + if (flags & DT_CENTER) + x = (rect->left + lmargin + rect->right - rmargin - size.cx) / 2; + else if (flags & DT_RIGHT) + x = rect->right - size.cx - rmargin; if (flags & DT_SINGLELINE) { -- 2.17.0

2 1

[PATCH 1/2] user32: Return 1 in DrawTextEx() when calculated offset is 0.
by Zhiyi Zhang June 4, 2018

June 4, 2018

The return value 0 in DrawTextEx() indicates failure. Should the offset from the bottom of the drawn text to top of the rectangle happens to be 0, return 1 instead. So that it doesn't indicate failure incidentally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 15 +++++++++++++++ dlls/user32/text.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..c5bcd50716 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -277,6 +277,21 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); + /* When offset to top is zero, return 1 */ + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRect(&rect, 0, 100, 0, 100); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_BOTTOM, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); + + SetRectEmpty(&rect); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_TOP, NULL); + /* Set top to text height and bottom zero, so bottom of drawn text to top is zero when DT_VCENTER is used */ + SetRect(&rect, 0, textheight, 0, 0); + textheight = DrawTextExW(hdc, textW, -1, &rect, DT_SINGLELINE | DT_CALCRECT | DT_VCENTER, NULL); + ok(textheight == 1, "Expect returned height:1 got:%d\n", textheight); /* invalid dtp size test */ dtp.cbSize = -1; /* Invalid */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 8a2c247d8d..286c4f52d0 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1064,6 +1064,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) memcpy(str, retstr, size_retstr); ret = y - rect->top; + if (ret == 0) ret = 1; done: heap_free(retstr); return ret; -- 2.17.0

2 1

[PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro
by Michael Stefaniuc June 4, 2018

June 4, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d3e8617b9..a4e94b15e0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = { {48000, 8, 1}, {48000, 8, 2}, {48000, 16, 1}, {48000, 16, 2}, {96000, 8, 1}, {96000, 8, 2}, {96000, 16, 1}, {96000, 16, 2} }; -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.wFormatTag = WAVE_FORMAT_PCM; fmt.cbSize = 0; - for(i = 0; i < NB_WIN_FORMATS; i++) { + for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); -- 2.14.4

2 1

[PATCH] testbot: Improve Job file storage.
by Francois Gouget June 4, 2018

June 4, 2018

So far files needed by a Step were stored in that Step's directory. This means the files produced by a Step are stored in the directory of the Step that needs them. Since multiple Steps may need the same file this can result in duplication (and also in retrieving the same file multiple times). This duplication is also needed for staging files if they are needed by more than one Step. This patch changes file storage so that files produced by a Step are stored in that Step's directory. Conversely files needed by a Step are found in the PreviousNo Step's directory, or in the Job's directory if PreviousNo is not set. This avoids duplication both when retrieving files from a VM and for staged files. To simplify the code Step::GetFullFileName() converts Step::FileName to an absolute path pointing to the Step's file. To ensure backward compatibility with existing Jobs it supports both the old and the new schemes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 13 ++++++------- testbot/bin/WineRunTask.pl | 5 ++--- testbot/lib/WineTestBot/Steps.pm | 25 +++++++++++++++++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 18 ++++++++++++++++++ testbot/web/GetFile.pl | 2 +- testbot/web/JobDetails.pl | 2 +- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 27b8be0e0..7a474e76d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -354,11 +354,10 @@ if (!defined $BaseName) # Run the build # -my $StepDir = $Step->GetDir(); -my $FileName = $Step->FileName; +my $FileName = $Step->GetFullFileName(); my $TA = $VM->GetAgent(); -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", "staging/patch.diff", 0)) +Debug(Elapsed($Start), " Sending '$FileName'\n"); +if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) { FatalTAError($TA, "Could not copy the patch to the VM"); } @@ -461,6 +460,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Don't try copying the test executables if the build step failed if ($NewStatus eq "completed") { + my $StepDir = $Step->CreateDir(); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { next if ($OtherStep->No == $StepNo); @@ -480,12 +480,11 @@ if ($NewStatus eq "completed") } Debug(Elapsed($Start), " Retrieving '$OtherFileName'\n"); - my $OtherStepDir = $OtherStep->CreateDir(); - if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) + if (!$TA->GetFile($TestExecutable, "$StepDir/$OtherFileName")) { FatalTAError($TA, "Could not retrieve '$OtherFileName'"); } - chmod 0664, "$OtherStepDir/$OtherFileName"; + chmod 0664, "$StepDir/$OtherFileName"; } } $TA->Disconnect(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 231f34e0c..d75741757 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -388,10 +388,9 @@ if ($FileType ne "exe32" && $FileType ne "exe64") { FatalError("Unexpected file type $FileType found\n"); } -my $StepDir = $Step->GetDir(); my $FileName = $Step->FileName; -Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", $FileName, 0)) +Debug(Elapsed($Start), " Sending '". $Step->GetFullFileName() ."'\n"); +if (!$TA->SendFile($Step->GetFullFileName(), $FileName, 0)) { FatalTAError($TA, "Could not copy the test executable to the VM"); } diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 4dc45690e..977419474 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -57,6 +57,12 @@ the Step was running, and to skipped if it was queued. =back +If FileName is set it identifies a file that the Step needs for its operation. +That file will either be in the directory of the PreviousNo Step that produced +it, or in the directory of the job if it was provided by the user. +Conversely a Step's Task(s) may produce one or more files. These are all stored +in that Step's directory and may be used by one or more Steps. + Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, or to reset their PreviousNo fields beforehand. @@ -136,6 +142,21 @@ sub RmTree($) rmtree($Dir); } +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub HandleStaging($$) { my ($self) = @_; @@ -150,13 +171,13 @@ sub HandleStaging($$) return "Can't split staging filename"; } my $BaseName = $1; + $self->FileName($BaseName); my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, "$StepDir/$BaseName")) + if (!move($StagingFileName, $self->GetFullFileName())) { return "Could not move the staging file: $!"; } - $self->FileName($BaseName); $self->InStaging(!1); my ($ErrProperty, $ErrMessage) = $self->Save(); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index db0cc0667..b9f70d768 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -39,6 +39,22 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } +# See WineTestBot::Step::GetFullFileName() +sub GetFullFileName($) +{ + my ($self) = @_; + + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; + # FIXME: Remove legacy support once no such job remains (so after + # $JobPurgeDays). + my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; + return $LegacyPath if (-f $LegacyPath); + + my $Path = "$DataDir/jobs/$JobId/"; + $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); + return $Path . $self->FileName; +} + sub GetTaskDir($) { my ($self) = @_; @@ -121,6 +137,7 @@ sub _initialize($$) my $StepTask = $self->CreateItem(); $StepTask->Id(100 * $Step->No + $Task->No); $StepTask->StepNo($Step->No); + $StepTask->PreviousNo($Step->PreviousNo); $StepTask->TaskNo($Task->No); $StepTask->Type($Step->Type); $StepTask->Status($Task->Status); @@ -166,6 +183,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Id", 1, 1, "N", 4), CreateBasicPropertyDescriptor("StepNo", "Step no", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateBasicPropertyDescriptor("TaskNo", "Task no", !1, 1, "N", 2), CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a178cca42..7e274a8bf 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -52,7 +52,7 @@ sub GetFile($$$) return !1; } - my $FileName = $Step->GetDir() ."/". $Step->FileName; + my $FileName = $Step->GetFullFileName(); if (! sysopen(FILE, $FileName, O_RDONLY)) { return !1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 4d9a77a57..6bf4a12e8 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -485,7 +485,7 @@ sub GenerateDataCell($$$$$) } elsif ($PropertyName eq "FileName") { - my $FileName = $StepTask->GetStepDir() ."/". $StepTask->FileName; + my $FileName = $StepTask->GetFullFileName(); if (-r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . -- 2.17.0

1 0

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.
by Francois Gouget June 4, 2018

June 4, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

1 0

[PATCH] ole32: Don't try to unregister window class if it was never registered.
by Jacek Caban June 4, 2018

June 4, 2018

UnregisterClass may load display driver, which is may be problematic inside DLL_PROCESS_DETACH (esp. in Android drivers, which imports ole32 itself). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/compobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

2 1

[PATCH v2] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)
by Alex Henrie June 4, 2018

June 4, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Also free the paths in pStrokes dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60515..49e270c4fe 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } } -- 2.17.0

2 1

[PATCH] msctf/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 3, 2018

June 3, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a02f95117..4a52432aa5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -981,7 +981,8 @@ static void test_Register(void) ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); - hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); + hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, + &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2088,7 +2089,7 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + StringFromGUID2(&g,str,ARRAY_SIZE(str)); WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) -- 2.14.4

1 0

[PATCH] mpr/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 3, 2018

June 3, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 041afbf130..fc067d98c4 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -60,7 +60,7 @@ static void test_WNetGetUniversalName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +132,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) -- 2.14.4

1 0

[PATCH] mapi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 3, 2018

June 3, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mapi32/tests/prop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 4e099318f5..4d7fd7be43 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -135,7 +135,7 @@ static void test_PropCopyMore(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { lpSrc->ulPropTag = ptTypes[i]; @@ -453,11 +453,11 @@ static void test_FPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(FPCProp_Results)/sizeof(FPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(FPCProp_Results); j++) { SHORT lVal = FPCProp_Results[j].lVal; SHORT rVal = FPCProp_Results[j].rVal; @@ -583,11 +583,11 @@ static void test_LPropCompareProp(void) lbuffw[1] = '\0'; rbuffw[1] = '\0'; - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvLeft.ulPropTag = pvRight.ulPropTag = ptTypes[i]; - for (j = 0; j < sizeof(LPCProp_Results)/sizeof(LPCProp_Results[0]); j++) + for (j = 0; j < ARRAY_SIZE(LPCProp_Results); j++) { SHORT lVal = LPCProp_Results[j].lVal; SHORT rVal = LPCProp_Results[j].rVal; @@ -684,7 +684,7 @@ static void test_PpropFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = ptTypes[i]; @@ -923,7 +923,7 @@ static void test_LpValFindProp(void) return; } - for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) + for (i = 0; i < ARRAY_SIZE(ptTypes); i++) { pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); -- 2.14.4

1 0

[PATCH] localui/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 3, 2018

June 3, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localui/tests/localui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index b0b51e338c..f051880fd1 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -310,7 +310,7 @@ START_TEST(localui) while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_lptA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); @@ -321,7 +321,7 @@ START_TEST(localui) while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; sprintf(bufferA, fmt_comA, id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); -- 2.14.4

1 0

[resend PATCH 1/2] include: Add ID2D1DeviceContext definition.
by Nikolay Sivov June 3, 2018

June 3, 2018

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Same patch, resending. include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 20 ++++ 2 files changed, 304 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4b6224afe3..4d30f6fd34 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -27,7 +27,18 @@ interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; interface IWICImagingFactory; +interface IWICColorContext; interface ID2D1ColorContext; +interface ID2D1Effect; +interface ID2D1GradientStopCollection1; +interface ID2D1ImageBrush; +interface ID2D1BitmapBrush1; +interface ID2D1CommandList; + +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __dwrite_h__ */") typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { @@ -96,7 +107,63 @@ typedef enum D2D1_MAP_OPTIONS D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_MAP_OPTIONS; +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 7, + D2D1_COMPOSITE_MODE_XOR = 8, + D2D1_COMPOSITE_MODE_PLUS = 9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 10, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 11, + D2D1_COMPOSITE_MODE_MASK_INVERT = 12, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { @@ -134,6 +201,54 @@ typedef struct D2D1_MAPPED_RECT BYTE *bits; } D2D1_MAPPED_RECT; +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -183,6 +298,175 @@ interface ID2D1Device : ID2D1Resource ); } +[ + object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998), + local, +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d202..e651a75d0e 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,23 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + float _11; + float _12; + float _13; + float _14; + float _21; + float _22; + float _23; + float _24; + float _31; + float _32; + float _33; + float _34; + float _41; + float _42; + float _43; + float _44; +} D2D_MATRIX_4X4_F; -- 2.17.0

3 5