September 2019 - Wine-devel

[PATCH] widl: Fix a variable name in a comment.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/widl/typelib_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 0d9f8ebd53c..58dd95ec3bd 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -327,7 +327,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct { -- 2.20.1

1 0

[PATCH] advapi32/tests: Spelling tweaks in ok() messages.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/crypt_lmhash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index a6e812e54a9..4c96e5b7629 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -287,18 +287,18 @@ static void test_SystemFunction004(void) r = pSystemFunction002(out.Buffer, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); - ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); + ok(((unsigned int*)output)[0] == in.Length, "encrypted length wrong\n"); + ok(((unsigned int*)output)[1] == 1, "encrypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); } static void test_SystemFunction005(void) -- 2.20.1

1 0

[PATCH] advapi32/tests: Spelling fixes in a couple of comments.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6b199bc4d35..675426d4a97 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3933,7 +3933,7 @@ static void test_RegLoadMUIString(void) ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); ok(ret > 0, "GetSystemDirectoryA failed\n"); - /* change the current direcoty to system32 */ + /* change the current directory to system32 */ GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); SetCurrentDirectoryW(sysdirW); @@ -3982,7 +3982,7 @@ static void test_RegLoadMUIString(void) ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); - /* change the current direcoty to other than system32 directory */ + /* change the current directory to other than system32 directory */ SetCurrentDirectoryA("\\"); size = 0xdeadbeef; -- 2.20.1

1 0

[PATCH] comctl32: Typo and spelling fixes in comments.
by Francois Gouget 02 Sep '19

