Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[winesync] 23876: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: winesync Date: Sat Sep 2 02:47:57 2006 New Revision: 23876 URL: http://svn.reactos.org/svn/reactos?rev=23876&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/sensapi/sensapi.c (with props) trunk/reactos/dll/win32/sensapi/sensapi.spec (with props) trunk/reactos/include/psdk/sensapi.h (with props) trunk/reactos/include/psdk/sensevts.h (with props) Modified: trunk/reactos/dll/win32/sensapi/sensapi.rbuild trunk/reactos/media/doc/README.WINE Added: trunk/reactos/dll/win32/sensapi/sensapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.c (added) +++ trunk/reactos/dll/win32/sensapi/sensapi.c Sat Sep 2 02:47:57 2006 @@ -1,0 +1,86 @@ +/* + * Implementation of System Event Notification Service Library (sensapi.dll) + * + * Copyright 2005 Steven Edwards for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Notes: + * The System Event Notification Service reports the status of network + * connections. For Wine we just report that we are always connected. + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "sensevts.h" +#include "sensapi.h" + +#include "uuids.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sensapi); + +HMODULE SENSAPI_hModule = 0; + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + SENSAPI_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} + +BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo) +{ + FIXME("%s,%p\n", lpszDestination, lpQOCInfo); + return TRUE; +} +BOOL WINAPI IsDestinationReachableW(LPCWSTR lpszDestination, LPQOCINFO lpQOCInfo) +{ + FIXME("%s,%p\n", debugstr_w(lpszDestination), lpQOCInfo); + return TRUE; +} + +BOOL WINAPI IsNetworkAlive(LPDWORD lpdwFlags) +{ + TRACE("yes, using LAN type network.\n"); + if (lpdwFlags) + *lpdwFlags = NETWORK_ALIVE_LAN; + return TRUE; +} Propchange: trunk/reactos/dll/win32/sensapi/sensapi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/sensapi/sensapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.rbuild (original) +++ trunk/reactos/dll/win32/sensapi/sensapi.rbuild Sat Sep 2 02:47:57 2006 @@ -1,3 +1,16 @@ -<module name="sensapi" type="win32dll" baseaddress="${BASEADDRESS_SENSAPI}" installbase="system32" installname="sensapi.dll"> +<module name="sensapi" type="win32dll" baseaddress="${BASEADDRESS_SENSAPI}" installbase="system32" installname="sensapi.dll" allowwarnings="true"> + <importlibrary definition="sensapi.spec.def" /> + <include base="sensapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> <file>sensapi.c</file> -</module> + <file>sensapi.spec</file> +</module> Added: trunk/reactos/dll/win32/sensapi/sensapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.spec (added) +++ trunk/reactos/dll/win32/sensapi/sensapi.spec Sat Sep 2 02:47:57 2006 @@ -1,0 +1,3 @@ +@ stdcall IsDestinationReachableA(str ptr) +@ stdcall IsDestinationReachableW(wstr ptr) +@ stdcall IsNetworkAlive(ptr) Propchange: trunk/reactos/dll/win32/sensapi/sensapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/sensapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sensapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/sensapi.h (added) +++ trunk/reactos/include/psdk/sensapi.h Sat Sep 2 02:47:57 2006 @@ -1,0 +1,47 @@ +/* + * Copyright (C) 2005 Steven Edwards + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __SENSAPI_H__ +#define __SENSAPI_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define NETWORK_ALIVE_LAN 1 +#define NETWORK_ALIVE_WAN 2 +#define NETWORK_ALIVE_AOL 4 + +typedef struct tagQOCINFO +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwInSpeed; + DWORD dwOutSpeed; +} QOCINFO, *LPQOCINFO; + +BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo); +BOOL WINAPI IsDestinationReachableW(LPCWSTR lpszDestination, LPQOCINFO lpQOCInfo); +#define IsDestinationReachable WINELIB_NAME_AW(IsDestinationReachable) +BOOL WINAPI IsNetworkAlive(LPDWORD lpdwFlags); + +#ifdef __cplusplus +} +#endif + +#endif /* __SENSAPI_H__ */ Propchange: trunk/reactos/include/psdk/sensapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/sensevts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sensevts.h?re… ============================================================================== (empty) Propchange: trunk/reactos/include/psdk/sensevts.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sat Sep 2 02:47:57 2006 @@ -68,6 +68,7 @@ reactos/dll/win32/riched20 # Synced to Wine-0_9_5 reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 +reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Synced to Wine-0_9_5 reactos/dll/win32/shdocvw # Synced to Wine-0_9_5

1 0

[hpoussin] 23875: Add a stub sensapi.dll. This is a step to fix bug 1751
by hpoussin＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: hpoussin Date: Sat Sep 2 02:41:31 2006 New Revision: 23875 URL: http://svn.reactos.org/svn/reactos?rev=23875&view=rev Log: Add a stub sensapi.dll. This is a step to fix bug 1751 Added: trunk/reactos/dll/win32/sensapi/ (with props) trunk/reactos/dll/win32/sensapi/sensapi.rbuild (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=238… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Sep 2 02:41:31 2006 @@ -108,6 +108,7 @@ <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> <property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> + <property name="BASEADDRESS_SENSAPI" value="0x77700000" /> <property name="BASEADDRESS_PACKET" value="0x77780000" /> <property name="BASEADDRESS_MSAFD" value="0x77780000" /> <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> Propchange: trunk/reactos/dll/win32/sensapi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Sep 2 02:41:31 2006 @@ -1,0 +1,2 @@ +GNUmakefile +*.vcproj Added: trunk/reactos/dll/win32/sensapi/sensapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.rbuild (added) +++ trunk/reactos/dll/win32/sensapi/sensapi.rbuild Sat Sep 2 02:41:31 2006 @@ -1,0 +1,3 @@ +<module name="sensapi" type="win32dll" baseaddress="${BASEADDRESS_SENSAPI}" installbase="system32" installname="sensapi.dll"> + <file>sensapi.c</file> +</module> Propchange: trunk/reactos/dll/win32/sensapi/sensapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sat Sep 2 02:41:31 2006 @@ -190,6 +190,9 @@ <directory name="security"> <xi:include href="security/security.rbuild" /> </directory> +<directory name="sensapi"> + <xi:include href="sensapi/sensapi.rbuild" /> +</directory> <directory name="serialui"> <xi:include href="serialui/serialui.rbuild" /> </directory>

1 0

[hpoussin] 23874: Add some error codes (taken from Wine)
by hpoussin＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: hpoussin Date: Sat Sep 2 02:10:56 2006 New Revision: 23874 URL: http://svn.reactos.org/svn/reactos?rev=23874&view=rev Log: Add some error codes (taken from Wine) Modified: trunk/reactos/include/psdk/advpub.h trunk/reactos/include/psdk/winerror.h Modified: trunk/reactos/include/psdk/advpub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/advpub.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/advpub.h (original) +++ trunk/reactos/include/psdk/advpub.h Sat Sep 2 02:10:56 2006 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_ADVPUB_H #define __WINE_ADVPUB_H @@ -23,6 +23,10 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifndef S_ASYNCHRONOUS +#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8L) #endif typedef struct _CabInfoA Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h (original) +++ trunk/reactos/include/psdk/winerror.h Sat Sep 2 02:10:56 2006 @@ -2284,6 +2284,9 @@ #define SEC_E_MESSAGE_ALTERED _HRESULT_TYPEDEF_(0x8009030FL) #define SEC_E_OUT_OF_SEQUENCE _HRESULT_TYPEDEF_(0x80090310L) #define SEC_E_NO_AUTHENTICATING_AUTHORITY _HRESULT_TYPEDEF_(0x80090311L) +#define SEC_I_CONTINUE_NEEDED _HRESULT_TYPEDEF_(0x00090312L) +#define SEC_I_COMPLETE_NEEDED _HRESULT_TYPEDEF_(0x00090313L) +#define SEC_I_COMPLETE_AND_CONTINUE _HRESULT_TYPEDEF_(0x00090314L) #define SEC_E_BAD_PKGID _HRESULT_TYPEDEF_(0x80090316L) #define SEC_E_CONTEXT_EXPIRED _HRESULT_TYPEDEF_(0x80090317L) #define SEC_E_INCOMPLETE_MESSAGE _HRESULT_TYPEDEF_(0x80090318L) @@ -2453,11 +2456,86 @@ #define CRYPT_E_ASN1_EXTENDED _HRESULT_TYPEDEF_(0x80093201L) #define CRYPT_E_ASN1_NOEOD _HRESULT_TYPEDEF_(0x80093202L) +#define TRUST_E_SYSTEM_ERROR _HRESULT_TYPEDEF_(0x80096001L) +#define TRUST_E_NO_SIGNER_CERT _HRESULT_TYPEDEF_(0x80096002L) +#define TRUST_E_COUNTER_SIGNER _HRESULT_TYPEDEF_(0x80096003L) #define TRUST_E_CERT_SIGNATURE _HRESULT_TYPEDEF_(0x80096004L) +#define TRUST_E_TIME_STAMP _HRESULT_TYPEDEF_(0x80096005L) +#define TRUST_E_BAD_DIGEST _HRESULT_TYPEDEF_(0x80096010L) +#define TRUST_E_BASIC_CONSTRAINTS _HRESULT_TYPEDEF_(0x80096019L) +#define TRUST_E_FINANCIAL_CRITERIA _HRESULT_TYPEDEF_(0x8009601EL) #define TRUST_E_PROVIDER_UNKNOWN _HRESULT_TYPEDEF_(0x800B0001L) #define TRUST_E_ACTION_UNKNOWN _HRESULT_TYPEDEF_(0x800B0002L) #define TRUST_E_SUBJECT_FORM_UNKNOWN _HRESULT_TYPEDEF_(0x800B0003L) #define TRUST_E_SUBJECT_NOT_TRUSTED _HRESULT_TYPEDEF_(0x800B0004L) +#define TRUST_E_NOSIGNATURE _HRESULT_TYPEDEF_(0x800B0100L) + +#define SPAPI_E_EXPECTED_SECTION_NAME _HRESULT_TYPEDEF_(0x800F0000L) +#define SPAPI_E_BAD_SECTION_NAME_LINE _HRESULT_TYPEDEF_(0x800F0001L) +#define SPAPI_E_SECTION_NAME_TOO_LONG _HRESULT_TYPEDEF_(0x800F0002L) +#define SPAPI_E_GENERAL_SYNTAX _HRESULT_TYPEDEF_(0x800F0003L) +#define SPAPI_E_WRONG_INF_STYLE _HRESULT_TYPEDEF_(0x800F0100L) +#define SPAPI_E_SECTION_NOT_FOUND _HRESULT_TYPEDEF_(0x800F0101L) +#define SPAPI_E_LINE_NOT_FOUND _HRESULT_TYPEDEF_(0x800F0102L) +#define SPAPI_E_NO_BACKUP _HRESULT_TYPEDEF_(0x800F0103L) +#define SPAPI_E_NO_ASSOCIATED_CLASS _HRESULT_TYPEDEF_(0x800F0200L) +#define SPAPI_E_CLASS_MISMATCH _HRESULT_TYPEDEF_(0x800F0201L) +#define SPAPI_E_DUPLICATE_FOUND _HRESULT_TYPEDEF_(0x800F0202L) +#define SPAPI_E_NO_DRIVER_SELECTED _HRESULT_TYPEDEF_(0x800F0203L) +#define SPAPI_E_KEY_DOES_NOT_EXIST _HRESULT_TYPEDEF_(0x800F0204L) +#define SPAPI_E_INVALID_DEVINST_NAME _HRESULT_TYPEDEF_(0x800F0205L) +#define SPAPI_E_INVALID_CLASS _HRESULT_TYPEDEF_(0x800F0206L) +#define SPAPI_E_DEVINST_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x800F0207L) +#define SPAPI_E_DEVINFO_NOT_REGISTERED _HRESULT_TYPEDEF_(0x800F0208L) +#define SPAPI_E_INVALID_REG_PROPERTY _HRESULT_TYPEDEF_(0x800F0209L) +#define SPAPI_E_NO_INF _HRESULT_TYPEDEF_(0x800F020AL) +#define SPAPI_E_NO_SUCH_DEVINST _HRESULT_TYPEDEF_(0x800F020BL) +#define SPAPI_E_CANT_LOAD_CLASS_ICON _HRESULT_TYPEDEF_(0x800F020CL) +#define SPAPI_E_INVALID_CLASS_INSTALLER _HRESULT_TYPEDEF_(0x800F020DL) +#define SPAPI_E_DI_DO_DEFAULT _HRESULT_TYPEDEF_(0x800F020EL) +#define SPAPI_E_DI_NOFILECOPY _HRESULT_TYPEDEF_(0x800F020FL) +#define SPAPI_E_INVALID_HWPROFILE _HRESULT_TYPEDEF_(0x800F0210L) +#define SPAPI_E_NO_DEVICE_SELECTED _HRESULT_TYPEDEF_(0x800F0211L) +#define SPAPI_E_DEVINFO_LIST_LOCKED _HRESULT_TYPEDEF_(0x800F0212L) +#define SPAPI_E_DEVINFO_DATA_LOCKED _HRESULT_TYPEDEF_(0x800F0213L) +#define SPAPI_E_DI_BAD_PATH _HRESULT_TYPEDEF_(0x800F0214L) +#define SPAPI_E_NO_CLASSINSTALL_PARAMS _HRESULT_TYPEDEF_(0x800F0215L) +#define SPAPI_E_FILEQUEUE_LOCKED _HRESULT_TYPEDEF_(0x800F0216L) +#define SPAPI_E_BAD_SERVICE_INSTALLSECT _HRESULT_TYPEDEF_(0x800F0217L) +#define SPAPI_E_NO_CLASS_DRIVER_LIST _HRESULT_TYPEDEF_(0x800F0218L) +#define SPAPI_E_NO_ASSOCIATED_SERVICE _HRESULT_TYPEDEF_(0x800F0219L) +#define SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F021AL) +#define SPAPI_E_DEVICE_INTERFACE_ACTIVE _HRESULT_TYPEDEF_(0x800F021BL) +#define SPAPI_E_DEVICE_INTERFACE_REMOVED _HRESULT_TYPEDEF_(0x800F021CL) +#define SPAPI_E_BAD_INTERFACE_INSTALLSECT _HRESULT_TYPEDEF_(0x800F021DL) +#define SPAPI_E_NO_SUCH_INTERFACE_CLASS _HRESULT_TYPEDEF_(0x800F021EL) +#define SPAPI_E_INVALID_REFERENCE_STRING _HRESULT_TYPEDEF_(0x800F021FL) +#define SPAPI_E_INVALID_MACHINENAME _HRESULT_TYPEDEF_(0x800F0220L) +#define SPAPI_E_REMOTE_COMM_FAILURE _HRESULT_TYPEDEF_(0x800F0221L) +#define SPAPI_E_MACHINE_UNAVAILABLE _HRESULT_TYPEDEF_(0x800F0222L) +#define SPAPI_E_NO_CONFIGMGR_SERVICES _HRESULT_TYPEDEF_(0x800F0223L) +#define SPAPI_E_INVALID_PROPPAGE_PROVIDER _HRESULT_TYPEDEF_(0x800F0224L) +#define SPAPI_E_NO_SUCH_DEVICE_INTERFACE _HRESULT_TYPEDEF_(0x800F0225L) +#define SPAPI_E_DI_POSTPROCESSING_REQUIRED _HRESULT_TYPEDEF_(0x800F0226L) +#define SPAPI_E_INVALID_COINSTALLER _HRESULT_TYPEDEF_(0x800F0227L) +#define SPAPI_E_NO_COMPAT_DRIVERS _HRESULT_TYPEDEF_(0x800F0228L) +#define SPAPI_E_NO_DEVICE_ICON _HRESULT_TYPEDEF_(0x800F0229L) +#define SPAPI_E_INVALID_INF_LOGCONFIG _HRESULT_TYPEDEF_(0x800F022AL) +#define SPAPI_E_DI_DONT_INSTALL _HRESULT_TYPEDEF_(0x800F022BL) +#define SPAPI_E_INVALID_FILTER_DRIVER _HRESULT_TYPEDEF_(0x800F022CL) +#define SPAPI_E_NON_WINDOWS_NT_DRIVER _HRESULT_TYPEDEF_(0x800F022DL) +#define SPAPI_E_NON_WINDOWS_DRIVER _HRESULT_TYPEDEF_(0x800F022EL) +#define SPAPI_E_NO_CATALOG_FOR_OEM_INF _HRESULT_TYPEDEF_(0x800F022FL) +#define SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE _HRESULT_TYPEDEF_(0x800F0230L) +#define SPAPI_E_NOT_DISABLEABLE _HRESULT_TYPEDEF_(0x800F0231L) +#define SPAPI_E_CANT_REMOVE_DEVINST _HRESULT_TYPEDEF_(0x800F0232L) +#define SPAPI_E_INVALID_TARGET _HRESULT_TYPEDEF_(0x800F0233L) +#define SPAPI_E_DRIVER_NONNATIVE _HRESULT_TYPEDEF_(0x800F0234L) +#define SPAPI_E_IN_WOW64 _HRESULT_TYPEDEF_(0x800F0235L) +#define SPAPI_E_SET_SYSTEM_RESTORE_POINT _HRESULT_TYPEDEF_(0x800F0236L) +#define SPAPI_E_INCORRECTLY_COPIED_INF _HRESULT_TYPEDEF_(0x800F0237L) +#define SPAPI_E_SCE_DISABLED _HRESULT_TYPEDEF_(0x800F0238L) +#define SPAPI_E_ERROR_NOT_INSTALLED _HRESULT_TYPEDEF_(0x800F1000L) /* Smart card management error codes */ #define SCARD_E_NO_SMARTCARD _HRESULT_TYPEDEF_(0x8010000CL)

