November 2017 - Wine-Devel - list.winehq.org

[PATCH v4 1/2] include: Add roparameterizediid.idl
by Alex Henrie Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: Removed "ns_prefix" and corrected function order. This is what I get for trying to write a header file based solely on MSDN... --- include/Makefile.in | 1 + include/roparameterizediid.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..85ee57d6f9 --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,95 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt +#endif + +import "wtypes.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetWinRtInterface( + GUID iid + ); + + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetRuntimeClassParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *base_type + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 3

[PATCH 3/3] advapi32: Fix parsing empty DACL/SACL security descriptor strings.
by Hans Leidekker Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a762d5a826..7281e01d79 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4314,7 +4314,7 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) DWORD flags = 0; LPCWSTR szAcl = *StringAcl; - while (*szAcl != '(') + while (*szAcl && *szAcl != '(') { if (*szAcl == 'P') { @@ -4625,7 +4625,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, pAcl->AclRevision = ACL_REVISION; pAcl->Sbz1 = 0; pAcl->AclSize = length; - pAcl->AceCount = acecount++; + pAcl->AceCount = acecount; pAcl->Sbz2 = 0; } return TRUE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 08d3705771..e86fe21fed 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4101,6 +4101,8 @@ static void test_ConvertStringSecurityDescriptor(void) PSECURITY_DESCRIPTOR pSD; static const WCHAR Blank[] = { 0 }; unsigned int i; + ULONG size; + ACL *acl; static const struct { const char *sidstring; @@ -4211,6 +4213,33 @@ static void test_ConvertStringSecurityDescriptor(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); if (ret) LocalFree(pSD); + + /* empty DACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("D:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "got %u\n", acl->AclRevision); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); + + /* empty SACL */ + size = 0; + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA("S:", SDDL_REVISION_1, &pSD, &size); + ok(ret, "unexpected error %u\n", GetLastError()); + ok(size == sizeof(SECURITY_DESCRIPTOR_RELATIVE) + sizeof(ACL), "got %u\n", size); + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(!acl->Sbz1, "got %u\n", acl->Sbz1); + ok(acl->AclSize == sizeof(*acl), "got %u\n", acl->AclSize); + ok(!acl->AceCount, "got %u\n", acl->AceCount); + ok(!acl->Sbz2, "got %u\n", acl->Sbz2); + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) -- 2.11.0

1 0

[PATCH 2/3] advapi32: Add traces to ConvertStringSecurityDescriptorToSecurityDescriptorA/W.
by Hans Leidekker Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bd15a027b9..a762d5a826 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4793,6 +4793,9 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( BOOL ret; LPWSTR StringSecurityDescriptorW; + TRACE("%s, %u, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); + if(!StringSecurityDescriptor) return FALSE; @@ -4818,7 +4821,8 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( SECURITY_DESCRIPTOR* psd; BOOL bret = FALSE; - TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + TRACE("%s, %u, %p, %p\n", debugstr_w(StringSecurityDescriptor), StringSDRevision, + SecurityDescriptor, SecurityDescriptorSize); if (GetVersion() & 0x80000000) { -- 2.11.0

1 0

[PATCH 1/3] advapi32; Remove unused foward declarations.
by Hans Leidekker Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ae9d6bdeb1..bd15a027b9 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,16 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes); -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl); -static BYTE ParseAceStringType(LPCWSTR* StringAcl); -static DWORD ParseAceStringRights(LPCWSTR* StringAcl); -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes); -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); typedef struct _ACEFLAG { -- 2.11.0

1 0

[PATCH] ucrtbase: Always return the full string length in __stdio_common_vs[w]printf for a NULL buffer
by Martin Storsjo Nov. 17, 2017

Nov. 17, 2017

If the target is a NULL buffer (with a zero length), we should always return the full size the format would have needed, even if UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR isn't specified. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- I know the subject line should be shorter - feel free to change it to a shorter form. --- dlls/msvcrt/wcs.c | 4 ++++ dlls/ucrtbase/tests/printf.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 88f52e0..0c54800 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -764,6 +764,8 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { @@ -1282,6 +1284,8 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, &ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + if(!str) + return ret; if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) return ret>len ? -1 : ret; if(ret>=len) { diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 77fb560..0e38003 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -215,6 +215,10 @@ static void test_snprintf (void) ok (vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, + "Failure to snprintf to NULL\n"); } static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -289,6 +293,13 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + ok (vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, + "Failure to swprintf to NULL\n"); } static int WINAPIV vfprintf_wrapper(FILE *file, -- 2.7.4

2 1

Re: [PATCH] V3 msvcrt : add arm implementation for _control87
by Piotr Caban Nov. 17, 2017

Nov. 17, 2017

Hi, On 11/12/17 16:13, Vijay Kiran Kamuju wrote: > + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); > + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; > + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; > + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; > + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; > + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; The fpword&0x1f seems to be used for status word. The exception trap enable bits are in fpword&0x1f00. The meaning of flag being set on arm is different then on i386 (enable trap vs mask). > + if (fpword & 0x80) flags |= MSVCRT__EM_DENORMAL; As far as I can see ARM doesn't support _EM_DENORMAL. The documentation says that 0x80 bit of fpword should not be modified unless you know what VFP coprocessor is used. Some other bits should also not be modified (like e.g. status word). > + switch (flags & MSVCRT__MCW_RC) > + { > + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; > + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; > + case MSVCRT__RC_UP: fpword |= 0x200000; break; The _RC_UP case is broken. Thanks, Piotr

