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

Matteo Bruni : wined3d: Initialize glMinSampleShading() function pointer.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 4c8127ef41ca8f48aab49c52e4b8d1a1901747c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c8127ef41ca8f48aab49c52… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:30 2018 +0200 wined3d: Initialize glMinSampleShading() function pointer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3ca389e..afb9718 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3279,6 +3279,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glMinSampleShading) /* OpenGL 4.0 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */

1 0

Alistair Leslie-Hughes : wbemdisp/tests: Add ISWbemSecurity tests.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: b5627d742cf14f2579648e57e35c4e47da0bd2f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5627d742cf14f2579648e57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 5 10:40:14 2018 +0200 wbemdisp/tests: Add ISWbemSecurity tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91e..1ce0456 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 imp_level; + WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,34 @@ 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 ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); + + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + todo_wine { + ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); + } + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); + ok( hr == S_OK, "got %x\n", hr ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +349,18 @@ 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 ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object );

1 0

Michael Müller : wbemdisp: Add ISWbemSecurity stub interface.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 350d980ccc15d93f1b4dd0bd78d5a46571b2cd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=350d980ccc15d93f1b4dd0bd… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jun 5 10:40:13 2018 +0200 wbemdisp: Add ISWbemSecurity stub interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Zebediah Figura : msi/tests: Test deferral of WriteRegistryValues.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: ed2861c28cdfd2bb97abb7d376f9aa2d975ea97d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2861c28cdfd2bb97abb7d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 1 21:48:22 2018 -0500 msi/tests: Test deferral of WriteRegistryValues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 28 ++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 5162018..2e464c4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -695,12 +695,25 @@ static const char wrv_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "RemoveRegistryValues\t\t4900\n" + "rrv_immediate\tREMOVE\t4901\n" + "rrv_deferred\tREMOVE\t4902\n" "WriteRegistryValues\t\t5000\n" + "wrv_immediate\tNOT REMOVE\t5001\n" + "wrv_deferred\tNOT REMOVE\t5002\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6200\n" "PublishProduct\t\t6300\n" "InstallFinalize\t\t6600\n"; +static const char wrv_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "wrv_immediate\t1\tcustom.dll\twrv_absent\n" + "wrv_deferred\t1025\tcustom.dll\twrv_present\n" + "rrv_immediate\t1\tcustom.dll\twrv_present\n" + "rrv_deferred\t1025\tcustom.dll\twrv_absent\n"; + static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -2025,6 +2038,7 @@ static const msi_table wrv_tables[] = ADD_TABLE(wrv_feature), ADD_TABLE(wrv_feature_comp), ADD_TABLE(wrv_install_exec_seq), + ADD_TABLE(wrv_custom_action), ADD_TABLE(property), ADD_TABLE(media), ADD_TABLE(wrv_registry), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3e742e3..4d45c9e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1922,3 +1922,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +UINT WINAPI wrv_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); + ok(hinst, !res, "got %u\n", res); + todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + check_reg_str(hinst, key, "sz", "string"); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI wrv_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); + ok(hinst, !res, "got %u\n", res); + todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + check_reg_str(hinst, key, "sz", NULL); + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index bfd8392..b94f6cc 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -53,3 +53,5 @@ @ stdcall sss_stopped(long) @ stdcall tl_present(long) @ stdcall tl_absent(long) +@ stdcall wrv_present(long) +@ stdcall wrv_absent(long)

1 0

