December 2019 - Wine-commits

Jacek Caban : wininet: Add missing schemes to url_schemes.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 64cb9425da43271109bc1df8df4aa32132f257ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=64cb9425da43271109bc1df8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 19 15:10:47 2019 +0100 wininet: Add missing schemes to url_schemes. Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 23 +++++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 16dc200c13..ad08e7249c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1572,16 +1572,19 @@ BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, UR return ret; } -static const WCHAR url_schemes[][7] = +static const WCHAR *url_schemes[] = { - {'f','t','p',0}, - {'g','o','p','h','e','r',0}, - {'h','t','t','p',0}, - {'h','t','t','p','s',0}, - {'f','i','l','e',0}, - {'n','e','w','s',0}, - {'m','a','i','l','t','o',0}, - {'r','e','s',0}, + L"ftp", + L"gopher", + L"http", + L"https", + L"file", + L"news", + L"mailto", + L"socks", + L"javascript", + L"vbscript", + L"res" }; /*********************************************************************** @@ -4199,7 +4202,7 @@ static LPCWSTR INTERNET_GetSchemeString(INTERNET_SCHEME scheme) index = scheme - INTERNET_SCHEME_FIRST; if (index >= ARRAY_SIZE(url_schemes)) return NULL; - return (LPCWSTR)url_schemes[index]; + return url_schemes[index]; } /* we can calculate using ansi strings because we're just diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 19ae7c3314..ba9d965442 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -168,7 +168,10 @@ static const crack_url_test_t crack_url_tests[] = { "file", "", "", "", "C:\\Program Files\\Atmel\\.\\Asdf.xml", ""}, {"C:\\file.txt", 0, 1, INTERNET_SCHEME_UNKNOWN, -1, 0, -1, 0, -1, 0, -1, 0, 2, 9, -1, 0, - "C", "", "", "", "\\file.txt", ""} + "C", "", "", "", "\\file.txt", ""}, + {"res://IELib.dll/test.htm", + 0, 3, INTERNET_SCHEME_RES, 6, 9, -1, 0, -1, 0, -1, 0, 15, 9, -1, 0, + "res", "IELib.dll", "", "", "/test.htm", ""}, }; static WCHAR *a2w(const char *str)

1 0

Jacek Caban : wininet: Don't set default gopher protocol in InternetCrackUrlW.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 4335be346271072f440419b9234883aef187d857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4335be346271072f440419b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 19 15:11:07 2019 +0100 wininet: Don't set default gopher protocol in InternetCrackUrlW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 --- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ad08e7249c..aaa8b2a569 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1829,9 +1829,6 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF case INTERNET_SCHEME_FTP: lpUC->nPort = INTERNET_DEFAULT_FTP_PORT; break; - case INTERNET_SCHEME_GOPHER: - lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; - break; default: break; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index ba9d965442..bce7dc76c5 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -172,6 +172,9 @@ static const crack_url_test_t crack_url_tests[] = { {"res://IELib.dll/test.htm", 0, 3, INTERNET_SCHEME_RES, 6, 9, -1, 0, -1, 0, -1, 0, 15, 9, -1, 0, "res", "IELib.dll", "", "", "/test.htm", ""}, + {"gopher://www.winehq.org/site/about#hi", + 0, 6, INTERNET_SCHEME_GOPHER, 9, 14, -1, 0, -1, 0, -1, 0, 23, 11, 34, 3, + "gopher", "www.winehq.org", "", "", "/site/about", "#hi"}, }; static WCHAR *a2w(const char *str)

1 0

Louis Lenders : kernel32: Update version to win7.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 1f626b5e1f072be9ba0b0d6eb0aab6e1cf7ebc71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f626b5e1f072be9ba0b0d6e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Dec 18 19:29:56 2019 +0100 kernel32: Update version to win7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48304 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/version.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index d4b994f28d..82287e5da7 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows XP SP2 */ -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.01.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.01.2600.2180" +/* these values come from Windows 7 SP1 */ +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc"

1 0

