Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 45663: Split the initial status code for drivers and services. You can easily test services by uncommenting '#define USE_SERVICE_STATUS_PENDING'.
by ekohl＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: ekohl Date: Tue Feb 23 00:17:03 2010 New Revision: 45663 URL: http://svn.reactos.org/svn/reactos?rev=45663&view=rev Log: Split the initial status code for drivers and services. You can easily test services by uncommenting '#define USE_SERVICE_STATUS_PENDING'. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Feb 23 00:17:03 2010 @@ -17,6 +17,11 @@ #define NDEBUG #include <debug.h> +/* + * Uncomment the line below to start services + * using the SERVICE_START_PENDING state + */ +// #define USE_SERVICE_START_PENDING /* GLOBALS *******************************************************************/ @@ -1038,12 +1043,23 @@ /* Load driver */ dwError = ScmLoadDriver(Service); if (dwError == ERROR_SUCCESS) + { Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + Service->Status.dwCurrentState = SERVICE_RUNNING; + } } else { /* Start user-mode service */ dwError = ScmStartUserModeService(Service, argc, argv); + if (dwError == ERROR_SUCCESS) + { +#ifdef USE_SERVICE_START_PENDING + Service->Status.dwCurrentState = SERVICE_START_PENDING; +#else + Service->Status.dwCurrentState = SERVICE_RUNNING; +#endif + } } DPRINT("ScmStartService() done (Error %lu)\n", dwError); @@ -1054,7 +1070,6 @@ { Group->ServicesRunning = TRUE; } - Service->Status.dwCurrentState = SERVICE_RUNNING; } #if 0 else

1 0

[cfinck] 45662: Put Vizzini's "csq.h" in the Public Domain with permission from the author: <sedwards> I talked to vizini <sedwards> it's public domain <sedwards> do what you will <sedwards> slap your name on it <sedwards> and submit it <Colin_Finck> I can just do a commit to put it under PD now and everything will be alright? <sedwards> yes, the author who wishes to remain anonymous is quite fine with that
by cfinck＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: cfinck Date: Mon Feb 22 23:00:00 2010 New Revision: 45662 URL: http://svn.reactos.org/svn/reactos?rev=45662&view=rev Log: Put Vizzini's "csq.h" in the Public Domain with permission from the author: <sedwards> I talked to vizini <sedwards> it's public domain <sedwards> do what you will <sedwards> slap your name on it <sedwards> and submit it <Colin_Finck> I can just do a commit to put it under PD now and everything will be alright? <sedwards> yes, the author who wishes to remain anonymous is quite fine with that Modified: trunk/reactos/include/ddk/csq.h Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=4566… ============================================================================== --- trunk/reactos/include/ddk/csq.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/csq.h [iso-8859-1] Mon Feb 22 23:00:00 2010 @@ -1,7 +1,17 @@ /* * Cancel-Safe Queue Library - * Copyright (c) 2004, Vizzini (vizzini(a)plasmic.com) - * Licensed under the GNU GPL for the ReactOS project + * Created in 2004 by Vizzini (vizzini(a)plasmic.com) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * * * This header defines the interface to the ReactOS Cancel-Safe Queue library. * This interface is based on and is similar to the Microsoft Cancel-Safe

1 0

