December 2020 - Wine-commits

Zebediah Figura : devenum: Avoid initializing nameless unions in designated initializers.
by Alexandre Julliard 29 Dec '20

29 Dec '20

Module: wine Branch: master Commit: 72782c04934312805c06a693dcaf630b99d117ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=72782c04934312805c06a693… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 29 10:25:12 2020 -0600 devenum: Avoid initializing nameless unions in designated initializers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index ab675b5656f..f097c580261 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -137,17 +137,10 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, } else if (!wcscmp(name, L"FilterData")) { - REGFILTERPINS2 reg_pins[2] = {{0}}; - REGFILTER2 reg_filter = - { - .dwVersion = 2, - .dwMerit = MERIT_NORMAL + 0x800, - .cPins2 = 2, - .rgPins2 = reg_pins, - }; - unsigned int count = 1, input_count, output_count, i; DMO_PARTIAL_MEDIATYPE *types = NULL, *new_array; + REGFILTERPINS2 reg_pins[2] = {{0}}; + REGFILTER2 reg_filter = {0}; REGPINTYPES *reg_types; HRESULT hr; @@ -192,6 +185,10 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].cInstances = 1; reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; + reg_filter.dwVersion = 2; + reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.cPins2 = 2; + reg_filter.rgPins2 = reg_pins; hr = create_filter_data(var, &reg_filter); free(reg_types);

1 0

Michael Stefaniuc : msscript.ocx/tests: Use wide-char string literals.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: b01337e37157d8bf9fa064ace02c6fe3b07548d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01337e37157d8bf9fa064ac… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 26 22:29:06 2020 +0100 msscript.ocx/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 47 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 4f43764234c..756c21d887b 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -34,7 +34,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define TESTSCRIPT_CLSID "{178fc164-f585-4e24-9c13-4bb7faf80746}" static const GUID CLSID_TestScript = {0x178fc164,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; -static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; #ifdef _WIN64 @@ -1371,9 +1370,6 @@ static void test_olecontrol(void) static void test_Language(void) { - static const WCHAR jsW[] = {'J','S','c','r','i','p','t',0}; - static const WCHAR vb2W[] = {'v','B','s','c','r','i','p','t',0}; - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IScriptControl *sc; HRESULT hr; BSTR str; @@ -1390,39 +1386,39 @@ static void test_Language(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); - str = SysAllocString(vb2W); + str = SysAllocString(L"vBscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(dummyW); + str = SysAllocString(L"dummy"); hr = IScriptControl_put_Language(sc, str); ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); - str = SysAllocString(jsW); + str = SysAllocString(L"JScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, jsW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"JScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptControl_put_Language(sc, NULL); @@ -1436,8 +1432,6 @@ static void test_Language(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1448,7 +1442,7 @@ static void test_Language(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1462,7 +1456,7 @@ static void test_Language(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) - ok(!lstrcmpW(testscriptW, str), "%s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); IActiveScriptSite_Release(site); @@ -1687,7 +1681,7 @@ static void test_timeout(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(val == 0, "got %d\n", val); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1716,7 +1710,7 @@ static void test_Reset(void) hr = IScriptControl_Reset(sc); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1726,15 +1720,13 @@ static void test_Reset(void) hr = IScriptControl_get_Language(sc, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, vbW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IScriptControl_Release(sc); /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1745,7 +1737,7 @@ static void test_Reset(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1833,7 +1825,6 @@ static IDispatch testdisp = { &dispvtbl }; static void test_AddObject(void) { - static const WCHAR oW[] = {'o',0}; IScriptControl *sc; BSTR str, objname; HRESULT hr; @@ -1842,14 +1833,14 @@ static void test_AddObject(void) &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); - objname = SysAllocString(oW); + objname = SysAllocString(L"o"); hr = IScriptControl_AddObject(sc, objname, NULL, VARIANT_FALSE); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_FALSE); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -1867,8 +1858,6 @@ static void test_AddObject(void) /* custom script engine */ if (have_custom_engine) { - static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; - hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1879,7 +1868,7 @@ static void test_AddObject(void) SET_EXPECT(QI_IActiveScriptParse); SET_EXPECT(InitNew); - str = SysAllocString(testscriptW); + str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2122,7 +2111,7 @@ static void test_UseSafeSubset(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); @@ -2239,7 +2228,7 @@ static void test_State(void) hr = IScriptControl_put_State(sc, Connected); ok(hr == E_FAIL, "got 0x%08x\n", hr); - str = SysAllocString(vbW); + str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str);

1 0

Zebediah Figura : httpapi/tests: Avoid some test failures with newer Windows 10.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: 41dfe7cc67ac65c9c5c365be6bf237f563639ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41dfe7cc67ac65c9c5c365be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 26 16:19:47 2020 -0600 httpapi/tests: Avoid some test failures with newer Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5d79197505c..1d1ad56e9f6 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -304,7 +304,7 @@ static void test_v1_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); response.StatusCode = 418; @@ -1372,10 +1372,9 @@ static void test_v2_server(void) ok(req->BytesReceived == strlen(req_text), "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); ok(!req->EntityChunkCount, "Got %u entity chunks.\n", req->EntityChunkCount); ok(!req->pEntityChunks, "Got entity chunks %p.\n", req->pEntityChunks); - ok(!req->RawConnectionId, "Got SSL connection ID %s.\n", wine_dbgstr_longlong(req->RawConnectionId)); + /* req->RawConnectionId is zero until Win10 2004. */ ok(!req->pSslInfo, "Got SSL info %p.\n", req->pSslInfo); - ok(!reqv2->RequestInfoCount, "Got request info count %u.\n", reqv2->RequestInfoCount); - ok(!reqv2->pRequestInfo, "Got request info %p.\n", reqv2->pRequestInfo); + /* RequestInfoCount and pRequestInfo are zero until Win10 1909. */ response.s.StatusCode = 418; response.s.pReason = "I'm a teapot";

1 0

Damjan Jovanovic : ws2_32: Deal with getaddrinfo() returning NULL ai_canonname despite AI_CANONNAME.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: 47d50bbbc23aeb10adf9f44215784c3f6c204b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47d50bbbc23aeb10adf9f442… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Dec 27 11:39:18 2020 +0200 ws2_32: Deal with getaddrinfo() returning NULL ai_canonname despite AI_CANONNAME. This fixes a wineboot crash on FreeBSD, where getaddrinfo() returns a NULL ai_canonname, causing wineboot to pass NULL to strchr(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50408 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 05097ce53b8..0579ede8772 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6616,6 +6616,11 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr * is invalid */ ERR_(winediag)("Failed to resolve your host name IP\n"); result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); + if (!result && punixhints && (punixhints->ai_flags & AI_CANONNAME) && unixaires && !unixaires->ai_canonname) + { + freeaddrinfo(unixaires); + result = EAI_NONAME; + } } } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result);