1 0

[weiden] 23873: Don't call BeginPaint/EndPaint while processing a WM_DRAWITEM message
by weiden＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: weiden Date: Sat Sep 2 01:53:31 2006 New Revision: 23873 URL: http://svn.reactos.org/svn/reactos?rev=23873&view=rev Log: Don't call BeginPaint/EndPaint while processing a WM_DRAWITEM message Modified: trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c Sat Sep 2 01:53:31 2006 @@ -414,17 +414,17 @@ lpDrawItem = (LPDRAWITEMSTRUCT) lParam; if(lpDrawItem->CtlID == IDC_WORLD_BACKGROUND) { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - hdc = BeginPaint(hwndDlg, &ps); - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, 0, 0, cxSource, cySource, SRCCOPY); - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); + HDC hdcMem; + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, hBitmap); + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + DeleteDC(hdcMem); + } } } break;

1 0

[pborobia] 23872: * Create LastKey if it don't exist * Remove hardcoded key reference
by pborobia＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: pborobia Date: Fri Sep 1 23:26:24 2006 New Revision: 23872 URL: http://svn.reactos.org/svn/reactos?rev=23872&view=rev Log: * Create LastKey if it don't exist * Remove hardcoded key reference Modified: branches/clipboard/base/applications/regedit/childwnd.c Modified: branches/clipboard/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/base/applications/reg… ============================================================================== --- branches/clipboard/base/applications/regedit/childwnd.c (original) +++ branches/clipboard/base/applications/regedit/childwnd.c Fri Sep 1 23:26:24 2006 @@ -431,8 +431,8 @@ TCHAR szBuffer[MAX_PATH]; _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("My Computer\\%s\\%s"), rootName, keyPath); - if (RegOpenKey(HKEY_CURRENT_USER, - _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"), + if (RegCreateKey(HKEY_CURRENT_USER, + g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) { RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0]));

1 0

[weiden] 23871: disable code that dereferences a random pointer
by weiden＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: weiden Date: Fri Sep 1 22:56:06 2006 New Revision: 23871 URL: http://svn.reactos.org/svn/reactos?rev=23871&view=rev Log: disable code that dereferences a random pointer Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2387… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Fri Sep 1 22:56:06 2006 @@ -763,7 +763,8 @@ /* Driver base is in parameter 1 */ DriverBase = (PVOID)BugCheckParameter1; - KiBugCheckDriver = &LdrEntry->BaseDllName; + /* FIXME: LdrEntry is uninitialized for god's sake!!! + KiBugCheckDriver = &LdrEntry->BaseDllName; */ break; /* Check if the driver has a stuck thread */

1 0

[weiden] 23870: Don't leak a reference in NtReleaseSemaphore() in case KeReleaseSemaphore() raises and exception
by weiden＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: weiden Date: Fri Sep 1 22:41:00 2006 New Revision: 23870 URL: http://svn.reactos.org/svn/reactos?rev=23870&view=rev Log: Don't leak a reference in NtReleaseSemaphore() in case KeReleaseSemaphore() raises and exception Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=2387… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c (original) +++ trunk/reactos/ntoskrnl/ex/sem.c Fri Sep 1 22:41:00 2006 @@ -342,7 +342,6 @@ IO_NO_INCREMENT, ReleaseCount, FALSE); - ObDereferenceObject(Semaphore); /* Return the old count if requested */ if(PreviousCount) *PreviousCount = PrevCount; @@ -352,6 +351,8 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; + + ObDereferenceObject(Semaphore); } /* Return Status */

1 0

[weiden] 23869: remove superfluous dereference
by weiden＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: weiden Date: Fri Sep 1 22:20:44 2006 New Revision: 23869 URL: http://svn.reactos.org/svn/reactos?rev=23869&view=rev Log: remove superfluous dereference Modified: trunk/reactos/base/applications/sc/query.c Modified: trunk/reactos/base/applications/sc/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/query… ============================================================================== --- trunk/reactos/base/applications/sc/query.c (original) +++ trunk/reactos/base/applications/sc/query.c Fri Sep 1 22:20:44 2006 @@ -213,7 +213,7 @@ bServiceName = FALSE; } } - *TmpArgs++; + TmpArgs++; }

1 0

