July 2017 - Wine-commits - list.winehq.org

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 1ff81aa7f1a8a0a60b6a28c2f2581600d9137d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff81aa7f1a8a0a60b6a28c2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:34 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 362 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 333 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff81aa7f1a8a0a60b6a2…

1 0

Alexandre Julliard : configure: Allow specifying different CFLAGS for the cross compiler.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 40b7091ec578d99cd187e2949b83c3b1b76367fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b7091ec578d99cd187e2949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 8 11:20:21 2017 +0200 configure: Allow specifying different CFLAGS for the cross compiler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 3 +++ configure.ac | 1 + tools/makedep.c | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 22b2ae7..6f1af8c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,6 +43,7 @@ CPPBIN = @CPPBIN@ CROSSCC = @CROSSCC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CROSSCFLAGS = @CROSSCFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ diff --git a/configure b/configure index 9858031..c421baf 100755 --- a/configure +++ b/configure @@ -690,6 +690,7 @@ X_PRE_LIBS X_CFLAGS XMKMF PTHREAD_LIBS +CROSSCFLAGS CROSSCC CROSSTARGET PRELINK @@ -9105,6 +9106,8 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CC="$ac_save_CC" + CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS} + fi fi diff --git a/configure.ac b/configure.ac index d8309ea..23937f1 100644 --- a/configure.ac +++ b/configure.ac @@ -983,6 +983,7 @@ then done], [AC_MSG_RESULT([no])]) CC="$ac_save_CC" + AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) fi fi diff --git a/tools/makedep.c b/tools/makedep.c index add722f..fe670af 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2669,7 +2669,7 @@ static struct strarray output_sources( const struct makefile *make ) if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filename( "-DWINE_CROSSTEST" ); output_filenames( cpp_flags ); - output_filename( "$(CFLAGS)" ); + output_filename( "$(CROSSCFLAGS)" ); output( "\n" ); } if (make->testdll && !strcmp( ext, "c" ) && !(source->file->flags & FLAG_GENERATED))

1 0

