October 2021 - Wine-commits

Alexandre Julliard : l3codeca.acm: Use the bundled mpg123 and build with msvcrt.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 5329da61ac51995f7a690edffbbc57d955566a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5329da61ac51995f7a690edf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:41:21 2021 +0200 l3codeca.acm: Use the bundled mpg123 and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 ------------------------------------------ configure.ac | 19 -------- dlls/l3codeca.acm/Makefile.in | 7 +-- dlls/l3codeca.acm/mpegl3.c | 6 --- include/config.h.in | 3 -- 5 files changed, 2 insertions(+), 143 deletions(-) diff --git a/configure b/configure index 4e64db49eed..8d4ca1ac653 100755 --- a/configure +++ b/configure @@ -637,8 +637,6 @@ VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS -MPG123_LIBS -MPG123_CFLAGS JPEG_LIBS JPEG_CFLAGS GSSAPI_LIBS @@ -874,7 +872,6 @@ with_jpeg with_krb5 with_ldap with_mingw -with_mpg123 with_netapi with_openal with_opencl @@ -1992,8 +1989,6 @@ GSSAPI_CFLAGS GSSAPI_LIBS JPEG_CFLAGS JPEG_LIBS -MPG123_CFLAGS -MPG123_LIBS NETAPI_CFLAGS NETAPI_LIBS VKD3D_CFLAGS @@ -2665,7 +2660,6 @@ Optional Packages: --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP --without-mingw do not use the MinGW cross-compiler - --without-mpg123 do not use the mpg123 library --without-netapi do not use the Samba NetAPI library --without-openal do not use OpenAL --without-opencl do not use OpenCL @@ -2818,9 +2812,6 @@ Some influential environment variables: GSSAPI_LIBS Linker flags for krb5-gssapi, overriding pkg-config JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config - MPG123_CFLAGS - C compiler flags for libmpg123, overriding pkg-config - MPG123_LIBS Linker flags for libmpg123, overriding pkg-config NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config @@ -4133,12 +4124,6 @@ if test "${with_mingw+set}" = set; then : fi -# Check whether --with-mpg123 was given. -if test "${with_mpg123+set}" = set; then : - withval=$with_mpg123; -fi - - # Check whether --with-netapi was given. if test "${with_netapi+set}" = set; then : withval=$with_netapi; @@ -15416,99 +15401,6 @@ esac fi -if test "x$with_mpg123" != "xno" -then - if ${MPG123_CFLAGS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_CFLAGS=`$PKG_CONFIG --cflags libmpg123 2>/dev/null` -fi -fi - -if ${MPG123_LIBS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - MPG123_LIBS=`$PKG_CONFIG --libs libmpg123 2>/dev/null` -fi -fi - -MPG123_LIBS=${MPG123_LIBS:-"-lmpg123"} -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 cflags: $MPG123_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 libs: $MPG123_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $MPG123_CFLAGS" -for ac_header in mpg123.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default" -if test "x$ac_cv_header_mpg123_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MPG123_H 1 -_ACEOF - -fi - -done - - if test "$ac_cv_header_mpg123_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 -$as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; } -if ${ac_cv_lib_mpg123_mpg123_feed+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpg123 $MPG123_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char mpg123_feed (); -int -main () -{ -return mpg123_feed (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpg123_mpg123_feed=yes -else - ac_cv_lib_mpg123_mpg123_feed=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5 -$as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; } -if test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes; then : - : -else - MPG123_LIBS="" -fi - - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi -CPPFLAGS=$ac_save_CPPFLAGS - -fi -if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes; then : - case "x$with_mpg123" in - x) as_fn_append wine_notices "|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; - xno) ;; - *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. -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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lopenal" >&5 @@ -18935,8 +18827,6 @@ GSSAPI_CFLAGS = $GSSAPI_CFLAGS GSSAPI_LIBS = $GSSAPI_LIBS JPEG_CFLAGS = $JPEG_CFLAGS JPEG_LIBS = $JPEG_LIBS -MPG123_CFLAGS = $MPG123_CFLAGS -MPG123_LIBS = $MPG123_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS diff --git a/configure.ac b/configure.ac index 047e2b82638..63bf4f25162 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerbero AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) -AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) @@ -1722,24 +1721,6 @@ fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) -dnl **** Check for mpg123 **** -if test "x$with_mpg123" != "xno" -then - WINE_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123],,, - [AC_CHECK_HEADERS([mpg123.h]) - if test "$ac_cv_header_mpg123_h" = "yes" - then - AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS]) - else - MPG123_CFLAGS="" - MPG123_LIBS="" - fi]) -fi -WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != 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" then diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index e527ec28675..451794b2624 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,9 +1,6 @@ MODULE = l3codeca.acm -IMPORTS = winmm user32 -EXTRAINCL = $(MPG123_CFLAGS) -EXTRALIBS = $(MPG123_LIBS) - -EXTRADLLFLAGS = -mcygwin +IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase +EXTRAINCL = $(MPG123_PE_CFLAGS) C_SRCS = \ mpegl3.c diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fa9f38258e5..336e706bb83 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -19,13 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <string.h> - #include <mpg123.h> #include "windef.h" @@ -212,14 +208,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) instance->dwDriver = (DWORD_PTR)handle; mpg123_open_feed(handle); -#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); -#endif return MMSYSERR_NOERROR; } diff --git a/include/config.h.in b/include/config.h.in index 2a408c3e74f..9493574d2d7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -327,9 +327,6 @@ /* Define to 1 if you have the <mntent.h> header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if you have the <mpg123.h> header file. */ -#undef HAVE_MPG123_H - /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID

