wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Alexandre Julliard : msvcrt: Import fabs() from musl.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 44e122e04e2f37ef11cded89ab3a8fd2369b2b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e122e04e2f37ef11cded89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 09:58:19 2020 +0100 msvcrt: Import fabs() from musl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 069a2f7f387..f5e933fc188 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -717,10 +717,14 @@ float CDECL MSVCRT_ceilf( float x ) /********************************************************************* * fabsf (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c */ float CDECL MSVCRT_fabsf( float x ) { - return fabsf(x); + union { float f; UINT32 i; } u = { x }; + u.i &= 0x7fffffff; + return u.f; } /********************************************************************* @@ -1610,10 +1614,14 @@ float CDECL MSVCRT_fmaf( float x, float y, float z ) /********************************************************************* * fabs (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c */ double CDECL MSVCRT_fabs( double x ) { - return fabs(x); + union { double f; UINT64 i; } u = { x }; + u.i &= ~0ull >> 1; + return u.f; } /*********************************************************************

1 0

Alexandre Julliard : msvcrt: Import _copysign() from musl.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: b1bc99f02553cc7db81ecbc567690687e1b4adb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1bc99f02553cc7db81ecbc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 09:57:52 2020 +0100 msvcrt: Import _copysign() from musl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8e8324b8fbe..069a2f7f387 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -177,12 +177,15 @@ float CDECL MSVCRT__chgsignf( float num ) /********************************************************************* * _copysignf (MSVCRT.@) + * + * Copied from musl: src/math/copysignf.c */ -float CDECL MSVCRT__copysignf( float num, float sign ) +float CDECL MSVCRT__copysignf( float x, float y ) { - if (signbit(sign)) - return signbit(num) ? num : -num; - return signbit(num) ? -num : num; + union { float f; UINT32 i; } ux = { x }, uy = { y }; + ux.i &= 0x7fffffff; + ux.i |= uy.i & 0x80000000; + return ux.f; } /********************************************************************* @@ -2126,12 +2129,15 @@ int CDECL MSVCRT_fesetround(int round_mode) /********************************************************************* * _copysign (MSVCRT.@) + * + * Copied from musl: src/math/copysign.c */ -double CDECL MSVCRT__copysign(double num, double sign) +double CDECL MSVCRT__copysign( double x, double y ) { - if (signbit(sign)) - return signbit(num) ? num : -num; - return signbit(num) ? -num : num; + union { double f; UINT64 i; } ux = { x }, uy = { y }; + ux.i &= ~0ull >> 1; + ux.i |= uy.i & 1ull << 63; + return ux.f; } /*********************************************************************

1 0

Michael Stefaniuc : oleview: Inline WCHAR strings of length 1.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: d53577ef7559945f00a9ce7a0389d4d88464c240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53577ef7559945f00a9ce7a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:19 2020 +0100 oleview: Inline WCHAR strings of length 1. Merge some of those strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 347 +++++++++++++++------------------------------ 1 file changed, 117 insertions(+), 230 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d53577ef7559945f00a9…

1 0

Michael Stefaniuc : userenv: Use wide-char string literals.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: d7e43c9e3108d5d6f78bc74d3dfa6a918ecfea16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e43c9e3108d5d6f78bc74d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:18 2020 +0100 userenv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 045bac0cfe1..58e610f6c6e 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -418,7 +418,6 @@ BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir, BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize ) { - static const WCHAR slashW[] = {'\\',0}; TOKEN_USER *t; WCHAR *userW = NULL, *dirW = NULL; DWORD len, dir_len, domain_len; @@ -459,7 +458,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, goto done; } lstrcpyW( lpProfileDir, dirW ); - lstrcatW( lpProfileDir, slashW ); + lstrcatW( lpProfileDir, L"\\" ); lstrcatW( lpProfileDir, userW ); *lpcchSize = len; ret = TRUE; @@ -533,11 +532,8 @@ end: return ret; } -static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; - BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) { - static const WCHAR ProfilesDirectory[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; LONG l; HKEY key; BOOL ret = FALSE; @@ -552,13 +548,15 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) return FALSE; } - l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, KEY_READ, &key); + l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, KEY_READ, &key); if (l) { SetLastError(l); return FALSE; } - l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, NULL, &len); + l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL, NULL, &len); if (l) { SetLastError(l); @@ -570,7 +568,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) SetLastError(ERROR_OUTOFMEMORY); goto end; } - l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, + l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL, (BYTE *)unexpanded_profiles_dir, &len); if (l) {

1 0

Michael Stefaniuc : taskschd: Use wide-char string literals.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 48e35424a65ddb89e9877e72f3a997c6e97a6617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e35424a65ddb89e9877e72… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:17 2020 +0100 taskschd: Use wide-char string literals. Also merge some strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder.c | 5 +- dlls/taskschd/regtask.c | 3 +- dlls/taskschd/task.c | 297 +++++++++++++++++------------------------------- 3 files changed, 108 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48e35424a65ddb89e987…

1 0

Michael Stefaniuc : kernel32: Use wide-char string literals.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: c5ff8ff27ef5bdba70be0d8d633920e1821af50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ff8ff27ef5bdba70be0d8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:16 2020 +0100 kernel32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 54 ++++++++++++++++-------------------------------- dlls/kernel32/console.c | 5 +---- dlls/kernel32/debugger.c | 12 ++++------- dlls/kernel32/file.c | 4 +--- dlls/kernel32/lcformat.c | 3 +-- dlls/kernel32/module.c | 6 ++---- dlls/kernel32/process.c | 5 ++--- dlls/kernel32/profile.c | 41 ++++++++++++++---------------------- dlls/kernel32/resource.c | 3 +-- dlls/kernel32/volume.c | 4 ++-- 10 files changed, 47 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5ff8ff27ef5bdba70be…

1 0

Derek Lesho : mf/session: Call session_command_complete after NotifyTopology command.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: 86e6c0bc28177a3794950fe2a13b8208400b6194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e6c0bc28177a3794950fe2… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 16 15:08:38 2020 -0600 mf/session: Call session_command_complete after NotifyTopology command. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index cf351c003e7..dffd5113ff9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2075,6 +2075,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, break; case SESSION_CMD_QM_NOTIFY_TOPOLOGY: IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + session_command_complete(session); break; case SESSION_CMD_SA_READY: topo_node = session_get_node_by_id(session, op->u.sa_ready.node_id);

1 0

Rémi Bernon : widl: Prefer mangled name over typedef in WinRT mode.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: a35ca92362750f8a49fc15efddc2c48caa07959e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35ca92362750f8a49fc15ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:29 2020 +0100 widl: Prefer mangled name over typedef in WinRT mode. For types under a non-global namespace. MIDL generates prefixed mangled name for every use of enum, struct and union types. When the types are in the global namespace, the typedef name is used instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 22 ++++++++++++++-------- tools/widl/typetree.c | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 743d86f0ee9..015bbe2ece7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,7 +192,7 @@ const char *get_name(const var_t *v) return v->name; } -static void write_fields(FILE *h, var_list_t *fields) +static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) { unsigned nameless_struct_cnt = 0, nameless_struct_i = 0, nameless_union_cnt = 0, nameless_union_i = 0; const char *name; @@ -250,7 +250,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_v(h, &v->declspec, TRUE, v->declonly, name, NAME_DEFAULT); + write_type_v(h, &v->declspec, TRUE, v->declonly, name, name_type); fprintf(h, ";\n"); } } @@ -322,7 +322,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i if ((ds->qualifier & TYPE_QUALIFIER_CONST) && (type_is_alias(t) || !is_ptr(t))) fprintf(h, "const "); - if (type_is_alias(t)) fprintf(h, "%s", t->name); + if (!winrt_mode && type_is_alias(t)) fprintf(h, "%s", t->name); else { switch (type_get_type_detect_alias(t)) { case TYPE_ENUM: @@ -347,9 +347,9 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i t->written = TRUE; indentation++; if (type_get_type(t) != TYPE_STRUCT) - write_fields(h, type_encapsulated_union_get_fields(t)); + write_fields(h, type_encapsulated_union_get_fields(t), name_type); else - write_fields(h, type_struct_get_fields(t)); + write_fields(h, type_struct_get_fields(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -362,7 +362,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else fprintf(h, "union {\n"); t->written = TRUE; indentation++; - write_fields(h, type_union_get_cases(t)); + write_fields(h, type_union_get_cases(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -464,9 +464,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i break; } case TYPE_ALIAS: - /* handled elsewhere */ - assert(0); + { + const decl_spec_t *ds = type_alias_get_aliasee(t); + int in_namespace = ds && ds->type && ds->type->namespace && !is_global_namespace(ds->type->namespace); + if (!in_namespace) fprintf(h, "%s", t->name); + else write_type_left(h, ds, name_type, declonly, write_callconv); break; + } } } } @@ -801,6 +805,8 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, int declonly) { + type_t *t = type_alias_get_aliasee_type(type); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) return; fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); fprintf(header, ";\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e9afc6fdd28..c0547b36a96 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -82,7 +82,7 @@ const char *type_get_name(const type_t *type, enum name_type name_type) case NAME_DEFAULT: return type->name; case NAME_C: - return type->c_name; + return type->c_name ? type->c_name : type->name; } assert(0);

1 0

Rémi Bernon : widl: Restrict some keywords to WinRT mode only.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: a154a42c0d72ed863d317cdbad9678ffa212467c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a154a42c0d72ed863d317cdb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:28 2020 +0100 widl: Restrict some keywords to WinRT mode only. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 339 ++++++++++++++++++++++++++-------------------------- 1 file changed, 170 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a154a42c0d72ed863d31…

1 0

Rémi Bernon : widl: Support repetition for some attributes.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: 92eb5ef5a1ada34853b57626b4e5201010decc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92eb5ef5a1ada34853b57626… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:27 2020 +0100 widl: Support repetition for some attributes. Some attributes can be specified multiple times, this is the case for instance for "custom" attribute, as well as WinRT "static". Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: PuetzKevinA(a)JohnDeere.com Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 249 +++++++++++++++++++++++++++------------------------- 1 file changed, 127 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92eb5ef5a1ada34853b5…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020