Bug 1498831: Exclude ID_GetFileAttributesW enum from Windows builds without MOZ_SANDBOX (r=jmathies)
authorDavid Parks <dparks@mozilla.com>
Tue, 16 Oct 2018 11:48:51 +0000
changeset 489886 943c165146e677a243702a51d5d9f3a5cfe163ba
parent 489885 de6fb9a3d7a5dcf98798c833994c68f2ac83526c
child 489887 425bec190a04d3de38be9ded779d25b57c35849e
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersjmathies
bugs1498831
milestone64.0a1
Bug 1498831: Exclude ID_GetFileAttributesW enum from Windows builds without MOZ_SANDBOX (r=jmathies) All of the enum entries must have a FunctionHook object but GetFileAttributesW only gets one if MOZ_SANDBOX is defined. This aligns the #define behavior of the enum with the #define behavior of its usage in FunctionHook. Differential Revision: https://phabricator.services.mozilla.com/D8745
dom/plugins/ipc/FunctionBrokerIPCUtils.h
--- a/dom/plugins/ipc/FunctionBrokerIPCUtils.h
+++ b/dom/plugins/ipc/FunctionBrokerIPCUtils.h
@@ -43,17 +43,19 @@ enum FunctionHookId
   , ID_HttpEndRequestA
   , ID_InternetQueryOptionA
   , ID_InternetErrorDlg
   , ID_AcquireCredentialsHandleA
   , ID_QueryCredentialsAttributesA
   , ID_FreeCredentialsHandle
   , ID_PrintDlgW
   , ID_CreateMutexW
+#if defined(MOZ_SANDBOX)
   , ID_GetFileAttributesW
+#endif // defined(MOZ_SANDBOX)
   , ID_FunctionHookCount
 #else // defined(XP_WIN)
     ID_FunctionHookCount
 #endif // defined(XP_WIN)
 };
 
 // Max number of bytes to show when logging a blob of raw memory
 static const uint32_t MAX_BLOB_CHARS_TO_LOG = 12;