wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Henri Verbeet : wined3d: Check the GLSL info log for all shaders.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 2af746b96e4131f1b2cb353922839ccf0bbd20a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af746b96e4131f1b2cb35392… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:21 2010 +0200 wined3d: Check the GLSL info log for all shaders. --- dlls/wined3d/glsl_shader.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da90288..9642686 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -255,6 +255,17 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA } /* GL locking is done by the caller. */ +static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLhandleARB shader, const char *src) +{ + TRACE("Compiling shader object %u.\n", shader); + GL_EXTCALL(glShaderSourceARB(shader, 1, &src, NULL)); + checkGLcall("glShaderSourceARB"); + GL_EXTCALL(glCompileShaderARB(shader)); + checkGLcall("glCompileShaderARB"); + print_glsl_info_log(gl_info, shader); +} + +/* GL locking is done by the caller. */ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_info, GLhandleARB program) { GLint i, object_count, source_size = -1; @@ -3911,10 +3922,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer ret = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); checkGLcall("glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)"); - GL_EXTCALL(glShaderSourceARB(ret, 1, (const char**)&buffer->buffer, NULL)); - checkGLcall("glShaderSourceARB(ret, 1, &buffer->buffer, NULL)"); - GL_EXTCALL(glCompileShaderARB(ret)); - checkGLcall("glCompileShaderARB(ret)"); + shader_glsl_compile(gl_info, ret, buffer->buffer); return ret; } @@ -4035,9 +4043,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); TRACE("Compiling shader object %u\n", shader_obj); - GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); - GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(gl_info, shader_obj); + shader_glsl_compile(gl_info, shader_obj, buffer->buffer); /* Store the shader object */ return shader_obj; @@ -4110,9 +4116,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); TRACE("Compiling shader object %u\n", shader_obj); - GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); - GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(gl_info, shader_obj); + shader_glsl_compile(gl_info, shader_obj, buffer->buffer); return shader_obj; } @@ -4546,12 +4550,10 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, } vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(vshader_id, 1, &blt_vshader, NULL)); - GL_EXTCALL(glCompileShaderARB(vshader_id)); + shader_glsl_compile(gl_info, vshader_id, blt_vshader); pshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(pshader_id, 1, &blt_pshader, NULL)); - GL_EXTCALL(glCompileShaderARB(pshader_id)); + shader_glsl_compile(gl_info, pshader_id, blt_pshader); program_id = GL_EXTCALL(glCreateProgramObjectARB()); GL_EXTCALL(glAttachObjectARB(program_id, vshader_id));

1 0

