November 2016 - Wine-Commits

Nikolay Sivov : dwrite: Set fontface pointer and font size for returned color glyph run.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 9103ee4c66e644c032b83bb2be520c38cfbba9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9103ee4c66e644c032b83bb2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 00:12:38 2016 +0300 dwrite: Set fontface pointer and font size for returned color glyph run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 18 ++++++++++-------- dlls/dwrite/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 75e2e00..7672aa6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5418,19 +5418,19 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R { struct dwrite_colorglyphenum *colorglyphenum; BOOL colorfont, has_colored_glyph; - IDWriteFontFace4 *fontface3; + IDWriteFontFace4 *fontface; HRESULT hr; UINT32 i; *ret = NULL; - hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface3); + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface); if (FAILED(hr)) { WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr); return hr; } - colorfont = IDWriteFontFace4_IsColorFont(fontface3) && IDWriteFontFace4_GetColorPaletteCount(fontface3) > palette; + colorfont = IDWriteFontFace4_IsColorFont(fontface) && IDWriteFontFace4_GetColorPaletteCount(fontface) > palette; if (!colorfont) { hr = DWRITE_E_NOCOLOR; goto failed; @@ -5446,7 +5446,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R colorglyphenum->ref = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; - colorglyphenum->fontface = fontface3; + colorglyphenum->fontface = fontface; colorglyphenum->glyphs = NULL; colorglyphenum->run = *run; colorglyphenum->run.glyphIndices = NULL; @@ -5455,7 +5455,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R colorglyphenum->palette = palette; memset(&colorglyphenum->colr, 0, sizeof(colorglyphenum->colr)); colorglyphenum->colr.exists = TRUE; - get_fontface_table(fontface3, MS_COLR_TAG, &colorglyphenum->colr); + get_fontface_table(fontface, MS_COLR_TAG, &colorglyphenum->colr); colorglyphenum->current_layer = 0; colorglyphenum->max_layer_num = 0; @@ -5488,6 +5488,8 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R memcpy(colorglyphenum->offsets, run->glyphOffsets, run->glyphCount * sizeof(*run->glyphOffsets)); } + colorglyphenum->colorrun.glyphRun.fontFace = (IDWriteFontFace*)fontface; + colorglyphenum->colorrun.glyphRun.fontEmSize = run->fontEmSize; colorglyphenum->colorrun.glyphRun.glyphIndices = colorglyphenum->glyphindices; colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; @@ -5506,14 +5508,14 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R switch (measuring_mode) { case DWRITE_MEASURING_MODE_NATURAL: - hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface3, 1, run->glyphIndices + i, &a, run->isSideways); + hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; colorglyphenum->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics); break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: - hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface3, run->fontEmSize, 1.0f, transform, + hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface, run->fontEmSize, 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a); if (FAILED(hr)) colorglyphenum->advances[i] = 0.0f; @@ -5530,7 +5532,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R return S_OK; failed: - IDWriteFontFace4_Release(fontface3); + IDWriteFontFace4_Release(fontface); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f5d9467..12327a5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5977,6 +5977,14 @@ static void test_TranslateColorGlyphRun(void) if (!hasrun) break; + + hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(colorrun->glyphRun.fontFace != NULL, "got fontface %p\n", colorrun->glyphRun.fontFace); + ok(colorrun->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun->glyphRun.fontEmSize); + ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); + ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); + ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); } /* iterated all way through */

1 0

