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

Henri Verbeet : wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 7ede9788d4ac6b61514b83cfe0a0908c701905b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ede9788d4ac6b61514b83cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:54 2014 +0200 wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources. --- dlls/wined3d/device.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f5a46c..962c9c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3741,22 +3741,32 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color) + struct wined3d_rendertarget_view *view, const struct wined3d_color *color) { struct wined3d_resource *resource; HRESULT hr; RECT rect; - resource = rendertarget_view->resource; - if (resource->type != WINED3D_RTYPE_SURFACE) + TRACE("device %p, view %p, color {%.8e, %.8e, %.8e, %.8e}.\n", + device, view, color->r, color->g, color->b, color->a); + + resource = view->resource; + if (resource->type != WINED3D_RTYPE_TEXTURE && resource->type != WINED3D_RTYPE_CUBE_TEXTURE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + if (view->depth > 1) { - FIXME("Only supported on surface resources\n"); + FIXME("Layered clears not implemented.\n"); return; } - SetRect(&rect, 0, 0, resource->width, resource->height); - hr = surface_color_fill(surface_from_resource(resource), &rect, color); - if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); + SetRect(&rect, 0, 0, view->width, view->height); + resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx); + if (FAILED(hr = surface_color_fill(surface_from_resource(resource), &rect, color))) + ERR("Color fill failed, hr %#x.\n", hr); } struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Keep a reference to the resource in rendertarget views.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: eb24c9578c83ba1684e65f2e5f2cfd091fdea752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb24c9578c83ba1684e65f2e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:52 2014 +0200 wined3d: Keep a reference to the resource in rendertarget views. --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/surface.c | 12 ++++++++++++ dlls/wined3d/texture.c | 12 ++++++++++++ dlls/wined3d/view.c | 4 ++++ dlls/wined3d/volume.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 6 files changed, 64 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9af0adb..989026f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1113,8 +1113,20 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +static ULONG buffer_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_buffer_incref(buffer_from_resource(resource)); +} + +static ULONG buffer_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_buffer_decref(buffer_from_resource(resource)); +} + static const struct wined3d_resource_ops buffer_resource_ops = { + buffer_resource_incref, + buffer_resource_decref, buffer_unload, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20b36f2..65517ec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1158,6 +1158,16 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); } +static ULONG surface_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_surface_incref(surface_from_resource(resource)); +} + +static ULONG surface_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_surface_decref(surface_from_resource(resource)); +} + static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1236,6 +1246,8 @@ static void surface_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops surface_resource_ops = { + surface_resource_incref, + surface_resource_decref, surface_unload, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 07667f3..f595e16 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -771,6 +771,16 @@ static const struct wined3d_texture_ops texture2d_ops = texture2d_sub_resource_cleanup, }; +static ULONG texture_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_texture_incref(wined3d_texture_from_resource(resource)); +} + +static ULONG texture_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_texture_decref(wined3d_texture_from_resource(resource)); +} + static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); @@ -791,6 +801,8 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops texture_resource_ops = { + texture_resource_incref, + texture_resource_decref, wined3d_texture_unload, }; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 54ed9e4..bfec1ef 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -40,7 +40,10 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_resource_decref(view->resource); HeapFree(GetProcessHeap(), 0, view); + } return refcount; } @@ -64,6 +67,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie { view->refcount = 1; view->resource = resource; + wined3d_resource_incref(resource); view->parent = parent; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f1d09e5..b8dab3e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -772,8 +772,20 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) return WINED3D_OK; } +static ULONG volume_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_volume_incref(volume_from_resource(resource)); +} + +static ULONG volume_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_volume_decref(volume_from_resource(resource)); +} + static const struct wined3d_resource_ops volume_resource_ops = { + volume_resource_incref, + volume_resource_decref, volume_unload, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4d8815..16ae4c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2020,6 +2020,8 @@ static inline void context_invalidate_active_texture(struct wined3d_context *con struct wined3d_resource_ops { + ULONG (*resource_incref)(struct wined3d_resource *resource); + ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); }; @@ -2051,6 +2053,16 @@ struct wined3d_resource const struct wined3d_resource_ops *resource_ops; }; +static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_incref(resource); +} + +static inline ULONG wined3d_resource_decref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_decref(resource); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to upload_palette().
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 3a160432f801b4528b0d5e8d3e9446cfc0093347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a160432f801b4528b0d5e8d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:51 2014 +0200 wined3d: Pass a texture instead of a surface to upload_palette(). --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d6214a..3d3816f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7278,10 +7278,10 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_texture *texture, struct wined3d_context *context) { - const struct wined3d_palette *palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL; - struct wined3d_device *device = surface->resource.device; + const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; @@ -7538,7 +7538,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(surface, context); + upload_palette(surface->container, context); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");

1 0

Gerald Pfeifer : cmd: Remove fslashW.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 51d217e6df3f112e8b1fd62356a0a3687d231f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d217e6df3f112e8b1fd6235… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:18:38 2014 +0200 cmd: Remove fslashW. --- programs/cmd/builtins.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cb7dfef..f7db4a9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -100,7 +100,6 @@ static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; -static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'};

1 0

André Hentschel : wpcap: Implement pcap_findalldevs_ex.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: e141ecf89de094f16bc37d6a11fa0505dc5ff6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e141ecf89de094f16bc37d6a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:04:46 2014 +0200 wpcap: Implement pcap_findalldevs_ex. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 90b0647a..da545a8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -116,6 +116,12 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) return ret; } +int CDECL wine_pcap_findalldevs_ex(char *source, void *auth, pcap_if_t **alldevs, char *errbuf) +{ + FIXME("(%s %p %p %p): partial stub\n", debugstr_a(source), auth, alldevs, errbuf); + return wine_pcap_findalldevs(alldevs, errbuf); +} + void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) { TRACE("(%p)\n", alldevs); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 540089d..c7d2cd1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -25,7 +25,7 @@ @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -@ stub pcap_findalldevs_ex +@ cdecl pcap_findalldevs_ex(ptr ptr ptr ptr) wine_pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ cdecl pcap_freecode(ptr) wine_pcap_freecode @ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle

1 0

André Hentschel : wpcap: Add version resource.
by Alexandre Julliard Aug. 21, 2014

Aug. 21, 2014

Module: wine Branch: master Commit: 3a372f26e9c35d1edab4cdb58a97e57cae373e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a372f26e9c35d1edab4cdb58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:05:10 2014 +0200 wpcap: Add version resource. --- dlls/wpcap/Makefile.in | 2 ++ dlls/wpcap/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 5caffbc..e44613f 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -4,3 +4,5 @@ EXTRALIBS = @LIBPCAP@ C_SRCS = \ wpcap.c + +RC_SRCS = version.rc diff --git a/dlls/wpcap/version.rc b/dlls/wpcap/version.rc new file mode 100644 index 0000000..d60cec4 --- /dev/null +++ b/dlls/wpcap/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "wpcap.dll Dynamic Link Library - based on libpcap 1.0" +#define WINE_FILENAME_STR "wpcap.dll" +#define WINE_FILEVERSION 4,1,0,2980 +#define WINE_FILEVERSION_STR "4.1.0.2980" +#define WINE_PRODUCTVERSION 4,1,0,2980 +#define WINE_PRODUCTVERSION_STR "4.1.0.2980" + +#include "wine/wine_common_ver.rc"

1 0

Aric Stewart : dwrite: Implement TryGetFontTable and ReleaseFontTable.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: bc77ee68180e402148f70f75d7a9464324fc7ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc77ee68180e402148f70f75d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:42:24 2014 -0500 dwrite: Implement TryGetFontTable and ReleaseFontTable. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 65 ++++++++++++++++++++++++++++++-- dlls/dwrite/opentype.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f56b6f0..a64e632 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -94,3 +94,4 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; +extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8c82d08..0683dd5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -156,6 +156,14 @@ struct dwrite_font { WCHAR *facename; }; +#define DWRITE_FONTTABLE_MAGIC 0xededfafa + +struct dwrite_fonttable { + UINT32 magic; + LPVOID context; + UINT32 file_index; +}; + struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; @@ -384,14 +392,65 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); - return E_NOTIMPL; + if (This->is_system) + { + FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); + return E_NOTIMPL; + } + else + { + HRESULT hr = S_OK; + int i; + struct dwrite_fonttable *table; + + TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); + + table = heap_alloc(sizeof(struct dwrite_fonttable)); + table->magic = DWRITE_FONTTABLE_MAGIC; + if (!table) + return E_OUTOFMEMORY; + + *exists = FALSE; + for (i = 0; i < This->file_count && !(*exists); i++) + { + IDWriteFontFileStream *stream; + hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); + if (FAILED(hr)) + continue; + table->file_index = i; + + hr = find_font_table(stream, This->index, table_tag, table_data, &table->context, table_size, exists); + + IDWriteFontFileStream_Release(stream); + } + if (FAILED(hr) && !*exists) + heap_free(table); + else + *context = (LPVOID)table; + return hr; + } } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%p): stub\n", This, table_context); + struct dwrite_fonttable *table = (struct dwrite_fonttable *)table_context; + IDWriteFontFileStream *stream; + HRESULT hr; + TRACE("(%p)->(%p)\n", This, table_context); + + if (table->magic != DWRITE_FONTTABLE_MAGIC) + { + TRACE("Invalid table magic\n"); + return; + } + + hr = _dwritefontfile_GetFontFileStream(This->files[table->file_index], &stream); + if (FAILED(hr)) + return; + IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); + IDWriteFontFileStream_Release(stream); + heap_free(table); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace *iface, FLOAT emSize, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 538db98..6c90a96 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -47,6 +47,21 @@ typedef struct { DWORD OffsetTable[1]; } TTC_Header_V1; +typedef struct { + DWORD version; + WORD numTables; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; +} TTC_SFNT_V1; + +typedef struct { + CHAR tag[4]; + DWORD checkSum; + DWORD offset; + DWORD length; +} TT_TableRecord; + HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ @@ -81,3 +96,76 @@ HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_ } return S_OK; } + +HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) +{ + const CHAR *first_data; + void *first_context; + HRESULT hr; + TTC_SFNT_V1 *font_header = NULL; + void *sfnt_context; + TT_TableRecord *table_record = NULL; + void *table_record_context; + int i; + int table_count; + int table_offset = 0; + + *found = FALSE; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&first_data, 0, 4, &first_context); + if (SUCCEEDED(hr)) + { + if (DWRITE_MAKE_OPENTYPE_TAG(first_data[0], first_data[1], first_data[2], first_data[3]) == MS_TTCF_TAG) + { + const TTC_Header_V1 *ttc_header; + void * ttc_context; + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) + { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); + if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); + } + } + else + { + if (font_index > 0) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + } + IDWriteFontFileStream_ReleaseFileFragment(stream, first_context); + } + if (FAILED(hr)) + return hr; + + table_count = GET_BE_WORD(font_header->numTables); + table_offset += sizeof(*font_header); + for (i = 0; i < table_count; i++) + { + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context); + if (FAILED(hr)) + break; + if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag) + break; + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + table_offset += sizeof(*table_record); + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, sfnt_context); + if (SUCCEEDED(hr) && i < table_count) + { + int offset = GET_BE_DWORD(table_record->offset); + int length = GET_BE_DWORD(table_record->length); + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + + *found = TRUE; + *table_size = length; + hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); + } + + return hr; +}

1 0

Ken Thomases : loader: Set LSUIElement to 1 in the embedded Mac Info.plist.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: dbe0d0be34e0a427de85b4dc87a38835e61b747e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe0d0be34e0a427de85b4dc8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Aug 20 13:39:34 2014 -0500 loader: Set LSUIElement to 1 in the embedded Mac Info.plist. --- loader/wine_info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine_info.plist.in b/loader/wine_info.plist.in index aea99e5..2895aea 100644 --- a/loader/wine_info.plist.in +++ b/loader/wine_info.plist.in @@ -22,5 +22,7 @@ <string>@PACKAGE_VERSION@</string> <key>NSPrincipalClass</key> <string>WineApplication</string> + <key>LSUIElement</key> + <string>1</string> </dict> </plist>

1 0

Aric Stewart : dwrite: Initial implementation of CreateFontFace.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 26977d4a4b3e6159072ae75e77a3e3b007bd3127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26977d4a4b3e6159072ae75e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:40:48 2014 -0500 dwrite: Initial implementation of CreateFontFace. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 194 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 4 + 4 files changed, 166 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26977d4a4b3e6159072ae…

1 0

Henri Verbeet : wined3d: Replace surface_update_draw_binding() with wined3d_resource_update_draw_binding().
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 1ce3269ac1d6c953258e559b2be8423167c46eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce3269ac1d6c953258e559b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 20 13:19:59 2014 +0200 wined3d: Replace surface_update_draw_binding() with wined3d_resource_update_draw_binding(). --- dlls/wined3d/resource.c | 10 ++++++++++ dlls/wined3d/surface.c | 14 ++------------ dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index dd31cb6..cb7ee9e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -323,3 +323,13 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) * offscreen, otherwise onscreen */ return swapchain->render_to_fbo; } + +void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) +{ + if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + resource->draw_binding = WINED3D_LOCATION_DRAWABLE; + else if (resource->multisample_type) + resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + else + resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; +} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3110e56..6603d46 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -112,16 +112,6 @@ void wined3d_surface_destroy(struct wined3d_surface *surface) HeapFree(GetProcessHeap(), 0, surface); } -void surface_update_draw_binding(struct wined3d_surface *surface) -{ - if (!wined3d_resource_is_offscreen(&surface->resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) - surface->resource.draw_binding = WINED3D_LOCATION_DRAWABLE; - else if (surface->resource.multisample_type) - surface->resource.draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; - else - surface->resource.draw_binding = WINED3D_LOCATION_TEXTURE_RGB; -} - void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) { @@ -157,7 +147,7 @@ void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapc TRACE("surface %p, swapchain %p.\n", surface, swapchain); surface->swapchain = swapchain; - surface_update_draw_binding(surface); + wined3d_resource_update_draw_binding(&surface->resource); } struct blt_info @@ -5974,7 +5964,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text } surface->container = container; - surface_update_draw_binding(surface); + wined3d_resource_update_draw_binding(&surface->resource); surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); list_init(&surface->renderbuffers); list_init(&surface->overlays); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1648a11..1582193 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1144,10 +1144,10 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) { UINT i; - surface_update_draw_binding(swapchain->front_buffer); + wined3d_resource_update_draw_binding(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { - surface_update_draw_binding(swapchain->back_buffers[i]); + wined3d_resource_update_draw_binding(&swapchain->back_buffers[i]->resource); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 118b5c8..086d13c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2065,6 +2065,7 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 @@ -2305,7 +2306,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, 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; -void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0