зеркало из https://github.com/mozilla/pjs.git
Fix compiler warnings by actually using declared variables b=217089 p=gautheri@noos.fr r/sr=alecf
This commit is contained in:
Родитель
24b31c8be8
Коммит
ad2eb5b9f6
|
@ -59,7 +59,6 @@ static char szPageUrlForJVM[] = JVM_SMARTUPDATE_URL;
|
||||||
//static char szPluginFinderCommandFormatString[] = PLUGINFINDER_COMMAND;
|
//static char szPluginFinderCommandFormatString[] = PLUGINFINDER_COMMAND;
|
||||||
static char szPluginFinderCommandBeginning[] = PLUGINFINDER_COMMAND_BEGINNING;
|
static char szPluginFinderCommandBeginning[] = PLUGINFINDER_COMMAND_BEGINNING;
|
||||||
static char szPluginFinderCommandEnd[] = PLUGINFINDER_COMMAND_END;
|
static char szPluginFinderCommandEnd[] = PLUGINFINDER_COMMAND_END;
|
||||||
static char szDefaultFileExt[] = "*";
|
|
||||||
|
|
||||||
BOOL RegisterNullPluginWindowClass()
|
BOOL RegisterNullPluginWindowClass()
|
||||||
{
|
{
|
||||||
|
@ -494,10 +493,12 @@ void CPlugin::URLNotify(const char * szURL)
|
||||||
int iSize = WinLoadString((HAB)0, m_hInst, IDS_GOING2HTML, sizeof(buf), buf);
|
int iSize = WinLoadString((HAB)0, m_hInst, IDS_GOING2HTML, sizeof(buf), buf);
|
||||||
|
|
||||||
NPError rc = NPN_NewStream(m_pNPInstance, "text/html", "asd_plugin_finder", &pStream);
|
NPError rc = NPN_NewStream(m_pNPInstance, "text/html", "asd_plugin_finder", &pStream);
|
||||||
|
if (rc != NPERR_NO_ERROR)
|
||||||
|
return;
|
||||||
|
|
||||||
//char buf[] = "<html>\n<body>\n\n<h2 align=center>NPN_NewStream / NPN_Write - This seems to work.</h2>\n\n</body>\n</html>";
|
//char buf[] = "<html>\n<body>\n\n<h2 align=center>NPN_NewStream / NPN_Write - This seems to work.</h2>\n\n</body>\n</html>";
|
||||||
|
|
||||||
int32 iBytes = NPN_Write(m_pNPInstance, pStream, strlen(buf), buf);
|
NPN_Write(m_pNPInstance, pStream, iSize, buf);
|
||||||
|
|
||||||
NPN_DestroyStream(m_pNPInstance, pStream, NPRES_DONE);
|
NPN_DestroyStream(m_pNPInstance, pStream, NPRES_DONE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,6 @@ static char szPageUrlForJVM[] = JVM_SMARTUPDATE_URL;
|
||||||
//static char szPluginFinderCommandFormatString[] = PLUGINFINDER_COMMAND;
|
//static char szPluginFinderCommandFormatString[] = PLUGINFINDER_COMMAND;
|
||||||
static char szPluginFinderCommandBeginning[] = PLUGINFINDER_COMMAND_BEGINNING;
|
static char szPluginFinderCommandBeginning[] = PLUGINFINDER_COMMAND_BEGINNING;
|
||||||
static char szPluginFinderCommandEnd[] = PLUGINFINDER_COMMAND_END;
|
static char szPluginFinderCommandEnd[] = PLUGINFINDER_COMMAND_END;
|
||||||
static char szDefaultFileExt[] = "*";
|
|
||||||
|
|
||||||
BOOL RegisterNullPluginWindowClass()
|
BOOL RegisterNullPluginWindowClass()
|
||||||
{
|
{
|
||||||
|
@ -554,10 +553,12 @@ void CPlugin::URLNotify(const char * szURL)
|
||||||
int iSize = LoadString(m_hInst, IDS_GOING2HTML, buf, sizeof(buf));
|
int iSize = LoadString(m_hInst, IDS_GOING2HTML, buf, sizeof(buf));
|
||||||
|
|
||||||
NPError rc = NPN_NewStream(m_pNPInstance, "text/html", "asd_plugin_finder", &pStream);
|
NPError rc = NPN_NewStream(m_pNPInstance, "text/html", "asd_plugin_finder", &pStream);
|
||||||
|
if (rc != NPERR_NO_ERROR)
|
||||||
|
return;
|
||||||
|
|
||||||
//char buf[] = "<html>\n<body>\n\n<h2 align=center>NPN_NewStream / NPN_Write - This seems to work.</h2>\n\n</body>\n</html>";
|
//char buf[] = "<html>\n<body>\n\n<h2 align=center>NPN_NewStream / NPN_Write - This seems to work.</h2>\n\n</body>\n</html>";
|
||||||
|
|
||||||
int32 iBytes = NPN_Write(m_pNPInstance, pStream, lstrlen(buf), buf);
|
NPN_Write(m_pNPInstance, pStream, iSize, buf);
|
||||||
|
|
||||||
NPN_DestroyStream(m_pNPInstance, pStream, NPRES_DONE);
|
NPN_DestroyStream(m_pNPInstance, pStream, NPRES_DONE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2281,7 +2281,7 @@ CPluginInstancePeer::NewStream(nsMIMEType type, const char* target,
|
||||||
// Create a new NPStream.
|
// Create a new NPStream.
|
||||||
NPStream* ptr = NULL;
|
NPStream* ptr = NULL;
|
||||||
NPError error = NPN_NewStream(npp, (NPMIMEType)type, target, &ptr);
|
NPError error = NPN_NewStream(npp, (NPMIMEType)type, target, &ptr);
|
||||||
if (error)
|
if (error != NPERR_NO_ERROR)
|
||||||
return fromNPError[error];
|
return fromNPError[error];
|
||||||
|
|
||||||
// Create a new Plugin Manager Stream.
|
// Create a new Plugin Manager Stream.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче