October 2012 - Wine-commits

Piotr Caban : ieframe: Handle rebar height changes.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: c7d7744860ac469be9ea5e4af39fef4a66d53a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d7744860ac469be9ea5e4af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 24 15:38:04 2012 +0200 ieframe: Handle rebar height changes. --- dlls/ieframe/iexplore.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 5b85205..a72ed34 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -551,6 +551,18 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar } } + if(hdr->idFrom == IDC_BROWSE_REBAR && hdr->code == RBN_HEIGHTCHANGE) + { + RECT docarea; + + GetClientRect(This->frame_hwnd, &docarea); + adjust_ie_docobj_rect(This->frame_hwnd, &docarea); + + if(This->doc_host->doc_host.hwnd) + SetWindowPos(This->doc_host->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, + SWP_NOZORDER | SWP_NOACTIVATE); + } + return 0; }

1 0

André Hentschel : d3d9/tests: Fix copy-paste error ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 31ca59f0b59cdb0a4587c484d195b267de9991b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ca59f0b59cdb0a4587c484d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:02 2012 +0200 d3d9/tests: Fix copy-paste error (coverity). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a67ce52..b6763099 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2751,7 +2751,7 @@ static void stretchrect_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest64, 0, &surf_tex_rt_dest64); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); } - if (tex_rt_dest64) { + if (tex_rt_dest640_480) { hr = IDirect3DTexture9_GetSurfaceLevel(tex_rt_dest640_480, 0, &surf_tex_rt_dest640_480); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); }

1 0

André Hentschel : cryptdlg: Fix copy-paste error ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: a8125d6efdb5117db5e74bfdab6bee2ba6ba144d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8125d6efdb5117db5e74bfda… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:00 2012 +0200 cryptdlg: Fix copy-paste error (coverity). --- dlls/cryptdlg/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 04311fd..9124541 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -276,7 +276,7 @@ static HCERTCHAINENGINE CRYPTDLG_MakeEngine(CERT_VERIFY_CERTIFICATE_TRUST *cert) { trust = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if (root) + if (trust) { for (i = 0; i < cert->cTrustStores; i++) CertAddStoreToCollection(trust, cert->rghstoreTrust[i], 0, 0);

1 0

André Hentschel : gdi32: Fix copy-paste error ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: cf95218f08e81fd093c16b00f87933fb8f986a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf95218f08e81fd093c16b00f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:08 2012 +0200 gdi32: Fix copy-paste error (coverity). --- dlls/gdi32/enhmfdrv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 553801c..cf44e9c 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -172,7 +172,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if(bounds.left > xCentre) bounds.left = xCentre; else if(bounds.right < xCentre) bounds.right = xCentre; if(bounds.top > yCentre) bounds.top = yCentre; - else if(bounds.bottom < yCentre) bounds.right = yCentre; + else if(bounds.bottom < yCentre) bounds.bottom = yCentre; } if(!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;

1 0

Henri Verbeet : d3d10: Implement D3D10DisassembleShader().
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: cb876cdb97df011b87c527550a5129cac63631c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb876cdb97df011b87c527550… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:04 2012 +0200 d3d10: Implement D3D10DisassembleShader(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/shader.c | 9 +++++++++ include/d3d10shader.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 9f6210b..1e6eb36 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -7,7 +7,7 @@ @ stub D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) @ stdcall D3D10GetGeometryShaderProfile(ptr) @ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 499da12..864f21f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -147,3 +147,12 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char return D3DCompile(data, data_size, filename, defines, include, entrypoint, profile, flags, 0, shader, error_messages); } + +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly) +{ + TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + data, data_size, color_code, comments, disassembly); + + return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); +} diff --git a/include/d3d10shader.h b/include/d3d10shader.h index af32539..06b4c3e 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -214,6 +214,8 @@ extern "C" { HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); +HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, + BOOL color_code, const char *comments, ID3D10Blob **disassembly); LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Henri Verbeet : wined3d: Set texture_level in surface_set_texture_target() as well.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: ddbe791d37a7b01cb602dab4862fe707eff2cd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbe791d37a7b01cb602dab48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:05 2012 +0200 wined3d: Set texture_level in surface_set_texture_target() as well. --- dlls/d3d10core/device.c | 4 +- dlls/d3d8/d3d8_private.h | 6 ++-- dlls/d3d8/device.c | 48 ++++++++++++++------------------------- dlls/d3d8/surface.c | 8 +++--- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 33 ++++++++++----------------- dlls/d3d9/surface.c | 8 +++--- dlls/ddraw/ddraw.c | 17 +++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 10 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++------------- dlls/wined3d/texture.c | 6 ++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 16 files changed, 77 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddbe791d37a7b01cb602d…

1 0

