AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix horribly mangled declarations in wxMSW ActiveMovie code

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin 2015-09-23 01:05:54 +02:00
parent b0be28dae5
commit fad14c4660
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/msw/wx_media.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">

4
src/msw/mediactrl_am.cpp
View File

@ -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;