March 2018 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Resource size should always be non-zero in resource_init().
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: d3baf0355af7520144449a9ac098ee5c380661c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3baf0355af7520144449a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:07 2018 +0330 wined3d: Resource size should always be non-zero in resource_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97f7aec..8968c16 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,6 +91,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } + if (!size) + ERR("Attempting to create a zero-sized resource.\n"); + for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { if (resource_types[i].type != type @@ -188,17 +191,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; - if (size) - { - if (!wined3d_resource_allocate_sysmem(resource)) - { - ERR("Failed to allocate system memory.\n"); - return E_OUTOFMEMORY; - } - } - else + if (!wined3d_resource_allocate_sysmem(resource)) { - resource->heap_memory = NULL; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } if (!(usage & WINED3DUSAGE_PRIVATE))

1 0

Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: df408ba3abd75c10af35d647728087cf447d29b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df408ba3abd75c10af35d647… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:17 2018 +0000 pidgen: Add PIDGenSimpA stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84..cf165ea 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c369..8b7e778 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW

1 0

Henri Verbeet : wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture().
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: 614102c013842efb2f17b704dc8b39cbb29492d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=614102c013842efb2f17b704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:08 2018 +0330 wined3d: Merge texture2d_prepare_texture() and texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 126 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ba0fa63..124aa31 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -441,7 +441,7 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * const struct wined3d_gl_info *gl_info) { unsigned int level, level_count, layer, layer_count; - GLsizei width, height; + GLsizei width, height, depth; GLenum target; level_count = texture->level_count; @@ -464,10 +464,12 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * TRACE("texture %p, layer %u, level %u, target %#x, width %u, height %u.\n", texture, layer, level, target, width, height); - if (texture->target == GL_TEXTURE_2D_ARRAY) + if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { + depth = wined3d_texture_get_level_depth(texture, level); GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); + target == GL_TEXTURE_2D_ARRAY ? texture->layer_count : depth, 0, + format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } else @@ -491,6 +493,10 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture switch (texture->target) { + case GL_TEXTURE_3D: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, wined3d_texture_get_level_depth(texture, 0))); + break; case GL_TEXTURE_2D_ARRAY: GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, width, height, texture->layer_count)); @@ -1556,10 +1562,17 @@ static void wined3d_texture_force_reload(struct wined3d_texture *texture) } } +/* Context activation is done by the caller. */ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_color_key_conversion *conversion; + GLenum internal; + + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key && !(texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) @@ -1574,7 +1587,36 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - texture->texture_ops->texture_prepare_texture(texture, context, srgb); + if (format->conv_byte_count) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + } + else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) + { + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); + TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); + } + + wined3d_texture_bind_and_dirtify(texture, context, srgb); + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + + TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); + + if (wined3d_texture_use_immutable_storage(texture, gl_info)) + wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + else + wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); texture->flags |= alloc_flag; } @@ -1771,53 +1813,10 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } -/* Context activation is done by the caller. */ -static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_color_key_conversion *conversion; - GLenum internal; - - TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); - - if (format->conv_byte_count) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - } - else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) - { - texture->flags |= WINED3D_TEXTURE_CONVERTED; - format = wined3d_get_format(gl_info, conversion->dst_format, texture->resource.usage); - TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); - } - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - if (!internal) - FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); - - TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); - else - wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); -} - static const struct wined3d_texture_ops texture2d_ops = { texture2d_upload_data, texture2d_load_location, - texture2d_prepare_texture, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2646,43 +2645,10 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return TRUE; } -static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) -{ - const struct wined3d_format *format = texture->resource.format; - GLenum internal = srgb ? format->glGammaInternal : format->glInternal; - unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; - - wined3d_texture_bind_and_dirtify(texture, context, srgb); - - if (wined3d_texture_use_immutable_storage(texture, gl_info)) - { - GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, - wined3d_texture_get_level_width(texture, 0), - wined3d_texture_get_level_height(texture, 0), - wined3d_texture_get_level_depth(texture, 0))); - checkGLcall("glTexStorage3D"); - } - else - { - for (i = 0; i < sub_count; ++i) - { - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, - wined3d_texture_get_level_width(texture, i), - wined3d_texture_get_level_height(texture, i), - wined3d_texture_get_level_depth(texture, i), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - } -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_upload_data, texture3d_load_location, - texture3d_prepare_texture, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 718ee63..302b6ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3088,8 +3088,6 @@ struct wined3d_texture_ops const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); - void (*texture_prepare_texture)(struct wined3d_texture *texture, - struct wined3d_context *context, BOOL srgb); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001

