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

Alistair Leslie-Hughes : kernel32: Add QueryUmsThreadInformation stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 8af9344519351ba29cdb1edef16cb60f15070834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af9344519351ba29cdb1ede… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:07 2018 +0000 kernel32: Add QueryUmsThreadInformation stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23bd0b4..e358075 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1175,7 +1175,7 @@ @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation -# @ stub -arch=x86_64 QueryUmsThreadInformation +@ stdcall -arch=x86_64 QueryUmsThreadInformation(ptr long ptr long ptr) @ stdcall QueryUnbiasedInterruptTime(ptr) @ stub QueryWin31IniFilesMappedToRegistry @ stdcall QueueUserAPC(ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1730083..b26fb93 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4332,6 +4332,17 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) return FALSE; } +/*********************************************************************** + * QueryUmsThreadInformation (KERNEL32.@) + */ +BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, + void *buf, ULONG length, ULONG *ret_length) +{ + FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index a752d69..cff15b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2488,6 +2488,7 @@ WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); +WINBASEAPI BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,PVOID,ULONG,PULONG); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *);

1 0

Alexandre Julliard : makefiles: Fix typo in documentation rules generation.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 84ddddfffb41029b2b5b0d10d6e57fddee834297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ddddfffb41029b2b5b0d10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 10:45:39 2018 +0100 makefiles: Fix typo in documentation rules generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index caaa50f..457dcd0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3484,7 +3484,7 @@ static void output_subdirs( struct makefile *make ) if (!submake->staticlib) { strarray_add( &builddeps_deps, subdir ); - if (!make->appmode.count) + if (!submake->appmode.count) { output( "manpages htmlpages sgmlpages xmlpages::\n" ); output( "\t(a)cd %s && $(MAKE) $@\n", subdir );

1 0

Alexandre Julliard : Wine release 3.3
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: website Branch: master Commit: 59196e1be6dcc42bc90b441049141d22c6f7ecc6 URL: https://source.winehq.org/git/website.git/?a=commit;h=59196e1be6dcc42bc90b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:17:33 2018 +0100 Wine release 3.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018030201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018030201.xml b/news/en/2018030201.xml new file mode 100644 index 0000000..0e106e6 --- /dev/null +++ b/news/en/2018030201.xml @@ -0,0 +1,17 @@ +<news> +<date>March 2, 2018</date> +<title>Wine 3.3 Released</title> +<body> + The Wine development release 3.3 is now available. + <a href="{$root}/announce/3.3">What's new</a> in this release: +<ul> + <li>Beginnings of Vulkan support.</li> + <li>Direct3D multi-threaded command stream enabled by default.</li> + <li>Multisample textures enabled by default.</li> + <li>Support for game controllers through SDL.</li> + <li>Support for loading CIL-only .Net binaries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.3.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

Alistair Leslie-Hughes : gdiplus/tests: Check the correct value.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 51fe44ed423ad3148e1f7d936b5be64ce99de5f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51fe44ed423ad3148e1f7d93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 1 23:04:49 2018 +0000 gdiplus/tests: Check the correct value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 102c33c..c5403cb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1316,7 +1316,7 @@ static void test_empty_rect(void) status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); expect(Ok, status); - expect(FALSE, status); + expect(FALSE, result); status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); expect(Ok, status);

1 0

Andrey Gusev : gdiplus/tests: Fix copy-paste typos.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 71e2c4b429429851bddfed247b1dfcbae15f1057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e2c4b429429851bddfed24… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 2 12:03:49 2018 +0200 gdiplus/tests: Fix copy-paste typos. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 34222e7..4fd2744 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5171,11 +5171,11 @@ static void test_GdipLoadImageFromStream(void) HRESULT hr; status = GdipLoadImageFromStream(NULL, NULL); - ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); image = (void *)0xdeadbeef; status = GdipLoadImageFromStream(NULL, &image); - ok(status == InvalidParameter, "Unexected return value %d.\n", status); + ok(status == InvalidParameter, "Unexpected return value %d.\n", status); ok(image == (void *)0xdeadbeef, "Unexpected image pointer.\n"); hglob = GlobalAlloc(0, sizeof(pngimage));

1 0

Alexandre Julliard : Release 3.3.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: f17120d11b0e1272bb9742ad88eb526ac914d7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17120d11b0e1272bb9742ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:12:41 2018 +0100 Release 3.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 949 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 517 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f17120d11b0e1272bb97…

1 0

