wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Józef Kucia : wined3d: Introduce wined3d_rendertarget_view_get_drawable_size() as replacement for surface_get_drawable_size().
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 5cdb8f2486cf00a61c1aac20daef8c7cac0d8312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdb8f2486cf00a61c1aac20d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 4 13:43:44 2016 +0100 wined3d: Introduce wined3d_rendertarget_view_get_drawable_size() as replacement for surface_get_drawable_size(). 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/device.c | 5 +++-- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/view.c | 17 ++++++++++++++--- dlls/wined3d/wined3d_private.h | 5 +++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a611531..d7349fcf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -291,7 +291,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c UINT rect_count, const RECT *clear_rect, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; + struct wined3d_rendertarget_view *rtv = rt_count ? fb->render_targets[0] : NULL; + struct wined3d_surface *target = rtv ? wined3d_rendertarget_view_get_surface(rtv) : NULL; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; const struct wined3d_state *state = &device->state; @@ -339,7 +340,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (target) { render_offscreen = context->render_offscreen; - surface_get_drawable_size(target, context, &drawable_width, &drawable_height); + wined3d_rendertarget_view_get_drawable_size(rtv, context, &drawable_width, &drawable_height); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9e36bcd..cd3763c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4624,7 +4624,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine if (vp.height > target->height) vp.height = target->height; - surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); + wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); } else if (depth_stencil) { @@ -4668,7 +4668,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context, if (vp.height > target->height) vp.height = target->height; - surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); + wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); } else if (depth_stencil) { @@ -4853,7 +4853,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st UINT height; UINT width; - surface_get_drawable_size(wined3d_rendertarget_view_get_surface(target), context, &width, &height); + wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); gl_info->gl_ops.gl.p_glScissor(r->left, height - r->bottom, r->right - r->left, r->bottom - r->top); } checkGLcall("glScissor"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1f819e6..a67c506 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -94,10 +94,21 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str return view->resource; } -void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, - unsigned int *width, unsigned int *height) +void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, + const struct wined3d_context *context, unsigned int *width, unsigned int *height) { - if (surface->container->swapchain) + const struct wined3d_texture *texture; + + if (view->resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(view->resource->type)); + *width = 0; + *height = 0; + return; + } + + texture = texture_from_resource(view->resource); + if (texture->swapchain) { /* The drawable size of an onscreen drawable is the surface size. * (Actually: The window size, but the surface is created in window diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19b650e..503f7f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2908,8 +2908,6 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; HRESULT wined3d_surface_create_dc(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_surface_destroy_dc(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, - unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface, @@ -3226,6 +3224,9 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( return texture->sub_resources[view->sub_resource_idx].u.surface; } +void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, + const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; + struct wined3d_shader_resource_view { LONG refcount;

1 0

Józef Kucia : wined3d: Move surface_get_drawable_size () to view.c file.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 4beb9e5922301b76c16f6ea885bc1cb604f9eb91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4beb9e5922301b76c16f6ea88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 4 13:43:43 2016 +0100 wined3d: Move surface_get_drawable_size() to view.c file. 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/surface.c | 33 --------------------------------- dlls/wined3d/view.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1c211ed..bba855a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,39 +36,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER; -void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, - unsigned int *width, unsigned int *height) -{ - if (surface->container->swapchain) - { - /* The drawable size of an onscreen drawable is the surface size. - * (Actually: The window size, but the surface is created in window - * size.) */ - *width = context->current_rt.texture->resource.width; - *height = context->current_rt.texture->resource.height; - } - else if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - const struct wined3d_swapchain *swapchain = context->swapchain; - - /* The drawable size of a backbuffer / aux buffer offscreen target is - * the size of the current context's drawable, which is the size of - * the back buffer of the swapchain the active context belongs to. */ - *width = swapchain->desc.backbuffer_width; - *height = swapchain->desc.backbuffer_height; - } - else - { - struct wined3d_surface *rt; - - /* The drawable size of an FBO target is the OpenGL texture size, - * which is the power of two size. */ - rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); - *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); - } -} - struct blt_info { GLenum binding; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7f07d57..1f819e6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -94,6 +94,39 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str return view->resource; } +void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, + unsigned int *width, unsigned int *height) +{ + if (surface->container->swapchain) + { + /* The drawable size of an onscreen drawable is the surface size. + * (Actually: The window size, but the surface is created in window + * size.) */ + *width = context->current_rt.texture->resource.width; + *height = context->current_rt.texture->resource.height; + } + else if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + { + const struct wined3d_swapchain *swapchain = context->swapchain; + + /* The drawable size of a backbuffer / aux buffer offscreen target is + * the size of the current context's drawable, which is the size of + * the back buffer of the swapchain the active context belongs to. */ + *width = swapchain->desc.backbuffer_width; + *height = swapchain->desc.backbuffer_height; + } + else + { + struct wined3d_surface *rt; + + /* The drawable size of an FBO target is the OpenGL texture size, + * which is the power of two size. */ + rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; + *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); + *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); + } +} + static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops)

1 0