[dgorbachev] 45661: Clean up RPCSS.
by dgorbachev＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: dgorbachev Date: Mon Feb 22 22:36:07 2010 New Revision: 45661 URL: http://svn.reactos.org/svn/reactos?rev=45661&view=rev Log: Clean up RPCSS. Modified: trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/base/services/rpcss/rpcss_ros.diff trunk/reactos/base/services/rpcss/service_main.c Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Mon Feb 22 22:36:07 2010 @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static HANDLE exit_event; +HANDLE exit_event; //extern HANDLE __wine_make_process_system(void); Modified: trunk/reactos/base/services/rpcss/rpcss_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] Mon Feb 22 22:36:07 2010 @@ -1,8 +1,13 @@ Index: rpcss_main.c =================================================================== ---- rpcss_main.c (revision 37240) -+++ rpcss_main.c (working copy) -@@ -62,7 +62,7 @@ +--- rpcss_main.c ++++ rpcss_main.c +@@ -58,11 +58,11 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +-static HANDLE exit_event; ++HANDLE exit_event; //extern HANDLE __wine_make_process_system(void); Modified: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Mon Feb 22 22:36:07 2010 @@ -9,120 +9,90 @@ #include "rpcss.h" -BOOL RPCSS_Initialize(void); -BOOL RPCSS_Shutdown(void); +#define NDEBUG +#include <debug.h> +extern BOOL RPCSS_Initialize(void); +extern BOOL RPCSS_Shutdown(void); +extern HANDLE exit_event; + +static VOID WINAPI ServiceMain(DWORD, LPWSTR *); static WCHAR ServiceName[] = L"RpcSs"; +SERVICE_TABLE_ENTRYW ServiceTable[] = +{ + { ServiceName, ServiceMain }, + { NULL, NULL } +}; -typedef struct _ServiceInfo +static SERVICE_STATUS ServiceStatus; +static SERVICE_STATUS_HANDLE ServiceStatusHandle; + +DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) { - SERVICE_STATUS servStatus; - SERVICE_STATUS_HANDLE hStatus; -} SERVICEINFO, *PSERVICEINFO; - - -static VOID -UpdateStatus(PSERVICEINFO pServInfo, - DWORD NewStatus, - DWORD Check) -{ - if (Check > 0) - { - pServInfo->servStatus.dwCheckPoint += Check; - } - else - { - pServInfo->servStatus.dwCheckPoint = Check; - } - - if (NewStatus > 0) - { - pServInfo->servStatus.dwCurrentState = NewStatus; - } - - SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); -} - - -static BOOL -RunService(PSERVICEINFO pServInfo) -{ - return RPCSS_Initialize(); -} - -VOID WINAPI -ServerCtrlHandler(DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext) -{ - PSERVICEINFO pServInfo = (PSERVICEINFO)lpContext; - switch (dwControl) { case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: - RPCSS_Shutdown(); - pServInfo->servStatus.dwWin32ExitCode = 0; - pServInfo->servStatus.dwWaitHint = 0; - UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); - break; + SetEvent(exit_event); + return NO_ERROR; + + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; default: - break; + return ERROR_CALL_NOT_IMPLEMENTED; } } VOID WINAPI ServiceMain(DWORD argc, LPWSTR argv[]) { - SERVICEINFO servInfo; - HANDLE hThread; - DWORD dwThreadId; + DWORD dwError; - servInfo.servStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - servInfo.servStatus.dwCurrentState = SERVICE_STOPPED; - servInfo.servStatus.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN; - servInfo.servStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; - servInfo.servStatus.dwServiceSpecificExitCode = 0; - servInfo.servStatus.dwCheckPoint = 0; - servInfo.servStatus.dwWaitHint = 1000; + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + dwError = GetLastError(); + DPRINT1("RegisterServiceCtrlHandlerW() failed! (Error %lu)\n", dwError); + return; + } - servInfo.hStatus = RegisterServiceCtrlHandlerExW(ServiceName, - (LPHANDLER_FUNCTION_EX)ServerCtrlHandler, - &servInfo); - if (!servInfo.hStatus) return; + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = SERVICE_START_PENDING; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = NO_ERROR; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + ServiceStatus.dwWaitHint = 1000; + SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); + if (RPCSS_Initialize()) + { + ServiceStatus.dwCurrentState = SERVICE_RUNNING; + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - /* Create worker thread */ - hThread = CreateThread(NULL, - 0, - (LPTHREAD_START_ROUTINE)RunService, - &servInfo, - 0, - &dwThreadId); - if (!hThread) return; + WaitForSingleObject(exit_event, INFINITE); - /* Set service status to running */ - UpdateStatus(&servInfo, SERVICE_RUNNING, 0); - - /* Wait until thread has terminated */ - WaitForSingleObject(hThread, INFINITE); - - CloseHandle(hThread); - - UpdateStatus(&servInfo, SERVICE_STOPPED, 0); + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + SetServiceStatus(ServiceStatusHandle, &ServiceStatus); + RPCSS_Shutdown(); + } } +int wmain(int argc, LPWSTR argv[]) +{ + if (!StartServiceCtrlDispatcherW(ServiceTable)) + { + DPRINT1("StartServiceCtrlDispatcherW() failed\n"); + return 1; + } -int wmain(int argc, LPWSTR argv []) -{ - SERVICE_TABLE_ENTRYW ServiceTable[] = - { - {ServiceName, ServiceMain}, - {NULL, NULL } - }; - - return (int)(StartServiceCtrlDispatcherW(ServiceTable) != TRUE); + return 0; }

1 0

[cwittich] 45660: fix build
by cwittich＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: cwittich Date: Mon Feb 22 20:49:58 2010 New Revision: 45660 URL: http://svn.reactos.org/svn/reactos?rev=45660&view=rev Log: fix build Modified: trunk/reactos/include/psdk/bdaiface.idl Modified: trunk/reactos/include/psdk/bdaiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bdaiface.idl?… ============================================================================== --- trunk/reactos/include/psdk/bdaiface.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bdaiface.idl [iso-8859-1] Mon Feb 22 20:49:58 2010 @@ -1,7 +1,7 @@ #ifndef DO_NO_IMPORTS import "unknwn.idl"; import "strmif.idl"; -import "BdaTypes.h"; +import "bdatypes.h"; #endif /************************************************************

1 0

