November 2016 - Wine-commits

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

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

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

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: Avoid unsynchronized buffer update when reloading whole buffer.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: c259854a0afc5e4fb8644af7c5c979f312f954f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c259854a0afc5e4fb8644af7c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 4 13:43:45 2016 +0100 wined3d: Avoid unsynchronized buffer update when reloading whole buffer. Fixes bc019fcbbd7f0014280a292bc58ef618cfbe34c7. Previously, we had the NOSYNC flag instead of the SYNC flag. When the NOSYNC flag was set the buffer was mapped with GL_MAP_UNSYNCHRONIZED_BIT. Now, when the SYNC flag is not set the buffer is mapped with GL_MAP_UNSYNCHRONIZED_BIT. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 564b1fc..f686855 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1009,9 +1009,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_invalidate_bo_range(buffer, 0, 0); /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application - * cleared for unsynchronized updates + * cleared for unsynchronized updates. */ - flags = 0; + flags = WINED3D_BUFFER_SYNC; } else {

1 0

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

07 Nov '16

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

Józef Kucia : wined3d: Return location from wined3d_buffer_get_memory().
by Alexandre Julliard 07 Nov '16

07 Nov '16

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

Nikolay Sivov : d2d1: Fix CreateGeometryGroup() prototype.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 78b6402a08cefb8a09645a31443f990d994a410f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b6402a08cefb8a09645a314… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 20:04:23 2016 +0300 d2d1: Fix CreateGeometryGroup() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 6 +++--- include/d2d1.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b83d221..6de0271 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -163,10 +163,10 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *iface, - D2D1_FILL_MODE fill_mode, ID2D1Geometry *geometry, UINT32 geometry_count, ID2D1GeometryGroup **group) + D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { - FIXME("iface %p, fill_mode %#x, geometry %p, geometry_count %u, group %p stub!\n", - iface, fill_mode, geometry, geometry_count, group); + FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", + iface, fill_mode, geometries, geometry_count, group); return E_NOTIMPL; } diff --git a/include/d2d1.idl b/include/d2d1.idl index cb07cfa..4a0b2ce 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1206,7 +1206,7 @@ interface ID2D1Factory : IUnknown ); HRESULT CreateGeometryGroup( [in] D2D1_FILL_MODE fill_mode, - [in, size_is(geometry_count)] ID2D1Geometry *geometry, + [in, size_is(geometry_count)] ID2D1Geometry **geometries, [in] UINT32 geometry_count, [out] ID2D1GeometryGroup **group );

1 0

Nikolay Sivov : include: Update D2D1_DRAW_TEXT_OPTIONS enum.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 7debee64dbc498bd35b8b7a5a7f6784a1e39106e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7debee64dbc498bd35b8b7a5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 00:12:39 2016 +0300 include: Update D2D1_DRAW_TEXT_OPTIONS enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 4a0b2ce..7a903ca 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -235,6 +235,8 @@ typedef enum D2D1_DRAW_TEXT_OPTIONS { D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001, D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002, + D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004, + D2D1_DRAW_TEXT_OPTIONS_DISABLE_COLOR_BITMAP_SNAPPING = 0x00000008, D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000, D2D1_DRAW_TEXT_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_DRAW_TEXT_OPTIONS;

1 0

Jacek Caban : urlmon/tests: Removed invalid test.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 8e40577a1a714c045acb39a8585f0d5ced81f87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e40577a1a714c045acb39a85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 14:06:22 2016 +0100 urlmon/tests: Removed invalid test. It's a race. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4fa11c7..9ccd8ef 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3410,10 +3410,7 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) } ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); - if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) - ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - else - IBindCtx_Release(bctx); + IBindCtx_Release(bctx); if(emulate_protocol) CoRevokeClassObject(regid);

1 0