1 0

Jefferson Carpenter : ntdll/tests: Clear AC flag in align check test.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: 93c48526202d6b2348116c64628b1eeeacc7b515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c48526202d6b2348116c64… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Sun Dec 27 12:58:27 2020 +0000 ntdll/tests: Clear AC flag in align check test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49771 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44c03a6e52a..ca338775351 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -850,16 +850,13 @@ static const BYTE align_check_code[] = { 0x55, /* push %ebp */ 0x89,0xe5, /* mov %esp,%ebp */ 0x9c, /* pushf */ + 0x9c, /* pushf */ 0x58, /* pop %eax */ 0x0d,0,0,4,0, /* or $0x40000,%eax */ 0x50, /* push %eax */ 0x9d, /* popf */ 0x89,0xe0, /* mov %esp, %eax */ 0x8b,0x40,0x1, /* mov 0x1(%eax), %eax - cause exception */ - 0x9c, /* pushf */ - 0x58, /* pop %eax */ - 0x35,0,0,4,0, /* xor $0x40000,%eax */ - 0x50, /* push %eax */ 0x9d, /* popf */ 0x5d, /* pop %ebp */ 0xc3, /* ret */

1 0

Dean M Greer : readme: Update OS X requirements.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: dbafbcb562fb30ff37c578de58486e3d5a432388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbafbcb562fb30ff37c578de… Author: Dean M Greer <gcenx83(a)gmail.com> Date: Sun Dec 27 18:55:53 2020 -0500 readme: Update OS X requirements. Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README b/README index 9761f667034..21ab6f23b20 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ To compile and run Wine, you must have one of the following: FreeBSD 8.0 or later Solaris x86 9 or later NetBSD-current - Mac OS X 10.5 or later + Mac OS X 10.8 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which @@ -61,8 +61,10 @@ NetBSD info: turned on in your kernel. Mac OS X info: - You need Xcode 2.4 or later to build properly on x86. - The Mac driver requires OS X 10.6 or later and won't be built on 10.5. + You need Xcode/Xcode Command Line Tools or Apple cctools. The + minimum requirements for compiling Wine are clang 3.8 with the + MacOSX10.10.sdk and mingw-w64 v8. The MacOSX10.14.sdk and later can + only build wine64. Supported file systems:

1 0

Dean M Greer : configure: Remove Xcode 3.x check.
by Alexandre Julliard 28 Dec '20

28 Dec '20

Module: wine Branch: master Commit: ff09f14867e1abfb7ae72d9929e89cded2926e1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff09f14867e1abfb7ae72d99… Author: Dean M Greer <gcenx83(a)gmail.com> Date: Sun Dec 27 19:06:34 2020 -0500 configure: Remove Xcode 3.x check. Check causes issues with newer Xcode versions. Xcode 3.x is unable to compile modern wine. Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 39 --------------------------------------- configure.ac | 18 ------------------ 2 files changed, 57 deletions(-) diff --git a/configure b/configure index 471d6517178..3cc5bbc724f 100755 --- a/configure +++ b/configure @@ -9079,45 +9079,6 @@ if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then : fi LIBS="$ac_save_LIBS" - fi - - if test "x$enable_win16" = "xyes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5 -$as_echo_n "checking whether 16-bit code can be built correctly... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5 -$as_echo "cross-compiling, assuming yes" >&6; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -asm(".text\n" - "bad:\tnop;nop\n" - "good:\tnop;nop\n\t" - ".globl _testfunc\n" - "_testfunc:\tcallw good"); - extern void testfunc(); -int -main () -{ -unsigned short *p = (unsigned short *)testfunc; - return p[0] != 0xe866 || p[1] != 0xfffa - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support." "$LINENO" 5 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - fi LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib" diff --git a/configure.ac b/configure.ac index dafa8489b71..beabfeb761c 100644 --- a/configure.ac +++ b/configure.ac @@ -866,24 +866,6 @@ case $host_os in LIBS="$ac_save_LIBS" fi - dnl Check for Xcode 3.x broken 16-bit support - if test "x$enable_win16" = "xyes" - then - AC_MSG_CHECKING([whether 16-bit code can be built correctly]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[asm(".text\n" - "bad:\tnop;nop\n" - "good:\tnop;nop\n\t" - ".globl _testfunc\n" - "_testfunc:\tcallw good"); - extern void testfunc();]], - [[unsigned short *p = (unsigned short *)testfunc; - return p[0] != 0xe866 || p[1] != 0xfffa]])], - AC_MSG_RESULT(yes), - [AC_MSG_RESULT(no) - AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])], - AC_MSG_RESULT([[cross-compiling, assuming yes]])) - fi - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")

