wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Henri Verbeet : d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 6feffa6ee2d8bdf043f9a35471a5b4a66abba90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feffa6ee2d8bdf043f9a3547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:56 2012 +0200 d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore(). --- dlls/d3d10/effect.c | 14 ++++++++++- dlls/d3d10/tests/effect.c | 52 +++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dabe02c..eb82512 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6091,9 +6091,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthSte static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingStore(ID3D10EffectDepthStencilVariable *iface, UINT index, D3D10_DEPTH_STENCIL_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (index >= max(v->type->element_count, 1)) + { + WARN("Invalid index %u.\n", index); + return E_FAIL; + } + + *desc = ((D3D10_DEPTH_STENCIL_DESC *)v->data)[index]; + + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 089ded6..b1b3816 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3866,30 +3866,29 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); - todo_wine ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); @@ -4116,30 +4115,29 @@ static void test_effect_state_group_defaults(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); - todo_wine ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); - todo_wine ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(!ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state");

1 0

Henri Verbeet : d3d10: Add support for parsing depth/stencil states.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: ea05d7b92d4cdaa7d0cdf8b65e546b24932114b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea05d7b92d4cdaa7d0cdf8b65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:55 2012 +0200 d3d10: Add support for parsing depth/stencil states. --- dlls/d3d10/effect.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cba50e2..dabe02c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -138,6 +138,20 @@ static const struct d3d10_effect_state_property_info property_info[] = {0x13, "RasterizerState.ScissorEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, ScissorEnable) }, {0x14, "RasterizerState.MultisampleEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, MultisampleEnable) }, {0x15, "RasterizerState.AntialiasedLineEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, AntialiasedLineEnable) }, + {0x16, "DepthStencilState.DepthEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthEnable) }, + {0x17, "DepthStencilState.DepthWriteMask", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthWriteMask) }, + {0x18, "DepthStencilState.DepthFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthFunc) }, + {0x19, "DepthStencilState.StencilEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilEnable) }, + {0x1a, "DepthStencilState.StencilReadMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilReadMask) }, + {0x1b, "DepthStencilState.StencilWriteMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilWriteMask) }, + {0x1c, "DepthStencilState.FrontFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFailOp) }, + {0x1d, "DepthStencilState.FrontFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilDepthFailOp)}, + {0x1e, "DepthStencilState.FrontFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilPassOp) }, + {0x1f, "DepthStencilState.FrontFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFunc) }, + {0x20, "DepthStencilState.BackFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFailOp) }, + {0x21, "DepthStencilState.BackFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilDepthFailOp) }, + {0x22, "DepthStencilState.BackFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilPassOp) }, + {0x23, "DepthStencilState.BackFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFunc) }, }; static const D3D10_RASTERIZER_DESC default_rasterizer_desc = @@ -154,6 +168,18 @@ static const D3D10_RASTERIZER_DESC default_rasterizer_desc = FALSE, }; +static const D3D10_DEPTH_STENCIL_DESC default_depth_stencil_desc = +{ + TRUE, + D3D10_DEPTH_WRITE_MASK_ALL, + D3D10_COMPARISON_LESS, + FALSE, + D3D10_DEFAULT_STENCIL_READ_MASK, + D3D10_DEFAULT_STENCIL_WRITE_MASK, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, +}; + struct d3d10_effect_state_storage_info { D3D_SHADER_VARIABLE_TYPE id; @@ -164,6 +190,7 @@ struct d3d10_effect_state_storage_info static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_info[] = { {D3D10_SVT_RASTERIZER, sizeof(default_rasterizer_desc), &default_rasterizer_desc }, + {D3D10_SVT_DEPTHSTENCIL, sizeof(default_depth_stencil_desc), &default_depth_stencil_desc}, }; static BOOL copy_name(const char *ptr, char **name) @@ -1013,6 +1040,20 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT } } +static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 *out_data, UINT idx) +{ + switch (in_type) + { + case D3D10_SVT_INT: + out_data[idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { @@ -1049,6 +1090,11 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return FALSE; break; + case D3D10_SVT_UINT8: + if (!read_int8_value(value, in_type, out_data, out_idx)) + return FALSE; + break; + default: FIXME("Unhandled out_type %#x.\n", out_type); return FALSE; @@ -1502,7 +1548,6 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; - case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_BLEND: case D3D10_SVT_SAMPLER: TRACE("SVT is a state.\n"); @@ -1521,6 +1566,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; + case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_RASTERIZER: { const struct d3d10_effect_state_storage_info *storage_info;

1 0

Henri Verbeet : wined3d: Fix some EXT_gpu_shader4 function names.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 048edaf6a3834cb3139ab944e0670385877bd1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=048edaf6a3834cb3139ab944e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:53 2012 +0200 wined3d: Fix some EXT_gpu_shader4 function names. --- dlls/wined3d/wined3d_gl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f01cdb3..2a67dff 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4235,9 +4235,9 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); USE_GL_FUNC(PGLFNVERTEXATTRIBIPOINTEREXTPROC, \ glVertexAttribIPointerEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNGETVERTEXATTRIBIIVEXTPROC, \ - glVertexAttribIivEXT, EXT_GPU_SHADER4, NULL) \ + glGetVertexAttribIivEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNGETVERTEXATTRIBIUIVEXTPROC, \ - glVertexAttribIuivEXT, EXT_GPU_SHADER4, NULL) \ + glGetVertexAttribIuivEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNUNIFORM1UIEXTPROC, \ glUniform1uiEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNUNIFORM2UIEXTPROC, \

1 0

Henri Verbeet : wined3d: Get rid of APPLE_flush_render, it doesn't exist.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 526901e307fddc5994e3a3aa22f8a92946f50a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526901e307fddc5994e3a3aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:52 2012 +0200 wined3d: Get rid of APPLE_flush_render, it doesn't exist. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2a6b83b..6b60966 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -91,7 +91,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, - {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, /* ARB */ @@ -1413,7 +1412,6 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * DirectDraw, not OpenGL. */ if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_CLIENT_STORAGE] - && gl_info->supported[APPLE_FLUSH_RENDER] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5bc3c63..f01cdb3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1720,7 +1720,6 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, - APPLE_FLUSH_RENDER, APPLE_YCBCR_422, /* ARB */ ARB_COLOR_BUFFER_FLOAT, @@ -1887,10 +1886,6 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -/* GL_APPLE_flush_render */ -typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); -typedef void (WINE_GLAPI *PGLFNFINISHRENDERAPPLEPROC)(void); - /* GL_APPLE_ycbcr_422 */ #ifndef GL_APPLE_ycbcr_422 #define GL_APPLE_ycbcr_422 1 @@ -3712,11 +3707,6 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, \ glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ - /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, \ - glFlushRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, \ - glFinishRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(PGLFNCLAMPCOLORARBPROC, \ glClampColorARB, ARB_COLOR_BUFFER_FLOAT, NULL) \

1 0

Nozomi Kodama : d3dx9_36: Add more traces.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: c7bf5e09d58f12614e95e28201ef85c9abfb1d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bf5e09d58f12614e95e2820… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sat Jul 21 16:10:51 2012 +0800 d3dx9_36: Add more traces. --- dlls/d3dx9_36/math.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7bf5e09d58f12614e95e…

1 0

Jacek Caban : mshtml.idl: Added IDOMEvent and IDOMEventTarget declarations.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 020a68e1350eaf7293718732c1c9203e460709c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020a68e1350eaf7293718732c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:50 2012 +0200 mshtml.idl: Added IDOMEvent and IDOMEventTarget declarations. --- include/mshtmdid.h | 39 ++++++++++++++++++ include/mshtml.idl | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 7484b7f..10c1b85 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -108,6 +108,28 @@ #define DISPID_DOMSTORAGEITEM DISPID_NORMAL_FIRST #define DISPID_DOMSTORAGE DISPID_NORMAL_FIRST #define DISPID_DOMSTORAGELIST DISPID_NORMAL_FIRST +#define DISPID_RULESAPPLIED DISPID_NORMAL_FIRST +#define DISPID_RULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_STYLESHEETRULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_PROCESSINGINSTRUCTION DISPID_NORMAL_FIRST + +#define DISPID_DOMEVENT DISPID_NORMAL_FIRST +#define DISPID_DOMUIEVENT (DISPID_DOMEVENT+25) +#define DISPID_DOMMOUSEEVENT (DISPID_DOMUIEVENT+25) +#define DISPID_DOMMOUSEWHEELEVENT (DISPID_DOMMOUSEEVENT+25) +#define DISPID_DOMWHEELEVENT (DISPID_DOMMOUSEWHEELEVENT+25) +#define DISPID_DOMTEXTEVENT (DISPID_DOMWHEELEVENT+25) +#define DISPID_DOMKEYBOARDEVENT (DISPID_DOMTEXTEVENT+25) +#define DISPID_DOMCOMPOSITIONEVENT (DISPID_DOMKEYBOARDEVENT+25) +#define DISPID_DOMCUSTOMEVENT (DISPID_DOMCOMPOSITIONEVENT+25) +#define DISPID_DOMMUTATIONEVENT (DISPID_DOMCUSTOMEVENT+25) +#define DISPID_DOMFOCUSEVENT (DISPID_DOMMUTATIONEVENT+25) +#define DISPID_SVGZOOMEVENT (DISPID_DOMFOCUSEVENT+25) +#define DISPID_DOMSITEMODEEVENT (DISPID_SVGZOOMEVENT+25) +#define DISPID_DOMMESSAGEEVENT (DISPID_DOMSITEMODEEVENT+25) +#define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) +#define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) +#define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -2886,6 +2908,23 @@ #define DISPID_IEVENTTARGET_REMOVEEVENTLISTENER DISPID_HTMLOBJECT+11 #define DISPID_IEVENTTARGET_DISPATCHEVENT DISPID_HTMLOBJECT+12 +/* IDOMEvent */ +#define DISPID_IDOMEVENT_BUBBLES DISPID_DOMEVENT+1 +#define DISPID_IDOMEVENT_CANCELABLE DISPID_DOMEVENT+2 +#define DISPID_IDOMEVENT_CURRENTTARGET DISPID_DOMEVENT+3 +#define DISPID_IDOMEVENT_DEFAULTPREVENTED DISPID_DOMEVENT+4 +#define DISPID_IDOMEVENT_EVENTPHASE DISPID_DOMEVENT+5 +#define DISPID_IDOMEVENT_TARGET DISPID_DOMEVENT+6 +#define DISPID_IDOMEVENT_TIMESTAMP DISPID_DOMEVENT+7 +#define DISPID_IDOMEVENT_TYPE DISPID_DOMEVENT+8 +#define DISPID_IDOMEVENT_INITEVENT DISPID_DOMEVENT+9 +#define DISPID_IDOMEVENT_PREVENTDEFAULT DISPID_DOMEVENT+10 +#define DISPID_IDOMEVENT_STOPPROPAGATION DISPID_DOMEVENT+11 +#define DISPID_IDOMEVENT_STOPIMMEDIATEPROPAGATION DISPID_DOMEVENT+12 +#define DISPID_IDOMEVENT_ISTRUSTED DISPID_DOMEVENT+13 +#define DISPID_IDOMEVENT_CANCELBUBBLE DISPID_DOMEVENT+14 +#define DISPID_IDOMEVENT_SRCELEMENT DISPID_DOMEVENT+15 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 6dee9bf..19e0fa9 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -131,6 +131,7 @@ interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; interface IHTMLStorage; +interface IDOMEvent; /***************************************************************************** * IHTMLFiltersCollection interface @@ -7975,6 +7976,22 @@ methods: VARIANT ontimeout(); WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; + + + [id(DISPID_IEVENTTARGET_ADDEVENTLISTENER)] + void addEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_REMOVEEVENTLISTENER)] + void removeEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_DISPATCHEVENT)] + VARIANT_BOOL dispatchEvent([in] IDOMEvent *evt); } /***************************************************************************** @@ -17208,6 +17225,98 @@ interface IHTMLStorage : IDispatch } /***************************************************************************** + * IDOMEventTarget interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104b9-98b5-11cf-bb82-00aa00bdce0b) +] +interface IEventTarget : IDispatch +{ + [id(DISPID_IEVENTTARGET_ADDEVENTLISTENER)] + HRESULT addEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_REMOVEEVENTLISTENER)] + HRESULT removeEventListener( + [in] BSTR type, + [in] IDispatch *listener, + [in] VARIANT_BOOL useCapture); + + [id(DISPID_IEVENTTARGET_DISPATCHEVENT)] + HRESULT dispatchEvent( + [in] IDOMEvent *evt, + [out, retval] VARIANT_BOOL *pfResult); +} + +/***************************************************************************** + * IDOMEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104ba-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMEvent : IDispatch +{ + [propget, id(DISPID_IDOMEVENT_BUBBLES)] + HRESULT bubbles([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_CANCELABLE)] + HRESULT cancelable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_CURRENTTARGET)] + HRESULT currentTarget([out, retval] IEventTarget **p); + + [propget, id(DISPID_IDOMEVENT_DEFAULTPREVENTED)] + HRESULT defaultPrevented([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_EVENTPHASE)] + HRESULT eventPhase([out, retval] USHORT *p); + + [propget, id(DISPID_IDOMEVENT_TARGET)] + HRESULT target([out, retval] IEventTarget **p); + + [propget, id(DISPID_IDOMEVENT_TIMESTAMP)] + HRESULT timeStamp([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMEVENT_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [id(DISPID_IDOMEVENT_INITEVENT)] + HRESULT initEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable); + + [id(DISPID_IDOMEVENT_PREVENTDEFAULT)] + HRESULT preventDefault(); + + [id(DISPID_IDOMEVENT_STOPPROPAGATION)] + HRESULT stopPropagation(); + + [id(DISPID_IDOMEVENT_STOPIMMEDIATEPROPAGATION)] + HRESULT stopImmediatePropagation(); + + [propget, id(DISPID_IDOMEVENT_ISTRUSTED)] + HRESULT isTrusted([out, retval] VARIANT_BOOL *p); + + [propput, id(DISPID_IDOMEVENT_CANCELBUBBLE)] + HRESULT cancelBubble([in] VARIANT_BOOL v); + + [propget, id(DISPID_IDOMEVENT_CANCELBUBBLE)] + HRESULT cancelBubble([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMEVENT_SRCELEMENT)] + HRESULT srcElement([out, retval] IHTMLElement **p); +} + +/***************************************************************************** * IMarkupContainer interface */ [

1 0

Jacek Caban : mshtml.idl: Added more *XMLHttpRequest* declarations.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 84eb47531d8af046e8baac9f05d1c2e1ca73980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84eb47531d8af046e8baac9f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:37 2012 +0200 mshtml.idl: Added more *XMLHttpRequest* declarations. --- include/mshtmdid.h | 53 ++++++++++++++++++++++++- include/mshtml.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index b43ead4..7484b7f 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -640,7 +640,49 @@ #define DISPID_EVPROP_ONHASHCHANGE (DISPID_EVENTS+109) #define DISPID_EVPROP_ONMESSAGE (DISPID_EVENTS+110) #define DISPID_EVPROP_ONDOMMUTATION (DISPID_EVENTS+111) -#define DISPID_EVPROPS_COUNT 112 +#define DISPID_EVPROP_TIMEOUT (DISPID_EVENTS+112) +#define DISPID_EVPROP_WHEEL (DISPID_EVENTS+113) +#define DISPID_EVPROP_SVGLOAD (DISPID_EVENTS+114) +#define DISPID_EVPROP_SVGUNLOAD (DISPID_EVENTS+115) +#define DISPID_EVPROP_SVGABORT (DISPID_EVENTS+116) +#define DISPID_EVPROP_SVGERROR (DISPID_EVENTS+117) +#define DISPID_EVPROP_SVGRESIZE (DISPID_EVENTS+118) +#define DISPID_EVPROP_SVGSCROLL (DISPID_EVENTS+119) +#define DISPID_EVPROP_SVGZOOM (DISPID_EVENTS+120) +#define DISPID_EVPROP_ONMSTHUMBNAILCLICK (DISPID_EVENTS+121) +#define DISPID_EVPROP_COMPOSITIONSTART (DISPID_EVENTS+122) +#define DISPID_EVPROP_COMPOSITIONUPDATE (DISPID_EVENTS+123) +#define DISPID_EVPROP_COMPOSITIONEND (DISPID_EVENTS+124) +#define DISPID_EVPROP_DOMATTRMODIFIED (DISPID_EVENTS+125) +#define DISPID_EVPROP_DOMCONTENTLOADED (DISPID_EVENTS+126) +#define DISPID_EVPROP_INPUT (DISPID_EVENTS+127) +#define DISPID_EVPROP_DOMCHARDATAMODIFIE (DISPID_EVENTS+128) +#define DISPID_EVPROP_TEXTINPUT (DISPID_EVENTS+129) +#define DISPID_EVPROP_ONMSSITEMODEJUMPLISTITEMREMOVED (DISPID_EVENTS+130) +#define DISPID_EVPROP_DOMNODEINSERTED (DISPID_EVENTS+131) +#define DISPID_EVPROP_DOMNODEREMOVED (DISPID_EVENTS+132) +#define DISPID_EVPROP_DOMSUBTREEMODIFIED (DISPID_EVENTS+133) +#define DISPID_EVPROP_CANPLAY (DISPID_EVENTS+134) +#define DISPID_EVPROP_CANPLAYTHROUGH (DISPID_EVENTS+135) +#define DISPID_EVPROP_DURATIONCHANGE (DISPID_EVENTS+136) +#define DISPID_EVPROP_EMPTIED (DISPID_EVENTS+137) +#define DISPID_EVPROP_ENDED (DISPID_EVENTS+138) +#define DISPID_EVPROP_LOADEDDATA (DISPID_EVENTS+139) +#define DISPID_EVPROP_LOADEDMETADATA (DISPID_EVENTS+140) +#define DISPID_EVPROP_LOADSTART (DISPID_EVENTS+141) +#define DISPID_EVPROP_PAUSE (DISPID_EVENTS+142) +#define DISPID_EVPROP_PLAY (DISPID_EVENTS+143) +#define DISPID_EVPROP_PLAYING (DISPID_EVENTS+144) +#define DISPID_EVPROP_PROGRESS (DISPID_EVENTS+145) +#define DISPID_EVPROP_RATECHANGE (DISPID_EVENTS+146) +#define DISPID_EVPROP_SEEKED (DISPID_EVENTS+147) +#define DISPID_EVPROP_SEEKING (DISPID_EVENTS+148) +#define DISPID_EVPROP_STALLED (DISPID_EVENTS+149) +#define DISPID_EVPROP_SUSPEND (DISPID_EVENTS+150) +#define DISPID_EVPROP_TIMEUPDATE (DISPID_EVENTS+151) +#define DISPID_EVPROP_VOLUMECHANGE (DISPID_EVENTS+152) +#define DISPID_EVPROP_WAITING (DISPID_EVENTS+153) +#define DISPID_EVPROPS_COUNT 154 #define DISPID_EVMETH_ONMOUSEOVER STDDISPID_XOBJ_ONMOUSEOVER #define DISPID_EVMETH_ONMOUSEOUT STDDISPID_XOBJ_ONMOUSEOUT @@ -1820,6 +1862,10 @@ /* IHTMLXMLHttpRequestFactory */ #define DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE DISPID_VALUE +/* HTMLXMLHttpRequestEvents */ +#define DISPID_HTMLXMLHTTPREQUESTEVENTS_ONTIMEOUT DISPID_XMLHTTPREQUEST+16 +#define DISPID_HTMLXMLHTTPREQUESTEVENTS_ONREADYSTATECHANGE DISPID_XMLHTTPREQUEST+8 + /* IOmHistory */ #define DISPID_IOMHISTORY_LENGTH DISPID_HISTORY #define DISPID_IOMHISTORY_BACK (DISPID_HISTORY+1) @@ -2835,6 +2881,11 @@ #define DISPID_IHTMLSTORAGE_REMOVEITEM DISPID_DOMSTORAGE+5 #define DISPID_IHTMLSTORAGE_CLEAR DISPID_DOMSTORAGE+7 +/* IEventTarget */ +#define DISPID_IEVENTTARGET_ADDEVENTLISTENER DISPID_HTMLOBJECT+10 +#define DISPID_IEVENTTARGET_REMOVEEVENTLISTENER DISPID_HTMLOBJECT+11 +#define DISPID_IEVENTTARGET_DISPATCHEVENT DISPID_HTMLOBJECT+12 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 57f77e8..6dee9bf 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7864,6 +7864,120 @@ interface IHTMLXMLHttpRequest : IDispatch } /***************************************************************************** + * IHTMLXMLHttpRequest2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510482-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequest2 : IDispatch +{ + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + HRESULT timeout([in] long v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + HRESULT timeout([out, retval] long *p); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + HRESULT ontimeout([in] VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + HRESULT ontimeout([out, retval] VARIANT *p); +} + +/***************************************************************************** + * IHTMLXMLHttpRequestFactory interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051040c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequestFactory : IDispatch +{ + [id(DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE)] + HRESULT create([out, retval] IHTMLXMLHttpRequest **p); +} + +/***************************************************************************** + * DispHTMLXMLHttpRequest dispinterface + */ +[ + hidden, + uuid(3050f596-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLXMLHttpRequest +{ +properties: +methods: + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_READYSTATE)] + long readyState(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY)] + VARIANT responseBody(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT)] + BSTR responseText(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML)] + IDispatch *responseXML(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUS)] + long status(); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT)] + BSTR statusText(); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + void onreadystatechange(VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + VARIANT onreadystatechange(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_ABORT)] + void abort(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_OPEN)] + void open( + [in] BSTR bstrMethod, + [in] BSTR bstrUrl, + [in] VARIANT varAsync, + [in, optional] VARIANT varUser, + [in, optional] VARIANT varPassword); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SEND)] + void send([in, optional] VARIANT varBody); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS)] + BSTR getAllResponseHeaders(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER)] + BSTR getResponseHeader([in] BSTR bstrHeader); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER)] + void setRequestHeader( + [in] BSTR bstrHeader, + [in] BSTR bstrValue); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + void timeout(long v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT)] + long timeout(); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + void ontimeout(VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT), displaybind, bindable] + VARIANT ontimeout(); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added IXMLHttpRequest declaration.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 930065072a13a6fcebd96209867603c0fb5ae53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=930065072a13a6fcebd962098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 20:19:23 2012 +0200 mshtml.idl: Added IXMLHttpRequest declaration. --- include/mshtmdid.h | 22 ++++++++++++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a062131..b43ead4 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1798,6 +1798,28 @@ /* IHTMLImgElement2 */ #define DISPID_IHTMLIMGELEMENT2_LONGDESC DISPID_IMG+19 +/* IHTMLXMLHttpRequest */ +#define DISPID_IHTMLXMLHTTPREQUEST_READYSTATE DISPID_XMLHTTPREQUEST+2 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY DISPID_XMLHTTPREQUEST+3 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT DISPID_XMLHTTPREQUEST+4 +#define DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML DISPID_XMLHTTPREQUEST+5 +#define DISPID_IHTMLXMLHTTPREQUEST_STATUS DISPID_XMLHTTPREQUEST+6 +#define DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT DISPID_XMLHTTPREQUEST+7 +#define DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLXMLHTTPREQUEST_ABORT DISPID_XMLHTTPREQUEST+9 +#define DISPID_IHTMLXMLHTTPREQUEST_OPEN DISPID_XMLHTTPREQUEST+10 +#define DISPID_IHTMLXMLHTTPREQUEST_SEND DISPID_XMLHTTPREQUEST+11 +#define DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS DISPID_XMLHTTPREQUEST+12 +#define DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER DISPID_XMLHTTPREQUEST+13 +#define DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER DISPID_XMLHTTPREQUEST+14 + +/* IHTMLXMLHttpRequest2 */ +#define DISPID_IHTMLXMLHTTPREQUEST2_TIMEOUT DISPID_XMLHTTPREQUEST+15 +#define DISPID_IHTMLXMLHTTPREQUEST2_ONTIMEOUT DISPID_EVPROP_TIMEOUT + +/* IHTMLXMLHttpRequestFactory */ +#define DISPID_IHTMLXMLHTTPREQUESTFACTORY_CREATE DISPID_VALUE + /* IOmHistory */ #define DISPID_IOMHISTORY_LENGTH DISPID_HISTORY #define DISPID_IOMHISTORY_BACK (DISPID_HISTORY+1) diff --git a/include/mshtml.idl b/include/mshtml.idl index d599eba..57f77e8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7802,6 +7802,68 @@ methods: } /***************************************************************************** + * IHTMLXMLHttpRequest interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051040a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLXMLHttpRequest : IDispatch +{ + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_READYSTATE)] + HRESULT readyState([out, retval] long *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEBODY)] + HRESULT responseBody([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSETEXT)] + HRESULT responseText([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_RESPONSEXML)] + HRESULT responseXML([out, retval] IDispatch **p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUS)] + HRESULT status([out, retval] long *p); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_STATUSTEXT)] + HRESULT statusText([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLXMLHTTPREQUEST_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([out, retval] VARIANT *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_ABORT)] HRESULT abort(); + + [id(DISPID_IHTMLXMLHTTPREQUEST_OPEN)] + HRESULT open( + [in] BSTR bstrMethod, + [in] BSTR bstrUrl, + [in] VARIANT varAsync, + [in, optional] VARIANT varUser, + [in, optional] VARIANT varPassword); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SEND)] + HRESULT send([in, optional] VARIANT varBody); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETALLRESPONSEHEADERS)] + HRESULT getAllResponseHeaders([out, retval] BSTR *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_GETRESPONSEHEADER)] + HRESULT getResponseHeader( + [in] BSTR bstrHeader, + [out, retval] BSTR *p); + + [id(DISPID_IHTMLXMLHTTPREQUEST_SETREQUESTHEADER)] + HRESULT setRequestHeader( + [in] BSTR bstrHeader, + [in] BSTR bstrValue); +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Matteo Bruni : d3dcompiler: Parse assignments.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 1a36da15afa711ff5eb9c4872f9d238bcd06ad10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a36da15afa711ff5eb9c4872… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:41 2012 +0200 d3dcompiler: Parse assignments. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 23 +++ dlls/d3dcompiler_43/hlsl.y | 5 +- dlls/d3dcompiler_43/utils.c | 217 +++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a36da15afa711ff5eb9c…

1 0

Matteo Bruni : d3dcompiler: Stub assignment parsing.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 6ccbccbb29cc2a44f375c0be10718e58f38626cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccbccbb29cc2a44f375c0be1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:40 2012 +0200 d3dcompiler: Stub assignment parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 ++++++++ dlls/d3dcompiler_43/hlsl.y | 51 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 769bf74..efba080 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -912,6 +912,21 @@ enum parse_unary_op UNARY_OP_BITNOT, }; +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + struct hlsl_parse_ctx { const char **source_files; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 177330f..6184d6a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -207,6 +207,7 @@ static unsigned int components_count_expr_list(struct list *list) struct parse_parameter parameter; struct parse_variable_def *variable_def; enum parse_unary_op unary_op; + enum parse_assign_op assign_op; } %token KW_BLENDSTATE @@ -352,6 +353,7 @@ static unsigned int components_count_expr_list(struct list *list) %type <instr> assignment_expr %type <list> expr_statement %type <unary_op> unary_op +%type <assign_op> assign_op %type <modifiers> input_mod %% @@ -1209,6 +1211,55 @@ assignment_expr: conditional_expr { $$ = $1; } + | unary_expr assign_op assignment_expr + { + FIXME("Assignment\n"); + } + +assign_op: '=' + { + $$ = ASSIGN_OP_ASSIGN; + } + | OP_ADDASSIGN + { + $$ = ASSIGN_OP_ADD; + } + | OP_SUBASSIGN + { + $$ = ASSIGN_OP_SUB; + } + | OP_MULASSIGN + { + $$ = ASSIGN_OP_MUL; + } + | OP_DIVASSIGN + { + $$ = ASSIGN_OP_DIV; + } + | OP_MODASSIGN + { + $$ = ASSIGN_OP_MOD; + } + | OP_LEFTSHIFTASSIGN + { + $$ = ASSIGN_OP_LSHIFT; + } + | OP_RIGHTSHIFTASSIGN + { + $$ = ASSIGN_OP_RSHIFT; + } + | OP_ANDASSIGN + { + $$ = ASSIGN_OP_AND; + } + | OP_ORASSIGN + { + $$ = ASSIGN_OP_OR; + } + | OP_XORASSIGN + { + $$ = ASSIGN_OP_XOR; + } expr: assignment_expr {

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
72
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 July 2012