May 2017 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmime/tests: Use simpler variable names in test_InitAudio().
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: a306577803473fa5917b62ebd344c5cc0c6ed015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a306577803473fa5917b62ebd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 4 17:17:02 2017 +0200 dmime/tests: Use simpler variable names in test_InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 48 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 90fd6ee..8531e38 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -33,56 +33,54 @@ DEFINE_GUID(GUID_Bunk,0xFFFFFFFF,0xFFFF,0xFFFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF static HRESULT test_InitAudio(void) { - IDirectMusicPerformance8 *idmusicperformance; - IDirectSound *pDirectSound; - IDirectMusicPort *pDirectMusicPort; - IDirectMusicAudioPath *pDirectMusicAudioPath; + IDirectMusicPerformance8 *performance; + IDirectSound *dsound; + IDirectMusicPort *port; + IDirectMusicAudioPath *path; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, - CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (LPVOID *)&idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void **)&performance); if (hr != S_OK) { skip("Cannot create DirectMusicPerformance object (%x)\n", hr); CoUninitialize(); return hr; } - pDirectSound = NULL; - hr = IDirectMusicPerformance8_InitAudio(idmusicperformance ,NULL, - &pDirectSound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); + dsound = NULL; + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); if(hr != S_OK) return hr; - pDirectMusicPort = NULL; - hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); + port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); - ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && pDirectMusicPort != NULL) - IDirectMusicPort_Release(pDirectMusicPort); + ok(port != NULL, "IDirectMusicPort not set\n"); + if (hr == S_OK && port != NULL) + IDirectMusicPort_Release(port); - hr = IDirectMusicPerformance8_GetDefaultAudioPath(idmusicperformance, &pDirectMusicAudioPath); + hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); if (hr == S_OK) - IDirectMusicAudioPath_Release(pDirectMusicAudioPath); + IDirectMusicAudioPath_Release(path); - hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + hr = IDirectMusicPerformance8_CloseDown(performance); ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); - IDirectMusicPerformance8_Release(idmusicperformance); + IDirectMusicPerformance8_Release(performance); - hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, - CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, - (void**)&idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance8, (void**)&performance); ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); - hr = IDirectMusicPerformance8_InitAudio(idmusicperformance, NULL, NULL, - NULL, 0, 64, 0, NULL); + hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); - hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + hr = IDirectMusicPerformance8_CloseDown(performance); ok(hr == S_OK, "CloseDown failed: %08x\n", hr); - IDirectMusicPerformance8_Release(idmusicperformance); + IDirectMusicPerformance8_Release(performance); return S_OK; }

1 0

Piotr Caban : msvcr100: Add _invalid_parameter_noinfo_noreturn implementation.
by Alexandre Julliard May 4, 2017

May 4, 2017

Module: wine Branch: master Commit: e76ea27ef681cd88996fa7b760875f1197f0d7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76ea27ef681cd88996fa7b76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 4 14:36:33 2017 +0200 msvcr100: Add _invalid_parameter_noinfo_noreturn implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/errno.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 57c5ecf..e9382cd 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -57,7 +57,7 @@ @ cdecl _initterm(ptr ptr) ucrtbase._initterm @ cdecl _initterm_e(ptr ptr) ucrtbase._initterm_e @ cdecl _invalid_parameter_noinfo() ucrtbase._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() ucrtbase._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type @ cdecl _register_onexit_function(ptr ptr) ucrtbase._register_onexit_function diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 99bffe0..2f5bc4b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -939,7 +939,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cb7a043..7bd7f75 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c2477e2..0c7e84d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 443eac8..520ef22 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1188,7 +1188,7 @@ @ cdecl _initterm_e(ptr ptr) msvcr120._initterm_e @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcr120._invalid_parameter @ cdecl _invalid_parameter_noinfo() msvcr120._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() msvcr120._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ extern _iob msvcr120._iob @ cdecl _isalnum_l(long ptr) msvcr120._isalnum_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 893ed7b..45bc194 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -487,6 +487,15 @@ void CDECL _invalid_parameter_noinfo(void) } /********************************************************************* + * _invalid_parameter_noinfo_noreturn (MSVCR100.@) + */ +void CDECL _invalid_parameter_noinfo_noreturn(void) +{ + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT__exit( STATUS_INVALID_CRUNTIME_PARAMETER ); +} + +/********************************************************************* * _get_invalid_parameter_handler (MSVCR80.@) */ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dbc418c..78ae7d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -424,7 +424,7 @@ @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ stub _is_exception_typeof @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l