1 0

Alexandre Julliard : libs: Import code from upstream FAudio 21.10.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 6b45777121fcd50d9b7d5b649c6710063b549892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b45777121fcd50d9b7d5b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 11:45:51 2021 +0200 libs: Import code from upstream FAudio 21.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/faudio/LICENSE | 25 + libs/faudio/Makefile.in | 22 + libs/faudio/include/F3DAudio.h | 262 ++ libs/faudio/include/FACT.h | 814 +++++ libs/faudio/include/FACT3D.h | 127 + libs/faudio/include/FAPO.h | 207 ++ libs/faudio/include/FAPOBase.h | 264 ++ libs/faudio/include/FAPOFX.h | 178 + libs/faudio/include/FAudio.h | 1322 +++++++ libs/faudio/include/FAudioFX.h | 308 ++ libs/faudio/src/F3DAudio.c | 1563 ++++++++ libs/faudio/src/FACT.c | 3021 ++++++++++++++++ libs/faudio/src/FACT3D.c | 172 + libs/faudio/src/FACT_internal.c | 3336 +++++++++++++++++ libs/faudio/src/FACT_internal.h | 644 ++++ libs/faudio/src/FAPOBase.c | 451 +++ libs/faudio/src/FAPOFX.c | 89 + libs/faudio/src/FAPOFX_echo.c | 248 ++ libs/faudio/src/FAPOFX_eq.c | 257 ++ libs/faudio/src/FAPOFX_masteringlimiter.c | 247 ++ libs/faudio/src/FAPOFX_reverb.c | 247 ++ libs/faudio/src/FAudio.c | 3201 +++++++++++++++++ libs/faudio/src/FAudioFX_reverb.c | 1969 ++++++++++ libs/faudio/src/FAudioFX_volumemeter.c | 281 ++ libs/faudio/src/FAudio_internal.c | 1967 ++++++++++ libs/faudio/src/FAudio_internal.h | 913 +++++ libs/faudio/src/FAudio_internal_simd.c | 1616 +++++++++ libs/faudio/src/FAudio_operationset.c | 777 ++++ libs/faudio/src/FAudio_platform_win32.c | 1583 ++++++++ libs/faudio/src/matrix_defaults.inl | 147 + libs/faudio/src/stb.h | 406 +++ libs/faudio/src/stb_vorbis.h | 5572 +++++++++++++++++++++++++++++ 34 files changed, 32264 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b45777121fcd50d9b7d…

1 0

Zhiyi Zhang : uxtheme: Save temporary system metrics to a struct in memory.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: aefcd057b1a85c159b1e3bdc2bb6f77f9d77f670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aefcd057b1a85c159b1e3bdc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Oct 21 10:06:16 2021 +0800 uxtheme: Save temporary system metrics to a struct in memory. So that temporary system metrics are not saved in the registry. Saving them to the registry creates a race condition when two processes are trying to activate theming at the same time, one process might save themed system metrics instead of unthemed system metrics to the registry. The race condition will be more apparent when initializing a wine prefix after theming is turned on by default in wine.inf. This patch refactors the system metric helper functions to use an in-memory struct and is a prerequisite to remove the race condition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 340 +++++++++++++++++++++++--------------------------- 1 file changed, 159 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aefcd057b1a85c159b1e…

