Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-29 22:58:39 +02:00
Code Issues Releases Wiki Activity

Fix: LoadModule would load a module without a version string.

Browse Source
This commit is contained in:
james.k.crook@gmail.com 2011-04-24 14:31:29 +00:00
parent f2bf104922
commit 21851193de
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/LoadModules.cpp
View File

@ -90,37 +90,36 @@ void LoadModule(wxString fname)
if (pDLL && pDLL->Load(fname, wxDL_LAZY)) if (pDLL && pDLL->Load(fname, wxDL_LAZY))
{ {
int result = 1; int result = 1;
// A little strange. The main function is called whether or not the version is OK.
mainFn = (tModuleInit)(pDLL->GetSymbol(wxT(initFnName))); mainFn = (tModuleInit)(pDLL->GetSymbol(wxT(initFnName)));
if (mainFn) if (mainFn)
result = mainFn( 0 ); result = mainFn( 0 );
// If the module provides a version string, check that it matches the // If the module provides a version string, check that it matches the
// Audacity version string. (For now, they must match exactly) // Audacity version string. (For now, they must match exactly)
// For compatibility reasons, if no version string is provided we try to
// load the module anyway.
tVersionFn versionFn = (tVersionFn)(pDLL->GetSymbol(wxT(versionFnName))); tVersionFn versionFn = (tVersionFn)(pDLL->GetSymbol(wxT(versionFnName)));
if (versionFn) bool bOK = versionFn != NULL;
{ if (!bOK){
wxLogWarning(wxT("The module %s does not provide a version string. It will not be loaded."), fname.c_str());
}
else {
wxString moduleVersion = versionFn(); wxString moduleVersion = versionFn();
if (!moduleVersion.IsSameAs(AUDACITY_VERSION_STRING)) bOK = moduleVersion.IsSameAs(AUDACITY_VERSION_STRING);
{ if( !bOK ){
wxLogError(wxT("The module %s is designed to work with Audacity version %s; it will not be loaded."), fname.c_str(), moduleVersion.c_str()); wxLogError(wxT("The module %s is designed to work with Audacity version %s; it will not be loaded."), fname.c_str(), moduleVersion.c_str());
delete pDLL;
return;
} }
} }
else
{
wxLogWarning(wxT("The module %s does not provide a version string. Attempting to load it anyway."), fname.c_str());
}
if( !bOK ){
delete pDLL;
}
else {
if(( scriptFn == NULL ) &&(result>=0 )) if(( scriptFn == NULL ) &&(result>=0 ))
scriptFn = (tpRegScriptServerFunc)(pDLL->GetSymbol(wxT(scriptFnName))); scriptFn = (tpRegScriptServerFunc)(pDLL->GetSymbol(wxT(scriptFnName)));
if((pPanelHijack==NULL ) && (result>=0)) if((pPanelHijack==NULL ) && (result>=0))
pPanelHijack = (tPanelFn)(pDLL->GetSymbol(wxT(mainPanelFnName))); pPanelHijack = (tPanelFn)(pDLL->GetSymbol(wxT(mainPanelFnName)));
} }
}
::wxSetWorkingDirectory(saveOldCWD); ::wxSetWorkingDirectory(saveOldCWD);
} }