wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Stefan Dösinger : wined3d: Move alpha test states to the fragment pipeline.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 5c7707dc775235ec98ada59dc196c33ca2000600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7707dc775235ec98ada59dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:16 2015 +0200 wined3d: Move alpha test states to the fragment pipeline. This will allow some color keying cleanups. For Core Contexts we'll have to emulate alpha testing in shaders anyway. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 4 ++++ dlls/wined3d/nvidia_texture_shader.c | 4 ++++ dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 25 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c7707dc775235ec98ada…

1 0

Stefan Dösinger : wined3d: Match blitter and fragment processing color keying capabilities.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: f4b6874491df5b4d89012231cd9e7813c7d0e105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b6874491df5b4d89012231c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:15 2015 +0200 wined3d: Match blitter and fragment processing color keying capabilities. This is necessary if e.g. the nvts or ffp fragment processing pipeline is selected for debugging purposes on a GPU that otherwise supports the ARB program blitter. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/surface.c | 22 +++++++++++++++------- dlls/wined3d/utils.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d7d975..e7c5ea2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7716,7 +7716,8 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -7727,8 +7728,14 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (!d3d_info->shader_color_key) + { + /* The conversion modifies the alpha channel so the color key might no longer match. */ + TRACE("Color keying not supported with converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: break; default: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1539476..01048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4378,7 +4378,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->blit_supported(&adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, + WINED3D_BLIT_OP_COLOR_BLIT, NULL, WINED3D_POOL_DEFAULT, 0, check_format, NULL, WINED3D_POOL_DEFAULT, 0, adapter_format)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5bcbfd4..5094af3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1050,7 +1050,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const struct wined3d_device *device = resource->device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_DEPTH_FILL, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format); if (!blitter) { @@ -3445,7 +3445,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st struct wined3d_device *device = s->resource.device; const struct blit_shader *blitter; - blitter = wined3d_select_blitter(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_FILL, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, rect, s->resource.usage, s->resource.pool, s->resource.format); if (!blitter) { @@ -3463,6 +3463,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain *src_swapchain, *dst_swapchain; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", @@ -3591,7 +3592,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + if (!device->blitter->blit_supported(gl_info, d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { @@ -4318,14 +4319,20 @@ static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) } } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { switch (blit_op) { - case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + if (d3d_info->shader_color_key) + { + TRACE("Color keying requires converted textures.\n"); + return FALSE; + } + case WINED3D_BLIT_OP_COLOR_BLIT: if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) return FALSE; @@ -4447,7 +4454,8 @@ static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } -static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -5367,7 +5375,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } - if (arbfp_blit.blit_supported(&device->adapter->gl_info, blit_op, + if (arbfp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d9f88a..2f21b29 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4194,7 +4194,8 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { @@ -4208,7 +4209,7 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { - if (blitters[i]->blit_supported(gl_info, blit_op, + if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op, src_rect, src_usage, src_pool, src_format, dst_rect, dst_usage, dst_pool, dst_format)) return blitters[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 155b171..7747c55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1340,7 +1340,8 @@ struct blit_shader HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key); void (*unset_shader)(const struct wined3d_gl_info *gl_info); - BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, + BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_surface *dst_surface, @@ -1353,7 +1354,8 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, +const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Implement color keying in the glsl fragment pipeline.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 5d51c97d07b57307912267996586d05528f652a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d51c97d07b57307912267996… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:54 2015 +0200 wined3d: Implement color keying in the glsl fragment pipeline. --- dlls/ddraw/tests/ddraw1.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw2.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw4.c | 22 ++++++---------------- dlls/ddraw/tests/ddraw7.c | 22 ++++++---------------- dlls/wined3d/arb_program_shader.c | 25 +++++++++---------------- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 +++ dlls/wined3d/texture.c | 18 ++++++++++++------ dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 10 +++++++--- 12 files changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d51c97d07b5730791226…

1 0

Stefan Dösinger : wined3d: Implement color keying in arbfp_blit.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 2d56694445a58ee94d8ac46eac569bec3f53f161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d56694445a58ee94d8ac46ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 10 12:05:53 2015 +0200 wined3d: Implement color keying in arbfp_blit. --- dlls/wined3d/arb_program_shader.c | 68 +++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 51 +++++++++++++++++++---------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++-- 4 files changed, 99 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d56694445a58ee94d8ac…

1 0

Stefan Dösinger : wined3d: Allow ARB blits from converted surfaces.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 439076d591fbf7f4e830be447c1abdbf6472a0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439076d591fbf7f4e830be447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:12 2015 +0200 wined3d: Allow ARB blits from converted surfaces. --- dlls/wined3d/arb_program_shader.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 091ae1d..79439f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7572,13 +7572,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) - { - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - if (is_complex_fixup(surface->resource.format->color_fixup)) fixup = get_complex_fixup(surface->resource.format->color_fixup); else @@ -7644,8 +7637,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7686,18 +7677,6 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } } static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op,

1 0

Stefan Dösinger : wined3d: Set color keys through the command stream.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 82db5954c49d9de1db3dad200d6dc39316820698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82db5954c49d9de1db3dad200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:11 2015 +0200 wined3d: Set color keys through the command stream. --- dlls/wined3d/cs.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 16 ++++---- dlls/wined3d/texture.c | 81 ++++++++++++++-------------------------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 25 +++++++++---- 6 files changed, 140 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82db5954c49d9de1db3da…

1 0

Maxime Lombard : wined3d: Add support for Nvidia GTX 970M.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 086d2af6299be6fd17d2c36ddbdf120faf7fefad URL: http://source.winehq.org/git/wine.git/?a=commit;h=086d2af6299be6fd17d2c36dd… Author: Maxime Lombard <berillions(a)gmail.com> Date: Thu Apr 9 20:09:23 2015 +0200 wined3d: Add support for Nvidia GTX 970M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13061f4..9412adb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1271,6 +1271,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1698,6 +1699,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d736dd..f9e0100 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,6 +1575,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, + CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Aaryaman Vasishta : d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 1b1d77268f725f12e175c3a919e8b981e6d199b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d77268f725f12e175c3a91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:33 2015 +0530 d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface. --- dlls/d3drm/frame.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ea7cfc8..39c2e7b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -472,6 +472,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &frame->IDirect3DRMFrame2_iface;

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMFrame2:: QueryInterface returning incorrect HRESULT.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 415b7c1feca042a416120d68f356e9862dcd1ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415b7c1feca042a416120d68f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:32 2015 +0530 d3drm: Fix IDirect3DRMFrame2::QueryInterface returning incorrect HRESULT. --- dlls/d3drm/frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 20acf56..ea7cfc8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -483,8 +483,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Bruno Jesus : include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: fbde8fc0f0f6d341a8ef7eef2b30e67238a40979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbde8fc0f0f6d341a8ef7eef2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Apr 10 00:35:51 2015 -0300 include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure. --- include/iptypes.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 997388e..fc9f860 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -199,7 +199,7 @@ typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; #define IP_ADAPTER_IPV6_ENABLED 0x100 #define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200 -typedef struct _IP_ADAPTER_ADDRESSES { +typedef struct _IP_ADAPTER_ADDRESSES_LH { union { ULONGLONG Alignment; struct { @@ -207,7 +207,7 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD IfIndex; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_ADDRESSES *Next; + struct _IP_ADAPTER_ADDRESSES_LH *Next; PCHAR AdapterName; PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; @@ -241,7 +241,38 @@ typedef struct _IP_ADAPTER_ADDRESSES { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; -} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +} IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; + +typedef struct _IP_ADAPTER_ADDRESSES_XP { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD IfIndex; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ADDRESSES_XP *Next; + PCHAR AdapterName; + PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; + PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; + PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress; + PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress; + PWCHAR DnsSuffix; + PWCHAR Description; + PWCHAR FriendlyName; + BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; + DWORD PhysicalAddressLength; + DWORD Flags; + DWORD Mtu; + DWORD IfType; + IF_OPER_STATUS OperStatus; + DWORD Ipv6IfIndex; + DWORD ZoneIndices[16]; + PIP_ADAPTER_PREFIX FirstPrefix; +} IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; + +#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH +#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
46
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 April 2015