Tag wine-3.3 : Alexandre Julliard : Release 3.3
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: refs/tags/wine-3.3 Tag: 729e6cece7d63c15b7149a7f6b32dd634b004ba8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=729e6cece7d63c15b7149a7f6b3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 19:12:41 2018 +0100 Release 3.3

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in raw_blitter_blit().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 97c7b6ae9a4c0b814fa3187fab470b4da93f9717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c7b6ae9a4c0b814fa3187f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:46 2018 +0330 wined3d: Explicitly calculate the sub-resource level in raw_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4a7ed19..fdf670c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2629,8 +2629,8 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_sub_resource_idx, dst_sub_resource_idx; + unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_texture *src_texture, *dst_texture; - unsigned int src_layer, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; DWORD location; @@ -2660,7 +2660,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit TRACE("Blit using ARB_copy_image.\n"); src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); + src_level = src_sub_resource_idx % src_texture->level_count; + src_layer = src_sub_resource_idx / src_texture->level_count; + dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + dst_level = dst_sub_resource_idx % dst_texture->level_count; + dst_layer = dst_sub_resource_idx / dst_texture->level_count; location = src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2669,7 +2674,6 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - src_layer = src_sub_resource_idx / src_texture->level_count; location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2686,10 +2690,9 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - dst_layer = dst_sub_resource_idx / dst_texture->level_count; - GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, - src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_surface->texture_level, + GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_level, + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_level, dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data");

1 0

Henri Verbeet : wined3d: Explicitly pass the sub-resource level to surface_is_full_rect().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 365948bf70655c4b810585056be0fbb3e7d2339e URL: https://source.winehq.org/git/wine.git/?a=commit;h=365948bf70655c4b81058505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:47 2018 +0330 wined3d: Explicitly pass the sub-resource level to surface_is_full_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdf670c..421b01c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -246,14 +246,14 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) +static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) { unsigned int t; - t = wined3d_texture_get_level_width(surface->container, surface->texture_level); + t = wined3d_texture_get_level_width(texture, level); if ((r->left && r->right) || abs(r->right - r->left) != t) return FALSE; - t = wined3d_texture_get_level_height(surface->container, surface->texture_level); + t = wined3d_texture_get_level_height(texture, level); if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) return FALSE; return TRUE; @@ -313,7 +313,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!surface_is_full_rect(dst_surface, dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -419,7 +419,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location); - if (!surface_is_full_rect(dst_surface, &dst_rect)) + if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); @@ -2679,7 +2679,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!location) location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (surface_is_full_rect(dst_surface, dst_rect)) + if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location));

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage ().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 6639ce4b0929ddf960da6064dcc010388afa8a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6639ce4b0929ddf960da6064… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 2 12:28:48 2018 +0330 wined3d: Explicitly calculate the sub-resource level in wined3d_texture_allocate_gl_mutable_storage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebaa3b9..1ffc2a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -492,42 +492,42 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * GLenum gl_internal_format, const struct wined3d_format *format, const struct wined3d_gl_info *gl_info) { - unsigned int i, level, sub_call_count; + unsigned int level, level_count, layer, layer_count; + GLsizei width, height; + GLenum target; - sub_call_count = texture->level_count; - if (texture->target != GL_TEXTURE_2D_ARRAY) - sub_call_count *= texture->layer_count; + level_count = texture->level_count; + layer_count = texture->target == GL_TEXTURE_2D_ARRAY ? 1 : texture->layer_count; - for (i = 0; i < sub_call_count; ++i) + for (layer = 0; layer < layer_count; ++layer) { - struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei width, height; - GLenum target; + target = wined3d_texture_get_sub_resource_target(texture, layer * level_count); - level = surface->texture_level; - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + for (level = 0; level < level_count; ++level) { - height *= format->height_scale.numerator; - height /= format->height_scale.denominator; - } - target = wined3d_texture_get_sub_resource_target(texture, i); + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); + if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + height *= format->height_scale.numerator; + height /= format->height_scale.denominator; + } - TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, target, level, width, height); + 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) - { - GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, - texture->layer_count, 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - else - { - gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, - width, height, 0, format->glFormat, format->glType, NULL); - checkGLcall("glTexImage2D"); + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexImage3D(target, level, gl_internal_format, width, height, + texture->layer_count, 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } + else + { + gl_info->gl_ops.gl.p_glTexImage2D(target, level, gl_internal_format, + width, height, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } } } }

1 0