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

Michael Stefaniuc : msvcrt: Rename a macro to ARRAY_SIZE().
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: ee8acc381d9d36d8e33ac3ece2972e019bf1b5d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8acc381d9d36d8e33ac3ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 20 23:35:08 2018 +0200 msvcrt: Rename a macro to ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 2e963dc..07458d4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -607,8 +607,6 @@ static void test_strcpy_s(void) dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } -#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) - #define okchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ ok(dst[0] == b0 && dst[1] == b1 && dst[2] == b2 && dst[3] == b3 && \ dst[4] == b4 && dst[5] == b5 && dst[6] == b6 && dst[7] == b7, \ @@ -628,14 +626,14 @@ static void test_memcpy_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Copying a buffer into a big enough destination returned %d, expected 0\n", ret); okchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], 'X', 'X'); /* Vary source size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(ret == ERANGE, "Copying a big buffer to a small destination returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -643,7 +641,7 @@ static void test_memcpy_s(void) /* Replace source with NULL */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_memcpy_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a NULL source buffer returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -651,21 +649,21 @@ static void test_memcpy_s(void) /* Vary dest size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_memcpy_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(ret == ERANGE, "Copying into a destination of size 0 returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); /* Replace dest with NULL */ errno = 0xdeadbeef; - ret = p_memcpy_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memcpy_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); /* Combinations */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memcpy_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_memcpy_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -684,20 +682,20 @@ static void test_memmove_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Moving a buffer into a big enough destination returned %d, expected 0\n", ret); okchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], 'X', 'X'); /* Overlapping */ memcpy(dest, big, sizeof(dest)); - ret = p_memmove_s(dest+1, NUMELMS(dest)-1, dest, NUMELMS(dest)-1); + ret = p_memmove_s(dest+1, ARRAY_SIZE(dest)-1, dest, ARRAY_SIZE(dest)-1); ok(ret == 0, "Moving a buffer up one char returned %d, expected 0\n", ret); okchars(dest, big[0], big[0], big[1], big[2], big[3], big[4], big[5], big[6]); /* Vary source size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(ret == ERANGE, "Moving a big buffer to a small destination returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -705,7 +703,7 @@ static void test_memmove_s(void) /* Replace source with NULL */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_memmove_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a NULL source buffer returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); @@ -713,21 +711,21 @@ static void test_memmove_s(void) /* Vary dest size */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_memmove_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(ret == ERANGE, "Moving into a destination of size 0 returned %d, expected ERANGE\n", ret); ok(errno == ERANGE, "errno is %d, expected ERANGE\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X'); /* Replace dest with NULL */ errno = 0xdeadbeef; - ret = p_memmove_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_memmove_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); /* Combinations */ errno = 0xdeadbeef; memset(dest, 'X', sizeof(dest)); - ret = p_memmove_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_memmove_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); okchars(dest, 'X', 'X', 'X', 'X', 'X', 'X', 'X', 'X');

1 0

Michael Stefaniuc : ntdll/tests: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 9ef8fa2a0bfb559475e17d2562892085f0e2a90f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef8fa2a0bfb559475e17d25… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 21 23:06:12 2018 +0200 ntdll/tests: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 8 +++----- dlls/ntdll/tests/rtl.c | 6 ++---- dlls/ntdll/tests/rtlstr.c | 31 +++++++++++-------------------- dlls/ntdll/tests/string.c | 24 ++++++++++-------------- 4 files changed, 26 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ef8fa2a0bfb559475e1…

1 0

Michael Stefaniuc : ntdll/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 3400da025e420f4fe88d32f306a5504517886138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3400da025e420f4fe88d32f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 21 23:06:11 2018 +0200 ntdll/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- dlls/ntdll/tests/exception.c | 16 +++++++--------- dlls/ntdll/tests/file.c | 4 ++-- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/om.c | 6 +++--- dlls/ntdll/tests/pipe.c | 4 ++-- dlls/ntdll/tests/rtl.c | 6 +++--- dlls/ntdll/tests/rtlstr.c | 10 +++++----- dlls/ntdll/tests/string.c | 2 +- dlls/ntdll/tests/threadpool.c | 14 +++++++------- 10 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3400da025e420f4fe88d…

1 0

