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

Alistair Leslie-Hughes : kernel32: Add EnterUmsSchedulingMode stub.
by Alexandre Julliard March 5, 2018

March 5, 2018

Module: wine Branch: master Commit: d371c451e1ac51a14728968c089e812d0b3d3c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d371c451e1ac51a14728968c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 04:00:00 2018 +0000 kernel32: Add EnterUmsSchedulingMode 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 | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 86edcfd..09af923 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -434,7 +434,7 @@ @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA # @ stub EnumerateLocalComputerNamesW -# @ stub -arch=x86_64 EnterUmsSchedulingMode +@ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) # @ stub -arch=x86_64 ExecuteUmsThread diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 63de750..b6a8a49 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4282,6 +4282,16 @@ BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEX return FALSE; } +/*********************************************************************** + * EnterUmsSchedulingMode (KERNEL32.@) + */ +BOOL WINAPI EnterUmsSchedulingMode(UMS_SCHEDULER_STARTUP_INFO *info) +{ + FIXME( "%p: stub\n", info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 7d0eaa6..3cf28af 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1939,6 +1939,7 @@ WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL); WINBASEAPI BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL); #define EndUpdateResource WINELIB_NAME_AW(EndUpdateResource) WINBASEAPI void WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit); +WINBASEAPI BOOL WINAPI EnterUmsSchedulingMode(PUMS_SCHEDULER_STARTUP_INFO); WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR); WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR); #define EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages)

1 0

Alexandre Julliard : makefiles: Fix typo in documentation rules generation.
by Alexandre Julliard March 5, 2018

March 5, 2018

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 March 2, 2018

March 2, 2018

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

Alexandre Julliard : Release 3.3.
by Alexandre Julliard March 2, 2018

March 2, 2018

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 March 2, 2018

March 2, 2018

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

Andrey Gusev : gdiplus/tests: Fix copy-paste typos.
by Alexandre Julliard March 2, 2018

March 2, 2018

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

Alistair Leslie-Hughes : gdiplus/tests: Check the correct value.
by Alexandre Julliard March 2, 2018

March 2, 2018

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

Michael Müller : dwmapi: Add stub for DwmSetIconicLivePreviewBitmap.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 7deb0909a9ace8802d2729fc17d74849ea3f4ff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7deb0909a9ace8802d2729fc… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 2 03:23:02 2018 +0000 dwmapi: Add stub for DwmSetIconicLivePreviewBitmap. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 697cefc..3744719 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -80,7 +80,7 @@ @ stdcall DwmRegisterThumbnail(long long ptr) # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration -@ stub DwmSetIconicLivePreviewBitmap +@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long) @ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 7ac0b2b..0e6ba3b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -270,6 +270,15 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params }; /********************************************************************** + * DwmSetIconicLivePreviewBitmap (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) +{ + FIXME("(%p %p %p %x) stub\n", hwnd, hbmp, pos, flags); + return S_OK; +}; + +/********************************************************************** * DwmSetIconicThumbnail (DWMAPI.@) */ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags)

1 0

Jacek Caban : jscript: Properly support missing array elements in stringify_array.
by Alexandre Julliard March 2, 2018

March 2, 2018

Module: wine Branch: master Commit: 5f9f9a45e9afe84dbcf69b9cb813dc983a70a7cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f9a45e9afe84dbcf69b9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 23:58:17 2018 +0100 jscript: Properly support missing array elements in stringify_array. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 7d69cf5..fc23b54 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -545,15 +545,18 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) } hres = jsdisp_get_idx(obj, i, &val); - if(FAILED(hres)) - return hres; - - hres = stringify(ctx, val); - if(FAILED(hres)) + if(SUCCEEDED(hres)) { + hres = stringify(ctx, val); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE && !append_string(ctx, nullW)) + return E_OUTOFMEMORY; + }else if(hres == DISP_E_UNKNOWNNAME) { + if(!append_string(ctx, nullW)) + return E_OUTOFMEMORY; + }else { return hres; - - if(hres == S_FALSE && !append_string(ctx, nullW)) - return E_OUTOFMEMORY; + } } if((length && *ctx->gap && !append_char(ctx, '\n')) || !append_char(ctx, ']'))

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in raw_blitter_blit().
by Alexandre Julliard March 2, 2018

March 2, 2018

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