May 2018 - Wine-commits - list.winehq.org

Hans Leidekker : server: Store the token owner separately.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: fc3057c4f3c3dd85902140b9ed479128e7d9297e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3057c4f3c3dd85902140b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 2 10:45:42 2018 +0200 server: Store the token owner separately. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/server/token.c b/server/token.c index cde9c5a..0810a61 100644 --- a/server/token.c +++ b/server/token.c @@ -104,7 +104,8 @@ struct token struct list privileges; /* privileges available to the token */ struct list groups; /* groups that the user of this token belongs to (sid_and_attributes) */ SID *user; /* SID of user this token represents */ - SID *primary_group; /* SID of user's primary group */ + SID *owner; /* SID of owner (points to user or one of groups) */ + SID *primary_group; /* SID of user's primary group (points to one of groups) */ unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ @@ -582,9 +583,12 @@ static struct token *create_token( unsigned primary, const SID *user, group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); - /* Use first owner capable group as an owner */ + /* Use first owner capable group as owner and primary group */ if (!token->primary_group && group->owner) + { + token->owner = &group->sid; token->primary_group = &group->sid; + } } /* copy privileges */ @@ -654,7 +658,10 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); if (src_token->primary_group == &group->sid) + { + token->owner = &newgroup->sid; token->primary_group = &newgroup->sid; + } } assert( token->primary_group ); @@ -1393,16 +1400,14 @@ DECL_HANDLER(access_check) } } -/* retrieves the SID of the user that the token represents */ +/* retrieves an SID from the token */ DECL_HANDLER(get_token_sid) { struct token *token; reply->sid_len = 0; - if ((token = (struct token *)get_handle_obj( current->process, req->handle, - TOKEN_QUERY, - &token_ops ))) + if ((token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_QUERY, &token_ops ))) { const SID *sid = NULL; @@ -1416,18 +1421,8 @@ DECL_HANDLER(get_token_sid) sid = token->primary_group; break; case TokenOwner: - { - struct group *group; - LIST_FOR_EACH_ENTRY( group, &token->groups, struct group, entry ) - { - if (group->owner) - { - sid = &group->sid; - break; - } - } + sid = token->owner; break; - } case TokenLogonSid: sid = (const SID *)&builtin_logon_sid; break;

1 0

Hans Leidekker : configure: Require a more recent version of libkrb5.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: ca919ee9c414f668f57a78476bab3b59c9f33d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca919ee9c414f668f57a7847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 2 14:15:03 2018 +0200 configure: Require a more recent version of libkrb5. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0529256..cf625c8 100755 --- a/configure +++ b/configure @@ -13640,11 +13640,11 @@ LIBS="-lkrb5 $KRB5_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char krb5_init_context (); +char krb5_is_config_principal (); int main () { -return krb5_init_context (); +return krb5_is_config_principal (); ; return 0; } @@ -13689,9 +13689,9 @@ else fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in - x) as_fn_append wine_notices "|libkrb5 ${notice_platform}development files not found, Kerberos won't be supported." ;; + x) as_fn_append wine_notices "|libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported." ;; xno) ;; - *) as_fn_error $? "libkrb5 ${notice_platform}development files not found, Kerberos won't be supported. + *) as_fn_error $? "libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported. This is an error since --with-krb5 was requested." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index fe8ffaa..7386d74 100644 --- a/configure.ac +++ b/configure.ac @@ -1669,7 +1669,7 @@ then [AC_CHECK_HEADERS([krb5/krb5.h]) if test "$ac_cv_header_krb5_krb5_h" = "yes" then - WINE_CHECK_SONAME(krb5,krb5_init_context,,[KRB5_CFLAGS=""],[$KRB5_LIBS]) + WINE_CHECK_SONAME(krb5,krb5_is_config_principal,,[KRB5_CFLAGS=""],[$KRB5_LIBS]) else KRB5_CFLAGS="" fi]) @@ -1677,7 +1677,7 @@ else with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], - [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.]) + [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** if test "x$with_gssapi" != "xno"

1 0

Alexandre Julliard : user32/tests: Reorganize the DPI tests.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 487599e77f7be678c57b7fe03d0dc4aa781f45cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=487599e77f7be678c57b7fe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 17:32:29 2018 +0200 user32/tests: Reorganize the DPI tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 363 +++++++++++++++++++++--------------------- 1 file changed, 184 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=487599e77f7be678c57b…

1 0

Alexandre Julliard : user32: Set the thread DPI awareness to the window' s when calling a window procedure.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 39f0bbff4ea16e2ff674d849a38dd0c60f425f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f0bbff4ea16e2ff674d849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 17:33:19 2018 +0200 user32: Set the thread DPI awareness to the window's when calling a window procedure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 +++ dlls/user32/tests/sysparams.c | 58 ++++++++++++++++++++++++------------------- dlls/user32/winproc.c | 6 +++++ 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 9e07be9..290f36b 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -228,6 +228,7 @@ WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ) static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT awareness; WNDPROC16 func = arg; int index = winproc_to_index( func ); CONTEXT context; @@ -281,6 +282,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA } } + awareness = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( HWND_32(hwnd) )); args.params[4] = hwnd; args.params[3] = msg; args.params[2] = wParam; @@ -288,6 +290,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA args.params[0] = LOWORD(lParam); WOWCallback16Ex( 0, WCB16_REGS, sizeof(args.params) + size, &args, (DWORD *)&context ); *result = MAKELONG( LOWORD(context.Eax), LOWORD(context.Edx) ); + SetThreadDpiAwarenessContext( awareness ); return *result; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 1836ca5..9620ffa 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3512,11 +3512,22 @@ static void test_dpi_context(void) ReleaseDC( 0, hdc ); } +static LRESULT CALLBACK dpi_winproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + DPI_AWARENESS_CONTEXT ctx = pGetWindowDpiAwarenessContext( hwnd ); + DPI_AWARENESS_CONTEXT ctx2 = pGetThreadDpiAwarenessContext(); + ok( pGetAwarenessFromDpiAwarenessContext( ctx ) == pGetAwarenessFromDpiAwarenessContext( ctx2 ), + "msg %04x wrong awareness %p / %p\n", msg, ctx, ctx2 ); + return DefWindowProcA( hwnd, msg, wp, lp ); +} + static void test_dpi_window(void) { DPI_AWARENESS_CONTEXT context, orig; DPI_AWARENESS awareness; + ULONG_PTR i, j; HWND hwnd; + MSG msg = { 0, WM_USER + 1, 0, 0 }; if (!pGetWindowDpiAwarenessContext) { @@ -3524,31 +3535,25 @@ static void test_dpi_window(void) return; } orig = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); - - pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); - - pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); + for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) + { + pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); + hwnd = CreateWindowA( "DpiTestClass", "Test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + ok( hwnd != 0, "failed to create window\n" ); + context = pGetWindowDpiAwarenessContext( hwnd ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == i, "%lu: wrong awareness %u\n", i, awareness ); + msg.hwnd = hwnd; + for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) + { + pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~j ); + SendMessageA( hwnd, WM_USER, 0, 0 ); + DispatchMessageA( &msg ); + CallWindowProcA( dpi_winproc, hwnd, WM_USER + 2, 0, 0 ); + } + DestroyWindow( hwnd ); + } SetLastError( 0xdeadbeef ); context = pGetWindowDpiAwarenessContext( (HWND)0xdeadbeef ); @@ -3634,6 +3639,9 @@ START_TEST(sysparams) wc.cbClsExtra = 0; wc.cbWndExtra = 0; RegisterClassA( &wc ); + wc.lpszClassName = "DpiTestClass"; + wc.lpfnWndProc = dpi_winproc; + RegisterClassA( &wc ); ghTestWnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, hInstance, NULL ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e07971c..b2d4fd2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -233,6 +233,7 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len ) /* call a 32-bit window procedure */ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT context; WNDPROC proc = arg; USER_CheckNotLock(); @@ -241,7 +242,9 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); + SetThreadDpiAwarenessContext( context ); TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); @@ -251,6 +254,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES /* call a 32-bit dialog procedure */ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT context; WNDPROC proc = arg; LRESULT ret; @@ -260,8 +264,10 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); ret = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); + SetThreadDpiAwarenessContext( context ); TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result );

1 0

Alex Henrie : include: Add strtof and strtold.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: ccbfb951c25a76d689ffd4a203b3e4fd2e13e92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbfb951c25a76d689ffd4a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 1 22:52:00 2018 -0600 include: Add strtof and strtold. 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> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index a325187..2851e19 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -203,7 +203,9 @@ int __cdecl rand(void); errno_t __cdecl rand_s(unsigned int*); void* __cdecl realloc(void*,size_t); void __cdecl srand(unsigned int); +float __cdecl strtof(const char*,char**); double __cdecl strtod(const char*,char**); +double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl _strtoi64(const char*,char**,int);

1 0

Alex Henrie : ucrtbase: Hook up _Exit.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 67cae2dedc9770755d86e4fbc756d3f8ddf6676a URL: https://source.winehq.org/git/wine.git/?a=commit;h=67cae2dedc9770755d86e4fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 1 22:52:01 2018 -0600 ucrtbase: Hook up _Exit. 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/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/stdlib.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 50856a5..24014a6 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub _Exit +@ cdecl _Exit(long) ucrtbase._Exit @ cdecl -arch=i386 __control87_2(long long ptr ptr) ucrtbase.__control87_2 @ cdecl __doserrno() ucrtbase.__doserrno @ cdecl __fpe_flt_rounds() ucrtbase.__fpe_flt_rounds diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ce226fe..236b0d5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -20,7 +20,7 @@ @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() -@ stub _Exit +@ cdecl _Exit(long) MSVCRT__exit @ stub _FCbuild @ stub _FCmulcc @ stub _FCmulcr diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2851e19..8d0a7c5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -179,6 +179,7 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); +void __cdecl _Exit(int); void __cdecl _exit(int); void __cdecl abort(void); int __cdecl abs(int);

1 0

Daniel Lehman : msvcrt/tests: Add setlocale test.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 642e0917d56613d013d2ae889816ad65eb1f2f06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642e0917d56613d013d2ae88… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 14:04:04 2018 -0700 msvcrt/tests: Add setlocale test. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 5e6d172..024afc1 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -614,6 +614,9 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "English_United States.UTF8"); ok(ret == NULL, "ret != NULL\n"); + + ret = setlocale(LC_ALL, "en-US"); + ok(ret == NULL || broken (ret != NULL), "ret != NULL\n"); /* XP & 2003 */ } static void test_crtGetStringTypeW(void)