Alexandre Julliard : kernel32/tests: Wait for threads to terminate.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 8d51efc7b9fb0764a8af0e6657104b0c53184449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d51efc7b9fb0764a8af0e665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:17:10 2017 +0200 kernel32/tests: Wait for threads to terminate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 6b0c3ed..4fb9de1 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1506,6 +1506,8 @@ static void test_WaitCts(void) args[1] = CLRRTS; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* Change the Comm Mask while a Wait is going on @@ -1588,6 +1590,8 @@ static void test_AbortWaitCts(void) "Unexpected time %d, expected around %d\n", diff, TIMEOUT>>1); CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1668,6 +1672,8 @@ static void test_WaitDsr(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1754,6 +1760,8 @@ static void test_WaitRing(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* * Wait for a change in DCD @@ -1833,6 +1841,8 @@ static void test_WaitDcd(void) args[1] = CLRDTR; CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } /* @@ -1914,6 +1924,8 @@ static void test_WaitBreak(void) ok(ClearCommBreak(hcom), "ClearCommBreak failed\n"); CloseHandle(hcom); + ok( !WaitForSingleObject( alarmThread, 10000 ), "thread still running\n" ); + CloseHandle( alarmThread ); } static void test_stdio(void)

1 0

Jeremy Newman : remove stat for warned users, method no longer exists
by Jeremy Newman 10 Jul '17

10 Jul '17

Module: appdb Branch: master Commit: bc12082ef0dabc370c705cd6e4e84556857fcef0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bc12082ef0dabc370c705cd6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jul 10 13:49:48 2017 -0500 remove stat for warned users, method no longer exists --- appdbStats.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/appdbStats.php b/appdbStats.php index 51ac310..997daee 100644 --- a/appdbStats.php +++ b/appdbStats.php @@ -51,12 +51,6 @@ echo " <td>".(User::objectGetEntriesCount()- User::active_users_within_days(183))."</td>\n"; echo "</tr>\n\n"; -/* Display the users who were warned and pending deletion */ -echo "<tr>\n"; -echo " <td>Inactive users pending deletion:</td>\n"; -echo " <td>".User::get_inactive_users_pending_deletion()."</td>\n"; -echo "</tr>\n\n"; - /* Display the number of comments */ echo "<tr>\n"; echo " <td>Comments:</td>\n";

1 0

Rosanne DiMesio : Move keywords search to above name search
by Jeremy Newman 10 Jul '17

10 Jul '17

Module: appdb Branch: master Commit: 359ae873e89c14f04da8551791d81d85bbecbd3e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=359ae873e89c14f04da85517… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jul 10 08:32:50 2017 -0500 Move keywords search to above name search Users are accustomed to the name search being the bottom one. Requested in bug 43299. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/application.php b/include/application.php index 8962915..f6c90b8 100644 --- a/include/application.php +++ b/include/application.php @@ -1121,8 +1121,8 @@ EOT; $oFilter->AddFilterInfo('versions.id', 'Wine version', array(FILTER_EQUALS,FILTER_LESS_THAN,FILTER_GREATER_THAN), FILTER_VALUES_ENUM, $aWineVersionIds, $aWineVersions); $oFilter->AddFilterInfo('appCategory', 'Category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); - $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('appFamily.keywords', 'Keywords', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); + $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); $oFilter->AddFilterInfo('onlyDownloadable', 'Only show downloadable apps', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter;

1 0

Alexandre Julliard : Wine release 2.12
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: website Branch: master Commit: db630af32553fb6cf83e7d1a15786d6fefdb4713 URL: http://source.winehq.org/git/website.git/?a=commit;h=db630af32553fb6cf83e7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 21:10:17 2017 +0200 Wine release 2.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017070701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017070701.xml b/news/en/2017070701.xml new file mode 100644 index 0000000..0264c3a --- /dev/null +++ b/news/en/2017070701.xml @@ -0,0 +1,16 @@ +<news> +<date>July 7, 2017</date> +<title>Wine 2.12 Released</title> +<body> + The Wine development release 2.12 is now available. + <a href="{$root}/announce/2.12">What's new</a> in this release: +<ul> + <li>Audio driver for Android.</li> + <li>Some performance improvements with async I/O.</li> + <li>More RegEdit file parser improvements.</li> + <li>Beginnings for MSI user interface support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hugh McMaster : regedit: Use a function to free the parser data.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: e2ae9e3c5819f305fe3e818bc2bfd625b82cfc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ae9e3c5819f305fe3e818bc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 7 11:47:51 2017 +0000 regedit: Use a function to free the parser data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9680bd2..a4158c2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -495,6 +495,15 @@ static LONG open_key(struct parser *parser, WCHAR *path) return res; } +static void free_parser_data(struct parser *parser) +{ + if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) + HeapFree(GetProcessHeap(), 0, parser->data); + + parser->data = NULL; + parser->data_size = 0; +} + enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -802,9 +811,7 @@ static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -826,10 +833,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -870,10 +874,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -890,10 +891,7 @@ static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos) return pos; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return p; } @@ -918,10 +916,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -941,11 +936,7 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); - if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - HeapFree(GetProcessHeap(), 0, parser->data); - - parser->data = NULL; - parser->data_size = 0; + free_parser_data(parser); if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE);

1 0

Michael Stefaniuc : wineandroid: Use EqualRect() instead of memcmp().
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: ba0afd26e7a70f7b3f67c78a580d4b25f37841d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0afd26e7a70f7b3f67c78a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:11 2017 +0200 wineandroid: Use EqualRect() instead of memcmp(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index ff8b1e0..e5006e3 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1264,7 +1264,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface = NULL; } - if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + if (!surface || !EqualRect( &surface->rect, &rect )) { data->surface = create_surface( data->hwnd, &rect, 255, color_key, TRUE ); if (surface) window_surface_release( surface );

1 0

Michael Stefaniuc : regedit: Remove a redundant NULL check before HeapFree ().
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: a9987fa11a1b2411b565dd1703d9f795dabfcfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9987fa11a1b2411b565dd170… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:13 2017 +0200 regedit: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a4158c2..0a356cb 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1564,9 +1564,7 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; - if (parser.value_name) - HeapFree(GetProcessHeap(), 0, parser.value_name); - + HeapFree(GetProcessHeap(), 0, parser.value_name); close_key(&parser); return TRUE;

1 0

Michael Stefaniuc : urlmon: Remove a redundant NULL check before SysFreeString().
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 5660a9be744417acf4ba223517bdcf9d4c8b7e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5660a9be744417acf4ba22351… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:12 2017 +0200 urlmon: Remove a redundant NULL check before SysFreeString(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1493023..47c972b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -510,8 +510,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->pi = grfPI; if(This->uri) { - if(This->display_uri) - SysFreeString(This->display_uri); + SysFreeString(This->display_uri); IUri_Release(This->uri); } IUri_AddRef(pUri);

1 0