February 2016 - Wine-commits

Alexandre Julliard : makefiles: Parse the entire top-level makefile.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 49f88527c93e8d6b2d75455722defdabbff478b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f88527c93e8d6b2d7545572… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 17:08:12 2016 +0900 makefiles: Parse the entire top-level makefile. It's only done once so there are no longer any performance concerns. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 --- tools/makedep.c | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index b78f43b..91b134f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,6 @@ # sgmlpages: compile sgml source for the Wine API Guide # xmlpages: compile xml source for the Wine API Guide -# Start of common header # The following variable definitions are copied into all makefiles prefix = @prefix@ @@ -100,8 +99,6 @@ ALL_TEST_RESOURCES = @ALL_TEST_RESOURCES@ @ALL_VARS_RULES@ @SET_MAKE@ -# End of common header - all: wine @echo "Wine build complete." diff --git a/tools/makedep.c b/tools/makedep.c index 4264b5e..70dd753 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -182,6 +182,7 @@ struct makefile static struct makefile *top_makefile; +static const char separator[] = "### Dependencies"; static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; @@ -1685,7 +1686,7 @@ static int set_make_variable( struct strarray *array, const char *assignment ) /******************************************************************* * parse_makefile */ -static struct makefile *parse_makefile( const char *path, const char *separator ) +static struct makefile *parse_makefile( const char *path ) { char *buffer; FILE *file; @@ -1702,7 +1703,7 @@ static struct makefile *parse_makefile( const char *path, const char *separator file = open_input_makefile( make ); while ((buffer = get_line( file ))) { - if (separator && !strncmp( buffer, separator, strlen(separator) )) break; + if (!strncmp( buffer, separator, strlen(separator) )) break; if (*buffer == '\t') continue; /* command */ while (isspace( *buffer )) buffer++; if (*buffer == '#') continue; /* comment */ @@ -3211,7 +3212,6 @@ static void output_top_variables( const struct makefile *make ) */ static void output_dependencies( const struct makefile *make ) { - static const char separator[] = "### Dependencies"; struct strarray targets, ignore_files = empty_strarray; char buffer[1024]; FILE *src_file; @@ -3449,7 +3449,7 @@ int main( int argc, char *argv[] ) for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); - top_makefile = parse_makefile( NULL, "# End of common header" ); + top_makefile = parse_makefile( NULL ); linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" ); target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); @@ -3485,7 +3485,7 @@ int main( int argc, char *argv[] ) top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); for (i = 0; i < top_makefile->subdirs.count; i++) - top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i], NULL ); + top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i] ); load_sources( top_makefile ); for (i = 0; i < top_makefile->subdirs.count; i++) @@ -3500,7 +3500,7 @@ int main( int argc, char *argv[] ) for (i = 1; i < argc; i++) { - struct makefile *make = parse_makefile( argv[i], NULL ); + struct makefile *make = parse_makefile( argv[i] ); load_sources( make ); output_dependencies( make ); }

1 0