1 0

Daniel Lehman : msvcr100/tests: Add setlocale test.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 0e882c6bf116e442c8c9fa9a29115197c58c2f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e882c6bf116e442c8c9fa9a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 15:30:08 2018 -0700 msvcr100/tests: Add setlocale test. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index f02f5ea..bd95991 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -26,6 +26,8 @@ #include <winbase.h> #include "wine/test.h" +#include <locale.h> + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -232,6 +234,8 @@ static unsigned int (__cdecl *p_CurrentScheduler_Id)(void); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static char* (__cdecl *p_setlocale)(int, const char*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -265,6 +269,7 @@ static BOOL init(void) SET(p_atoi, "atoi"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p_setlocale, "setlocale"); SET(p_Context_Id, "?Id(a)Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach(a)CurrentScheduler@Concurrency@@SAXXZ"); @@ -1052,6 +1057,14 @@ static void test__memicmp_l(void) "Cannot reset invalid parameter handler\n"); } +static void test_setlocale(void) +{ + char *ret; + + ret = p_setlocale(LC_ALL, "en-US"); + ok(!ret, "got %p\n", ret); +} + START_TEST(msvcr100) { if (!init()) @@ -1070,4 +1083,5 @@ START_TEST(msvcr100) test_event(); test__memicmp(); test__memicmp_l(); + test_setlocale(); }