Nikolay Sivov : dwrite: Update file type and face type enums.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 1e8a706bc3084636f822861cfb5903281316b0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8a706bc3084636f822861cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 00:12:37 2016 +0300 dwrite: Update file type and face type enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 2 +- dlls/dwrite/opentype.c | 8 ++++---- dlls/dwrite/tests/font.c | 2 +- include/dwrite.idl | 10 ++++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 641e808..9d5b1be 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -895,7 +895,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory4 *iface, if (!is_face_type_supported(req_facetype)) return E_INVALIDARG; - if (req_facetype != DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION && index) + if (req_facetype != DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION && index) return E_INVALIDARG; if (!is_simulation_valid(simulations)) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3412e66..3205b7f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -810,7 +810,7 @@ BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || (type == DWRITE_FONT_FACE_TYPE_TRUETYPE) || - (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) || + (type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) || (type == DWRITE_FONT_FACE_TYPE_RAW_CFF); } @@ -831,8 +831,8 @@ static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font if (!memcmp(header->TTCTag, &ttctag, sizeof(ttctag))) { *font_count = GET_BE_DWORD(header->numFonts); - *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION; - *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION; + *file_type = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION; + *face_type = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION; } IDWriteFontFileStream_ReleaseFileFragment(stream, context); @@ -1013,7 +1013,7 @@ HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag *table_data = NULL; *table_context = NULL; - if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { + if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; void * ttc_context; hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7f9be00..f5d9467 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1603,7 +1603,7 @@ static void test_CreateFontFace(void) hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, 1, &file, 0, + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* < win10 */, "got 0x%08x\n", hr); diff --git a/include/dwrite.idl b/include/dwrite.idl index 9452e11..06ae767 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -48,23 +48,25 @@ typedef enum DWRITE_FONT_FILE_TYPE DWRITE_FONT_FILE_TYPE_UNKNOWN, DWRITE_FONT_FILE_TYPE_CFF, DWRITE_FONT_FILE_TYPE_TRUETYPE, - DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION, + DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION, DWRITE_FONT_FILE_TYPE_TYPE1_PFM, DWRITE_FONT_FILE_TYPE_TYPE1_PFB, DWRITE_FONT_FILE_TYPE_VECTOR, - DWRITE_FONT_FILE_TYPE_BITMAP + DWRITE_FONT_FILE_TYPE_BITMAP, + DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION } DWRITE_FONT_FILE_TYPE; typedef enum DWRITE_FONT_FACE_TYPE { DWRITE_FONT_FACE_TYPE_CFF, DWRITE_FONT_FACE_TYPE_TRUETYPE, - DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, + DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION, DWRITE_FONT_FACE_TYPE_TYPE1, DWRITE_FONT_FACE_TYPE_VECTOR, DWRITE_FONT_FACE_TYPE_BITMAP, DWRITE_FONT_FACE_TYPE_UNKNOWN, - DWRITE_FONT_FACE_TYPE_RAW_CFF + DWRITE_FONT_FACE_TYPE_RAW_CFF, + DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION } DWRITE_FONT_FACE_TYPE; typedef enum DWRITE_FONT_WEIGHT

1 0

Józef Kucia : wined3d: Use unsynchronized buffer updates only if there has been at least one buffer map.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 085ae6ed08710fedfdcd1febe580d04baeebd596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085ae6ed08710fedfdcd1febe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 4 13:43:46 2016 +0100 wined3d: Use unsynchronized buffer updates only if there has been at least one buffer map. Fixes bc019fcbbd7f0014280a292bc58ef618cfbe34c7. We cannot use unsynchronized updates when the application haven't called map at all. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f686855..6b59965 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,7 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ -#define WINED3D_BUFFER_APPLESYNC 0x20 /* Using sync as in GL_APPLE_flush_buffer_range. */ +#define WINED3D_BUFFER_MAP 0x20 /* There has been at least one map since the last preload. */ +#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -818,7 +819,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (flags & WINED3D_BUFFER_DISCARD) mapflags |= GL_MAP_INVALIDATE_BUFFER_BIT; - else if (!(flags & WINED3D_BUFFER_SYNC)) + else if (flags & WINED3D_BUFFER_MAP && !(flags & WINED3D_BUFFER_SYNC)) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); @@ -831,7 +832,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con DWORD syncflags = 0; if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3D_MAP_DISCARD; - else if (!(flags & WINED3D_BUFFER_SYNC)) + else if (flags & WINED3D_BUFFER_MAP && !(flags & WINED3D_BUFFER_SYNC)) syncflags |= WINED3D_MAP_NOOVERWRITE; buffer_sync_apple(This, syncflags, gl_info); } @@ -929,14 +930,14 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined void buffer_mark_used(struct wined3d_buffer *buffer) { - buffer->flags &= ~(WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); + buffer->flags &= ~(WINED3D_BUFFER_MAP | WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); } /* Context activation is done by the caller. */ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); + DWORD flags = buffer->flags & (WINED3D_BUFFER_MAP | WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL decl_changed = FALSE; @@ -1011,7 +1012,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates. */ - flags = WINED3D_BUFFER_SYNC; + flags = 0; } else { @@ -1171,6 +1172,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } } + buffer->flags |= WINED3D_BUFFER_MAP; if (flags & WINED3D_MAP_DISCARD) buffer->flags |= WINED3D_BUFFER_DISCARD; else if (!(flags & WINED3D_MAP_NOOVERWRITE))