2 2

[PATCH] include: Add optional ANSI color codes for winetests and debug macros.
by Rafał Harabień Nov. 17, 2017

Nov. 17, 2017

By default colors are disabled. Use WINETEST_COLOR=1 to enable colors in tests. Use WINEDEBUG_COLOR=1 to enable colors in debug messages. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- include/wine/test.h | 14 ++++++++++++++ libs/wine/debug.c | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..17d6056 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -206,6 +206,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ static int report_success = 0; +/* use ANSI escape codes for output coloring */ +static int winetest_color = 0; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -303,14 +306,20 @@ int broken( int condition ) int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); + const char *color_red = "\e[91m"; + const char *color_reset = "\e[39m"; if (data->todo_level) { if (condition) { + if (winetest_color) + printf(color_red); printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf(color_reset); InterlockedIncrement(&todo_failures); return 0; } @@ -330,9 +339,13 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { + if (winetest_color) + printf(color_red); printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + if (winetest_color) + printf(color_reset); InterlockedIncrement(&failures); return 0; } @@ -669,6 +682,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 8b04ef9..58d39c3 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -39,12 +39,14 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; +static const char * const debug_classes_color[] = { "\e[93m", "\e[91m", "\e[93m", "" }; #define MAX_DEBUG_OPTIONS 256 static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); static int nb_debug_options = -1; static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS]; +static int debug_color = 0; static struct __wine_debug_functions funcs; @@ -193,7 +195,7 @@ static void debug_usage(void) /* initialize all options at startup */ static void debug_init(void) { - char *wine_debug; + char *wine_debug, *var; struct stat st1, st2; if (nb_debug_options != -1) return; /* already initialized */ @@ -212,6 +214,8 @@ static void debug_init(void) if (!strcmp( wine_debug, "help" )) debug_usage(); parse_options( wine_debug ); } + var = getenv("WINEDEBUG_COLOR"); + if (var != NULL) debug_color = atoi(var); } /* varargs wrapper for funcs.dbg_vprintf */ @@ -406,6 +410,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch const char *func, const char *format, va_list args ) { int ret = 0; + const char *color_reset = "\e[39m"; #if defined(__MINGW32__) || defined(_MSC_VER) if (TRACE_ON(pid)) @@ -414,9 +419,16 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + { + if (debug_color) + ret += wine_dbg_printf( "%s", debug_classes_color[cls] ); ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + } if (format) ret += funcs.dbg_vprintf( format, args ); + if (debug_color) + ret += wine_dbg_printf( color_reset ); + return ret; } -- 2.7.4

3 6

[PATCH] po: Update German translation.
by Julian Rüger Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/5] kernel32: Advertise junction points in GetVolumeInformationW.
by Daniel Lehman Nov. 17, 2017

Nov. 17, 2017

Patch 0004 Fixes issue with Boost Filesystem class Taken from wine-staging: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_wine-2Dcomp… With some modifications: - some rearrangement and merging of patches (so tests run if applied one-by-one) - additional argument checks - additional tests - temporary link made in same directory as final link instead of /tmp

2 1

[website] German translation for release 2.21
by Julian Rüger Nov. 17, 2017

Nov. 17, 2017

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0