wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

Henri Verbeet : wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 694cdcc41cc74eff8c1d96ac0e18895862b22476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694cdcc41cc74eff8c1d96ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:28 2014 +0200 wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource. Like "draw_binding". --- dlls/wined3d/surface.c | 74 +++++++++++++++++++++--------------------- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=694cdcc41cc74eff8c1d9…

1 0

Henri Verbeet : wined3d: Explicitly destroy the surface in texture2d_sub_resource_cleanup().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: ed230a426adbc5e376f9ce7f00c2113b19f3ea59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed230a426adbc5e376f9ce7f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:27 2014 +0200 wined3d: Explicitly destroy the surface in texture2d_sub_resource_cleanup(). Like volumes. We can do this now because we no longer have standalone surfaces. --- dlls/wined3d/surface.c | 58 ++++++++++++------------------------------ dlls/wined3d/texture.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8fa477..d8ee07f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -103,6 +103,15 @@ static void surface_cleanup(struct wined3d_surface *surface) resource_cleanup(&surface->resource); } +void wined3d_surface_destroy(struct wined3d_surface *surface) +{ + TRACE("surface %p.\n", surface); + + surface_cleanup(surface); + surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); + HeapFree(GetProcessHeap(), 0, surface); +} + void surface_update_draw_binding(struct wined3d_surface *surface) { if (!surface_is_offscreen(surface) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -151,14 +160,6 @@ void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapc surface_update_draw_binding(surface); } -void surface_set_container(struct wined3d_surface *surface, struct wined3d_texture *container) -{ - TRACE("surface %p, container %p.\n", surface, container); - - surface->container = container; - surface_update_draw_binding(surface); -} - struct blt_info { GLenum binding; @@ -2135,49 +2136,24 @@ static inline unsigned short float_32_to_16(const float *in) ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface) { - ULONG refcount; - TRACE("surface %p, swapchain %p, container %p.\n", surface, surface->swapchain, surface->container); if (surface->swapchain) return wined3d_swapchain_incref(surface->swapchain); - if (surface->container) - return wined3d_texture_incref(surface->container); - - refcount = InterlockedIncrement(&surface->resource.ref); - TRACE("%p increasing refcount to %u.\n", surface, refcount); - - return refcount; + return wined3d_texture_incref(surface->container); } ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) { - ULONG refcount; - TRACE("surface %p, swapchain %p, container %p.\n", surface, surface->swapchain, surface->container); if (surface->swapchain) return wined3d_swapchain_decref(surface->swapchain); - if (surface->container) - return wined3d_texture_decref(surface->container); - - refcount = InterlockedDecrement(&surface->resource.ref); - TRACE("%p decreasing refcount to %u.\n", surface, refcount); - - if (!refcount) - { - surface_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - - TRACE("Destroyed surface %p.\n", surface); - HeapFree(GetProcessHeap(), 0, surface); - } - - return refcount; + return wined3d_texture_decref(surface->container); } void CDECL wined3d_surface_preload(struct wined3d_surface *surface) @@ -6016,7 +5992,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - surface_set_container(surface, container); + surface->container = container; + surface_update_draw_binding(surface); surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); list_init(&surface->renderbuffers); list_init(&surface->overlays); @@ -6036,11 +6013,9 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->texture_level = level; /* Call the private setup routine */ - hr = surface->surface_ops->surface_private_setup(surface); - if (FAILED(hr)) + if (FAILED(hr = surface->surface_ops->surface_private_setup(surface))) { - ERR("Private setup failed, returning %#x\n", hr); - surface_set_container(surface, NULL); + ERR("Private setup failed, hr %#x.\n", hr); surface_cleanup(surface); return hr; } @@ -6091,8 +6066,7 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); - surface_set_container(object, NULL); - wined3d_surface_decref(object); + wined3d_surface_destroy(object); return hr; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 423dec8..392f84d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -742,8 +742,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_set_container(surface, NULL); - wined3d_surface_decref(surface); + wined3d_surface_destroy(surface); } static const struct wined3d_texture_ops texture2d_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20594e1..4c79ddb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2303,7 +2303,6 @@ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; -void surface_set_container(struct wined3d_surface *surface, struct wined3d_texture *container) DECLSPEC_HIDDEN; void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; @@ -2313,6 +2312,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, GLint level, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void wined3d_surface_destroy(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Explicitly destroy the volume in texture3d_sub_resource_cleanup().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 64a1fde181f6c26e80623e56c41f2768fc43f8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a1fde181f6c26e80623e56c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:26 2014 +0200 wined3d: Explicitly destroy the volume in texture3d_sub_resource_cleanup(). The texture always has the only reference to its subresources. This also means we never have to set the container to NULL. --- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/volume.c | 62 ++++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 20 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8beb9f8..423dec8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1064,9 +1064,7 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource { struct wined3d_volume *volume = volume_from_resource(sub_resource); - /* Cleanup the container. */ - volume_set_container(volume, NULL); - wined3d_volume_decref(volume); + wined3d_volume_destroy(volume); } static const struct wined3d_texture_ops texture3d_ops = diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 994cfc2..f1d09e5 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,13 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) -{ - TRACE("volume %p, container %p.\n", volume, container); - - volume->container = container; -} - static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) { if (volume->resource.heap_memory) @@ -461,6 +454,18 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) context_release(context); } +void wined3d_volume_destroy(struct wined3d_volume *volume) +{ + TRACE("volume %p.\n", volume); + + if (volume->pbo) + wined3d_volume_free_pbo(volume); + + resource_cleanup(&volume->resource); + volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); + HeapFree(GetProcessHeap(), 0, volume); +} + static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -504,46 +509,16 @@ static void volume_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) { - ULONG refcount; - - if (volume->container) - { - TRACE("Forwarding to container %p.\n", volume->container); - return wined3d_texture_incref(volume->container); - } - - refcount = InterlockedIncrement(&volume->resource.ref); - - TRACE("%p increasing refcount to %u.\n", volume, refcount); + TRACE("Forwarding to container %p.\n", volume->container); - return refcount; + return wined3d_texture_incref(volume->container); } ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { - ULONG refcount; - - if (volume->container) - { - TRACE("Forwarding to container %p.\n", volume->container); - return wined3d_texture_decref(volume->container); - } + TRACE("Forwarding to container %p.\n", volume->container); - refcount = InterlockedDecrement(&volume->resource.ref); - - TRACE("%p decreasing refcount to %u.\n", volume, refcount); - - if (!refcount) - { - if (volume->pbo) - wined3d_volume_free_pbo(volume); - - resource_cleanup(&volume->resource); - volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); - HeapFree(GetProcessHeap(), 0, volume); - } - - return refcount; + return wined3d_texture_decref(volume->container); } void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) @@ -846,7 +821,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture volume->flags |= WINED3D_VFLAG_PBO; } - volume_set_container(volume, container); + volume->container = container; return WINED3D_OK; } @@ -879,8 +854,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); - volume_set_container(object, NULL); - wined3d_volume_decref(object); + wined3d_volume_destroy(object); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9341b2f..20594e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2188,9 +2188,9 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; +void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Recognize some more AMD cards.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: df59ac1d0cae07095bc969f5c905416fc1865e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df59ac1d0cae07095bc969f5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:25 2014 +0200 wined3d: Recognize some more AMD cards. --- dlls/wined3d/directx.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f1ba7b5..fe98bab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1323,9 +1323,16 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7660D, "AMD Radeon HD 7660D", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8600M, "AMD Radeon HD 8600M Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8670, "AMD Radeon HD 8670", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, @@ -1996,11 +2003,19 @@ cards_intel[] = * These are returned but not handled: RC410, RV380. */ cards_amd_mesa[] = { + /* Sea Islands */ + {"HAWAII", CARD_AMD_RADEON_R9 }, + {"KAVERI", CARD_AMD_RADEON_R7 }, + {"KABINI", CARD_AMD_RADEON_R3 }, + {"BONAIRE", CARD_AMD_RADEON_HD8770}, /* Southern Islands */ + {"OLAND", CARD_AMD_RADEON_HD8670}, + {"HAINAN", CARD_AMD_RADEON_HD8600M}, {"TAHITI", CARD_AMD_RADEON_HD7900}, {"PITCAIRN", CARD_AMD_RADEON_HD7800}, {"CAPE VERDE", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ + {"ARUBA", CARD_AMD_RADEON_HD7660D}, {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, {"TURKS", CARD_AMD_RADEON_HD6600}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe0bf8..9341b2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1413,9 +1413,16 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6700 = 0x68ba, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, + CARD_AMD_RADEON_HD7660D = 0x9901, CARD_AMD_RADEON_HD7700 = 0x683d, CARD_AMD_RADEON_HD7800 = 0x6819, CARD_AMD_RADEON_HD7900 = 0x679a, + CARD_AMD_RADEON_HD8600M = 0x6660, + CARD_AMD_RADEON_HD8670 = 0x6610, + CARD_AMD_RADEON_HD8770 = 0x665c, + CARD_AMD_RADEON_R3 = 0x9830, + CARD_AMD_RADEON_R7 = 0x130f, + CARD_AMD_RADEON_R9 = 0x67b1, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Nikolay Sivov : wrc: Remove some always-true conditions (PVS-Studio).
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 08058c793f28989874661ada89264fb550fa6177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08058c793f28989874661ada8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 19 06:53:04 2014 +0400 wrc: Remove some always-true conditions (PVS-Studio). --- tools/wrc/translation.c | 98 ++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08058c793f28989874661…