1 0

Andrey Gusev : ext-ms-win-gdi-dc-l1-2-0: Add dll.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: 579be451a1e18dc079ccfbd44723d15494e4d049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579be451a1e18dc079ccfbd44… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 5 22:41:59 2016 +0200 ext-ms-win-gdi-dc-l1-2-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in | 1 + .../ext-ms-win-gdi-dc-l1-2-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index 8814d56..6685ea8 100755 --- a/configure +++ b/configure @@ -1164,6 +1164,7 @@ enable_esent enable_evr enable_explorerframe enable_ext_ms_win_gdi_dc_create_l1_1_1 +enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 @@ -17929,6 +17930,7 @@ wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 +wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 diff --git a/configure.ac b/configure.ac index 8b7c80a..5f8ad7d 100644 --- a/configure.ac +++ b/configure.ac @@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in b/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in new file mode 100644 index 0000000..84b297f --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-l1-2-0.dll diff --git a/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec b/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec new file mode 100644 index 0000000..80ce933 --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec @@ -0,0 +1,16 @@ +@ stdcall CreatePalette(ptr) gdi32.CreatePalette +@ stdcall GetClipBox(long ptr) gdi32.GetClipBox +@ stdcall GetCurrentObject(long long) gdi32.GetCurrentObject +@ stdcall GetDCOrgEx(long ptr) gdi32.GetDCOrgEx +@ stdcall GetObjectA(long long ptr) gdi32.GetObjectA +@ stdcall GetObjectType(long) gdi32.GetObjectType +@ stdcall GetObjectW(long long ptr) gdi32.GetObjectW +@ stdcall GetPaletteEntries(long long long ptr) gdi32.GetPaletteEntries +@ stdcall GetStockObject(long) gdi32.GetStockObject +@ stdcall GetSystemPaletteEntries(long long long ptr) gdi32.GetSystemPaletteEntries +@ stdcall RealizePalette(long) gdi32.RealizePalette +@ stdcall RestoreDC(long long) gdi32.RestoreDC +@ stdcall SaveDC(long) gdi32.SaveDC +@ stdcall SelectObject(long long) gdi32.SelectObject +@ stdcall SelectPalette(long long long) gdi32.SelectPalette +@ stdcall SetDCBrushColor(long long) gdi32.SetDCBrushColor diff --git a/tools/make_specfiles b/tools/make_specfiles index cc956e6..c2748d8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -293,6 +293,7 @@ my @dll_groups = [ "gdi32", "ext-ms-win-gdi-dc-create-l1-1-1", + "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", ], [

1 0

Józef Kucia : wined3d: Return location from wined3d_buffer_get_memory().
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: e2733ed7fbcc9ca205e5e9b7507f301021b742cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2733ed7fbcc9ca205e5e9b75… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 4 13:43:47 2016 +0100 wined3d: Return location from wined3d_buffer_get_memory(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6b59965..58c273c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -631,7 +631,7 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) { TRACE("buffer %p, data %p, locations %s.\n", @@ -641,18 +641,19 @@ void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, { data->buffer_object = buffer->buffer_object; data->addr = NULL; - return; + return WINED3D_LOCATION_BUFFER; } if (locations & WINED3D_LOCATION_SYSMEM) { data->buffer_object = 0; data->addr = buffer->resource.heap_memory; - return; + return WINED3D_LOCATION_SYSMEM; } ERR("Unexpected locations %s.\n", wined3d_debug_location(locations)); data->buffer_object = 0; data->addr = NULL; + return 0; } static void buffer_unload(struct wined3d_resource *resource) @@ -1274,7 +1275,7 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ context = context_acquire(device, NULL); gl_info = context->gl_info; - wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); if (dst.buffer_object && src.buffer_object) @@ -1326,7 +1327,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ memcpy(dst.addr + dst_offset, src.addr + src_offset, size); } - dst_location = dst.buffer_object ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM; wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 503f7f2..6e742f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,7 +3179,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc } void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; -void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context,