[tkreuzer] 45659: [GDI32] - Quickfix the region leak, by commenting out the user mode part in DeleteRegion. Thanks to Caemyr for finding the guilty revision.
by tkreuzer＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: tkreuzer Date: Mon Feb 22 20:27:35 2010 New Revision: 45659 URL: http://svn.reactos.org/svn/reactos?rev=45659&view=rev Log: [GDI32] - Quickfix the region leak, by commenting out the user mode part in DeleteRegion. Thanks to Caemyr for finding the guilty revision. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Mon Feb 22 20:27:35 2010 @@ -104,6 +104,7 @@ FASTCALL DeleteRegion( HRGN hRgn ) { +#if 0 PRGN_ATTR Rgn_Attr; if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && @@ -127,6 +128,7 @@ } } } +#endif return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); }

1 0

[ekohl] 45658: Revert remaining parts of patches 45626 and 45633.
by ekohl＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: ekohl Date: Mon Feb 22 20:26:54 2010 New Revision: 45658 URL: http://svn.reactos.org/svn/reactos?rev=45658&view=rev Log: Revert remaining parts of patches 45626 and 45633. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Feb 22 20:26:54 2010 @@ -51,11 +51,12 @@ /* GLOBALS ******************************************************************/ -static VOID CALLBACK ServiceMain(DWORD, LPWSTR *); -static WCHAR ServiceName[] = L"PlugPlay"; -static SERVICE_TABLE_ENTRYW ServiceTable[] = -{ - {ServiceName, ServiceMain}, +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv); + +static SERVICE_TABLE_ENTRY ServiceTable[2] = +{ + {TEXT("PlugPlay"), ServiceMain}, {NULL, NULL} }; @@ -2445,36 +2446,63 @@ } -static DWORD WINAPI -ServiceControlHandler(DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext) -{ - /* FIXME */ - DPRINT1("ServiceControlHandler() called (control code %lu)\n", dwControl); - return ERROR_SUCCESS; -} - - -static DWORD -ServiceInit(VOID) +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv) { HANDLE hThread; DWORD dwThreadId; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("ServiceMain() called\n"); + + hThread = CreateThread(NULL, + 0, + PnpEventThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + + hThread = CreateThread(NULL, + 0, + RpcServerThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + + hThread = CreateThread(NULL, + 0, + DeviceInstallThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + + DPRINT("ServiceMain() done\n"); +} + + +int +wmain(int argc, WCHAR *argv[]) +{ + BOOLEAN OldValue; DWORD dwError; - BOOLEAN OldValue; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("Umpnpmgr: main() started\n"); /* We need this privilege for using CreateProcessAsUserW */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, - TRUE, - FALSE, - &OldValue); - - hInstallEvent = CreateEvent(NULL, - TRUE, - SetupIsActive()/*FALSE*/, - NULL); + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &OldValue); + + hInstallEvent = CreateEvent(NULL, TRUE, SetupIsActive()/*FALSE*/, NULL); if (hInstallEvent == NULL) { dwError = GetLastError(); @@ -2482,10 +2510,7 @@ return dwError; } - hDeviceInstallListNotEmpty = CreateEvent(NULL, - FALSE, - FALSE, - NULL); + hDeviceInstallListNotEmpty = CreateEvent(NULL, FALSE, FALSE, NULL); if (hDeviceInstallListNotEmpty == NULL) { dwError = GetLastError(); @@ -2532,110 +2557,11 @@ return dwError; } - hThread = CreateThread(NULL, - 0, - PnpEventThread, - NULL, - 0, - &dwThreadId); - if (hThread == NULL) - { - return GetLastError(); - } - CloseHandle(hThread); - - hThread = CreateThread(NULL, - 0, - RpcServerThread, - NULL, - 0, - &dwThreadId); - if (hThread == NULL) - { - return GetLastError(); - } - CloseHandle(hThread); - - hThread = CreateThread(NULL, - 0, - DeviceInstallThread, - NULL, - 0, - &dwThreadId); - if (hThread == NULL) - { - return GetLastError(); - } - CloseHandle(hThread); - - return ERROR_SUCCESS; -} - - -static VOID CALLBACK -ServiceMain(DWORD argc, - LPWSTR *argv) -{ - SERVICE_STATUS ServiceStatus; - SERVICE_STATUS_HANDLE ServiceStatusHandle; - DWORD dwError; - - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - DPRINT("ServiceMain() called\n"); - - ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, - ServiceControlHandler, - NULL); - if (!ServiceStatusHandle) - { - dwError = GetLastError(); - DPRINT1("RegisterServiceCtrlHandlerW() failed! (Error %lu)\n", dwError); - return; - } - - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - ServiceStatus.dwCurrentState = SERVICE_START_PENDING; - ServiceStatus.dwControlsAccepted = 0; - ServiceStatus.dwWin32ExitCode = NO_ERROR; - ServiceStatus.dwServiceSpecificExitCode = 0; - ServiceStatus.dwCheckPoint = 0; - ServiceStatus.dwWaitHint = 2000; - - SetServiceStatus(ServiceStatusHandle, - &ServiceStatus); - - dwError = ServiceInit(); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("Service stopped\n"); - ServiceStatus.dwCurrentState = SERVICE_STOPPED; - } - else - { - ServiceStatus.dwCurrentState = SERVICE_RUNNING; - } - - SetServiceStatus(ServiceStatusHandle, - &ServiceStatus); - - DPRINT("ServiceMain() done\n"); -} - - -int -wmain(int argc, - WCHAR *argv[]) -{ - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - DPRINT1("Umpnpmgr: main() started\n"); - - StartServiceCtrlDispatcherW(ServiceTable); - - DPRINT1("Umpnpmgr: main() done\n"); + StartServiceCtrlDispatcher(ServiceTable); + + DPRINT("Umpnpmgr: main() done\n"); + + ExitThread(0); return 0; } Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Mon Feb 22 20:26:54 2010 @@ -48,34 +48,35 @@ BOOL -ScmCreateEvent(PHANDLE Event, - LPCWSTR Name) +ScmCreateStartEvent(PHANDLE StartEvent) { HANDLE hEvent; - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - Name); + hEvent = CreateEvent(NULL, + TRUE, + FALSE, + TEXT("SvcctrlStartEvent_A3752DX")); if (hEvent == NULL) { if (GetLastError() == ERROR_ALREADY_EXISTS) { - hEvent = OpenEventW(EVENT_ALL_ACCESS, - FALSE, - Name); - } - } - - if (hEvent) - { - DPRINT("SERVICES: created event %S with handle %x\n", Name, hEvent); - *Event = hEvent; - return TRUE; - } - - DPRINT1("SERVICES: Failed to create event %S\n", Name); - return FALSE; + hEvent = OpenEvent(EVENT_ALL_ACCESS, + FALSE, + TEXT("SvcctrlStartEvent_A3752DX")); + if (hEvent == NULL) + { + return FALSE; + } + } + else + { + return FALSE; + } + } + + *StartEvent = hEvent; + + return TRUE; } @@ -298,7 +299,6 @@ int nShowCmd) { HANDLE hScmStartEvent; - HANDLE hScmAutoStartCompleteEvent; HANDLE hEvent; DWORD dwError; @@ -307,16 +307,14 @@ /* Acquire privileges to load drivers */ AcquireLoadDriverPrivilege(); - /* Create events */ - if (!ScmCreateEvent(&hScmAutoStartCompleteEvent, L"SC_AutoStartComplete")) - { + /* Create start event */ + if (!ScmCreateStartEvent(&hScmStartEvent)) + { + DPRINT1("SERVICES: Failed to create start event\n"); ExitThread(0); } - if (!ScmCreateEvent(&hScmStartEvent, L"SvcctrlStartEvent_A3752DX")) - { - ExitThread(0); - } + DPRINT("SERVICES: created start event with handle %x.\n", hScmStartEvent); // ScmInitThreadManager(); @@ -355,9 +353,6 @@ DPRINT("SERVICES: Running.\n"); - - /* Signal complete event */ - SetEvent(hScmAutoStartCompleteEvent); #if 1 hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);