Alexandre Julliard : makefiles: Generate top-level rules for building mo files.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: d5ddc93b82e61a6ca6c3d125643e00b1a1dc7088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ddc93b82e61a6ca6c3d1256… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 17:46:56 2016 +0900 makefiles: Generate top-level rules for building mo files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 21 +++++---------------- configure.ac | 25 ++++++------------------- tools/makedep.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/configure b/configure index b11d5fb..6342d91 100755 --- a/configure +++ b/configure @@ -18308,23 +18308,12 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -if test "$MSGFMT" != false -then - wine_fn_append_rule "__builddeps__: \$(LINGUAS:%=po/%.mo) -clean:: - \$(RM) \$(LINGUAS:%=po/%.mo)" +test "$MSGFMT" != false || LINGUAS= - posrc="po" - test "$srcdir" = . || posrc="$srcdir/po" - for i in $LINGUAS - do - wine_fn_ignore_file "po/$i.mo" - wine_fn_append_rule "po/$i.mo: $posrc/$i.po - \$(MSGFMT) -o \$@ $posrc/$i.po" - done -else - LINGUAS= -fi +for i in $LINGUAS +do + wine_fn_ignore_file "po/$i.mo" +done if test "x$enable_tools" != xno then diff --git a/configure.ac b/configure.ac index 288224c..9e0dcd9 100644 --- a/configure.ac +++ b/configure.ac @@ -3650,25 +3650,12 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -if test "$MSGFMT" != false -then - WINE_APPEND_RULE( -[__builddeps__: \$(LINGUAS:%=po/%.mo) -clean:: - \$(RM) \$(LINGUAS:%=po/%.mo)]) - - posrc="po" - test "$srcdir" = . || posrc="$srcdir/po" - for i in $LINGUAS - do - WINE_IGNORE_FILE("po/$i.mo") - WINE_APPEND_RULE( -[po/$i.mo: $posrc/$i.po - \$(MSGFMT) -o \$@ $posrc/$i.po]) - done -else - LINGUAS= -fi +test "$MSGFMT" != false || LINGUAS= + +for i in $LINGUAS +do + WINE_IGNORE_FILE("po/$i.mo") +done if test "x$enable_tools" != xno then diff --git a/tools/makedep.c b/tools/makedep.c index 70dd753..79ad71d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -146,6 +146,7 @@ static const char *convert; static const char *rsvg; static const char *icotool; static const char *dlltool; +static const char *msgfmt; struct makefile { @@ -2988,16 +2989,6 @@ static struct strarray output_sources( const struct makefile *make ) strarray_addall( &clean_files, all_targets ); strarray_addall( &clean_files, get_expanded_make_var_array( make, "EXTRA_TARGETS" )); - if (clean_files.count) - { - output( "%s::\n", obj_dir_path( make, "clean" )); - output( "\trm -f" ); - output_filenames_obj_dir( make, clean_files ); - output( "\n" ); - if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" )); - strarray_add( &phony_targets, obj_dir_path( make, "clean" )); - } - if (make->subdirs.count) { struct strarray makefile_deps = empty_strarray; @@ -3022,9 +3013,32 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); strarray_add( &phony_targets, "distclean" ); + if (msgfmt && strcmp( msgfmt, "false" )) + { + strarray_addall( &clean_files, mo_files ); + output( "__builddeps__:" ); + output_filenames( mo_files ); + output( "\n" ); + for (i = 0; i < linguas.count; i++) + { + output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); + output( " %s/%s.po\n", src_dir_path( make, "po" ), linguas.str[i] ); + output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); + } + } if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); } + if (clean_files.count) + { + output( "%s::\n", obj_dir_path( make, "clean" )); + output( "\trm -f" ); + output_filenames_obj_dir( make, clean_files ); + output( "\n" ); + if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" )); + strarray_add( &phony_targets, obj_dir_path( make, "clean" )); + } + if (phony_targets.count) { output( ".PHONY:" ); @@ -3472,6 +3486,7 @@ int main( int argc, char *argv[] ) rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); + msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;

1 0