[gedmurphy] 23868: - Use a more generic print service - don't assign a service name at the start as it causes problems when query(ex) doesn't supply one. - Simplify the service starting code. - Add missing options to the print type - rewrite the querying functionality to be cleaner, and use existing code. - remove the braces I left, used for collapsing dbg info
by gedmurphy＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: gedmurphy Date: Fri Sep 1 20:55:36 2006 New Revision: 23868 URL: http://svn.reactos.org/svn/reactos?rev=23868&view=rev Log: - Use a more generic print service - don't assign a service name at the start as it causes problems when query(ex) doesn't supply one. - Simplify the service starting code. - Add missing options to the print type - rewrite the querying functionality to be cleaner, and use existing code. - remove the braces I left, used for collapsing dbg info Modified: trunk/reactos/base/applications/sc/control.c trunk/reactos/base/applications/sc/create.c trunk/reactos/base/applications/sc/delete.c trunk/reactos/base/applications/sc/print.c trunk/reactos/base/applications/sc/query.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/start.c trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/contr… ============================================================================== --- trunk/reactos/base/applications/sc/control.c (original) +++ trunk/reactos/base/applications/sc/control.c Fri Sep 1 20:55:36 2006 @@ -21,7 +21,6 @@ DWORD dwDesiredAccess = 0; #ifdef SCDBG -{ LPCTSTR *TmpArgs = Args; INT TmpCnt = ArgCount; _tprintf(_T("service to control - %s\n"), ServiceName); @@ -34,7 +33,6 @@ TmpCnt--; } _tprintf(_T("\n")); -} #endif /* SCDBG */ switch (Control) @@ -75,8 +73,16 @@ Control, &Status)) { + SERVICE_STATUS_PROCESS StatusEx; + + /* FIXME: lazy hack ;) */ + CopyMemory(&StatusEx, &Status, sizeof(Status)); + StatusEx.dwProcessId = 0; + StatusEx.dwServiceFlags = 0; + PrintService(ServiceName, - &Status); + &StatusEx, + FALSE); CloseServiceHandle(hSc); CloseServiceHandle(hSCManager); Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c (original) +++ trunk/reactos/base/applications/sc/create.c Fri Sep 1 20:55:36 2006 @@ -29,7 +29,6 @@ lpBinaryPathName = *ServiceArgs; #ifdef SCDBG -{ _tprintf(_T("service name - %s\n"), ServiceName); _tprintf(_T("display name - %s\n"), ServiceName); _tprintf(_T("service type - %lu\n"), dwServiceType); @@ -41,7 +40,6 @@ _tprintf(_T("dependincies - %s\n"), lpDependencies); _tprintf(_T("account start name - %s\n"), lpServiceStartName); _tprintf(_T("account password - %s\n"), lpPassword); -} #endif if (!ServiceName) Modified: trunk/reactos/base/applications/sc/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/delet… ============================================================================== --- trunk/reactos/base/applications/sc/delete.c (original) +++ trunk/reactos/base/applications/sc/delete.c Fri Sep 1 20:55:36 2006 @@ -15,9 +15,7 @@ SC_HANDLE hSc = NULL; #ifdef SCDBG -{ _tprintf(_T("service to delete - %s\n\n"), ServiceName); -} #endif hSCManager = OpenSCManager(NULL, Modified: trunk/reactos/base/applications/sc/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/print… ============================================================================== --- trunk/reactos/base/applications/sc/print.c (original) +++ trunk/reactos/base/applications/sc/print.c Fri Sep 1 20:55:36 2006 @@ -1,28 +1,19 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/sc/print.c + * PURPOSE: print service info + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + #include "sc.h" VOID -PrintServiceEx(LPCTSTR lpServiceName, - LPSERVICE_STATUS_PROCESS pStatusEx) -{ - SERVICE_STATUS Status; - - /*FIXME: quick hack, assign values 1 by 1 */ - CopyMemory(&Status, pStatusEx, sizeof(SERVICE_STATUS)); - - PrintService(lpServiceName, - &Status); - - _tprintf(_T("\tPID : %lu\n"), - pStatusEx->dwProcessId); - _tprintf(_T("\tFLAGS : %lu\n"), - pStatusEx->dwServiceFlags); -} - - -VOID PrintService(LPCTSTR lpServiceName, - LPSERVICE_STATUS pStatus) + LPSERVICE_STATUS_PROCESS pStatus, + BOOL bExtended) { _tprintf(_T("SERVICE_NAME: %s\n"), lpServiceName); @@ -30,10 +21,30 @@ (unsigned int)pStatus->dwServiceType); switch (pStatus->dwServiceType) { - case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; - case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; - case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; - case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; + case SERVICE_KERNEL_DRIVER: + _tprintf(_T("KERNEL_DRIVER\n")); + break; + + case SERVICE_FILE_SYSTEM_DRIVER: + _tprintf(_T("FILE_SYSTEM_DRIVER\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); + break; + default : _tprintf(_T("\n")); break; } @@ -65,7 +76,7 @@ _tprintf(_T("NOT_PAUSABLE,")); if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN) - _tprintf(_T("???")); + _tprintf(_T("ACCEPTS_SHUTDOWN")); else _tprintf(_T("IGNORES_SHUTDOWN")); @@ -81,4 +92,14 @@ (unsigned int)pStatus->dwCheckPoint); _tprintf(_T("\tWAIT_HINT : 0x%x\n"), (unsigned int)pStatus->dwWaitHint); + + if (bExtended) + { + _tprintf(_T("\tPID : %lu\n"), + pStatus->dwProcessId); + _tprintf(_T("\tFLAGS : %lu\n"), + pStatus->dwServiceFlags); + } + + _tprintf(_T("\n")); } Modified: trunk/reactos/base/applications/sc/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/query… ============================================================================== --- trunk/reactos/base/applications/sc/query.c (original) +++ trunk/reactos/base/applications/sc/query.c Fri Sep 1 20:55:36 2006 @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS SC utility - * FILE: subsys/system/sc/query.c - * PURPOSE: control ReactOS services - * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * Ged Murphy 20/10/05 Created + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/sc/query.c + * PURPOSE: queries service info + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ /* @@ -16,82 +14,20 @@ #include "sc.h" -/* local function decs */ -VOID PrintService2(BOOL bExtended); -BOOL EnumServices(DWORD ServiceType, DWORD ServiceState); -BOOL QueryService(LPCTSTR ServiceName, BOOL bExtended); - -/* global variables */ -static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; -DWORD NumServices = 0; - - -BOOL -Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended) -{ - if (! ServiceName) /* display all running services and drivers */ - { - /* get default values */ - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - - /* print default values */ - PrintService2(bExtended); - } - else if (_tcsicmp(ServiceName, _T("type=")) == 0) - { - LPCTSTR Type = *ServiceArgs; - - if (_tcsicmp(Type, _T("driver")) == 0) - EnumServices(SERVICE_DRIVER, SERVICE_ACTIVE); - else if (_tcsicmp(Type, _T("service")) == 0) - EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - else if (_tcsicmp(Type, _T("all")) == 0) - EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); - else - { - _tprintf(_T("\nERROR following \"type=\"!\n")); - _tprintf(_T("Must be \"driver\" or \"service\" or \"all\"\n")); - } - - PrintService2(bExtended); - } - else if(_tcsicmp(ServiceName, _T("state=")) == 0) - { - LPCTSTR State = *ServiceArgs; - - if (_tcsicmp(State, _T("inactive")) == 0) - EnumServices(SERVICE_WIN32, SERVICE_INACTIVE); - else if (_tcsicmp(State, _T("all")) == 0) - EnumServices(SERVICE_WIN32, SERVICE_STATE_ALL); - else - { - _tprintf(_T("\nERROR following \"state=\"!\n")); - _tprintf(_T("Must be \"active\" or \"inactive\" or \"all\"\n")); - } - - PrintService2(bExtended); - } -/* - else if(_tcsicmp(ServiceName, _T("bufsize="))) - - else if(_tcsicmp(ServiceName, _T("ri="))) - - else if(_tcsicmp(ServiceName, _T("group="))) -*/ - else /* print only the service requested */ - { - QueryService(ServiceName, bExtended); - } - - return TRUE; -} - - -BOOL -QueryService(LPCTSTR ServiceName, BOOL bExtended) +LPTSTR QueryOpts[] = { + _T("type="), + _T("state="), + _T("bufsize="), + _T("ri="), + _T("group="), +}; + + +LPSERVICE_STATUS_PROCESS +QueryService(LPCTSTR ServiceName) { SC_HANDLE hSCManager; - SERVICE_STATUS_PROCESS *pServiceInfo = NULL; + LPSERVICE_STATUS_PROCESS pServiceInfo = NULL; SC_HANDLE hSc; DWORD BufSiz = 0; DWORD BytesNeeded = 0; @@ -103,120 +39,59 @@ if (hSCManager == NULL) { ReportLastError(); - return FALSE; - } - - hSc = OpenService(hSCManager, ServiceName, SERVICE_QUERY_STATUS); - + return NULL; + } + + hSc = OpenService(hSCManager, + ServiceName, + SERVICE_QUERY_STATUS); if (hSc == NULL) - { - _tprintf(_T("QueryService: openService failed\n")); - ReportLastError(); - return FALSE; - } + goto fail; Ret = QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - NULL, - BufSiz, - &BytesNeeded); - + SC_STATUS_PROCESS_INFO, + NULL, + BufSiz, + &BytesNeeded); if ((Ret != 0) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) - { - _tprintf(_T("QueryService: First call to QueryServiceStatusEx failed : ")); - ReportLastError(); - return FALSE; - } - else /* Call function again if required size was returned */ - { - /* reserve memory for service info array */ - pServiceInfo = (SERVICE_STATUS_PROCESS *) - HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceInfo == NULL) - { - _tprintf(_T("QueryService: Failed to allocate memory : ")); - ReportLastError(); - return FALSE; - } - - /* fill array with service info */ - if (! QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)pServiceInfo, - BytesNeeded, - &BytesNeeded)) - { - _tprintf(_T("QueryService: Second call to QueryServiceStatusEx failed : ")); - ReportLastError(); - HeapFree(GetProcessHeap(), 0, pServiceInfo); - return FALSE; - } - } - - - _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); - - _tprintf(_T("\tTYPE : %x "), - (unsigned int)pServiceInfo->dwServiceType); - switch (pServiceInfo->dwServiceType) - { - case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; - case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; - case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; - case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; - default : _tprintf(_T("\n")); break; - } - - _tprintf(_T("\tSTATE : %x "), - (unsigned int)pServiceInfo->dwCurrentState); - - switch (pServiceInfo->dwCurrentState) - { - case 1 : _tprintf(_T("STOPPED\n")); break; - case 2 : _tprintf(_T("START_PENDING\n")); break; - case 3 : _tprintf(_T("STOP_PENDING\n")); break; - case 4 : _tprintf(_T("RUNNING\n")); break; - case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; - case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; - case 7 : _tprintf(_T("PAUSED\n")); break; - default : _tprintf(_T("\n")); break; - } - -// _tprintf(_T("\n\taccepted : 0x%x\n\n"), -// pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); -// (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - - _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), - (unsigned int)pServiceInfo->dwWin32ExitCode, - (unsigned int)pServiceInfo->dwWin32ExitCode); - _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), - (unsigned int)pServiceInfo->dwServiceSpecificExitCode, - (unsigned int)pServiceInfo->dwServiceSpecificExitCode); - _tprintf(_T("\tCHECKPOINT : 0x%x\n"), - (unsigned int)pServiceInfo->dwCheckPoint); - _tprintf(_T("\tWAIT_HINT : 0x%x\n"), - (unsigned int)pServiceInfo->dwWaitHint); - if (bExtended) - { - _tprintf(_T("\tPID : %lu\n"), - pServiceInfo->dwProcessId); - _tprintf(_T("\tFLAGS : %lu\n"), - pServiceInfo->dwServiceFlags); - } - - HeapFree(GetProcessHeap(), 0, pServiceInfo); - - return TRUE; + goto fail; + + pServiceInfo = (LPSERVICE_STATUS_PROCESS)HeapAlloc(GetProcessHeap(), + 0, + BytesNeeded); + if (pServiceInfo == NULL) + goto fail; + + if (!QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)pServiceInfo, + BytesNeeded, + &BytesNeeded)) + { + goto fail; + } + + return pServiceInfo; + +fail: + ReportLastError(); + if (pServiceInfo) HeapFree(GetProcessHeap(), 0, pServiceInfo); + if (hSc) CloseServiceHandle(hSc); + if (hSCManager) CloseServiceHandle(hSCManager); + return NULL; } -BOOL -EnumServices(DWORD ServiceType, DWORD ServiceState) +static BOOL +EnumServices(ENUM_SERVICE_STATUS_PROCESS **pServiceStatus, + DWORD ServiceType, + DWORD ServiceState) { SC_HANDLE hSCManager; DWORD BufSize = 0; DWORD BytesNeeded = 0; DWORD ResumeHandle = 0; + DWORD NumServices = 0; DWORD Ret; hSCManager = OpenSCManager(NULL, @@ -228,120 +103,146 @@ return FALSE; } - /* determine required buffer size */ Ret = EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - ServiceType, - ServiceState, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0); - - if ((Ret != 0) && (GetLastError() != ERROR_MORE_DATA)) - { - _tprintf(_T("EnumServices: First call to EnumServicesStatusEx failed : ")); - ReportLastError(); + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)*pServiceStatus, + BufSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0); + + if ((Ret == 0) && (GetLastError() == ERROR_MORE_DATA)) + { + *pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), + 0, + BytesNeeded); + if (*pServiceStatus != NULL) + { + if (EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)*pServiceStatus, + BytesNeeded, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) + { + return NumServices; + } + } + } + + ReportLastError(); + if (pServiceStatus) + HeapFree(GetProcessHeap(), 0, *pServiceStatus); + + return NumServices; +} + + +BOOL +Query(LPCTSTR *ServiceArgs, + DWORD ArgCount, + BOOL bExtended) +{ + LPENUM_SERVICE_STATUS_PROCESS pServiceStatus = NULL; + DWORD NumServices = 0; + //DWORD ServiceType; + //DWORD ServiceState; + BOOL bServiceName = TRUE; + DWORD OptSize, i; + + LPCTSTR *TmpArgs; + INT TmpCnt; + +#ifdef SCDBG + TmpArgs = ServiceArgs; + TmpCnt = ArgCount; + _tprintf(_T("Arguments:\n")); + while (TmpCnt) + { + _tprintf(_T(" %s\n"), *TmpArgs); + TmpArgs++; + TmpCnt--; + } + _tprintf(_T("\n")); +#endif /* SCDBG */ + + /* display all running services and drivers */ + if (ArgCount == 0) + { + NumServices = EnumServices(&pServiceStatus, + SERVICE_WIN32, + SERVICE_ACTIVE); + + if (NumServices != 0) + { + for (i=0; i < NumServices; i++) + { + PrintService(pServiceStatus[i].lpServiceName, + &pServiceStatus[i].ServiceStatusProcess, + bExtended); + } + + _tprintf(_T("number : %lu\n"), NumServices); + + if (pServiceStatus) + HeapFree(GetProcessHeap(), 0, pServiceStatus); + + return TRUE; + } + return FALSE; } - else /* Call function again if required size was returned */ - { - /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) - HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceStatus == NULL) - { - _tprintf(_T("EnumServices: Failed to allocate memory : ")); - ReportLastError(); - return FALSE; - } - - /* fill array with service info */ - if (! EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - ServiceType, - ServiceState, - (LPBYTE)pServiceStatus, - BytesNeeded, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - _tprintf(_T("EnumServices: Second call to EnumServicesStatusEx failed : ")); - ReportLastError(); - HeapFree(GetProcessHeap(), 0, pServiceStatus); - return FALSE; - } - } + + TmpArgs = ServiceArgs; + TmpCnt = ArgCount; + OptSize = sizeof(QueryOpts) / sizeof(QueryOpts[0]); + while (TmpCnt--) + { + for (i=0; i < OptSize; i++) + { + if (!lstrcmpi(*TmpArgs, QueryOpts[i])) + { + bServiceName = FALSE; + } + } + *TmpArgs++; + } + + + /* FIXME: parse options */ + + + /* print only the service requested */ + if (bServiceName) + { + LPSERVICE_STATUS_PROCESS pStatus; + LPCTSTR ServiceName = *ServiceArgs; + + pStatus = QueryService(ServiceName); + if (bExtended) + { + PrintService(ServiceName, + pStatus, + TRUE); + } + else + { + PrintService(ServiceName, + pStatus, + FALSE); + } + } + + if (pServiceStatus) + HeapFree(GetProcessHeap(), 0, pServiceStatus); return TRUE; } - - -VOID -PrintService2(BOOL bExtended) -{ - DWORD i; - - for (i=0; i < NumServices; i++) - { - - _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus[i].lpServiceName); - _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus[i].lpDisplayName); - - _tprintf(_T("\tTYPE : %x "), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceType); - switch (pServiceStatus[i].ServiceStatusProcess.dwServiceType) - { - case 1 : _tprintf(_T("KERNEL_DRIVER\n")); break; - case 2 : _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; - case 16 : _tprintf(_T("WIN32_OWN_PROCESS\n")); break; - case 32 : _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; - default : _tprintf(_T("\n")); break; - } - - _tprintf(_T("\tSTATE : %x "), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCurrentState); - - switch (pServiceStatus[i].ServiceStatusProcess.dwCurrentState) - { - case 1 : _tprintf(_T("STOPPED\n")); break; - case 2 : _tprintf(_T("START_PENDING\n")); break; - case 3 : _tprintf(_T("STOP_PENDING\n")); break; - case 4 : _tprintf(_T("RUNNING\n")); break; - case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; - case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; - case 7 : _tprintf(_T("PAUSED\n")); break; - default : _tprintf(_T("\n")); break; - } - - // _tprintf(_T("\n\taccepted : 0x%x\n\n"), - // pServiceStatus[i].ServiceStatusProcess.dwControlsAccepted); - // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - - _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode, - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWin32ExitCode); - _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode, - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwServiceSpecificExitCode); - _tprintf(_T("\tCHECKPOINT : 0x%x\n"), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwCheckPoint); - _tprintf(_T("\tWAIT_HINT : 0x%x\n"), - (unsigned int)pServiceStatus[i].ServiceStatusProcess.dwWaitHint); - if (bExtended) - { - _tprintf(_T("\tPID : %lu\n"), - pServiceStatus[i].ServiceStatusProcess.dwProcessId); - _tprintf(_T("\tFLAGS : %lu\n"), - pServiceStatus[i].ServiceStatusProcess.dwServiceFlags); - } - - _tprintf(_T("\n")); - } - - _tprintf(_T("number : %lu\n"), NumServices); -} Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c (original) +++ trunk/reactos/base/applications/sc/sc.c Fri Sep 1 20:55:36 2006 @@ -42,10 +42,11 @@ static INT ScControl(LPCTSTR Server, // remote machine name LPCTSTR Command, // sc command - LPCTSTR ServiceName, // name of service LPCTSTR *ServiceArgs, // any options DWORD ArgCount) // argument counter { + LPCTSTR ServiceName = NULL; + if (Server) { _tprintf(_T("Remote service control is not yet implemented\n")); @@ -54,18 +55,21 @@ if (!lstrcmpi(Command, _T("query"))) { - Query(ServiceName, - ServiceArgs, + Query(ServiceArgs, + ArgCount, FALSE); } else if (!lstrcmpi(Command, _T("queryex"))) { - Query(ServiceName, - ServiceArgs, + Query(ServiceArgs, + ArgCount, TRUE); } else if (!lstrcmpi(Command, _T("start"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) { Start(ServiceName, @@ -77,6 +81,9 @@ } else if (!lstrcmpi(Command, _T("pause"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) { Control(SERVICE_CONTROL_PAUSE, @@ -89,6 +96,9 @@ } else if (!lstrcmpi(Command, _T("interrogate"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) { Control(SERVICE_CONTROL_INTERROGATE, @@ -101,6 +111,9 @@ } else if (!lstrcmpi(Command, _T("stop"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) { Control(SERVICE_CONTROL_STOP, @@ -113,6 +126,9 @@ } else if (!lstrcmpi(Command, _T("continue"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) { Control(SERVICE_CONTROL_CONTINUE, @@ -125,6 +141,9 @@ } else if (!lstrcmpi(Command, _T("delete"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (ServiceName) Delete(ServiceName); else @@ -132,6 +151,9 @@ } else if (!lstrcmpi(Command, _T("create"))) { + ServiceName = *ServiceArgs++; + ArgCount--; + if (*ServiceArgs) Create(ServiceName, ServiceArgs); @@ -141,6 +163,9 @@ else if (!lstrcmpi(Command, _T("control"))) { INT CtlValue; + + ServiceName = *ServiceArgs++; + ArgCount--; CtlValue = _ttoi(ServiceArgs[0]); ServiceArgs++; @@ -170,9 +195,9 @@ int _tmain(int argc, LPCTSTR argv[]) { - LPCTSTR Server = NULL; // remote machine - LPCTSTR Command = NULL; // sc command - LPCTSTR ServiceName = NULL; // name of service + LPCTSTR Server = NULL; // remote machine + LPCTSTR Command = NULL; // sc command + LPCTSTR *Args = NULL; // Any remaining args if (argc < 2) { @@ -192,25 +217,23 @@ Server = argv[1]; Command = argv[2]; if (argc > 3) - ServiceName = argv[3]; + Args = &argv[3]; return ScControl(Server, Command, - ServiceName, - &argv[4], - argc-4); + Args, + argc-3); } else { Command = argv[1]; if (argc > 2) - ServiceName = argv[2]; + Args = &argv[2]; return ScControl(Server, Command, - ServiceName, - &argv[3], - argc-3); + Args, + argc-2); } } Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h (original) +++ trunk/reactos/base/applications/sc/sc.h Fri Sep 1 20:55:36 2006 @@ -3,19 +3,19 @@ #include <stdio.h> #include <tchar.h> -//#define SCDBG - -VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS pStatus); -VOID PrintServiceEx(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus); +#define SCDBG /* control functions */ -BOOL Query(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, BOOL bExtended); BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount); BOOL Create(LPCTSTR ServiceName, LPCTSTR *ServiceArgs); BOOL Delete(LPCTSTR ServiceName); BOOL Control(DWORD Control, LPCTSTR ServiceName, LPCTSTR *Args, INT ArgCount); +BOOL Query(LPCTSTR *ServiceArgs, DWORD ArgCount, BOOL bExtended); + +LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); /* print and error functions */ +VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); VOID ReportLastError(VOID); /* usage functions */ Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… ============================================================================== --- trunk/reactos/base/applications/sc/start.c (original) +++ trunk/reactos/base/applications/sc/start.c Fri Sep 1 20:55:36 2006 @@ -11,15 +11,11 @@ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount) { - SC_HANDLE hSCManager = NULL; - SC_HANDLE hSc = NULL; + SC_HANDLE hSCManager; + SC_HANDLE hSc; LPSERVICE_STATUS_PROCESS pServiceInfo = NULL; - DWORD BufSiz = 0; - DWORD BytesNeeded = 0; - DWORD Ret; #ifdef SCDBG -{ LPCTSTR *TmpArgs = ServiceArgs; INT TmpCnt = ArgCount; _tprintf(_T("service to control - %s\n"), ServiceName); @@ -31,24 +27,23 @@ TmpCnt--; } _tprintf(_T("\n")); -} #endif /* SCDBG */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (hSCManager == NULL) - goto fail; + { + ReportLastError(); + return FALSE; + } hSc = OpenService(hSCManager, ServiceName, SERVICE_START | SERVICE_QUERY_STATUS); if (hSc == NULL) - { - _tprintf(_T("openService failed\n")); goto fail; - } if (! StartService(hSc, ArgCount, @@ -58,32 +53,13 @@ goto fail; } - Ret = QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - NULL, - BufSiz, - &BytesNeeded); - if ((Ret != 0) || (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) //FIXME: check this - goto fail; - - - pServiceInfo = (LPSERVICE_STATUS_PROCESS)HeapAlloc(GetProcessHeap(), - 0, - BytesNeeded); - if (pServiceInfo == NULL) - goto fail; - - if (!QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)pServiceInfo, - BytesNeeded, - &BytesNeeded)) + pServiceInfo = QueryService(ServiceName); + if (pServiceInfo != NULL) { - goto fail; + PrintService(ServiceName, + pServiceInfo, + TRUE); } - - PrintServiceEx(ServiceName, - pServiceInfo); HeapFree(GetProcessHeap(), 0, pServiceInfo); CloseServiceHandle(hSc); Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c (original) +++ trunk/reactos/base/applications/sc/usage.c Fri Sep 1 20:55:36 2006 @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS SC utility - * FILE: subsys/system/sc/usage.c - * PURPOSE: control ReactOS services - * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * Ged Murphy 20/10/05 Created + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/sc/usage.c + * PURPOSE: display usage info + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ #include "sc.h" @@ -26,7 +24,7 @@ _T("\t query : Queries the status for a service, or\n") _T("\t enumerates the status for types of services.\n") _T("\t queryex : Queries the extended status for a service, or\n") -// _T("\t enumerates the status for types of services.\n" + _T("\t enumerates the status for types of services.\n") _T("\t start : Starts a service.\n") _T("\t pause : Sends a PAUSE control request to a service.\n") _T("\t interrogate : Sends a INTERROGATE control request to a service.\n") @@ -63,7 +61,7 @@ _T(" for that service is returned. Further options do not apply in\n") _T(" this case. If the query command is followed by nothing or one of\n") _T(" the options listed below, the services are enumerated.\n") - _T(" type= Type of services to enumerate (driver, service, all)\n") + _T(" type= Type of services to enumerate (driver, service, interact, all)\n") _T(" (default = service)\n") _T(" state= State of services to enumerate (inactive, all)\n") _T(" (default = active)\n") @@ -85,8 +83,8 @@ // _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") // _T("sc query ri= 14 - Enumerates with resume index = 14\n") // _T("sc queryex group= "" - Enumerates active services not in a group\n") - _T("sc query type= service type= interact - Enumerates all interactive services\n")); -// _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); + _T("sc query type= service type= interact - Enumerates all interactive services\n") + _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); } }