1 0

[janderwald] 45657: [PSDK] - Add BDA interfaces
by janderwald＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: janderwald Date: Mon Feb 22 20:03:09 2010 New Revision: 45657 URL: http://svn.reactos.org/svn/reactos?rev=45657&view=rev Log: [PSDK] - Add BDA interfaces Added: trunk/reactos/include/psdk/bdaiface.idl Modified: trunk/reactos/include/psdk/psdk.rbuild Added: trunk/reactos/include/psdk/bdaiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bdaiface.idl?… ============================================================================== --- trunk/reactos/include/psdk/bdaiface.idl (added) +++ trunk/reactos/include/psdk/bdaiface.idl [iso-8859-1] Mon Feb 22 20:03:09 2010 @@ -1,0 +1,607 @@ +#ifndef DO_NO_IMPORTS +import "unknwn.idl"; +import "strmif.idl"; +import "BdaTypes.h"; +#endif + +/************************************************************ + * interface IBDA_NetworkProvider + */ +[ + object, + uuid(fd501041-8ebe-11ce-8183-00aa00577da2), + pointer_default(unique) +] +interface IBDA_NetworkProvider : IUnknown +{ + HRESULT PutSignalSource( + [in] ULONG ulSignalSource); + + HRESULT GetSignalSource( + [in, out] ULONG * pulSignalSource); + + HRESULT GetNetworkType( + [in, out] GUID * pguidNetworkType); + + HRESULT PutTuningSpace( + [in] REFGUID guidTuningSpace); + + HRESULT GetTuningSpace( + [in, out] GUID * pguidTuingSpace); + + HRESULT RegisterDeviceFilter( + [in] IUnknown * pUnkFilterControl, + [in, out] ULONG * ppvRegisitrationContext); + + HRESULT UnRegisterDeviceFilter( + [in] ULONG pvRegistrationContext); +} + + +/************************************************************ + * interface IBDA_EthernetFilter + */ +[ + object, + uuid(71985F43-1CA1-11d3-9CC8-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_EthernetFilter : IUnknown +{ + HRESULT GetMulticastListSize( + [in, out] ULONG * pulcbAddresses); + + HRESULT PutMulticastList( + [in] ULONG ulcbAddresses, + [in] BYTE * pAddressList); + + HRESULT GetMulticastList( + [in, out] ULONG * pulcbAddresses, + [out] BYTE * pAddressList); + + HRESULT PutMulticastMode( + [in] ULONG ulModeMask); + + HRESULT GetMulticastMode( + [out] ULONG * pulModeMask); + +} + +/************************************************************ + * interface IBDA_IPV4Filter + */ +[ + object, + uuid(71985F44-1CA1-11d3-9CC8-00C04F7971E0), + pointer_default(unique) +] + +interface IBDA_IPV4Filter : IUnknown +{ + HRESULT GetMulticastListSize( + [in, out] ULONG * pulcbAddresses); + + HRESULT PutMulticastList( + [in] ULONG ulcbAddresses, + [in] BYTE * pAddressList); + + HRESULT GetMulticastList( + [in, out] ULONG * pulcbAddresses, + [out] BYTE * pAddressList); + + HRESULT PutMulticastMode( + [in] ULONG ulModeMask); + + HRESULT GetMulticastMode( + [out] ULONG * pulModeMask); +} + +/************************************************************ + * interface IBDA_IPV6Filter + */ + +[ + object, + uuid(E1785A74-2A23-4fb3-9245-A8F88017EF33), + pointer_default(unique) +] +interface IBDA_IPV6Filter : IUnknown +{ + + HRESULT GetMulticastListSize( + [in, out] ULONG * pulcbAddresses); + + HRESULT PutMulticastList( + [in] ULONG ulcbAddresses, + [in] BYTE * pAddressList); + + HRESULT GetMulticastList( + [in, out] ULONG * pulcbAddresses, + [out] BYTE * pAddressList); + + HRESULT PutMulticastMode( + [in] ULONG ulModeMask); + + HRESULT GetMulticastMode( + [out] ULONG * pulModeMask); +} + +/************************************************************ + * interface IBDA_DeviceControl + */ + +[ + object, + uuid(FD0A5AF3-B41D-11d2-9C95-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_DeviceControl : IUnknown +{ + HRESULT StartChanges(void); + HRESULT CheckChanges(void); + HRESULT CommitChanges(void); + HRESULT GetChangeState( + [in, out] ULONG * pState); +} + +/************************************************************ + * interface IBDA_PinControl + */ +[ + object, + uuid(0DED49D5-A8B7-4d5d-97A1-12B0C195874D), + pointer_default(unique) +] +interface IBDA_PinControl : IUnknown +{ + HRESULT GetPinID( + [in, out] ULONG * pulPinID); + + HRESULT GetPinType( + [in, out] ULONG * pulPinType); + + HRESULT RegistrationContext( + [in, out] ULONG * pulRegistrationCtx); +} + +/************************************************************ + * interface IBDA_SignalProperties + */ +[ + object, + uuid(D2F1644B-B409-11d2-BC69-00A0C9EE9E16), + pointer_default(unique) +] +interface IBDA_SignalProperties : IUnknown +{ + HRESULT PutNetworkType( + [in] REFGUID guidNetworkType); + + HRESULT GetNetworkType( + [in, out] GUID * pguidNetworkType); + + HRESULT PutSignalSource( + [in] ULONG ulSignalSource); + + HRESULT GetSignalSource( + [in, out] ULONG * pulSignalSource); + + HRESULT PutTuningSpace( + [in] REFGUID guidTuningSpace); + + HRESULT GetTuningSpace( + [in, out] GUID * pguidTuingSpace); +} + + +/************************************************************ + * interface IBDA_SignalStatistics + */ +[ + object, + uuid(1347D106-CF3A-428a-A5CB-AC0D9A2A4338), + pointer_default(unique) +] +interface IBDA_SignalStatistics : IUnknown +{ + HRESULT put_SignalStrength( + [in] LONG lDbStrength); + + HRESULT get_SignalStrength( + [in, out] LONG * plDbStrength); + + HRESULT put_SignalQuality( + [in] LONG lPercentQuality); + + HRESULT get_SignalQuality( + [in, out] LONG * plPercentQuality); + + HRESULT put_SignalPresent( + [in] BOOLEAN fPresent); + + HRESULT get_SignalPresent( + [in, out] BOOLEAN * pfPresent); + + HRESULT put_SignalLocked( + [in] BOOLEAN fLocked); + + HRESULT get_SignalLocked( + [in, out] BOOLEAN * pfLocked); + + HRESULT put_SampleTime( + [in] LONG lmsSampleTime); + + HRESULT get_SampleTime( + [in, out] LONG * plmsSampleTime); +} + +/************************************************************ + * interface IBDA_Topology + */ +[ + object, + uuid(79B56888-7FEA-4690-B45D-38FD3C7849BE), + pointer_default(unique) +] +interface IBDA_Topology : IUnknown +{ + HRESULT GetNodeTypes( + [in, out] ULONG * pulcNodeTypes, + [in] ULONG ulcNodeTypesMax, + [in, out] ULONG * rgulNodeTypes); + + HRESULT GetNodeDescriptors( + [in, out] ULONG * ulcNodeDescriptors, + [in] ULONG ulcNodeDescriptorsMax, + [in, out] BDANODE_DESCRIPTOR * rgNodeDescriptors); + + HRESULT GetNodeInterfaces( + [in] ULONG ulNodeType, + [in, out] ULONG * pulcInterfaces, + [in] ULONG ulcInterfacesMax, + [in, out] GUID * rgguidInterfaces); + + HRESULT GetPinTypes( + [in, out] ULONG * pulcPinTypes, + [in] ULONG ulcPinTypesMax, + [in, out] ULONG * rgulPinTypes); + + HRESULT GetTemplateConnections( + [in, out] ULONG * pulcConnections, + [in] ULONG ulcConnectionsMax, + [in, out, ] BDA_TEMPLATE_CONNECTION * rgConnections); + + HRESULT CreatePin( + [in] ULONG ulPinType, + [in, out] ULONG * pulPinId); + + HRESULT DeletePin( + [in] ULONG ulPinId); + + HRESULT SetMediaType( + [in] ULONG ulPinId, + [in] AM_MEDIA_TYPE * pMediaType); + + HRESULT SetMedium( + [in] ULONG ulPinId, + [in] REGPINMEDIUM * pMedium); + + HRESULT CreateTopology( + [in] ULONG ulInputPinId, + [in] ULONG ulOutputPinId); + + HRESULT GetControlNode( + [in] ULONG ulInputPinId, + [in] ULONG ulOutputPinId, + [in] ULONG ulNodeType, + [in, out] IUnknown ** ppControlNode); +} + +/************************************************************ + * interface IBDA_VoidTransform + */ +[ + object, + uuid(71985F46-1CA1-11d3-9CC8-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_VoidTransform : IUnknown +{ + HRESULT Start(); + + HRESULT Stop(); +} + +/************************************************************ + * interface IBDA_NullTransform + */ + +[ + object, + uuid(DDF15B0D-BD25-11d2-9CA0-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_NullTransform : IUnknown +{ + HRESULT Start(); + + HRESULT Stop(); +} + +/************************************************************ + * interface IBDA_FrequencyFilter + */ + +[ + object, + uuid(71985F47-1CA1-11d3-9CC8-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_FrequencyFilter : IUnknown +{ + HRESULT put_Autotune( + [in] ULONG ulTransponder); + + HRESULT get_Autotune( + [in, out] ULONG * pulTransponder); + + HRESULT put_Frequency( + [in] ULONG ulFrequency); + + HRESULT get_Frequency( + [in, out] ULONG * pulFrequency); + + HRESULT put_Polarity( + [in] Polarisation Polarity); + + HRESULT get_Polarity( + [in, out] Polarisation * pPolarity); + + HRESULT put_Range( + [in] ULONG ulRange); + + HRESULT get_Range( + [in, out] ULONG * pulRange); + + HRESULT put_Bandwidth( + [in] ULONG ulBandwidth); + + HRESULT get_Bandwidth( + [in, out] ULONG * pulBandwidth); + + HRESULT put_FrequencyMultiplier( + [in] ULONG ulMultiplier); + + HRESULT get_FrequencyMultiplier( + [in, out] ULONG * pulMultiplier); +} + +/************************************************************ + * interface IBDA_LNBInfo + */ +[ + object, + uuid(992CF102-49F9-4719-A664-C4F23E2408F4), + pointer_default(unique) +] +interface IBDA_LNBInfo : IUnknown +{ + HRESULT put_LocalOscilatorFrequencyLowBand( + [in] ULONG ulLOFLow); + + HRESULT get_LocalOscilatorFrequencyLowBand( + [in, out] ULONG * pulLOFLow); + + HRESULT put_LocalOscilatorFrequencyHighBand( + [in] ULONG ulLOFHigh); + + HRESULT get_LocalOscilatorFrequencyHighBand( + [in, out] ULONG * pulLOFHigh); + + HRESULT put_HighLowSwitchFrequency( + [in] ULONG ulSwitchFrequency); + + HRESULT get_HighLowSwitchFrequency( + [in, out] ULONG * pulSwitchFrequency); +} + +/************************************************************ + * interface IBDA_AutoDemodulate + */ + +[ + object, + uuid(DDF15B12-BD25-11d2-9CA0-00C04F7971E0), + pointer_default(unique) +] +interface IBDA_AutoDemodulate : IUnknown +{ + HRESULT put_AutoDemodulate(); +} + +/************************************************************ + * interface IBDA_DigitalDemodulator + */ + +[ + object, + uuid(EF30F379-985B-4d10-B640-A79D5E04E1E0), + pointer_default(unique) +] +interface IBDA_DigitalDemodulator : IUnknown +{ + HRESULT put_ModulationType( + [in] ModulationType * pModulationType); + + HRESULT get_ModulationType( + [in, out] ModulationType * pModulationType); + + HRESULT put_InnerFECMethod( + [in] FECMethod * pFECMethod); + + HRESULT get_InnerFECMethod( + [in, out] FECMethod * pFECMethod); + + HRESULT put_InnerFECRate( + [in] BinaryConvolutionCodeRate * pFECRate); + + HRESULT get_InnerFECRate( + [in, out] BinaryConvolutionCodeRate * pFECRate); + + HRESULT put_OuterFECMethod( + [in] FECMethod * pFECMethod); + + HRESULT get_OuterFECMethod( + [in, out] FECMethod * pFECMethod); + + HRESULT put_OuterFECRate( + [in] BinaryConvolutionCodeRate * pFECRate); + + HRESULT get_OuterFECRate( + [in, out] BinaryConvolutionCodeRate * pFECRate); + + HRESULT put_SymbolRate( + [in] ULONG * pSymbolRate); + + HRESULT get_SymbolRate( + [in, out] ULONG * pSymbolRate); + + HRESULT put_SpectralInversion( + [in] SpectralInversion * pSpectralInversion); + + HRESULT get_SpectralInversion( + [in, out] SpectralInversion * pSpectralInversion); +} + +typedef enum +{ + KSPROPERTY_IPSINK_MULTICASTLIST, + KSPROPERTY_IPSINK_ADAPTER_DESCRIPTION, + KSPROPERTY_IPSINK_ADAPTER_ADDRESS +}KSPROPERTY_IPSINK; + +/************************************************************ + * interface IBDA_IPSinkControl + */ + +[ + object, + uuid(3F4DC8E2-4050-11d3-8F4B-00C04F7971E2), + pointer_default(unique), +] +interface IBDA_IPSinkControl : IUnknown +{ + HRESULT GetMulticastList( + [in, out] unsigned long *pulcbSize, + [in, out] BYTE **pbBuffer); + + HRESULT GetAdapterIPAddress( + [in, out] unsigned long *pulcbSize, + [in, out] BYTE ** pbBuffer); + +} + +/************************************************************ + * interface IBDA_IPSinkInfo + */ +[ + object, + uuid(A750108F-492E-4d51-95F7-649B23FF7AD7), + pointer_default(unique) +] +interface IBDA_IPSinkInfo : IUnknown +{ + HRESULT get_MulticastList( + [in, out] ULONG * pulcbAddresses, + [out] BYTE **ppbAddressList); + + HRESULT get_AdapterIPAddress( + [out] BSTR *pbstrBuffer); + + HRESULT get_AdapterDescription( + [out] BSTR *pbstrBuffer); +} + +/************************************************************ + * interface IEnumPIDMap + */ + +[ + object, + uuid(afb6c2a2-2c41-11d3-8a60-0000f81e0e4a), + pointer_default(unique) +] +interface IEnumPIDMap : IUnknown +{ + HRESULT Next( + [in] ULONG cRequest, + [in, out] PID_MAP * pPIDMap, + [out] ULONG * pcReceived); + + HRESULT Skip( + [in] ULONG cRecords); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumPIDMap ** ppIEnumPIDMap); +} ; + +/************************************************************ + * interface IMPEG2PIDMap + */ + +[ + object, + uuid(afb6c2a1-2c41-11d3-8a60-0000f81e0e4a), + pointer_default(unique) +] +interface IMPEG2PIDMap : IUnknown +{ + HRESULT MapPID( + [in] ULONG culPID, + [in] ULONG * pulPID, + [in] MEDIA_SAMPLE_CONTENT MediaSampleContent); + + HRESULT UnmapPID( + [in] ULONG culPID, + [in] ULONG * pulPID); + + HRESULT EnumPIDMap( + [out] IEnumPIDMap ** pIEnumPIDMap); +} ; + +/************************************************************ + * interface IFrequencyMap + */ + + [ + object, + uuid(06FB45C1-693C-4ea7-B79F-7A6A54D8DEF2), + pointer_default(unique), + ] + + interface IFrequencyMap : IUnknown + { + HRESULT get_FrequencyMapping( + [out] ULONG* ulCount, + [out] ULONG** ppulList); + + HRESULT put_FrequencyMapping( + [in] ULONG ulCount, + [in] ULONG *pList); + + HRESULT get_CountryCode([out] ULONG *pulCountryCode); + + HRESULT put_CountryCode( + [in] ULONG ulCountryCode); + + HRESULT get_DefaultFrequencyMapping( + [in] ULONG ulCountryCode, + [out] ULONG* pulCount, + [out] ULONG** ppulList); + + HRESULT get_CountryCodeList( + [out] ULONG* pulCount, + [out] ULONG** ppulList); + }; Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Mon Feb 22 20:03:09 2010 @@ -5,6 +5,7 @@ <file>activaut.idl</file> <file>activdbg.idl</file> <file>activscp.idl</file> + <file>bdaiface.idl</file> <file>bits1_5.idl</file> <file>bits.idl</file> <file>commoncontrols.idl</file>

