wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Henri Verbeet : ddraw: Fix the parameter names for the various Flip() functions.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 4e02cc3a8663e3493e50ed8f0ef92887842ac40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e02cc3a8663e3493e50ed8f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:07 2016 +0200 ddraw: Fix the parameter names for the various Flip() functions. The "dst" surface is the source, not the destination. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d914b2f..796e387 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1345,51 +1345,51 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, - IDirectDrawSurface4 *dst, DWORD flags) + IDirectDrawSurface4 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface4(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, - IDirectDrawSurface3 *dst, DWORD flags) + IDirectDrawSurface3 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, - IDirectDrawSurface2 *dst, DWORD flags) + IDirectDrawSurface2 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, - IDirectDrawSurface *dst, DWORD flags) + IDirectDrawSurface *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, const RECT *dst_rect_in,

1 0

Henri Verbeet : wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt ().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 82044bc9192c26aba8399785be0da38e2ebf7cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82044bc9192c26aba8399785b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:06 2016 +0200 wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt(). Note that we return immediately. The textures aren't mapped yet here, so we shouldn't try to unmap them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8463666..367bd95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3408,9 +3408,9 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { - /* The conv function writes a FIXME */ - WARN("Cannot convert source surface format to dest format.\n"); - goto release; + FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_texture->resource.format->id)); + return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture; src_sub_resource_idx = 0;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_upload_data().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: aaca15f17278d94287ef5c0af9c7e9e25e5f05f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaca15f17278d94287ef5c0af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:05 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 34 ++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 121a8ee..fd7f818 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3601,7 +3601,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, data.buffer_object = 0; data.addr = src.data; - wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data); + wined3d_volume_upload_data(dst_texture, i, context, &data); wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f1896fd..eb0ad2f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1992,7 +1992,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int addr.buffer_object = 0; addr.addr = data->data; - wined3d_volume_upload_data(texture->sub_resources[sub_resource_idx].u.volume, context, &addr); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &addr); } static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3106ac7..f59f963 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -30,23 +30,22 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, - const struct wined3d_const_bo_address *data) +void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = volume->container; const struct wined3d_format *format = texture->resource.format; + unsigned int level = sub_resource_idx % texture->level_count; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int width, height, depth; const void *mem = data->addr; void *converted_mem = NULL; - TRACE("volume %p, context %p, level %u, format %s (%#x).\n", - volume, context, volume->texture_level, debug_d3dformat(format->id), - format->id); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s (%#x).\n", + texture, level, context, debug_d3dformat(format->id), format->id); - width = wined3d_texture_get_level_width(texture, volume->texture_level); - height = wined3d_texture_get_level_height(texture, volume->texture_level); - depth = wined3d_texture_get_level_depth(texture, volume->texture_level); + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); + depth = wined3d_texture_get_level_depth(texture, level); if (format->convert) { @@ -54,14 +53,14 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine UINT src_row_pitch, src_slice_pitch; if (data->buffer_object) - ERR("Loading a converted volume from a PBO.\n"); + ERR("Loading a converted texture from a PBO.\n"); if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch, @@ -75,9 +74,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine checkGLcall("glBindBuffer"); } - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - width, height, depth, - format->glFormat, format->glType, mem)); + GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, 0, 0, 0, + width, height, depth, format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -163,7 +161,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); wined3d_volume_download_data(volume, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - wined3d_volume_upload_data(volume, context, wined3d_const_bo_address(&data)); + wined3d_volume_upload_data(texture, volume->texture_level, context, wined3d_const_bo_address(&data)); HeapFree(GetProcessHeap(), 0, data.addr); } @@ -215,14 +213,14 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, data.addr += sub_resource->offset; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(volume, context, &data); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(volume, context, &data); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c19e7e..099d1ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,8 @@ struct wined3d_volume BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, - const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; struct wined3d_renderbuffer_entry {

1 0

Henri Verbeet : wined3d: No longer make sub-resources full resources.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 17768e567bdb03c676bc62c3b40739c4536c43a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17768e567bdb03c676bc62c3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:04 2016 +0200 wined3d: No longer make sub-resources full resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 ----- dlls/wined3d/directx.c | 6 --- dlls/wined3d/surface.c | 116 ----------------------------------------- dlls/wined3d/texture.c | 92 ++++++++++++++++---------------- dlls/wined3d/utils.c | 2 - dlls/wined3d/volume.c | 72 ------------------------- dlls/wined3d/wined3d_private.h | 21 -------- include/wine/wined3d.h | 8 ++- 8 files changed, 47 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17768e567bdb03c676bc6…

1 0

Henri Verbeet : wined3d: Try harder to print something reasonable in wined3d_debug_location().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 19bb2b1b7e350dc0180ddff4efbfea2b1fdd63de URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bb2b1b7e350dc0180ddff4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:03 2016 +0200 wined3d: Try harder to print something reasonable in wined3d_debug_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c0688b5..2eca094 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5456,8 +5456,17 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) const char *wined3d_debug_location(DWORD location) { + const char *prefix = ""; + const char *suffix = ""; char buf[294]; + if (wined3d_popcount(location) > 16) + { + prefix = "~("; + location = ~location; + suffix = ")"; + } + buf[0] = '\0'; #define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); @@ -5472,7 +5481,7 @@ const char *wined3d_debug_location(DWORD location) #undef LOCATION_TO_STR if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s%s%s", prefix, buf[0] ? &buf[3] : "0", suffix); } /* Print a floating point value with the %.8e format specifier, always using

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 870M.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 7c18fe17c76efd7d7a2b2648c48e5990c2ae780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c18fe17c76efd7d7a2b2648c… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 20 16:15:18 2016 +0000 wined3d: Add Nvidia GeForce GTX 870M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 3f80225..1bb7182 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1293,6 +1293,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1755,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7421368..7863c8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1801,6 +1801,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ + CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM*::CreateObject.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: c44d9dad3f76a62f7a85d8036c14989929639f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44d9dad3f76a62f7a85d8036… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Apr 20 20:40:09 2016 +0530 d3drm: Implement IDirect3DRM*::CreateObject. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index fe33315..edb46df 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -139,10 +139,12 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, @@ -603,10 +605,12 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, @@ -1054,10 +1058,50 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + IUnknown *object; + HRESULT hr; + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + if (!out) + return D3DRMERR_BADVALUE; + + if (!clsid || !iid) + { + *out = NULL; + return D3DRMERR_BADVALUE; + } + + if (outer) + { + FIXME("COM aggregation for outer IUnknown (%p) not implemented. Returning E_NOTIMPL.\n", outer); + *out = NULL; + return E_NOTIMPL; + } + + if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + { + struct d3drm_texture *texture; + if (FAILED(hr = d3drm_texture_create(&texture))) + { + *out = NULL; + return hr; + } + object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; + } + else + { + FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); + *out = NULL; + return CLASSFACTORY_E_FIRST; + } + + if (FAILED(hr = IUnknown_QueryInterface(object, iid, out))) + *out = NULL; + IUnknown_Release(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a8f9c40..9f6eaab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1353,23 +1353,24 @@ static void test_object(void) { REFCLSID clsid; REFIID iid; + BOOL todo; } tests[] = { - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2 }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3 }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2 }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice, TRUE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3, FALSE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport, TRUE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2, TRUE }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; IDirect3DRM3 *d3drm3; - IUnknown *unknown; + IUnknown *unknown = (IUnknown *)0xdeadbeef; HRESULT hr; ULONG ref1, ref2, ref3, ref4; int i; @@ -1382,17 +1383,26 @@ static void test_object(void) hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown); + ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + todo_wine_if(tests[i].todo) + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); if (SUCCEEDED(hr)) { ref2 = get_refcount((IUnknown *)d3drm1);

1 0

Michael Stefaniuc : shell32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 816df88a77d1f4847e0cc5ddb5e5ec22dbed43c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816df88a77d1f4847e0cc5ddb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:58:01 2016 +0200 shell32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 5dfdd08..694b5d1 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem( Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- %s\n", wine_dbgstr_rect(&TextRect)); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -794,8 +794,8 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", - rect.right, rect.left, rect.top, rect.bottom); + { + FIXME("%s\n", wine_dbgstr_rect(&rect)); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } return 0x00100010; /*FIXME*/

1 0

Michael Stefaniuc : comdlg32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 69f6493a8c74534b29a6b49990b2360b32054c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f6493a8c74534b29a6b4999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:51:07 2016 +0200 comdlg32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 344a356..ed2615d 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1173,9 +1173,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); hdc = BeginPaint( hDlg, &ps ); - TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase, - ps.rcPaint.left, ps.rcPaint.top, - ps.rcPaint.right, ps.rcPaint.bottom); + TRACE("erase %d, rect=%s\n", ps.fErase, wine_dbgstr_rect(&ps.rcPaint)); /* Paint frame */ DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );

1 0

Michael Stefaniuc : uxtheme: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 3c3fccacf021a036713619786b5cc7355bbceedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3fccacf021a036713619786… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:46:02 2016 +0200 uxtheme: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index e3d3679..730a26c 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1747,7 +1747,7 @@ HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME hTheme, HDC hdc, int iPartId /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pContentRect)); return S_OK; } @@ -1795,7 +1795,7 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pExtentRect)); return S_OK; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
75
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 2016