August 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the unused vbo_mode setting.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: cbd555bbc9b316163719bbca3a75d4517bd2be11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd555bbc9b316163719bbca3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 10 09:30:52 2009 +0200 wined3d: Get rid of the unused vbo_mode setting. --- dlls/wined3d/wined3d_main.c | 16 ---------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2d3c222..881f90e 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -39,7 +39,6 @@ wined3d_settings_t wined3d_settings = { VS_HW, /* Hardware by default */ PS_HW, /* Hardware by default */ - VBO_HW, /* Hardware by default */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ @@ -196,19 +195,6 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) wined3d_settings.ps_mode = PS_NONE; } } - if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) - { - if (!strcmp(buffer,"none")) - { - TRACE("Disable Vertex Buffer Hardware support\n"); - wined3d_settings.vbo_mode = VBO_NONE; - } - else if (!strcmp(buffer,"hardware")) - { - TRACE("Allow Vertex Buffer Hardware support\n"); - wined3d_settings.vbo_mode = VBO_HW; - } - } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { if (!strcmp(buffer,"disabled")) @@ -314,8 +300,6 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) TRACE("Allow HW vertex shaders\n"); if (wined3d_settings.ps_mode == PS_NONE) TRACE("Disable pixel shaders\n"); - if (wined3d_settings.vbo_mode == VBO_NONE) - TRACE("Disable Vertex Buffer Hardware support\n"); if (wined3d_settings.glslRequested) TRACE("If supported by your system, GL Shading Language will be used\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e01b09..f5b898b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -280,7 +280,6 @@ typedef struct wined3d_settings_s { /* vertex and pixel shader modes */ int vs_mode; int ps_mode; - int vbo_mode; /* Ideally, we don't want the user to have to request GLSL. If the hardware supports GLSL, we should use it. However, until it's fully implemented, we'll leave it as a registry setting for developers. */

1 0

Henri Verbeet : wined3d: Return ~0U for wined3d_log2i(0).
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 6794a57073206945b5fc93e5a899177de4b1a9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6794a57073206945b5fc93e5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 10 09:30:51 2009 +0200 wined3d: Return ~0U for wined3d_log2i(0). --- dlls/wined3d/utils.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 07a0794..3c25ebe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2690,24 +2690,24 @@ const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions = UINT wined3d_log2i(UINT32 x) { - static const BYTE l[] = + static const UINT l[] = { - 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + ~0U, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, }; UINT32 i;

1 0

Henri Verbeet : wined3d: Use EXT_provoking_vertex to match Direct3D' s provoking vertex convention.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 3b06fc92f479f8ae2e23990f38e1fc2185138b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b06fc92f479f8ae2e23990f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 10 09:30:50 2009 +0200 wined3d: Use EXT_provoking_vertex to match Direct3D's provoking vertex convention. --- dlls/d3d9/tests/visual.c | 11 +++++++++-- dlls/wined3d/context.c | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2a86be8..d4fabf3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6586,8 +6586,15 @@ static void shademode_test(IDirect3DDevice9 *device) switch(shademode) { case D3DSHADE_FLAT: /* Should take the color of the first vertex of each triangle */ - todo_wine ok(color0 == 0x00ff0000, "FLAT shading has color0 %08x, expected 0x00ff0000 (todo)\n", color0); - todo_wine ok(color1 == 0x0000ff00, "FLAT shading has color1 %08x, expected 0x0000ff00 (todo)\n", color1); + if (0) + { + /* This test depends on EXT_provoking_vertex being + * available. This extension is currently (20090810) + * not common enough to let the test fail if it isn't + * present. */ + ok(color0 == 0x00ff0000, "FLAT shading has color0 %08x, expected 0x00ff0000\n", color0); + ok(color1 == 0x0000ff00, "FLAT shading has color1 %08x, expected 0x0000ff00\n", color1); + } shademode = D3DSHADE_GOURAUD; break; case D3DSHADE_GOURAUD: diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0737079..09743c6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1357,6 +1357,12 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } + + if (GL_SUPPORT(EXT_PROVOKING_VERTEX)) + { + GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); + } + LEAVE_GL(); This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE);