1 0

Nikolay Sivov : dwrite: Use layout pointer as an argument instead of neutral list.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 7596dc633106bd664f0bd1f0b4dee139383fc037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7596dc633106bd664f0bd1f0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 19 06:22:56 2014 +0400 dwrite: Use layout pointer as an argument instead of neutral list. --- dlls/dwrite/layout.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7a4ac18..2ef7c9f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -239,20 +239,20 @@ static void free_layout_range(struct layout_range *range) heap_free(range); } -static void free_layout_ranges_list(struct list *ranges) +static void free_layout_ranges_list(struct dwrite_textlayout *layout) { struct layout_range *cur, *cur2; - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->ranges, struct layout_range, entry) { list_remove(&cur->entry); free_layout_range(cur); } } -static struct layout_range *find_outer_range(struct list *ranges, const DWRITE_TEXT_RANGE *range) +static struct layout_range *find_outer_range(struct dwrite_textlayout *layout, const DWRITE_TEXT_RANGE *range) { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { if (cur->range.startPosition > range->startPosition) return NULL; @@ -267,11 +267,11 @@ static struct layout_range *find_outer_range(struct list *ranges, const DWRITE_T return NULL; } -static struct layout_range *get_layout_range_by_pos(struct list *ranges, UINT32 pos) +static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos) { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { DWRITE_TEXT_RANGE *r = &cur->range; if (r->startPosition <= pos && pos < r->startPosition + r->length) return cur; @@ -339,7 +339,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo DWRITE_TEXT_RANGE r; /* If new range is completely within existing range, split existing range in two */ - if ((outer = find_outer_range(ranges, &value->range))) { + if ((outer = find_outer_range(layout, &value->range))) { /* no need to add same range */ if (is_same_layout_attrvalue(outer, attr, value)) @@ -401,7 +401,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo /* Now it's only possible that given range contains some existing ranges, fully or partially. Update all of them. */ - left = get_layout_range_by_pos(ranges, value->range.startPosition); + left = get_layout_range_by_pos(layout, value->range.startPosition); if (left->range.startPosition == value->range.startPosition) changed = set_layout_range_attrval(left, attr, value); else /* need to split */ { @@ -490,7 +490,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - free_layout_ranges_list(&This->ranges); + free_layout_ranges_list(This); release_format_data(&This->format); heap_free(This->str); heap_free(This); @@ -900,7 +900,7 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout *i if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *weight = range->weight; if (r) *r = range->range; @@ -918,7 +918,7 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontStyle(IDWriteTextLayout *if if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *style = range->style; if (r) *r = range->range; @@ -952,7 +952,7 @@ static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout *iface, if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *underline = range->underline; if (r) *r = range->range; @@ -970,7 +970,7 @@ static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout *iface if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *strikethrough = range->strikethrough; if (r) *r = range->range; @@ -988,7 +988,7 @@ static HRESULT WINAPI dwritetextlayout_GetDrawingEffect(IDWriteTextLayout *iface if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *effect = range->effect; if (*effect) IUnknown_AddRef(*effect); @@ -1005,7 +1005,7 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout *iface, TRACE("(%p)->(%u %p %p)\n", This, position, object, r); - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *object = range ? range->object : NULL; if (*object) IDWriteInlineObject_AddRef(*object);

1 0

Francois Gouget : shell32: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 0f3728a692c63131617d939ec25b49b66ab8c588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3728a692c63131617d939ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:26:22 2014 +0200 shell32: Add a trailing '\n' to a FIXME(). --- dlls/shell32/shellitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 3c2bd50..b5d70dc 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1054,7 +1054,7 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, TRACE("%p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); if(AttribFlags & ~(SIATTRIBFLAGS_AND|SIATTRIBFLAGS_OR)) - FIXME("%08x contains unsupported attribution flags", AttribFlags); + FIXME("%08x contains unsupported attribution flags\n", AttribFlags); for(i = 0; i < This->item_count; i++) {

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to a couple of win_skip() calls.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: c1d592876af9a51a3ff3540595f1571c558ffb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d592876af9a51a3ff354059… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:26:15 2014 +0200 shell32/tests: Add a trailing '\n' to a couple of win_skip() calls. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a583d49..fc37443 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3739,7 +3739,7 @@ static void test_ShellItemArrayEnumItems(void) if(!pSHCreateShellItemArray) { - win_skip("No SHCreateShellItemArray, skipping test.."); + win_skip("No SHCreateShellItemArray, skipping test...\n"); return; } @@ -4157,7 +4157,7 @@ static void test_ShellItemArrayGetAttributes(void) if(!pSHCreateShellItemArrayFromShellItem) { - win_skip("No SHCreateShellItemArrayFromShellItem, skipping test.."); + win_skip("No SHCreateShellItemArrayFromShellItem, skipping test...\n"); return; }

1 0

Francois Gouget : rsaenh/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 37456407901300798367bf67ecd65301d4514c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37456407901300798367bf67e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:25:49 2014 +0200 rsaenh/tests: Add a trailing '\n' to some ok() calls. --- dlls/rsaenh/tests/rsaenh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 41b51c1..5192c2f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1536,10 +1536,10 @@ static void test_rc2(void) dwLen = sizeof(dwKeyLen); result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56 || broken(dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); dwKeyLen = 128; @@ -1550,7 +1550,7 @@ static void test_rc2(void) dwKeyLen = 12345; ok(result, "expected success, got error 0x%08X\n", GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 128, "Expected 128, got %d\n", dwKeyLen); } else @@ -1558,16 +1558,16 @@ static void test_rc2(void) ok(!result, "expected error\n"); ok(GetLastError() == NTE_BAD_DATA, "Expected 0x80009005, got 0x%08X\n", GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 40, "Expected 40, got %d\n", dwKeyLen); } dwLen = sizeof(dwKeyLen); result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError());

1 0

Vincent Povirk : mscoree: Factor out common code for calling .NET methods.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 1986e496c79915a14beac3050bef371a97ab0296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1986e496c79915a14beac3050… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 13 17:05:44 2014 -0500 mscoree: Factor out common code for calling .NET methods. --- dlls/mscoree/corruntimehost.c | 235 ++++++++++++++++-------------------------- 1 file changed, 91 insertions(+), 144 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b44fb6a..ce73134 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -153,23 +153,25 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) LeaveCriticalSection(&This->lock); } -static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) +static HRESULT RuntimeHost_Invoke(RuntimeHost *This, MonoDomain *domain, + const char *assemblyname, const char *namespace, const char *typename, const char *methodname, + MonoObject *obj, void **args, int arg_count, MonoObject **result) { - HRESULT hr; - void *args[1]; MonoAssembly *assembly; MonoImage *image; MonoClass *klass; MonoMethod *method; - MonoObject *appdomain_object; - IUnknown *unk; + MonoObject *exc; + static const char *get_hresult = "get_HResult"; + + *result = NULL; mono_thread_attach(domain); - assembly = mono_domain_assembly_open(domain, "mscorlib"); + assembly = mono_domain_assembly_open(domain, assemblyname); if (!assembly) { - ERR("Cannot load mscorlib\n"); + ERR("Cannot load assembly\n"); return E_FAIL; } @@ -180,29 +182,57 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d return E_FAIL; } - klass = mono_class_from_name(image, "System", "AppDomain"); + klass = mono_class_from_name(image, namespace, typename); if (!klass) { ERR("Couldn't get class from image\n"); return E_FAIL; } - method = mono_class_get_method_from_name(klass, "get_CurrentDomain", 0); + method = mono_class_get_method_from_name(klass, methodname, arg_count); if (!method) { ERR("Couldn't get method from class\n"); return E_FAIL; } - args[0] = NULL; - appdomain_object = mono_runtime_invoke(method, NULL, args, NULL); - if (!appdomain_object) + *result = mono_runtime_invoke(method, obj, args, &exc); + if (exc) { - ERR("Couldn't get result pointer\n"); - return E_FAIL; + HRESULT hr; + MonoObject *hr_object; + + if (methodname != get_hresult) + { + /* Map the exception to an HRESULT. */ + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Exception", get_hresult, + exc, NULL, 0, &hr_object); + if (SUCCEEDED(hr)) + hr = *(HRESULT*)mono_object_unbox(hr_object); + if (SUCCEEDED(hr)) + hr = E_FAIL; + } + else + hr = E_FAIL; + ERR("Method %s.%s raised an exception, hr=%x\n", namespace, typename, hr); + *result = NULL; + return hr; } - hr = RuntimeHost_GetIUnknownForObject(This, appdomain_object, &unk); + return S_OK; +} + +static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) +{ + HRESULT hr; + MonoObject *appdomain_object; + IUnknown *unk; + + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "get_CurrentDomain", + NULL, NULL, 0, &appdomain_object); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetIUnknownForObject(This, appdomain_object, &unk); if (SUCCEEDED(hr)) { @@ -219,10 +249,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) HRESULT hr; void *args[2]; MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; + MonoObject *dummy; hr = RuntimeHost_GetDefaultDomain(This, &domain); if (FAILED(hr)) @@ -231,39 +258,10 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) return; } - mono_thread_attach(domain); - - assembly = mono_domain_assembly_open(domain, "mscorlib"); - if (!assembly) - { - ERR("Cannot load mscorlib\n"); - return; - } - - image = mono_assembly_get_image(assembly); - if (!image) - { - ERR("Couldn't get assembly image\n"); - return; - } - - klass = mono_class_from_name(image, "System", "Environment"); - if (!klass) - { - ERR("Couldn't get class from image\n"); - return; - } - - method = mono_class_get_method_from_name(klass, "Exit", 1); - if (!method) - { - ERR("Couldn't get method from class\n"); - return; - } - args[0] = &exitcode; args[1] = NULL; - mono_runtime_invoke(method, NULL, args, NULL); + RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Environment", "Exit", + NULL, args, 1, &dummy); ERR("Process should have exited\n"); } @@ -629,13 +627,8 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); HRESULT hr; MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; MonoObject *result; MonoString *str; - void *args[2]; char *filenameA = NULL, *classA = NULL, *methodA = NULL; char *argsA = NULL, *ns; @@ -643,66 +636,60 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); hr = RuntimeHost_GetDefaultDomain(This, &domain); - if(hr != S_OK) - { - ERR("Couldn't get Default Domain\n"); - return hr; - } - hr = E_FAIL; - - mono_thread_attach(domain); - - filenameA = WtoA(pwzAssemblyPath); - assembly = mono_domain_assembly_open(domain, filenameA); - if (!assembly) + if (SUCCEEDED(hr)) { - ERR("Cannot open assembly %s\n", filenameA); - goto cleanup; + mono_thread_attach(domain); + + filenameA = WtoA(pwzAssemblyPath); + if (!filenameA) hr = E_OUTOFMEMORY; } - image = mono_assembly_get_image(assembly); - if (!image) + if (SUCCEEDED(hr)) { - ERR("Couldn't get assembly image\n"); - goto cleanup; + classA = WtoA(pwzTypeName); + if (!classA) hr = E_OUTOFMEMORY; } - classA = WtoA(pwzTypeName); - ns = strrchr(classA, '.'); - *ns = '\0'; - klass = mono_class_from_name(image, classA, ns+1); - if (!klass) + if (SUCCEEDED(hr)) { - ERR("Couldn't get class from image\n"); - goto cleanup; + ns = strrchr(classA, '.'); + if (ns) + *ns = '\0'; + else + hr = E_INVALIDARG; } - methodA = WtoA(pwzMethodName); - method = mono_class_get_method_from_name(klass, methodA, 1); - if (!method) + if (SUCCEEDED(hr)) { - ERR("Couldn't get method from class\n"); - goto cleanup; + methodA = WtoA(pwzMethodName); + if (!methodA) hr = E_OUTOFMEMORY; } /* The .NET function we are calling has the following declaration * public static int functionName(String param) */ - argsA = WtoA(pwzArgument); - str = mono_string_new(domain, argsA); - args[0] = str; - args[1] = NULL; - result = mono_runtime_invoke(method, NULL, args, NULL); - if (!result) - ERR("Couldn't get result pointer\n"); - else + if (SUCCEEDED(hr)) { - *pReturnValue = *(DWORD*)mono_object_unbox(result); - hr = S_OK; + argsA = WtoA(pwzArgument); + if (!argsA) hr = E_OUTOFMEMORY; } -cleanup: + if (SUCCEEDED(hr)) + { + str = mono_string_new(domain, argsA); + if (!str) hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + hr = RuntimeHost_Invoke(This, domain, filenameA, classA, ns+1, methodA, + NULL, (void**)&str, 1, &result); + } + + if (SUCCEEDED(hr)) + *pReturnValue = *(DWORD*)mono_object_unbox(result); + HeapFree(GetProcessHeap(), 0, filenameA); HeapFree(GetProcessHeap(), 0, classA); HeapFree(GetProcessHeap(), 0, argsA); @@ -807,60 +794,20 @@ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; MonoObject *result; - void *args[2]; + HRESULT hr; domain = mono_object_get_domain(obj); - assembly = mono_domain_assembly_open(domain, "mscorlib"); - if (!assembly) - { - ERR("Cannot load mscorlib\n"); - return E_FAIL; - } - - image = mono_assembly_get_image(assembly); - if (!image) - { - ERR("Couldn't get assembly image\n"); - return E_FAIL; - } + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", + NULL, (void**)&obj, 1, &result); - klass = mono_class_from_name(image, "System.Runtime.InteropServices", "Marshal"); - if (!klass) - { - ERR("Couldn't get class from image\n"); - return E_FAIL; - } - - method = mono_class_get_method_from_name(klass, "GetIUnknownForObject", 1); - if (!method) - { - ERR("Couldn't get method from class\n"); - return E_FAIL; - } - - args[0] = obj; - args[1] = NULL; - result = mono_runtime_invoke(method, NULL, args, NULL); - if (!result) - { - ERR("Couldn't get result pointer\n"); - return E_FAIL; - } - - *ppUnk = *(IUnknown**)mono_object_unbox(result); - if (!*ppUnk) - { - ERR("GetIUnknownForObject returned 0\n"); - return E_FAIL; - } + if (SUCCEEDED(hr)) + *ppUnk = *(IUnknown**)mono_object_unbox(result); + else + *ppUnk = NULL; - return S_OK; + return hr; } static void get_utf8_args(int *argc, char ***argv)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
31
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 August 2014