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

Hans Leidekker : hnetcfg/tests: Ignore case when comparing filenames.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 8e29f491c4ff92d18c60715f7013ae698c802e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e29f491c4ff92d18c60715f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 14:56:00 2018 +0200 hnetcfg/tests: Ignore case when comparing filenames. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4d70818..4ee19d8 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -141,7 +141,7 @@ static void test_NetFwAuthorizedApplication(void) hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); SysFreeString( bstr ); SysFreeString( image );

1 0

Owen Rudge : wsdapi/tests: Add initial test for receiving probe messages.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: a055b68fcfa866b33d5f9689fefceaf7731fddad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a055b68fcfa866b33d5f9689… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 9 23:35:53 2018 +0100 wsdapi/tests: Add initial test for receiving probe messages. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 99 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 7440cfd..ae2fa39 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -41,6 +41,17 @@ static const char *publisherId = "urn:uuid:3AE5617D-790F-408A-9374-359A77F924A3"; static const char *sequenceId = "urn:uuid:b14de351-72fc-4453-96f9-e58b0c9faf38"; +static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\" " + "xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\" " + "xmlns:wsd=\"http://schemas.xmlsoap.org/ws/2005/04/discovery\" " + "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" + "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" + "<wsa:MessageID>urn:uuid:aa3eb169-9440-4eb7-9090-88402664cc6a</wsa:MessageID></soap:Header>" + "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types></wsd:Probe></soap:Body></soap:Envelope>"; + +static HANDLE probe_event = NULL; + #define MAX_CACHED_MESSAGES 5 #define MAX_LISTENING_THREADS 20 @@ -313,6 +324,71 @@ cleanup: return ret; } +static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG family) +{ + IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; + static const struct in6_addr i_addr_zero; + struct addrinfo *multi_address; + ULONG bufferSize = 0; + LPSOCKADDR sockaddr; + BOOL ret = FALSE; + const char ttl = 8; + ULONG retval; + SOCKET s; + + /* Resolve the multicast address */ + if (family == AF_INET6) + multi_address = resolve_address(SEND_ADDRESS_IPV6, SEND_PORT, AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + else + multi_address = resolve_address(SEND_ADDRESS_IPV4, SEND_PORT, AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if (multi_address == NULL) + return FALSE; + + /* Get size of buffer for adapters */ + retval = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); + if (retval != ERROR_BUFFER_OVERFLOW) goto cleanup; + + adapter_addresses = (IP_ADAPTER_ADDRESSES *) heap_alloc(bufferSize); + if (adapter_addresses == NULL) goto cleanup; + + /* Get list of adapters */ + retval = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); + if (retval != ERROR_SUCCESS) goto cleanup; + + for (adapter_addr = adapter_addresses; adapter_addr != NULL; adapter_addr = adapter_addr->Next) + { + if (adapter_addr->FirstUnicastAddress == NULL) continue; + + sockaddr = adapter_addr->FirstUnicastAddress->Address.lpSockaddr; + + /* Create a socket and bind to the adapter address */ + s = socket(family, SOCK_DGRAM, IPPROTO_UDP); + if (s == INVALID_SOCKET) continue; + + if (bind(s, sockaddr, adapter_addr->FirstUnicastAddress->Address.iSockaddrLength) == SOCKET_ERROR) + { + closesocket(s); + continue; + } + + /* Set the multicast interface and TTL value */ + setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char *) &i_addr_zero, + (family == AF_INET6) ? sizeof(struct in6_addr) : sizeof(struct in_addr)); + setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)); + + sendto(s, data, length, 0, (SOCKADDR *) multi_address->ai_addr, multi_address->ai_addrlen); + closesocket(s); + } + + ret = TRUE; + +cleanup: + freeaddrinfo(multi_address); + heap_free(adapter_addresses); + return ret; +} + typedef struct IWSDiscoveryPublisherNotifyImpl { IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; LONG ref; @@ -375,6 +451,23 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_Release(IWSDiscoveryPublishe static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) { trace("IWSDiscoveryPublisherNotifyImpl_ProbeHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); + + if (probe_event == NULL) + { + /* We may have received an unrelated probe on the network */ + return S_OK; + } + + ok(pSoap != NULL, "pSoap == NULL\n"); + ok(pMessageParameters != NULL, "pMessageParameters == NULL\n"); + + if (pSoap != NULL) + { + ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); + ok(pSoap->Header.To != NULL, "pSoap->Header.To == NULL\n"); + } + + SetEvent(probe_event); return S_OK; } @@ -723,6 +816,12 @@ after_publish_test: heap_free(publisherIdW); heap_free(sequenceIdW); + /* Test the receiving of a probe message */ + probe_event = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(send_udp_multicast_of_type(testProbeMessage, sizeof(testProbeMessage) - 1, AF_INET) == TRUE, "Sending Probe message failed\n"); + todo_wine ok(WaitForSingleObject(probe_event, 2000) == WAIT_OBJECT_0, "Probe message not received\n"); + CloseHandle(probe_event); + ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref);