1 0

Donat Enikeev : crypt32: Import system root certs into volatile registry keys instead of dedicated root store.
by Alexandre Julliard Nov. 7, 2016

Nov. 7, 2016

Module: wine Branch: master Commit: c2b0dfd73d15e51c14960007336d004dccf01444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0dfd73d15e51c149600073… Author: Donat Enikeev <donat(a)enikeev.net> Date: Mon Nov 7 17:37:29 2016 +0100 crypt32: Import system root certs into volatile registry keys instead of dedicated root store. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 6 +- dlls/crypt32/main.c | 1 - dlls/crypt32/regstore.c | 11 ++-- dlls/crypt32/rootstore.c | 123 ++++++++++++++--------------------------- dlls/crypt32/store.c | 12 +--- 5 files changed, 56 insertions(+), 97 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index ad4a827..8b1b003 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -336,7 +336,11 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; -WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; + +void CRYPT_ImportSystemRootCertsToReg(void) DECLSPEC_HIDDEN; +BOOL CRYPT_SerializeContextsToReg(HKEY key, DWORD flags, const WINE_CONTEXT_INTERFACE *contextInterface, + HCERTSTORE memStore) DECLSPEC_HIDDEN; + BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 241a1d9..9ff7592 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -49,7 +49,6 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); - root_store_free(); default_chain_engine_free(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index b79387f..5a39a26 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -179,7 +179,7 @@ static void CRYPT_RegReadFromReg(HKEY key, HCERTSTORE store) } /* Hash is assumed to be 20 bytes in length (a SHA-1 hash) */ -static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *buf, +static BOOL CRYPT_WriteSerializedToReg(HKEY key, DWORD flags, const BYTE *hash, const BYTE *buf, DWORD len) { WCHAR asciiHash[20 * 2 + 1]; @@ -188,7 +188,7 @@ static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *b BOOL ret; CRYPT_HashToStr(hash, asciiHash); - rc = RegCreateKeyExW(key, asciiHash, 0, NULL, 0, KEY_ALL_ACCESS, NULL, + rc = RegCreateKeyExW(key, asciiHash, 0, NULL, flags, KEY_ALL_ACCESS, NULL, &subKey, NULL); if (!rc) { @@ -205,7 +205,7 @@ static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *b return ret; } -static BOOL CRYPT_SerializeContextsToReg(HKEY key, +BOOL CRYPT_SerializeContextsToReg(HKEY key, DWORD flags, const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE memStore) { const void *context = NULL; @@ -232,7 +232,7 @@ static BOOL CRYPT_SerializeContextsToReg(HKEY key, { ret = contextInterface->serialize(context, 0, buf, &size); if (ret) - ret = CRYPT_WriteSerializedToReg(key, hash, buf, size); + ret = CRYPT_WriteSerializedToReg(key, flags, hash, buf, size); } CryptMemFree(buf); } @@ -287,8 +287,7 @@ static BOOL CRYPT_RegWriteToReg(WINE_REGSTOREINFO *store) } LeaveCriticalSection(&store->cs); } - ret = CRYPT_SerializeContextsToReg(key, interfaces[i], - store->memStore); + ret = CRYPT_SerializeContextsToReg(key, 0, interfaces[i], store->memStore); RegCloseKey(key); } else diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 5cee235..8e1dc2a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -435,53 +435,6 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, return ret; } -static BOOL WINAPI CRYPT_RootWriteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT cert, DWORD dwFlags) -{ - /* The root store can't have certs added */ - return FALSE; -} - -static BOOL WINAPI CRYPT_RootDeleteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT cert, DWORD dwFlags) -{ - /* The root store can't have certs deleted */ - return FALSE; -} - -static BOOL WINAPI CRYPT_RootWriteCRL(HCERTSTORE hCertStore, - PCCRL_CONTEXT crl, DWORD dwFlags) -{ - /* The root store can have CRLs added. At worst, a malicious application - * can DoS itself, as the changes aren't persisted in any way. - */ - return TRUE; -} - -static BOOL WINAPI CRYPT_RootDeleteCRL(HCERTSTORE hCertStore, - PCCRL_CONTEXT crl, DWORD dwFlags) -{ - /* The root store can't have CRLs deleted */ - return FALSE; -} - -static void *rootProvFuncs[] = { - NULL, /* CERT_STORE_PROV_CLOSE_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */ - CRYPT_RootWriteCert, - CRYPT_RootDeleteCert, - NULL, /* CERT_STORE_PROV_SET_CERT_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CRL_FUNC */ - CRYPT_RootWriteCRL, - CRYPT_RootDeleteCRL, - NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_CONTROL_FUNC */ -}; - static const char * const CRYPT_knownLocations[] = { "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs", @@ -790,55 +743,65 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) static HCERTSTORE create_root_store(void) { - HCERTSTORE root = NULL; HCERTSTORE memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - CERT_STORE_PROV_INFO provInfo = { - sizeof(CERT_STORE_PROV_INFO), - sizeof(rootProvFuncs) / sizeof(rootProvFuncs[0]), - rootProvFuncs, - NULL, - 0, - NULL - }; - read_trusted_roots_from_known_locations(memStore); add_ms_root_certs(memStore); - root = CRYPT_ProvCreateStore(0, memStore, &provInfo); } - TRACE("returning %p\n", root); - return root; + + TRACE("returning %p\n", memStore); + return memStore; } -static WINECRYPT_CERTSTORE *CRYPT_rootStore; +static const WCHAR certs_root_pathW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s','\\', + 'R','o','o','t','\\', 'C','e','r','t','i','f','i','c','a','t','e','s', 0}; +static const WCHAR semaphoreW[] = + {'c','r','y','p','t','3','2','_','r','o','o','t','_','s','e','m','a','p','h','o','r','e',0}; -WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) +void CRYPT_ImportSystemRootCertsToReg(void) { - TRACE("(%ld, %08x)\n", hCryptProv, dwFlags); + HCERTSTORE store = NULL; + HKEY key; + LONG rc; + HANDLE hsem; + + static BOOL root_certs_imported = FALSE; - if (dwFlags & CERT_STORE_DELETE_FLAG) + if (root_certs_imported) + return; + + hsem = CreateSemaphoreW( NULL, 0, 1, semaphoreW); + if (!hsem) { - WARN("root store can't be deleted\n"); - SetLastError(ERROR_ACCESS_DENIED); - return NULL; + ERR("Failed to create semaphore\n"); + return; } - if (!CRYPT_rootStore) - { - HCERTSTORE root = create_root_store(); - InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, - NULL); - if (CRYPT_rootStore != root) - CertCloseStore(root, 0); + if(GetLastError() == ERROR_ALREADY_EXISTS) + WaitForSingleObject(hsem, INFINITE); + else + { + if ((store = create_root_store())) + { + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, certs_root_pathW, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &key, 0); + if (!rc) + { + if (!CRYPT_SerializeContextsToReg(key, REG_OPTION_VOLATILE, pCertInterface, store)) + ERR("Failed to import system certs into registry, %08x\n", GetLastError()); + RegCloseKey(key); + } + CertCloseStore(store, 0); + } else + ERR("Failed to create root store\n"); } - CRYPT_rootStore->vtbl->addref(CRYPT_rootStore); - return CRYPT_rootStore; -} -void root_store_free(void) -{ - CertCloseStore(CRYPT_rootStore, 0); + root_certs_imported = TRUE; + ReleaseSemaphore(hsem, 1, NULL); + CloseHandle(hsem); } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 356712b..19eca22 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -424,21 +424,15 @@ static WINECRYPT_CERTSTORE *CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, SetLastError(E_INVALIDARG); return NULL; } - /* FIXME: In Windows, the root store (even the current user location) is - * protected: adding to it or removing from it present a user interface, - * and the keys are owned by the system process, not the current user. - * Wine's registry doesn't implement access controls, so a similar - * mechanism isn't possible yet. - */ - if ((dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) == - CERT_SYSTEM_STORE_LOCAL_MACHINE && !lstrcmpiW(storeName, rootW)) - return CRYPT_RootOpenStore(hCryptProv, dwFlags); switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) { case CERT_SYSTEM_STORE_LOCAL_MACHINE: root = HKEY_LOCAL_MACHINE; base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH; + /* If the HKLM\Root certs are requested, expressing system certs into the registry */ + if (!lstrcmpiW(storeName, rootW)) + CRYPT_ImportSystemRootCertsToReg(); break; case CERT_SYSTEM_STORE_CURRENT_USER: root = HKEY_CURRENT_USER;