1 0

Hugh McMaster : regedit: Simplify clean-up in get_lineA/W().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 6b596ecf9e47e31823141cbeb764791c498d9b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b596ecf9e47e31823141cbeb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 3 11:28:14 2017 +0000 regedit: Simplify clean-up in get_lineA/W(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 8dd18d2..9740293 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -677,12 +677,7 @@ static char *get_lineA(FILE *fp) static char *buf, *next; char *line; - if (!fp) - { - if (size) HeapFree(GetProcessHeap(), 0, buf); - size = 0; - return NULL; - } + if (!fp) goto cleanup; if (!size) { @@ -737,7 +732,9 @@ static char *get_lineA(FILE *fp) } return line; } - HeapFree(GetProcessHeap(), 0, buf); + +cleanup: + if (size) HeapFree(GetProcessHeap(), 0, buf); size = 0; return NULL; } @@ -788,12 +785,7 @@ static WCHAR *get_lineW(FILE *fp) static WCHAR *buf, *next; WCHAR *line; - if (!fp) - { - if (size) HeapFree(GetProcessHeap(), 0, buf); - size = 0; - return NULL; - } + if (!fp) goto cleanup; if (!size) { @@ -849,7 +841,9 @@ static WCHAR *get_lineW(FILE *fp) } return line; } - HeapFree( GetProcessHeap(), 0, buf ); + +cleanup: + if (size) HeapFree(GetProcessHeap(), 0, buf); size = 0; return NULL; }

1 0

