July 2009 - Wine-commits - list.winehq.org

Paul Vriens : winhttp: Fix a crash on Vista and higher.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 4e370f74f789164aa207e3fe0536fb8aeefde069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e370f74f789164aa207e3fe0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 16 15:47:38 2009 +0200 winhttp: Fix a crash on Vista and higher. --- dlls/winhttp/tests/winhttp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 78c4777..bce91fe 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -905,10 +905,14 @@ static void test_set_default_proxy_config(void) len = get_default_proxy_reg_value( saved_proxy_settings, len, &type ); } - SetLastError(0xdeadbeef); - ret = WinHttpSetDefaultProxyConfiguration(NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (0) + { + /* Crashes on Vista and higher */ + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } /* test with invalid access type */ info.dwAccessType = 0xdeadbeef;

1 0

Vitaliy Margolen : shell32: Export IsUserAnAdmin by name as well.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: d2117c14ba72b3fb3160034e11d4e431f22f9c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2117c14ba72b3fb3160034e1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jul 16 07:15:22 2009 -0600 shell32: Export IsUserAnAdmin by name as well. --- dlls/shell32/shell32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 433ed3a..2eb5934 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -251,7 +251,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState(a)8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAnAdmin() + 680 stdcall IsUserAnAdmin() 704 stdcall -noname GUIDFromStringW(wstr ptr)

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp4 opcode.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 50f5abcad97def3cc0c47c8c5fbff62003bfcbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f5abcad97def3cc0c47c8c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:25 2009 +0200 wined3d: Recognize the SM4 dp4 opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 30e9862..8686232 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -50,6 +50,7 @@ enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, WINED3D_SM4_OP_DP3 = 0x10, + WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, @@ -99,6 +100,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, + {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp3 opcode.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 03acf9d2074a3335408fe5d9c85bfce356a7ff1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03acf9d2074a3335408fe5d9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:24 2009 +0200 wined3d: Recognize the SM4 dp3 opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 418e7b2..30e9862 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, @@ -97,6 +98,7 @@ struct sysval_map static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 rsq opcode.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 7539cd5c8554d4738cbbcd0c389ef59c7d70669a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7539cd5c8554d4738cbbcd0c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:23 2009 +0200 wined3d: Recognize the SM4 rsq opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f5c3e65..418e7b2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -53,6 +53,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SINCOS = 0x4d, }; @@ -100,6 +101,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, };

1 0