1 0

Jacek Caban : rpcsal.h: Added __RPC__range and __RPC__in_range defines.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

Module: wine Branch: master Commit: 9d348189880a6e7a1e7a6a303915e47af3255972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d348189880a6e7a1e7a6a303… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 15:45:52 2016 +0100 rpcsal.h: Added __RPC__range and __RPC__in_range defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcsal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/rpcsal.h b/include/rpcsal.h index ffa114a..72a61ef 100644 --- a/include/rpcsal.h +++ b/include/rpcsal.h @@ -165,3 +165,6 @@ #define __RPC_ref_pointer #define __RPC_string #define __RPC_unique_pointer + +#define __RPC__range(min,max) +#define __RPC__in_range(min,max)

1 0

Hans Leidekker : netapi32/tests: Fix a test failure on Windows 7.
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

Module: wine Branch: master Commit: 83af2eec506c65ba4802eab984998aeacede8c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83af2eec506c65ba4802eab98… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:29:29 2016 +0100 netapi32/tests: Fix a test failure on Windows 7. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f44a6d3..f095d77 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -558,7 +558,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR path2[] = {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; static const WCHAR path3[] = - {'h','t','t','p','s',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + {'h','t','t','p','s',':','/','/','h','o','s','t','/','p','a','t','h',0}; static const WCHAR path4[] = {'\\','\\','s','e','r','v','e','r',0}; static const WCHAR path5[] = @@ -598,7 +598,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR result[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t','\\','p','a','t','h',0}; static const WCHAR result2[] = - {'\\','\\','s','e','r','v','e','r','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', + {'\\','\\','h','o','s','t','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', 'p','a','t','h',0}; static const WCHAR result3[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t',0}; @@ -626,7 +626,7 @@ static void test_DavGetUNCFromHTTPPath(void) { { path, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path2, MAX_PATH, ERROR_SUCCESS, result, 25 }, - { path3, MAX_PATH, ERROR_SUCCESS, result2, 29 }, + { path3, MAX_PATH, ERROR_SUCCESS, result2, 27 }, { path4, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path5, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path6, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH },

1 0

Nikolay Sivov : gdiplus: Use static data for identity check in GdipIsMatrixIdentity().
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

Module: wine Branch: master Commit: f7187ecbd62f778649e055af61cd2c6786ead7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7187ecbd62f778649e055af6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 04:18:19 2016 +0300 gdiplus: Use static data for identity check in GdipIsMatrixIdentity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/matrix.c | 20 +++++++------------- dlls/gdiplus/tests/matrix.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index fc2d3f5..3cd8d82 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -497,23 +497,17 @@ GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMa GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix *matrix, BOOL *result) { - GpMatrix *e; - GpStatus ret; - BOOL isIdentity; + static const GpMatrix identity = + { + { 1.0, 0.0, + 0.0, 1.0, + 0.0, 0.0 } + }; TRACE("(%p, %p)\n", matrix, result); if(!matrix || !result) return InvalidParameter; - ret = GdipCreateMatrix(&e); - if(ret != Ok) return ret; - - ret = GdipIsMatrixEqual(matrix, e, &isIdentity); - if(ret == Ok) - *result = isIdentity; - - heap_free(e); - - return ret; + return GdipIsMatrixEqual(matrix, &identity, result); } diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 83b57ef..a2e0595 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -302,7 +302,42 @@ static void test_constructor3(void) expectf(0.0, values[4]); expectf(0.0, values[5]); - GdipDeleteMatrix(matrix);} + GdipDeleteMatrix(matrix); +} + +static void test_isidentity(void) +{ + GpMatrix *matrix; + GpStatus stat; + BOOL result; + + stat = GdipIsMatrixIdentity(NULL, NULL); + expect(InvalidParameter, stat); + + stat = GdipIsMatrixIdentity(NULL, &result); + expect(InvalidParameter, stat); + + stat = GdipCreateMatrix2(1.0, 0.0, 0.0, 1.0, 0.0, 0.0, &matrix); + expect(Ok, stat); + + stat = GdipIsMatrixIdentity(matrix, NULL); + expect(InvalidParameter, stat); + + result = FALSE; + stat = GdipIsMatrixIdentity(matrix, &result); + expect(Ok, stat); + ok(!!result, "got %d\n", result); + + stat = GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.1, 0.0); + expect(Ok, stat); + + result = TRUE; + stat = GdipIsMatrixIdentity(matrix, &result); + expect(Ok, stat); + ok(!result, "got %d\n", result); + + GdipDeleteMatrix(matrix); +} START_TEST(matrix) { @@ -322,6 +357,7 @@ START_TEST(matrix) test_invert(); test_shear(); test_constructor3(); + test_isidentity(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Return success from GdipImageSetAbort().
by Alexandre Julliard Nov. 4, 2016

Nov. 4, 2016

Module: wine Branch: master Commit: da2021e46fb05addd74b1bab32f971d88ab5b347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2021e46fb05addd74b1bab3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 23:34:44 2016 +0300 gdiplus: Return success from GdipImageSetAbort(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 11 +++++++++-- dlls/gdiplus/tests/image.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e4eba2b..21d5a3a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5373,8 +5373,15 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) */ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) { - FIXME("(%p, %p): stub\n", image, pabort); - return NotImplemented; + TRACE("(%p, %p)\n", image, pabort); + + if (!image) + return InvalidParameter; + + if (pabort) + FIXME("Abort callback is not supported.\n"); + + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ad0cc6f..6abd026 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -32,6 +32,7 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); +static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*); #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -4916,6 +4917,30 @@ static void test_histogram(void) GdipDisposeImage((GpImage*)bm); } +static void test_imageabort(void) +{ + GpStatus stat; + GpBitmap *bm; + + if (!pGdipImageSetAbort) + { + win_skip("GdipImageSetAbort() is not supported.\n"); + return; + } + + bm = NULL; + stat = GdipCreateBitmapFromScan0(8, 8, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + stat = pGdipImageSetAbort(NULL, NULL); + expect(InvalidParameter, stat); + + stat = pGdipImageSetAbort((GpImage*)bm, NULL); + expect(Ok, stat); + + GdipDisposeImage((GpImage*)bm); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -4931,6 +4956,7 @@ START_TEST(image) pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); + pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); test_supported_encoders(); test_CloneBitmapArea(); @@ -4979,6 +5005,7 @@ START_TEST(image) test_createeffect(); test_getadjustedpalette(); test_histogram(); + test_imageabort(); GdiplusShutdown(gdiplusToken); }

1 0