wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 898946. Avoid #including XPCOM headers within maintenanceservice. r=bbondy

Browse Source 
--HG--
extra : rebase_source : b19663967f7af21daf8f3cf123701a79e295f4b3
This commit is contained in:
Robert O'Callahan 2013-08-02 21:30:06 +12:00
parent 2ac93d314a
commit 0164459114
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/components/maintenanceservice/serviceinstall.cpp
View File

@ -10,9 +10,8 @@
// Used for DNLEN and UNLEN
#include <lm.h>
#include <nsAutoPtr.h>
#include <nsWindowsHelpers.h>
#include <nsMemory.h>
#include "mozilla/Scoped.h"
#include "serviceinstall.h"
#include "servicebase.h"
@ -65,7 +64,7 @@ GetVersionNumberFromPath(LPWSTR path, DWORD &A, DWORD &B,
DWORD &C, DWORD &D)
{
DWORD fileVersionInfoSize = GetFileVersionInfoSizeW(path, 0);
nsAutoArrayPtr<char> fileVersionInfo = new char[fileVersionInfoSize];
mozilla::ScopedDeleteArray<char> fileVersionInfo(new char[fileVersionInfoSize]);
if (!GetFileVersionInfoW(path, 0, fileVersionInfoSize,
fileVersionInfo.get())) {
LOG_WARN(("Could not obtain file info of old service. (%d)",
@ -286,7 +285,7 @@ SvcInstall(SvcInstallAction action)
// Get the service config information, in particular we want the binary
// path of the service.
nsAutoArrayPtr<char> serviceConfigBuffer = new char[bytesNeeded];
mozilla::ScopedDeleteArray<char> serviceConfigBuffer(new char[bytesNeeded]);
if (!QueryServiceConfigW(schService,
reinterpret_cast<QUERY_SERVICE_CONFIGW*>(serviceConfigBuffer.get()),
bytesNeeded, &bytesNeeded)) {

1
toolkit/components/maintenanceservice/workmonitor.cpp
View File

@ -15,7 +15,6 @@
#pragma comment(lib, "rpcrt4.lib")
#include "nsWindowsHelpers.h"
#include "nsAutoPtr.h"
#include "workmonitor.h"
#include "serviceinstall.h"