Austin English : ntoskrnl.exe: Add KeSetTimerEx stub.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 9e443e95f291a7e96c48fe0907e742507e21ca4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e443e95f291a7e96c48fe090… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 4 20:59:20 2016 -0500 ntoskrnl.exe: Add KeSetTimerEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 854d68d..7527659 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3150,3 +3150,12 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE break; } } + +/*********************************************************************** + * KeSetTimerEx (NTOSKRNL.EXE.@) + */ +BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDPC *dpc ) +{ + FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3a2fc92..ce7c517 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -618,7 +618,7 @@ @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer -@ stub KeSetTimerEx +@ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread

1 0

Nikolay Sivov : dwrite: Update script list with latest additions.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 4c7e136013cbfd3d9a27b0c78a2d230584bc452c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e136013cbfd3d9a27b0c78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 13:56:41 2016 +0300 dwrite: Update script list with latest additions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 12 ++++++++++++ dlls/dwrite/scripts.h | 14 +++++++++++++- tools/make_unicode | 13 +++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3f146c5..72ce813 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -169,6 +169,18 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, _OT('s','i','d','d') }, { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, _OT('t','i','r','h') }, { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('w','a','r','a') }, + { /* Adlm */ { 0x6d6c6441, 166, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','d','l','m') }, + { /* Ahom */ { 0x6d6f6841, 338, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','h','o','m') }, + { /* Hluw */ { 0x77756c48, 80, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','l','u','w') }, + { /* Bhks */ { 0x736b6842, 334, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('b','h','k','s') }, + { /* Hatr */ { 0x72746148, 127, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','a','t','r') }, + { /* Marc */ { 0x6372614d, 332, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','a','r','c') }, + { /* Mult */ { 0x746c754d, 323, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','u','l','t') }, + { /* Newa */ { 0x6177654e, 333, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('n','e','w','a') }, + { /* Hung */ { 0x676e7548, 176, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','u','n','g') }, + { /* Osge */ { 0x6567734f, 219, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('o','s','g','e') }, + { /* Sgnw */ { 0x776e6753, 95, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('s','g','n','w') }, + { /* Tang */ { 0x676e6154, 520, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('t','a','n','g') }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index 2adb98b..1e90504 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -129,5 +129,17 @@ enum unicode_script_id { Script_Siddham = 123, Script_Tirhuta = 124, Script_Warang_Citi = 125, - Script_LastId = 125 + Script_Adlam = 126, + Script_Ahom = 127, + Script_Anatolian_Hieroglyphs = 128, + Script_Bhaiksuki = 129, + Script_Hatran = 130, + Script_Marchen = 131, + Script_Multani = 132, + Script_Newa = 133, + Script_Old_Hungarian = 134, + Script_Osage = 135, + Script_SignWriting = 136, + Script_Tangut = 137, + Script_LastId = 137 }; diff --git a/tools/make_unicode b/tools/make_unicode index a0bcf8f..ab8e82b 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1450,6 +1450,19 @@ my %scripts = "Siddham" => 123, "Tirhuta" => 124, "Warang_Citi" => 125, + # Win10 RS1 + "Adlam" => 126, + "Ahom" => 127, + "Anatolian_Hieroglyphs" => 128, + "Bhaiksuki" => 129, + "Hatran" => 130, + "Marchen" => 131, + "Multani" => 132, + "Newa" => 133, + "Old_Hungarian" => 134, + "Osage" => 135, + "SignWriting" => 136, + "Tangut" => 137 ); ################################################################

1 0

Nikolay Sivov : dwrite: Set fontface pointer and font size for returned color glyph run.
by Alexandre Julliard 07 Nov '16

07 Nov '16

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 07 Nov '16

07 Nov '16

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

Nikolay Sivov : gdiplus: Use static data for identity check in GdipIsMatrixIdentity().
by Alexandre Julliard 04 Nov '16

04 Nov '16

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 04 Nov '16

04 Nov '16

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

Nikolay Sivov : msvcrt: Added _wfindnext32().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: c03e5ed3be146ef12dfeaf060000fc62c1323731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03e5ed3be146ef12dfeaf060… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 19:05:05 2016 +0300 msvcrt: Added _wfindnext32(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-filesystem-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec index dd881aa..26520b6 100644 --- a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec +++ b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec @@ -43,7 +43,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) ucrtbase._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) ucrtbase._wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) ucrtbase._wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) ucrtbase._wfindnext64 @ cdecl _wfindnext64i32(long ptr) ucrtbase._wfindnext64i32 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 03fd698..15d5339 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1547,7 +1547,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f5371b9..b4549f5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1905,7 +1905,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e402c5f..683dc6a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1929,7 +1929,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a953c38..0510b16 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1613,7 +1613,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcr120._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcr120._wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) msvcr120._wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) msvcr120._wfindnext64 @ cdecl _wfindnext64i32(long ptr) msvcr120._wfindnext64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c1edc24..4bcef50 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1226,7 +1226,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 93da303..5c34e77 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1202,7 +1202,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 3c5d16f..f4edc28 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -599,6 +599,23 @@ int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * } /********************************************************************* + * _wfindnext32 (MSVCRT.@) + */ +int CDECL MSVCRT__wfindnext32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata32_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd32(&find_data, ft); + return 0; +} + +/********************************************************************* * _wfindnext (MSVCRT.@) * * Unicode version of _findnext. diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 47608f9..83143b6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2077,7 +2077,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32

1 0

Andrey Gusev : d3dx11: Move D3DX11CreateTextureFromMemory to texture.c.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: b8140565990886cc90604d993c48ac4efe59031e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8140565990886cc90604d993… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 4 15:43:22 2016 +0100 d3dx11: Move D3DX11CreateTextureFromMemory to texture.c. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 10 ---------- dlls/d3dx11_43/texture.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index 6eb2a10..b33c235 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -65,13 +65,3 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_ return E_NOTIMPL; } - -HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, - SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, - ID3D11Resource **texture, HRESULT *hresult) -{ - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", - device, data, data_size, load_info, pump, texture, hresult); - - return E_NOTIMPL; -} diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 832f64f..65598a6 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, data, data_size, load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) {

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
47
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 2016