January 2018 - Wine-commits

Alex Henrie : msvcrt: Don' t include MSVC 7.0+ exception functions in SOs for older DLLs.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 9be95285c38a4ffada8136a1fe25807d640db68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be95285c38a4ffada8136a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:42 2018 -0700 msvcrt: Don't include MSVC 7.0+ exception functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 8d13e7f..13698f8 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -41,7 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +#if _MSVCR_VER>=70 && _MSVCR_VER<=71 static MSVCRT_security_error_handler security_error_handler; +#endif static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; @@ -294,6 +296,8 @@ BOOL CDECL MSVCRT___uncaught_exception(void) return FALSE; } +#if _MSVCR_VER>=70 && _MSVCR_VER<=71 + /********************************************************************* * _set_security_error_handler (MSVCR70.@) */ @@ -321,6 +325,8 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#endif /* _MSVCR_VER>=70 && _MSVCR_VER<=71 */ + #if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) @@ -470,8 +476,10 @@ struct __std_exception_data { MSVCRT_bool dofree; }; +#if _MSVCR_VER>=140 + /********************************************************************* - * __std_exception_copy (MSVCRT.@) + * __std_exception_copy (UCRTBASE.@) */ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, struct __std_exception_data *dst) @@ -488,7 +496,7 @@ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, } /********************************************************************* - * __std_exception_destroy (MSVCRT.@) + * __std_exception_destroy (UCRTBASE.@) */ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) { @@ -499,3 +507,5 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) data->what = NULL; data->dofree = 0; } + +#endif /* _MSVCR_VER>=140 */

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ exit functions in SOs for older DLLs.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: b6ec8980c57c8278ceb57f659693246212566ae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ec8980c57c8278ceb57f65… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:43 2018 -0700 msvcrt: Don't include MSVC 8.0+ exit functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index d0e93d7..7e18055 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -204,6 +204,7 @@ void CDECL MSVCRT_abort(void) MSVCRT__exit(3); } +#if _MSVCR_VER>=80 /********************************************************************* * _set_abort_behavior (MSVCR80.@) */ @@ -218,6 +219,7 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m MSVCRT_abort_behavior = (MSVCRT_abort_behavior & ~mask) | (flags & mask); return old; } +#endif /********************************************************************* * _wassert (MSVCRT.@) @@ -346,6 +348,8 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } +#if _MSVCR_VER>=140 + /********************************************************************* * _crt_atexit (UCRTBASE.@) */ @@ -462,6 +466,8 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } +#endif /* _MSVCR_VER>=140 */ + #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@)

1 0

Alex Henrie : msvcrt: Don' t include MSVC 11.0+ function _wcreate_locale in SOs for older DLLs.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 6a76d027f2a144ac7321db8fa3fcb6bf95414c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a76d027f2a144ac7321db8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:44 2018 -0700 msvcrt: Don't include MSVC 11.0+ function _wcreate_locale in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6d5ceb5..c37989d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1641,8 +1641,9 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return loc; } +#if _MSVCR_VER >= 110 /********************************************************************* - * _wcreate_locale (MSVCRT.@) + * _wcreate_locale (MSVCR110.@) */ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t *locale) { @@ -1665,6 +1666,7 @@ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t MSVCRT_free(str); return loc; } +#endif /********************************************************************* * setlocale (MSVCRT.@)

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ function _CRT_RTC_INITW in SOs for older DLLs.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 6defbd1b503ed450943bbe3623c058a0b0ada8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6defbd1b503ed450943bbe36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:45 2018 -0700 msvcrt: Don't include MSVC 8.0+ function _CRT_RTC_INITW in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d784dec..8f18aa4 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -457,7 +457,6 @@ void * CDECL _encoded_null(void) #endif /* _MSVCR_VER>=80 */ #if _MSVCR_VER>=70 - /********************************************************************* * _CRT_RTC_INIT (MSVCR70.@) */ @@ -466,9 +465,12 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); return NULL; } +#endif + +#if _MSVCR_VER>=80 /********************************************************************* - * _CRT_RTC_INITW (MSVCR70.@) + * _CRT_RTC_INITW (MSVCR80.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -476,10 +478,6 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } -#endif /* _MSVCR_VER>=70 */ - -#if _MSVCR_VER>=80 - /********************************************************************* * _byteswap_ushort (MSVCR80.@) */

1 0