Henri Verbeet : wined3d: Remove some dead code from gen_ffp_instr().
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 41c8f1ef8a8c785a16cddb5cbafc9a8e3e7e0267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c8f1ef8a8c785a16cddb5cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:06 2012 +0200 wined3d: Remove some dead code from gen_ffp_instr(). --- dlls/wined3d/arb_program_shader.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a74171..0c0b22a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5939,7 +5939,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; unsigned int mul = 1; - BOOL mul_final_dest = FALSE; if(color && alpha) dstmask = ""; else if(color) dstmask = ".xyz"; @@ -5971,11 +5970,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta /* FALLTHROUGH */ case WINED3D_TOP_MODULATE_2X: mul *= 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_MODULATE: shader_addline(buffer, "MUL %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); @@ -5983,11 +5977,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_ADD_SIGNED_2X: mul = 2; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } /* FALLTHROUGH */ case WINED3D_TOP_ADD_SIGNED: shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); @@ -6048,11 +6037,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3D_TOP_DOTPRODUCT3: mul = 4; - if (!strcmp(dstreg, "result.color")) - { - dstreg = "ret"; - mul_final_dest = TRUE; - } shader_addline(buffer, "SUB arg1, %s, const.w;\n", arg1); shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); shader_addline(buffer, "DP3_SAT %s%s, arg1, arg2;\n", dstreg, dstmask); @@ -6076,11 +6060,10 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta FIXME("Unhandled texture op %08x\n", op); } - if(mul == 2) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } else if(mul == 4) { - shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", mul_final_dest ? "result.color" : dstreg, dstmask, dstreg); - } + if (mul == 2) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.y;\n", dstreg, dstmask, dstreg); + else if (mul == 4) + shader_addline(buffer, "MUL_SAT %s%s, %s, const.z;\n", dstreg, dstmask, dstreg); } static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info)

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVERTEXSHADER9.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 0c84de4455e354b85ac5c0af1c3090fc5b4051b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c84de4455e354b85ac5c0af1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:07 2012 +0200 d3dx9: Avoid LPDIRECT3DVERTEXSHADER9. --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ include/d3dx9effect.h | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dcd12d4..7fde7fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2717,18 +2717,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(struct ID3DXBaseEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - TRACE("iface %p, parameter %p, vshader %p\n", This, parameter, vshader); + TRACE("iface %p, parameter %p, shader %p.\n", This, parameter, shader); - if (vshader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) { - *vshader = *(LPDIRECT3DVERTEXSHADER9 *)param->data; - if (*vshader) IDirect3DVertexShader9_AddRef(*vshader); - TRACE("Returning %p\n", *vshader); + if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); return D3D_OK; } @@ -3379,14 +3380,15 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4345,14 +4347,15 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetPixelShader(ID3DXEffectCompiler return ID3DXBaseEffectImpl_GetPixelShader(base, parameter, shader); } -static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) +static HRESULT WINAPI ID3DXEffectCompilerImpl_GetVertexShader(struct ID3DXEffectCompiler *iface, + D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); ID3DXBaseEffect *base = This->base_effect; TRACE("Forward iface %p, base %p\n", This, base); - return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, vshader); + return ID3DXBaseEffectImpl_GetVertexShader(base, parameter, shader); } static HRESULT WINAPI ID3DXEffectCompilerImpl_SetArrayRange(ID3DXEffectCompiler *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -4737,8 +4740,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, break; case D3DXPT_VERTEXSHADER: - hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); - if (hr != D3D_OK) + if (FAILED(hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, param->data))) { WARN("Failed to create vertex shader\n"); return hr; diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index bae911f..b3a16d7 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -151,7 +151,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; }; #undef INTERFACE @@ -179,7 +179,7 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) STDMETHOD(SetSamplerState)(THIS_ DWORD sampler, D3DSAMPLERSTATETYPE type, DWORD value) PURE; STDMETHOD(SetNPatchMode)(THIS_ FLOAT num_segments) PURE; STDMETHOD(SetFVF)(THIS_ DWORD format) PURE; - STDMETHOD(SetVertexShader)(THIS_ LPDIRECT3DVERTEXSHADER9 shader) PURE; + STDMETHOD(SetVertexShader)(THIS_ struct IDirect3DVertexShader9 *shader) PURE; STDMETHOD(SetVertexShaderConstantF)(THIS_ UINT register_index, CONST FLOAT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantI)(THIS_ UINT register_index, CONST INT* constant_data, UINT register_count) PURE; STDMETHOD(SetVertexShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE; @@ -255,7 +255,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffect methods ***/ STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; @@ -348,7 +348,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) PURE; - STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffectCompiler methods ***/ STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 80382486aa65d41b170473f02698b943da4a60f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80382486aa65d41b170473f02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 21:01:08 2012 +0200 d3dx9: Avoid LPDIRECT3DVOLUMETEXTURE9. --- dlls/d3dx9_36/texture.c | 15 +---- include/d3dx9tex.h | 162 +++++++++++----------------------------------- 2 files changed, 42 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80382486aa65d41b17047…

1 0

Christian Costa : d3dxof: Fix remaining 'objects.txt' filename.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 82dd739064bea6732c44f81fdf6309d8c206d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd739064bea6732c44f81fd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 23:14:34 2012 +0200 d3dxof: Fix remaining 'objects.txt' filename. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 182bf33..9ff76b2 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -756,7 +756,7 @@ static void test_dump(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.txt", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.x", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData)))

1 0