Ros-diffs

ros-diffs@reactos.org

81390 discussions

[nyadav] 51955: [AUDSRV] Modify Architecture of server to use RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:48:26 2011 New Revision: 51955 URL: http://svn.reactos.org/svn/reactos?rev=51955&view=rev Log: [AUDSRV] Modify Architecture of server to use RPC Added: branches/nyadav-audio-branch/base/services/audsrv/ (with props) branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt (with props) branches/nyadav-audio-branch/base/services/audsrv/audsrv.c (with props) branches/nyadav-audio-branch/base/services/audsrv/audsrv.h (with props) branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc (with props) branches/nyadav-audio-branch/base/services/audsrv/rpc.c (with props) Removed: branches/nyadav-audio-branch/base/services/audiosrv2/ Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,6 +1,6 @@ add_subdirectory(audiosrv) -add_subdirectory(audiosrv2) +add_subdirectory(audsrv) add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(spoolsv) Propchange: branches/nyadav-audio-branch/base/services/audsrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 09:48:26 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/audsrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/audsrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/audsrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,0 +1,19 @@ + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +set_unicode() + +list(APPEND SOURCE + audsrv.c + audsrv.rc + rpc.c) + +add_executable(audsrv ${SOURCE}) + +target_link_libraries(audsrv audsrvrpc ${PSEH_LIB}) + +add_pch(audsrv ${CMAKE_CURRENT_SOURCE_DIR}/audsrv.h ${SOURCE}) + +set_module_type(audsrv win32cui) +add_importlibs(audsrv advapi32 rpcrt4 msvcrt kernel32 ntdll user32 ksuser setupapi) +add_cab_target(audsrv 1) Propchange: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt ------------------------------------------------------------------------------ evn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt ------------------------------------------------------------------------------ evn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt ------------------------------------------------------------------------------ sv:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt ------------------------------------------------------------------------------ sv:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c (added) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,0 +1,521 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/audsrv.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Pankaj Yadav + + */ + +/* INCLUDES *****************************************************************/ + +#include "audsrv.h" + +/* GLOBALS ******************************************************************/ + +static VOID CALLBACK ServiceMain(DWORD, LPWSTR *); +static DWORD ServiceInit(VOID); +static BOOL WINAPI close ( DWORD dwCtrlType ); +static WCHAR ServiceName[] = L"AudSrv"; +static SERVICE_TABLE_ENTRYW ServiceTable[2] = +{ + { ServiceName, ServiceMain }, + { NULL, NULL } +}; + +SERVICE_STATUS ServiceStatus; +SERVICE_STATUS_HANDLE ServiceStatusHandle; + + +HANDLE MyHeap = NULL; + +#define _2pi 6.283185307179586476925286766559 + +GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + +const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSINTERFACESETID_Standard = {0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + +MixerEngine engine,*pengine; +/* FUNCTIONS ****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + DPRINT("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + DPRINT(" SERVICE_CONTROL_STOP received\n"); + close(CTRL_CLOSE_EVENT); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + DPRINT(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + DPRINT(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + DPRINT(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + DPRINT(" SERVICE_CONTROL_SHUTDOWN received\n"); + close(CTRL_CLOSE_EVENT); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + DPRINT1(" Control %lu received\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + +static VOID CALLBACK +ServiceMain(DWORD argc, + LPWSTR *argv) +{ + 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; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_START_PENDING); + } + else + { + DPRINT("Service started\n"); + UpdateServiceStatus(SERVICE_RUNNING); + } + + DPRINT("ServiceMain() done\n"); +} + + + + +void fill(MixerEngine * mixer) +{ + DWORD Length; + UINT i = 0; + mixer->mastervolume = 1000; + mixer->masterchannels=2; + mixer->masterfreq=48000; + mixer->masterbitspersample=16; + mixer->masterchannelmask = KSAUDIO_SPEAKER_STEREO; + Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; + mixer->masterbuf = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); + while (i < Length / 2) + { + mixer->masterbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); + i++; + mixer->masterbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * _2pi / 48000); + i++; + } +} + +void initdevice(MixerEngine * mixer) +{ + SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVINFO_DATA DeviceData; + PSP_DEVICE_INTERFACE_DETAIL_DATA DetailData; + HDEVINFO DeviceHandle; + PKSDATAFORMAT DataFormat; + PWAVEFORMATEXTENSIBLE WaveFormat; + PKSPIN_CONNECT PinConnect; + KSSTATE State; + DWORD Length; + BOOL Result; + NTSTATUS Status; + + // + // Get a handle to KS Audio Interfaces + // + DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, + NULL, + NULL, + DIGCF_DEVICEINTERFACE |DIGCF_PRESENT); + + printf("DeviceHandle %p\n", DeviceHandle); + + // + // Enumerate the first interface + // + InterfaceData.cbSize = sizeof(InterfaceData); + InterfaceData.Reserved = 0; + Result = SetupDiEnumDeviceInterfaces(DeviceHandle, + NULL, + &CategoryGuid, + 1, + &InterfaceData); + + printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); + + // + // Get the interface details (namely the device path) + // + Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); + DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + DeviceData.cbSize = sizeof(DeviceData); + DeviceData.Reserved = 0; + Result = SetupDiGetDeviceInterfaceDetail(DeviceHandle, + &InterfaceData, + DetailData, + Length, + NULL, + &DeviceData); + + wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); + + // + // Open a handle to the device + // + mixer->FilterHandle = CreateFile(DetailData->DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + printf("Handle %p\n", mixer->FilterHandle); + + // + // Close the interface handle and clean up + // + //SetupDiDestroyDeviceInfoList(DeviceHandle); + + // + // Allocate a KS Pin Connection Request Structure + // + Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX); + PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + DataFormat = (PKSDATAFORMAT)(PinConnect + 1); + WaveFormat = (PWAVEFORMATEXTENSIBLE)(DataFormat + 1); + + // + // Setup the KS Pin Data + // + + PinConnect->Interface.Set = KSINTERFACESETID_Standard; + PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; + PinConnect->Interface.Flags = 0; + PinConnect->Medium.Set = KSMEDIUMSETID_Standard; + PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; + PinConnect->Medium.Flags = 0; + PinConnect->PinId = 0; + PinConnect->PinToHandle = NULL; + PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; + PinConnect->Priority.PrioritySubClass = 1; + + // + // Setup the KS Data Format Information + // + printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); + + DataFormat->Flags = 0; + DataFormat->Reserved = 0; + DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat->SampleSize = mixer->masterchannels * mixer->masterbitspersample / 8; + DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); + + WaveFormat->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + WaveFormat->Format.nChannels = mixer->masterchannels; + WaveFormat->Format.nSamplesPerSec = mixer->masterfreq; + WaveFormat->Format.nBlockAlign = (mixer->masterchannels * mixer->masterbitspersample)/8;; + WaveFormat->Format.nAvgBytesPerSec = WaveFormat->Format.nSamplesPerSec * WaveFormat->Format.nBlockAlign; + WaveFormat->Format.wBitsPerSample = mixer->masterbitspersample; + WaveFormat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + WaveFormat->dwChannelMask = mixer->masterchannelmask; + WaveFormat->Samples.wValidBitsPerSample = mixer->masterbitspersample; + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + + printf("Creating pin\n"); + + // + // Create the pin + // + Status = KsCreatePin(mixer->FilterHandle, PinConnect, GENERIC_READ|GENERIC_WRITE, &(mixer->PinHandle)); + + printf("PinHandle %p Status %lx\n", mixer->PinHandle, Status); + + + Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; + // + // Create and fill out the KS Stream Packet + // + mixer->Packet = (PKSSTREAM_HEADER)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(KSSTREAM_HEADER)); + mixer->Packet->Data = mixer->masterbuf; + mixer->Packet->FrameExtent = Length; + mixer->Packet->DataUsed = Length; + mixer->Packet->Size = sizeof(KSSTREAM_HEADER); + mixer->Packet->PresentationTime.Numerator = 1; + mixer->Packet->PresentationTime.Denominator = 1; + + // + // Setup a KS Property to change the state + // + mixer->Property = (PKSPROPERTY)HeapAlloc(GetProcessHeap(), 0, sizeof(KSPROPERTY)); + mixer->Property->Set = KSPROPSETID_Connection; + mixer->Property->Id = KSPROPERTY_CONNECTION_STATE; + mixer->Property->Flags = KSPROPERTY_TYPE_SET; + + // + // Change the state to run + // + State = KSSTATE_RUN; + DeviceIoControl(mixer->PinHandle, + IOCTL_KS_PROPERTY, + mixer->Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); +} +void playbuffer(MixerEngine * mixer) +{ + DWORD Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); + // + // Play our 1-second buffer + // + + DeviceIoControl(mixer->PinHandle, + IOCTL_KS_WRITE_STREAM, + NULL, + 0, + mixer->Packet, + mixer->Packet->Size, + &Length, + NULL); + +} +void closedevice(MixerEngine * mixer) +{ + KSSTATE State; + DWORD Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); + // + // Change the state to stop + // + State = KSSTATE_STOP; + DeviceIoControl(mixer->PinHandle, + IOCTL_KS_PROPERTY, + mixer->Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); + + CloseHandle(mixer->PinHandle); + CloseHandle(mixer->FilterHandle); + +} +DWORD WINAPI RunMixerThread(LPVOID param) +{ + MixerEngine * mixer = (MixerEngine *) param; + SetEvent(mixer->EventPool[0]); + while(1) + { + while(WaitForSingleObject(mixer->EventPool[0],100)!=0){if(mixer->dead)goto DEAD;} + fill(mixer); + SetEvent(mixer->EventPool[1]); + } +DEAD: + printf("\nMixer Thread Ended\n"); + return 0; +} +DWORD WINAPI RunPlayerThread(LPVOID param) +{ + MixerEngine * mixer = (MixerEngine *) param; + while(1) + { + while(WaitForSingleObject(mixer->EventPool[1],100)!=0){if(mixer->dead)goto DEAD;} + initdevice(mixer); + playbuffer(mixer); + closedevice(mixer); + SetEvent(mixer->EventPool[0]); + } + +DEAD: + printf("\nPlayer Thread Ended\n"); + return 0; +} +void SpawnMixerThread(MixerEngine * mixer) +{ + DWORD dwID; + mixer->mixerthread=CreateThread(NULL,0,RunMixerThread,pengine,0,&dwID); +} +void SpawnPlayerThread(MixerEngine * mixer) +{ + DWORD dwID; + mixer->playerthread=CreateThread(NULL,0,RunPlayerThread,pengine,0,&dwID); +} +void SpawnRPCThread(MixerEngine * mixer) +{ + DWORD dwID; + mixer->rpcthread=CreateThread(NULL,0,RunRPCThread,pengine,0,&dwID); +} +void ShutdownRPC(void) +{ + RPC_STATUS status; + + status = RpcMgmtStopServerListening(NULL); + + if (status) + { + exit(status); + } + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + + if (status) + { + exit(status); + } +} +static BOOL WINAPI close ( DWORD dwCtrlType ) +{ + pengine->dead=1; + WaitForSingleObject(pengine->mixerthread,INFINITE); + WaitForSingleObject(pengine->playerthread,INFINITE); + ShutdownRPC(); + WaitForSingleObject(pengine->rpcthread,INFINITE); + + CloseHandle(pengine->mixerthread); + CloseHandle(pengine->playerthread); + CloseHandle(pengine->rpcthread); + return TRUE; +} + +INT wmain(int argc, char *argv[]) +{ + INT RetCode = 0; +/*For Temporary Debug purpose, If there is any argument it acts as simple command line app,otherwise it is a NTSERVICE*/ +if(argc==1) +{ +printf("Under Construction.Please User audsrv.exe -n to start as normal command line application.\n"); + MyHeap = HeapCreate(0, 1024 * 256, 0); + + if (!MyHeap) + { + DPRINT1("FATAL ERROR, can't create heap.\n"); + RetCode = 1; + goto err; + } + + StartServiceCtrlDispatcher(ServiceTable); +} +else +{ + pengine=&engine; + + /*Later these will be loaded from a Conf file*/ + pengine->mastervolume=1000; + pengine->mute=FALSE; + + pengine->dead=0; + pengine->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); + SetConsoleCtrlHandler(close,TRUE); + SpawnMixerThread(pengine); + SpawnPlayerThread(pengine); + SpawnRPCThread(pengine); + WaitForSingleObject(pengine->mixerthread,INFINITE); + WaitForSingleObject(pengine->playerthread,INFINITE); + WaitForSingleObject(pengine->rpcthread,INFINITE); +} + err: +CloseHandle(pengine->mixerthread); +CloseHandle(pengine->playerthread); +CloseHandle(pengine->rpcthread); + if (MyHeap) + HeapDestroy(MyHeap); + + return RetCode; +} +static DWORD +ServiceInit(VOID) +{ + pengine=&engine; + + /*Later these will be loaded from a Conf file*/ + pengine->mastervolume=1000; + pengine->mute=FALSE; + + pengine->dead=0; + pengine->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); + SetConsoleCtrlHandler(close,TRUE); + SpawnMixerThread(pengine); + SpawnPlayerThread(pengine); + SpawnRPCThread(pengine); + + return ERROR_SUCCESS; +} Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c ------------------------------------------------------------------------------ evn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c ------------------------------------------------------------------------------ evn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c ------------------------------------------------------------------------------ sv:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c ------------------------------------------------------------------------------ sv:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h (added) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,0 +1,71 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/audsrv/audsrv.h + * PURPOSE: Event logging service + * COPYRIGHT: Copyright 2011 Pankaj Yadav + */ + +#ifndef __AUDSRV_H__ +#define __AUDSRV_H__ + +#define NDEBUG +#define WIN32_NO_STATUS + +#include <windows.h> +#include <wincon.h> +#include <memory.h> +#include <mmsystem.h> +#include <stdio.h> +#include <math.h> +#include <setupapi.h> +#include <ndk/ntndk.h> +#include <ks.h> +#include <ksmedia.h> +#include <ks.h> +#include <debug.h> +#include "audsrvrpc_s.h" + + +typedef struct PortStream +{ + int volume; + LONG freq; + int bitspersample; + int channels; + ULONG channelmask; + HANDLE thread; + struct PortStream * next; +} PortStream; + +typedef struct MixerEngine +{ +/*Should be Initialized at Server Start*/ + char dead; + HANDLE EventPool[2];//0=Played,1=Ready + HANDLE mixerthread; + HANDLE playerthread; + HANDLE rpcthread; +/*Should be Initialized at Server Start from configuration file,Currently there is no configuration file so initialized to a fixed value at start*/ + int mastervolume; + BOOL mute; +/*Should be Initialized before playing First Stream*/ + long masterfreq; + int masterchannels; + unsigned long masterchannelmask; + int masterbitspersample; + PSHORT masterbuf; +/*Currently don't know the future of following variables*/ + HANDLE FilterHandle; + HANDLE PinHandle; + PKSPROPERTY Property; + PKSSTREAM_HEADER Packet; +} MixerEngine; + +extern MixerEngine engine; + +/* rpc.c */ +DWORD WINAPI RunRPCThread(LPVOID lpParameter); +/********************************/ + +#endif /* __AUDSRV_H__ */ Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h ------------------------------------------------------------------------------ evn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h ------------------------------------------------------------------------------ evn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h ------------------------------------------------------------------------------ sv:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h ------------------------------------------------------------------------------ sv:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc (added) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Audio Server\0" +#define REACTOS_STR_INTERNAL_NAME "Audsrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "Audsrv.exe\0" +#include <reactos/version.rc> Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc ------------------------------------------------------------------------------ evn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc ------------------------------------------------------------------------------ evn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc ------------------------------------------------------------------------------ sv:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc ------------------------------------------------------------------------------ sv:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/audsrv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c (added) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Fri May 27 09:48:26 2011 @@ -1,0 +1,69 @@ +/* + * PROJECT: ReactOS kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/audsrv/rpc.c + * PURPOSE: Audio Server + * COPYRIGHT: Copyright 2011 Pankaj Yadav + */ + +/* INCLUDES *****************************************************************/ + +#include "audsrv.h" + +LIST_ENTRY LogHandleListHead; + +/* FUNCTIONS ****************************************************************/ + +DWORD WINAPI RunRPCThread(LPVOID lpParameter) +{ + RPC_STATUS Status; + + InitializeListHead(&LogHandleListHead); +printf("reached\n"); + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\EventLog", NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(audsrv_v0_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +/*************************RPC Functions**********************************/ + +NTSTATUS AUDInitStream( AUDSRV_HANDLE *streamthread) +{ + UNIMPLEMENTED;/*Coolest Macro I have ever seen*/ + return STATUS_NOT_IMPLEMENTED; +} +/*************************************************************************/ +void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +void __RPC_USER IELF_HANDLE_rundown(AUDSRV_HANDLE LogHandle) +{ +} Propchange: branches/nyadav-audio-branch/base/services/audsrv/rpc.c ------------------------------------------------------------------------------ evn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/rpc.c ------------------------------------------------------------------------------ evn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/rpc.c ------------------------------------------------------------------------------ sv:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/rpc.c ------------------------------------------------------------------------------ sv:mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/rpc.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[nyadav] 51954: [AUDSRV] Add a client to test audio server
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:40:19 2011 New Revision: 51954 URL: http://svn.reactos.org/svn/reactos?rev=51954&view=rev Log: [AUDSRV] Add a client to test audio server Added: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/ (with props) branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt (with props) branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c (with props) Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/CMakeLists.txt Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/CMakeLists.txt [iso-8859-1] Fri May 27 09:40:19 2011 @@ -1,3 +1,4 @@ add_subdirectory(audio_test) +add_subdirectory(audclient) add_subdirectory(portcls) Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 09:40:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt [iso-8859-1] Fri May 27 09:40:19 2011 @@ -1,0 +1,10 @@ +set_unicode(audclient yes) + + + +add_executable(audclient + audclient.c) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) +set_module_type(audclient win32cui) +add_importlibs(audclient audsrvapi advapi32 user32 ksuser setupapi msvcrt kernel32) +add_cab_target(audclient 1) Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c (added) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri May 27 09:40:19 2011 @@ -1,0 +1,12 @@ +#define WIN32_NO_STATUS +#define _KSDDK_ + +#include <audsrvapi.h> +#include <stdio.h> +int +__cdecl +wmain(int argc, char* argv[]) +{ + printf("ReactOS Audio Mixer Sample Client.\n"); + return 0; +} Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[nyadav] 51953: [AUDSRV] AUDIO server modified headers and new IDL files
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:33:13 2011 New Revision: 51953 URL: http://svn.reactos.org/svn/reactos?rev=51953&view=rev Log: [AUDSRV] AUDIO server modified headers and new IDL files Added: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf (with props) branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl (with props) branches/nyadav-audio-branch/include/reactos/libs/audsrv/ (with props) branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h (with props) Removed: branches/nyadav-audio-branch/include/reactos/libs/audiosrv2/ Modified: branches/nyadav-audio-branch/include/reactos/idl/CMakeLists.txt (contents, props changed) branches/nyadav-audio-branch/include/reactos/idl/eventlogrpc.acf (props changed) branches/nyadav-audio-branch/include/reactos/idl/eventlogrpc.idl (props changed) branches/nyadav-audio-branch/include/reactos/idl/lsa.acf (props changed) branches/nyadav-audio-branch/include/reactos/idl/lsa.idl (props changed) branches/nyadav-audio-branch/include/reactos/idl/ms-dtyp.idl (props changed) branches/nyadav-audio-branch/include/reactos/idl/pnp.acf (props changed) branches/nyadav-audio-branch/include/reactos/idl/pnp.idl (props changed) branches/nyadav-audio-branch/include/reactos/idl/svcctl.acf (props changed) branches/nyadav-audio-branch/include/reactos/idl/svcctl.idl (props changed) branches/nyadav-audio-branch/include/reactos/idl/wlansvc.idl (props changed) Modified: branches/nyadav-audio-branch/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/CMakeLists.txt [iso-8859-1] Fri May 27 09:33:13 2011 @@ -2,6 +2,7 @@ include_directories(.) add_rpc_library(eventlogrpc eventlogrpc.idl) +add_rpc_library(audsrvrpc audsrvrpc.idl) add_rpc_library(lsarpc lsa.idl) add_rpc_library(svcctlrpc svcctl.idl) add_rpc_library(wlansvcrpc wlansvc.idl) Propchange: branches/nyadav-audio-branch/include/reactos/idl/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf (added) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf [iso-8859-1] Fri May 27 09:33:13 2011 @@ -1,0 +1,6 @@ +[ + implicit_handle(handle_t bindhandle), strict_context_handle +] +interface audsrv +{ +} Propchange: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.acf ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl (added) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Fri May 27 09:33:13 2011 @@ -1,0 +1,42 @@ +/* + * Event Log RPC interface definition + */ + +#include <ms-dtyp.idl> + +cpp_quote("#if !defined(__AUDSRV_H__) ") +typedef long NTSTATUS; +cpp_quote("#endif") + +typedef [range(0, 0x0007FFFF)] unsigned long RULONG; +typedef struct _RPC_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; +} RPC_STRING, *PRPC_STRING; + +typedef [context_handle] PVOID AUDSRV_HANDLE; +typedef AUDSRV_HANDLE *PAUDSRV_HANDLE; +typedef [handle, unique] LPWSTR AUDSRV_HANDLE_W; +typedef [handle, unique] LPSTR AUDSRV_HANDLE_A; + +typedef struct _RPC_CLIENT_ID { + DWORD UniqueProcess; + DWORD UniqueThread; +} RPC_CLIENT_ID, *PRPC_CLIENT_ID; + +[ + uuid(F4CB5F3D-84CC-4BFF-BB16-1397896E3A38), + version(0.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle +#endif +] + +interface audsrv +{ + + NTSTATUS AUDInitStream([in] AUDSRV_HANDLE *streamthread); + +} Propchange: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/eventlogrpc.acf ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/eventlogrpc.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/lsa.acf ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/lsa.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/ms-dtyp.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/pnp.acf ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/pnp.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/svcctl.acf ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/svcctl.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/idl/wlansvc.idl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 09:33:13 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h (added) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Fri May 27 09:33:13 2011 @@ -1,0 +1,5 @@ +#ifndef _PORTINTERFACE_H +#define _PORTINTERFACE_H + + +#endif Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[nyadav] 51952: [AUDSRV] Revamp Audio Server API with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:20:19 2011 New Revision: 51952 URL: http://svn.reactos.org/svn/reactos?rev=51952&view=rev Log: [AUDSRV] Revamp Audio Server API with RPC Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/ (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec (with props) branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c (with props) Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/ Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 09:20:19 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,21 @@ +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) + +spec2def(audsrvapi.dll audsrvapi.spec) + +list(APPEND SOURCE + dllmain.c + audsrvapi.c + ${CMAKE_CURRENT_BINARY_DIR}/audsrvapi.def) + +add_library(audsrvapi SHARED ${SOURCE}) +set_module_type(audsrvapi win32dll) + +target_link_libraries(audsrvapi audsrvrpc uuid wine ${PSEH_LIB}) + + +add_pch(audsrv ${CMAKE_CURRENT_SOURCE_DIR}/audsrv.h ${SOURCE}) + +add_importlibs(audsrvapi rpcrt4 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_cab_target(audsrvapi 1) +add_importlib_target(audsrvapi.spec) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,1 @@ +#include "audsrvapi.h" Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,2 @@ +#include "audsrvrpc_c.h" +#include <audsrvapi.h> Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== (empty) Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c (added) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Fri May 27 09:20:19 2011 @@ -1,0 +1,18 @@ + +#include "audsrvapi.h" + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[nyadav] 51951: [AUDSRV] Revamp Audio Server Api with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:05:47 2011 New Revision: 51951 URL: http://svn.reactos.org/svn/reactos?rev=51951&view=rev Log: [AUDSRV] Revamp Audio Server Api with RPC Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c (with props) branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h (with props) branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec (with props) Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c Removed: branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audiosrv2dll.spec (removed) @@ -1,1 +1,0 @@ -@ stdcall getmixerengine() Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c (added) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,0 +1,1 @@ +#include "audsrvapi.h" Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h (added) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,0 +1,2 @@ +#include "audsrvrpc_c.h" +#include <audsrvapi.h> Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== (empty) Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/dll/win32/audiosrv2/audsrvapi.spec ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] Fri May 27 09:05:47 2011 @@ -1,5 +1,5 @@ -#include "audsrv.h" +#include "audsrvapi.h" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call,