1 0

Daniel Lehman : msvcr110/tests: Add setlocale tests.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: d0e8c9a1ab7894bef53a1f62d81a85386c65fff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0e8c9a1ab7894bef53a1f62… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 14:28:23 2018 -0700 msvcr110/tests: Add setlocale tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcr110/tests/Makefile.in | 5 +++ dlls/msvcr110/tests/msvcr110.c | 78 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/configure b/configure index cf625c8..119391d 100755 --- a/configure +++ b/configure @@ -18837,6 +18837,7 @@ wine_fn_config_makefile dlls/msvcp90/tests enable_tests wine_fn_config_makefile dlls/msvcr100 enable_msvcr100 wine_fn_config_makefile dlls/msvcr100/tests enable_tests wine_fn_config_makefile dlls/msvcr110 enable_msvcr110 +wine_fn_config_makefile dlls/msvcr110/tests enable_tests wine_fn_config_makefile dlls/msvcr120 enable_msvcr120 wine_fn_config_makefile dlls/msvcr120/tests enable_tests wine_fn_config_makefile dlls/msvcr120_app enable_msvcr120_app diff --git a/configure.ac b/configure.ac index 7386d74..1bc3d13 100644 --- a/configure.ac +++ b/configure.ac @@ -3459,6 +3459,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp90/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr100) WINE_CONFIG_MAKEFILE(dlls/msvcr100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr110) +WINE_CONFIG_MAKEFILE(dlls/msvcr110/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr120) WINE_CONFIG_MAKEFILE(dlls/msvcr120/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr120_app) diff --git a/dlls/msvcr110/tests/Makefile.in b/dlls/msvcr110/tests/Makefile.in new file mode 100644 index 0000000..e8fa818 --- /dev/null +++ b/dlls/msvcr110/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msvcr110.dll +APPMODE = -mno-cygwin + +C_SRCS = \ + msvcr110.c diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c new file mode 100644 index 0000000..0a18f73 --- /dev/null +++ b/dlls/msvcr110/tests/msvcr110.c @@ -0,0 +1,78 @@ +/* + * Copyright 2018 Daniel Lehman + * + * 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 <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> +#include <float.h> +#include <limits.h> + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include "wine/test.h" + +#include <locale.h> + +static char* (CDECL *p_setlocale)(int category, const char* locale); + +static BOOL init(void) +{ + HMODULE module; + + module = LoadLibraryA("msvcr110.dll"); + if (!module) + { + win_skip("msvcr110.dll not installed\n"); + return FALSE; + } + + p_setlocale = (void*)GetProcAddress(module, "setlocale"); + return TRUE; +} + +static void test_setlocale(void) +{ + int i; + char *ret; + static const char *names[] = + { + "en-us", + "en-US", + "EN-US", + "syr-SY", + "uz-Latn-uz", + }; + + for(i=0; i<sizeof(names)/sizeof(*names); i++) { + ret = p_setlocale(LC_ALL, names[i]); + todo_wine ok(!!ret, "expected success, but got NULL\n"); + if(ret) ok(!strcmp(ret, names[i]), + "expected %s, got %s\n", names[i], ret); + } + + p_setlocale(LC_ALL, "C"); +} + +START_TEST(msvcr110) +{ + if (!init()) return; + test_setlocale(); +}

1 0

Louis Lenders : winmm: Return error in waveInMessage if either dwParam1 or dwParam2 is null.
by Alexandre Julliard 02 May '18

02 May '18

Module: wine Branch: master Commit: 8dca6c35e11a104385242ed8346ee05707b78ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dca6c35e11a104385242ed8… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 2 10:02:15 2018 -0500 winmm: Return error in waveInMessage if either dwParam1 or dwParam2 is null. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 54c3793..fd4005c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -661,6 +661,16 @@ static void wave_in_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 26fed17..045bf4a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3660,17 +3660,17 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_inmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; }

1 0