1 0

[ekohl] 45656: Reenable critical debug messages.
by ekohl＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: ekohl Date: Mon Feb 22 19:56:51 2010 New Revision: 45656 URL: http://svn.reactos.org/svn/reactos?rev=45656&view=rev Log: Reenable critical debug messages. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Feb 22 19:56:51 2010 @@ -118,7 +118,7 @@ NULL); if (Status != RPC_S_OK) { - DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return; } @@ -127,14 +127,14 @@ NULL); if (Status != RPC_S_OK) { - DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); return; } Status = RpcServerListen(1, 20, TRUE); if (Status != RPC_S_OK) { - DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); return; }

1 0

[fireball] 45655: [NTOS]: Enable high/low memory events notifications.
by fireball＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: fireball Date: Mon Feb 22 17:44:13 2010 New Revision: 45655 URL: http://svn.reactos.org/svn/reactos?rev=45655&view=rev Log: [NTOS]: Enable high/low memory events notifications. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Feb 22 17:44:13 2010 @@ -73,11 +73,14 @@ MiInsertZeroListAtBack(IN PFN_NUMBER EntryIndex) { PFN_NUMBER OldBlink; - PMMPFN Pfn1;//, Blink; - //ULONG Color; - //PMMCOLOR_TABLES ColorHead; PMMPFNLIST ListHead; - + PMMPFN Pfn1; +#if 0 + PMMPFN Blink; + ULONG Color; + PMMCOLOR_TABLES ColorHead; +#endif + /* Make sure the PFN lock is held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -115,7 +118,7 @@ /* Update the page location */ Pfn1->u3.e1.PageLocation = ZeroedPageList; -#if 0 + /* FIXME: NOT YET Due to caller semantics: Update the available page count */ //MmAvailablePages++; @@ -130,7 +133,7 @@ /* Otherwise check if we reached the high threshold and signal the event */ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } - +#if 0 /* Get the page color */ Color = EntryIndex & MmSecondaryColorMask;