02 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 82ed38ebe52..ac53a2cf0fa 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -671,7 +671,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy, * * NOTES * This function is just a dummy - all the controls are registered at - * the DLL initialization time. See InitCommonContolsEx for details. + * the DLL initialization time. See InitCommonControlsEx for details. */ VOID WINAPI diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9e91a2f9487..05ae3a61c0e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -237,7 +237,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy * *'dddddd' is handled as 'dddd' plus 'dd'. * *unrecognized formats are strings (here given the type DT_STRING; * start of the string is encoded in lower bits of DT_STRING. - * Therefore, 'string' ends finally up as '<show seconds>tring'. + * Therefore, 'string' ends up as '<show seconds>tring'. * */ static void diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f113bb2d1f1..8c667a192b3 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2135,7 +2135,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) } else { - /* Place the band in the prexisting row the mouse is hovering over */ + /* Place the band in the preexisting row the mouse is hovering over */ iRowBegin = first_visible(infoPtr); while(iRowBegin < infoPtr->uNumBands) { diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7b9cccfc989..b2d36826d2a 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -951,7 +951,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) /*********************************************************************** * SYSLINK_SetFocusLink - * Updates the focus status bits and focusses the specified link. + * Updates the focus status bits and focuses the specified link. * If no document item is specified, the focus bit will be removed from all links. * Returns the previous focused item. */ diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0e62ab9e0c8..daa1715e7ee 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2164,7 +2164,7 @@ static void test_color_table(UINT ilc) rgb[2].rgbBlue = 0xff; check_color_table("remove all, add 8", hdc, himl, ilc, rgb, default_table); - /* remove all, add 4. Color table remains the same since it's inplicitly + /* remove all, add 4. Color table remains the same since it's implicitly been set by the previous _Add */ ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4e4fd757b16..ceab5328bc7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5691,7 +5691,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (nButton == infoPtr->nButtonDrag) { - /* if the button is moved sightly left and we have a + /* if the button is moved slightly left and we have a * separator there then remove it */ if (pt.x < (btnPtr->rect.left + (btnPtr->rect.right - btnPtr->rect.left)/2)) { -- 2.20.1

1 0

[PATCH] makefiles: Avoid rpath=$ORIGIN/... on NetBSD.
by Francois Gouget 02 Sep '19

02 Sep '19

On NetBSD using $ORIGIN in an rpath does not work when running the executable from a symbolic link located in another directory. This is probably because $ORIGIN is set from /proc/self/exe which contains the paths of the symbolic link instead of that of the executable, resulting in the rpath pointing to the wrong location. For Wine this means running './wine notepad' from a 64 bit build does not work because libwine.so.1 is not found. So avoid $ORIGIN on NetBSD and instead use the full path to the build directory. At least this will work until the build directory is moved around. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't really like this patch but it gets things going. I consider it to be a NetBSD bug and ideally they would fix it. But then we need some solution in the interim. Also the NetBSD developers seem to dislike the $ORIGIN feature so I'm not sure that will happen. https://mail-index.netbsd.org/tech-pkg/2013/11/15/msg012248.html configure.ac | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 581189b2156..2a535ca90eb 100644 --- a/configure.ac +++ b/configure.ac @@ -958,11 +958,21 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib], - [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], + [rpath_opt="-Wl,--rpath"], [WINE_TRY_CFLAGS([-Wl,-R,\$ORIGIN/../lib], - [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) + [rpath_opt="-Wl,-R"])]) + if test -n "$rpath_opt" + then + LDRPATH_INSTALL="$rpath_opt,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" + case $host_os in + netbsd) + LDRPATH_LOCAL="$rpath_opt,$ac_pwd/libs/wine" + ;; + *) + LDRPATH_LOCAL="$rpath_opt,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" + ;; + esac + fi WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) -- 2.20.1

1 0

[PATCH] libwine: Fully dereference the /proc/self/exe symbolic link.
by Francois Gouget 02 Sep '19

02 Sep '19

Linux will do it for us but not NetBSD. That is, if foo is an executable that prints the path /proc/self/exe points to, on Linux one gets: $ ./foo /tmp/foo $ ln -s foo bar $ ln -s bar babar $ /tmp/babar /tmp/foo But on NetBSD one gets instead: $ ./foo /tmp/./foo $ ln -s foo bar $ ln -s bar babar $ /tmp/babar /tmp/babar Fully dereferencing /proc/self/exe is necessary to be able to run both 32 and 64 bit executables from the build tree. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Using realpath() simplifies the code quite a bit and letting it allocate the memory itself seems to be part of POSIX.1-2008. But let me know if this self-allocating feature should be avoided or if realpath() should be avoided altogether (though note we're already using it in a couple of places). libs/wine/config.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index ab5e3816dc5..f4fda02bf95 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -164,33 +164,16 @@ static char *get_runtime_libdir(void) /* read a symlink and return its directory */ static char *symlink_dirname( const char *name ) { - char *p, *buffer, *absdir = NULL; - int ret, size; + char *p, *fullpath = NULL; - for (size = 256; ; size *= 2) + fullpath = realpath( name, NULL ); + if (fullpath) { - if (!(buffer = malloc( size ))) return NULL; - if ((ret = readlink( name, buffer, size )) == -1) break; - if (ret != size) - { - buffer[ret] = 0; - if (!(p = strrchr( buffer, '/' ))) break; - if (p == buffer) p++; - *p = 0; - if (buffer[0] == '/') return buffer; - /* make it absolute */ - absdir = xmalloc( strlen(name) + strlen(buffer) + 1 ); - strcpy( absdir, name ); - if (!(p = strrchr( absdir, '/' ))) break; - strcpy( p + 1, buffer ); - free( buffer ); - return absdir; - } - free( buffer ); + p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; } - free( buffer ); - free( absdir ); - return NULL; + return fullpath; } /* return the directory that contains the main exe at run-time */ -- 2.20.1

1 0

[PATCH] libwine: Like Linux, NetBSD has /proc/self/exe.
by Francois Gouget 02 Sep '19

02 Sep '19

It also has /proc/curproc/exe but there does not seem to be a reason to prefer it over /proc/self/exe. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 3c9110b3b80..ab5e3816dc5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -61,7 +61,7 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #endif -#if defined(__linux__) || defined(__FreeBSD_kernel__ ) +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) static const char exe_link[] = "/proc/curproc/file"; -- 2.20.1

1 0

[PATCH] libwine: Only link libi386 with the libraries that need it.
by Francois Gouget 02 Sep '19

02 Sep '19

In particular it does not make sense to link executables and dlls built with MinGW with it. From: Naveen Narayanan <zerous(a)nocebo.space> Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- configure.ac | 2 +- libs/wine/Makefile.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d0af7ef4a1a..581189b2156 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,7 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD -AC_CHECK_LIB(i386,i386_set_ldt) +AC_CHECK_LIB(i386,i386_set_ldt,[AC_SUBST(I386_LIBS, "-li386")]) AC_SUBST(OPENGL_LIBS,"") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 789d09a2185..f7dd34b058d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,5 @@ -EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) +EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) + C_SRCS = \ config.c \ -- 2.20.1

1 0

[PATCH 1/5] amstream: Use shorter method names for the multimedia stream.
by Zebediah Figura 02 Sep '19

02 Sep '19

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/main.c | 4 +- dlls/amstream/multimedia.c | 95 +++++++++++++++++--------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e44a9de7495..105ddb13f5c 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -34,7 +34,7 @@ #include "amstream.h" #include "wine/heap.h" -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index b6705945a85..c718f42448c 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -73,8 +73,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { - { &CLSID_AMMultiMediaStream, AM_create }, - { &CLSID_AMDirectDrawStream, AM_create }, + { &CLSID_AMMultiMediaStream, multimedia_stream_create }, + { &CLSID_AMDirectDrawStream, multimedia_stream_create }, { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, filter_create } }; diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 47753512810..7f0fb34d266 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -50,9 +50,9 @@ static inline struct multimedia_stream *impl_from_IAMMultiMediaStream(IAMMultiMe return CONTAINING_RECORD(iface, struct multimedia_stream, IAMMultiMediaStream_iface); } -static const struct IAMMultiMediaStreamVtbl AM_Vtbl; +static const struct IAMMultiMediaStreamVtbl multimedia_stream_vtbl; -HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT multimedia_stream_create(IUnknown *pUnkOuter, LPVOID *ppObj) { struct multimedia_stream *object; HRESULT hr; @@ -65,7 +65,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; + object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; object->ref = 1; if (FAILED(hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, @@ -82,7 +82,8 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) } /*** IUnknown methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI multimedia_stream_QueryInterface(IAMMultiMediaStream *iface, + REFIID riid, void **ppvObject) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -102,7 +103,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream return E_NOINTERFACE; } -static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) +static ULONG WINAPI multimedia_stream_AddRef(IAMMultiMediaStream *iface) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -111,7 +112,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_AddRef(IAMMultiMediaStream* iface) return InterlockedIncrement(&This->ref); } -static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) +static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -140,7 +141,8 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) } /*** IMultiMediaStream methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream* iface, DWORD* pdwFlags, STREAM_TYPE* pStreamType) +static HRESULT WINAPI multimedia_stream_GetInformation(IAMMultiMediaStream *iface, + DWORD *pdwFlags, STREAM_TYPE *pStreamType) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -149,7 +151,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream* iface, REFMSPID idPurpose, IMediaStream** ppMediaStream) +static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *iface, + REFMSPID idPurpose, IMediaStream **ppMediaStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); MSPID PurposeId; @@ -171,7 +174,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream return MS_E_NOSTREAM; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStream* iface, LONG Index, IMediaStream** ppMediaStream) +static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface, + LONG Index, IMediaStream **ppMediaStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -180,7 +184,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* iface, STREAM_STATE* pCurrentState) +static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *pCurrentState) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -189,7 +193,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE new_state) +static HRESULT WINAPI multimedia_stream_SetState(IAMMultiMediaStream *iface, STREAM_STATE new_state) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = E_INVALIDARG; @@ -204,7 +208,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime) +static HRESULT WINAPI multimedia_stream_GetTime(IAMMultiMediaStream *iface, STREAM_TIME *pCurrentTime) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -213,7 +217,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* iface, STREAM_TIME* pDuration) +static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, STREAM_TIME *pDuration) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -222,7 +226,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME seek_time) +static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -231,7 +235,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS) +static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *phEOS) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -241,7 +245,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream } /*** IAMMultiMediaStream methods ***/ -static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) +static HRESULT WINAPI multimedia_stream_Initialize(IAMMultiMediaStream *iface, + STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder *pFilterGraph) { static const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -296,7 +301,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream* iface, IGraphBuilder** ppGraphBuilder) +static HRESULT WINAPI multimedia_stream_GetFilterGraph(IAMMultiMediaStream *iface, + IGraphBuilder **ppGraphBuilder) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -313,7 +319,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return S_OK; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream *iface, IMediaStreamFilter **filter) +static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface, + IMediaStreamFilter **filter) { struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); @@ -327,8 +334,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream *ifa return S_OK; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, - DWORD dwFlags, IMediaStream** ppNewStream) +static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *iface, + IUnknown *stream_object, const MSPID *PurposeId, DWORD dwFlags, IMediaStream **ppNewStream) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; @@ -395,7 +402,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) +static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, + const WCHAR *filename, DWORD flags) { static const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -440,7 +448,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac return ret; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags) +static HRESULT WINAPI multimedia_stream_OpenMoniker(IAMMultiMediaStream *iface, + IBindCtx *pCtx, IMoniker *pMoniker, DWORD dwFlags) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -449,7 +458,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* i return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, DWORD dwFlags) +static HRESULT WINAPI multimedia_stream_Render(IAMMultiMediaStream *iface, DWORD dwFlags) { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); @@ -461,25 +470,25 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, return IGraphBuilder_Render(This->pFilterGraph, This->ipin); } -static const IAMMultiMediaStreamVtbl AM_Vtbl = +static const IAMMultiMediaStreamVtbl multimedia_stream_vtbl = { - IAMMultiMediaStreamImpl_QueryInterface, - IAMMultiMediaStreamImpl_AddRef, - IAMMultiMediaStreamImpl_Release, - IAMMultiMediaStreamImpl_GetInformation, - IAMMultiMediaStreamImpl_GetMediaStream, - IAMMultiMediaStreamImpl_EnumMediaStreams, - IAMMultiMediaStreamImpl_GetState, - IAMMultiMediaStreamImpl_SetState, - IAMMultiMediaStreamImpl_GetTime, - IAMMultiMediaStreamImpl_GetDuration, - IAMMultiMediaStreamImpl_Seek, - IAMMultiMediaStreamImpl_GetEndOfStream, - IAMMultiMediaStreamImpl_Initialize, - IAMMultiMediaStreamImpl_GetFilterGraph, - IAMMultiMediaStreamImpl_GetFilter, - IAMMultiMediaStreamImpl_AddMediaStream, - IAMMultiMediaStreamImpl_OpenFile, - IAMMultiMediaStreamImpl_OpenMoniker, - IAMMultiMediaStreamImpl_Render + multimedia_stream_QueryInterface, + multimedia_stream_AddRef, + multimedia_stream_Release, + multimedia_stream_GetInformation, + multimedia_stream_GetMediaStream, + multimedia_stream_EnumMediaStreams, + multimedia_stream_GetState, + multimedia_stream_SetState, + multimedia_stream_GetTime, + multimedia_stream_GetDuration, + multimedia_stream_Seek, + multimedia_stream_GetEndOfStream, + multimedia_stream_Initialize, + multimedia_stream_GetFilterGraph, + multimedia_stream_GetFilter, + multimedia_stream_AddMediaStream, + multimedia_stream_OpenFile, + multimedia_stream_OpenMoniker, + multimedia_stream_Render }; -- 2.22.0

1 4

[PATCH] dsound: Trace all DSBCAPS values.
by Alistair Leslie-Hughes 01 Sep '19

01 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/dsound.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2fbb3ce40d..f3030d6834 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -105,10 +105,12 @@ static void _dump_DSBCAPS(DWORD xmask) { FE(DSBCAPS_CTRLPAN) FE(DSBCAPS_CTRLVOLUME) FE(DSBCAPS_CTRLPOSITIONNOTIFY) + FE(DSBCAPS_CTRLFX) FE(DSBCAPS_STICKYFOCUS) FE(DSBCAPS_GLOBALFOCUS) FE(DSBCAPS_GETCURRENTPOSITION2) FE(DSBCAPS_MUTE3DATMAXDISTANCE) + FE(DSBCAPS_LOCDEFER) #undef FE }; unsigned int i; -- 2.17.1

1 0