Henri Verbeet : wined3d: Introduce a local variable for gl_info in IWineD3DSurfaceImpl_BltOverride( ).
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 87e12b8b6adf26583b2c07740be9b7cdb0cf4370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e12b8b6adf26583b2c07740… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:20 2010 +0200 wined3d: Introduce a local variable for gl_info in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1caf0b1..662ef7b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3357,6 +3357,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *device = dst_surface->resource.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL; RECT dst_rect, src_rect; @@ -3561,7 +3562,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (fbo_blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + if (fbo_blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { @@ -3603,7 +3604,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && fbo_blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + && fbo_blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, @@ -3620,7 +3621,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, } if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && arbfp_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + && arbfp_blit.blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, @@ -3657,7 +3658,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, if (dstSwapchain && dst_surface == dstSwapchain->front_buffer) surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - if (!device->blitter->blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { @@ -3733,14 +3734,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) return WINED3DERR_INVALIDCALL; - if (ffp_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_COLOR_FILL, + if (ffp_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { return ffp_blit.color_fill(device, dst_surface, &dst_rect, &color); } - else if (cpu_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_COLOR_FILL, + else if (cpu_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc))

1 0

Henri Verbeet : d3dx9_36/tests: Use the proper D3DFVF_PSIZE constant in test_fvf_decl_conversion().
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 5655c6f0bba9f747029db8274e26a6c8876d9125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5655c6f0bba9f747029db8274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:19 2010 +0200 d3dx9_36/tests: Use the proper D3DFVF_PSIZE constant in test_fvf_decl_conversion(). --- dlls/d3dx9_36/tests/mesh.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 502382a..8d0f227 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -503,8 +503,6 @@ static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected } } -#define D3DFVF_RESERVED1 0x020 /* in d3dtypes.h */ - static void test_fvf_decl_conversion(void) { int i; @@ -538,7 +536,7 @@ static void test_fvf_decl_conversion(void) { CONST D3DVERTEXELEMENT9 test_buffer[] = { { 0, 0, D3DDECLTYPE_FLOAT1, 0, D3DDECLUSAGE_PSIZE, 0 }, D3DDECL_END() }; - test_decl_to_fvf(test_buffer, D3DFVF_RESERVED1, D3D_OK, TRUE, __LINE__); + test_decl_to_fvf(test_buffer, D3DFVF_PSIZE, D3D_OK, TRUE, __LINE__); } { CONST D3DVERTEXELEMENT9 test_buffer[] =

1 0

Henri Verbeet : d3dx9_36/tests: Remove a (mostly) redundant test.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: bcd452ab82b8c386bd0912bdd108595111fd458a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd452ab82b8c386bd0912bdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:18 2010 +0200 d3dx9_36/tests: Remove a (mostly) redundant test. --- dlls/d3dx9_36/tests/mesh.c | 98 -------------------------------------------- 1 files changed, 0 insertions(+), 98 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index beb22ad..502382a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -413,103 +413,6 @@ static void D3DXComputeBoundingSphereTest(void) ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } -static void D3DXDeclaratorFromFVFTest(void) -{ - D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; - HRESULT hr; - int i, size; - - static const D3DVERTEXELEMENT9 exp1[6] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - {0, 0x18, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, - {0, 0x1C, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, - {0, 0x20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT,D3DDECLUSAGE_TEXCOORD, 0}, - D3DDECL_END(), }; - - static const D3DVERTEXELEMENT9 exp2[3] = { - {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, - {0, 0x10, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_PSIZE, 0}, - D3DDECL_END(), }; - - static const D3DVERTEXELEMENT9 exp3[4] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 0xC, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, - {0, 0x1C, D3DDECLTYPE_UBYTE4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, - D3DDECL_END(), }; - - /* Note: passing NULL as declaration segfaults */ - todo_wine - { - hr = D3DXDeclaratorFromFVF(0, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - ok(decl[0].Stream == 0xFF, "D3DXDeclaratorFromFVF returned an incorrect vertex declaration\n"); /* end element */ - - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp1)/sizeof(exp1[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp1[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp1[i].Stream); - ok(decl[i].Type == exp1[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); - ok(decl[i].Method == exp1[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp1[i].Method); - ok(decl[i].Usage == exp1[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp1[i].Usage); - ok(decl[i].UsageIndex == exp1[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp1[i].UsageIndex); - ok(decl[i].Offset == exp1[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp1[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } - - todo_wine - { - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZRHW | D3DFVF_PSIZE, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp2)/sizeof(exp2[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp2[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp2[i].Stream); - ok(decl[i].Type == exp2[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp1[i].Type); - ok(decl[i].Method == exp2[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp2[i].Method); - ok(decl[i].Usage == exp2[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp2[i].Usage); - ok(decl[i].UsageIndex == exp2[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp2[i].UsageIndex); - ok(decl[i].Offset == exp2[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp2[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } - - todo_wine - { - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5, decl); - ok(hr == D3DERR_INVALIDCALL, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - - hr = D3DXDeclaratorFromFVF(D3DFVF_XYZB5 | D3DFVF_LASTBETA_UBYTE4, decl); - ok(hr == D3D_OK, "D3DXDeclaratorFromFVF returned %#x, expected %#x\n", hr, D3D_OK); - - if (hr == D3D_OK) - { - size = sizeof(exp3)/sizeof(exp3[0]); - for (i=0; i<size-1; i++) - { - ok(decl[i].Stream == exp3[i].Stream, "Returned stream %d, expected %d\n", decl[i].Stream, exp3[i].Stream); - ok(decl[i].Type == exp3[i].Type, "Returned type %d, expected %d\n", decl[i].Type, exp3[i].Type); - ok(decl[i].Method == exp3[i].Method, "Returned method %d, expected %d\n", decl[i].Method, exp3[i].Method); - ok(decl[i].Usage == exp3[i].Usage, "Returned usage %d, expected %d\n", decl[i].Usage, exp3[i].Usage); - ok(decl[i].UsageIndex == exp3[i].UsageIndex, "Returned usage index %d, expected %d\n", decl[i].UsageIndex, exp3[i].UsageIndex); - ok(decl[i].Offset == exp3[i].Offset, "Returned offset %d, expected %d\n", decl[i].Offset, exp3[i].Offset); - } - ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ - } - } -} - static inline void print_elements(const D3DVERTEXELEMENT9 *elements) { D3DVERTEXELEMENT9 last = D3DDECL_END(); @@ -1565,7 +1468,6 @@ START_TEST(mesh) D3DXBoundProbeTest(); D3DXComputeBoundingBoxTest(); D3DXComputeBoundingSphereTest(); - D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); D3DXCreateMeshTest();

1 0

Henri Verbeet : d3dx9_36: Use a lookup table in D3DXGetDeclVertexSize().
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 31e8a20d880cc125b7cecd71a4152ab6141ea95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e8a20d880cc125b7cecd71a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:17 2010 +0200 d3dx9_36: Use a lookup table in D3DXGetDeclVertexSize(). --- dlls/d3dx9_36/mesh.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0ff6788..788c449 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -169,6 +169,27 @@ HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3* pfirstposition, DWOR return D3D_OK; } +static const UINT d3dx_decltype_size[D3DDECLTYPE_UNUSED] = +{ + /* D3DDECLTYPE_FLOAT1 */ 1 * 4, + /* D3DDECLTYPE_FLOAT2 */ 2 * 4, + /* D3DDECLTYPE_FLOAT3 */ 3 * 4, + /* D3DDECLTYPE_FLOAT4 */ 4 * 4, + /* D3DDECLTYPE_D3DCOLOR */ 4 * 1, + /* D3DDECLTYPE_UBYTE4 */ 4 * 1, + /* D3DDECLTYPE_SHORT2 */ 2 * 2, + /* D3DDECLTYPE_SHORT4 */ 4 * 2, + /* D3DDECLTYPE_UBYTE4N */ 4 * 1, + /* D3DDECLTYPE_SHORT2N */ 2 * 2, + /* D3DDECLTYPE_SHORT4N */ 4 * 2, + /* D3DDECLTYPE_USHORT2N */ 2 * 2, + /* D3DDECLTYPE_USHORT4N */ 4 * 2, + /* D3DDECLTYPE_UDEC3 */ 4, /* 3 * 10 bits + 2 padding */ + /* D3DDECLTYPE_DEC3N */ 4, + /* D3DDECLTYPE_FLOAT16_2 */ 2 * 2, + /* D3DDECLTYPE_FLOAT16_4 */ 4 * 2, +}; + /************************************************************************* * D3DXDeclaratorFromFVF */ @@ -246,31 +267,13 @@ UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_id if (element->Stream != stream_idx) continue; - switch (element->Type) + if (element->Type >= sizeof(d3dx_decltype_size) / sizeof(*d3dx_decltype_size)) { - case D3DDECLTYPE_FLOAT1: type_size = 1 * 4; break; - case D3DDECLTYPE_FLOAT2: type_size = 2 * 4; break; - case D3DDECLTYPE_FLOAT3: type_size = 3 * 4; break; - case D3DDECLTYPE_FLOAT4: type_size = 4 * 4; break; - case D3DDECLTYPE_D3DCOLOR: type_size = 4 * 1; break; - case D3DDECLTYPE_UBYTE4: type_size = 4 * 1; break; - case D3DDECLTYPE_SHORT2: type_size = 2 * 2; break; - case D3DDECLTYPE_SHORT4: type_size = 4 * 2; break; - case D3DDECLTYPE_UBYTE4N: type_size = 4 * 1; break; - case D3DDECLTYPE_SHORT2N: type_size = 2 * 2; break; - case D3DDECLTYPE_SHORT4N: type_size = 4 * 2; break; - case D3DDECLTYPE_USHORT2N: type_size = 2 * 2; break; - case D3DDECLTYPE_USHORT4N: type_size = 4 * 2; break; - case D3DDECLTYPE_UDEC3: type_size = 4; break; /* 3 * 10 bits + 2 padding */ - case D3DDECLTYPE_DEC3N: type_size = 4; break; - case D3DDECLTYPE_FLOAT16_2: type_size = 2 * 2; break; - case D3DDECLTYPE_FLOAT16_4: type_size = 4 * 2; break; - default: - FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); - type_size = 0; - break; + FIXME("Unhandled element type %#x, size will be incorrect.\n", element->Type); + continue; } + type_size = d3dx_decltype_size[element->Type]; if (element->Offset + type_size > size) size = element->Offset + type_size; }

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: e237369b09c1496db4cd13d089fbdc106a19d702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e237369b09c1496db4cd13d08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 17:58:16 2010 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aa478df..2785f35 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -978,7 +978,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r * DDERR_CANNOTATTACHSURFACE if the surface can't be attached for some reason * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf) +static HRESULT ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf) { TRACE("surface %p, attachment %p.\n", This, Surf);

1 0

Alexandre Julliard : msvcrt: Export the 64-bit version of the C++ mangled names for all implemented functions .
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 52aac5aba7c9611afb45fbb897acf5bb792e8c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52aac5aba7c9611afb45fbb89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 22:11:16 2010 +0200 msvcrt: Export the 64-bit version of the C++ mangled names for all implemented functions. --- dlls/msvcirt/msvcirt.spec | 20 +++++--- dlls/msvcr100/msvcr100.spec | 83 +++++++++++++++++++++++++--------- dlls/msvcr70/msvcr70.spec | 49 ++++++++++++++++---- dlls/msvcr71/msvcr71.spec | 49 ++++++++++++++++---- dlls/msvcr80/msvcr80.spec | 104 +++++++++++++++++++++++++++++++------------ dlls/msvcr90/msvcr90.spec | 104 +++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 50 +++++++++++++++++---- dlls/msvcrt20/msvcrt20.spec | 9 +++- dlls/msvcrt40/msvcrt40.spec | 45 +++++++++++++++---- dlls/msvcrtd/msvcrtd.spec | 43 ++++++++++++++--- 10 files changed, 425 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52aac5aba7c9611afb45f…

1 0

Alexandre Julliard : winebuild: Support relay debugging for thiscall functions.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: 22d5180b9fd9138a9f196f9135a2bf0b21bdd25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d5180b9fd9138a9f196f913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:44:01 2010 +0200 winebuild: Support relay debugging for thiscall functions. --- dlls/ntdll/relay.c | 13 ++++++++----- tools/winebuild/spec32.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 95575bb..cd9412c 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -318,7 +318,7 @@ static inline void RELAY_PrintArgs( const INT_PTR *args, int nb_args, unsigned i } } -extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); +extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); #ifdef __i386__ __ASM_GLOBAL_FUNC( call_entry_point, "pushl %ebp\n\t" @@ -340,6 +340,9 @@ __ASM_GLOBAL_FUNC( call_entry_point, "movl %esp,%edi\n\t" "cld\n\t" "rep; movsl\n" + "testl $2,20(%ebp)\n\t" /* (flags & 2) -> thiscall */ + "jz 1f\n\t" + "popl %ecx\n\t" "1:\tcall *8(%ebp)\n\t" "leal -8(%ebp),%esp\n\t" "popl %edi\n\t" @@ -404,7 +407,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, struct relay_entry_point *entry_point = data->entry_points + ordinal; if (!TRACE_ON(relay)) - ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); + ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1, flags ); else { if (entry_point->name) @@ -414,7 +417,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, RELAY_PrintArgs( stack + 1, nb_args, descr->arg_types[ordinal] ); DPRINTF( ") ret=%08lx\n", stack[0] ); - ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); + ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1, flags ); if (entry_point->name) DPRINTF( "%04x:Ret %s.%s()", GetCurrentThreadId(), data->dllname, entry_point->name ); @@ -477,7 +480,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, memcpy( args_copy, args, nb_args * sizeof(args[0]) ); args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy ); + call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy, 0 ); if (TRACE_ON(relay)) @@ -544,7 +547,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, INT_PTR idx, memcpy( args_copy, args, nb_args * sizeof(args[0]) ); args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - call_entry_point( orig_func + 24 + *(int *)(orig_func + 20), nb_args, args_copy ); + call_entry_point( orig_func + 24 + *(int *)(orig_func + 20), nb_args, args_copy, 0 ); if (TRACE_ON(relay)) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index cf0b76e..330db30 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -52,7 +52,7 @@ static inline int needs_relay( const ORDDEF *odp ) /* skip nonexistent entry points */ if (!odp) return 0; /* skip non-functions */ - if ((odp->type != TYPE_STDCALL) && (odp->type != TYPE_CDECL)) return 0; + if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL && odp->type != TYPE_THISCALL) return 0; /* skip norelay and forward entry points */ if (odp->flags & (FLAG_NORELAY|FLAG_FORWARD)) return 0; return 1; @@ -141,6 +141,13 @@ static void output_relay_debug( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: + if (odp->type == TYPE_THISCALL) /* add the this pointer */ + { + output( "\tpopl %%eax\n" ); + output( "\tpushl %%ecx\n" ); + output( "\tpushl %%eax\n" ); + flags |= 2; + } if (odp->flags & FLAG_REGISTER) output( "\tpushl %%eax\n" ); else @@ -164,7 +171,7 @@ static void output_relay_debug( DLLSPEC *spec ) else { output( "\tcall *4(%%eax)\n" ); - if (odp->type == TYPE_STDCALL) + if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) output( "\tret $%u\n", args * get_ptr_size() ); else output( "\tret\n" );

1 0

Alexandre Julliard : winebuild: Signal an error when a thiscall function doesn' t take a pointer as first argument.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: adddccb7f97d89c8f0fa50a04a8bae398654524c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adddccb7f97d89c8f0fa50a04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:29:51 2010 +0200 winebuild: Signal an error when a thiscall function doesn't take a pointer as first argument. --- tools/winebuild/parser.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 459bf97..ce17a3f 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -308,6 +308,11 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->u.func.arg_types[i] = '\0'; if (odp->type == TYPE_VARARGS) odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ + if (odp->type == TYPE_THISCALL && odp->u.func.arg_types[0] != 'p') + { + error( "First argument of a thiscall function must be a pointer\n" ); + return 0; + } if (!(token = GetToken(1))) {

1 0

Alexandre Julliard : msvcrt: List the this pointer as an additional argument for thiscall functions.
by Alexandre Julliard 25 Aug '10

25 Aug '10

Module: wine Branch: master Commit: c4f673fb6318381aa81d25a2da00e5a88a9e54ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f673fb6318381aa81d25a2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:29:27 2010 +0200 msvcrt: List the this pointer as an additional argument for thiscall functions. --- dlls/msvcirt/msvcirt.spec | 32 +++++++------- dlls/msvcp80/msvcp80.spec | 92 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 92 +++++++++++++++++++++--------------------- dlls/msvcr100/msvcr100.spec | 54 +++++++++++++------------- dlls/msvcr70/msvcr70.spec | 72 +++++++++++++++++----------------- dlls/msvcr71/msvcr71.spec | 56 +++++++++++++------------- dlls/msvcr80/msvcr80.spec | 50 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 50 ++++++++++++------------ dlls/msvcrt/msvcrt.spec | 74 +++++++++++++++++----------------- dlls/msvcrt40/msvcrt40.spec | 64 +++++++++++++++--------------- dlls/msvcrtd/msvcrtd.spec | 64 +++++++++++++++--------------- 11 files changed, 350 insertions(+), 350 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4f673fb6318381aa81d2…

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010