1 0

Henri Verbeet : wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data().
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: 89cd64bcb7fe4f9fb791a542a82ef9868252d628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cd64bcb7fe4f9fb791a542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:09 2018 +0330 wined3d: Pass a wined3d_box structure to wined3d_surface_upload_data(). For consistency with wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++++------------------- dlls/wined3d/texture.c | 18 ++++++++------- dlls/wined3d/wined3d_private.h | 6 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89cd64bcb7fe4f9fb791…

1 0

Mark Jansen : comctl32/tests: Prevent a possible nullptr dereference.
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: f94d0e7b3aa9cb9af17e7c36212d95f20fbbce54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94d0e7b3aa9cb9af17e7c36… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Mar 16 22:57:15 2018 +0100 comctl32/tests: Prevent a possible nullptr dereference. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3838563..1c307e4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2047,9 +2047,9 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen && bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) || - broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && + (broken_expect && broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen && - bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue), + bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)), "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i, bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue, expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue);

1 0

Henri Verbeet : wined3d: Pass the destination x/ y coordinates as separate parameters to wined3d_surface_upload_data().
by Alexandre Julliard March 19, 2018

March 19, 2018

Module: wine Branch: master Commit: d4b0249c48e0601bdb3ed38b20113b364c93b298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b0249c48e0601bdb3ed38b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:10 2018 +0330 wined3d: Pass the destination x/y coordinates as separate parameters to wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 51 +++++++++++++++++++----------------------- dlls/wined3d/texture.c | 10 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4b0249c48e0601bdb3e…

1 0

Alexandre Julliard : Wine release 2.0.5
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: website Branch: master Commit: 26866d63248c5209e8181440370e79440197ecfb URL: https://source.winehq.org/git/website.git/?a=commit;h=26866d63248c5209e8181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 18 15:02:43 2018 +0100 Wine release 2.0.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018031801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018031801.xml b/news/en/2018031801.xml new file mode 100644 index 0000000..85d969b --- /dev/null +++ b/news/en/2018031801.xml @@ -0,0 +1,12 @@ +<news> +<date>March 18, 2018</date> +<title>Wine 2.0.5 Released</title> +<body> + The Wine maintenance release 2.0.5 is now available. + <a href="{$root}/announce/2.0.5">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Henri Verbeet : wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: c5684b5e8a94ecbc773e5a592b6f844aac42b071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5684b5e8a94ecbc773e5a59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:33 2017 +0100 wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM. For consistency with the texture code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a70c55615731a99e1a834f6fcc62766a9d228d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7d0552b..f87c4b3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep 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_MAP 0x20 /* There has been at least one map since the last preload. */ @@ -251,7 +251,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi buffer->buffer_object_usage = gl_usage; - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { buffer_invalidate_bo_range(buffer, 0, 0); } @@ -608,7 +608,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; break; case WINED3D_LOCATION_BUFFER: @@ -671,8 +671,8 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER)) - buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; + if (!(flags & WINED3D_BUFFER_PIN_SYSMEM)) + buffer->flags &= ~WINED3D_BUFFER_PIN_SYSMEM; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); buffer_destroy_buffer_object(buffer, context); @@ -1051,7 +1051,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("No conversion needed.\n"); /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM)) return; buffer_direct_upload(buffer, context, flags); @@ -1102,7 +1102,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { @@ -1212,7 +1212,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) return; } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) && buffer->buffer_object) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) && buffer->buffer_object) { struct wined3d_device *device = buffer->resource.device; const struct wined3d_gl_info *gl_info; @@ -1483,7 +1483,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ TRACE("Using doublebuffer mode.\n"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on

1 0

Henri Verbeet : wined3d: Try to avoid stalling on dynamic buffer maps.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 77a1b76ee6a9686a2184e6372fa69525e30bd7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a1b76ee6a9686a2184e637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:40 2017 +0100 wined3d: Try to avoid stalling on dynamic buffer maps. Particularly for applications that use dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f87c4b3..d7eada7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1102,7 +1102,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) {

1 0

Thomas Faber : ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 806438fb4fad28533d22910d1b8c1b46eda20ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=806438fb4fad28533d22910d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jan 16 19:19:34 2018 +0100 ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42f742e1be8a4f3b26ed3d1a343f17fe55cbf322) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68..b978438 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1453,8 +1453,11 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + WCHAR **new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, + 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE;

1 0