wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Henri Verbeet : d3d10core/tests: Port alpha_test() to d3d10core.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 1c116c35279dac5396734757b7ee434a0629201e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c116c35279dac5396734757b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:25 2014 +0100 d3d10core/tests: Port alpha_test() to d3d10core. --- dlls/d3d10core/tests/device.c | 253 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 +- dlls/d3d9/tests/visual.c | 4 +- dlls/ddraw/tests/visual.c | 4 +- 4 files changed, 259 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c116c35279dac5396734…

1 0

Henri Verbeet : wined3d: Recognize the SM4 uge opcode.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 8c18ebf66a75d77d884499f2e31809f930803fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c18ebf66a75d77d884499f2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:24 2014 +0100 wined3d: Recognize the SM4 uge opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7bc23d..f5e614e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a0a43b..98239ef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; + case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; default: op = "<unhandled operator>"; @@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; + case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; default: op = "<unhandled operator>"; @@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, + /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7a98dd8..f32d248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cba55ad..ac0fab5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -117,6 +117,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "F", "F"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "FF", "F"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "UU", "UU"}, + {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "U", "UU"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cba20f4..b7803c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_UGE, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Henri Verbeet : wined3d: Explicitly convert the condition to bool shader_glsl_if().
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 8681999eee64221f230d34e74608382886de0980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681999eee64221f230d34e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:23 2014 +0100 wined3d: Explicitly convert the condition to bool shader_glsl_if(). In SM4 shaders the condition is likely to be an integer instead of a bool uniform like in SM3. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7379ba2..9a0a43b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3360,7 +3360,7 @@ static void shader_glsl_if(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s) {\n", src0_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) {\n", src0_param.param_str); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetOpacity().
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 5cc7996b1f207c41d940e4a926e098dfc7ee89a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7996b1f207c41d940e4a92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:22 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetOpacity(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8837cee..6366086 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -226,9 +226,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColor static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface,

1 0

Henri Verbeet : d3d9: Remove some incorrect constants from d3d9types.h.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 82f70e25c1e476d35d60268df9cb0d22f6dc0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f70e25c1e476d35d60268df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:21 2014 +0100 d3d9: Remove some incorrect constants from d3d9types.h. D3DPRESENT_BACK_BUFFER_MAX doesn't exist at all and D3DPRESENT_BACK_BUFFERS_MAX is in d3d9.h. --- include/d3d9types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4cc1195..fd7c4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -206,7 +206,6 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,8 +642,6 @@ typedef enum _D3DBACKBUFFER_TYPE { D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) - typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0, D3DBASIS_BSPLINE = 1,

1 0

Michael Stefaniuc : mciseq: Simplify the check for an empty string.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 560a78dd40fefc1c5b62dda1bf70b487e7a2373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=560a78dd40fefc1c5b62dda1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:07:02 2014 +0100 mciseq: Simplify the check for an empty string. --- dlls/mciseq/mcimidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4fcfb48..62b3192 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -683,7 +683,7 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp if (dwFlags & MCI_OPEN_ELEMENT) { TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpParms->lpstrElementName)); - if (lpParms->lpstrElementName && strlenW(lpParms->lpstrElementName) > 0) { + if (lpParms->lpstrElementName && lpParms->lpstrElementName[0]) { wmm->hFile = mmioOpenW((LPWSTR)lpParms->lpstrElementName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (wmm->hFile == 0) {

1 0

Michael Stefaniuc : advpack: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 88725cb27903ee3d947a0fa05b6544a8196d411d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88725cb27903ee3d947a0fa05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 11:05:58 2014 +0100 advpack: Simplify the check for an empty string (PVS-Studio). --- dlls/advpack/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 1e555f7..c5efbb2 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -567,7 +567,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles) szConvertedList[dwLen - 1] = '\0'; /* empty list */ - if (!lstrlenA(szConvertedList)) + if (!szConvertedList[0]) { HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL;

1 0

Michael Stefaniuc : mscms/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: de092c6bd397aa9d9a72947b1d24d7a2393db62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de092c6bd397aa9d9a72947b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 17 10:59:05 2014 +0100 mscms/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/mscms/tests/profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index fd35193..012a7dc 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1364,10 +1364,10 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); - ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, + ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); - ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, + ok(profilefile1W[0] && lstrlenW(profilefile1W) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenW(profilefile1W)); lstrcpyA(profilefile2, profilefile1); lstrcpyW(profilefile2W, profilefile1W);

1 0

Nikolay Sivov : dwrite: Reuse local file stream instances.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 8b769332e25face5d80d7568c838269c795440f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b769332e25face5d80d7568c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 17 12:30:25 2014 +0300 dwrite: Reuse local file stream instances. --- dlls/dwrite/font.c | 84 +++++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/font.c | 51 +++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a83baa7..a8d1efe 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include "wine/list.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -1975,12 +1976,20 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ +struct local_cached_stream +{ + struct list entry; + IDWriteFontFileStream *stream; + void *key; + UINT32 key_size; +}; struct dwrite_localfontfilestream { IDWriteFontFileStream IDWriteFontFileStream_iface; LONG ref; + struct local_cached_stream *entry; HANDLE handle; }; @@ -1993,6 +2002,8 @@ struct local_refkey struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; + + struct list streams; }; static inline struct dwrite_localfontfileloader *impl_from_IDWriteLocalFontFileLoader(IDWriteLocalFontFileLoader *iface) @@ -2028,6 +2039,13 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) return ref; } +static inline void release_cached_stream(struct local_cached_stream *stream) +{ + list_remove(&stream->entry); + heap_free(stream->key); + heap_free(stream); +} + static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); @@ -2035,10 +2053,10 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) TRACE("(%p)->(%d)\n", This, ref); - if (!ref) - { + if (!ref) { if (This->handle != INVALID_HANDLE_VALUE) CloseHandle(This->handle); + release_cached_stream(This->entry); heap_free(This); } @@ -2107,7 +2125,7 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(HANDLE handle, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(HANDLE handle, struct local_cached_stream *entry, IDWriteFontFileStream** iface) { struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) @@ -2116,6 +2134,7 @@ static HRESULT create_localfontfilestream(HANDLE handle, IDWriteFontFileStream** This->ref = 1; This->handle = handle; This->IDWriteFontFileStream_iface.lpVtbl = &localfontfilestreamvtbl; + This->entry = entry; *iface = &This->IDWriteFontFileStream_iface; return S_OK; @@ -2153,28 +2172,76 @@ static ULONG WINAPI localfontfileloader_Release(IDWriteLocalFontFileLoader *ifac TRACE("(%p)->(%d)\n", This, ref); - if (!ref) + if (!ref) { + struct local_cached_stream *stream, *stream2; + + /* This will detach all entries from cache. Entries are released together with streams, + so stream controls its lifetime. */ + LIST_FOR_EACH_ENTRY_SAFE(stream, stream2, &This->streams, struct local_cached_stream, entry) + list_init(&stream->entry); + heap_free(This); + } return ref; } -static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **fontFileStream) +static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **ret) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); const struct local_refkey *refkey = key; + struct local_cached_stream *stream; + IDWriteFontFileStream *filestream; HANDLE handle; + HRESULT hr; - TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, fontFileStream); + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, ret); TRACE("name: %s\n", debugstr_w(refkey->name)); + + /* search cache first */ + LIST_FOR_EACH_ENTRY(stream, &This->streams, struct local_cached_stream, entry) { + if (key_size == stream->key_size && !memcmp(stream->key, key, key_size)) { + *ret = stream->stream; + IDWriteFontFileStream_AddRef(*ret); + return S_OK; + } + } + + *ret = NULL; + handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (handle == INVALID_HANDLE_VALUE) return E_FAIL; - return create_localfontfilestream(handle, fontFileStream); + stream = heap_alloc(sizeof(*stream)); + if (!stream) + return E_OUTOFMEMORY; + + stream->key = heap_alloc(key_size); + if (!stream->key) { + heap_free(stream); + return E_OUTOFMEMORY; + } + + stream->key_size = key_size; + memcpy(stream->key, key, key_size); + + hr = create_localfontfilestream(handle, stream, &filestream); + if (FAILED(hr)) { + heap_free(stream->key); + heap_free(stream); + return hr; + } + + stream->stream = filestream; + list_add_head(&This->streams, &stream->entry); + + *ret = stream->stream; + + return S_OK; } static HRESULT WINAPI localfontfileloader_GetFilePathLengthFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, UINT32 *length) @@ -2229,8 +2296,9 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) if (!This) return E_OUTOFMEMORY; - This->ref = 1; This->IDWriteLocalFontFileLoader_iface.lpVtbl = &localfontfileloadervtbl; + This->ref = 1; + list_init(&This->streams); *iface = &This->IDWriteLocalFontFileLoader_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1fdb8d0..b8ff22d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2355,6 +2355,56 @@ if (0) { /* crashes on native */ IDWriteFactory_Release(factory); } +static void test_CreateStreamFromKey(void) +{ + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileStream *stream, *stream2; + IDWriteFontFileLoader *loader; + IDWriteFactory *factory; + IDWriteFontFile *file; + void *key; + UINT32 size; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(stream, 1); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(stream == stream2, "got %p, %p\n", stream, stream2); + EXPECT_REF(stream, 2); + IDWriteFontFileStream_Release(stream); + IDWriteFontFileStream_Release(stream2); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(stream, 1); + IDWriteFontFileStream_Release(stream); + + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2386,6 +2436,7 @@ START_TEST(font) test_GetFaceNames(); test_TryGetFontTable(); test_ConvertFontToLOGFONT(); + test_CreateStreamFromKey(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement compatible reference key for local files and remaining loader methods.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 53fb0cc711eeaa7902dbe6992cc31b97252131eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=53fb0cc711eeaa7902dbe6992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 15 19:19:00 2014 +0300 dwrite: Implement compatible reference key for local files and remaining loader methods. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 71 ++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 16 ++++++++-- dlls/dwrite/tests/font.c | 39 ++++++++++++++++++++++-- 4 files changed, 110 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d1c42ce..3b1d283 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -108,6 +108,7 @@ extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DE extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; +extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8bb39fa..a83baa7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1984,6 +1984,12 @@ struct dwrite_localfontfilestream HANDLE handle; }; +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; @@ -2153,16 +2159,16 @@ static ULONG WINAPI localfontfileloader_Release(IDWriteLocalFontFileLoader *ifac return ref; } -static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *fontFileReferenceKey, UINT32 fontFileReferenceKeySize, IDWriteFontFileStream **fontFileStream) +static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFileLoader *iface, const void *key, UINT32 key_size, IDWriteFontFileStream **fontFileStream) { - HANDLE handle; struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - const WCHAR *name = (const WCHAR*)fontFileReferenceKey; + const struct local_refkey *refkey = key; + HANDLE handle; - TRACE("(%p)->(%p, %i, %p)\n",This, fontFileReferenceKey, fontFileReferenceKeySize, fontFileStream); + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, fontFileStream); - TRACE("name: %s\n",debugstr_w(name)); - handle = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + TRACE("name: %s\n", debugstr_w(refkey->name)); + handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (handle == INVALID_HANDLE_VALUE) @@ -2174,26 +2180,37 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi static HRESULT WINAPI localfontfileloader_GetFilePathLengthFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, UINT32 *length) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - TRACE("(%p)->(%p, %i, %p)\n",This, key, key_size, length); - *length = key_size; + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, length); + + *length = strlenW(refkey->name); return S_OK; } static HRESULT WINAPI localfontfileloader_GetFilePathFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, WCHAR *path, UINT32 length) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - TRACE("(%p)->(%p, %i, %p, %i)\n",This, key, key_size, path, length); - if (length < key_size) + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p, %i)\n", This, key, key_size, path, length); + + if (length < strlenW(refkey->name)) return E_INVALIDARG; - lstrcpynW((WCHAR*)key, path, key_size); + + strcpyW(path, refkey->name); return S_OK; } static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, FILETIME *writetime) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - FIXME("(%p)->(%p, %i, %p):stub\n",This, key, key_size, writetime); - return E_NOTIMPL; + const struct local_refkey *refkey = key; + + TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, writetime); + + *writetime = refkey->writetime; + return S_OK; } static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { @@ -2218,3 +2235,31 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) *iface = &This->IDWriteLocalFontFileLoader_iface; return S_OK; } + +HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **key, UINT32 *size) +{ + struct local_refkey *refkey; + + *size = FIELD_OFFSET(struct local_refkey, name) + (strlenW(path)+1)*sizeof(WCHAR); + *key = NULL; + + refkey = heap_alloc(*size); + if (!refkey) + return E_OUTOFMEMORY; + + if (writetime) + refkey->writetime = *writetime; + else { + WIN32_FILE_ATTRIBUTE_DATA info; + + if (GetFileAttributesExW(path, GetFileExInfoStandard, &info)) + refkey->writetime = info.ftLastWriteTime; + else + memset(&refkey->writetime, 0, sizeof(refkey->writetime)); + } + strcpyW(refkey->name, path); + + *key = refkey; + + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 2868c3b..1292086 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -686,8 +686,11 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *iface, WCHAR const *path, FILETIME const *writetime, IDWriteFontFile **font_file) { - HRESULT hr; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + UINT32 key_size; + HRESULT hr; + void *key; + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(path), writetime, font_file); if (!This->localfontfileloader) @@ -696,7 +699,16 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac if (FAILED(hr)) return hr; } - return create_font_file((IDWriteFontFileLoader*)This->localfontfileloader, path, sizeof(WCHAR) * (strlenW(path)+1), font_file); + + /* get a reference key used by local loader */ + hr = get_local_refkey(path, writetime, &key, &key_size); + if (FAILED(hr)) + return hr; + + hr = create_font_file((IDWriteFontFileLoader*)This->localfontfileloader, key, key_size, font_file); + heap_free(key); + + return hr; } static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60d0d44..1fdb8d0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2218,15 +2218,26 @@ static void test_GetFaceNames(void) IDWriteFactory_Release(factory); } +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + static void test_TryGetFontTable(void) { + IDWriteLocalFontFileLoader *localloader; + WIN32_FILE_ATTRIBUTE_DATA info; + const struct local_refkey *key; + IDWriteFontFileLoader *loader; const void *table, *table2; IDWriteFontFace *fontface; void *context, *context2; IDWriteFactory *factory; IDWriteFontFile *file; - BOOL exists; - UINT32 size; + WCHAR buffW[MAX_PATH]; + BOOL exists, ret; + UINT32 size, len; HRESULT hr; create_testfontfile(test_fontfile); @@ -2236,6 +2247,30 @@ static void test_TryGetFontTable(void) hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); ok(hr == S_OK, "got 0x%08x\n",hr); + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + ret = GetFileAttributesExW(test_fontfile, GetFileExInfoStandard, &info); + ok(ret, "got %d\n", ret); + ok(!memcmp(&info.ftLastWriteTime, &key->writetime, sizeof(key->writetime)), "got wrong write time\n"); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_GetFilePathLengthFromKey(localloader, key, size, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(lstrlenW(key->name) == len, "path length %d\n", len); + + hr = IDWriteLocalFontFileLoader_GetFilePathFromKey(localloader, key, size, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, key->name), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(key->name)); + IDWriteLocalFontFileLoader_Release(localloader); + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, 0, &fontface); ok(hr == S_OK, "got 0x%08x\n",hr);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
40
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 November 2014