1 0

Zhiyi Zhang : uxtheme: Check LoadedBefore registry key before loading theme.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: d290362c8ca82fe09a0908a64f26f39ae6fc3eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d290362c8ca82fe09a0908a6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Oct 21 10:06:26 2021 +0800 uxtheme: Check LoadedBefore registry key before loading theme. Only save unthemed system metrics to the registry when the LoadedBefore registry key value is '0'. This avoids saving themed system metrics when two processes are trying to activate theming at the same time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 37 +++++++++++++++++++++++++------------ dlls/uxtheme/uxthemedll.h | 4 ++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index d9eedf6543b..0298fe61d4a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -185,7 +185,7 @@ static void UXTHEME_LoadTheme(void) lstrcpynW(szCurrentColor, pt->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, pt->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); - MSSTYLES_SetActiveTheme(pt, FALSE); + UXTHEME_SetActiveTheme(pt); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), debugstr_w(szCurrentColor), debugstr_w(szCurrentSize)); MSSTYLES_CloseThemeFile(pt); @@ -419,27 +419,38 @@ static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_ * * Change the current active theme */ -static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { + BOOL ret, loaded_before = FALSE; struct system_metrics metrics; + DWORD size; HKEY hKey; WCHAR tmp[2]; HRESULT hr; - if (tf && !bThemeActive) - { - if (UXTHEME_GetSystemMetrics(&metrics)) - UXTHEME_SaveUnthemedSystemMetrics(&metrics); - } - - hr = MSSTYLES_SetActiveTheme(tf, TRUE); - if(FAILED(hr)) - return hr; if(tf) { bThemeActive = TRUE; lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); + + ret = UXTHEME_GetSystemMetrics(&metrics); + + /* Check if theming is already active */ + if (!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) + { + size = sizeof(tmp); + if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) + loaded_before = (tmp[0] != '0'); + else + WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + RegCloseKey(hKey); + } + if (loaded_before) + return MSSTYLES_SetActiveTheme(tf, FALSE); + + if (ret) + UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else { bThemeActive = FALSE; @@ -460,18 +471,20 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, L"DllName", 0, REG_SZ, (const BYTE*)szCurrentTheme, (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, L"LoadedBefore", 0, REG_SZ, (const BYTE *)tmp, sizeof(WCHAR) * 2); } else { RegDeleteValueW(hKey, L"ColorName"); RegDeleteValueW(hKey, L"SizeName"); RegDeleteValueW(hKey, L"DllName"); - + RegDeleteValueW(hKey, L"LoadedBefore"); } RegCloseKey(hKey); } else TRACE("Failed to open theme registry key\n"); + hr = MSSTYLES_SetActiveTheme(tf, TRUE); if (bThemeActive) { if (UXTHEME_GetSystemMetrics(&metrics)) diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 4b8f95764d6..67130774392 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -21,7 +21,10 @@ #ifndef __WINE_UXTHEMEDLL_H #define __WINE_UXTHEMEDLL_H +#include <wingdi.h> #include <winuser.h> +#include <uxtheme.h> +#include <msstyles.h> typedef HANDLE HTHEMEFILE; @@ -99,6 +102,7 @@ BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN;

1 0

Zebediah Figura : winegstreamer: Move the IWMPacketSize2 implementation to the wm_reader object.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 4f10b95c8355c94e4c6f506322b80be7ae7aa174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f10b95c8355c94e4c6f5063… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 22:48:39 2021 -0500 winegstreamer: Move the IWMPacketSize2 implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 68 ------------------------------------- dlls/winegstreamer/wm_reader.c | 67 ++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 4 +-- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6dc0ad3e291..519be33dadd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -117,6 +117,7 @@ struct wm_reader { IWMHeaderInfo3 IWMHeaderInfo3_iface; IWMLanguageList IWMLanguageList_iface; + IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; LONG refcount; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a36718ef453..d2891730bfb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -33,7 +33,6 @@ struct async_reader IWMReaderTimecode IWMReaderTimecode_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IReferenceClock IReferenceClock_iface; - IWMPacketSize2 IWMPacketSize2_iface; }; static struct async_reader *impl_from_IWMReader(IWMReader *iface) @@ -1322,68 +1321,6 @@ static const IReferenceClockVtbl ReferenceClockVtbl = refclock_Unadvise }; -static struct async_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMPacketSize2_iface); -} - -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - struct async_reader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} - -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - static struct async_reader *impl_from_wm_reader(struct wm_reader *iface) { return CONTAINING_RECORD(iface, struct async_reader, reader); @@ -1398,10 +1335,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IReferenceClock)) return &reader->IReferenceClock_iface; - if (IsEqualIID(iid, &IID_IWMPacketSize) - || IsEqualIID(iid, &IID_IWMPacketSize2)) - return &reader->IWMPacketSize2_iface; - if (IsEqualIID(iid, &IID_IWMReader)) return &reader->IWMReader_iface; @@ -1462,7 +1395,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) wm_reader_init(&object->reader, &async_reader_ops); object->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - object->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; object->IWMReader_iface.lpVtbl = &WMReaderVtbl; object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index b72ff98cd18..edf8f227308 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -41,6 +41,11 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMLanguageList_iface; } + else if (IsEqualIID(iid, &IID_IWMPacketSize) + || IsEqualIID(iid, &IID_IWMPacketSize2)) + { + *out = &reader->IWMPacketSize2_iface; + } else if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IWMProfile) || IsEqualIID(iid, &IID_IWMProfile2) @@ -572,10 +577,72 @@ static const IWMLanguageListVtbl language_list_vtbl = language_list_AddLanguageByRFC1766String, }; +static struct wm_reader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMPacketSize2_iface); +} + +static HRESULT WINAPI packet_size_QueryInterface(IWMPacketSize2 *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI packet_size_AddRef(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI packet_size_Release(IWMPacketSize2 *iface) +{ + struct wm_reader *reader = impl_from_IWMPacketSize2(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + FIXME("iface %p, size %p, stub!\n", iface, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + FIXME("iface %p, size %u, stub!\n", iface, size); + return E_NOTIMPL; +} + +static const IWMPacketSize2Vtbl packet_size_vtbl = +{ + packet_size_QueryInterface, + packet_size_AddRef, + packet_size_Release, + packet_size_GetMaxPacketSize, + packet_size_SetMaxPacketSize, + packet_size_GetMinPacketSize, + packet_size_SetMinPacketSize, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; + reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->refcount = 1; reader->ops = ops; diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f9c5ed393f..0662c035617 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -148,8 +148,8 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMHeaderInfo2, TRUE); check_interface(reader, &IID_IWMHeaderInfo3, TRUE); check_interface(reader, &IID_IWMLanguageList, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize, TRUE); - todo_wine check_interface(reader, &IID_IWMPacketSize2, TRUE); + check_interface(reader, &IID_IWMPacketSize, TRUE); + check_interface(reader, &IID_IWMPacketSize2, TRUE); check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE);

1 0

Zebediah Figura : winegstreamer: Move the IWMReaderPlaylistBurn implementation to the wm_reader object.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: dd182a924f89b948010ecc0d79f43aec83adfe65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd182a924f89b948010ecc0d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 22:48:40 2021 -0500 winegstreamer: Move the IWMReaderPlaylistBurn implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 69 ------------------------------------- dlls/winegstreamer/wm_reader.c | 68 ++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 2 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 519be33dadd..be72f6694c7 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -119,6 +119,7 @@ struct wm_reader IWMLanguageList IWMLanguageList_iface; IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; + IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; LONG refcount; const struct wm_reader_ops *ops; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index d2891730bfb..0a240ff55c5 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -31,7 +31,6 @@ struct async_reader IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IWMReaderTimecode IWMReaderTimecode_iface; - IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IReferenceClock IReferenceClock_iface; }; @@ -1191,70 +1190,6 @@ static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = timecode_GetTimecodeRangeBounds }; - -static struct async_reader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMReaderPlaylistBurn_iface); -} - -static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, - LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p\n", This, count, stat); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) -{ - struct async_reader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, 0x%08x\n", This, result); - return E_NOTIMPL; -} - -static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = -{ - playlist_QueryInterface, - playlist_AddRef, - playlist_Release, - playlist_InitPlaylistBurn, - playlist_GetInitResults, - playlist_Cancel, - playlist_EndPlaylistBurn -}; - static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface); @@ -1353,9 +1288,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) || IsEqualIID(iid, &IID_IWMReaderNetworkConfig2)) return &reader->IWMReaderNetworkConfig2_iface; - if (IsEqualIID(iid, &IID_IWMReaderPlaylistBurn)) - return &reader->IWMReaderPlaylistBurn_iface; - if (IsEqualIID(iid, &IID_IWMReaderStreamClock)) return &reader->IWMReaderStreamClock_iface; @@ -1399,7 +1331,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) object->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; - object->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index edf8f227308..1627dead3d6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -53,6 +53,10 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMProfile3_iface; } + else if (IsEqualIID(iid, &IID_IWMReaderPlaylistBurn)) + { + *out = &reader->IWMReaderPlaylistBurn_iface; + } else if (!(*out = reader->ops->query_interface(reader, iid))) { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -638,12 +642,76 @@ static const IWMPacketSize2Vtbl packet_size_vtbl = packet_size_SetMinPacketSize, }; +static struct wm_reader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMReaderPlaylistBurn_iface); +} + +static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMReaderPlaylistBurn(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) +{ + struct wm_reader *reader = impl_from_IWMReaderPlaylistBurn(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) +{ + struct wm_reader *reader = impl_from_IWMReaderPlaylistBurn(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, + const WCHAR **filenames, IWMStatusCallback *callback, void *context) +{ + FIXME("iface %p, count %u, filenames %p, callback %p, context %p, stub!\n", + iface, count, filenames, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *hrs) +{ + FIXME("iface %p, count %u, hrs %p, stub!\n", iface, count, hrs); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT hr) +{ + FIXME("iface %p, hr %#x, stub!\n", iface, hr); + return E_NOTIMPL; +} + +static const IWMReaderPlaylistBurnVtbl playlist_vtbl = +{ + playlist_QueryInterface, + playlist_AddRef, + playlist_Release, + playlist_InitPlaylistBurn, + playlist_GetInitResults, + playlist_Cancel, + playlist_EndPlaylistBurn, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; reader->IWMLanguageList_iface.lpVtbl = &language_list_vtbl; reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; + reader->IWMReaderPlaylistBurn_iface.lpVtbl = &playlist_vtbl; reader->refcount = 1; reader->ops = ops; } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 0662c035617..5c9e9551495 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -153,7 +153,7 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMProfile, TRUE); check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); - todo_wine check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); + check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); check_interface(reader, &IID_IWMSyncReader, TRUE); check_interface(reader, &IID_IWMSyncReader2, TRUE);

