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

Louis Lenders : atmlib: Add stub for ATMFinish.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: c5d0bad48ee42614b49f6666381b2804a09b66a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d0bad48ee42614b49f6666… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 11 14:31:10 2018 +0200 atmlib: Add stub for ATMFinish. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/atmlib.spec | 2 +- dlls/atmlib/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec index 387486d..dc55548 100644 --- a/dlls/atmlib/atmlib.spec +++ b/dlls/atmlib/atmlib.spec @@ -16,7 +16,7 @@ @ stub ATMEnumMMFonts @ stub ATMEnumMMFontsA @ stub ATMEnumMMFontsW -@ stub ATMFinish +@ stdcall ATMFinish() @ stub ATMFontAvailable @ stub ATMFontAvailableA @ stub ATMFontAvailableW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index 0baca00..efae51f 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -45,3 +45,9 @@ BOOL WINAPI ATMProperlyLoaded(void) FIXME("stub\n"); return FALSE; } + +int WINAPI ATMFinish(void) +{ + FIXME("stub\n"); + return 0; +}

1 0

Michael Müller : feclient: Add stub dll.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 7f0b93c7f17af709fe5fbe17e8407ffc65dbba13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0b93c7f17af709fe5fbe17… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 10 16:35:14 2018 +0200 feclient: Add stub dll. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/configure b/configure index ed45350..a38763c 100755 --- a/configure +++ b/configure @@ -1285,6 +1285,7 @@ enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep +enable_feclient enable_fltlib enable_fltmgr_sys enable_fntcache @@ -18694,6 +18695,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_wi wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests +wine_fn_config_makefile dlls/feclient enable_feclient wine_fn_config_makefile dlls/fltlib enable_fltlib wine_fn_config_makefile dlls/fltmgr.sys enable_fltmgr_sys wine_fn_config_makefile dlls/fntcache enable_fntcache diff --git a/configure.ac b/configure.ac index f306078..5d60559 100644 --- a/configure.ac +++ b/configure.ac @@ -3291,6 +3291,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000..d3eeefb --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000..3534610 --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,50 @@ +@ stub EfsUtilGetCurrentKey +@ stub EdpAllowFileAccessForProcess +@ stub EdpConsumerCredentialCreate +@ stub EdpConsumerCredentialQuery +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplStartCredServiceIfDplEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpIsConsumerDataProtectionEnforced +@ stub EdpIsConsumerDataProtectionSupported +@ stub EdpPurgeAppLearningEvents +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EdpUnprotectFile +@ stub EdpWriteLogSiteLearningEvents +@ stub EfsClientCloseFileRaw +@ stub EfsClientCopyFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeKeyInfo +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientGetKeyInfo +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsReprotectFile +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey +@ stub OefsCheckSupport diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000..91aed70 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Qian Hong : server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 9ec4b572f8ce388fbc19eae70573f8c6d1c984bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec4b572f8ce388fbc19eae7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 11 04:42:48 2018 +0000 server: Map EXDEV to STATUS_NOT_SAME_DEVICE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif

1 0

Dmitry Timoshkov : mstask: Implement ITaskScheduler::Delete().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 4bd663629d6bce8bd9c109740f7b9698d25605b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd663629d6bce8bd9c10974… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:23 2018 +0800 mstask: Implement ITaskScheduler::Delete(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task_scheduler.c | 23 ++++++++++++++++++----- dlls/mstask/tests/task_scheduler.c | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 42e7738..416a321 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -302,12 +302,25 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, return hr; } -static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( - ITaskScheduler* iface, - LPCWSTR pwszName) +static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWSTR name) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszName)); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + if (!DeleteFileW(task_name)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8b93b56..d476638 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -249,7 +249,7 @@ static void test_save_task_curfile(ITask *task) curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); @@ -343,6 +343,12 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_Delete(scheduler, Task1_ext); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); @@ -418,9 +424,12 @@ static void test_task_storage(void) test_save_task_curfile(task); - DeleteFileW(task1_full_name); - DeleteFileW(task2_full_name); - DeleteFileW(task3_full_name); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task2); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task3); + ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler);

1 0

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

10 May '18

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

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

10 May '18

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

Zebediah Figura : include: Add wmcodecdsp.idl and CMP3DecMediaObject.
by Alexandre Julliard 10 May '18

10 May '18

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

Zebediah Figura : wmcodecdspuuid: Add static library.
by Alexandre Julliard 10 May '18

10 May '18

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 : mp3dmod: Add stub MP3 Decoder DMO.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 0aff95bfa014d7b793f321255036f2bb8d5bc34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aff95bfa014d7b793f32125… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 9 17:31:33 2018 -0500 mp3dmod: Add stub MP3 Decoder DMO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/mp3dmod/Makefile.in | 8 + dlls/mp3dmod/mp3dmod.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mp3dmod/mp3dmod.idl | 27 ++++ dlls/mp3dmod/mp3dmod.spec | 5 + 6 files changed, 425 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0aff95bfa014d7b793f3…

1 0

Zebediah Figura : mp3dmod: Link to libmpg123.
by Alexandre Julliard 10 May '18

10 May '18

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