Alexandre Julliard : makefiles: Automatically create all directories that contain a target file.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: f17419ec4fa72fa6c2a4eecac1cd4ca5cbfc1b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17419ec4fa72fa6c2a4eecac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 18:00:36 2016 +0900 makefiles: Automatically create all directories that contain a target file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 79ad71d..45c9209 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1839,6 +1839,29 @@ static void create_dir( const char *dir ) /******************************************************************* + * create_file_directories + * + * Create the base directories of all the files. + */ +static void create_file_directories( const struct makefile *make, struct strarray files ) +{ + struct strarray subdirs = empty_strarray; + unsigned int i; + char *dir; + + for (i = 0; i < files.count; i++) + { + if (!strchr( files.str[i], '/' )) continue; + dir = base_dir_path( make, files.str[i] ); + *strrchr( dir, '/' ) = 0; + strarray_add_uniq( &subdirs, dir ); + } + + for (i = 0; i < subdirs.count; i++) create_dir( subdirs.str[i] ); +} + + +/******************************************************************* * output_filenames_obj_dir */ static void output_filenames_obj_dir( const struct makefile *make, struct strarray array ) @@ -2213,7 +2236,6 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; struct strarray install_rules[NB_INSTALL_RULES]; @@ -2245,13 +2267,6 @@ static struct strarray output_sources( const struct makefile *make ) if (!ext) fatal_error( "unsupported file type %s\n", source->name ); *ext++ = 0; - if (make->src_dir && strchr( obj, '/' )) - { - char *subdir = base_dir_path( make, obj ); - *strrchr( subdir, '/' ) = 0; - strarray_add_uniq( &subdirs, subdir ); - } - extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); get_dependencies( &dependencies, source, source ); @@ -3046,8 +3061,6 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } - for (i = 0; i < subdirs.count; i++) create_dir( subdirs.str[i] ); - return clean_files; } @@ -3231,6 +3244,8 @@ static void output_dependencies( const struct makefile *make ) FILE *src_file; int found = 0; + if (make->base_dir) create_dir( make->base_dir ); + output_file_name = base_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name ); output_top_variables( make ); @@ -3263,6 +3278,8 @@ static void output_dependencies( const struct makefile *make ) if (!make->src_dir && make->base_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files ); + create_file_directories( make, targets ); + output_file_name = NULL; } @@ -3345,9 +3362,6 @@ static void load_sources( struct makefile *make ) list_init( &make->sources ); list_init( &make->includes ); - /* FIXME: target dir has to exist to allow locating srcdir-relative include files */ - if (make->base_dir) create_dir( make->base_dir ); - for (var = source_vars; *var; var++) { value = get_expanded_make_var_array( make, *var );

1 0

Alexandre Julliard : makefiles: The tools no longer depend on libwine.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 0383509eebb89fb269f45194f82576d2a4ba58a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0383509eebb89fb269f45194f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 18:16:02 2016 +0900 makefiles: The tools no longer depend on libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 91b134f..8c2d856 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,8 +137,8 @@ install-manpages:: manpages # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wine libs/wpp -__builddeps__: __tooldeps__ include +__tooldeps__: libs/port libs/wpp +__builddeps__: __tooldeps__ libs/wine include .PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__ dummy: @@ -147,8 +147,7 @@ server: libs/port libs/wine tools include fonts: tools/sfnt2fon include: tools tools/widl libs/wine tools: libs/port -tools/wmc tools/wrc: tools -tools/sfnt2fon tools/wmc tools/wrc: libs/wine +tools/sfnt2fon tools/wmc tools/wrc: tools tools/widl tools/wmc tools/wrc: libs/wpp libs/port libs/wine libs/wpp: include/config.h

1 0

Michael Stefaniuc : webservices: Print the debug string and not the pointer to it.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 1496777d5f536f71c740545e13a4b5e1bdd7c5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1496777d5f536f71c740545e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 25 09:25:30 2016 +0100 webservices: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f224720..37c2045 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -716,7 +716,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT HRESULT WINAPI WsGetXmlAttribute( WS_XML_READER *handle, const WS_XML_STRING *attr, WS_HEAP *heap, WCHAR **str, ULONG *len, WS_ERROR *error ) { - FIXME( "%p %p %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); + FIXME( "%p %s %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); return E_NOTIMPL; }

1 0

Hugh McMaster : reg/tests: Test handling of null and user-specified separators.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 3cd90a43bb6e507abc9d29431b7fec08f81dbeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd90a43bb6e507abc9d29431… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 19:54:08 2016 +1100 reg/tests: Test handling of null and user-specified separators. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ac01631..151739c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -389,6 +389,18 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi20 /t REG_MULTI_SZ /s \"#\" /d \"two#\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi21 /t REG_MULTI_SZ /s \"#\" /d \"two\\0\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, TODO_REG_SIZE|TODO_REG_DATA); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Ignore the slash zero character sequence if a custom separator is specified.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: b57b998354a6ceaa1aae2c6e0864e96fd7f846fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57b998354a6ceaa1aae2c6e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 19:54:09 2016 +1100 reg: Ignore the slash zero character sequence if a custom separator is specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0155912..e66ba5a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -290,7 +290,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r for (i = 0, destindex = 0; i < len; i++, destindex++) { - if (data[i] == '\\' && data[i + 1] == '0') + if (!separator && data[i] == '\\' && data[i + 1] == '0') { buffer[destindex] = 0; i++; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 151739c..efb2839 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -391,15 +391,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi20 /t REG_MULTI_SZ /s \"#\" /d \"two#\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi21 /t REG_MULTI_SZ /s \"#\" /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); RegCloseKey(hkey);

1 0

Piotr Caban : msvcp110: Add _Thrd_detach implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: b793e2e4220a3d1c7996d2000d444311230310d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b793e2e4220a3d1c7996d2000… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:34 2016 +0100 msvcp110: Add _Thrd_detach implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 15 +++++++++++++-- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 09aaac9..87b2392 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,7 +3858,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 737cfe3..8fdd4e7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 915f58a..8c7c093 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -203,6 +203,7 @@ static void (__cdecl *p__Thrd_sleep)(const xtime*); static _Thrd_t (__cdecl *p__Thrd_current)(void); static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); +static int (__cdecl *p__Thrd_detach)(_Thrd_t); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); @@ -486,6 +487,8 @@ static BOOL init(void) "_Thrd_create"); SET(p__Thrd_join, "_Thrd_join"); + SET(p__Thrd_detach, + "_Thrd_detach"); SET(p__Mtx_init, "_Mtx_init"); @@ -1677,7 +1680,8 @@ static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; - *thr = p__Thrd_current(); + if(thr) + *thr = p__Thrd_current(); return 0x42; } @@ -1759,7 +1763,14 @@ static void test_thrd(void) ok(ta.id == tb.id, "expected %d, got %d\n", ta.id, tb.id); ok(ta.hnd != tb.hnd, "same handles, got %p\n", ta.hnd); ok(r == 0x42, "expected 0x42, got %d\n", r); - ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); + ret = p__Thrd_detach(ta); + ok(ret == 4, "_Thrd_detach should have failed with error 4, got %d\n", ret); + + ret = p__Thrd_create(&ta, thrd_thread, NULL); + ok(!ret, "failed to create thread, got %d\n", ret); + ret = p__Thrd_detach(ta); + ok(!ret, "_Thrd_detach failed, got %d\n", ret); + } #define NUM_THREADS 10 diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index af63a39..12a92fd 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa4ff7b..b1348d5 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -874,6 +874,11 @@ int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) return ret; } +int __cdecl _Thrd_detach(_Thrd_t thr) +{ + return CloseHandle(thr.hnd) ? 0 : _THRD_ERROR; +} + typedef struct { const vtable_ptr *vtable;