1 0

[fireball] 45654: [NTOS]: Temporarily disable last part of MiInsertZeroListAtBack which seems to cause issues in the 1st stage.
by fireball＠svn.reactos.org 22 Feb '10

22 Feb '10

Author: fireball Date: Mon Feb 22 14:39:30 2010 New Revision: 45654 URL: http://svn.reactos.org/svn/reactos?rev=45654&view=rev Log: [NTOS]: Temporarily disable last part of MiInsertZeroListAtBack which seems to cause issues in the 1st stage. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Feb 22 14:39:30 2010 @@ -73,9 +73,9 @@ MiInsertZeroListAtBack(IN PFN_NUMBER EntryIndex) { PFN_NUMBER OldBlink; - PMMPFN Pfn1, Blink; - ULONG Color; - PMMCOLOR_TABLES ColorHead; + PMMPFN Pfn1;//, Blink; + //ULONG Color; + //PMMCOLOR_TABLES ColorHead; PMMPFNLIST ListHead; /* Make sure the PFN lock is held */ @@ -92,7 +92,7 @@ /* Use the zero list */ ListHead = &MmZeroedPageListHead; ListHead->Total++; - + /* Get the back link */ OldBlink = ListHead->Blink; if (OldBlink != LIST_HEAD) @@ -115,7 +115,7 @@ /* Update the page location */ Pfn1->u3.e1.PageLocation = ZeroedPageList; - +#if 0 /* FIXME: NOT YET Due to caller semantics: Update the available page count */ //MmAvailablePages++; @@ -158,6 +158,7 @@ /* And increase the count in the colored list */ ColorHead->Count++; +#endif } VOID

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs