Changeset 66121 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Mar 16, 2017 9:44:53 AM (8 years ago)

Author:

vboxsync

Message:

Main/svcmain: cleanups, make functions static and use IPRT where sensible/possible

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (10 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -39 +39 @@
 #include <iprt/getopt.h>
 #include <iprt/message.h>
-#include <iprt\asm.h>
+#include <iprt/asm.h>
 
 class CExeModule : public ATL::CComModule
@@ -151 +151 @@
 * This function defined starting from Vista only.
 */
-BOOL ShutdownBlockReasonCreateAPI(HWND hWnd,LPCWSTR pwszReason)
+static BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason)
 {
     BOOL fResult = FALSE;
@@ -158 +158 @@
     PFNSHUTDOWNBLOCKREASONCREATE pfn = (PFNSHUTDOWNBLOCKREASONCREATE)GetProcAddress(
             GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonCreate");
-    _ASSERTE(pfn);
+    AssertPtrValid(pfn);
     if (pfn)
         fResult = pfn(hWnd, pwszReason);
@@ -168 +168 @@
 * This function defined starting from Vista only.
 */
-BOOL ShutdownBlockReasonDestroyAPI(HWND hWnd)
+static BOOL ShutdownBlockReasonDestroyAPI(HWND hWnd)
 {
     BOOL fResult = FALSE;
@@ -175 +175 @@
     PFNSHUTDOWNBLOCKREASONDESTROY pfn = (PFNSHUTDOWNBLOCKREASONDESTROY)GetProcAddress(
         GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonDestroy");
-    _ASSERTE(pfn);
+    AssertPtrValid(pfn);
     if (pfn)
         fResult = pfn(hWnd);
@@ -181 +181 @@
 }
 
-
-LRESULT CALLBACK WinMainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK WinMainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     LRESULT rc = 0;
@@ -231 +230 @@
 }
 
-
-int CreateMainWindow()
+static int CreateMainWindow()
 {
     int rc = VINF_SUCCESS;
-    _ASSERTE(g_hMainWindow == NULL);
+    Assert(g_hMainWindow == NULL);
 
     LogFlow(("CreateMainWindow\n"));
@@ -280 +278 @@
 
 
-void DestroyMainWindow()
-{
-    _ASSERTE(g_hMainWindow != NULL);
+static void DestroyMainWindow()
+{
+    Assert(g_hMainWindow != NULL);
     Log(("SVCMain: DestroyMainWindow \n"));
     if (g_hMainWindow != NULL)
@@ -333 +331 @@
     RTR3InitExe(argc, &argv, 0);
 
-
-    /* Note that all options are given lowercase/camel case/uppercase to
-     * approximate case insensitive matching, which RTGetOpt doesn't offer. */
     static const RTGETOPTDEF s_aOptions[] =
     {
@@ -502 +497 @@
     int nRet = 0;
     HRESULT hRes = com::Initialize(false /*fGui*/, fRun /*fAutoRegUpdate*/);
-    _ASSERTE(SUCCEEDED(hRes));
+    AssertLogRelMsg(SUCCEEDED(hRes), ("SVCMAIN: init failed: %Rhrc\n", hRes));
 
     g_pModule = new CExeModule();