1 0

Zebediah Figura : wmcodecdspuuid: Add static library.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 7179475dd03b11df124aa345615065203eed0c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7179475dd03b11df124aa345… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:32 2018 -0500 wmcodecdspuuid: Add static library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++++ configure.ac | 1 + dlls/wmcodecdspuuid/Makefile.in | 4 ++++ dlls/wmcodecdspuuid/wmcodecdspuuid.c | 27 +++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index d53583d..eda1f7b 100755 --- a/configure +++ b/configure @@ -1594,6 +1594,7 @@ enable_winusb enable_wlanapi enable_wldap32 enable_wmasf +enable_wmcodecdspuuid enable_wmi enable_wmiutils enable_wmp @@ -8839,6 +8840,8 @@ CROSSTARGET="" if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in + aarch64*) + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[3456789]86*) @@ -19171,6 +19174,7 @@ wine_fn_config_makefile dlls/wlanapi/tests enable_tests wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf +wine_fn_config_makefile dlls/wmcodecdspuuid enable_wmcodecdspuuid wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils wine_fn_config_makefile dlls/wmiutils/tests enable_tests diff --git a/configure.ac b/configure.ac index b4a8ef0..bea3aa2 100644 --- a/configure.ac +++ b/configure.ac @@ -3773,6 +3773,7 @@ WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) +WINE_CONFIG_MAKEFILE(dlls/wmcodecdspuuid) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) WINE_CONFIG_MAKEFILE(dlls/wmiutils/tests) diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in new file mode 100644 index 0000000..d8f5d02 --- /dev/null +++ b/dlls/wmcodecdspuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwmcodecdspuuid.a + +C_SRCS = \ + wmcodecdspuuid.c diff --git a/dlls/wmcodecdspuuid/wmcodecdspuuid.c b/dlls/wmcodecdspuuid/wmcodecdspuuid.c new file mode 100644 index 0000000..c715641 --- /dev/null +++ b/dlls/wmcodecdspuuid/wmcodecdspuuid.c @@ -0,0 +1,27 @@ +/* + * GUID definitions + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "strmif.h" +#include "mediaobj.h" + +#include "initguid.h" + +#include "wmcodecdsp.h"

1 0

Zebediah Figura : include: Add wmcodecdsp.idl and CMP3DecMediaObject.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 21ac699f6fb35363480ac151b5169979aa7c0b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac699f6fb35363480ac151… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:31 2018 -0500 include: Add wmcodecdsp.idl and CMP3DecMediaObject. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmcodecdsp.idl | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d816bbf..78ab095 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -701,6 +701,7 @@ SOURCES = \ winuser.rh \ winver.h \ wlanapi.h \ + wmcodecdsp.idl \ wmdrmsdk.idl \ wmistr.h \ wmium.h \ diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl new file mode 100644 index 0000000..8ec303c --- /dev/null +++ b/include/wmcodecdsp.idl @@ -0,0 +1,25 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mediaobj.idl"; +import "strmif.idl"; + +[ + uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) +] +coclass CMP3DecMediaObject {}

1 0

Martin Storsjo : configure: Detect MinGW-w64 ARM64 toolchains.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 31de3c69075ea123eb36d1fb82155d58165a2675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31de3c69075ea123eb36d1fb… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 10 00:50:41 2018 +0300 configure: Detect MinGW-w64 ARM64 toolchains. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 6ad8363..289ee92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -191,6 +191,8 @@ dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in + aarch64*) + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[[3456789]]86*)

1 0

Martin Storsjo : arm64: Use __builtin_ms_va_list and __attribute__((ms_abi )) on arm64.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 8fb8cc03c3edb599dd98f369e14a08f899cbff95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fb8cc03c3edb599dd98f369… Author: Martin Storsjo <martin(a)martin.st> Date: Wed May 9 23:34:57 2018 +0300 arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64. Windows uses a different ABI for va_list on arm64 just like on x86_64. On x86_64, the calling convention for windows functions is completely different from the one on other platforms. On arm64, they're mostly the same, with the only exception being variadic functions (where all float arguments are passed in integer registers, since the va_list is a single pointer). Any functions using __builtin_ms_va_start need to be decorated with __attribute__((ms_abi)). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++++++++++++++++++++++++ configure.ac | 7 +++++++ include/msvcrt/crtdefs.h | 6 +++++- include/windef.h | 6 +++++- include/wine/test.h | 4 ++-- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 30d53da..d53583d 100755 --- a/configure +++ b/configure @@ -5409,6 +5409,30 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm -mfloat-abi=$float_abi" ;; + aarch64*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 +$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdarg.h> +int +main () +{ +void func(__builtin_ms_va_list *args); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$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 $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index 54c31d8..b4a8ef0 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,13 @@ case $host in CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; + aarch64*) + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index a9edef5..0c0b087 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -62,6 +62,8 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -82,13 +84,15 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index 40028f3..8e8a08a 100644 --- a/include/windef.h +++ b/include/windef.h @@ -71,6 +71,8 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -91,13 +93,15 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/wine/test.h b/include/wine/test.h index 21e2ac7..e3e4bcf 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -90,7 +90,7 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else @@ -181,7 +181,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #include <stdio.h> #include <excpt.h> -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __winetest_va_end(list) __builtin_ms_va_end(list) #else

1 0

Zebediah Figura : mp3dmod: Link to libmpg123.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 328937151e91367b44f084d341ef872013a3984d URL: https://source.winehq.org/git/wine.git/?a=commit;h=328937151e91367b44f084d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:34 2018 -0500 mp3dmod: Link to libmpg123. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mp3dmod/Makefile.in | 2 ++ dlls/mp3dmod/mp3dmod.c | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/configure b/configure index c56e341..9e38228 100755 --- a/configure +++ b/configure @@ -14236,6 +14236,7 @@ This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; esac enable_l3codeca_acm=${enable_l3codeca_acm:-no} fi +test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} if test "$ac_cv_header_AL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index d705fd8..4ea26b3 100644 --- a/configure.ac +++ b/configure.ac @@ -1763,6 +1763,7 @@ fi WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], [enable_l3codeca_acm]) +test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_mp3dmod=${enable_mp3dmod:-no} dnl **** Check for OpenAL 1.1 **** if test "$ac_cv_header_AL_al_h" = "yes" diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index d892751..5bcef48 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,5 +1,7 @@ MODULE = mp3dmod.dll IMPORTS = dmoguids uuid wmcodecdspuuid +EXTRAINCL = $(MPG123_CFLAGS) +EXTRALIBS = $(MPG123_LIBS) C_SRCS = \ mp3dmod.c diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index c6cb0ad..0f1f069 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <mpg123.h> #include "windef.h" #include "winbase.h" #define COBJMACROS @@ -35,6 +36,7 @@ static HINSTANCE mp3dmod_instance; struct mp3_decoder { IMediaObject IMediaObject_iface; LONG ref; + mpg123_handle *mh; }; static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) @@ -80,6 +82,7 @@ static ULONG WINAPI MediaObject_Release(IMediaObject *iface) if (!refcount) { + mpg123_delete(This->mh); heap_free(This); } return refcount; @@ -264,6 +267,7 @@ static const IMediaObjectVtbl IMediaObject_vtbl = { static HRESULT create_mp3_decoder(REFIID iid, void **obj) { struct mp3_decoder *This; + int err; if (!(This = heap_alloc(sizeof(*This)))) return E_OUTOFMEMORY; @@ -271,6 +275,9 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) This->IMediaObject_iface.lpVtbl = &IMediaObject_vtbl; This->ref = 0; + mpg123_init(); + This->mh = mpg123_new(NULL, &err); + return IMediaObject_QueryInterface(&This->IMediaObject_iface, iid, obj); }

1 0

Jacek Caban : jscript: Make RegExp object properties non-writable.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 2538a74c801230941c326f2629ba07962e14fa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538a74c801230941c326f26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:45 2018 +0200 jscript: Make RegExp object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 40 ++++++++-------------------------------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 5798635..821c016 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -256,12 +256,6 @@ static HRESULT RegExp_get_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -270,12 +264,6 @@ static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -284,12 +272,6 @@ static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ return S_OK; } -static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -298,12 +280,6 @@ static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static INT index_from_val(script_ctx_t *ctx, jsval_t v) { double n; @@ -607,11 +583,11 @@ static void RegExp_destructor(jsdisp_t *dispex) static const builtin_prop_t RegExp_props[] = { {execW, RegExp_exec, PROPF_METHOD|1}, - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source}, + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source}, {testW, RegExp_test, PROPF_METHOD|1}, {toStringW, RegExp_toString, PROPF_METHOD} }; @@ -626,11 +602,11 @@ static const builtin_info_t RegExp_info = { }; static const builtin_prop_t RegExpInst_props[] = { - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source} + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source} }; static const builtin_info_t RegExpInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6b84b40..a769a49 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -179,7 +179,11 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(obj, "arguments", false, false, false); obj = /test/; + test_own_data_prop_desc(obj, "global", false, false, false); + test_own_data_prop_desc(obj, "ignoreCase", false, false, false); test_own_data_prop_desc(obj, "lastIndex", true, false, false); + test_own_data_prop_desc(obj, "multiline", false, false, false); + test_own_data_prop_desc(obj, "source", false, false, false); next_test(); }

1 0

Jacek Caban : jscript: Make Function instance object properties non-writable.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: 7f01473a388529853f1552c15711bdf71c92daa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f01473a388529853f1552c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:36 2018 +0200 jscript: Make Function instance object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 14 ++++---------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ac0640f..af0b9a4 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -358,12 +358,6 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -588,9 +582,9 @@ static void Function_destructor(jsdisp_t *dispex) static const builtin_prop_t Function_props[] = { {applyW, Function_apply, PROPF_METHOD|2}, - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, + {argumentsW, NULL, 0, Function_get_arguments}, {callW, Function_call, PROPF_METHOD|1}, - {lengthW, NULL, 0, Function_get_length, Function_set_length}, + {lengthW, NULL, 0, Function_get_length}, {toStringW, Function_toString, PROPF_METHOD} }; @@ -604,8 +598,8 @@ static const builtin_info_t Function_info = { }; static const builtin_prop_t FunctionInst_props[] = { - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, - {lengthW, NULL, 0, Function_get_length, Function_set_length} + {argumentsW, NULL, 0, Function_get_arguments}, + {lengthW, NULL, 0, Function_get_length} }; static const builtin_info_t FunctionInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 1096307..6b84b40 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -174,6 +174,10 @@ function test_getOwnPropertyDescriptor() { obj = new Array(); test_own_data_prop_desc(obj, "length", true, false, false); + obj = new Function(); + test_own_data_prop_desc(obj, "length", false, false, false); + test_own_data_prop_desc(obj, "arguments", false, false, false); + obj = /test/; test_own_data_prop_desc(obj, "lastIndex", true, false, false);

1 0

Jacek Caban : jscript: Make String.length non-writable.
by Alexandre Julliard May 10, 2018

May 10, 2018

Module: wine Branch: master Commit: a9f8c2c7c189aef11e47dede0260f364d49c65ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9f8c2c7c189aef11e47dede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:28 2018 +0200 jscript: Make String.length non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 10 ++-------- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ad978f2..737c878 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -119,12 +119,6 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT String_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("%p\n", jsthis); - return E_NOTIMPL; -} - static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r) { StringInstance *string; @@ -1539,7 +1533,7 @@ static const builtin_prop_t String_props[] = { {indexOfW, String_indexOf, PROPF_METHOD|2}, {italicsW, String_italics, PROPF_METHOD}, {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, - {lengthW, NULL,0, String_get_length, String_set_length}, + {lengthW, NULL,0, String_get_length}, {linkW, String_link, PROPF_METHOD|1}, {localeCompareW, String_localeCompare, PROPF_METHOD|1}, {matchW, String_match, PROPF_METHOD|1}, @@ -1571,7 +1565,7 @@ static const builtin_info_t String_info = { }; static const builtin_prop_t StringInst_props[] = { - {lengthW, NULL,0, String_get_length, String_set_length} + {lengthW, NULL,0, String_get_length} }; static const builtin_info_t StringInst_info = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f124c46..f9178a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -408,6 +408,12 @@ ok(str.toString() === "", "str.toString() = " + str.toString()); var str = new String("test", "abc"); ok(str.toString() === "test", "str.toString() = " + str.toString()); +str = new String("test"); +ok(str.length === 4, "str.length = " + str.length); +str.length = 3; +str.length = 5; +ok(str.length === 4, "str.length = " + str.length); + var strObj = new Object(); strObj.toString = function() { return "abcd" }; strObj.substr = String.prototype.substr; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index efdfb0a..1096307 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -166,6 +166,7 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(Math, "PI", false, false, false); var obj = new String(); + test_own_data_prop_desc(obj, "length", false, false, false); ok(Object.getOwnPropertyDescriptor(obj, "slice") === undefined, "getOwnPropertyDescriptor(slice) did not return undefined"); test_own_data_prop_desc(String.prototype, "slice", true, false, true);

1 0