зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1060419 - make nsPluginsDirWin.cpp use Printf.h, r=froydnj
MozReview-Commit-ID: DEp62fnUggc --HG-- extra : rebase_source : 135ab81c4407ab6a7fc412615b53569f5d61fbc1
This commit is contained in:
Родитель
46ef49f2a5
Коммит
a871c68c0c
|
@ -13,12 +13,12 @@
|
||||||
|
|
||||||
#include "mozilla/ArrayUtils.h" // ArrayLength
|
#include "mozilla/ArrayUtils.h" // ArrayLength
|
||||||
#include "mozilla/DebugOnly.h"
|
#include "mozilla/DebugOnly.h"
|
||||||
|
#include "mozilla/Printf.h"
|
||||||
|
|
||||||
#include "nsPluginsDir.h"
|
#include "nsPluginsDir.h"
|
||||||
#include "prlink.h"
|
#include "prlink.h"
|
||||||
#include "plstr.h"
|
#include "plstr.h"
|
||||||
#include "prmem.h"
|
#include "prmem.h"
|
||||||
#include "prprf.h"
|
|
||||||
|
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
|
@ -99,7 +99,7 @@ static char* GetVersion(void* verbuf)
|
||||||
::VerQueryValueW(verbuf, L"\\", (void **)&fileInfo, &fileInfoLen);
|
::VerQueryValueW(verbuf, L"\\", (void **)&fileInfo, &fileInfoLen);
|
||||||
|
|
||||||
if (fileInfo) {
|
if (fileInfo) {
|
||||||
return PR_smprintf("%ld.%ld.%ld.%ld",
|
return mozilla::Smprintf("%ld.%ld.%ld.%ld",
|
||||||
HIWORD(fileInfo->dwFileVersionMS),
|
HIWORD(fileInfo->dwFileVersionMS),
|
||||||
LOWORD(fileInfo->dwFileVersionMS),
|
LOWORD(fileInfo->dwFileVersionMS),
|
||||||
HIWORD(fileInfo->dwFileVersionLS),
|
HIWORD(fileInfo->dwFileVersionLS),
|
||||||
|
@ -425,7 +425,7 @@ nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
|
||||||
PL_strfree(info.fFileName);
|
PL_strfree(info.fFileName);
|
||||||
|
|
||||||
if (info.fVersion)
|
if (info.fVersion)
|
||||||
PR_smprintf_free(info.fVersion);
|
mozilla::SmprintfFree(info.fVersion);
|
||||||
|
|
||||||
ZeroMemory((void *)&info, sizeof(info));
|
ZeroMemory((void *)&info, sizeof(info));
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче