July 2016 - Wine-Commits - list.winehq.org

Jan Schmidt : d3d9: Adjust D3DCOLOR_ARGB to avoid shift overflow.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: a9de59c906e20f1b186cbe5d5a17d10556c89796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9de59c906e20f1b186cbe5d5… Author: Jan Schmidt <jan(a)centricular.com> Date: Wed Jul 20 14:37:09 2016 +1000 d3d9: Adjust D3DCOLOR_ARGB to avoid shift overflow. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 8ebedcc..82e5112 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -39,7 +39,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b)

1 0

Matteo Bruni : ddraw: Use a union in tss_lookup. (Coverity).
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 96eb4242cc98166afa58e012062f516ca6b51da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96eb4242cc98166afa58e0120… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:28 2016 +0200 ddraw: Use a union in tss_lookup. (Coverity). 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/ddraw/device.c | 64 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ec71a7c..2f79c4c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4776,35 +4776,39 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, static const struct tss_lookup { BOOL sampler_state; - enum wined3d_texture_stage_state state; + union + { + enum wined3d_texture_stage_state texture_state; + enum wined3d_sampler_state sampler_state; + } u; } tss_lookup[] = { - {FALSE, WINED3D_TSS_INVALID}, /* 0, unused */ - {FALSE, WINED3D_TSS_COLOR_OP}, /* 1, D3DTSS_COLOROP */ - {FALSE, WINED3D_TSS_COLOR_ARG1}, /* 2, D3DTSS_COLORARG1 */ - {FALSE, WINED3D_TSS_COLOR_ARG2}, /* 3, D3DTSS_COLORARG2 */ - {FALSE, WINED3D_TSS_ALPHA_OP}, /* 4, D3DTSS_ALPHAOP */ - {FALSE, WINED3D_TSS_ALPHA_ARG1}, /* 5, D3DTSS_ALPHAARG1 */ - {FALSE, WINED3D_TSS_ALPHA_ARG2}, /* 6, D3DTSS_ALPHAARG2 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT00}, /* 7, D3DTSS_BUMPENVMAT00 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT01}, /* 8, D3DTSS_BUMPENVMAT01 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT10}, /* 9, D3DTSS_BUMPENVMAT10 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT11}, /* 10, D3DTSS_BUMPENVMAT11 */ - {FALSE, WINED3D_TSS_TEXCOORD_INDEX}, /* 11, D3DTSS_TEXCOORDINDEX */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 12, D3DTSS_ADDRESS */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 13, D3DTSS_ADDRESSU */ - {TRUE, WINED3D_SAMP_ADDRESS_V}, /* 14, D3DTSS_ADDRESSV */ - {TRUE, WINED3D_SAMP_BORDER_COLOR}, /* 15, D3DTSS_BORDERCOLOR */ - {TRUE, WINED3D_SAMP_MAG_FILTER}, /* 16, D3DTSS_MAGFILTER */ - {TRUE, WINED3D_SAMP_MIN_FILTER}, /* 17, D3DTSS_MINFILTER */ - {TRUE, WINED3D_SAMP_MIP_FILTER}, /* 18, D3DTSS_MIPFILTER */ - {TRUE, WINED3D_SAMP_MIPMAP_LOD_BIAS}, /* 19, D3DTSS_MIPMAPLODBIAS */ - {TRUE, WINED3D_SAMP_MAX_MIP_LEVEL}, /* 20, D3DTSS_MAXMIPLEVEL */ - {TRUE, WINED3D_SAMP_MAX_ANISOTROPY}, /* 21, D3DTSS_MAXANISOTROPY */ - {FALSE, WINED3D_TSS_BUMPENV_LSCALE}, /* 22, D3DTSS_BUMPENVLSCALE */ - {FALSE, WINED3D_TSS_BUMPENV_LOFFSET}, /* 23, D3DTSS_BUMPENVLOFFSET */ - {FALSE, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 0, unused */ + {FALSE, {WINED3D_TSS_COLOR_OP}}, /* 1, D3DTSS_COLOROP */ + {FALSE, {WINED3D_TSS_COLOR_ARG1}}, /* 2, D3DTSS_COLORARG1 */ + {FALSE, {WINED3D_TSS_COLOR_ARG2}}, /* 3, D3DTSS_COLORARG2 */ + {FALSE, {WINED3D_TSS_ALPHA_OP}}, /* 4, D3DTSS_ALPHAOP */ + {FALSE, {WINED3D_TSS_ALPHA_ARG1}}, /* 5, D3DTSS_ALPHAARG1 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG2}}, /* 6, D3DTSS_ALPHAARG2 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT00}}, /* 7, D3DTSS_BUMPENVMAT00 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT01}}, /* 8, D3DTSS_BUMPENVMAT01 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT10}}, /* 9, D3DTSS_BUMPENVMAT10 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT11}}, /* 10, D3DTSS_BUMPENVMAT11 */ + {FALSE, {WINED3D_TSS_TEXCOORD_INDEX}}, /* 11, D3DTSS_TEXCOORDINDEX */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 12, D3DTSS_ADDRESS */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 13, D3DTSS_ADDRESSU */ + {TRUE, {WINED3D_SAMP_ADDRESS_V}}, /* 14, D3DTSS_ADDRESSV */ + {TRUE, {WINED3D_SAMP_BORDER_COLOR}}, /* 15, D3DTSS_BORDERCOLOR */ + {TRUE, {WINED3D_SAMP_MAG_FILTER}}, /* 16, D3DTSS_MAGFILTER */ + {TRUE, {WINED3D_SAMP_MIN_FILTER}}, /* 17, D3DTSS_MINFILTER */ + {TRUE, {WINED3D_SAMP_MIP_FILTER}}, /* 18, D3DTSS_MIPFILTER */ + {TRUE, {WINED3D_SAMP_MIPMAP_LOD_BIAS}}, /* 19, D3DTSS_MIPMAPLODBIAS */ + {TRUE, {WINED3D_SAMP_MAX_MIP_LEVEL}}, /* 20, D3DTSS_MAXMIPLEVEL */ + {TRUE, {WINED3D_SAMP_MAX_ANISOTROPY}}, /* 21, D3DTSS_MAXANISOTROPY */ + {FALSE, {WINED3D_TSS_BUMPENV_LSCALE}}, /* 22, D3DTSS_BUMPENVLSCALE */ + {FALSE, {WINED3D_TSS_BUMPENV_LOFFSET}}, /* 23, D3DTSS_BUMPENVLOFFSET */ + {FALSE, {WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ }; /***************************************************************************** @@ -4849,7 +4853,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, if (l->sampler_state) { - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); switch (state) { @@ -4909,7 +4913,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); } wined3d_mutex_unlock(); @@ -5047,11 +5051,11 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, break; } - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); } else { - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); } wined3d_mutex_unlock();

1 0

Matteo Bruni : d3d8: Use a union in tss_lookup. (Coverity).
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 3a597237b7cde9b2e2f8c69e28de66aeafe1c1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a597237b7cde9b2e2f8c69e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:27 2016 +0200 d3d8: Use a union in tss_lookup. (Coverity). 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/d3d8/device.c | 72 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f0efad..bf333c1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1810,39 +1810,43 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag static const struct tss_lookup { BOOL sampler_state; - enum wined3d_texture_stage_state state; + union + { + enum wined3d_texture_stage_state texture_state; + enum wined3d_sampler_state sampler_state; + } u; } tss_lookup[] = { - {FALSE, WINED3D_TSS_INVALID}, /* 0, unused */ - {FALSE, WINED3D_TSS_COLOR_OP}, /* 1, D3DTSS_COLOROP */ - {FALSE, WINED3D_TSS_COLOR_ARG1}, /* 2, D3DTSS_COLORARG1 */ - {FALSE, WINED3D_TSS_COLOR_ARG2}, /* 3, D3DTSS_COLORARG2 */ - {FALSE, WINED3D_TSS_ALPHA_OP}, /* 4, D3DTSS_ALPHAOP */ - {FALSE, WINED3D_TSS_ALPHA_ARG1}, /* 5, D3DTSS_ALPHAARG1 */ - {FALSE, WINED3D_TSS_ALPHA_ARG2}, /* 6, D3DTSS_ALPHAARG2 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT00}, /* 7, D3DTSS_BUMPENVMAT00 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT01}, /* 8, D3DTSS_BUMPENVMAT01 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT10}, /* 9, D3DTSS_BUMPENVMAT10 */ - {FALSE, WINED3D_TSS_BUMPENV_MAT11}, /* 10, D3DTSS_BUMPENVMAT11 */ - {FALSE, WINED3D_TSS_TEXCOORD_INDEX}, /* 11, D3DTSS_TEXCOORDINDEX */ - {FALSE, WINED3D_TSS_INVALID}, /* 12, unused */ - {TRUE, WINED3D_SAMP_ADDRESS_U}, /* 13, D3DTSS_ADDRESSU */ - {TRUE, WINED3D_SAMP_ADDRESS_V}, /* 14, D3DTSS_ADDRESSV */ - {TRUE, WINED3D_SAMP_BORDER_COLOR}, /* 15, D3DTSS_BORDERCOLOR */ - {TRUE, WINED3D_SAMP_MAG_FILTER}, /* 16, D3DTSS_MAGFILTER */ - {TRUE, WINED3D_SAMP_MIN_FILTER}, /* 17, D3DTSS_MINFILTER */ - {TRUE, WINED3D_SAMP_MIP_FILTER}, /* 18, D3DTSS_MIPFILTER */ - {TRUE, WINED3D_SAMP_MIPMAP_LOD_BIAS}, /* 19, D3DTSS_MIPMAPLODBIAS */ - {TRUE, WINED3D_SAMP_MAX_MIP_LEVEL}, /* 20, D3DTSS_MAXMIPLEVEL */ - {TRUE, WINED3D_SAMP_MAX_ANISOTROPY}, /* 21, D3DTSS_MAXANISOTROPY */ - {FALSE, WINED3D_TSS_BUMPENV_LSCALE}, /* 22, D3DTSS_BUMPENVLSCALE */ - {FALSE, WINED3D_TSS_BUMPENV_LOFFSET}, /* 23, D3DTSS_BUMPENVLOFFSET */ - {FALSE, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ - {TRUE, WINED3D_SAMP_ADDRESS_W}, /* 25, D3DTSS_ADDRESSW */ - {FALSE, WINED3D_TSS_COLOR_ARG0}, /* 26, D3DTSS_COLORARG0 */ - {FALSE, WINED3D_TSS_ALPHA_ARG0}, /* 27, D3DTSS_ALPHAARG0 */ - {FALSE, WINED3D_TSS_RESULT_ARG}, /* 28, D3DTSS_RESULTARG */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 0, unused */ + {FALSE, {WINED3D_TSS_COLOR_OP}}, /* 1, D3DTSS_COLOROP */ + {FALSE, {WINED3D_TSS_COLOR_ARG1}}, /* 2, D3DTSS_COLORARG1 */ + {FALSE, {WINED3D_TSS_COLOR_ARG2}}, /* 3, D3DTSS_COLORARG2 */ + {FALSE, {WINED3D_TSS_ALPHA_OP}}, /* 4, D3DTSS_ALPHAOP */ + {FALSE, {WINED3D_TSS_ALPHA_ARG1}}, /* 5, D3DTSS_ALPHAARG1 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG2}}, /* 6, D3DTSS_ALPHAARG2 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT00}}, /* 7, D3DTSS_BUMPENVMAT00 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT01}}, /* 8, D3DTSS_BUMPENVMAT01 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT10}}, /* 9, D3DTSS_BUMPENVMAT10 */ + {FALSE, {WINED3D_TSS_BUMPENV_MAT11}}, /* 10, D3DTSS_BUMPENVMAT11 */ + {FALSE, {WINED3D_TSS_TEXCOORD_INDEX}}, /* 11, D3DTSS_TEXCOORDINDEX */ + {FALSE, {WINED3D_TSS_INVALID}}, /* 12, unused */ + {TRUE, {WINED3D_SAMP_ADDRESS_U}}, /* 13, D3DTSS_ADDRESSU */ + {TRUE, {WINED3D_SAMP_ADDRESS_V}}, /* 14, D3DTSS_ADDRESSV */ + {TRUE, {WINED3D_SAMP_BORDER_COLOR}}, /* 15, D3DTSS_BORDERCOLOR */ + {TRUE, {WINED3D_SAMP_MAG_FILTER}}, /* 16, D3DTSS_MAGFILTER */ + {TRUE, {WINED3D_SAMP_MIN_FILTER}}, /* 17, D3DTSS_MINFILTER */ + {TRUE, {WINED3D_SAMP_MIP_FILTER}}, /* 18, D3DTSS_MIPFILTER */ + {TRUE, {WINED3D_SAMP_MIPMAP_LOD_BIAS}}, /* 19, D3DTSS_MIPMAPLODBIAS */ + {TRUE, {WINED3D_SAMP_MAX_MIP_LEVEL}}, /* 20, D3DTSS_MAXMIPLEVEL */ + {TRUE, {WINED3D_SAMP_MAX_ANISOTROPY}}, /* 21, D3DTSS_MAXANISOTROPY */ + {FALSE, {WINED3D_TSS_BUMPENV_LSCALE}}, /* 22, D3DTSS_BUMPENVLSCALE */ + {FALSE, {WINED3D_TSS_BUMPENV_LOFFSET}}, /* 23, D3DTSS_BUMPENVLOFFSET */ + {FALSE, {WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS}}, /* 24, D3DTSS_TEXTURETRANSFORMFLAGS */ + {TRUE, {WINED3D_SAMP_ADDRESS_W}}, /* 25, D3DTSS_ADDRESSW */ + {FALSE, {WINED3D_TSS_COLOR_ARG0}}, /* 26, D3DTSS_COLORARG0 */ + {FALSE, {WINED3D_TSS_ALPHA_ARG0}}, /* 27, D3DTSS_ALPHAARG0 */ + {FALSE, {WINED3D_TSS_RESULT_ARG}}, /* 28, D3DTSS_RESULTARG */ }; static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, @@ -1863,9 +1867,9 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); else - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); wined3d_mutex_unlock(); return D3D_OK; @@ -1889,9 +1893,9 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); else - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : winegcc: Set the soname of all dlls on Android.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: f5929a9cf95449221329b365fd1392f011ac74d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5929a9cf95449221329b365f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:55:11 2016 +0900 winegcc: Set the soname of all dlls on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 119e12b..514a574 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1130,7 +1130,8 @@ static void build(struct options* opts) } break; case PLATFORM_ANDROID: - /* not supported on Android */ + /* the Android loader requires a soname for all libraries */ + strarray_add( link_args, strmake( "-Wl,-soname,%s.so", output_name )); break; default: if (opts->image_base)