1 0

[nyadav] 51950: [AUDSRV] Revamp Audio Server Api with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 09:00:12 2011 New Revision: 51950 URL: http://svn.reactos.org/svn/reactos?rev=51950&view=rev Log: [AUDSRV] Revamp Audio Server Api with RPC Modified: branches/nyadav-audio-branch/dll/win32/CMakeLists.txt Modified: branches/nyadav-audio-branch/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/C… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/CMakeLists.txt [iso-8859-1] Fri May 27 09:00:12 2011 @@ -7,7 +7,7 @@ add_subdirectory(advpack) add_subdirectory(atl) add_subdirectory(authz) -add_subdirectory(audiosrv2) +add_subdirectory(audsrvapi) add_subdirectory(avicap32) add_subdirectory(avifil32) add_subdirectory(batt)

1 0

[nyadav] 51949: Audio Server API with RPC
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 08:50:55 2011 New Revision: 51949 URL: http://svn.reactos.org/svn/reactos?rev=51949&view=rev Log: Audio Server API with RPC Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/CMakeLists.txt [iso-8859-1] Fri May 27 08:50:55 2011 @@ -1,16 +1,20 @@ +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audsrv) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/audiosrv2) - -spec2def(audiosrv2dll.dll audiosrv2dll.spec) +spec2def(audsrvapi.dll audsrvapi.spec) list(APPEND SOURCE dllmain.c - ${CMAKE_CURRENT_BINARY_DIR}/audiosrv2dll.def) + ${CMAKE_CURRENT_BINARY_DIR}/audsrvapi.def) -add_library(audiosrv2dll SHARED ${SOURCE}) -set_module_type(audiosrv2dll win32dll) +add_library(audsrvapi SHARED ${SOURCE}) +set_module_type(audsrvapi win32dll) -target_link_libraries(audiosrv2dll uuid wine) -add_importlibs(audiosrv2dll ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(audiosrv2dll 1) -add_importlib_target(audiosrv2dll.spec) +target_link_libraries(audsrvapi audsrvrpc uuid wine ${PSEH_LIB}) + + +add_pch(audsrv ${CMAKE_CURRENT_SOURCE_DIR}/audsrv.h ${SOURCE}) + +add_importlibs(audsrvapi rpcrt4 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_cab_target(audsrvapi 1) +add_importlib_target(audsrvapi.spec) Modified: branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audiosrv2/dllmain.c [iso-8859-1] Fri May 27 08:50:55 2011 @@ -1,68 +1,18 @@ -#include <audiosrv.h> - -static MixerEngine * lpvMem = NULL; -static HANDLE hMapObject = NULL; +#include "audsrv.h" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { -BOOL fInit, fIgnore; switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - hMapObject = CreateFileMapping( - INVALID_HANDLE_VALUE, // use paging file - NULL, // default security attributes - PAGE_READWRITE, // read/write access - 0, // size: high 32-bits - sizeof(MixerEngine),TEXT("MixerEngine")); // size: low 32-bits - if (hMapObject == NULL) - return FALSE; - - fInit = (GetLastError() != ERROR_ALREADY_EXISTS); - - lpvMem = (MixerEngine *)MapViewOfFile( - hMapObject, // object to map view of - FILE_MAP_WRITE, // read/write access - 0, // high offset: map from - 0, // low offset: beginning - 0); // default: map entire file - if (lpvMem == NULL) - return FALSE; - - if (fInit) - lpvMem->dead=0; - lpvMem->masterchannels=0; - lpvMem->masterbitspersample=0; - lpvMem->masterchannelmask=0; - lpvMem->masterdoublebuf[0]=NULL; - lpvMem->masterdoublebuf[1]=NULL; - lpvMem->masterfreq=0; - lpvMem->mastervolume=0; - lpvMem->mute=0; - lpvMem->portstream=NULL; - lpvMem->workingbuffer=0; - lpvMem->mixerthread=NULL; - lpvMem->playerthread=NULL; - lpvMem->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); - lpvMem->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); - - break; case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: - break; case DLL_PROCESS_DETACH: - fIgnore = UnmapViewOfFile(lpvMem); - fIgnore = CloseHandle(hMapObject); break; } return TRUE; } - -WINAPI MixerEngine * getmixerengine() -{ -return lpvMem; -}

