From fad14c466009729fe38c206b6c76bc1d487f77fa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Sep 2015 01:05:54 +0200 Subject: [PATCH] Fix horribly mangled declarations in wxMSW ActiveMovie code Due to a typo (missing closing parenthesis after GetMediaParameterName()), all the method and interface declarations in a span of 150 lines were parsed as arguments of STDMETHOD macro resulting in something completely nonsensical, but, by some unfortunate miracle, compilable. Any code relying on any of these declarations definitely could never work as the interfaces were incorrectly declared and any attempt to use them would have resulted in a crash, so this code was either totally broken or these declarations were unused -- not sure which one, but for now just fix the typo. --- build/msw/wx_media.vcxproj | 2 +- src/msw/mediactrl_am.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/msw/wx_media.vcxproj b/build/msw/wx_media.vcxproj index 9eda0397de..d94e9b4fbb 100644 --- a/build/msw/wx_media.vcxproj +++ b/build/msw/wx_media.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 4e9f294d3e..4721bb1455 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -575,7 +575,7 @@ struct IMediaPlayer2 : public IMediaPlayer { STDMETHOD(get_DVD)(struct IMediaPlayerDvd __RPC_FAR *__RPC_FAR *ppdispatch) PURE; STDMETHOD(GetMediaParameter)(long EntryNum, BSTR bstrParameterName, BSTR __RPC_FAR *pbstrParameterValue) PURE; - STDMETHOD(GetMediaParameterName(long EntryNum, long Index, BSTR __RPC_FAR *pbstrParameterName) PURE; + STDMETHOD(GetMediaParameterName)(long EntryNum, long Index, BSTR __RPC_FAR *pbstrParameterName) PURE; STDMETHOD(get_EntryCount)(long __RPC_FAR *pNumberEntries) PURE; STDMETHOD(GetCurrentEntry)(long __RPC_FAR *pEntryNumber) PURE; STDMETHOD(SetCurrentEntry)(long EntryNumber) PURE; @@ -718,7 +718,7 @@ struct INSPlay : public INSOPlay STDMETHOD(put_BaseURL)(BSTR pbstrBaseURL) PURE; STDMETHOD(get_DefaultFrame)(BSTR __RPC_FAR *pbstrDefaultFrame) PURE; STDMETHOD(put_DefaultFrame)(BSTR pbstrDefaultFrame) PURE; - STDMETHOD(AboutBox))(void) PURE; + STDMETHOD(AboutBox)(void) PURE; STDMETHOD(Cancel)(void) PURE; STDMETHOD(GetCodecInstalled)(long CodecNum, VARIANT_BOOL __RPC_FAR *pCodecInstalled) PURE; STDMETHOD(GetCodecDescription)(long CodecNum, BSTR __RPC_FAR *pbstrCodecDescription) PURE;