April 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Build stub services with msvcrt.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 76e6883a5e2befc463911f8932a0d8a75439d670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e6883a5e2befc463911f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:32:32 2019 +0200 makefiles: Build stub services with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/Makefile.in | 3 ++- programs/presentationfontcache/Makefile.in | 3 ++- programs/spoolsv/Makefile.in | 3 ++- programs/termsv/Makefile.in | 3 ++- programs/winmgmt/Makefile.in | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 6291b59..e5d37e6 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,6 +1,7 @@ MODULE = plugplay.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index d7cbfe1..0427090 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,6 +1,7 @@ MODULE = presentationfontcache.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index ca468b0..d9fb20a 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = spoolsv.exe -APPMODE = -mconsole IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 81465f4..ea30120 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = termsv.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in index 0a3b08e..3b30f23 100644 --- a/programs/winmgmt/Makefile.in +++ b/programs/winmgmt/Makefile.in @@ -1,6 +1,7 @@ MODULE = winmgmt.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : makefiles: Build modules that use msvcrt as PE builtins.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 1f0a9c4c29bfa4a87fe8c0da9beb6fdc6b1f6fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0a9c4c29bfa4a87fe8c0da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:42:17 2019 +0200 makefiles: Build modules that use msvcrt as PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 584c5a0..2fcb917 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2077,7 +2077,8 @@ static int is_cross_compiled( struct makefile *make ) !make->is_win16 && !strarray_exists( &make->imports, "kernel" ) && (make->testdll || - !make->object_files.count)); + !make->object_files.count || + strarray_exists( &make->extradllflags, "-mno-cygwin" ))); } @@ -2951,6 +2952,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && (make->testdll || + strarray_exists( &make->extradllflags, "-mno-cygwin" ) || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib))); int need_obj = (!need_cross ||

1 0

Alexandre Julliard : makefiles: Don't use -fno-builtin flag with MinGW.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 629f2e10b134982658070497e129f70cc8a424d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629f2e10b134982658070497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:54:14 2019 +0200 makefiles: Don't use -fno-builtin flag with MinGW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 60 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 7 ++++++- tools/makedep.c | 1 - 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 158d983..1ed30b9 100755 --- a/configure +++ b/configure @@ -632,8 +632,8 @@ POLL_LIBS DL_LIBS TOOLSEXT UNWINDFLAGS -EXCESS_PRECISION_CFLAGS BUILTINFLAG +EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS VKD3D_CFLAGS @@ -16568,33 +16568,7 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; } EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 -$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } -if ${ac_cv_cflags__fno_builtin+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fno-builtin" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__fno_builtin=yes -else - ac_cv_cflags__fno_builtin=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 -$as_echo "$ac_cv_cflags__fno_builtin" >&6; } -if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_cflags__fno_strict_aliasing+:} false; then : $as_echo_n "(cached) " >&6 @@ -17113,6 +17087,36 @@ fi ;; esac done + case $host_os in + cygwin*|mingw32*) ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 +$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } +if ${ac_cv_cflags__fno_builtin+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-builtin" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_builtin=yes +else + ac_cv_cflags__fno_builtin=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 +$as_echo "$ac_cv_cflags__fno_builtin" >&6; } +if test "x$ac_cv_cflags__fno_builtin" = xyes; then : + BUILTINFLAG="-fno-builtin" + +fi ;; + esac + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 $as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } diff --git a/configure.ac b/configure.ac index c2f97e0..68d52a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1937,7 +1937,6 @@ then fi dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options @@ -1984,6 +1983,12 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= esac done + dnl Disable gcc builtins except for Mingw + case $host_os in + cygwin*|mingw32*) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + esac + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; diff --git a/tools/makedep.c b/tools/makedep.c index 2fcb917..e4d48dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2990,7 +2990,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output_filenames( make->include_args ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filenames( extra_cross_cflags ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" );

1 0

Alexandre Julliard : makefiles: Build all tests with msvcrt.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: d4ef782db7928e0deed5f0b43a8a1557cae0358e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ef782db7928e0deed5f0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 12:10:19 2019 +0200 makefiles: Build all tests with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/tests/advpack.c | 8 ++++---- dlls/kernel32/tests/debugger.c | 8 ++++---- dlls/kernel32/tests/process.c | 8 ++++---- dlls/msi/tests/custom.c | 8 ++++---- dlls/msi/tests/db.c | 8 ++++---- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcp100/tests/Makefile.in | 1 - dlls/msvcp110/tests/Makefile.in | 1 - dlls/msvcp120/tests/Makefile.in | 1 - dlls/msvcp140/tests/Makefile.in | 1 - dlls/msvcp60/tests/Makefile.in | 1 - dlls/msvcp90/tests/Makefile.in | 1 - dlls/msvcr100/tests/Makefile.in | 1 - dlls/msvcr110/tests/Makefile.in | 1 - dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrtd/tests/Makefile.in | 1 - dlls/shell32/tests/shlexec.c | 16 ++++++++-------- dlls/ucrtbase/tests/Makefile.in | 1 - programs/services/tests/service.c | 10 +++++----- tools/makedep.c | 1 + 22 files changed, 34 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4ef782db7928e0deed5…

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.SystemDrive.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: fb26388b0a8efc05b3e479db837a380759153267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb26388b0a8efc05b3e479db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:11 2019 +0200 wbemprox: Implement Win32_OperatingSystem.SystemDrive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47065 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d4c2630..862e17f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -396,6 +396,8 @@ static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR prop_systemnameW[] = {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = @@ -601,6 +603,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -1029,6 +1032,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *systemdrive; UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; @@ -3102,6 +3106,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_systemdrive(void) +{ + WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + heap_free( ret ); + return NULL; +} static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; @@ -3243,6 +3254,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); + rec->systemdrive = get_systemdrive(); rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 510e7aa..3453358 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1243,6 +1243,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR totalvirtualmemorysizeW[] = @@ -1398,6 +1400,15 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Hans Leidekker : wbemprox/tests: Introduce a helper to check properties.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 34d5f90db68a19ef191092757a3cecb00e227927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d5f90db68a19ef19109275… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 24 12:58:12 2019 +0200 wbemprox/tests: Introduce a helper to check properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 609 +++++++------------------------------------- 1 file changed, 88 insertions(+), 521 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34d5f90db68a19ef1910…

1 0

Alistair Leslie-Hughes : xinput: Check that we actually received a value before assignment.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 72e62952db9104b03d136d9fa0ebdb1e8aa6ae52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72e62952db9104b03d136d9f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 24 00:58:15 2019 +0000 xinput: Check that we actually received a value before assignment. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46999 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index c0c405f..1ccecb1 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -388,23 +388,29 @@ void HID_update_state(xinput_controller* device) } } - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Erich E. Hoover : server: Add default security descriptor ownership for processes.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: e11e8705eb9fcb7c2ec736cf2f7e5036decf22cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11e8705eb9fcb7c2ec736cf… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Apr 22 23:45:29 2019 +0200 server: Add default security descriptor ownership for processes. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ server/process.c | 26 +++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 2 ++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64..3097a64 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4682,11 +4682,15 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { + char domain_users_ptr[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; + SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + BOOL owner_defaulted, group_defaulted; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4813,6 +4817,37 @@ static void test_GetSecurityInfo(void) } LocalFree(pSD); CloseHandle(obj); + + /* Obtain the "domain users" SID from the user SID */ + if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0), + *GetSidSubAuthority(user_sid, 1), + *GetSidSubAuthority(user_sid, 2), + *GetSidSubAuthority(user_sid, 3), 0, 0, 0, 0, &domain_sid)) + { + win_skip("Failed to get current domain SID\n"); + return; + } + sid_size = sizeof(domain_users_ptr); + pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size); + FreeSid(domain_sid); + + /* Test querying the ownership of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetNamedSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, user_sid), + "Process owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index 4a1cebf..dc50779 100644 --- a/server/process.c +++ b/server/process.c @@ -63,6 +63,7 @@ static void process_dump( struct object *obj, int verbose ); static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *process_get_sd( struct object *obj ); static void process_poll_event( struct fd *fd, int event ); static struct list *process_get_kernel_obj_list( struct object *obj ); static void process_destroy( struct object *obj ); @@ -80,7 +81,7 @@ static const struct object_ops process_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ process_map_access, /* map_access */ - default_get_sd, /* get_sd */ + process_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ @@ -669,6 +670,29 @@ static struct list *process_get_kernel_obj_list( struct object *obj ) return &process->kernel_object; } +static struct security_descriptor *process_get_sd( struct object *obj ) +{ + static struct security_descriptor *process_default_sd; + + if (obj->sd) return obj->sd; + + if (!process_default_sd) + { + size_t users_sid_len = security_sid_len( security_domain_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd->control = SE_DACL_PRESENT; + process_default_sd->owner_len = admins_sid_len; + process_default_sd->group_len = users_sid_len; + process_default_sd->sacl_len = 0; + process_default_sd->dacl_len = 0; + memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + } + return process_default_sd; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/security.h b/server/security.h index 873bbc6..606dbb2 100644 --- a/server/security.h +++ b/server/security.h @@ -47,6 +47,7 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_domain_users_sid; extern const PSID security_high_label_sid; diff --git a/server/token.c b/server/token.c index 5c35bcc..895809e 100644 --- a/server/token.c +++ b/server/token.c @@ -83,6 +83,7 @@ static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORIT static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; +static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +93,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Erich E. Hoover : server: Add default security descriptor DACL for processes.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: wine Branch: master Commit: 5a79077250061662a68ae55e343000354b4b927d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a79077250061662a68ae55e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Apr 22 23:45:30 2019 +0200 server: Add default security descriptor DACL for processes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15980 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 50 ++++++++++++++++++++++++++++++++++++++++++ server/process.c | 28 +++++++++++++++++++++-- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3097a64..1c26228 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4687,10 +4687,12 @@ static void test_GetSecurityInfo(void) char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; PSID domain_users_sid = (PSID) domain_users_ptr, domain_sid; SID_IDENTIFIER_AUTHORITY sia = { SECURITY_NT_AUTHORITY }; + int domain_users_ace_id = -1, admins_ace_id = -1, i; DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; BOOL owner_defaulted, group_defaulted; + BOOL dacl_defaulted, dacl_present; ACL_SIZE_INFORMATION acl_size; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; @@ -4698,6 +4700,7 @@ static void test_GetSecurityInfo(void) PSID owner, group; BOOL bret = TRUE; PACL pDacl; + BYTE flags; DWORD ret; if (!pGetSecurityInfo || !pSetSecurityInfo) @@ -4848,6 +4851,53 @@ static void test_GetSecurityInfo(void) ok(group != NULL, "group should not be NULL\n"); ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n"); LocalFree(pSD); + + /* Test querying the DACL of a process */ + ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!ret, "GetSecurityInfo failed with error %d\n", ret); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, domain_users_sid); + if (bret) domain_users_ace_id = i; + bret = EqualSid(&ace->SidStart, admin_sid); + if (bret) admins_ace_id = i; + } + ok(domain_users_ace_id != -1 || broken(domain_users_ace_id == -1) /* win2k */, + "Domain Users ACE not found.\n"); + if (domain_users_ace_id != -1) + { + bret = pGetAce(pDacl, domain_users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Domain Users ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Domain Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Domain Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + ok(admins_ace_id != -1 || broken(admins_ace_id == -1) /* xp */, + "Builtin Admins ACE not found.\n"); + if (admins_ace_id != -1) + { + bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Admins ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == 0x0, "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); + ok(ace->Mask == PROCESS_ALL_ACCESS || broken(ace->Mask == 0x1f0fff) /* win2k */, + "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, PROCESS_ALL_ACCESS); + } + LocalFree(pSD); } static void test_GetSidSubAuthority(void) diff --git a/server/process.c b/server/process.c index dc50779..beaa686 100644 --- a/server/process.c +++ b/server/process.c @@ -680,15 +680,39 @@ static struct security_descriptor *process_get_sd( struct object *obj ) { size_t users_sid_len = security_sid_len( security_domain_users_sid ); size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + size_t dacl_len = sizeof(ACL) + 2 * offsetof( ACCESS_ALLOWED_ACE, SidStart ) + + users_sid_len + admins_sid_len; + ACCESS_ALLOWED_ACE *aaa; + ACL *dacl; - process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len ); + process_default_sd = mem_alloc( sizeof(*process_default_sd) + admins_sid_len + users_sid_len + + dacl_len ); process_default_sd->control = SE_DACL_PRESENT; process_default_sd->owner_len = admins_sid_len; process_default_sd->group_len = users_sid_len; process_default_sd->sacl_len = 0; - process_default_sd->dacl_len = 0; + process_default_sd->dacl_len = dacl_len; memcpy( process_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); memcpy( (char *)(process_default_sd + 1) + admins_sid_len, security_domain_users_sid, users_sid_len ); + + dacl = (ACL *)((char *)(process_default_sd + 1) + admins_sid_len + users_sid_len); + dacl->AclRevision = ACL_REVISION; + dacl->Sbz1 = 0; + dacl->AclSize = dacl_len; + dacl->AceCount = 2; + dacl->Sbz2 = 0; + aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + aaa->Mask = GENERIC_READ; + memcpy( &aaa->SidStart, security_domain_users_sid, users_sid_len ); + aaa = (ACCESS_ALLOWED_ACE *)((char *)aaa + aaa->Header.AceSize); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = 0; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + admins_sid_len; + aaa->Mask = PROCESS_ALL_ACCESS; + memcpy( &aaa->SidStart, security_builtin_admins_sid, admins_sid_len ); } return process_default_sd; }

1 0

Alexandre Julliard : testbot: Don't hardcode .exe.so extension.
by Alexandre Julliard 24 Apr '19

24 Apr '19

Module: tools Branch: master Commit: 54520fa3fe29ff73b5d2552eeb42651bc1c42e5a URL: https://source.winehq.org/git/tools.git/?a=commit;h=54520fa3fe29ff73b5d2552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 00:40:25 2019 +0200 testbot: Don't hardcode .exe.so extension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 6 +++--- testbot/lib/Build/Utils.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 7e6b822..f848157 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,7 +99,7 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -109,7 +109,7 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -168,7 +168,7 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index b204386..254c762 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -383,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "reg.exe", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; }

1 0