Zebediah Figura : stdole2.idl: Use more accurate sizes for Automation types.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 70e5d5fd2e8501f36e4f3b2bccbdc55e25d31ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70e5d5fd2e8501f36e4f3b2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 4 17:59:33 2018 -0500 stdole2.idl: Use more accurate sizes for Automation types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/stdole2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 18c402a..d372384 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -32,15 +32,15 @@ ] library stdole { - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - + /* These typedefs need to have the same size as their real counterparts. */ typedef short VARIANT_BOOL; - typedef long BSTR; + typedef void *BSTR; typedef double CURRENCY; typedef unsigned long HRESULT; - typedef void *VARIANT; + typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; + } VARIANT; typedef unsigned long SCODE; typedef struct GUID {

1 0

Alexandre Julliard : user32: Rename rectWindow to window_rect for consistency.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 52be6f0ecca20ad67ee1f9e3d97db98074ebe0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=52be6f0ecca20ad67ee1f9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:03:16 2018 +0200 user32: Rename rectWindow to window_rect for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 8 ++++---- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2435a6f..1398458 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (win != WND_OTHER_PROCESS) { - RECT window_rect = win->rectWindow, client_rect = win->client_rect; + RECT window_rect = win->window_rect, client_rect = win->client_rect; switch (relative) { @@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind mirror_rect( &win->client_rect, &window_rect ); break; case COORDS_WINDOW: - OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); - OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top ); + OffsetRect( &window_rect, -win->window_rect.left, -win->window_rect.top ); + OffsetRect( &client_rect, -win->window_rect.left, -win->window_rect.top ); if (win->dwExStyle & WS_EX_LAYOUTRTL) - mirror_rect( &win->rectWindow, &client_rect ); + mirror_rect( &win->window_rect, &client_rect ); break; case COORDS_PARENT: if (win->parent) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9f954dc..9794aab 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -44,7 +44,7 @@ typedef struct tagWND DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ RECT client_rect; /* Client area rel. to parent client area */ - RECT rectWindow; /* Whole window rel. to parent client area */ + RECT window_rect; /* Whole window rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */ POINT min_pos; /* Position for minimized window */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a06ae7e..d527409 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) TRACE("%p %i\n", hwnd, (bShow != 0) ); if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return; - if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000) + if (win->window_rect.left == -32000 || win->window_rect.top == -32000) { TRACE( "not showing title for hidden icon %p\n", hwnd ); bShow = FALSE; @@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) /* update the placement according to the current style */ if (pWnd->dwStyle & WS_MINIMIZE) { - pWnd->min_pos.x = pWnd->rectWindow.left; - pWnd->min_pos.y = pWnd->rectWindow.top; + pWnd->min_pos.x = pWnd->window_rect.left; + pWnd->min_pos.y = pWnd->window_rect.top; } else if (pWnd->dwStyle & WS_MAXIMIZE) { - pWnd->max_pos.x = pWnd->rectWindow.left; - pWnd->max_pos.y = pWnd->rectWindow.top; + pWnd->max_pos.x = pWnd->window_rect.left; + pWnd->max_pos.y = pWnd->window_rect.top; } else { - pWnd->normal_rect = pWnd->rectWindow; + pWnd->normal_rect = pWnd->window_rect; } wndpl->length = sizeof(*wndpl); @@ -2117,7 +2117,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { win->dwStyle = reply->new_style; win->dwExStyle = reply->new_ex_style; - win->rectWindow = *window_rect; + win->window_rect = *window_rect; win->client_rect = *client_rect; win->visible_rect = visible_rect; win->surface = new_surface; @@ -2127,7 +2127,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { RECT client; GetClientRect( win->parent, &client ); - mirror_rect( &client, &win->rectWindow ); + mirror_rect( &client, &win->window_rect ); mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->visible_rect ); }

1 0

Roderick Colenbrander : winevulkan: Parse extension require sections one by one.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 3bb4ecaf16af7a03dd5ddcf88ceea736f81e02b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb4ecaf16af7a03dd5ddcf8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:12 2018 -0700 winevulkan: Parse extension require sections one by one. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 78 +++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5fae8dc..594ebdd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2359,46 +2359,54 @@ class VkRegistry(object): LOGGER.debug("Loading extension: {0}".format(ext_name)) - # Extensions can add enum values to Core / extension enums, so add these. - enums = ext.findall("require/enum") - for enum_elem in enums: - if "bitpos" in enum_elem.keys(): - # We need to add an extra value to an existing enum type. - # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) - elif "offset" in enum_elem.keys(): - ext_number = int(ext.attrib["number"]) - offset = int(enum_elem.attrib["offset"]) - value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset - - # Deal with negative values. - direction = enum_elem.attrib.get("dir") - if direction is not None: - value = -value - - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] - enum.add(VkEnumValue(enum_elem.attrib["name"], value)) - - elif "value" in enum_elem.keys(): - self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) - continue - else: - # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX - continue + # Extensions can define one or more require sections each requiring + # different features (e.g. Vulkan 1.1). Parse each require section + # separately, so we can skip sections we don't want. + for require in ext.findall("require"): + # Extensions can add enum values to Core / extension enums, so add these. + for enum_elem in require.findall("enum"): + if "bitpos" in enum_elem.keys(): + # We need to add an extra value to an existing enum type. + # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) + elif "offset" in enum_elem.keys(): + # Extensions promoted to Core, have the extension number as part + # of the enum value. Else retrieve from the extension tag. + if enum_elem.attrib.get("extnumber") is not None: + ext_number = int(enum_elem.attrib.get("extnumber")) + else: + ext_number = int(ext.attrib["number"]) + offset = int(enum_elem.attrib["offset"]) + value = EXT_BASE + (ext_number - 1) * EXT_BLOCK_SIZE + offset + + # Deal with negative values. + direction = enum_elem.attrib.get("dir") + if direction is not None: + value = -value + + type_name = enum_elem.attrib["extends"] + enum = self.types[type_name]["data"] + enum.add(VkEnumValue(enum_elem.attrib["name"], value)) + + elif "value" in enum_elem.keys(): + self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) + continue + else: + # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX + continue + + # Pull in any commands we need. We infer types to pull in from the command + # as well. + for command in require.findall("command"): + cmd_name = command.attrib["name"] + self._mark_command_required(cmd_name) # Store a list with extensions. ext_info = {"name" : ext_name, "type" : ext_type} extensions.append(ext_info) - # Pull in any commands we need. We infer types to pull in from the command - # as well. - for command in commands: - cmd_name = command.attrib["name"] - self._mark_command_required(cmd_name) - # Sort in alphabetical order. self.extensions = sorted(extensions, key=lambda ext: ext["name"])