Damjan Jovanovic : ws2_32: Remove an unneeded todo_wine.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 6e7f357b65ff31603aaf7e92660658e9a032e513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7f357b65ff31603aaf7e92… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Dec 19 04:02:47 2019 +0200 ws2_32: Remove an unneeded todo_wine. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cd97aae4bb..60c5dfc63f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3048,9 +3048,8 @@ static void test_WSAEnumNetworkEvents(void) "Test[%d]: WSAEnumNetworkEvents failed\n", i); if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ { - todo_wine_if (i == 0) /* Remove when fixed */ - ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", - i, net_events.lNetworkEvents); + ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", + i, net_events.lNetworkEvents); } else {

1 0

Erich E. Hoover : msvcrt: Implement strtod without using 'long double'.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: c22af971c287933a137c9fbecc81823812e12b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22af971c287933a137c9fbe… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Dec 18 15:48:11 2019 -0700 msvcrt: Implement strtod without using 'long double'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/string.c | 67 ++++++++++++++++++++++++++++++---------------- dlls/msvcrt/tests/string.c | 46 ++++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3933c0fa3e..2ac7977182 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -49,6 +49,8 @@ #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) #define MSVCRT_MB_LEN_MAX 5 +#define MSVCRT_DBL_MAX_10_EXP 308 +#define MSVCRT_DBL_MIN_10_EXP (-307) #ifdef _WIN64 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX #else diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b78d93a917..03d80a5dec 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -558,16 +558,26 @@ static double strtod16(int sign, const char *p, char **end, } #endif +static double MSVCRT_mul_pow10(double x, int exp) +{ + BOOL negexp = (exp < 0); + double ret; + + if(negexp) + exp = -exp; + ret = pow(10.0, exp); + return (negexp ? x/ret : x*ret); +} + static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { + BOOL found_digit = FALSE, overflow, underflow; + int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; unsigned fpcontrol; - int exp=0, sign=1; const char *p; double ret; - long double lret=1, expcnt = 10; - BOOL found_digit = FALSE, negexp; if(err) *err = 0; @@ -621,13 +631,13 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale found_digit = TRUE; hlp = d * 10 + *p++ - '0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp++; + exp1++; break; } else d = hlp; } while(*p>='0' && *p<='9') { - exp++; + exp1++; p++; } @@ -640,7 +650,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; d = hlp; - exp--; + exp1--; } while(*p>='0' && *p<='9') p++; @@ -669,9 +679,9 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } e *= s; - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; - else exp += e; + if(exp1<0 && e<0 && exp1+e>=0) exp1 = INT_MIN; + else if(exp1>0 && e>0 && exp1+e<0) exp1 = INT_MAX; + else exp3 = e; } else { if(*p=='-' || *p=='+') p--; @@ -681,20 +691,31 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale fpcontrol = _control87(0, 0); _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - - negexp = (exp < 0); - if(negexp) - exp = -exp; - while(exp) { - if(exp & 1) - lret *= expcnt; - exp /= 2; - expcnt = expcnt*expcnt; - } - ret = (long double)sign * (negexp ? d/lret : d*lret); - - _control87(fpcontrol, 0xffffffff); + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, + MSVCRT__MCW_EM | MSVCRT__MCW_PC ); + + /* if we have a simple case then just calculate the result directly */ + overflow = (exp3-exp1 > MSVCRT_DBL_MAX_10_EXP); + underflow = (exp3-exp1 < MSVCRT_DBL_MIN_10_EXP); + if(!overflow && !underflow) { + exp1 += exp3; + exp3 = 0; + } + /* take the number without exponent and convert it into a double */ + ret = MSVCRT_mul_pow10(d, exp1); + /* shift the number to the representation where the first non-zero digit is in the ones place */ + if(overflow || underflow) + exp2 = (ret != 0.0 ? (int)log10(ret) : 0); + /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ + if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) + exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; + ret = MSVCRT_mul_pow10(ret, exp2); + /* apply the exponent (and undo any shift) */ + ret = MSVCRT_mul_pow10(ret, exp3-exp2); + /* apply the sign bit */ + ret *= sign; + + _control87( fpcontrol, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); if((d && ret==0.0) || isinf(ret)) { if(err) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f814a22bdb..beca47f1b6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -28,6 +28,7 @@ #include <locale.h> #include <errno.h> #include <limits.h> +#include <float.h> #include <math.h> /* make it use a definition from string.h */ @@ -1885,6 +1886,13 @@ static inline BOOL almost_equal(double d1, double d2) { return FALSE; } +static inline BOOL large_almost_equal(double d1, double d2) { + double diff = fabs(d1-d2); + if(diff / (fabs(d1) + fabs(d2)) < DBL_EPSILON) + return TRUE; + return FALSE; +} + static void test__strtod(void) { const char double1[] = "12.1"; @@ -1990,6 +1998,9 @@ static void test__strtod(void) errno = 0xdeadbeef; strtod("-1d309", NULL); ok(errno == ERANGE, "errno = %x\n", errno); + + d = strtod("1.7976931348623158e+308", NULL); + ok(almost_equal(d, DBL_MAX), "d = %lf (%lf)\n", d, DBL_MAX); } static void test_mbstowcs(void) @@ -2984,11 +2995,28 @@ static void test_tolower(void) setlocale(LC_ALL, "C"); } +static double mul_pow10(double x, double exp) +{ + int fpexcept = _EM_DENORMAL|_EM_INVALID|_EM_ZERODIVIDE|_EM_OVERFLOW|_EM_UNDERFLOW|_EM_INEXACT; + BOOL negexp = (exp < 0); + int fpcontrol; + double ret; + + if(negexp) + exp = -exp; + fpcontrol = _control87(0, 0); + _control87(fpexcept, 0xffffffff); + ret = pow(10.0, exp); + ret = (negexp ? x/ret : x*ret); + _control87(fpcontrol, 0xffffffff); + return ret; +} + static void test__atodbl(void) { _CRT_DOUBLE d; char num[32]; - int ret; + int i, j, ret; if(!p__atodbl_l) { /* Old versions of msvcrt use different values for _OVERFLOW and _UNDERFLOW @@ -3029,13 +3057,25 @@ static void test__atodbl(void) ok(ret == 0, "_atodbl(&d, \"123\") returned %d, expected 0\n", ret); ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + /* check over the whole range of (simple) normal doubles */ + for (j = DBL_MIN_10_EXP; j <= DBL_MAX_10_EXP; j++) { + for (i = 1; i <= 9; i++) { + double expected = mul_pow10(i, j); + if (expected < DBL_MIN || expected > DBL_MAX) continue; + snprintf(num, sizeof(num), "%de%d", i, j); + ret = _atodbl(&d, num); + ok(large_almost_equal(d.x, expected), "d.x = %le, expected %le\n", d.x, expected); + } + } + + /* check with denormal doubles */ strcpy(num, "1e-309"); ret = p__atodbl_l(&d, num, NULL); ok(ret == _UNDERFLOW, "_atodbl_l(&d, \"1e-309\", NULL) returned %d, expected _UNDERFLOW\n", ret); - ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + ok(d.x!=0 && almost_equal(d.x, 0.1e-308), "d.x = %le, expected 0.1e-308\n", d.x); ret = _atodbl(&d, num); ok(ret == _UNDERFLOW, "_atodbl(&d, \"1e-309\") returned %d, expected _UNDERFLOW\n", ret); - ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + ok(d.x!=0 && almost_equal(d.x, 0.1e-308), "d.x = %le, expected 0.1e-308\n", d.x); strcpy(num, "1e309"); ret = p__atodbl_l(&d, num, NULL);

1 0

Alexandre Julliard : configure: Disable gssapi also when linking with kerberos doesn't work.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 382df5d14db2d101e89b36574bf343bef32750c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=382df5d14db2d101e89b3657… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 19 15:24:01 2019 +0100 configure: Disable gssapi also when linking with kerberos doesn't work. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 61327c673d..f8e2f69801 100755 --- a/configure +++ b/configure @@ -15747,8 +15747,6 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$KRB5_CFLAGS" || KRB5_CFLAGS=`echo " $KRB5_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$KRB5_LIBS" || KRB5_LIBS=`echo " $KRB5_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` -else - with_gssapi=${with_gssapi:-no} fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in @@ -15759,6 +15757,7 @@ This is an error since --with-krb5 was requested." "$LINENO" 5 ;; esac fi +test "x$ac_cv_lib_soname_krb5" != "x" || with_gssapi=${with_gssapi:-no} if test "x$with_gssapi" != "xno" then diff --git a/configure.ac b/configure.ac index 8a121bce01..e347738961 100644 --- a/configure.ac +++ b/configure.ac @@ -1818,11 +1818,10 @@ then else KRB5_CFLAGS="" fi]) -else - with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) +test "x$ac_cv_lib_soname_krb5" != "x" || with_gssapi=${with_gssapi:-no} dnl **** Check for gssapi **** if test "x$with_gssapi" != "xno"

1 0

Alexandre Julliard : winex11: Use the default color table for window surfaces on 8bpp displays.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: 458e0ad5133c9a449e22688a89183f3a6ab286e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=458e0ad5133c9a449e22688a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 19 17:48:24 2019 +0100 winex11: Use the default color table for window surfaces on 8bpp displays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48088 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 7 +-- dlls/winex11.drv/palette.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 109 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=458e0ad5133c9a449e22…

1 0

Nikolay Sivov : ole32/tests: Add some tests for Reduce().
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: f021fd4ce6077026203b1a904733ac0dd9ca977f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f021fd4ce6077026203b1a90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 19 17:05:54 2019 +0300 ole32/tests: Add some tests for Reduce(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 47 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b65c0115ca..e4d693b442 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1531,12 +1531,11 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { + IMoniker *moniker, *inverse, *reduced; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; - IMoniker *inverse; IUnknown *unknown; FILETIME filetime; @@ -1597,8 +1596,6 @@ todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); @@ -1606,13 +1603,22 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; DWORD moniker_type; + IBindCtx *bind_ctx; IStream *stream; IUnknown *unk; HRESULT hr; @@ -1654,6 +1660,21 @@ todo_wine hr = IMoniker_IsEqual(moniker1, moniker2); ok_ole_success(hr, IsEqual); + /* Reduce() */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bind_ctx); + IStream_Release(stream); if (moniker1) IMoniker_Release(moniker1); @@ -1761,7 +1782,7 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; - IMoniker *moniker, *moniker2; + IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; DWORD hash; @@ -1919,6 +1940,12 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IMoniker_Release(moniker); /* IsEqual */ @@ -1961,13 +1988,12 @@ static void stream_write_dword(IStream *stream, DWORD value) static void test_anti_moniker(void) { - IMoniker *moniker, *moniker2, *moniker3; + IMoniker *moniker, *moniker2, *moniker3, *inverse, *reduced; HRESULT hr; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IStream *stream; @@ -2143,6 +2169,11 @@ todo_wine IStream_Release(stream); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2);

1 0

Jacek Caban : rpcrt4: Support VT_BSTR in get_param_pointer_info.
by Alexandre Julliard 19 Dec '19

19 Dec '19

Module: wine Branch: master Commit: f64832fe6a4bb330d42f44b51cd5addb1f521291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64832fe6a4bb330d42f44b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 19 14:07:57 2019 +0100 rpcrt4: Support VT_BSTR in get_param_pointer_info. Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index cb5e4f17df..7cb7da18ad 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -925,6 +925,12 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); break; + case VT_BSTR: + *flags |= IsSimpleRef | MustFree; + *tfs_tdesc = tdesc; + if (!is_in && is_out) + *server_size = sizeof(void *); + break; default: *flags |= IsSimpleRef; *tfs_tdesc = tdesc;

1 0

Alexandre Julliard : winegcc: Use winebuild to set the builtin flag.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 51ffea5a3940bdc74b44b9303c4574dfb156efc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ffea5a3940bdc74b44b930… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 18 21:05:44 2019 +0100 winegcc: Use winebuild to set the builtin flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 939c1e5c91..7f32a38788 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -524,28 +524,6 @@ static int check_platform( struct options *opts, const char *file ) return ret; } -static void make_wine_builtin( const char *file ) -{ - static const char wine_magic[32] = "Wine builtin DLL"; - int fd; - struct - { - unsigned short e_magic; - unsigned short unused[29]; - unsigned int e_lfanew; - } header; - - if ((fd = open( file, O_RDWR | O_BINARY )) == -1) error( "Failed to add signature to %s\n", file ); - - if (read( fd, &header, sizeof(header) ) == sizeof(header) && !memcmp( &header.e_magic, "MZ", 2 )) - { - if (header.e_lfanew < sizeof(header) + sizeof(wine_magic)) - error( "Not enough space (%x) for Wine signature\n", header.e_lfanew ); - write( fd, wine_magic, sizeof(wine_magic) ); - } - close( fd ); -} - static const char *get_multiarch_dir( enum target_cpu cpu ) { switch(cpu) @@ -882,6 +860,16 @@ static strarray *get_winebuild_args(struct options *opts) return spec_args; } +static void make_wine_builtin( struct options *opts, const char *file ) +{ + strarray *args = get_winebuild_args( opts ); + + strarray_add( args, "--builtin" ); + strarray_add( args, file ); + spawn( opts->prefix, args, 0 ); + strarray_free( args ); +} + /* check if there is a static lib associated to a given dll */ static char *find_static_lib( const char *dll ) { @@ -1267,7 +1255,7 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); - if (is_pe && opts->wine_builtin) make_wine_builtin( output_path ); + if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target)

1 0