Alexandre Julliard : configure: Check for the necessary data structure for if_nameindex().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: a6fc8f6c82f832115e2fdd7b3762fa344d437fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fc8f6c82f832115e2fdd7b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 3 21:20:43 2017 +0200 configure: Check for the necessary data structure for if_nameindex(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 39 ++++++++++++++++++++++++++++++++++++++- configure.ac | 14 +++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 53882d5..04d6f54 100755 --- a/configure +++ b/configure @@ -15284,7 +15284,6 @@ for ac_func in \ getpwuid \ gettimeofday \ getuid \ - if_nameindex \ isnanf \ kqueue \ lstat \ @@ -16150,6 +16149,44 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5 +$as_echo_n "checking for if_nameindex... " >&6; } +if ${wine_cv_have_if_nameindex+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif +int +main () +{ +struct if_nameindex *p = if_nameindex(); return p->if_index; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_if_nameindex=yes +else + wine_cv_have_if_nameindex=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_if_nameindex" >&5 +$as_echo "$wine_cv_have_if_nameindex" >&6; } +if test "$wine_cv_have_if_nameindex" = "yes" +then + +$as_echo "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 $as_echo_n "checking for sigaddset... " >&6; } if ${wine_cv_have_sigaddset+:} false; then : diff --git a/configure.ac b/configure.ac index e86f143..1431fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -2015,7 +2015,6 @@ AC_CHECK_FUNCS(\ getpwuid \ gettimeofday \ getuid \ - if_nameindex \ isnanf \ kqueue \ lstat \ @@ -2203,6 +2202,19 @@ AC_CHECK_MEMBERS([struct ff_effect.direction],,, #include <linux/input.h> #endif]) +AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif]], + [[struct if_nameindex *p = if_nameindex(); return p->if_index;]])],[wine_cv_have_if_nameindex=yes],[wine_cv_have_if_nameindex=no])) +if test "$wine_cv_have_if_nameindex" = "yes" +then + AC_DEFINE(HAVE_IF_NAMEINDEX, 1, [Define to 1 if you have the `if_nameindex' function.]) +fi + AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) if test "$wine_cv_have_sigaddset" = "yes"

1 0

Hugh McMaster : regedit: Use a function pointer to read each registry line instead of calling get_lineA /W() directly.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 8753a1b271795d2f977b41a814de7e4ace780d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8753a1b271795d2f977b41a81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 3 11:28:36 2017 +0000 regedit: Use a function pointer to read each registry line instead of calling get_lineA/W() directly. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 282800e..a65f879 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -745,12 +745,12 @@ cleanup: return NULL; } -static BOOL processRegLinesA(FILE *fp, char *two_chars) +static BOOL processRegLinesA(FILE *fp, WCHAR *(*get_line)(FILE *), char *two_chars) { WCHAR *line, *header; int reg_version; - line = get_lineA(fp); + line = get_line(fp); header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(header); @@ -762,11 +762,11 @@ static BOOL processRegLinesA(FILE *fp, char *two_chars) HeapFree(GetProcessHeap(), 0, header); if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) { - get_lineA(NULL); /* Reset static variables */ + get_line(NULL); /* Reset static variables */ return reg_version == REG_VERSION_FUZZY; } - while ((line = get_lineA(fp))) + while ((line = get_line(fp))) { if (reg_version == REG_VERSION_31) processRegEntry31(line); @@ -847,20 +847,20 @@ cleanup: return NULL; } -static BOOL processRegLinesW(FILE *fp) +static BOOL processRegLinesW(FILE *fp, WCHAR *(*get_line)(FILE *)) { WCHAR *line; int reg_version; - line = get_lineW(fp); + line = get_line(fp); reg_version = parse_file_header(line); if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) { - get_lineW(NULL); /* Reset static variables */ + get_line(NULL); /* Reset static variables */ return reg_version == REG_VERSION_FUZZY; } - while ((line = get_lineW(fp))) + while ((line = get_line(fp))) processRegEntry(line, TRUE); closeKey(); @@ -1346,9 +1346,9 @@ BOOL import_registry_file(FILE* reg_file) return FALSE; if (s[0] == 0xff && s[1] == 0xfe) - return processRegLinesW(reg_file); + return processRegLinesW(reg_file, get_lineW); else - return processRegLinesA(reg_file, (char *)s); + return processRegLinesA(reg_file, get_lineA, (char *)s); } /******************************************************************************

1 0

Hugh McMaster : regedit: Return a Unicode line from get_lineA().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 76b9e6c712bfa129afec746f4e986a5fbdedbd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b9e6c712bfa129afec746f4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 3 11:28:26 2017 +0000 regedit: Return a Unicode line from get_lineA(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9740293..282800e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -671,12 +671,15 @@ static enum reg_versions parse_file_header(WCHAR *s) return REG_VERSION_INVALID; } -static char *get_lineA(FILE *fp) +static WCHAR *get_lineA(FILE *fp) { + static WCHAR *lineW; static size_t size; static char *buf, *next; char *line; + HeapFree(GetProcessHeap(), 0, lineW); + if (!fp) goto cleanup; if (!size) @@ -707,7 +710,8 @@ static char *get_lineA(FILE *fp) if (!(count = fread(buf + len, 1, size - len - 1, fp))) { next = NULL; - return buf; + lineW = GetWideString(buf); + return lineW; } buf[len + count] = 0; next = buf; @@ -730,10 +734,12 @@ static char *get_lineA(FILE *fp) line = next; continue; } - return line; + lineW = GetWideString(line); + return lineW; } cleanup: + lineW = NULL; if (size) HeapFree(GetProcessHeap(), 0, buf); size = 0; return NULL; @@ -741,22 +747,19 @@ cleanup: static BOOL processRegLinesA(FILE *fp, char *two_chars) { - char *line, *header; - WCHAR *lineW; + WCHAR *line, *header; int reg_version; line = get_lineA(fp); - header = HeapAlloc(GetProcessHeap(), 0, strlen(line) + 3); + header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(header); - strcpy(header, two_chars); - strcpy(header + 2, line); + header[0] = two_chars[0]; + header[1] = two_chars[1]; + lstrcpyW(header + 2, line); - lineW = GetWideString(header); + reg_version = parse_file_header(header); HeapFree(GetProcessHeap(), 0, header); - - reg_version = parse_file_header(lineW); - HeapFree(GetProcessHeap(), 0, lineW); if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) { get_lineA(NULL); /* Reset static variables */ @@ -765,14 +768,10 @@ static BOOL processRegLinesA(FILE *fp, char *two_chars) while ((line = get_lineA(fp))) { - lineW = GetWideString(line); - if (reg_version == REG_VERSION_31) - processRegEntry31(lineW); + processRegEntry31(line); else - processRegEntry(lineW, FALSE); - - HeapFree(GetProcessHeap(), 0, lineW); + processRegEntry(line, FALSE); } closeKey();

1 0

Piotr Caban : msvcp90: Don' t overwrite pointers to class members in basic_streambuf:swap.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 5bb77b4e452b0f3dd156b709c8488dde540f3a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb77b4e452b0f3dd156b709c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 17:44:03 2017 +0200 msvcp90: Don't overwrite pointers to class members in basic_streambuf:swap. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 84a6bf2c..07aa651 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2002,18 +2002,33 @@ streamsize __thiscall basic_streambuf_char_sputn(basic_streambuf_char *this, con DEFINE_THISCALL_WRAPPER(basic_streambuf_char_swap, 8) void __thiscall basic_streambuf_char_swap(basic_streambuf_char *this, basic_streambuf_char *r) { - basic_streambuf_char tmp; + char *wfirst, *wnext, *wlast, *rfirst, *rnext, *rlast; +#if _MSVCP_VER < 70 + locale loc; +#else + locale *loc; +#endif TRACE("(%p %p)\n", this, r); if(this == r) return; - tmp = *this; - *this = *r; - this->vtable = tmp.vtable; - tmp.vtable = r->vtable; - *r = tmp; + wfirst = *this->pwbuf; + wnext = *this->pwpos; + wlast = *this->pwpos + *this->pwsize; + rfirst = *this->prbuf; + rnext = *this->prpos; + rlast = *this->prpos + *this->prsize; + loc = this->loc; + + basic_streambuf_char_setp_next(this, *r->pwbuf, *r->pwpos, *r->pwpos + *r->pwsize); + basic_streambuf_char_setg(this, *r->prbuf, *r->prpos, *r->prpos + *r->prsize); + this->loc = r->loc; + + basic_streambuf_char_setp_next(r, wfirst, wnext, wlast); + basic_streambuf_char_setg(r, rfirst, rnext, rlast); + r->loc = loc; } /* ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W00(a)Z */ @@ -2959,18 +2974,33 @@ streamsize __thiscall basic_streambuf_wchar_sputn(basic_streambuf_wchar *this, c DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_swap, 8) void __thiscall basic_streambuf_wchar_swap(basic_streambuf_wchar *this, basic_streambuf_wchar *r) { - basic_streambuf_wchar tmp; + wchar_t *wfirst, *wnext, *wlast, *rfirst, *rnext, *rlast; +#if _MSVCP_VER < 70 + locale loc; +#else + locale *loc; +#endif TRACE("(%p %p)\n", this, r); if(this == r) return; - tmp = *this; - *this = *r; - this->vtable = tmp.vtable; - tmp.vtable = r->vtable; - *r = tmp; + wfirst = *this->pwbuf; + wnext = *this->pwpos; + wlast = *this->pwpos + *this->pwsize; + rfirst = *this->prbuf; + rnext = *this->prpos; + rlast = *this->prpos + *this->prsize; + loc = this->loc; + + basic_streambuf_wchar_setp_next(this, *r->pwbuf, *r->pwpos, *r->pwpos + *r->pwsize); + basic_streambuf_wchar_setg(this, *r->prbuf, *r->prpos, *r->prpos + *r->prsize); + this->loc = r->loc; + + basic_streambuf_wchar_setp_next(r, wfirst, wnext, wlast); + basic_streambuf_wchar_setg(r, rfirst, rnext, rlast); + r->loc = loc; } /* ?_Stinit@?1??_Init@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl(a)23@@Z(a)4HA */

1 0

Bruno Jesus : gdiplus: Use software mode to draw semi-transparent lines when necessary.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 29a55bc4d12834ee9a68ebc924ffec6959485421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a55bc4d12834ee9a68ebc92… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed May 3 02:59:42 2017 -0300 gdiplus: Use software mode to draw semi-transparent lines when necessary. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d8bdd7..6c0d58d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1001,12 +1001,21 @@ static REAL intersect_line_scanline(const GpPointF *p1, const GpPointF *p2, REAL return (p1->X - p2->X) * (p2->Y - y) / (p2->Y - p1->Y) + p2->X; } -static BOOL brush_can_fill_path(GpBrush *brush) +/* is_fill is TRUE if filling regions, FALSE for drawing primitives */ +static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) { switch (brush->bt) { case BrushTypeSolidColor: - return TRUE; + { + if (is_fill) + return TRUE; + else + { + /* cannot draw semi-transparent colors */ + return (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000; + } + } case BrushTypeHatchFill: { GpHatch *hatch = (GpHatch*)brush; @@ -3785,7 +3794,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (path->pathdata.Count == 0) return Ok; - if (!graphics->hdc) + if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path); @@ -4035,7 +4044,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath GpStatus retval; HRGN hrgn=NULL; - if(!graphics->hdc || !brush_can_fill_path(brush)) + if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) return NotImplemented; save_state = SaveDC(graphics->hdc); @@ -4328,7 +4337,7 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, HRGN hrgn; RECT rc; - if(!graphics->hdc || !brush_can_fill_path(brush)) + if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) return NotImplemented; status = GdipGetRegionHRgn(region, graphics, &hrgn);

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHEvalConeLight().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 6834b285d21aaa869f189073734b08ca73d759f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834b285d21aaa869f1890737… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:17 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHEvalConeLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 59 ++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9f90d16..93d31a7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2616,9 +2616,14 @@ static void test_D3DXSHDot(void) static void test_D3DXSHEvalConeLight(void) { + float bout[49], expected, gout[49], rout[49]; + unsigned int j, l, order; D3DXVECTOR3 dir; - FLOAT bout[49], expected, gout[49], rout[49]; - const FLOAT table[] = { + HRESULT hr; + BOOL equal; + + static const float table[] = + { /* Red colour */ 1.604815f, -3.131381f, 7.202175f, -2.870432f, 6.759296f, -16.959688f, 32.303082f, -15.546381f, -0.588878f, -5.902123f, 40.084042f, -77.423569f, @@ -2661,12 +2666,14 @@ static void test_D3DXSHEvalConeLight(void) 15.691326f, -26.775339f, 45.859665f, -24.544060f, -1.367048f, 4.013170f, -1.039392f, 8.582172f, -9.440103f, -117.862114f, 517.839600f, -820.820740f, 1374.188232f, -752.419067f, -45.114819f, 153.427063f, -53.766754f, 5.478452f, }; - struct + const struct + { + float *red_received, *green_received, *blue_received; + const float *red_expected, *green_expected, *blue_expected; + float radius, roffset, goffset, boffset; + } + test[] = { - FLOAT *red_received, *green_received, *blue_received; - const FLOAT *red_expected, *green_expected, *blue_expected; - FLOAT radius, roffset, goffset, boffset; - } test[] = { { rout, gout, bout, table, &table[72], &table[144], 0.5f, 1.01f, 1.02f, 1.03f, }, { rout, gout, bout, &table[36], &table[108], &table[180], 1.6f, 1.01f, 1.02f, 1.03f, }, { rout, rout, rout, &table[144], &table[144], &table[144], 0.5f, 1.03f, 1.03f, 1.03f, }, @@ -2676,9 +2683,8 @@ static void test_D3DXSHEvalConeLight(void) /* D3DXSHEvalConeLight accepts NULL green or blue colour. */ { rout, NULL, bout, table, NULL, &table[144], 0.5f, 1.01f, 0.0f, 1.03f, }, { rout, gout, NULL, table, &table[72], NULL, 0.5f, 1.01f, 1.02f, 0.0f, }, - { rout, NULL, NULL, table, NULL, NULL, 0.5f, 1.01f, 0.0f, 0.0f, }, }; - HRESULT hr; - unsigned int j, l, order; + { rout, NULL, NULL, table, NULL, NULL, 0.5f, 1.01f, 0.0f, 0.0f, }, + }; dir.x = 1.1f; dir.y = 1.2f; dir.z = 2.76f; @@ -2704,8 +2710,9 @@ static void test_D3DXSHEvalConeLight(void) expected = j + test[l].roffset; else expected = test[l].red_expected[j]; - ok(relative_error(expected, test[l].red_received[j]) < admitted_error, - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); + equal = compare_float(test[l].red_received[j], expected, 128); + ok(equal, "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].red_received[j]); if (test[l].green_received) { @@ -2713,8 +2720,9 @@ static void test_D3DXSHEvalConeLight(void) expected = j + test[l].goffset; else expected = test[l].green_expected[j]; - ok(relative_error(expected, test[l].green_received[j]) < admitted_error, - "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].green_received[j]); + equal = compare_float(test[l].green_received[j], expected, 64); + ok(equal, "Green: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].green_received[j]); } if (test[l].blue_received) @@ -2723,8 +2731,9 @@ static void test_D3DXSHEvalConeLight(void) expected = j + test[l].boffset; else expected = test[l].blue_expected[j]; - ok(relative_error(expected, test[l].blue_received[j]) < admitted_error, - "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].blue_received[j]); + equal = compare_float(test[l].blue_received[j], expected, 128); + ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, expected, test[l].blue_received[j]); } } } @@ -2751,17 +2760,17 @@ static void test_D3DXSHEvalConeLight(void) for (j = 0; j < 49; j++) { - expected = red[j]; - ok(relative_error(expected, rout[j]) < admitted_error, - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, rout[j]); + equal = compare_float(red[j], rout[j], 0); + ok(equal, "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, red[j], rout[j]); - expected = green[j]; - ok(relative_error(expected, gout[j]) < admitted_error, - "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, gout[j]); + equal = compare_float(green[j], gout[j], 0); + ok(equal, "Green: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, green[j], gout[j]); - expected = blue[j]; - ok(relative_error(expected, bout[j]) < admitted_error, - "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, bout[j]); + equal = compare_float(blue[j], bout[j], 0); + ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", + l, order, j, blue[j], bout[j]); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHDot().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 6ac2e70240a778e6259a98fd36e00dcb936b8a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2e70240a778e6259a98fd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:16 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHDot(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 291fcdc..9f90d16 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2593,10 +2593,11 @@ static void test_D3DXSHAdd(void) static void test_D3DXSHDot(void) { + float a[49], b[49], got; unsigned int i; - FLOAT a[49], b[49], got; - const FLOAT expected[] = - { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, }; + BOOL equal; + + static const float expected[] = {0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.5f, 15873.0f, 39812.5f}; for (i = 0; i < 49; i++) { @@ -2608,10 +2609,9 @@ static void test_D3DXSHDot(void) for (i = 0; i <= D3DXSH_MAXORDER + 1; i++) { got = D3DXSHDot(i, a, b); - ok(relative_error(got, expected[i]) < admitted_error, "order %d: expected %f, received %f\n", i, expected[i], got); + equal = compare_float(got, expected[i], 0); + ok(equal, "order %u: Got %.8e, expected %.8e.\n", i, got, expected[i]); } - - return; } static void test_D3DXSHEvalConeLight(void)

1 0