Alex Henrie : msvcrt: Fix mistakes in comments.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: f0e74961e1da1cb601064555f3218675ee06dc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e74961e1da1cb601064555… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:46 2018 -0700 msvcrt: Fix mistakes in comments. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c37989d..088e1b7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -451,7 +451,7 @@ char* CDECL _Getdays(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getdays (MSVCR100.@) + * _W_Getdays (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getdays(void) { @@ -519,7 +519,7 @@ char* CDECL _Getmonths(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getmonths (MSVCR100.@) + * _W_Getmonths (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getmonths(void) { diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 89400f8..9b48011 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1040,7 +1040,7 @@ double CDECL MSVCRT__chgsign(double num) } /********************************************************************* - * __control87_2 (MSVCRT.@) + * __control87_2 (MSVCR80.@) * * Not exported by native msvcrt, added in msvcr80. */

1 0

Józef Kucia : d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource().
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: 4a6d3c7eac0ef5941030998a0ad6bba9223b33e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6d3c7eac0ef5941030998a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 10 17:26:33 2018 +0100 d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource(). 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4d9f34e..e7fd3a7 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -152,6 +152,7 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN; /* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 177c0cc..17fb4b1 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_texture3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); +} + struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) { if (!iface) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index e919c58..c9e137c 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( (ID3D10Texture2D *)resource)->wined3d_texture); + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture3D( + (ID3D10Texture3D *)resource)->wined3d_texture); + default: FIXME("Unhandled resource dimension %#x.\n", dimension); return NULL;

1 0

Józef Kucia : wined3d: Fix linestrips output for geometry shaders.
by Alexandre Julliard 10 Jan '18

10 Jan '18

Module: wine Branch: master Commit: b0415bbc22e9f682ca6496f09af9a0131b9a13eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0415bbc22e9f682ca6496f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 10 17:30:56 2018 +0100 wined3d: Fix linestrips output for geometry shaders. 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/shader_sm4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7c3e8b8..3963cbc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -341,7 +341,7 @@ enum wined3d_sm4_register_type enum wined3d_sm4_output_primitive_type { WINED3D_SM4_OUTPUT_PT_POINTLIST = 0x1, - WINED3D_SM4_OUTPUT_PT_LINELIST = 0x3, + WINED3D_SM4_OUTPUT_PT_LINESTRIP = 0x3, WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, }; @@ -470,7 +470,7 @@ static const enum wined3d_primitive_type output_primitive_type_table[] = /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_POINTLIST */ WINED3D_PT_POINTLIST, /* UNKNOWN */ WINED3D_PT_UNDEFINED, - /* WINED3D_SM4_OUTPUT_PT_LINELIST */ WINED3D_PT_LINELIST, + /* WINED3D_SM4_OUTPUT_PT_LINESTRIP */ WINED3D_PT_LINESTRIP, /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ WINED3D_PT_TRIANGLESTRIP, };

1 0

Julian Rüger : German translation for release 3.0-rc5
by Jeremy Newman 10 Jan '18

10 Jan '18

Module: website Branch: master Commit: 28f727ff3e9e22923d33e37eb8ee33e4f8a303d4 URL: https://source.winehq.org/git/website.git/?a=commit;h=28f727ff3e9e22923d33e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 10 10:28:48 2018 +0100 German translation for release 3.0-rc5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018010501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018010501.xml b/news/de/2018010501.xml new file mode 100644 index 0000000..9877bce --- /dev/null +++ b/news/de/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>5. Januar 2018</date> +<title>Wine 3.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 3.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : winhlp32: Remove redundant comparison.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 9519216fa07d159e5f474a396dc6b86eee80a24a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9519216fa07d159e5f474a39… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 9 13:25:30 2018 +0200 winhlp32: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 0708034..2ac3d2f 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1666,7 +1666,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) option = *cmdline; if (option) cmdline++; - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; switch (option) { case 'i':

1 0

Jacek Caban : schtasks: Make /change argument case insensitive.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: a148e5555df63d951e9f36db39b6aa23606f53c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a148e5555df63d951e9f36db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 9 13:08:06 2018 +0100 schtasks: Make /change argument case insensitive. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 2 +- programs/schtasks/tests/schtasks.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index c620154..24d6876 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -130,7 +130,7 @@ int wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!strcmpW(argv[1], change_optW)) + else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index b8a9739..b65025f 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -175,12 +175,12 @@ START_TEST(schtasks) register_task("wine\\test\\winetest"); - r = run_command("schtasks /change /tn wine\\test\\winetest /enable"); + r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); ok(r == 0, "r = %u\n", r); unregister_task("wine\\test\\winetest"); - r = run_command("schtasks /change /tn wine\\test\\winetest /enable"); + r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r); ITaskFolder_Release(root);

1 0