Zebediah Figura : shell32/tests: Don't test CommandLineToArgv() in test_argify().
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: b79eff8d91faf21c052c72d79488552bea92f94b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79eff8d91faf21c052c72d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 21 09:02:47 2018 -0500 shell32/tests: Don't test CommandLineToArgv() in test_argify(). This is essentially redundant. We should have tests for all behaviours of CommandLineToArgv() above; the purpose of test_argify() is to test how ShellExecute() et al. parses its parameters, and to show that this is different from CommandLineToArgv(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 167 +++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b79eff8d91faf21c052c…

1 0

Alexandre Julliard : user32: Check the DpiScalingVer registry key to enable DPI scaling.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: ea92a74133a4ba86cf1fdbe0b2dd390410c74d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea92a74133a4ba86cf1fdbe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 21 14:20:38 2018 +0200 user32: Check the DpiScalingVer registry key to enable DPI scaling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 74 ++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 28ebae6..3245f20 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -144,6 +144,8 @@ static const WCHAR DESKPATTERN_VALNAME[]= {DESKTOP_KEY,'P','a','t', static const WCHAR FONTSMOOTHING_VALNAME[]= {DESKTOP_KEY,'F','o','n','t','S','m','o','o','t','h','i','n','g',0}; static const WCHAR DRAGWIDTH_VALNAME[]= {DESKTOP_KEY,'D','r','a','g','W','i','d','t','h',0}; static const WCHAR DRAGHEIGHT_VALNAME[]= {DESKTOP_KEY,'D','r','a','g','H','e','i','g','h','t',0}; +static const WCHAR DPISCALINGVER_VALNAME[]= {DESKTOP_KEY,'D','p','i','S','c','a','l','i','n','g','V','e','r',0}; +static const WCHAR LOGPIXELS_VALNAME[]= {DESKTOP_KEY,'L','o','g','P','i','x','e','l','s',0}; static const WCHAR LOWPOWERACTIVE_VALNAME[]= {DESKTOP_KEY,'L','o','w','P','o','w','e','r','A','c','t','i','v','e',0}; static const WCHAR POWEROFFACTIVE_VALNAME[]= {DESKTOP_KEY,'P','o','w','e','r','O','f','f','A','c','t','i','v','e',0}; static const WCHAR USERPREFERENCESMASK_VALNAME[]= {DESKTOP_KEY,'U','s','e','r','P','r','e','f','e','r','e','n','c','e','s','M','a','s','k',0}; @@ -251,6 +253,9 @@ static BOOL notify_change = TRUE; /* System parameters storage */ static RECT work_area; +static UINT system_dpi; +static DPI_AWARENESS dpi_awareness; +static DPI_AWARENESS default_awareness = DPI_AWARENESS_UNAWARE; static HKEY volatile_base_key; @@ -612,37 +617,6 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) return init_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ ); } -static DWORD get_reg_dword( HKEY base, const WCHAR *key_name, const WCHAR *value_name ) -{ - HKEY key; - DWORD type, ret = 0, size = sizeof(ret); - - if (RegOpenKeyW( base, key_name, &key )) return 0; - if (RegQueryValueExW( key, value_name, NULL, &type, (void *)&ret, &size ) || type != REG_DWORD) - ret = 0; - RegCloseKey( key ); - return ret; -} - -/* get the system dpi from the registry */ -static UINT get_system_dpi(void) -{ - static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; - static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; - static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - static UINT system_dpi; - UINT dpi; - - if (!system_dpi) - { - if (!(dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name )) && - !(dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) - dpi = USER_DEFAULT_SCREEN_DPI; - system_dpi = dpi; - } - return system_dpi; -} - HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; @@ -897,7 +871,7 @@ static BOOL get_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo DWORD val; if (load_entry( &entry->hdr, &val, sizeof(val) ) == sizeof(DWORD)) entry->dword.val = val; } - *(DWORD *)ptr_param = entry->bool.val; + *(DWORD *)ptr_param = entry->dword.val; return TRUE; } @@ -1285,6 +1259,7 @@ static TWIPS_ENTRY( SMCAPTIONWIDTH, -225 ); static DWORD_ENTRY( ACTIVEWINDOWTRACKING, 0 ); static DWORD_ENTRY( ACTIVEWNDTRKTIMEOUT, 0 ); static DWORD_ENTRY( CARETWIDTH, 1 ); +static DWORD_ENTRY( DPISCALINGVER, 0 ); static DWORD_ENTRY( FOCUSBORDERHEIGHT, 1 ); static DWORD_ENTRY( FOCUSBORDERWIDTH, 1 ); static DWORD_ENTRY( FONTSMOOTHINGCONTRAST, 0 ); @@ -1292,6 +1267,7 @@ static DWORD_ENTRY( FONTSMOOTHINGORIENTATION, FE_FONTSMOOTHINGORIENTATIONRGB ); static DWORD_ENTRY( FONTSMOOTHINGTYPE, FE_FONTSMOOTHINGSTANDARD ); static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); +static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); static PATH_ENTRY( DESKPATTERN ); @@ -1430,8 +1406,10 @@ static union sysparam_all_entry * const default_entries[] = */ void SYSPARAMS_Init(void) { + static const WCHAR def_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR def_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; HKEY key; - DWORD i, dispos; + DWORD i, dispos, dpi_scaling; /* this one must be non-volatile */ if (RegCreateKeyW( HKEY_CURRENT_USER, WINE_CURRENT_USER_REGKEY, &key )) @@ -1447,6 +1425,24 @@ void SYSPARAMS_Init(void) RegCloseKey( key ); + get_dword_entry( (union sysparam_all_entry *)&entry_LOGPIXELS, 0, &system_dpi, 0 ); + if (!system_dpi) /* check fallback key */ + { + if (!RegOpenKeyW( HKEY_CURRENT_CONFIG, def_key_name, &key )) + { + DWORD type, size = sizeof(system_dpi); + if (RegQueryValueExW( key, def_value_name, NULL, &type, (void *)&system_dpi, &size ) || + type != REG_DWORD) + system_dpi = 0; + RegCloseKey( key ); + } + } + if (!system_dpi) system_dpi = USER_DEFAULT_SCREEN_DPI; + + /* FIXME: what do the DpiScalingVer flags mean? */ + get_dword_entry( (union sysparam_all_entry *)&entry_DPISCALINGVER, 0, &dpi_scaling, 0 ); + if (!dpi_scaling) default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; + if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ { for (i = 0; i < ARRAY_SIZE( default_entries ); i++) @@ -3171,15 +3167,13 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, } -static DPI_AWARENESS dpi_awareness; - /********************************************************************** * get_monitor_dpi */ UINT get_monitor_dpi( HWND hwnd ) { /* FIXME: use the monitor DPI instead */ - return get_system_dpi(); + return system_dpi; } /********************************************************************** @@ -3300,7 +3294,7 @@ BOOL WINAPI IsProcessDPIAware(void) UINT WINAPI GetDpiForSystem(void) { if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; - return get_system_dpi(); + return system_dpi; } /*********************************************************************** @@ -3308,7 +3302,7 @@ UINT WINAPI GetDpiForSystem(void) */ BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) { - UINT dpi = get_system_dpi(); + UINT dpi = system_dpi; WARN( "(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y ); @@ -3326,7 +3320,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) if (info->dpi_awareness) return ULongToHandle( info->dpi_awareness ); if (dpi_awareness) return ULongToHandle( dpi_awareness ); - return (DPI_AWARENESS_CONTEXT)(0x10 | DPI_AWARENESS_SYSTEM_AWARE); /* FIXME: should default to unaware */ + return ULongToHandle( 0x10 | default_awareness ); } /********************************************************************** @@ -3358,7 +3352,6 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT */ BOOL WINAPI LogicalToPhysicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) { - UINT system_dpi = get_system_dpi(); UINT dpi = GetDpiForWindow( hwnd ); RECT rect; @@ -3375,7 +3368,6 @@ BOOL WINAPI LogicalToPhysicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) { DPI_AWARENESS_CONTEXT context; - UINT system_dpi = get_system_dpi(); UINT dpi = GetDpiForWindow( hwnd ); RECT rect;

1 0

Alexandre Julliard : ntdll: Implement RtlExpandEnvironmentStrings().
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 9c57e23d9ba43fc52f82ad39b6a98b101868d719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c57e23d9ba43fc52f82ad39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 21 12:05:31 2018 +0200 ntdll: Implement RtlExpandEnvironmentStrings(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 40 +++++++++++++++++++++++----------------- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a5bdf0f..1428a1b 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -281,21 +281,14 @@ done: return nts; } -/****************************************************************** - * RtlExpandEnvironmentStrings_U (NTDLL.@) - * +/****************************************************************************** + * RtlExpandEnvironmentStrings (NTDLL.@) */ -NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR renv, const UNICODE_STRING* us_src, - PUNICODE_STRING us_dst, PULONG plen) +NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE_T src_len, + WCHAR *dst, SIZE_T count, SIZE_T *plen ) { - DWORD src_len, len, count, total_size = 1; /* 1 for terminating '\0' */ - LPCWSTR env, src, p, var; - LPWSTR dst; - - src = us_src->Buffer; - src_len = us_src->Length / sizeof(WCHAR); - count = us_dst->MaximumLength / sizeof(WCHAR); - dst = count ? us_dst->Buffer : NULL; + SIZE_T len, total_size = 1; /* 1 for terminating '\0' */ + LPCWSTR env, p, var; if (!renv) { @@ -353,15 +346,28 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR renv, const UNICODE_STRING* if (!renv) RtlReleasePebLock(); - /* Null-terminate the string */ if (dst && count) *dst = '\0'; - - us_dst->Length = (dst) ? (dst - us_dst->Buffer) * sizeof(WCHAR) : 0; - if (plen) *plen = total_size * sizeof(WCHAR); + if (plen) *plen = total_size; return (count) ? STATUS_SUCCESS : STATUS_BUFFER_TOO_SMALL; } +/****************************************************************** + * RtlExpandEnvironmentStrings_U (NTDLL.@) + */ +NTSTATUS WINAPI RtlExpandEnvironmentStrings_U( const WCHAR *env, const UNICODE_STRING *src, + UNICODE_STRING *dst, ULONG *plen ) +{ + SIZE_T len; + NTSTATUS ret; + + ret = RtlExpandEnvironmentStrings( env, src->Buffer, src->Length / sizeof(WCHAR), + dst->Buffer, dst->MaximumLength / sizeof(WCHAR), &len ); + if (plen) *plen = len * sizeof(WCHAR); /* FIXME: check for overflow? */ + if (len > UNICODE_STRING_MAX_CHARS) ret = STATUS_BUFFER_TOO_SMALL; + if (!ret) dst->Length = (len - 1) * sizeof(WCHAR); + return ret; +} static inline void normalize( void *base, WCHAR **ptr ) { diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0c667aa..d321c44 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -596,6 +596,7 @@ @ stdcall RtlEraseUnicodeString(ptr) @ stdcall RtlExitUserProcess(long) @ stdcall RtlExitUserThread(long) +@ stdcall RtlExpandEnvironmentStrings(ptr wstr long ptr long ptr) @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) @ stub RtlExtendHeap @ stdcall -arch=win32 -ret64 RtlExtendedIntegerMultiply(int64 long) diff --git a/include/winternl.h b/include/winternl.h index 58c475d..cbf5c66 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2630,6 +2630,7 @@ NTSYSAPI BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserProcess(ULONG); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlExitUserThread(ULONG); +NTSYSAPI NTSTATUS WINAPI RtlExpandEnvironmentStrings(const WCHAR*,WCHAR*,SIZE_T,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PCWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionString(ULONG,const GUID*,ULONG,const UNICODE_STRING*,PVOID); NTSYSAPI NTSTATUS WINAPI RtlFindActivationContextSectionGuid(ULONG,const GUID*,ULONG,const GUID*,PVOID);

1 0

Michael Stefaniuc : msvcrt/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 3624b7c60c4e07d559f68dda23bf5201d1061950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3624b7c60c4e07d559f68dda… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 20 23:35:09 2018 +0200 msvcrt/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 6 +++--- dlls/msvcrt/tests/dir.c | 16 ++++++++-------- dlls/msvcrt/tests/file.c | 23 +++++++++++----------- dlls/msvcrt/tests/locale.c | 6 +++--- dlls/msvcrt/tests/misc.c | 4 ++-- dlls/msvcrt/tests/printf.c | 4 ++-- dlls/msvcrt/tests/string.c | 48 +++++++++++++++++++++++----------------------- 7 files changed, 53 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3624b7c60c4e07d559f6…

1 0

Józef Kucia : vulkan-1/tests: Add tests.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 4a332a7692ce67ca1cd287f16a50e64f1d0376b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a332a7692ce67ca1cd287f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 11:42:43 2018 +0200 vulkan-1/tests: Add tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/vulkan-1/Makefile.in | 1 + dlls/vulkan-1/tests/Makefile.in | 5 +++ dlls/vulkan-1/tests/vulkan.c | 92 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) diff --git a/configure b/configure index bcb660d..ddd6db1 100755 --- a/configure +++ b/configure @@ -19222,6 +19222,7 @@ wine_fn_config_makefile dlls/vnetbios.vxd enable_win16 wine_fn_config_makefile dlls/vssapi enable_vssapi wine_fn_config_makefile dlls/vtdapi.vxd enable_win16 wine_fn_config_makefile dlls/vulkan-1 enable_vulkan_1 +wine_fn_config_makefile dlls/vulkan-1/tests enable_tests wine_fn_config_makefile dlls/vwin32.vxd enable_win16 wine_fn_config_makefile dlls/w32skrnl enable_win16 wine_fn_config_makefile dlls/w32sys.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 469fa8d..68f7f14 100644 --- a/configure.ac +++ b/configure.ac @@ -3721,6 +3721,7 @@ WINE_CONFIG_MAKEFILE(dlls/vnetbios.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vssapi) WINE_CONFIG_MAKEFILE(dlls/vtdapi.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vulkan-1) +WINE_CONFIG_MAKEFILE(dlls/vulkan-1/tests) WINE_CONFIG_MAKEFILE(dlls/vwin32.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32skrnl,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32sys.dll16,enable_win16) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 4bb8cec..2abc54d 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -1,5 +1,6 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan +IMPORTLIB = vulkan-1 C_SRCS = \ vulkan.c diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in new file mode 100644 index 0000000..c9f9f07 --- /dev/null +++ b/dlls/vulkan-1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = vulkan-1.dll +IMPORTS = vulkan-1 + +C_SRCS = \ + vulkan.c diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c new file mode 100644 index 0000000..67da880 --- /dev/null +++ b/dlls/vulkan-1/tests/vulkan.c @@ -0,0 +1,92 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * 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 + */ + +#include "windows.h" +#include "wine/heap.h" +#include "wine/vulkan.h" +#include "wine/test.h" + +static VkResult create_instance(uint32_t extension_count, + const char * const *enabled_extensions, VkInstance *vk_instance) +{ + VkInstanceCreateInfo create_info; + + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.pApplicationInfo = NULL; + create_info.enabledLayerCount = 0; + create_info.ppEnabledLayerNames = NULL; + create_info.enabledExtensionCount = extension_count; + create_info.ppEnabledExtensionNames = enabled_extensions; + + return vkCreateInstance(&create_info, NULL, vk_instance); +} + +static void test_enumerate_physical_devices(void) +{ + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceProperties properties; + VkInstance vk_instance; + unsigned int i; + uint32_t count; + VkResult vr; + + if ((vr = create_instance(0, NULL, &vk_instance)) < 0) + { + skip("Failed to create Vulkan instance, vr %d.\n", vr); + return; + } + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + trace("Got %u physical device(s).\n", count); + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < count; ++i) + { + vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); + + trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", + properties.deviceName, properties.vendorID, properties.deviceID, + VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), + VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, + VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), + VK_VERSION_PATCH(properties.apiVersion)); + } + + heap_free(vk_physical_devices); + + vkDestroyInstance(vk_instance, NULL); +} + +START_TEST(vulkan) +{ + test_enumerate_physical_devices(); +}

1 0

Alexandre Julliard : user32: Don' t remap DPI for font size in points when saving.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 4abc3d726ff6bdf2222d981e0d6f1e15c346893c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4abc3d726ff6bdf2222d981e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 21 14:16:38 2018 +0200 user32: Don't remap DPI for font size in points when saving. Points already take DPI into account. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0613015..28ebae6 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1033,7 +1033,7 @@ static BOOL set_font_entry( union sysparam_all_entry *entry, UINT int_param, voi /* zero pad the end of lfFaceName so we don't save uninitialised data */ ptr = memchrW( font.lfFaceName, 0, LF_FACESIZE ); if (ptr) memset( ptr, 0, (font.lfFaceName + LF_FACESIZE - ptr) * sizeof(WCHAR) ); - font.lfHeight = map_from_system_dpi( font.lfHeight ); + if (font.lfHeight < 0) font.lfHeight = map_from_system_dpi( font.lfHeight ); if (!save_entry( &entry->hdr, &font, sizeof(font), REG_BINARY, flags )) return FALSE; entry->font.val = font;

1 0

Michael Stefaniuc : wininet/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 21, 2018

June 21, 2018

Module: wine Branch: master Commit: 8d876e740e6f210b82977f4a58255a7126c5efdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d876e740e6f210b82977f4a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 21 23:06:10 2018 +0200 wininet/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/ftp.c | 2 +- dlls/wininet/tests/http.c | 10 ++++----- dlls/wininet/tests/internet.c | 16 ++++++------- dlls/wininet/tests/url.c | 52 +++++++++++++++++++++---------------------- dlls/wininet/tests/urlcache.c | 4 ++-- 5 files changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d876e740e6f210b8297…

1 0