1 0

Zebediah Figura : winegstreamer: Move the IWMReaderTimecode implementation to the wm_reader object.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 37e9f0eadae9f62ccae8919a92686695927e9274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e9f0eadae9f62ccae8919a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 22:48:41 2021 -0500 winegstreamer: Move the IWMReaderTimecode implementation to the wm_reader object. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_asyncreader.c | 52 ----------------------------------- dlls/winegstreamer/wm_reader.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 2 +- 4 files changed, 57 insertions(+), 53 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index be72f6694c7..c757dfbefd8 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -120,6 +120,7 @@ struct wm_reader IWMPacketSize2 IWMPacketSize2_iface; IWMProfile3 IWMProfile3_iface; IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; + IWMReaderTimecode IWMReaderTimecode_iface; LONG refcount; const struct wm_reader_ops *ops; diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 0a240ff55c5..12b96245707 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -30,7 +30,6 @@ struct async_reader IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; - IWMReaderTimecode IWMReaderTimecode_iface; IReferenceClock IReferenceClock_iface; }; @@ -1143,53 +1142,6 @@ static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = negotiation_TryOutputProps }; -static struct async_reader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, IWMReaderTimecode_iface); -} - -static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv) -{ - struct async_reader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) -{ - struct async_reader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) -{ - struct async_reader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count) -{ - struct async_reader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %p\n", This, num, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range, - DWORD *start_timecode, DWORD *end_timecode) -{ - struct async_reader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode); - return E_NOTIMPL; -} - -static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = -{ - timecode_QueryInterface, - timecode_AddRef, - timecode_Release, - timecode_GetTimecodeRangeCount, - timecode_GetTimecodeRangeBounds -}; - static struct async_reader *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct async_reader, IReferenceClock_iface); @@ -1291,9 +1243,6 @@ static void *async_reader_query_interface(struct wm_reader *iface, REFIID iid) if (IsEqualIID(iid, &IID_IWMReaderStreamClock)) return &reader->IWMReaderStreamClock_iface; - if (IsEqualIID(iid, &IID_IWMReaderTimecode)) - return &reader->IWMReaderTimecode_iface; - if (IsEqualIID(iid, &IID_IWMReaderTypeNegotiation)) return &reader->IWMReaderTypeNegotiation_iface; @@ -1332,7 +1281,6 @@ HRESULT WINAPI winegstreamer_create_wm_async_reader(IWMReader **reader) object->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; object->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; object->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; - object->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; object->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; TRACE("Created async reader %p.\n", object); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 1627dead3d6..963d33afe0f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -57,6 +57,10 @@ static HRESULT WINAPI profile_QueryInterface(IWMProfile3 *iface, REFIID iid, voi { *out = &reader->IWMReaderPlaylistBurn_iface; } + else if (IsEqualIID(iid, &IID_IWMReaderTimecode)) + { + *out = &reader->IWMReaderTimecode_iface; + } else if (!(*out = reader->ops->query_interface(reader, iid))) { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -705,6 +709,56 @@ static const IWMReaderPlaylistBurnVtbl playlist_vtbl = playlist_EndPlaylistBurn, }; +static struct wm_reader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) +{ + return CONTAINING_RECORD(iface, struct wm_reader, IWMReaderTimecode_iface); +} + +static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID iid, void **out) +{ + struct wm_reader *reader = impl_from_IWMReaderTimecode(iface); + + return IWMProfile3_QueryInterface(&reader->IWMProfile3_iface, iid, out); +} + +static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) +{ + struct wm_reader *reader = impl_from_IWMReaderTimecode(iface); + + return IWMProfile3_AddRef(&reader->IWMProfile3_iface); +} + +static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) +{ + struct wm_reader *reader = impl_from_IWMReaderTimecode(iface); + + return IWMProfile3_Release(&reader->IWMProfile3_iface); +} + +static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, + WORD stream_number, WORD *count) +{ + FIXME("iface %p, stream_number %u, count %p, stub!\n", iface, stream_number, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, + WORD stream_number, WORD index, DWORD *start, DWORD *end) +{ + FIXME("iface %p, stream_number %u, index %u, start %p, end %p, stub!\n", + iface, stream_number, index, start, end); + return E_NOTIMPL; +} + +static const IWMReaderTimecodeVtbl timecode_vtbl = +{ + timecode_QueryInterface, + timecode_AddRef, + timecode_Release, + timecode_GetTimecodeRangeCount, + timecode_GetTimecodeRangeBounds, +}; + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; @@ -712,6 +766,7 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) reader->IWMPacketSize2_iface.lpVtbl = &packet_size_vtbl; reader->IWMProfile3_iface.lpVtbl = &profile_vtbl; reader->IWMReaderPlaylistBurn_iface.lpVtbl = &playlist_vtbl; + reader->IWMReaderTimecode_iface.lpVtbl = &timecode_vtbl; reader->refcount = 1; reader->ops = ops; } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 5c9e9551495..79bcfef0d52 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -154,7 +154,7 @@ static void test_wmsyncreader_interfaces(void) check_interface(reader, &IID_IWMProfile2, TRUE); check_interface(reader, &IID_IWMProfile3, TRUE); check_interface(reader, &IID_IWMReaderPlaylistBurn, TRUE); - todo_wine check_interface(reader, &IID_IWMReaderTimecode, TRUE); + check_interface(reader, &IID_IWMReaderTimecode, TRUE); check_interface(reader, &IID_IWMSyncReader, TRUE); check_interface(reader, &IID_IWMSyncReader2, TRUE);

1 0

Rémi Bernon : dinput: Replace stub EnumEffects with generic implementation.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 713d71c187c142b3dd889def6f9287be60d682a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=713d71c187c142b3dd889def… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:42 2021 +0200 dinput: Replace stub EnumEffects with generic implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 +++++++++++++++++++++++++++++++++++++++++----- dlls/dinput/joystick_hid.c | 73 +--------------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand,

1 0

Rémi Bernon : dinput: Use the internal vtable for GetEffectInfo.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: f54210590f968d4fc8f22785c071514bb99400d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54210590f968d4fc8f22785… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:43 2021 +0200 dinput: Use the internal vtable for GetEffectInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 18 +++++++++++------- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 13 ++++--------- dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e5713f4713d..ce163660e6c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1732,14 +1732,18 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface return DI_OK; } -HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( - LPDIRECTINPUTDEVICE8W iface, - LPDIEFFECTINFOW lpdei, - REFGUID rguid) +HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, + const GUID *guid ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%s): stub!\n", This, lpdei, debugstr_guid(rguid)); - return DI_OK; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, info %p, guid %s.\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + if (info->dwSize != sizeof(DIEFFECTINFOW)) return DIERR_INVALIDPARAM; + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_DEVICENOTREG; + if (!impl->vtbl->get_effect_info) return DIERR_UNSUPPORTED; + return impl->vtbl->get_effect_info( iface, info, guid ); } HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index bdac5b4a378..0b5919c7ec6 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -68,6 +68,7 @@ struct dinput_device_vtbl DIDEVICEOBJECTINSTANCEW *instance ); HRESULT (*set_property)( IDirectInputDevice8W *iface, DWORD property, const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ); + HRESULT (*get_effect_info)( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ); }; #define DEVICE_STATE_MAX_SIZE 1024 diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 91b6020d1f1..1e1f8c05e3f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,8 +838,8 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, - const GUID *guid ) +static HRESULT hid_joystick_internal_get_effect_info( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, + const GUID *guid ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); struct pid_effect_update *effect_update = &impl->pid_effect_update; @@ -853,12 +853,6 @@ static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, D USAGE usage = 0; USHORT count; - TRACE( "iface %p, info %p, guid %s.\n", iface, info, debugstr_guid( guid ) ); - - if (!info) return E_POINTER; - if (info->dwSize != sizeof(DIEFFECTINFOW)) return DIERR_INVALIDPARAM; - if (!(impl->base.caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_DEVICENOTREG; - switch ((usage = effect_guid_to_usage( guid ))) { case PID_USAGE_ET_SQUARE: @@ -1085,7 +1079,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, - hid_joystick_GetEffectInfo, + IDirectInputDevice2WImpl_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, hid_joystick_EnumCreatedEffectObjects, @@ -1326,6 +1320,7 @@ static const struct dinput_device_vtbl hid_joystick_internal_vtbl = hid_joystick_internal_enum_objects, hid_joystick_internal_get_property, hid_joystick_internal_set_property, + hid_joystick_internal_get_effect_info, }; static DWORD device_type_for_version( DWORD type, DWORD version ) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f17dc89ac16..1127ec2aaea 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -338,6 +338,7 @@ static const struct dinput_device_vtbl keyboard_internal_vtbl = keyboard_internal_enum_objects, keyboard_internal_get_property, keyboard_internal_set_property, + NULL, }; static const IDirectInputDevice8WVtbl SysKeyboardWvt = diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7fafa7696a7..69348ad2c7f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -651,6 +651,7 @@ static const struct dinput_device_vtbl mouse_internal_vtbl = mouse_internal_enum_objects, mouse_internal_get_property, mouse_internal_set_property, + NULL, }; static const IDirectInputDevice8WVtbl SysMouseWvt =