1 0

Alexandre Julliard : configure: Set the libwine soname on Android.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 1409662393784723032d0037babfe335ff88133b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1409662393784723032d0037b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:54:50 2016 +0900 configure: Set the libwine soname on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ce49aed..06e13d2 100755 --- a/configure +++ b/configure @@ -8380,7 +8380,7 @@ fi LIBWINE_INSTALL_LIB="libwine.so" - LIBWINE_LDFLAGS="-shared" + LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" ;; diff --git a/configure.ac b/configure.ac index 019d549..0a42855 100644 --- a/configure.ac +++ b/configure.ac @@ -860,7 +860,7 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") - AC_SUBST(LIBWINE_LDFLAGS,"-shared") + AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) ;; *)

1 0

Michael Stefaniuc : hlink/tests: Use wine_dbgstr_guid() to print a REFIID.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: fdb1f48a22ba94ff73b088918269164714cd37ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb1f48a22ba94ff73b088918… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 20 10:30:06 2016 +0200 hlink/tests: Use wine_dbgstr_guid() to print a REFIID. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index a913fb1..8a01f19 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1731,7 +1731,7 @@ static const WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R' static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj) { - ok(0, "BTS: %p %p %p %p %p\n", iface, pbc, toLeft, riid, obj); + ok(0, "BTS: %p %p %p %s %p\n", iface, pbc, toLeft, wine_dbgstr_guid(riid), obj); return E_NOTIMPL; }

1 0

Matteo Bruni : wined3d: Update vertex shader when the swizzle map changes.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 8d6ea0ea02e8e1cee6cd873486997b646ca75323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6ea0ea02e8e1cee6cd87348… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 20 00:33:25 2016 +0200 wined3d: Update vertex shader when the swizzle map changes. 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 | 5 ++++- dlls/wined3d/state.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff0fd2b..c239a47 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8972,9 +8972,12 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* If the vertex declaration contains a transformed position attribute, * the draw uses the fixed function vertex pipeline regardless of any * vertex shader set by the application. */ - if (transformed != wasrhw) + if (transformed != wasrhw + || context->stream_info.swizzle_map != context->last_swizzle_map) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + context->last_swizzle_map = context->stream_info.swizzle_map; + if (!use_vs(state)) { if (context->last_was_vshader) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 98e78da..30ea1c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4451,6 +4451,11 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine context->last_was_rhw = transformed; + if (context->stream_info.swizzle_map != context->last_swizzle_map) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + + context->last_swizzle_map = context->stream_info.swizzle_map; + /* Don't have to apply the matrices when vertex shaders are used. When * vshaders are turned off this function will be called again anyway to * make sure they're properly set. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b400994..3c6c869 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1462,6 +1462,7 @@ struct wined3d_context DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD padding : 14; + DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Nikolay Sivov : dwrite: Implement GetOverhangMetrics() for trimming sign.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 0973f4655a67b51e0dbc7c18c0e528da0ba90bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0973f4655a67b51e0dbc7c18c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 19 23:02:59 2016 +0300 dwrite: Implement GetOverhangMetrics() for trimming sign. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a9c0572..22c3f31 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4693,8 +4693,8 @@ static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, static HRESULT WINAPI dwritetrimmingsign_GetOverhangMetrics(IDWriteInlineObject *iface, DWRITE_OVERHANG_METRICS *overhangs) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - FIXME("(%p)->(%p): stub\n", This, overhangs); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, overhangs); + return IDWriteTextLayout_GetOverhangMetrics(This->layout, overhangs); } static HRESULT WINAPI dwritetrimmingsign_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before,

1 0

Iván Matellanes : msvcirt: Implement istream::sync.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 1235aa5d1b29ddc367b8bae89455d528a8486b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1235aa5d1b29ddc367b8bae89… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jul 20 10:56:06 2016 +0100 msvcirt: Implement istream::sync. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1715f80..12a4809 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3378,8 +3378,16 @@ istream* __thiscall istream_seekg_offset(istream *this, streamoff off, ios_seek_ DEFINE_THISCALL_WRAPPER(istream_sync, 4) int __thiscall istream_sync(istream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = istream_get_ios(this); + int ret; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if ((ret = call_streambuf_sync(base->sb)) == EOF) + ios_clear(base, base->state | IOSTATE_badbit | IOSTATE_failbit); + ios_unlockbuf(base); + return ret; } /* ?tellg(a)istream@@QAEJXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 0bb3e98..af8a235 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -323,6 +323,7 @@ static istream* (*__thiscall p_istream_putback)(istream*, char); static istream* (*__thiscall p_istream_read)(istream*, char*, int); static istream* (*__thiscall p_istream_seekg)(istream*, streampos); static istream* (*__thiscall p_istream_seekg_offset)(istream*, streamoff, ios_seek_dir); +static int (*__thiscall p_istream_sync)(istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -534,6 +535,7 @@ static BOOL init(void) SET(p_istream_read, "?read(a)istream@@QEAAAEAV1(a)PEADH@Z"); SET(p_istream_seekg, "?seekg(a)istream@@QEAAAEAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); + SET(p_istream_sync, "?sync(a)istream@@QEAAHXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -667,6 +669,7 @@ static BOOL init(void) SET(p_istream_read, "?read(a)istream@@QAEAAV1(a)PADH@Z"); SET(p_istream_seekg, "?seekg(a)istream@@QAEAAV1(a)J@Z"); SET(p_istream_seekg_offset, "?seekg(a)istream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); + SET(p_istream_sync, "?sync(a)istream@@QAEHXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4549,6 +4552,42 @@ if (0) /* crashes on native */ ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(_tell(fb1.fd) == 24, "expected 24 got %d\n", _tell(fb1.fd)); + /* sync */ + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_badbit; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, is1.base_ios.state); + is1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); +if (0) /* crashes on native */ + is1.base_ios.sb = NULL; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.base + 30; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + fb1.base.gptr = fb1.base.egptr; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + is1.base_ios.state = IOSTATE_eofbit; + fd = fb1.fd; + fb1.fd = -1; + ret = (int) call_func1(p_istream_sync, &is1); + ok(ret == EOF, "expected -1 got %d\n", ret); + ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state); + fb1.fd = fd; + call_func1(p_istream_vbase_dtor, &is1); call_func1(p_istream_vbase_dtor, &is2); call_func1(p_ostream_vbase_dtor, &os);

1 0

Jacek Caban : mshtml: Added asynchronous script loading tests.
by Alexandre Julliard July 20, 2016

July 20, 2016

Module: wine Branch: master Commit: 82d867a67689e13389ad4b8b5b25ff6227bc1bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d867a67689e13389ad4b8b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:42:34 2016 +0200 mshtml: Added asynchronous script loading tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/asyncscriptload.js | 97 +++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/script.c | 180 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/winetest.js | 14 ++- 4 files changed, 271 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82d867a67689e13389ad4…

1 0