1 0

Piotr Caban : msvcp100: Add std::system_category() implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 21a9a8c6847255adbbcfa4335e312cf08ad41dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a9a8c6847255adbbcfa4335… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:41 2016 +0100 msvcp100: Add std::system_category() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp90/misc.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 357ca83..62403d5 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2731,8 +2731,8 @@ @ thiscall -arch=win32 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ() std_system_category +@ cdecl -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ() std_system_category @ stub -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ @ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ @ extern -arch=win32 ?table_size@?$ctype(a)D@std@@2IB ctype_char_table_size diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b1348d5..7ec4f19 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -675,7 +675,6 @@ DEFINE_THISCALL_WRAPPER(custom_category_message, 12) basic_string_char* __thiscall custom_category_message(const custom_category *this, basic_string_char *ret, int err) { - if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); } @@ -703,6 +702,14 @@ MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, return FALSE; } +DEFINE_THISCALL_WRAPPER(iostream_category_message, 12) +basic_string_char* __thiscall iostream_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + /* ?iostream_category(a)std@@YAABVerror_category(a)1@XZ */ /* ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ */ const error_category* __cdecl std_iostream_category(void) @@ -710,6 +717,25 @@ const error_category* __cdecl std_iostream_category(void) TRACE("()\n"); return &iostream_category.base; } + +static custom_category system_category; +DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category(a)std@@") + +extern const vtable_ptr MSVCP_system_category_vtable; + +static void system_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_system_category_vtable; + this->type = "system"; +} + +/* ?system_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?system_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_system_category(void) +{ + TRACE("()\n"); + return &system_category.base; +} #endif #if _MSVCP_VER >= 110 @@ -989,6 +1015,13 @@ void __asm_dummy_vtables(void) { __ASM_VTABLE(iostream_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(iostream_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); + __ASM_VTABLE(system_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) VTABLE_ADD_FUNC(custom_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) @@ -1008,6 +1041,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 init_error_category_rtti(base); init_iostream_category_rtti(base); + init_system_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); @@ -1016,6 +1050,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 iostream_category_ctor(&iostream_category); + system_category_ctor(&system_category); #endif }

1 0

Piotr Caban : msvcp100: Add std::generic_category() implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: ede38f4fdb457475708db0f2689f7ec5276c3f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede38f4fdb457475708db0f26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:47 2016 +0100 msvcp100: Add std::generic_category() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp90/misc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 62403d5..663a8f6 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1742,8 +1742,8 @@ @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ() std_generic_category +@ cdecl -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ() std_generic_category @ thiscall -arch=win32 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ cdecl -arch=win64 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=win32 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2@@Z(ptr ptr) basic_istream_char_get_streambuf diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7ec4f19..a4713d2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -736,6 +736,25 @@ const error_category* __cdecl std_system_category(void) TRACE("()\n"); return &system_category.base; } + +static custom_category generic_category; +DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category(a)std@@") + +extern const vtable_ptr MSVCP_generic_category_vtable; + +static void generic_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_generic_category_vtable; + this->type = "generic"; +} + +/* ?generic_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_generic_category(void) +{ + TRACE("()\n"); + return &generic_category.base; +} #endif #if _MSVCP_VER >= 110 @@ -1026,6 +1045,13 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); + __ASM_VTABLE(generic_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); #endif #if _MSVCP_VER >= 110 __ASM_VTABLE(_Pad, @@ -1042,6 +1068,7 @@ void init_misc(void *base) init_error_category_rtti(base); init_iostream_category_rtti(base); init_system_category_rtti(base); + init_generic_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); @@ -1051,6 +1078,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 iostream_category_ctor(&iostream_category); system_category_ctor(&system_category); + generic_category_ctor(&generic_category); #endif }

1 0