diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:35:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:35:46 +0000 |
| commit | 28e3362541204d0b745d85effb9fc34ad80ef648 (patch) | |
| tree | 2fa01c8a3f3fc293605b4e273319199672b8c24a /setup_native/source/win32/customactions/indexingfilter | |
| parent | e4660e0770bb452a85dc70f8ee4adbf0fac70b72 (diff) | |
INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2006/01/31 13:35:11 sb 1.3.18.1: #i53898# Made code warning-free.
Diffstat (limited to 'setup_native/source/win32/customactions/indexingfilter')
| -rw-r--r-- | setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx index eb00486b28af..6ff0b709e903 100644 --- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx +++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx @@ -4,9 +4,9 @@ * * $RCSfile: restartindexingservice.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:31:10 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:35:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,9 +42,11 @@ the service we do nothing. */ +#pragma warning(push, 1) /* disable warnings within system headers */ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <msiquery.h> +#pragma warning(pop) /* Advapi.dll needs to be loaded dynamically because the service @@ -112,12 +114,12 @@ bool StopIndexingService(SC_HANDLE hService) return (status.dwCurrentState == SERVICE_STOPPED); } -bool StartIndexingService(SC_HANDLE hService) +void StartIndexingService(SC_HANDLE hService) { - SERVICE_STATUS status; - if (StartService_(hService, 0, NULL)) { + SERVICE_STATUS status; + // Check the status until the service is no longer stop pending. if (QueryServiceStatus_(hService, &status)) { @@ -156,10 +158,9 @@ bool StartIndexingService(SC_HANDLE hService) } } } - return (status.dwCurrentState == SERVICE_RUNNING); } -extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE handle) +extern "C" UINT __stdcall RestartIndexingService(MSIHANDLE) { //MessageBox(NULL, TEXT("Restarting Indexing Service"), TEXT("Message"), MB_OK | MB_ICONINFORMATION); |