March 2016 - Wine-commits - list.winehq.org

Miklós Máté : wined3d: Warn only once about unsupported wrap state.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: e29aaca0185c71461ebd708c542a0e1afdef7201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29aaca0185c71461ebd708c5… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Mon Mar 14 13:40:57 2016 +0100 wined3d: Warn only once about unsupported wrap state. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a819244..55e91c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1571,7 +1571,9 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3D_RS_WRAP0] + static unsigned int once; + + if ((state->render_states[WINED3D_RS_WRAP0] || state->render_states[WINED3D_RS_WRAP1] || state->render_states[WINED3D_RS_WRAP2] || state->render_states[WINED3D_RS_WRAP3] @@ -1587,6 +1589,7 @@ static void state_wrap(struct wined3d_context *context, const struct wined3d_sta || state->render_states[WINED3D_RS_WRAP13] || state->render_states[WINED3D_RS_WRAP14] || state->render_states[WINED3D_RS_WRAP15]) + && !once++) FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); }

1 0

Paul Gofman : d3dx9: Fix D3DXIntersectTri function.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: fda55a3fdfdfc41b4a1ea35a9f69fcf630001b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda55a3fdfdfc41b4a1ea35a9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 11 15:35:32 2016 +0300 d3dx9: Fix D3DXIntersectTri function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 7 +++++-- dlls/d3dx9_36/tests/mesh.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f7bd1a3..b2dbd27 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2380,12 +2380,15 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXMATRIX m; D3DXVECTOR4 vec; + TRACE("p0 %p, p1 %p, p2 %p, praypos %p, praydir %p, pu %p, pv %p, pdist %p.\n", + p0, p1, p2, praypos, praydir, pu, pv, pdist); + m.u.m[0][0] = p1->x - p0->x; m.u.m[1][0] = p2->x - p0->x; m.u.m[2][0] = -praydir->x; m.u.m[3][0] = 0.0f; - m.u.m[0][1] = p1->y - p0->z; - m.u.m[1][1] = p2->y - p0->z; + m.u.m[0][1] = p1->y - p0->y; + m.u.m[1][1] = p2->y - p0->y; m.u.m[2][1] = -praydir->y; m.u.m[3][1] = 0.0f; m.u.m[0][2] = p1->z - p0->z; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d193d1b..4a75e47 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1103,14 +1103,39 @@ static void D3DXIntersectTriTest(void) exp_res = TRUE; exp_u = 0.5f; exp_v = 0.25f; exp_dist = 8.0f; - got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); - ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); - ok( compare(exp_u,got_u), "Expected u = %f, got %f\n",exp_u,got_u); - ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); - ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); - ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = 0.0f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = 0.0f; + + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = -0.5f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = -1.0f; + exp_u = 0.375f; + exp_v = 0.5625f; + exp_dist = 7.9375f; + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + /*Only positive ray is taken in account*/

1 0

Alexandre Julliard : advapi32: Fix null termination in RegQueryInfoKeyA.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 303daeef58b7fe56ef991dde8504d65c11924937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303daeef58b7fe56ef991dde8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:06:29 2016 +0900 advapi32: Fix null termination in RegQueryInfoKeyA. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index aa451b1..7992384 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1162,12 +1162,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); if (len) { - class[len - 1] = 0; if (*class_len + 1 > len) { status = STATUS_BUFFER_OVERFLOW; *class_len -= 1; } + class[*class_len] = 0; } } else status = STATUS_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c2b0e12..f877b36 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1987,6 +1987,17 @@ static void test_reg_query_info(void) "classbuffer = \"%.*s\", expected %s\n", (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1998,6 +2009,17 @@ static void test_reg_query_info(void) "classbufferW = %s, expected %s\n", wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey); RegDeleteKeyA(subkey, "");

1 0

Matteo Bruni : d3dx9: Cleanup header includes.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 4d1192ad893bdbdf2e394c3f9c2b31e02cade758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1192ad893bdbdf2e394c3f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 15 04:03:22 2016 +0100 d3dx9: Cleanup header includes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/animation.c | 6 ++++-- dlls/d3dx9_36/core.c | 12 +++--------- dlls/d3dx9_36/d3dx9_36_main.c | 11 ++--------- dlls/d3dx9_36/{d3dx9_36_private.h => d3dx9_private.h} | 12 +++++------- dlls/d3dx9_36/effect.c | 7 +------ dlls/d3dx9_36/font.c | 3 +-- dlls/d3dx9_36/line.c | 6 ++++-- dlls/d3dx9_36/math.c | 8 +------- dlls/d3dx9_36/mesh.c | 9 ++------- dlls/d3dx9_36/render.c | 6 ++++-- dlls/d3dx9_36/shader.c | 7 +------ dlls/d3dx9_36/skin.c | 6 ++++-- dlls/d3dx9_36/sprite.c | 6 ++++-- dlls/d3dx9_36/surface.c | 7 ++++--- dlls/d3dx9_36/texture.c | 7 ++++--- dlls/d3dx9_36/util.c | 6 ++++-- dlls/d3dx9_36/volume.c | 6 ++++-- dlls/d3dx9_36/xfile.c | 6 +++--- 18 files changed, 55 insertions(+), 76 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 9a8f8b5..818bd7a 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 1b767e3..1eb289e 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -17,16 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "config.h" +#include "wine/port.h" -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "d3dx9_36_private.h" +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 4a94b28..04c1877 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -22,16 +22,9 @@ #include "config.h" #include "wine/port.h" -#include "initguid.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" +#include "initguid.h" +#include "d3dx9_private.h" /*********************************************************************** * DllMain. diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_private.h similarity index 96% rename from dlls/d3dx9_36/d3dx9_36_private.h rename to dlls/d3dx9_36/d3dx9_private.h index 79f3b76..bc9581d 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -19,15 +19,13 @@ * */ -#ifndef __WINE_D3DX9_36_PRIVATE_H -#define __WINE_D3DX9_36_PRIVATE_H +#ifndef __WINE_D3DX9_PRIVATE_H +#define __WINE_D3DX9_PRIVATE_H -#include <stdarg.h> +#define NONAMELESSUNION +#include "wine/debug.h" #define COBJMACROS -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "d3dx9.h" #define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) @@ -110,4 +108,4 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; -#endif /* __WINE_D3DX9_36_PRIVATE_H */ +#endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fef0245..8f82784 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -19,13 +19,8 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "wingdi.h" -#include "d3dx9_36_private.h" +#include "d3dx9_private.h" #include "d3dcompiler.h" /* Constants for special INT/FLOAT conversation */ diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index dd1243e..5522dea 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -20,9 +20,8 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" +#include "d3dx9_private.h" #include "wine/unicode.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 5de44f4..356d54f 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 123bd2f..da33074 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -22,16 +22,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "config.h" #include "wine/port.h" -#include "windef.h" -#include "wingdi.h" -#include "d3dx9_36_private.h" - -#include "wine/debug.h" +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b2dbd27..3204ea7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -27,23 +27,18 @@ #include "config.h" #include "wine/port.h" -#define COBJMACROS -#define NONAMELESSUNION #include <assert.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif -#include "windef.h" -#include "wingdi.h" -#include "d3dx9.h" + +#include "d3dx9_private.h" #undef MAKE_DDHRESULT #include "dxfile.h" #include "rmxfguid.h" #include "rmxftmpl.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index cca6b44..ad83307 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e25480d..9723aa4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -21,14 +21,9 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" +#include "d3dx9_private.h" #include "d3dcommon.h" #include "d3dcompiler.h" -#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 9b93af6..f197d33 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 8fbabc3..4a7437f 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4fa2a76..1bfe75a 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -18,9 +18,10 @@ * */ -#include "wine/debug.h" -#include "wine/unicode.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" #include "initguid.h" #include "ole2.h" diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 27f08ad..1d13c08 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -19,9 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/unicode.h" -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 94899cf..d8cd43a 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -17,8 +17,10 @@ * */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index fae8542..5a006ef 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "d3dx9_36_private.h" +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index eda0d7e..1575454 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -17,10 +17,10 @@ * */ -#include "wine/debug.h" +#include "config.h" +#include "wine/port.h" -#define COBJMACROS -#include "d3dx9.h" +#include "d3dx9_private.h" #include "d3dx9xof.h" #undef MAKE_DDHRESULT #include "dxfile.h"

1 0

Alex Henrie : user32: Don't put a default icon on modal dialogs.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 9a28e350644b6850f08880a7faa8bce8c41af812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28e350644b6850f08880a7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 13 22:35:27 2016 -0600 user32: Don't put a default icon on modal dialogs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 053353a..68320af 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -168,10 +168,10 @@ static HICON NC_IconForWindow( HWND hwnd ) if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICONSM ); if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICON ); - /* If there is no hIcon specified and this is a modal dialog, + /* If there is no icon specified and this is not a modal dialog, * get the default one. */ - if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) + if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); return hIcon;

1 0

Nikolay Sivov : ole32: Fix refcounting of IObjContext per-thread instance.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: cf218bca423a78f9ee45dfbbda784bc285307471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf218bca423a78f9ee45dfbbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 20:30:54 2016 +0300 ole32: Fix refcounting of IObjContext per-thread instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 61 ++++++++++++++++++++-------------------------- dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b095aeb..857f985 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4683,10 +4683,15 @@ static ULONG Context_AddRef(Context *This) static ULONG Context_Release(Context *This) { - ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) + /* Context instance is initially created with CoGetContextToken() with refcount set to 0, + releasing context while refcount is at 0 destroys it. */ + if (!This->refs) + { HeapFree(GetProcessHeap(), 0, This); - return refs; + return 0; + } + + return InterlockedDecrement(&This->refs); } static HRESULT WINAPI Context_CTI_QueryInterface(IComThreadingInfo *iface, REFIID riid, LPVOID *ppv) @@ -4924,39 +4929,19 @@ static const IObjContextVtbl Context_Object_Vtbl = */ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) { - APARTMENT *apt = COM_CurrentApt(); - Context *context; + IObjContext *context; HRESULT hr; TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); *ppv = NULL; - if (!apt) - { - if (!(apt = apartment_find_multi_threaded())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - } - - context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); - if (!context) - return E_OUTOFMEMORY; - - context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; - context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; - context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; - context->refs = 1; - - hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); - IComThreadingInfo_Release(&context->IComThreadingInfo_iface); + hr = CoGetContextToken((ULONG_PTR*)&context); + if (FAILED(hr)) + return hr; - return hr; + return IObjContext_QueryInterface(context, riid, ppv); } - /*********************************************************************** * CoGetContextToken [OLE32.@] */ @@ -4985,16 +4970,24 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) if (!info->context_token) { - HRESULT hr; - IObjContext *ctx; + Context *context; + + context = HeapAlloc(GetProcessHeap(), 0, sizeof(*context)); + if (!context) + return E_OUTOFMEMORY; + + context->IComThreadingInfo_iface.lpVtbl = &Context_Threading_Vtbl; + context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; + context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; + /* Context token does not take a reference, it's always zero until + interface is explicitely requested with CoGetObjectContext(). */ + context->refs = 0; - hr = CoGetObjectContext(&IID_IObjContext, (void **)&ctx); - if (FAILED(hr)) return hr; - info->context_token = ctx; + info->context_token = &context->IObjContext_iface; } *token = (ULONG_PTR)info->context_token; - TRACE("apt->context_token=%p\n", info->context_token); + TRACE("context_token=%p\n", info->context_token); return S_OK; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d684e33..1af24b6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1774,7 +1774,7 @@ static void test_CoGetObjectContext(void) { HRESULT hr; ULONG refs; - IComThreadingInfo *pComThreadingInfo; + IComThreadingInfo *pComThreadingInfo, *threadinginfo2; IContextCallback *pContextCallback; IObjContext *pObjContext; APTTYPE apttype; @@ -1786,7 +1786,7 @@ static void test_CoGetObjectContext(void) if (!pCoGetObjectContext) { - skip("CoGetObjectContext not present\n"); + win_skip("CoGetObjectContext not present\n"); return; } @@ -1812,6 +1812,12 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + threadinginfo2 = NULL; + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&threadinginfo2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(pComThreadingInfo == threadinginfo2, "got different instance\n"); + IComThreadingInfo_Release(threadinginfo2); + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1854,11 +1860,8 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); CoUninitialize(); @@ -1881,11 +1884,8 @@ static void test_CoGetObjectContext(void) hr = pCoGetObjectContext(&IID_IContextCallback, (void **)&pContextCallback); ok_ole_success(hr, "CoGetObjectContext(ContextCallback)"); - if (hr == S_OK) - { - refs = IContextCallback_Release(pContextCallback); - ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); - } + refs = IContextCallback_Release(pContextCallback); + ok(refs == 0, "pContextCallback should have 0 refs instead of %d refs\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&pObjContext); ok_ole_success(hr, "CoGetObjectContext"); @@ -2007,7 +2007,7 @@ static void test_CoGetContextToken(void) { HRESULT hr; ULONG refs; - ULONG_PTR token; + ULONG_PTR token, token2; IObjContext *ctx; struct info info; HANDLE thread; @@ -2042,6 +2042,11 @@ static void test_CoGetContextToken(void) hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token == token2, "got different token\n"); + SetEvent(info.stop); ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); @@ -2063,18 +2068,23 @@ static void test_CoGetContextToken(void) ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); + token2 = 0; + hr = pCoGetContextToken(&token2); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok(token2 == token, "got different token\n"); + refs = IUnknown_AddRef((IUnknown *)token); - todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); + ok(refs == 1, "Expected 1, got %u\n", refs); hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); - todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); + ok(refs == 3, "Expected 3, got %u\n", refs); refs = IObjContext_Release(ctx); - todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); + ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); ok(refs == 1, "Expected 1, got %u\n", refs); @@ -2084,7 +2094,7 @@ static void test_CoGetContextToken(void) hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); ok(token, "Expected token != 0\n"); - todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); + ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs);

1 0

Hugh McMaster : reg: Correctly handle cases with no data argument.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 84eed4cf222d179855a4f0efbaf6ebfad2cc6d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84eed4cf222d179855a4f0efb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 19:58:56 2016 +1100 reg: Correctly handle cases with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 7 +++++-- programs/reg/tests/reg.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 164981d..1167ccb 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -225,11 +225,14 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *reg_count) { + static const WCHAR empty; LPBYTE out_data = NULL; *reg_count = 0; + if (!data) data = ∅ + switch (reg_type) { case REG_NONE: @@ -411,7 +414,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (data && !(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + if (!(reg_data = get_regdata(data, reg_type, separator, &reg_count))) { RegCloseKey(subkey); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4089367..6a55537 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -147,11 +147,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v none1 /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + verify_reg(hkey, "none1", REG_NONE, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); @@ -168,7 +168,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -179,7 +179,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "test2", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -187,11 +187,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); @@ -204,7 +204,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand2", REG_EXPAND_SZ, "", 1, 0); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -216,7 +216,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); @@ -372,7 +372,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -435,7 +435,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); RegCloseKey(hkey);

1 0

Michael Stefaniuc : dinput: Support IUnknown in the IDirectInputEffect COM object.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 48bf99ea8904d187438646b04fea3bd29e79b48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48bf99ea8904d187438646b04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 12:06:08 2016 +0100 dinput: Support IUnknown in the IDirectInputEffect COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 6a8926d..c9c30fd 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, TRACE("%p %s %p\n", This, debugstr_guid(guid), out); - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + if(IsEqualIID(guid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ *out = iface; IDirectInputEffect_AddRef(iface); return S_OK;

1 0

Alistair Leslie-Hughes : user32: Don' t crash in DrawTextEx when tab length is zero.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 84d0c4f0da4982c3f67cce9552b7d971d7a0e1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d0c4f0da4982c3f67cce955… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 2 15:22:10 2016 +1100 user32: Don't crash in DrawTextEx when tab length is zero. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/user32/text.c | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 0352d66..eccf972 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -44,8 +44,9 @@ static void test_DrawTextCalcRect(void) static WCHAR emptystringW[] = { 0 }; static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; + static char tabstring[] = "one\ttwo"; INT textlen, textheight, heightcheck; - RECT rect = { 0, 0, 100, 0 }; + RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; @@ -580,6 +581,42 @@ static void test_DrawTextCalcRect(void) ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", textheight, heightcheck * 6); + /* DT_TABSTOP | DT_EXPANDTABS tests */ + SetRect( &rect, 0,0, 10, 10); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_TABSTOP | DT_EXPANDTABS ); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + + SetRect( &rect2, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + textheight = DrawTextExA(hdc, tabstring, -1, &rect2, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 0, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left && rect.right != rect2.right && rect.top == rect2.top && rect.bottom == rect2.bottom, + "incorrect rect %d,%d-%d,%d rect2 %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom, rect2.left, rect2.top, rect2.right, rect2.bottom ); + + SetRect( &rect, 0,0, 10, 10); + memset(&dtp, 0, sizeof(dtp)); + dtp.cbSize = sizeof(dtp); + dtp.iTabLength = 8; + textheight = DrawTextExA(hdc, tabstring, -1, &rect, DT_CALCRECT | DT_TABSTOP | DT_EXPANDTABS, &dtp); + ok(textheight >= heightcheck, "Got unexpected textheight %d\n", textheight); + ok(dtp.iTabLength == 8, "invalid dtp.iTabLength = %i\n",dtp.iTabLength); + ok(rect.left == rect2.left, "unexpected value %d, got %d\n", rect.left, rect2.left); + /* XP, 2003 appear to not give the same values. */ + ok(rect.right == rect2.right || broken(rect.right > rect2.right), "unexpected value %d, got %d\n",rect.right, rect2.right); + ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); + ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7b0302e..2ac3afd 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -948,7 +948,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_EXPANDTABS) { - int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; + int tabstop = ((flags & DT_TABSTOP) && dtp && dtp->iTabLength) ? dtp->iTabLength : 8; tabwidth = tm.tmAveCharWidth * tabstop; }

1 0

Austin English : user32: Add QueryDisplayConfig stub.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 2b740588ba9b9fa7097e94326a70b8598bb727ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b740588ba9b9fa7097e94326… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 22 22:27:53 2016 -0600 user32: Add QueryDisplayConfig stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 12 ++++ dlls/user32/user32.spec | 1 + include/wingdi.h | 182 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4497621..071230e 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -474,6 +474,18 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); } + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /*********************************************************************** * RegisterSystemThread (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9ff5525..5c19634 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -550,6 +550,7 @@ # @ stub PrivateSetDbgTag # @ stub PrivateSetRipFlags @ stdcall PtInRect(ptr int64) +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) @ stub QuerySendMessage # @ stub QueryUserCounters @ stdcall RealChildWindowFromPoint(long int64) diff --git a/include/wingdi.h b/include/wingdi.h index dbe12cd..c1acd25 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3325,6 +3325,188 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO +{ + POINTL PathSourceSize; + RECTL DesktopImageRegion; + RECTL DesktopImageClip; +} DISPLAYCONFIG_DESKTOP_IMAGE_INFO; + +typedef enum +{ + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1, + DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2, + DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE = 3, + DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_MODE_INFO_TYPE; + +typedef enum +{ + DISPLAYCONFIG_PIXELFORMAT_8BPP = 1, + DISPLAYCONFIG_PIXELFORMAT_16BPP = 2, + DISPLAYCONFIG_PIXELFORMAT_24BPP = 3, + DISPLAYCONFIG_PIXELFORMAT_32BPP = 4, + DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5, + DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_PIXELFORMAT; + +typedef enum +{ + DISPLAYCONFIG_ROTATION_IDENTITY = 1, + DISPLAYCONFIG_ROTATION_ROTATE90 = 2, + DISPLAYCONFIG_ROTATION_ROTATE180 = 3, + DISPLAYCONFIG_ROTATION_ROTATE270 = 4, + DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_ROTATION; + +typedef enum +{ + DISPLAYCONFIG_SCALING_IDENTITY = 1, + DISPLAYCONFIG_SCALING_CENTERED = 2, + DISPLAYCONFIG_SCALING_STRETCHED = 3, + DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4, + DISPLAYCONFIG_SCALING_CUSTOM = 5, + DISPLAYCONFIG_SCALING_PREFERRED = 128, + DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_SCALING; + +typedef enum +{ + DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0, + DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST = DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3, + DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_SCANLINE_ORDERING; + +typedef enum +{ + DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001, + DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002, + DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004, + DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008, + DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_TOPOLOGY_ID; + +typedef enum +{ + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; + +typedef struct DISPLAYCONFIG_2DREGION +{ + UINT32 cx; + UINT32 cy; +} DISPLAYCONFIG_2DREGION; + +typedef struct DISPLAYCONFIG_RATIONAL +{ + UINT32 Numerator; + UINT32 Denominator; +} DISPLAYCONFIG_RATIONAL; + +typedef struct DISPLAYCONFIG_PATH_SOURCE_INFO +{ + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 cloneGroupId :16; + UINT32 sourceModeInfoIdx :16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_SOURCE_INFO; + +typedef struct DISPLAYCONFIG_SOURCE_MODE +{ + UINT32 width; + UINT32 height; + DISPLAYCONFIG_PIXELFORMAT pixelFormat; + POINTL position; +} DISPLAYCONFIG_SOURCE_MODE; + +typedef struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO +{ + UINT64 pixelRate; + DISPLAYCONFIG_RATIONAL hSyncFreq; + DISPLAYCONFIG_RATIONAL vSyncFreq; + DISPLAYCONFIG_2DREGION activeSize; + DISPLAYCONFIG_2DREGION totalSize; + union { + struct { + UINT32 videoStandard :16; + UINT32 vSyncFreqDivider :6; + UINT32 reserved :10; + } AdditionalSignalInfo; + UINT32 videoStandard; + } DUMMYUNIONNAME; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; +} DISPLAYCONFIG_VIDEO_SIGNAL_INFO; + +typedef struct DISPLAYCONFIG_PATH_TARGET_INFO +{ + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 desktopModeInfoIdx :16; + UINT32 targetModeInfoIdx :16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + DISPLAYCONFIG_ROTATION rotation; + DISPLAYCONFIG_SCALING scaling; + DISPLAYCONFIG_RATIONAL refreshRate; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; + BOOL targetAvailable; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_TARGET_INFO; + +typedef struct DISPLAYCONFIG_TARGET_MODE +{ + DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo; +} DISPLAYCONFIG_TARGET_MODE; + +typedef struct DISPLAYCONFIG_PATH_INFO +{ + DISPLAYCONFIG_PATH_SOURCE_INFO sourceInfo; + DISPLAYCONFIG_PATH_TARGET_INFO targetInfo; + UINT32 flags; +} DISPLAYCONFIG_PATH_INFO; + +typedef struct DISPLAYCONFIG_MODE_INFO +{ + DISPLAYCONFIG_MODE_INFO_TYPE infoType; + UINT32 id; + LUID adapterId; + union { + DISPLAYCONFIG_TARGET_MODE targetMode; + DISPLAYCONFIG_SOURCE_MODE sourceMode; + DISPLAYCONFIG_DESKTOP_IMAGE_INFO desktopImageInfo; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_MODE_INFO; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002

1 0