1 0

[cgutman] 51947: [USETUP] - Disable the 1st stage user-mode PnP manager because it is creating incomplete registry keys which is confusing the real user-mode PnP manager and preventing devices inst...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 03:40:22 2011 New Revision: 51947 URL: http://svn.reactos.org/svn/reactos?rev=51947&view=rev Log: [USETUP] - Disable the 1st stage user-mode PnP manager because it is creating incomplete registry keys which is confusing the real user-mode PnP manager and preventing devices installed in 1st stage from appearing in device manager - Fixes displaying PCI bus controllers in device manager - I need to discuss with Herve what should be done with this code Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri May 27 03:40:22 2011 @@ -3776,10 +3776,14 @@ INPUT_RECORD Ir; PAGE_NUMBER Page; LARGE_INTEGER Time; - NTSTATUS Status; +// NTSTATUS Status; NtQuerySystemTime(&Time); +#if 0 /* This minimal PnP implementation causes problems because it writes + * half complete registry entries which cause devices installed by this + * method (PCI) to be improperly installed and not recognized by device manager + */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, @@ -3791,6 +3795,7 @@ &hPnpThread, NULL); if (!NT_SUCCESS(Status)) +#endif hPnpThread = INVALID_HANDLE_VALUE; if (!CONSOLE_Init())