1 0

[ekohl] 23867: Fix indentation, no code changes.
by ekohl＠svn.reactos.org 01 Sep '06

01 Sep '06

Author: ekohl Date: Fri Sep 1 19:49:50 2006 New Revision: 23867 URL: http://svn.reactos.org/svn/reactos?rev=23867&view=rev Log: Fix indentation, no code changes. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Fri Sep 1 19:49:50 2006 @@ -22,19 +22,19 @@ typedef struct _ACTIVE_SERVICE { - DWORD ThreadId; - UNICODE_STRING ServiceName; - union - { - LPSERVICE_MAIN_FUNCTIONA lpFuncA; - LPSERVICE_MAIN_FUNCTIONW lpFuncW; - } Main; - LPHANDLER_FUNCTION HandlerFunction; - LPHANDLER_FUNCTION_EX HandlerFunctionEx; - LPVOID HandlerContext; - SERVICE_STATUS ServiceStatus; - BOOL bUnicode; - LPWSTR Arguments; + DWORD ThreadId; + UNICODE_STRING ServiceName; + union + { + LPSERVICE_MAIN_FUNCTIONA lpFuncA; + LPSERVICE_MAIN_FUNCTIONW lpFuncW; + } Main; + LPHANDLER_FUNCTION HandlerFunction; + LPHANDLER_FUNCTION_EX HandlerFunctionEx; + LPVOID HandlerContext; + SERVICE_STATUS ServiceStatus; + BOOL bUnicode; + LPWSTR Arguments; } ACTIVE_SERVICE, *PACTIVE_SERVICE; @@ -49,195 +49,195 @@ static PACTIVE_SERVICE ScLookupServiceByServiceName(LPWSTR lpServiceName) { - DWORD i; - - for (i = 0; i < dwActiveServiceCount; i++) - { - if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) - { - return &lpActiveServices[i]; - } - } - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; + DWORD i; + + for (i = 0; i < dwActiveServiceCount; i++) + { + if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) + { + return &lpActiveServices[i]; + } + } + + SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + + return NULL; } static PACTIVE_SERVICE ScLookupServiceByThreadId(DWORD ThreadId) { - DWORD i; - - for (i = 0; i < dwActiveServiceCount; i++) - { - if (lpActiveServices[i].ThreadId == ThreadId) - { - return &lpActiveServices[i]; - } - } - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; + DWORD i; + + for (i = 0; i < dwActiveServiceCount; i++) + { + if (lpActiveServices[i].ThreadId == ThreadId) + { + return &lpActiveServices[i]; + } + } + + SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + + return NULL; } static DWORD WINAPI ScServiceMainStub(LPVOID Context) { - PACTIVE_SERVICE lpService; - DWORD dwArgCount = 0; - DWORD dwLength = 0; - DWORD dwLen; - LPWSTR lpPtr; - - lpService = (PACTIVE_SERVICE)Context; - - DPRINT("ScServiceMainStub() called\n"); - - /* Count arguments */ - lpPtr = lpService->Arguments; - while (*lpPtr) - { - DPRINT("arg: %S\n", *lpPtr); - dwLen = wcslen(lpPtr) + 1; - dwArgCount++; - dwLength += dwLen; - lpPtr += dwLen; - } - DPRINT("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); - - /* Build the argument vector and call the main service routine */ - if (lpService->bUnicode) - { - LPWSTR *lpArgVector; - LPWSTR Ptr; - - lpArgVector = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (dwArgCount + 1) * sizeof(LPWSTR)); - if (lpArgVector == NULL) - return ERROR_OUTOFMEMORY; - - dwArgCount = 0; - Ptr = lpService->Arguments; - while (*Ptr) - { - lpArgVector[dwArgCount] = Ptr; - - dwArgCount++; - Ptr += (wcslen(Ptr) + 1); - } - lpArgVector[dwArgCount] = NULL; - - (lpService->Main.lpFuncW)(dwArgCount, lpArgVector); - - HeapFree(GetProcessHeap(), - 0, - lpArgVector); - } - else - { - LPSTR *lpArgVector; - LPSTR Ptr; - LPSTR AnsiString; - DWORD AnsiLength; - - AnsiLength = WideCharToMultiByte(CP_ACP, - 0, - lpService->Arguments, - dwLength, - NULL, - 0, - NULL, - NULL); - AnsiString = HeapAlloc(GetProcessHeap(), - 0, - AnsiLength); - WideCharToMultiByte(CP_ACP, - 0, - lpService->Arguments, - dwLength, - AnsiString, - AnsiLength, - NULL, - NULL); - - lpArgVector = HeapAlloc(GetProcessHeap(), - 0, - (dwArgCount + 1) * sizeof(LPSTR)); - - dwArgCount = 0; - Ptr = AnsiString; - while (*Ptr) - { - lpArgVector[dwArgCount] = Ptr; - - dwArgCount++; - Ptr += (strlen(Ptr) + 1); - } - lpArgVector[dwArgCount] = NULL; - - (lpService->Main.lpFuncA)(dwArgCount, lpArgVector); - - HeapFree(GetProcessHeap(), - 0, - lpArgVector); - HeapFree(GetProcessHeap(), - 0, - AnsiString); - } - - return ERROR_SUCCESS; + PACTIVE_SERVICE lpService; + DWORD dwArgCount = 0; + DWORD dwLength = 0; + DWORD dwLen; + LPWSTR lpPtr; + + lpService = (PACTIVE_SERVICE)Context; + + DPRINT("ScServiceMainStub() called\n"); + + /* Count arguments */ + lpPtr = lpService->Arguments; + while (*lpPtr) + { + DPRINT("arg: %S\n", *lpPtr); + dwLen = wcslen(lpPtr) + 1; + dwArgCount++; + dwLength += dwLen; + lpPtr += dwLen; + } + DPRINT("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); + + /* Build the argument vector and call the main service routine */ + if (lpService->bUnicode) + { + LPWSTR *lpArgVector; + LPWSTR Ptr; + + lpArgVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (dwArgCount + 1) * sizeof(LPWSTR)); + if (lpArgVector == NULL) + return ERROR_OUTOFMEMORY; + + dwArgCount = 0; + Ptr = lpService->Arguments; + while (*Ptr) + { + lpArgVector[dwArgCount] = Ptr; + + dwArgCount++; + Ptr += (wcslen(Ptr) + 1); + } + lpArgVector[dwArgCount] = NULL; + + (lpService->Main.lpFuncW)(dwArgCount, lpArgVector); + + HeapFree(GetProcessHeap(), + 0, + lpArgVector); + } + else + { + LPSTR *lpArgVector; + LPSTR Ptr; + LPSTR AnsiString; + DWORD AnsiLength; + + AnsiLength = WideCharToMultiByte(CP_ACP, + 0, + lpService->Arguments, + dwLength, + NULL, + 0, + NULL, + NULL); + AnsiString = HeapAlloc(GetProcessHeap(), + 0, + AnsiLength); + WideCharToMultiByte(CP_ACP, + 0, + lpService->Arguments, + dwLength, + AnsiString, + AnsiLength, + NULL, + NULL); + + lpArgVector = HeapAlloc(GetProcessHeap(), + 0, + (dwArgCount + 1) * sizeof(LPSTR)); + + dwArgCount = 0; + Ptr = AnsiString; + while (*Ptr) + { + lpArgVector[dwArgCount] = Ptr; + + dwArgCount++; + Ptr += (strlen(Ptr) + 1); + } + lpArgVector[dwArgCount] = NULL; + + (lpService->Main.lpFuncA)(dwArgCount, lpArgVector); + + HeapFree(GetProcessHeap(), + 0, + lpArgVector); + HeapFree(GetProcessHeap(), + 0, + AnsiString); + } + + return ERROR_SUCCESS; } static DWORD ScConnectControlPipe(HANDLE *hPipe) { - DWORD dwBytesWritten; - DWORD dwProcessId; - DWORD dwState; - - if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) - { - DPRINT1("WaitNamedPipe() failed (Error %lu)\n", GetLastError()); - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - *hPipe = CreateFileW(L"\\\\.\\pipe\\net\\NtControlPipe", - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (*hPipe == INVALID_HANDLE_VALUE) - { - DPRINT1("CreateFileW() failed (Error %lu)\n", GetLastError()); - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - dwState = PIPE_READMODE_MESSAGE; - if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) - { - CloseHandle(hPipe); - *hPipe = INVALID_HANDLE_VALUE; - return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; - } - - dwProcessId = GetCurrentProcessId(); - WriteFile(*hPipe, - &dwProcessId, - sizeof(DWORD), - &dwBytesWritten, - NULL); - - DPRINT("Sent process id %lu\n", dwProcessId); - - return ERROR_SUCCESS; + DWORD dwBytesWritten; + DWORD dwProcessId; + DWORD dwState; + + if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) + { + DPRINT1("WaitNamedPipe() failed (Error %lu)\n", GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + *hPipe = CreateFileW(L"\\\\.\\pipe\\net\\NtControlPipe", + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (*hPipe == INVALID_HANDLE_VALUE) + { + DPRINT1("CreateFileW() failed (Error %lu)\n", GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + dwState = PIPE_READMODE_MESSAGE; + if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) + { + CloseHandle(hPipe); + *hPipe = INVALID_HANDLE_VALUE; + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } + + dwProcessId = GetCurrentProcessId(); + WriteFile(*hPipe, + &dwProcessId, + sizeof(DWORD), + &dwBytesWritten, + NULL); + + DPRINT("Sent process id %lu\n", dwProcessId); + + return ERROR_SUCCESS; } @@ -245,93 +245,93 @@ static DWORD ScStartService(PSCM_START_PACKET StartPacket) { - PACTIVE_SERVICE lpService; - HANDLE ThreadHandle; - - DPRINT("ScStartService() called\n"); - DPRINT("Size: %lu\n", StartPacket->Size); - DPRINT("Service: %S\n", &StartPacket->Arguments[0]); - - lpService = ScLookupServiceByServiceName(&StartPacket->Arguments[0]); - if (lpService == NULL) - return ERROR_SERVICE_DOES_NOT_EXIST; - - lpService->Arguments = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - StartPacket->Size * sizeof(WCHAR)); - if (lpService->Arguments == NULL) - return ERROR_OUTOFMEMORY; - - memcpy(lpService->Arguments, - StartPacket->Arguments, - StartPacket->Size * sizeof(WCHAR)); - - ThreadHandle = CreateThread(NULL, - 0, - ScServiceMainStub, - lpService, - CREATE_SUSPENDED, - &lpService->ThreadId); - if (ThreadHandle == NULL) - return ERROR_SERVICE_NO_THREAD; - - ResumeThread(ThreadHandle); - CloseHandle(ThreadHandle); - - return ERROR_SUCCESS; + PACTIVE_SERVICE lpService; + HANDLE ThreadHandle; + + DPRINT("ScStartService() called\n"); + DPRINT("Size: %lu\n", StartPacket->Size); + DPRINT("Service: %S\n", &StartPacket->Arguments[0]); + + lpService = ScLookupServiceByServiceName(&StartPacket->Arguments[0]); + if (lpService == NULL) + return ERROR_SERVICE_DOES_NOT_EXIST; + + lpService->Arguments = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + StartPacket->Size * sizeof(WCHAR)); + if (lpService->Arguments == NULL) + return ERROR_OUTOFMEMORY; + + memcpy(lpService->Arguments, + StartPacket->Arguments, + StartPacket->Size * sizeof(WCHAR)); + + ThreadHandle = CreateThread(NULL, + 0, + ScServiceMainStub, + lpService, + CREATE_SUSPENDED, + &lpService->ThreadId); + if (ThreadHandle == NULL) + return ERROR_SERVICE_NO_THREAD; + + ResumeThread(ThreadHandle); + CloseHandle(ThreadHandle); + + return ERROR_SUCCESS; } static BOOL ScServiceDispatcher(HANDLE hPipe, - PUCHAR lpBuffer, - DWORD dwBufferSize) -{ - LPDWORD Buffer; - DWORD Count; - BOOL bResult; - - DPRINT("ScDispatcherLoop() called\n"); - - Buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - 1024); - if (Buffer == NULL) - return FALSE; - - while (TRUE) - { - /* Read command from the control pipe */ - bResult = ReadFile(hPipe, - Buffer, - 1024, - &Count, - NULL); - if (bResult == FALSE) + PUCHAR lpBuffer, + DWORD dwBufferSize) +{ + LPDWORD Buffer; + DWORD Count; + BOOL bResult; + + DPRINT("ScDispatcherLoop() called\n"); + + Buffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + 1024); + if (Buffer == NULL) + return FALSE; + + while (TRUE) + { + /* Read command from the control pipe */ + bResult = ReadFile(hPipe, + Buffer, + 1024, + &Count, + NULL); + if (bResult == FALSE) { - DPRINT1("Pipe read failed (Error: %lu)\n", GetLastError()); - return FALSE; + DPRINT1("Pipe read failed (Error: %lu)\n", GetLastError()); + return FALSE; } - /* Execute command */ - switch (Buffer[0]) + /* Execute command */ + switch (Buffer[0]) { - case SCM_START_COMMAND: - DPRINT("Start command\n"); - ScStartService((PSCM_START_PACKET)Buffer); - break; - - default: - DPRINT1("Unknown command %lu", Buffer[0]); - break; + case SCM_START_COMMAND: + DPRINT("Start command\n"); + ScStartService((PSCM_START_PACKET)Buffer); + break; + + default: + DPRINT1("Unknown command %lu", Buffer[0]); + break; } } - HeapFree(GetProcessHeap(), - 0, - Buffer); - - return TRUE; + HeapFree(GetProcessHeap(), + 0, + Buffer); + + return TRUE; } @@ -342,25 +342,25 @@ */ SERVICE_STATUS_HANDLE STDCALL RegisterServiceCtrlHandlerA(LPCSTR lpServiceName, - LPHANDLER_FUNCTION lpHandlerProc) -{ - ANSI_STRING ServiceNameA; - UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; - - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); - if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) - { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; - } - - SHandle = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, - lpHandlerProc); - - RtlFreeUnicodeString(&ServiceNameU); - - return SHandle; + LPHANDLER_FUNCTION lpHandlerProc) +{ + ANSI_STRING ServiceNameA; + UNICODE_STRING ServiceNameU; + SERVICE_STATUS_HANDLE SHandle; + + RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) + { + SetLastError(ERROR_OUTOFMEMORY); + return (SERVICE_STATUS_HANDLE)0; + } + + SHandle = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, + lpHandlerProc); + + RtlFreeUnicodeString(&ServiceNameU); + + return SHandle; } @@ -371,20 +371,20 @@ */ SERVICE_STATUS_HANDLE STDCALL RegisterServiceCtrlHandlerW(LPCWSTR lpServiceName, - LPHANDLER_FUNCTION lpHandlerProc) -{ - PACTIVE_SERVICE Service; - - Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); - if (Service == NULL) - { - return (SERVICE_STATUS_HANDLE)NULL; - } - - Service->HandlerFunction = lpHandlerProc; - Service->HandlerFunctionEx = NULL; - - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + LPHANDLER_FUNCTION lpHandlerProc) +{ + PACTIVE_SERVICE Service; + + Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); + if (Service == NULL) + { + return (SERVICE_STATUS_HANDLE)NULL; + } + + Service->HandlerFunction = lpHandlerProc; + Service->HandlerFunctionEx = NULL; + + return (SERVICE_STATUS_HANDLE)Service->ThreadId; } @@ -395,27 +395,27 @@ */ SERVICE_STATUS_HANDLE STDCALL RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, - LPHANDLER_FUNCTION_EX lpHandlerProc, - LPVOID lpContext) -{ - ANSI_STRING ServiceNameA; - UNICODE_STRING ServiceNameU; - SERVICE_STATUS_HANDLE SHandle; - - RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); - if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) - { - SetLastError(ERROR_OUTOFMEMORY); - return (SERVICE_STATUS_HANDLE)0; - } - - SHandle = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, - lpHandlerProc, - lpContext); - - RtlFreeUnicodeString(&ServiceNameU); - - return SHandle; + LPHANDLER_FUNCTION_EX lpHandlerProc, + LPVOID lpContext) +{ + ANSI_STRING ServiceNameA; + UNICODE_STRING ServiceNameU; + SERVICE_STATUS_HANDLE SHandle; + + RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) + { + SetLastError(ERROR_OUTOFMEMORY); + return (SERVICE_STATUS_HANDLE)0; + } + + SHandle = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, + lpHandlerProc, + lpContext); + + RtlFreeUnicodeString(&ServiceNameU); + + return SHandle; } @@ -426,22 +426,22 @@ */ SERVICE_STATUS_HANDLE STDCALL RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, - LPHANDLER_FUNCTION_EX lpHandlerProc, - LPVOID lpContext) -{ - PACTIVE_SERVICE Service; - - Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); - if (Service == NULL) - { - return (SERVICE_STATUS_HANDLE)NULL; - } - - Service->HandlerFunction = NULL; - Service->HandlerFunctionEx = lpHandlerProc; - Service->HandlerContext = lpContext; - - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + LPHANDLER_FUNCTION_EX lpHandlerProc, + LPVOID lpContext) +{ + PACTIVE_SERVICE Service; + + Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); + if (Service == NULL) + { + return (SERVICE_STATUS_HANDLE)NULL; + } + + Service->HandlerFunction = NULL; + Service->HandlerFunctionEx = lpHandlerProc; + Service->HandlerContext = lpContext; + + return (SERVICE_STATUS_HANDLE)Service->ThreadId; } @@ -452,12 +452,12 @@ */ BOOL STDCALL SetServiceBits(SERVICE_STATUS_HANDLE hServiceStatus, - DWORD dwServiceBits, - BOOL bSetBitsOn, - BOOL bUpdateImmediately) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwServiceBits, + BOOL bSetBitsOn, + BOOL bUpdateImmediately) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } @@ -468,22 +468,22 @@ */ BOOL STDCALL SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) -{ - PACTIVE_SERVICE Service; - - Service = ScLookupServiceByThreadId((DWORD)hServiceStatus); - if (!Service) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - RtlCopyMemory(&Service->ServiceStatus, - lpServiceStatus, - sizeof(SERVICE_STATUS)); - - return TRUE; + LPSERVICE_STATUS lpServiceStatus) +{ + PACTIVE_SERVICE Service; + + Service = ScLookupServiceByThreadId((DWORD)hServiceStatus); + if (!Service) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + RtlCopyMemory(&Service->ServiceStatus, + lpServiceStatus, + sizeof(SERVICE_STATUS)); + + return TRUE; } @@ -495,72 +495,72 @@ BOOL STDCALL StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable) { - ULONG i; - HANDLE hPipe; - DWORD dwError; - PUCHAR lpMessageBuffer; - - DPRINT("StartServiceCtrlDispatcherA() called\n"); - - i = 0; - while (lpServiceStartTable[i].lpServiceProc != NULL) - { - i++; - } - - dwActiveServiceCount = i; - lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); - if (lpActiveServices == NULL) - { - return FALSE; - } - - /* Copy service names and start procedure */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, - lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].bUnicode = FALSE; - } - - dwError = ScConnectControlPipe(&hPipe); - if (dwError != ERROR_SUCCESS) - { - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - return FALSE; - } - - lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - 256); - if (lpMessageBuffer == NULL) - { - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - CloseHandle(hPipe); - return FALSE; - } - - ScServiceDispatcher(hPipe, lpMessageBuffer, 256); - CloseHandle(hPipe); - - /* Free the message buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); - - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - - return TRUE; + ULONG i; + HANDLE hPipe; + DWORD dwError; + PUCHAR lpMessageBuffer; + + DPRINT("StartServiceCtrlDispatcherA() called\n"); + + i = 0; + while (lpServiceStartTable[i].lpServiceProc != NULL) + { + i++; + } + + dwActiveServiceCount = i; + lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); + if (lpActiveServices == NULL) + { + return FALSE; + } + + /* Copy service names and start procedure */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, + lpServiceStartTable[i].lpServiceName); + lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].bUnicode = FALSE; + } + + dwError = ScConnectControlPipe(&hPipe); + if (dwError != ERROR_SUCCESS) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + return FALSE; + } + + lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + 256); + if (lpMessageBuffer == NULL) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + CloseHandle(hPipe); + return FALSE; + } + + ScServiceDispatcher(hPipe, lpMessageBuffer, 256); + CloseHandle(hPipe); + + /* Free the message buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); + + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + + return TRUE; } @@ -572,72 +572,72 @@ BOOL STDCALL StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW lpServiceStartTable) { - ULONG i; - HANDLE hPipe; - DWORD dwError; - PUCHAR lpMessageBuffer; - - DPRINT("StartServiceCtrlDispatcherW() called\n"); - - i = 0; - while (lpServiceStartTable[i].lpServiceProc != NULL) - { - i++; - } - - dwActiveServiceCount = i; - lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); - if (lpActiveServices == NULL) - { - return FALSE; - } - - /* Copy service names and start procedure */ - for (i = 0; i < dwActiveServiceCount; i++) - { - RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, - lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; - lpActiveServices[i].bUnicode = TRUE; - } - - dwError = ScConnectControlPipe(&hPipe); - if (dwError != ERROR_SUCCESS) - { - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - return FALSE; - } - - lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - 256); - if (lpMessageBuffer == NULL) - { - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - CloseHandle(hPipe); - return FALSE; - } - - ScServiceDispatcher(hPipe, lpMessageBuffer, 256); - CloseHandle(hPipe); - - /* Free the message buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); - - /* Free the service table */ - RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); - lpActiveServices = NULL; - dwActiveServiceCount = 0; - - return TRUE; + ULONG i; + HANDLE hPipe; + DWORD dwError; + PUCHAR lpMessageBuffer; + + DPRINT("StartServiceCtrlDispatcherW() called\n"); + + i = 0; + while (lpServiceStartTable[i].lpServiceProc != NULL) + { + i++; + } + + dwActiveServiceCount = i; + lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); + if (lpActiveServices == NULL) + { + return FALSE; + } + + /* Copy service names and start procedure */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, + lpServiceStartTable[i].lpServiceName); + lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].bUnicode = TRUE; + } + + dwError = ScConnectControlPipe(&hPipe); + if (dwError != ERROR_SUCCESS) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + return FALSE; + } + + lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + 256); + if (lpMessageBuffer == NULL) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + CloseHandle(hPipe); + return FALSE; + } + + ScServiceDispatcher(hPipe, lpMessageBuffer, 256); + CloseHandle(hPipe); + + /* Free the message buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); + + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + + return TRUE; } /* EOF */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006