1 0

Alexandre Julliard : Wine release 6.0-rc4
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: website Branch: master Commit: 70a26bec011d2d28b9ed957677db7ef79bfe214d URL: https://source.winehq.org/git/website.git/?a=commit;h=70a26bec011d2d28b9ed9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 26 20:10:48 2020 +0100 Wine release 6.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020122601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020122601.xml b/news/en/2020122601.xml new file mode 100644 index 00000000..f32acbdf --- /dev/null +++ b/news/en/2020122601.xml @@ -0,0 +1,12 @@ +<news> +<date>December 26, 2020</date> +<title>Wine 6.0-rc4 Released</title> +<body> + The Wine development release 6.0-rc4 is now available. + <a href="{$root}/announce/6.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc4.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

Zebediah Figura : ucrtbase: Do not add MSVCRT_ prefix to the exported function name of _lrot*.
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: wine Branch: master Commit: 59e0c9e94d6c39a7e588f511923b3410cce0dcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e0c9e94d6c39a7e588f511… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 24 11:44:55 2020 -0600 ucrtbase: Do not add MSVCRT_ prefix to the exported function name of _lrot*. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 078cf2c5083..2631299d24c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -568,8 +568,8 @@ @ cdecl _logb(double) @ cdecl -arch=!i386 _logbf(float) @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp -@ cdecl MSVCRT__lrotl(long long) MSVCRT__lrotl -@ cdecl MSVCRT__lrotr(long long) MSVCRT__lrotr +@ cdecl _lrotl(long long) MSVCRT__lrotl +@ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @ stub _lsearch_s @ cdecl _lseek(long long long)

1 0

Zebediah Figura : d3dcompiler/tests: Avoid initializing nameless unions in designated initializers.
by Alexandre Julliard 26 Dec '20

26 Dec '20

Module: wine Branch: master Commit: 464b2dc6613207afa888334fabee8f205a0885b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=464b2dc6613207afa888334f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 25 10:06:36 2020 -0600 d3dcompiler/tests: Avoid initializing nameless unions in designated initializers. Old versions of gcc can't handle this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50397 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 7a1243b9ccf..53dbd3e2df7 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -526,6 +526,7 @@ static void test_trig(void) static void test_sampling(void) { + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = {0}; struct test_context test_context; ID3D11ShaderResourceView *srv; ID3D11SamplerState *sampler; @@ -592,13 +593,6 @@ static void test_sampling(void) static const D3D11_SUBRESOURCE_DATA resource_data = {&texture_data, sizeof(texture_data) / 2}; - static const D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = - { - .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, - .ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D, - .Texture2D.MipLevels = 1, - }; - static const D3D11_SAMPLER_DESC sampler_desc = { .Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR, @@ -614,6 +608,9 @@ static void test_sampling(void) hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv);

1 0