1 0

Rémi Bernon : dinput: Move GetForceFeedbackState stub to device.c.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 4ddd257f06aeb42f51e34211cc9ee267f5e5c536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ddd257f06aeb42f51e34211… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:44 2021 +0200 dinput: Move GetForceFeedbackState stub to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 8 ++++---- dlls/dinput/joystick_hid.c | 11 +---------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ce163660e6c..2a9b9aa596e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1746,11 +1746,11 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( IDirectInputDevice8W *ifa return impl->vtbl->get_effect_info( iface, info, guid ); } -HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) +HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p): stub!\n", This, pdwOut); - return DI_OK; + FIXME( "iface %p, out %p stub!\n", iface, out ); + if (!out) return E_POINTER; + return DIERR_UNSUPPORTED; } HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 1e1f8c05e3f..2788f138216 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -973,15 +973,6 @@ static HRESULT hid_joystick_internal_get_effect_info( IDirectInputDevice8W *ifac return DI_OK; } -static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) -{ - FIXME( "iface %p, out %p stub!\n", iface, out ); - - if (!out) return E_POINTER; - - return DIERR_UNSUPPORTED; -} - static BOOL CALLBACK unload_effect_object( IDirectInputEffect *effect, void *context ) { IDirectInputEffect_Unload( effect ); @@ -1080,7 +1071,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, - hid_joystick_GetForceFeedbackState, + IDirectInputDevice2WImpl_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand, hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape,

1 0