1 0

Roderick Colenbrander : winevulkan: Parse forward declared struct members.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 69ca5159155de674a7ee379c0aa9a787d97a8e83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ca5159155de674a7ee379c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:11 2018 -0700 winevulkan: Parse forward declared struct members. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 81148ef..5fae8dc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -780,9 +780,10 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, - extension_structs=None): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, extension_structs=None): self.const = const + self.struct_fwd_decl = struct_fwd_decl self.name = name self.pointer = pointer self.type = _type @@ -805,8 +806,8 @@ class VkMember(object): return False def __repr__(self): - return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, - self.dyn_array_len) + return "{0} {1} {2} {3} {4} {5} {6}".format(self.const, self.struct_fwd_decl, self.type, self.pointer, + self.name, self.array_len, self.dyn_array_len) @staticmethod def from_xml(member): @@ -815,11 +816,22 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = True if member.text and "const" in member.text else False + const = False + struct_fwd_decl = False member_type = None pointer = None array_len = None + if member.text: + if "const" in member.text: + const = True + + # Some members contain forward declarations: + # - VkBaseInstructure has a member "const struct VkBaseInStructure *pNext" + # - VkWaylandSurfaceCreateInfoKHR has a member "struct wl_display *display" + if "struct" in member.text: + struct_fwd_decl = True + if type_elem is not None: member_type = type_elem.text if type_elem.tail is not None: @@ -855,8 +867,8 @@ class VkMember(object): # Remove brackets around length array_len = name_elem.tail.strip("[]") - return VkMember(const=const, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, - dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, extension_structs=extension_structs) def copy(self, input, output, direction): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ @@ -900,6 +912,9 @@ class VkMember(object): if self.is_const(): text += "const " + if self.is_struct_forward_declaration(): + text += "struct " + if conv and self.is_struct(): text += "{0}_host".format(self.type) else: @@ -974,6 +989,9 @@ class VkMember(object): def is_struct(self): return self.type_info["category"] == "struct" + def is_struct_forward_declaration(self): + return self.struct_fwd_decl + def is_union(self): return self.type_info["category"] == "union"

1 0

Matteo Bruni : wined3d: Slightly improve formatting of generated GLSL shader interfaces.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 05c6692471b699bf7cf7579977bcc2f8dbd4f67b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05c6692471b699bf7cf75799… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:28 2018 +0200 wined3d: Slightly improve formatting of generated GLSL shader interfaces. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3692a27..d6615d7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2174,9 +2174,9 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte switch (mode) { case WINED3DSIM_CONSTANT: - return "flat"; + return "flat "; case WINED3DSIM_LINEAR_NOPERSPECTIVE: - return "noperspective"; + return "noperspective "; default: FIXME("Unhandled interpolation mode %#x.\n", mode); case WINED3DSIM_NONE: @@ -2207,7 +2207,7 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i for (i = 0; i < element_count; ++i) { mode = wined3d_extract_interpolation_mode(interpolation_mode, i); - shader_addline(buffer, "%s vec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); + shader_addline(buffer, " %svec4 reg%u;\n", shader_glsl_interpolation_qualifiers(mode), i); } shader_addline(buffer, "} shader_in;\n"); } @@ -2242,7 +2242,7 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ mode = wined3d_extract_interpolation_mode(interpolation_mode, i); interpolation_qualifiers = shader_glsl_interpolation_qualifiers(mode); } - shader_addline(buffer, "%s vec4 reg%u;\n", interpolation_qualifiers, i); + shader_addline(buffer, " %svec4 reg%u;\n", interpolation_qualifiers, i); } shader_addline(buffer, "} shader_out;\n"); }

1 0

Zebediah Figura : msi/tests: Simplify and clarify WriteRegistryValues and RemoveRegistryValues tests.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 3c2b229431805ff771f4c20be52d1a9d7ff0ced3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2b229431805ff771f4c20b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 1 21:48:21 2018 -0500 msi/tests: Simplify and clarify WriteRegistryValues and RemoveRegistryValues tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 612 ++++++++++++++---------------------------------- 1 file changed, 181 insertions(+), 431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2b229431805ff771f4…

1 0