1 0

Henri Verbeet : wined3d: Detect EXT_provoking_vertex.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: ac64bf6406fb847e6c586ec93ba610a9159c4450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac64bf6406fb847e6c586ec93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 10 09:30:49 2009 +0200 wined3d: Detect EXT_provoking_vertex. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1498684..5cd017e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -100,6 +100,7 @@ static const struct { {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL, 0 }, {"GL_EXT_paletted_texture", EXT_PALETTED_TEXTURE, 0 }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS, 0 }, + {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX, 0 }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR, 0 }, {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE, 0 }, {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index dcb526b..5802bf8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1952,6 +1952,17 @@ typedef void (WINE_GLAPI * PGLFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum inte #endif typedef void (WINE_GLAPI * PGLFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); typedef void (WINE_GLAPI * PGLFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); + +/* GL_EXT_provoking_vertex */ +#ifndef GL_EXT_provoking_vertex +#define GL_EXT_provoking_vertex 1 +#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8e4d +#define GL_LAST_VERTEX_CONVENTION_EXT 0x8e4e +#define GL_PROVOKING_VERTEX_EXT 0x8e4f +#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTIONS_EXT 0x8e4c +#endif +typedef void (WINE_GLAPI * PGLFNGLPROVOKINGVERTEXEXTPROC)(GLenum mode); + /* GL_EXT_texture3D */ #ifndef GL_EXT_texture3D #define GL_EXT_texture3D 1 @@ -3458,6 +3469,7 @@ typedef enum _GL_SupportedExt { EXT_PALETTED_TEXTURE, EXT_PIXEL_BUFFER_OBJECT, EXT_POINT_PARAMETERS, + EXT_PROVOKING_VERTEX, EXT_SECONDARY_COLOR, EXT_STENCIL_TWO_SIDE, EXT_STENCIL_WRAP, @@ -3634,6 +3646,8 @@ typedef enum _GL_SupportedExt { /* GL_EXT_point_parameters */ \ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFEXTPROC, glPointParameterfEXT, EXT_POINT_PARAMETERS, NULL )\ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVEXTPROC, glPointParameterfvEXT, EXT_POINT_PARAMETERS, NULL )\ + /* GL_EXT_provoking_vertex */ \ + USE_GL_FUNC(PGLFNGLPROVOKINGVERTEXEXTPROC, glProvokingVertexEXT, EXT_PROVOKING_VERTEX, NULL)\ /* GL_EXT_secondary_color */ \ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3UBEXTPROC, glSecondaryColor3ubEXT, EXT_SECONDARY_COLOR, NULL )\ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3UBVEXTPROC, glSecondaryColor3ubvEXT, EXT_SECONDARY_COLOR, NULL )\

1 0

Henri Verbeet : wined3d: Properly handle negative loop step in shader_glsl_loop().
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 8d746c31bacd8e76d01c8c53c4033289aa18b269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d746c31bacd8e76d01c8c53c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 10 09:30:48 2009 +0200 wined3d: Properly handle negative loop step in shader_glsl_loop(). --- dlls/wined3d/arb_program_shader.c | 11 +-------- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 7 ++++++ 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4ed57a0..c7eeb8f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -91,13 +91,6 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) /* ARB_program_shader private data */ -struct loop_control -{ - unsigned int count; - unsigned int start; - int step; -}; - struct control_frame { struct list entry; @@ -115,7 +108,7 @@ struct control_frame unsigned int loop_no; unsigned int ifc_no; }; - struct loop_control loop_control; + struct wined3d_shader_loop_control loop_control; BOOL had_else; }; @@ -4686,7 +4679,7 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, } static void get_loop_control_const(const struct wined3d_shader_instruction *ins, - IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control) + IWineD3DBaseShaderImpl *This, UINT idx, struct wined3d_shader_loop_control *loop_control) { struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1239b0a..0f5871e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2485,22 +2485,33 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) } } - if(control_values) { - if(control_values[2] > 0) { - shader_addline(ins->ctx->buffer, "for (aL%u = %d; aL%u < (%d * %d + %d); aL%u += %d) {\n", - shader->baseShader.cur_loop_depth, control_values[1], - shader->baseShader.cur_loop_depth, control_values[0], control_values[2], control_values[1], - shader->baseShader.cur_loop_depth, control_values[2]); - } else if(control_values[2] == 0) { - shader_addline(ins->ctx->buffer, "for (aL%u = %d, tmpInt%u = 0; tmpInt%u < %d; tmpInt%u++) {\n", - shader->baseShader.cur_loop_depth, control_values[1], shader->baseShader.cur_loop_depth, - shader->baseShader.cur_loop_depth, control_values[0], + if (control_values) + { + struct wined3d_shader_loop_control loop_control; + loop_control.count = control_values[0]; + loop_control.start = control_values[1]; + loop_control.step = (int)control_values[2]; + + if (loop_control.step > 0) + { + shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d) {\n", + shader->baseShader.cur_loop_depth, loop_control.start, + shader->baseShader.cur_loop_depth, loop_control.count, loop_control.step, loop_control.start, + shader->baseShader.cur_loop_depth, loop_control.step); + } + else if (loop_control.step < 0) + { + shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d) {\n", + shader->baseShader.cur_loop_depth, loop_control.start, + shader->baseShader.cur_loop_depth, loop_control.count, loop_control.step, loop_control.start, + shader->baseShader.cur_loop_depth, loop_control.step); + } + else + { + shader_addline(ins->ctx->buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++) {\n", + shader->baseShader.cur_loop_depth, loop_control.start, shader->baseShader.cur_loop_depth, + shader->baseShader.cur_loop_depth, loop_control.count, shader->baseShader.cur_loop_depth); - } else { - shader_addline(ins->ctx->buffer, "for (aL%u = %d; aL%u > (%d * %d + %d); aL%u += %d) {\n", - shader->baseShader.cur_loop_depth, control_values[1], - shader->baseShader.cur_loop_depth, control_values[0], control_values[2], control_values[1], - shader->baseShader.cur_loop_depth, control_values[2]); } } else { shader_addline(ins->ctx->buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d791092..0e01b09 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -725,6 +725,13 @@ struct wined3d_shader_attribute UINT usage_idx; }; +struct wined3d_shader_loop_control +{ + unsigned int count; + unsigned int start; + int step; +}; + struct wined3d_shader_frontend { void *(*shader_init)(const DWORD *ptr, const struct wined3d_shader_signature *output_signature);

1 0

Vladimir Pankratov : shdocvw: Fix format parameter type.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 3bc4e67f9e0fb93d244b7a71388fa62a97e2588d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc4e67f9e0fb93d244b7a713… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Aug 10 12:12:00 2009 +0500 shdocvw: Fix format parameter type. --- dlls/shdocvw/frame.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/frame.c b/dlls/shdocvw/frame.c index dd90499..eeff20a 100644 --- a/dlls/shdocvw/frame.c +++ b/dlls/shdocvw/frame.c @@ -135,7 +135,7 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { DocHost *This = INPLACEFRAME_THIS(iface); - FIXME("(%p)->(%p)\n", This, debugstr_w(pszStatusText)); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added IHTMLLocation::get_pathname implementation.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 2ca7683dfb03a286ec09f3d3d4039a9e844db78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca7683dfb03a286ec09f3d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 9 15:56:10 2009 +0200 mshtml: Added IHTMLLocation::get_pathname implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmllocation.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 5 +++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index acda821..7f44bb1 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -6,6 +6,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 EXTRADEFS = -DCOM_NO_WINDOWS_H +DELAYIMPORTS = wininet C_SRCS = \ conpoint.c \ diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 35f042a..e2001bb 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -23,7 +23,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" +#include "wininet.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -195,8 +198,41 @@ static HRESULT WINAPI HTMLLocation_put_pathname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + WCHAR buf[INTERNET_MAX_PATH_LENGTH]; + URL_COMPONENTSW url = {sizeof(url)}; + DWORD size = 0; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc || !This->doc->url) { + FIXME("No current URL\n"); + return E_NOTIMPL; + } + + hres = CoInternetParseUrl(This->doc->url, PARSE_PATH_FROM_URL, 0, buf, sizeof(buf), &size, 0); + if(SUCCEEDED(hres)) { + *p = SysAllocString(buf); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; + } + + url.dwUrlPathLength = 1; + if(!InternetCrackUrlW(This->doc->url, 0, 0, &url)) { + FIXME("InternetCrackUrl failed\n"); + return E_FAIL; + } + + if(!url.dwUrlPathLength) { + *p = NULL; + return S_OK; + } + + *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_search(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4846848..87581f1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2383,6 +2383,7 @@ static void test_location(IHTMLDocument2 *doc) { IHTMLLocation *location, *location2; IHTMLWindow2 *window; + BSTR str; ULONG ref; HRESULT hres; @@ -2406,6 +2407,10 @@ static void test_location(IHTMLDocument2 *doc) test_ifaces((IUnknown*)location, location_iids); test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation); + hres = IHTMLLocation_get_pathname(location, &str); + ok(hres == S_OK, "get_pathname failed: %08x\n", hres); + ok(!strcmp_wa(str, "blank"), "unexpected pathname %s\n", dbgstr_w(str)); + ref = IHTMLLocation_Release(location); ok(!ref, "location chould be destroyed here\n"); }

1 0

Vincent Povirk : windowscodecs: Fix copy_pixels when Y != 0.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 3d1bb79983ed146f0ffbec8a548fb9f36fb49e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1bb79983ed146f0ffbec8a5… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Aug 8 22:29:15 2009 -0500 windowscodecs: Fix copy_pixels when Y != 0. --- dlls/windowscodecs/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index ac63603..7ec5d41 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -76,7 +76,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, const BYTE *src; BYTE *dst; - src = srcbuffer + (row_offset / 8); + src = srcbuffer + (row_offset / 8) + srcstride * rc->Y; dst = dstbuffer; for (row=0; row < rc->Height; row++) {

1 0

Vincent Povirk : include: Add IWICStream to headers.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: c3ce7b5d636a7c75bfbe9066bde9ee70c87c6541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ce7b5d636a7c75bfbe9066b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 3 08:52:52 2009 -0500 include: Add IWICStream to headers. --- include/wincodec.idl | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4925e01..40e69eb 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -143,7 +143,6 @@ interface IWICFormatConverter; interface IWICBitmapScaler; interface IWICBitmapClipper; interface IWICBitmapFlipRotator; -interface IWICStream; interface IWICColorContext; interface IWICColorTransform; interface IWICFastMetadataEncoder; @@ -401,6 +400,29 @@ interface IWICBitmapDecoder : IUnknown [out] IWICBitmapFrameDecode **ppIBitmapFrame); } +[ + object, + uuid(135ff860-22b7-4ddf-b0f6-218f4f299a43) +] +interface IWICStream : IStream +{ + HRESULT InitializeFromIStream( + [in] IStream *pIStream); + + HRESULT InitializeFromFilename( + [in] LPCWSTR wzFileName, + [in] DWORD dwAccessMode); + + HRESULT InitializeFromMemory( + [in, size_is(cbBufferSize)] BYTE *pbBuffer, + [in] DWORD cbBufferSize); + + HRESULT InitializeFromIStreamRegion( + [in] IStream *pIStream, + [in] ULARGE_INTEGER ulOffset, + [in] ULARGE_INTEGER ulMaxSize); +} + cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") [

1 0

Jacek Caban : shdocvw: Check GetContainer result before setting new container.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 52bade97f46e99331800a4fbe5f4a80300d196d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bade97f46e99331800a4fbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 19:02:31 2009 +0200 shdocvw: Check GetContainer result before setting new container. --- dlls/shdocvw/oleobject.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 017e738..c42aa91 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -152,8 +152,16 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) SWP_NOZORDER | SWP_SHOWWINDOW); if(This->client) { + IOleContainer *container; + IOleClientSite_ShowObject(This->client); - IOleClientSite_GetContainer(This->client, &This->container); + + hres = IOleClientSite_GetContainer(This->client, &container); + if(SUCCEEDED(hres)) { + if(This->container) + IOleContainer_Release(This->container); + This->container = container; + } } if(This->doc_host.frame)

1 0