1 0

[cgutman] 51946: [NTOSKRNL] - Quick fix for the crash loading boot-time legacy drivers - More device node flag state fixes coming soon
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 02:11:05 2011 New Revision: 51946 URL: http://svn.reactos.org/svn/reactos?rev=51946&view=rev Log: [NTOSKRNL] - Quick fix for the crash loading boot-time legacy drivers - More device node flag state fixes coming soon Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri May 27 02:11:05 2011 @@ -327,6 +327,12 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; + + if (((DeviceNode->Flags & DNF_STARTED) && !(DeviceNode->Flags & DNF_HAS_PROBLEM)) || + (DeviceNode->Flags & DNF_START_REQUEST_PENDING)) + { + return STATUS_SUCCESS; + } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status))

1 0

[jimtabor] 51945: [Win32k|User32] - Remove NtUserGetLastInputInfo.
by jimtabor＠svn.reactos.org 27 May '11

27 May '11

Author: jimtabor Date: Fri May 27 01:36:41 2011 New Revision: 51945 URL: http://svn.reactos.org/svn/reactos?rev=51945&view=rev Log: [Win32k|User32] - Remove NtUserGetLastInputInfo. Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/w32ksvc.h Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Fri May 27 01:36:41 2011 @@ -181,7 +181,6 @@ return NtUserGetKeyNameText( lParam, lpString, nSize ); } - /* * @implemented */ @@ -190,7 +189,6 @@ { return (SHORT) NtUserGetKeyState((DWORD) nVirtKey); } - /* * @implemented @@ -225,16 +223,23 @@ return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); } - /* * @implemented */ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) { - return NtUserGetLastInputInfo(plii); -} - + TRACE("%p\n", plii); + + if (plii->cbSize != sizeof (*plii) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + plii->dwTime = gpsi->dwLastRITEventTickCount; + return TRUE; +} /* * @implemented @@ -247,7 +252,6 @@ strtoul(pwszKLID, NULL, 16), Flags); } - /* * @implemented @@ -263,7 +267,6 @@ Flags); } - /* * @implemented */ @@ -273,7 +276,6 @@ { return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) ); } - /* * @implemented Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri May 27 01:36:41 2011 @@ -3161,11 +3161,6 @@ BOOL NTAPI -NtUserGetLastInputInfo( - PLASTINPUTINFO plii); - -BOOL -NTAPI NtUserGetMinMaxInfo( HWND hwnd, MINMAXINFO *MinMaxInfo, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri May 27 01:36:41 2011 @@ -65,43 +65,10 @@ LARGE_INTEGER TickCount; KeQueryTickCount(&TickCount); LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000); + if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick; } return LastInputTick; } - -BOOL -APIENTRY -NtUserGetLastInputInfo(PLASTINPUTINFO plii) -{ - BOOL ret = TRUE; - - UserEnterShared(); - - _SEH2_TRY - { - if (ProbeForReadUint(&plii->cbSize) != sizeof(LASTINPUTINFO)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - _SEH2_LEAVE; - } - - ProbeForWrite(plii, sizeof(LASTINPUTINFO), sizeof(DWORD)); - - plii->dwTime = IntLastInputTick(FALSE); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; - } - _SEH2_END; - - UserLeave(); - - return ret; -} - VOID FASTCALL ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri May 27 01:36:41 2011 @@ -683,7 +683,6 @@ # NtUserBuildMenuItemList 4 NtUserGetMenuDefaultItem 3 -NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserMenuInfo 3 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Fri May 27 01:36:41 2011 @@ -683,7 +683,6 @@ SVC_(UserBuildMenuItemList, 4) SVC_(UserGetMenuDefaultItem, 3) -SVC_(UserGetLastInputInfo, 1) SVC_(UserGetMinMaxInfo, 3) SVC_(UserGetMonitorInfo, 2) SVC_(UserMenuInfo, 3)

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