Henri Verbeet : wined3d: Recognize the SM4 constant buffer register type.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: d6ffe00cd271257e9c81cbf57fb5b3d4e3416cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ffe00cd271257e9c81cbf57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:22 2009 +0200 wined3d: Recognize the SM4 constant buffer register type. --- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 23 ++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4b9c445..e1e1f21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -928,6 +928,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("l"); break; + case WINED3DSPR_CONSTBUFFER: + TRACE("cb"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 57a365b..f5c3e65 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -58,10 +58,11 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, }; enum wined3d_sm4_immconst_type @@ -104,11 +105,15 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, }; static const struct sysval_map sysval_map[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9aa93..ae09827 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -325,6 +325,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_LABEL = 18, WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, + WINED3DSPR_CONSTBUFFER, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type

1 0

Henri Verbeet : wined3d: Recognize SM4 arrays.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: c4f8845bc94dc6f26aed0bb62b98faba12a83a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f8845bc94dc6f26aed0bb62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:21 2009 +0200 wined3d: Recognize SM4 arrays. This is for SM4 constant buffers, which look like cb<x>[<y>]. At some later point we should probably translate pre-SM4 constants to constant buffers. --- dlls/wined3d/baseshader.c | 25 +++++++++++++++++++------ dlls/wined3d/shader_sm1.c | 2 ++ dlls/wined3d/shader_sm4.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0c2ede1..4b9c445 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -956,14 +956,27 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, } else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) { - if (reg->rel_addr) + if (reg->array_idx != ~0U) { - TRACE("["); - shader_dump_src_param(reg->rel_addr, shader_version); - TRACE(" + "); + TRACE("%u[%u", offset, reg->array_idx); + if (reg->rel_addr) + { + TRACE(" + "); + shader_dump_src_param(reg->rel_addr, shader_version); + } + TRACE("]"); + } + else + { + if (reg->rel_addr) + { + TRACE("["); + shader_dump_src_param(reg->rel_addr, shader_version); + TRACE(" + "); + } + TRACE("%u", offset); + if (reg->rel_addr) TRACE("]"); } - TRACE("%u", offset); - if (reg->rel_addr) TRACE("]"); } } diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index a626d52..ead2769 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -349,6 +349,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->reg.type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->reg.idx = param & WINED3DSP_REGNUM_MASK; + src->reg.array_idx = ~0U; src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; src->reg.rel_addr = rel_addr; @@ -360,6 +361,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->reg.type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->reg.idx = param & WINED3DSP_REGNUM_MASK; + dst->reg.array_idx = ~0U; dst->write_mask = (param & WINED3D_SM1_WRITEMASK_MASK) >> WINED3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5cc445d..57a365b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_OPCODE_MASK 0xff +#define WINED3D_SM4_REGISTER_ORDER_SHIFT 20 +#define WINED3D_SM4_REGISTER_ORDER_MASK (0x3 << WINED3D_SM4_REGISTER_ORDER_SHIFT) + #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) @@ -265,6 +268,7 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine struct wined3d_sm4_data *priv = data; DWORD token = *(*ptr)++; enum wined3d_sm4_register_type register_type; + DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) @@ -277,6 +281,16 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine src_param->reg.type = register_type_table[register_type]; } + order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; + + if (order < 1) src_param->reg.idx = ~0U; + else src_param->reg.idx = *(*ptr)++; + + if (order < 2) src_param->reg.array_idx = ~0U; + else src_param->reg.array_idx = *(*ptr)++; + + if (order > 2) FIXME("Unhandled order %u.\n", order); + if (register_type == WINED3D_SM4_RT_IMMCONST) { enum wined3d_sm4_immconst_type immconst_type = @@ -304,7 +318,6 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine } else { - src_param->reg.idx = *(*ptr)++; src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; } @@ -319,8 +332,8 @@ static void shader_sm4_read_dst_param(void *data, const DWORD **ptr, struct wine { struct wined3d_sm4_data *priv = data; DWORD token = *(*ptr)++; - UINT register_idx = *(*ptr)++; enum wined3d_sm4_register_type register_type; + DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) @@ -333,7 +346,16 @@ static void shader_sm4_read_dst_param(void *data, const DWORD **ptr, struct wine dst_param->reg.type = register_type_table[register_type]; } - dst_param->reg.idx = register_idx; + order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; + + if (order < 1) dst_param->reg.idx = ~0U; + else dst_param->reg.idx = *(*ptr)++; + + if (order < 2) dst_param->reg.array_idx = ~0U; + else dst_param->reg.array_idx = *(*ptr)++; + + if (order > 2) FIXME("Unhandled order %u.\n", order); + dst_param->write_mask = (token & WINED3D_SM4_WRITEMASK_MASK) >> WINED3D_SM4_WRITEMASK_SHIFT; dst_param->modifiers = 0; dst_param->shift = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 68f2e4c..1e9aa93 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -670,6 +670,7 @@ struct wined3d_shader_register { WINED3DSHADER_PARAM_REGISTER_TYPE type; UINT idx; + UINT array_idx; const struct wined3d_shader_src_param *rel_addr; enum wined3d_immconst_type immconst_type; DWORD immconst_data[4];

1 0

David Adam : d3dx9: Remove a failing test in Windows.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: f24bf3e4bd78f65f56a67df292c40864294693a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24bf3e4bd78f65f56a67df29… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jul 15 21:14:00 2009 +0200 d3dx9: Remove a failing test in Windows. --- dlls/d3dx9_36/tests/math.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d55a0d4..722198a 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -593,11 +593,6 @@ static void D3DXPlaneTest(void) expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); expect_plane(expectedplane, gotplane); - /* Test if 2 vectors are parallels */ - vec3.x = 1.0f; vec3.y = 1.0f; vec3.z = 2.0f; - expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; - D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); - expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f;

1 0

David Adam : d3dx9: Fix D3DXQuaternionToAxisAngle to make tests pass in Windows.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: a3634e2ca32df3f2f284f086e241ed8b78dfeed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3634e2ca32df3f2f284f086e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jul 15 21:04:01 2009 +0200 d3dx9: Fix D3DXQuaternionToAxisAngle to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 21 ++++----------------- dlls/d3dx9_36/tests/math.c | 9 ++++----- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b3f7906..f80a5db 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1373,23 +1373,10 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATE void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) { - FLOAT norm; - - *pangle = 0.0f; - norm = D3DXQuaternionLength(pq); - if ( norm ) - { - paxis->x = pq->x / norm; - paxis->y = pq->y / norm; - paxis->z = pq->z / norm; - if ( fabs( pq->w ) <= 1.0f ) *pangle = 2.0f * acos(pq->w); - } - else - { - paxis->x = 1.0f; - paxis->y = 0.0f; - paxis->z = 0.0f; - } + paxis->x = pq->x; + paxis->y = pq->y; + paxis->z = pq->z; + *pangle = 2.0f * acos(pq->w); } /*_________________D3DXVec2_____________________*/ diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1fe12c7..d55a0d4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -938,20 +938,19 @@ static void D3DXQuaternionTest(void) /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; - expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; expected = 2.197869f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(expectedvec,axis); ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); /* Test if |w|>1.0f */ - expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; expected = 0.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(expectedvec,axis); - ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); /* Test the null quaternion */ - expectedvec.x = 1.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - expected = 0.0f; + expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; + expected = 3.141593f; D3DXQuaternionToAxisAngle(&nul,&axis,&angle); expect_vec3(expectedvec,axis); ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle);

1 0

Andrew Nguyen : t2embed: Implement TTLoadEmbeddedFont as a stub.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 8f1836cbccbfa4c540d24cfaf36cf083f6fb6730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1836cbccbfa4c540d24cfaf… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 15 22:00:22 2009 -0500 t2embed: Implement TTLoadEmbeddedFont as a stub. --- dlls/t2embed/main.c | 18 +++++++++++++++++ dlls/t2embed/t2embed.spec | 2 +- include/Makefile.in | 1 + include/t2embapi.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 8962248..c9c5dc5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -24,6 +24,10 @@ #include "windef.h" #include "winbase.h" +#include "t2embapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(t2embed); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,3 +45,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, + ULONG *pulPrivStatus, ULONG ulPrivs, + ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, TTLOADINFO *pTTLoadInfo) +{ + FIXME("(%p 0x%08x %p 0x%08x %p %p %p %s %s %p) stub\n", phFontReference, + ulFlags, pulPrivStatus, ulPrivs, pulStatus, lpfnReadFromStream, + lpvReadStream, debugstr_w(szWinFamilyName), szMacFamilyName, + pTTLoadInfo); + + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index ed0c71f..ed5d25b 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -7,7 +7,7 @@ @ stub TTGetEmbeddingType @ stub TTIsEmbeddingEnabled @ stub TTIsEmbeddingEnabledForFacename -@ stub TTLoadEmbeddedFont +@ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @ stub _TTDeleteEmbeddedFont(a)12 diff --git a/include/Makefile.in b/include/Makefile.in index f238003..68e8974 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -415,6 +415,7 @@ SRCDIR_INCLUDES = \ sspi.h \ storage.h \ svrapi.h \ + t2embapi.h \ tapi.h \ tchar.h \ textserv.h \ diff --git a/include/t2embapi.h b/include/t2embapi.h new file mode 100644 index 0000000..f199764 --- /dev/null +++ b/include/t2embapi.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2009 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_T2EMBAPI_H +#define __WINE_T2EMBAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Possible return values. */ +#define E_NONE 0x0000L +#define E_API_NOTIMPL 0x0001L + +typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRefStrSize; + unsigned short *pusRefStr; +} TTLOADINFO; + +LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, + LPVOID,LPWSTR,LPSTR,TTLOADINFO*); + +#ifdef __cplusplus +} +#endif + +#endif

1 0