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

Michael Müller : sfc_os: Set an error code in SfcGetNextProtectedFile stub.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 7dd74d5b5084f352b46c0e52e421bf28f34cade1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd74d5b5084f352b46c0e52… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Mar 4 10:51:25 2018 -0600 sfc_os: Set an error code in SfcGetNextProtectedFile stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc_os/sfc_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f4515f2..6193dda 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -55,6 +55,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) { FIXME("%p %p\n", handle, data); + + SetLastError(ERROR_NO_MORE_FILES); return FALSE; }

1 0

Nikolay Sivov : d3dx9: Improve argument validation in CloneEffect().
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: c3f92419e892c54b145f925b49955b1ceecec481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3f92419e892c54b145f925b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 2 23:35:51 2018 +0100 d3dx9: Improve argument validation in CloneEffect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 ++ dlls/d3dx9_36/tests/effect.c | 203 +++++++++++++++++++++++++++---------------- 2 files changed, 135 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3f92419e892c54b145f…

1 0

Alex Henrie : msvcrt: Compile but show an error if Bessel functions aren' t available.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd2f1e59bd22197b63eb5ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Mar 2 10:02:46 2018 -0700 msvcrt: Compile but show an error if Bessel functions aren't available. 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> --- configure | 8 +++++++- configure.ac | 8 +++++++- dlls/msvcrt/math.c | 36 +++++++++++++++++++++++++++++++++--- include/config.h.in | 18 ++++++++++++++++++ 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/configure b/configure index fdcdfd7..397677e 100755 --- a/configure +++ b/configure @@ -17649,6 +17649,9 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -17673,7 +17676,10 @@ for ac_func in \ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 43fdb0c..cfc2080 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,6 +2698,9 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + j0 \ + j1 \ + jn \ lgamma \ lgammaf \ llrint \ @@ -2722,7 +2725,10 @@ AC_CHECK_FUNCS(\ round \ roundf \ trunc \ - truncf + truncf \ + y0 \ + y1 \ + yn ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b48011..a3af78a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1412,7 +1412,12 @@ INT CDECL MSVCRT__isnan(double num) double CDECL MSVCRT__j0(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J0 return j0(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1421,7 +1426,12 @@ double CDECL MSVCRT__j0(double num) double CDECL MSVCRT__j1(double num) { /* FIXME: errno handling */ +#ifdef HAVE_J1 return j1(num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1430,7 +1440,12 @@ double CDECL MSVCRT__j1(double num) double CDECL MSVCRT__jn(int n, double num) { /* FIXME: errno handling */ +#ifdef HAVE_JN return jn(n, num); +#else + FIXME("not implemented\n"); + return 0; +#endif } /********************************************************************* @@ -1440,12 +1455,17 @@ double CDECL MSVCRT__y0(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y0 retval = y0(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1456,12 +1476,17 @@ double CDECL MSVCRT__y1(double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_Y1 retval = y1(num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } @@ -1472,12 +1497,17 @@ double CDECL MSVCRT__yn(int order, double num) { double retval; if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; +#ifdef HAVE_YN retval = yn(order,num); if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) { *MSVCRT__errno() = MSVCRT_EDOM; - retval = sqrt(-1); + retval = NAN; } +#else + FIXME("not implemented\n"); + retval = 0; +#endif return retval; } diff --git a/include/config.h.in b/include/config.h.in index 353c146..3346b01 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -342,6 +342,15 @@ /* Define to 1 if you have the `isnanf' function. */ #undef HAVE_ISNANF +/* Define to 1 if you have the `j0' function. */ +#undef HAVE_J0 + +/* Define to 1 if you have the `j1' function. */ +#undef HAVE_J1 + +/* Define to 1 if you have the `jn' function. */ +#undef HAVE_JN + /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H @@ -1365,6 +1374,15 @@ /* Define if Xrandr has the XRRGetScreenResources function */ #undef HAVE_XRRGETSCREENRESOURCES +/* Define to 1 if you have the `y0' function. */ +#undef HAVE_Y0 + +/* Define to 1 if you have the `y1' function. */ +#undef HAVE_Y1 + +/* Define to 1 if you have the `yn' function. */ +#undef HAVE_YN + /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_ZLIB

1 0

Alexandre Julliard : makefiles: Generate the crosstest disabled rule from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 2fa7ae05f2378567f650e185079b657b89334858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa7ae05f2378567f650e185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 15:33:02 2018 +0100 makefiles: Generate the crosstest disabled rule from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 4 ---- tools/makedep.c | 14 +++++++------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c9150d3..cba521b 100755 --- a/configure +++ b/configure @@ -18198,9 +18198,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)" -test -n "$CROSSTARGET" || wine_fn_append_rule "crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" - if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" diff --git a/configure.ac b/configure.ac index 2e99320..5d09075 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,10 +2797,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -test -n "$CROSSTARGET" || WINE_APPEND_RULE( -[crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false]) - WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) diff --git a/tools/makedep.c b/tools/makedep.c index 457dcd0..7e14ed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3547,13 +3547,13 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); } - if (crosstest_deps.count) - { - output( "crosstest:" ); - output_filenames( crosstest_deps ); - output( "\n" ); - strarray_add( &make->phony_targets, "crosstest" ); - } + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); + if (!crosstest_deps.count) + output( "\t(a)echo \"crosstest is not supported (mingw not installed?)\" && false\n" ); + strarray_add( &make->phony_targets, "crosstest" ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n");

1 0

Alexandre Julliard : makefiles: Generate the winetest resource list from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: acc6306bcfd17ea472ccb162b9aeb0ab208dfdfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc6306bcfd17ea472ccb162… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 15:36:10 2018 +0100 makefiles: Generate the winetest resource list from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - aclocal.m4 | 13 +- configure | 417 +++++++++++++++++++++--------------------- programs/winetest/Makefile.in | 2 +- tools/makedep.c | 14 ++ 5 files changed, 223 insertions(+), 224 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acc6306bcfd17ea472cc…

1 0

Alexandre Julliard : makefiles: Generate the tools dependencies from makedep.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 431b6459989569a032ee50fe71b101c6aeacce5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=431b6459989569a032ee50fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 22:27:23 2018 +0100 makefiles: Generate the tools dependencies from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 13 +++---------- aclocal.m4 | 9 +-------- configure | 13 ++++--------- configure.ac | 4 +++- tools/makedep.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 791bb84..6b65fdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,7 +74,6 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@srcdir\@,$(srcdir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' @@ -128,18 +127,12 @@ install-manpages:: manpages # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wpp +__tooldeps__: libs/wpp __builddeps__: __tooldeps__ libs/wine include po -.PHONY: depend dummy __tooldeps__ install install-lib install-dev +.PHONY: depend dummy install install-lib install-dev dummy: -loader: libs/port libs/wine tools -server: libs/port libs/wine tools include -fonts: tools/sfnt2fon -include: tools tools/widl -libs/wine tools: libs/port -tools/sfnt2fon tools/wmc tools/wrc: tools -tools/widl tools/wmc tools/wrc: libs/wpp +server: include libs/port libs/wine libs/wpp: include/config.h # Misc rules diff --git a/aclocal.m4 b/aclocal.m4 index 15ad1fe..c0bdd55 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -286,15 +286,8 @@ wine_fn_config_test () wine_fn_config_tool () { ac_dir=$[1] - AS_VAR_IF([enable_tools],[no],[wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return]) - + AS_VAR_IF([enable_tools],[no],[return]) wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () diff --git a/configure b/configure index 3dd1b6b..be00e57 100755 --- a/configure +++ b/configure @@ -7805,16 +7805,9 @@ wine_fn_config_tool () { ac_dir=$1 if test "x$enable_tools" = xno; then : - wine_fn_append_file DISABLED_SUBDIRS $ac_dir; return + return fi - wine_fn_all_rules - - wine_fn_append_rule "__tooldeps__: $ac_dir" - wine_fn_append_rule "$ac_dir: libs/port" - case $ac_dir in - tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; - esac } wine_fn_config_symlink () @@ -19348,7 +19341,9 @@ if test "x$enable_tools" != xno then wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext" +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl" else wine_fn_append_rule "\$(MAKEDEP): @echo \"You need to run make in $TOOLSDIR first\" && false" diff --git a/configure.ac b/configure.ac index 5d09075..819a921 100644 --- a/configure.ac +++ b/configure.ac @@ -3954,7 +3954,9 @@ then WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext]) +Makefile: tools/makedep$ac_exeext +fonts: tools/sfnt2fon +include: tools tools/widl]) else WINE_APPEND_RULE( [\$(MAKEDEP): diff --git a/tools/makedep.c b/tools/makedep.c index 658d47f..57adf0b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3409,6 +3409,7 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray tooldeps_deps = empty_strarray; struct strarray winetest_deps = empty_strarray; struct strarray crosstest_deps = empty_strarray; unsigned int i, j; @@ -3509,6 +3510,30 @@ static void output_subdirs( struct makefile *make ) strarray_add( &builddeps_deps, target ); } } + else + { + if (!strcmp( submake->base_dir, "tools" ) || !strncmp( submake->base_dir, "tools/", 6 )) + { + strarray_add( &tooldeps_deps, submake->base_dir ); + for (j = 0; j < submake->programs.count; j++) + output( "%s/%s%s: %s\n", submake->base_dir, + submake->programs.str[j], tools_ext, submake->base_dir ); + } + if (submake->programs.count || submake->sharedlib) + { + struct strarray libs = get_expanded_make_var_array( submake, "EXTRALIBS" ); + for (j = 0; j < submake->programs.count; j++) + strarray_addall( &libs, get_expanded_file_local_var( submake, + submake->programs.str[j], "LDFLAGS" )); + output( "%s: libs/port", submake->base_dir ); + for (j = 0; j < libs.count; j++) + { + if (!strcmp( libs.str[j], "-lwpp" )) output_filename( "libs/wpp" ); + if (!strcmp( libs.str[j], "-lwine" )) output_filename( "libs/wine" ); + } + output( "\n" ); + } + } if (submake->install_rules[INSTALL_LIB].count) { @@ -3532,6 +3557,13 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + if (tooldeps_deps.count) + { + output( "__tooldeps__:" ); + output_filenames( tooldeps_deps ); + output( "\n" ); + strarray_add( &make->phony_targets, "__tooldeps__" ); + } if (winetest_deps.count) { output( "programs/winetest:" );

1 0

Alexandre Julliard : makefiles: Generate dummy dependencies for header files.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 51b57133c79ddc8787df37ebea22550cb42f6625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b57133c79ddc8787df37eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 5 00:20:57 2018 +0100 makefiles: Generate dummy dependencies for header files. This allows building when a header file is removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 57adf0b..c9ab24d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -200,6 +200,7 @@ struct makefile struct strarray implib_objs; struct strarray all_targets; struct strarray phony_targets; + struct strarray dependencies; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -426,6 +427,17 @@ static void strarray_add_uniq( struct strarray *array, const char *str ) /******************************************************************* + * strarray_addall_uniq + */ +static void strarray_addall_uniq( struct strarray *array, struct strarray added ) +{ + unsigned int i; + + for (i = 0; i < added.count; i++) strarray_add_uniq( array, added.str[i] ); +} + + +/******************************************************************* * strarray_get_value * * Find a value in a name/value pair string array. @@ -3643,7 +3655,7 @@ static void output_sources( struct makefile *make ) if (!strcmp( ext, output_source_funcs[j].ext )) break; output_source_funcs[j].fn( make, source, obj ); - free( obj ); + strarray_addall_uniq( &make->dependencies, source->dependencies ); } /* special case for winetest: add resource files from other test dirs */ @@ -3705,9 +3717,14 @@ static void output_sources( struct makefile *make ) output_uninstall_rules( make ); } + if (make->dependencies.count) + { + output_filenames( make->dependencies ); + output( ":\n" ); + } + strarray_addall( &make->clean_files, make->object_files ); - for (i = 0; i < make->crossobj_files.count; i++) - strarray_add_uniq( &make->clean_files, make->crossobj_files.str[i] ); + strarray_addall_uniq( &make->clean_files, make->crossobj_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, get_expanded_make_var_array( make, "EXTRA_TARGETS" ));

1 0

Alexandre Julliard : makefiles: Treat all directories the same way in configure.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: 3aecaf1da776b77c39a385d4a1d062476b178400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aecaf1da776b77c39a385d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 4 23:02:30 2018 +0100 makefiles: Treat all directories the same way in configure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 116 +-- configure | 2291 ++++++++++++++++++++++++-------------------------- configure.ac | 2186 +++++++++++++++++++++++------------------------ tools/make_makefiles | 62 +- 4 files changed, 2240 insertions(+), 2415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3aecaf1da776b77c39a3…

1 0

Alistair Leslie-Hughes : include: Add some missing NTSTATUS defines.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: bd57abf403d85c338051d1c22951fa94d01fed52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd57abf403d85c338051d1c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 00:34:31 2018 +0000 include: Add some missing NTSTATUS defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 86dad85..735b6c2 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -990,6 +990,10 @@ #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) +#define STATUS_INVALID_SIGNATURE ((NTSTATUS) 0xC000A000) +#define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS) 0xC000A001) +#define STATUS_AUTH_TAG_MISMATCH ((NTSTATUS) 0xC000A002) + #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001) #define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS) 0xC0020002) #define RPC_NT_INVALID_BINDING ((NTSTATUS) 0xC0020003)

1 0

Alistair Leslie-Hughes : include: Add UMS typedef's.
by Alexandre Julliard 05 Mar '18

05 Mar '18

Module: wine Branch: master Commit: d3ea561f550bba5ce4eab0e4d9a94f1f663aa12d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ea561f550bba5ce4eab0e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 5 03:59:53 2018 +0000 include: Add UMS typedef's. Based on a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 14 ++++++++++++++ include/winnt.h | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 9c7908a..aefedfd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1694,6 +1694,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef void *PUMS_CONTEXT; +typedef void *PUMS_COMPLETION_LIST; +typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT; +typedef struct _UMS_SCHEDULER_STARTUP_INFO +{ + ULONG UmsVersion; + PUMS_COMPLETION_LIST CompletionList; + PUMS_SCHEDULER_ENTRY_POINT SchedulerProc; + PVOID SchedulerParam; +} UMS_SCHEDULER_STARTUP_INFO, *PUMS_SCHEDULER_STARTUP_INFO; + +typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; +typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 56b533c..e602c1f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6123,6 +6123,27 @@ typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); +typedef enum _RTL_UMS_THREAD_INFO_CLASS +{ + UmsThreadInvalidInfoClass, + UmsThreadUserContext, + UmsThreadPriority, + UmsThreadAffinity, + UmsThreadTeb, + UmsThreadIsSuspended, + UmsThreadIsTerminated, + UmsThreadMaxInfoClass +} RTL_UMS_THREAD_INFO_CLASS, *PRTL_UMS_THREAD_INFO_CLASS; + +typedef enum _RTL_UMS_SCHEDULER_REASON +{ + UmsSchedulerStartup, + UmsSchedulerThreadBlocked, + UmsSchedulerThreadYield, +} RTL_UMS_SCHEDULER_REASON, *PRTL_UMS_SCHEDULER_REASON; + +typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); + #ifdef __cplusplus } #endif

1 0