Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 51965: [NTOSKRNL] Fix struct size checking for debug remove locks. Spotted by Roel
by pschweitzer＠svn.reactos.org 27 May '11

27 May '11

Author: pschweitzer Date: Fri May 27 21:21:36 2011 New Revision: 51965 URL: http://svn.reactos.org/svn/reactos?rev=51965&view=rev Log: [NTOSKRNL] Fix struct size checking for debug remove locks. Spotted by Roel Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Fri May 27 21:21:36 2011 @@ -50,7 +50,7 @@ switch (RemlockSize) { /* Check if this is a debug lock */ - case sizeof(IO_REMOVE_LOCK_DBG_BLOCK): + case (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)): /* Setup debug parameters */ Lock->Dbg.Signature = 'COLR'; Lock->Dbg.HighWatermark = HighWatermark; @@ -92,7 +92,7 @@ if (!Lock->Common.Removed) { /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { ASSERT(Lock->Dbg.HighWatermark == 0 || LockValue <= Lock->Dbg.HighWatermark); @@ -154,7 +154,7 @@ PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { /* Acquire blocks queue */ KeAcquireSpinLock(&(Lock->Dbg.Spin), &OldIrql); @@ -265,7 +265,7 @@ } /* Check what kind of lock this is */ - if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { /* A block must be remaining */ ASSERT(Lock->Dbg.Blocks);

1 0

[nyadav] 51964: [AUDSRV] Add Playback of virtual buffer on virtual server to audio client
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 21:11:53 2011 New Revision: 51964 URL: http://svn.reactos.org/svn/reactos?rev=51964&view=rev Log: [AUDSRV] Add Playback of virtual buffer on virtual server to audio client Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -27,7 +27,7 @@ #include "audsrvrpc_s.h" -typedef struct PortStream +typedef struct ServerStream { int volume; LONG freq; @@ -35,8 +35,9 @@ int channels; ULONG channelmask; HANDLE thread; - struct PortStream * next; -} PortStream; + float balance; + struct ServerStream * next; +} ServerStream; typedef struct MixerEngine { @@ -60,6 +61,7 @@ HANDLE PinHandle; PKSPROPERTY Property; PKSSTREAM_HEADER Packet; + ServerStream * serverstreamlist; } MixerEngine; extern MixerEngine engine; Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,5 +1,5 @@ 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) spec2def(audsrvapi.dll audsrvapi.spec) Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,1 +1,70 @@ -#include "audsrvapi.h" +#include "audsrvapi.h" + +/*All the wrappers for Remote Function should be here*/ +int status = 0; /*There can be any structure which can hold the connection status*/ +/*Every Function should ensure connection*/ + +/*Initialize an audio stream + *Return -1 if callbacks are NULL pointers + */ +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +{ + if(clientstream == NULL ) return -1; + if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; + /*Validity of all other data will be checked at server*/ + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_initstream() function*/ + /*Analyse the return by the function*/ + /*Currently Suppose the return is 0 and a valid streamid is returned*/ + clientstream->stream = &status; + + clientstream->ClientEventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); + clientstream->dead = 0; + + return 0; +} + +WINAPI int playaudio ( ClientStream * clientstream) +{ + /*This is an ActiveScheduler*/ + clientstream->callbacks.OpenComplete(0); + while(1) + { + while(WaitForSingleObject(clientstream->ClientEventPool[0],100)!=0){if(clientstream->dead)goto DEAD;} + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ + Sleep(1000); + printf("Played a virtual buffer on Virtual Audio Server :) %d\n",clientstream->dead); + clientstream->callbacks.BufferCopied(0); + } + clientstream->callbacks.PlayComplete(0); + +DEAD: +printf("\nAudio Thread Ended\n"); + + return 0; +} +WINAPI int stopaudio (ClientStream * clientstream ) +{ + /*Server Side termination is remaining*/ + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_stop() function*/ + clientstream->dead = 1; /*Client Side termination*/ +} +WINAPI int Volume(ClientStream * clientstream, int * volume ) +{ +} +WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume) +{ +} +WINAPI int Write(ClientStream * clientstream ,const char * aData) +{ + if(clientstream->dead) return -1; + SetEvent(clientstream->ClientEventPool[0]); +} +WINAPI int SetBalance(ClientStream * clientstream ,float balance) +{ +} +WINAPI int GetBalance(ClientStream * clientstream ,float * balance) +{ +} Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,2 +1,2 @@ #include "audsrvrpc_c.h" -#include <audsrvapi.h> +#include <audsrv/audsrvapi.h> Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,0 +1,8 @@ +@ stdcall initstream (ptr long long long long long long long) +@ stdcall playaudio ( ptr); +@ stdcall stopaudio (ptr ); +@ stdcall Volume(ptr ptr ); +@ stdcall SetVolume(ptr long); +@ stdcall Write(ptr ptr); +@ stdcall SetBalance(ptr long); +@ stdcall GetBalance(ptr ptr); Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri May 27 21:11:53 2011 @@ -3,10 +3,54 @@ #include <audsrvapi.h> #include <stdio.h> + +void opencomplete (int error ); +void buffercopied (int error ); +void playcomplete (int error ); + +ClientStream clientstream = {NULL,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ + +DWORD WINAPI RunAudioThread(LPVOID param) +{ + ClientStream * localstream = (ClientStream *) param; + printf("Starting Audio Thread \n"); + playaudio(localstream); +} +void opencomplete (int error ) +{ + /*Copy First Buffer and write*/ + Write(&clientstream,"HELLO_RANDOM_STRING"); +} +void buffercopied (int error ) +{ + Write(&clientstream,"HELLO_RANDOM_STRING"); +} +void playcomplete (int error ) +{ + printf("Play Complete Code %d\n",error); +} int __cdecl wmain(int argc, char* argv[]) { - printf("ReactOS Audio Mixer Sample Client.\n"); + int error; + DWORD dwID; + HANDLE audiothread; + char input='\0'; + printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); + //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); + error = initstream ( &clientstream , 44100 , 2 , 16 , KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ + if ( error ) + printf("Failed to Initialize Stream.Error %d\n", error); + else + { + printf("StreamID : %d\n",*((int *)clientstream.stream)); + audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); + } + while ( input != 'a' ) + scanf("%c",&input); + printf("Stoping Audio Stream.\n"); + stopaudio(&clientstream); + WaitForSingleObject(audiothread,INFINITE); return 0; -} +} Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Fri May 27 21:11:53 2011 @@ -1,5 +1,34 @@ -#ifndef _PORTINTERFACE_H -#define _PORTINTERFACE_H +#ifndef _AUDSRVAPI_H +#define _AUDSRVAPI_H +#include <windows.h> +#include <ks.h> +#include <ksmedia.h> +#include <stdio.h> +/********************Structures*********************/ +typedef struct CallBacks +{ + void (*OpenComplete) (int error ); + void (*BufferCopied) (int error ); + void (*PlayComplete) (int error ); +} CallBacks; + +typedef struct ClientStream +{ +HANDLE stream; +int dead; +HANDLE ClientEventPool[1]; /*[0]th event is for Activescheduler*/ +struct CallBacks callbacks; +} ClientStream; + +/********************API Functions******************/ +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); +WINAPI int playaudio ( ClientStream * clientstream); +WINAPI int stopaudio (ClientStream * clientstream ); +WINAPI int Volume(ClientStream * clientstream, int * volume ); +WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume); +WINAPI int Write(ClientStream * clientstream ,const char * aData); +WINAPI int SetBalance(ClientStream * clientstream ,float balance); +WINAPI int GetBalance(ClientStream * clientstream ,float * balance); #endif

1 0

[cgutman] 51963: [UMPNPMGR] - Determine whether the device is really installed by reading the ClassGUID key instead of looking at the device flags - Add a debug print for device installation (shoul...
by cgutman＠svn.reactos.org 27 May '11

27 May '11

Author: cgutman Date: Fri May 27 20:50:17 2011 New Revision: 51963 URL: http://svn.reactos.org/svn/reactos?rev=51963&view=rev Log: [UMPNPMGR] - Determine whether the device is really installed by reading the ClassGUID key instead of looking at the device flags - Add a debug print for device installation (shouldn't be too spammy except and will be helpful for hotplugging) [USETUP] - Reenable the 1st stage PnP manager Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/usetup/interface/usetup.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] Fri May 27 20:50:17 2011 @@ -2241,8 +2241,6 @@ static BOOL InstallDevice(PCWSTR DeviceInstance, BOOL ShowWizard) { - PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - NTSTATUS Status; BOOL DeviceInstalled = FALSE; DWORD BytesWritten; DWORD Value; @@ -2251,6 +2249,8 @@ PROCESS_INFORMATION ProcessInfo; STARTUPINFOW StartupInfo; UUID RandomUuid; + WCHAR RegistryPath[MAX_PATH]; + HKEY DeviceKey; /* The following lengths are constant (see below), they cannot overflow */ WCHAR CommandLine[116]; @@ -2262,26 +2262,30 @@ ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - DeviceInstance); - PlugPlayData.Operation = 0; /* Get status */ - - /* Get device status */ - Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtPlugPlayControl('%S') failed with status 0x%08lx\n", DeviceInstance, Status); - return FALSE; - } - - if ((PlugPlayData.DeviceStatus & (DNF_STARTED | DNF_START_FAILED)) != 0) - { - /* Device is already started, or disabled due to some problem. Don't install it */ - DPRINT("No need to install '%S'\n", DeviceInstance); - return TRUE; - } + wcscpy(RegistryPath, L"SYSTEM\\CurrentControlSet\\Enum\\"); + wcscat(RegistryPath, DeviceInstance); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + RegistryPath, + 0, + KEY_QUERY_VALUE, + &DeviceKey) == ERROR_SUCCESS) + { + if (RegQueryValueExW(DeviceKey, + L"ClassGUID", + NULL, + NULL, + NULL, + NULL) == ERROR_SUCCESS) + { + DPRINT("No need to install: %S\n", DeviceInstance); + return TRUE; + } + + CloseHandle(DeviceKey); + } + + DPRINT1("Installing: %S\n", DeviceInstance); /* Create a random UUID for the named pipe */ UuidCreate(&RandomUuid); @@ -2386,6 +2390,8 @@ if(ProcessInfo.hThread) CloseHandle(ProcessInfo.hThread); + + DPRINT1("Success? %d\n", DeviceInstalled); return DeviceInstalled; } 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 20:50:17 2011 @@ -3776,14 +3776,10 @@ 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, @@ -3795,7 +3791,6 @@ &hPnpThread, NULL); if (!NT_SUCCESS(Status)) -#endif hPnpThread = INVALID_HANDLE_VALUE; if (!CONSOLE_Init())

1 0

[cmihail] 51962: [TCPIP] Closing a socket while in listening state (that has not accepted any connections) no longer certainly crashes the system. There's still a tendency to crash the system somet...
by cmihail＠svn.reactos.org 27 May '11

27 May '11

Author: cmihail Date: Fri May 27 19:37:28 2011 New Revision: 51962 URL: http://svn.reactos.org/svn/reactos?rev=51962&view=rev Log: [TCPIP] Closing a socket while in listening state (that has not accepted any connections) no longer certainly crashes the system. There's still a tendency to crash the system sometimes, but it's related to possibly not canceling any outstanding IRPs for the listening socket. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri May 27 19:37:28 2011 @@ -83,7 +83,8 @@ } BOOLEAN TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener, - PCONNECTION_ENDPOINT Connection ) { + PCONNECTION_ENDPOINT Connection ) +{ PLIST_ENTRY ListEntry; PTDI_BUCKET Bucket; KIRQL OldIrql; @@ -92,18 +93,20 @@ LockObject(Listener, &OldIrql); ListEntry = Listener->ListenRequest.Flink; - while ( ListEntry != &Listener->ListenRequest ) { - Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); + while ( ListEntry != &Listener->ListenRequest ) + { + Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - if( Bucket->AssociatedEndpoint == Connection ) { - DereferenceObject(Bucket->AssociatedEndpoint); - RemoveEntryList( &Bucket->Entry ); - ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG ); - Found = TRUE; - break; - } + if( Bucket->AssociatedEndpoint == Connection ) + { + DereferenceObject(Bucket->AssociatedEndpoint); + RemoveEntryList( &Bucket->Entry ); + ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG ); + Found = TRUE; + break; + } - ListEntry = ListEntry->Flink; + ListEntry = ListEntry->Flink; } UnlockObject(Listener, OldIrql); @@ -131,6 +134,8 @@ if( Bucket ) { Bucket->AssociatedEndpoint = Connection; + ReferenceObject(Bucket->AssociatedEndpoint); + Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; InsertTailList( &Listener->ListenRequest, &Bucket->Entry );

1 0

[jgardou] 51961: [CMAKE] - remove unnecessary file
by jgardou＠svn.reactos.org 27 May '11

27 May '11

Author: jgardou Date: Fri May 27 16:02:15 2011 New Revision: 51961 URL: http://svn.reactos.org/svn/reactos?rev=51961&view=rev Log: [CMAKE] - remove unnecessary file Removed: branches/cmake-bringup/ros_cd.cmake Removed: branches/cmake-bringup/ros_cd.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ros_cd.cmake?rev=… ============================================================================== --- branches/cmake-bringup/ros_cd.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/ros_cd.cmake (removed) @@ -1,159 +1,0 @@ -#reactos.dff -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.dff - COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_SOURCE_DIR}/boot/bootdata/packages/reactos.dff.in ${REACTOS_BINARY_DIR}/boot/reactos.dff - DEPENDS ${REACTOS_SOURCE_DIR}/boot/bootdata/packages/reactos.dff.in) - -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt CAB_TARGET_ENTRIES) -foreach(ENTRY ${CAB_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*" "\\1" _targetname ${ENTRY}) - string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) - get_target_property(_FILENAME ${_targetname} LOCATION) - if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(_FILENAME '\"${_FILENAME}\"') - endif() - add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.dff - COMMAND ${CMAKE_COMMAND} -E echo ${_FILENAME} ${_dir_num} >> ${REACTOS_BINARY_DIR}/boot/reactos.dff - DEPENDS ${_targetname} - APPEND) -endforeach() - -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_cab.txt CAB_TARGET_ENTRIES) -foreach(ENTRY ${CAB_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*" "\\1" _FILENAME ${ENTRY}) - string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) - if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(QUOTED_FILENAME '\"${_FILENAME}\"') - else() - set(QUOTED_FILENAME ${_FILENAME}) - endif() - add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.dff - COMMAND ${CMAKE_COMMAND} -E echo ${QUOTED_FILENAME} ${_dir_num} >> ${REACTOS_BINARY_DIR}/boot/reactos.dff - DEPENDS ${_FILENAME} - APPEND) -endforeach() - -#reactos.cab -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.inf - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot -I -P ${REACTOS_SOURCE_DIR} - DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.dff) -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/reactos.inf -L ${REACTOS_BINARY_DIR}/boot -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.inf) - -#bootcd target -macro(create_bootcd_dir BOOTCD_DIR _target) - - file(MAKE_DIRECTORY - "${BOOTCD_DIR}" - "${BOOTCD_DIR}/loader" - "${BOOTCD_DIR}/reactos" - "${BOOTCD_DIR}/reactos/system32") - - file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) - foreach(ENTRY ${MINICD_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - get_target_property(_FILENAME ${_targetname} LOCATION) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND ${_target}_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} - DEPENDS ${_targetname}) - endforeach() - - file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) - foreach(ENTRY ${MINICD_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND ${_target}_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} - DEPENDS ${_FILENAME}) - endforeach() - - add_custom_command( - OUTPUT ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab - COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.inf ${BOOTCD_DIR}/reactos/reactos.inf - COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.cab ${BOOTCD_DIR}/reactos/reactos.cab - DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.cab) - list(APPEND ${_target}_FILES ${filename} ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab) -endmacro() - -create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcd bootcd) -add_custom_target(bootcd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS ${bootcd_FILES}) -add_dependencies(bootcd dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/bootcd.iso) - -#bootcdregtest target -create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcdregtest bootcdregtest) -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf - COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf - DEPENDS ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest) -add_custom_target(bootcdregtest - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${REACTOS_BINARY_DIR}/boot/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso - DEPENDS ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf ${bootcdregtest_FILES}) -add_dependencies(bootcdregtest dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) - - -#livecd target -file(MAKE_DIRECTORY - "${LIVECD_DIR}" - "${LIVECD_DIR}/loader" - "${LIVECD_DIR}/Profiles" - "${LIVECD_DIR}/Profiles/All Users" - "${LIVECD_DIR}/Profiles/All Users/Desktop" - "${LIVECD_DIR}/Profiles/Default User" - "${LIVECD_DIR}/Profiles/Default User/Desktop" - "${LIVECD_DIR}/Profiles/Default User/My Documents" - "${LIVECD_DIR}/reactos" - "${LIVECD_DIR}/reactos/inf" - "${LIVECD_DIR}/reactos/fonts" - "${LIVECD_DIR}/reactos/system32" - "${LIVECD_DIR}/reactos/system32/config") - -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt LIVECD_TARGET_ENTRIES) -foreach(ENTRY ${LIVECD_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - get_target_property(_FILENAME ${_targetname} LOCATION) - set(filename ${LIVECD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND LIVECD_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${LIVECD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_targetname}) -endforeach() -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt LIVECD_ENTRIES) - -foreach(ENTRY ${LIVECD_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - set(filename ${LIVECD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND LIVECD_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${LIVECD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_FILENAME}) -endforeach() - -add_custom_target(livecd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS ${LIVECD_FILES}) -add_dependencies(livecd isoboot livecd_hives vgafonts) - -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso)

1 0

[ekohl] 51960: [MSPORTS] - Implement a simple property sheet provider for serial ports. The property sheet does not show yet because the dialog resource is not found because a call to FindResourceW...
by ekohl＠svn.reactos.org 27 May '11

27 May '11

Author: ekohl Date: Fri May 27 15:33:12 2011 New Revision: 51960 URL: http://svn.reactos.org/svn/reactos?rev=51960&view=rev Log: [MSPORTS] - Implement a simple property sheet provider for serial ports. The property sheet does not show yet because the dialog resource is not found because a call to FindResourceW fails. Added: trunk/reactos/dll/win32/msports/internal.h (with props) trunk/reactos/dll/win32/msports/lang/ (with props) trunk/reactos/dll/win32/msports/lang/de-DE.rc (with props) trunk/reactos/dll/win32/msports/lang/en-US.rc (with props) trunk/reactos/dll/win32/msports/resource.h (with props) trunk/reactos/dll/win32/msports/serial.c (with props) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msports/msports.c trunk/reactos/dll/win32/msports/msports.rbuild trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/msports/msports.spec trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Fri May 27 15:33:12 2011 @@ -7,6 +7,7 @@ classinst.c comdb.c msports.c + serial.c msports.rc ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msports.def) @@ -17,7 +18,7 @@ target_link_libraries(msports wine) -add_importlibs(msports setupapi advapi32 kernel32 ntdll) +add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) add_importlib_target(msports.spec) Added: trunk/reactos/dll/win32/msports/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/internal… ============================================================================== --- trunk/reactos/dll/win32/msports/internal.h (added) +++ trunk/reactos/dll/win32/msports/internal.h [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,0 +1,9 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\msports\internal.h + * PURPOSE: Global declarations + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +extern HINSTANCE hInstance; Propchange: trunk/reactos/dll/win32/msports/internal.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/internal.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/dll/win32/msports/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 27 15:33:12 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msports/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msports/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msports/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/msports/lang/de-DE.rc [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,0 +1,12 @@ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Port Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 7, 4, 238, 114 + RTEXT "B&its pro Sekunde:", -1, 77, 19, 62, 8, WS_GROUP + COMBOBOX IDC_SERIALBITSPERSECOND, 142, 17, 99, 13, WS_TABSTOP | CBS_DROPDOWNLIST +END Propchange: trunk/reactos/dll/win32/msports/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/lang/de-DE.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/msports/lang/en-US.rc [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,0 +1,12 @@ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Port Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 7, 4, 238, 114 + RTEXT "B&its per second:", -1, 77, 19, 62, 8, WS_GROUP + COMBOBOX IDC_SERIALBITSPERSECOND, 142, 17, 99, 13, WS_TABSTOP | CBS_DROPDOWNLIST +END Propchange: trunk/reactos/dll/win32/msports/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/lang/en-US.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/msports/msports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,7 +1,7 @@ /* * PROJECT: Ports installer library * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/msports/msports.c + * FILE: dll\win32\msports\msports.c * PURPOSE: Library main function * COPYRIGHT: Copyright 2011 Eric Kohl */ @@ -12,6 +12,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msports); +HINSTANCE hInstance; BOOL WINAPI @@ -23,6 +24,7 @@ { case DLL_PROCESS_ATTACH: TRACE("DLL_PROCESS_ATTACH\n"); + hInstance = hinstDll; DisableThreadLibraryCalls(hinstDll); break; } Modified: trunk/reactos/dll/win32/msports/msports.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Fri May 27 15:33:12 2011 @@ -4,9 +4,12 @@ <library>wine</library> <library>kernel32</library> <library>advapi32</library> + <library>comctl32</library> + <library>user32</library> <library>setupapi</library> <file>classinst.c</file> <file>comdb.c</file> <file>msports.c</file> + <file>serial.c</file> <file>msports.rc</file> </module> Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,7 +1,11 @@ #include <windows.h> +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Ports Class Installer\0" #define REACTOS_STR_INTERNAL_NAME "msports\0" #define REACTOS_STR_ORIGINAL_FILENAME "msports.dll\0" #include <reactos/version.rc> + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" Modified: trunk/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.spec [iso-8859-1] Fri May 27 15:33:12 2011 @@ -9,4 +9,4 @@ @ stub ParallelPortPropPageProvider @ stdcall PortsClassInstaller(long ptr ptr) @ stub SerialDisplayAdvancedSettings -@ stub SerialPortPropPageProvider +@ stdcall SerialPortPropPageProvider(ptr ptr long) Added: trunk/reactos/dll/win32/msports/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/resource… ============================================================================== --- trunk/reactos/dll/win32/msports/resource.h (added) +++ trunk/reactos/dll/win32/msports/resource.h [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,0 +1,3 @@ + +#define IDD_SERIALSETTINGS 200 +#define IDC_SERIALBITSPERSECOND 201 Propchange: trunk/reactos/dll/win32/msports/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/resource.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msports/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/serial.c… ============================================================================== --- trunk/reactos/dll/win32/msports/serial.c (added) +++ trunk/reactos/dll/win32/msports/serial.c [iso-8859-1] Fri May 27 15:33:12 2011 @@ -1,0 +1,97 @@ +/* + * PROJECT: Ports installer library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\msports\serial.c + * PURPOSE: Serial Port property functions + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +#include <windows.h> +#include <commctrl.h> +#include <prsht.h> +#include <setupapi.h> + +#include <wine/debug.h> + +#include "internal.h" +#include "resource.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msports); + + +static +BOOL +OnInitDialog(HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + FIXME("Port_OnInit()\n"); + return TRUE; +} + + +static +INT_PTR +CALLBACK +SerialSettingsDlgProc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + FIXME("SerialSettingsDlgProc()\n"); + + switch (uMsg) + { + case WM_INITDIALOG: + return OnInitDialog(hwnd, wParam, lParam); + } + + return FALSE; +} + + +BOOL +WINAPI +SerialPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + LPARAM lParam) +{ + PROPSHEETPAGEW PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + FIXME("SerialPortPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + { + FIXME("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); + + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); + PropSheetPage.dwFlags = 0; + PropSheetPage.hInstance = hInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_SERIALSETTINGS); + PropSheetPage.pfnDlgProc = SerialSettingsDlgProc; + PropSheetPage.lParam = 0; + PropSheetPage.pfnCallback = NULL; + + hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); + if (hPropSheetPage == NULL) + { + FIXME("CreatePropertySheetPageW() failed!\n"); + return FALSE; + } + + if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) + { + FIXME("lpfnAddPropSheetPageProc() failed!\n"); + DestroyPropertySheetPage(hPropSheetPage); + return FALSE; + } + } + + FIXME("Done!\n"); + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msports/serial.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/serial.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=51… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 51959: [SETUPAPI] - SetupDiGetClassDevPropertySheetsW: Improve the way property sheet pages are added to a property sheet. This change enables us to retrieve the number of property sheet pa...
by ekohl＠svn.reactos.org 27 May '11

27 May '11

Author: ekohl Date: Fri May 27 15:07:43 2011 New Revision: 51959 URL: http://svn.reactos.org/svn/reactos?rev=51959&view=rev Log: [SETUPAPI] - SetupDiGetClassDevPropertySheetsW: Improve the way property sheet pages are added to a property sheet. This change enables us to retrieve the number of property sheet pages provided by a property sheet provider without leaking property sheets. Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Fri May 27 15:07:43 2011 @@ -1135,9 +1135,10 @@ struct ClassDevPropertySheetsData { - HPROPSHEETPAGE *PropertySheetPages; - DWORD MaximumNumberOfPages; + LPPROPSHEETHEADERW PropertySheetHeader; + DWORD PropertySheetHeaderPageListSize; DWORD NumberOfPages; + BOOL DontCancel; }; static BOOL WINAPI @@ -1149,14 +1150,16 @@ PropPageData = (struct ClassDevPropertySheetsData *)lParam; - if (PropPageData->NumberOfPages < PropPageData->MaximumNumberOfPages) - { - *PropPageData->PropertySheetPages = hPropSheetPage; - PropPageData->PropertySheetPages++; - } - PropPageData->NumberOfPages++; - return TRUE; + + if (PropPageData->PropertySheetHeader->nPages < PropPageData->PropertySheetHeaderPageListSize) + { + PropPageData->PropertySheetHeader->phpage[PropPageData->PropertySheetHeader->nPages] = hPropSheetPage; + PropPageData->PropertySheetHeader->nPages++; + return TRUE; + } + + return PropPageData->DontCancel; } /*********************************************************************** @@ -1208,6 +1211,7 @@ PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; struct ClassDevPropertySheetsData PropPageData; DWORD dwLength, dwRegType; + DWORD InitialNumberOfPages; DWORD rc; if (DeviceInfoData) @@ -1256,27 +1260,29 @@ goto cleanup; } + InitialNumberOfPages = PropertySheetHeader->nPages; + Request.cbSize = sizeof(SP_PROPSHEETPAGE_REQUEST); Request.PageRequested = SPPSR_ENUM_ADV_DEVICE_PROPERTIES; Request.DeviceInfoSet = DeviceInfoSet; Request.DeviceInfoData = DeviceInfoData; - PropPageData.PropertySheetPages = &PropertySheetHeader->phpage[PropertySheetHeader->nPages]; - PropPageData.MaximumNumberOfPages = PropertySheetHeaderPageListSize - PropertySheetHeader->nPages; + + PropPageData.PropertySheetHeader = PropertySheetHeader; + PropPageData.PropertySheetHeaderPageListSize = PropertySheetHeaderPageListSize; PropPageData.NumberOfPages = 0; - ret = pPropPageProvider(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); - if (!ret) - goto cleanup; + PropPageData.DontCancel = (RequiredSize != NULL) ? TRUE : FALSE; + + pPropPageProvider(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); if (RequiredSize) - *RequiredSize = PropPageData.NumberOfPages + PropertySheetHeader->nPages; - if (PropPageData.NumberOfPages <= PropPageData.MaximumNumberOfPages) - { - PropertySheetHeader->nPages += PropPageData.NumberOfPages; + *RequiredSize = PropPageData.NumberOfPages; + + if (InitialNumberOfPages + PropPageData.NumberOfPages <= PropertySheetHeaderPageListSize) + { ret = TRUE; } else { - PropertySheetHeader->nPages += PropPageData.MaximumNumberOfPages; SetLastError(ERROR_INSUFFICIENT_BUFFER); }

1 0

[nyadav] 51958: CMAKE: Show Extended Debug Messages while building
by nyadav＠svn.reactos.org 27 May '11

27 May '11

Author: nyadav Date: Fri May 27 14:35:50 2011 New Revision: 51958 URL: http://svn.reactos.org/svn/reactos?rev=51958&view=rev Log: CMAKE: Show Extended Debug Messages while building Modified: branches/nyadav-audio-branch/CMakeLists.txt Modified: branches/nyadav-audio-branch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/CMakeLists.… ============================================================================== --- branches/nyadav-audio-branch/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/CMakeLists.txt [iso-8859-1] Fri May 27 14:35:50 2011 @@ -21,6 +21,9 @@ set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) + +#Show Debug Output while Building +SET(CMAKE_VERBOSE_MAKEFILE ON) if(NOT ARCH) set(ARCH i386)

1 0

[janderwald] 51957: [USBOHCI] - Implement function to retrieve isochronous head endpoint descriptor - Implement function to retrieve current frame number - Set isochronous descriptor flag for head ...
by janderwald＠svn.reactos.org 27 May '11

27 May '11

Author: janderwald Date: Fri May 27 13:04:55 2011 New Revision: 51957 URL: http://svn.reactos.org/svn/reactos?rev=51957&view=rev Log: [USBOHCI] - Implement function to retrieve isochronous head endpoint descriptor - Implement function to retrieve current frame number - Set isochronous descriptor flag for head endpoint - Implement retrieve device status for devices - Implement retrieve class status from device - Partly implement isochronous descriptor handling in usb queue - Start implementing isochronous transfers in ISUBRequest - Code currently not tested as the Virtual Machine with XP + ReactOS usbohci driver brings down the host system when starting the iso transfers. Ironically it crashes in MS usbohci driver Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup/drivers/usb/usbohci/interfaces.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri May 27 13:04:55 2011 @@ -62,7 +62,9 @@ NTSTATUS GetBulkHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); NTSTATUS GetControlHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); NTSTATUS GetInterruptEndpointDescriptors(struct _OHCI_ENDPOINT_DESCRIPTOR *** OutDescriptor); + NTSTATUS GetIsochronousHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); VOID HeadEndpointDescriptorModified(ULONG HeadType); + NTSTATUS GetDMA(OUT struct IDMAMemoryManager **m_DmaManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); @@ -80,6 +82,7 @@ KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); + virtual VOID GetCurrentFrameNumber(PULONG FrameNumber); // local BOOLEAN InterruptService(); NTSTATUS InitializeController(); @@ -698,6 +701,17 @@ return STATUS_SUCCESS; } +NTSTATUS +CUSBHardwareDevice::GetIsochronousHeadEndpointDescriptor( + struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) +{ + // + // get descriptor + // + *OutDescriptor = m_IsoEndpointDescriptor; + return STATUS_SUCCESS; +} + VOID CUSBHardwareDevice::HeadEndpointDescriptorModified( ULONG Type) @@ -847,6 +861,11 @@ // Now link the first endpoint to the isochronous endpoint // m_InterruptEndpoints[0]->NextPhysicalEndpoint = m_IsoEndpointDescriptor->PhysicalAddress.LowPart; + + // + // set iso endpoint type + // + m_IsoEndpointDescriptor->Flags |= OHCI_ENDPOINT_ISOCHRONOUS_FORMAT; // // done @@ -1183,6 +1202,15 @@ return OldLevel; } +VOID +CUSBHardwareDevice::GetCurrentFrameNumber( + PULONG FrameNumber) +{ + // + // store frame number + // + *FrameNumber = m_HCCA->CurrentFrameNumber; +} VOID CUSBHardwareDevice::ReleaseDeviceLock( Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Fri May 27 13:04:55 2011 @@ -231,6 +231,8 @@ #define OHCI_ENDPOINT_FULL_SPEED 0x00000000 #define OHCI_ENDPOINT_DIRECTION_OUT 0x00000800 #define OHCI_ENDPOINT_DIRECTION_IN 0x00001000 +#define OHCI_ENDPOINT_GENERAL_FORMAT 0x00000000 +#define OHCI_ENDPOINT_ISOCHRONOUS_FORMAT 0x00008000 // // Maximum port count set by OHCI @@ -293,3 +295,35 @@ #define OHCI_TD_CONDITION_BUFFER_OVERRUN 0x0c #define OHCI_TD_CONDITION_BUFFER_UNDERRUN 0x0d #define OHCI_TD_CONDITION_NOT_ACCESSED 0x0f + +// -------------------------------- +// Isochronous transfer descriptor structure (section 4.3.2) +// -------------------------------- + +#define OHCI_ITD_NOFFSET 8 + +typedef struct _OHCI_ISO_TD_ +{ + + // Hardware part 32 byte + ULONG Flags; + ULONG BufferPhysical; // Physical page number of byte 0 + ULONG NextPhysicalDescriptor; // Next isochronous transfer descriptor + ULONG LastPhysicalByteAddress; // Physical buffer end + ULONG Offset[OHCI_ITD_NOFFSET]; // Buffer offsets + + // Software part + PHYSICAL_ADDRESS PhysicalAddress; // Physical address of this descriptor + struct _OHCI_ISO_TD_ * NextLogicalDescriptor; // Logical pointer next descriptor +}OHCI_ISO_TD, *POHCI_ISO_TD; + +#define OHCI_ITD_GET_STARTING_FRAME(x) ((x) & 0x0000ffff) +#define OHCI_ITD_SET_STARTING_FRAME(x) ((x) & 0xffff) +#define OHCI_ITD_GET_DELAY_INTERRUPT(x) (((x) >> 21) & 7) +#define OHCI_ITD_SET_DELAY_INTERRUPT(x) ((x) << 21) +#define OHCI_ITD_NO_INTERRUPT 0x00e00000 +#define OHCI_ITD_GET_FRAME_COUNT(x) ((((x) >> 24) & 7) + 1) +#define OHCI_ITD_SET_FRAME_COUNT(x) (((x) - 1) << 24) +#define OHCI_ITD_GET_CONDITION_CODE(x) ((x) >> 28) +#define OHCI_ITD_NO_CONDITION_CODE 0xf0000000 + Modified: branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri May 27 13:04:55 2011 @@ -1119,7 +1119,10 @@ IN OUT PIRP Irp, PURB Urb) { - PUSHORT Status; + PUSHORT DeviceStatus; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; // // sanity checks @@ -1127,22 +1130,54 @@ PC_ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBufferLength >= sizeof(USHORT)); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBuffer); - PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); // // get status buffer // - Status = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; - - // - // FIXME need more flags ? - // - *Status = USB_PORT_STATUS_CONNECT; + DeviceStatus = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; + + + if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + { + // + // FIXME need more flags ? + // + *DeviceStatus = USB_PORT_STATUS_CONNECT; + return STATUS_SUCCESS; + } + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = 0; + CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x80; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done // - return STATUS_SUCCESS; + return Status; } //----------------------------------------------------------------------------------------- @@ -1155,6 +1190,8 @@ PUSB_HUB_DESCRIPTOR UsbHubDescriptor; ULONG PortCount, Dummy2; USHORT Dummy1; + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); @@ -1163,6 +1200,36 @@ // switch(Urb->UrbControlVendorClassRequest.Request) { + case USB_REQUEST_GET_STATUS: + { + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0xA0; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + break; + } case USB_REQUEST_GET_DESCRIPTOR: { switch (Urb->UrbControlVendorClassRequest.Value >> 8) Modified: branches/usb-bringup/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] Fri May 27 13:04:55 2011 @@ -190,6 +190,15 @@ //----------------------------------------------------------------------------------------- // +// GetIsochronousHeadEndpointDescriptor +// +// Description: returns the control head endpoint descriptor + + virtual NTSTATUS GetIsochronousHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) = 0; + + +//----------------------------------------------------------------------------------------- +// // GetInterruptEndpointDescriptors // // Description: returns interrupt endpoint descriptors @@ -301,6 +310,14 @@ // Description: releases the device lock virtual void ReleaseDeviceLock(KIRQL OldLevel) = 0; + +//---------------------------------------------------------------------------------------- +// +// GetCurrentFrameNumber +// +// Description: returns the current frame number + + virtual VOID GetCurrentFrameNumber(PULONG FrameNumber) = 0; }; typedef IUSBHardwareDevice *PUSBHARDWAREDEVICE; Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri May 27 13:04:55 2011 @@ -61,6 +61,7 @@ PUSBHARDWAREDEVICE m_Hardware; // hardware POHCI_ENDPOINT_DESCRIPTOR m_BulkHeadEndpointDescriptor; // bulk head descriptor POHCI_ENDPOINT_DESCRIPTOR m_ControlHeadEndpointDescriptor; // control head descriptor + POHCI_ENDPOINT_DESCRIPTOR m_IsoHeadEndpointDescriptor; // isochronous head descriptor POHCI_ENDPOINT_DESCRIPTOR * m_InterruptEndpoints; }; @@ -101,6 +102,9 @@ Hardware->GetControlHeadEndpointDescriptor(&m_ControlHeadEndpointDescriptor); // + Hardware->GetIsochronousHeadEndpointDescriptor(&m_IsoHeadEndpointDescriptor); + + // // get interrupt endpoints // Hardware->GetInterruptEndpointDescriptors(&m_InterruptEndpoints); @@ -164,6 +168,8 @@ KIRQL OldLevel; POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor; POHCI_ENDPOINT_DESCRIPTOR Descriptor; + POHCI_ISO_TD CurrentDescriptor; + ULONG FrameNumber; DPRINT("CUSBQueue::AddUSBRequest\n"); @@ -176,39 +182,6 @@ // get request type // Type = Request->GetTransferType(); - - // - // check if supported - // - switch(Type) - { - case USB_ENDPOINT_TYPE_ISOCHRONOUS: - /* NOT IMPLEMENTED IN QUEUE */ - Status = STATUS_NOT_SUPPORTED; - break; - case USB_ENDPOINT_TYPE_INTERRUPT: - case USB_ENDPOINT_TYPE_CONTROL: - case USB_ENDPOINT_TYPE_BULK: - Status = STATUS_SUCCESS; - break; - default: - /* BUG */ - PC_ASSERT(FALSE); - Status = STATUS_NOT_SUPPORTED; - } - - // - // check for success - // - if (!NT_SUCCESS(Status)) - { - // - // request not supported, please try later - // - DPRINT1("Request Type %x not supported\n", Type); - ASSERT(FALSE); - return Status; - } // // add extra reference which is released when the request is completed @@ -258,6 +231,48 @@ HeadDescriptor = FindInterruptEndpointDescriptor(Request->GetInterval()); ASSERT(HeadDescriptor); } + else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // get head descriptor + // + HeadDescriptor = m_IsoHeadEndpointDescriptor; + + // + // get current frame number + // + m_Hardware->GetCurrentFrameNumber(&FrameNumber); + + // + // increment frame number + // + FrameNumber++; + + // + // apply frame number to iso transfer descriptors + // + CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; + + DPRINT1("ISO: NextFrameNumber %x\n", FrameNumber); + + while(CurrentDescriptor) + { + // + // set current frame number + // + CurrentDescriptor->Flags |= OHCI_ITD_SET_STARTING_FRAME(FrameNumber); + + // + // move to next frame number + // + FrameNumber++; + + // + // move to next descriptor + // + CurrentDescriptor = CurrentDescriptor->NextLogicalDescriptor; + } + } // // insert endpoint at end @@ -269,9 +284,6 @@ // Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; - DPRINT("Request %x Logical %x added to queue Queue %p Logical %x\n", Descriptor, Descriptor->PhysicalAddress.LowPart, HeadDescriptor, HeadDescriptor->PhysicalAddress.LowPart); - - if (Type == USB_ENDPOINT_TYPE_CONTROL || Type == USB_ENDPOINT_TYPE_BULK) { // @@ -279,6 +291,7 @@ // m_Hardware->HeadEndpointDescriptorModified(Type); } + return STATUS_SUCCESS; } Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Fri May 27 13:04:55 2011 @@ -57,9 +57,11 @@ NTSTATUS BuildSetupPacketFromURB(); NTSTATUS BuildControlTransferDescriptor(POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor); NTSTATUS BuildBulkInterruptEndpoint(POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor); + NTSTATUS BuildIsochronousEndpoint(POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor); NTSTATUS CreateGeneralTransferDescriptor(POHCI_GENERAL_TD* OutDescriptor, ULONG BufferSize); VOID FreeDescriptor(POHCI_GENERAL_TD Descriptor); NTSTATUS AllocateEndpointDescriptor(OUT POHCI_ENDPOINT_DESCRIPTOR *OutDescriptor); + NTSTATUS CreateIsochronousTransferDescriptor(OUT POHCI_ISO_TD *OutDescriptor, ULONG FrameCount); UCHAR GetEndpointAddress(); USHORT GetMaxPacketSize(); @@ -243,6 +245,81 @@ // switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_ISOCH_TRANSFER: + { + // + // there must be at least one packet + // + ASSERT(Urb->UrbIsochronousTransfer.NumberOfPackets); + + // + // is there data to be transferred + // + if (Urb->UrbIsochronousTransfer.TransferBufferLength) + { + // + // Check if there is a MDL + // + if (!Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) + { + // + // sanity check + // + PC_ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + + // + // Create one using TransferBuffer + // + DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + m_TransferBufferMDL = IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, + FALSE, + FALSE, + NULL); + + if (!m_TransferBufferMDL) + { + // + // failed to allocate mdl + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build mdl for non paged pool + // FIXME: Does hub driver already do this when passing MDL? + // + MmBuildMdlForNonPagedPool(m_TransferBufferMDL); + } + else + { + // + // use provided mdl + // + m_TransferBufferMDL = Urb->UrbIsochronousTransfer.TransferBufferMDL; + } + } + + // + // save buffer length + // + m_TransferBufferLength = Urb->UrbIsochronousTransfer.TransferBufferLength; + + // + // Set Length Completed to 0 + // + m_TransferBufferLengthCompleted = 0; + + // + // get endpoint descriptor + // + m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbIsochronousTransfer.PipeHandle; + + // + // completed initialization + // + break; + } // // luckily those request have the same structure layout // @@ -525,6 +602,230 @@ m_DmaManager->Release(Descriptor, sizeof(OHCI_GENERAL_TD)); } + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBRequest::CreateIsochronousTransferDescriptor( + POHCI_ISO_TD* OutDescriptor, + ULONG FrameCount) +{ + POHCI_ISO_TD Descriptor; + PHYSICAL_ADDRESS DescriptorAddress; + NTSTATUS Status; + + // + // allocate transfer descriptor + // + Status = m_DmaManager->Allocate(sizeof(OHCI_ISO_TD), (PVOID*)&Descriptor, &DescriptorAddress); + if (!NT_SUCCESS(Status)) + { + // + // no memory + // + return Status; + } + + // + // initialize descriptor, hardware part + // + Descriptor->Flags = OHCI_ITD_SET_FRAME_COUNT(FrameCount) | OHCI_ITD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED); + Descriptor->BufferPhysical = 0; + Descriptor->NextPhysicalDescriptor = 0; + Descriptor->LastPhysicalByteAddress = 0; + + // + // software part + // + Descriptor->PhysicalAddress.QuadPart = DescriptorAddress.QuadPart; + Descriptor->NextLogicalDescriptor = 0; + + // + // store result + // + *OutDescriptor = Descriptor; + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBRequest::BuildIsochronousEndpoint( + POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor) +{ + POHCI_ISO_TD FirstDescriptor, PreviousDescriptor = NULL, CurrentDescriptor; + POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; + ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset; + NTSTATUS Status; + PVOID Buffer; + PIO_STACK_LOCATION IoStack; + PURB Urb; + + DPRINT1("cp\n"); + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(m_Irp); + + // + // sanity check + // + PC_ASSERT(IoStack->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL); + PC_ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_SUBMIT_URB); + PC_ASSERT(IoStack->Parameters.Others.Argument1 != 0); + + // + // get urb + // + Urb = (PURB)IoStack->Parameters.Others.Argument1; + ASSERT(Urb); + + // + // allocate endpoint descriptor + // + Status = AllocateEndpointDescriptor(&EndpointDescriptor); + if (!NT_SUCCESS(Status)) + { + // + // failed to create setup descriptor + // + return Status; + } + DPRINT1("cp\n"); + // + // get buffer + // + Buffer = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); + ASSERT(Buffer); + + DPRINT1("cp\n"); + while(Index < Urb->UrbIsochronousTransfer.NumberOfPackets) + { + // + // get number of packets remaining + // + NumberOfPackets = min(Urb->UrbIsochronousTransfer.NumberOfPackets - Index, OHCI_ITD_NOFFSET); + DPRINT1("cp Number Packets %lu\n", NumberOfPackets); + // + // allocate iso descriptor + // + Status = CreateIsochronousTransferDescriptor(&CurrentDescriptor, NumberOfPackets); + if (!NT_SUCCESS(Status)) + { + // + // FIXME: cleanup + // failed to allocate descriptor + // + ASSERT(FALSE); + return Status; + } + DPRINT1("cp\n"); + // + // initialize descriptor + // + CurrentDescriptor->BufferPhysical = (MmGetPhysicalAddress(Buffer).LowPart & ~ (PAGE_SIZE - 1)); + + // + // get page offset + // + PageOffset = BYTE_OFFSET(MmGetPhysicalAddress(Buffer).LowPart); + DPRINT1("cp\n"); + for(SubIndex = 0; SubIndex < NumberOfPackets; SubIndex++) + { + // + // store buffer offset + // + CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset + PageOffset; + } + + // + // increment packet offset + // + Index += NumberOfPackets; + + // + // check if this is the last descriptor + // + if (Index == Urb->UrbIsochronousTransfer.NumberOfPackets) + { + // + // end of transfer + // + CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + m_TransferBufferLength - 1; + } + else + { + // + // use start address of next packet - 1 + // + CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + PageOffset + Urb->UrbIsochronousTransfer.IsoPacket[Index + 1].Offset - 1; + + // + // move buffer to next address + // + Buffer = (PVOID)((ULONG_PTR)Buffer + Urb->UrbIsochronousTransfer.IsoPacket[Index + 1].Offset); + } + + // + // is there a previous descriptor + // + if (PreviousDescriptor) + { + // + // link descriptors + // + PreviousDescriptor->NextLogicalDescriptor = CurrentDescriptor; + PreviousDescriptor->NextPhysicalDescriptor = CurrentDescriptor->PhysicalAddress.LowPart; + } + else + { + // + // first descriptor + // + FirstDescriptor = CurrentDescriptor; + } + + // + // store as previous descriptor + // + PreviousDescriptor = CurrentDescriptor; + } + DPRINT1("cp\n"); + + // + // clear interrupt mask for last transfer descriptor + // + CurrentDescriptor->Flags &= ~OHCI_TD_INTERRUPT_MASK; + + // + // fire interrupt as soon transfer is finished + // + CurrentDescriptor->Flags |= OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); + + // + // set isochronous type + // + EndpointDescriptor->Flags |= OHCI_ENDPOINT_ISOCHRONOUS_FORMAT; + + // + // now link descriptor to endpoint + // + EndpointDescriptor->HeadPhysicalDescriptor = FirstDescriptor->PhysicalAddress.LowPart; + EndpointDescriptor->TailPhysicalDescriptor = CurrentDescriptor->PhysicalAddress.LowPart; + EndpointDescriptor->HeadLogicalDescriptor = FirstDescriptor; + DPRINT1("cp\n"); + // + // store result + // + *OutEndpointDescriptor = EndpointDescriptor; + + // + // done + // + return STATUS_SUCCESS; +} + //---------------------------------------------------------------------------------------- NTSTATUS CUSBRequest::CreateGeneralTransferDescriptor( @@ -1084,8 +1385,7 @@ Status = BuildBulkInterruptEndpoint(OutDescriptor); break; case USB_ENDPOINT_TYPE_ISOCHRONOUS: - DPRINT1("USB_ENDPOINT_TYPE_ISOCHRONOUS not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = BuildIsochronousEndpoint((POHCI_ENDPOINT_DESCRIPTOR*)OutDescriptor); break; default: PC_ASSERT(FALSE); @@ -1201,7 +1501,6 @@ CUSBRequest::CompletionCallback( struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) { - POHCI_GENERAL_TD TransferDescriptor, NextTransferDescriptor; PIO_STACK_LOCATION IoStack; PURB Urb;

1 0

[cmihail] 51956: Slightly updated todo list.
by cmihail＠svn.reactos.org 27 May '11

27 May '11

Author: cmihail Date: Fri May 27 10:54:23 2011 New Revision: 51956 URL: http://svn.reactos.org/svn/reactos?rev=51956&view=rev Log: Slightly updated todo list. Modified: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt Modified: branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/todo_gsoc… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/todo_gsoc.txt [iso-8859-1] Fri May 27 10:54:23 2011 @@ -1,7 +1,7 @@ Tasks to do by the end of GSoC (sorted in decending order by importance): 1) Make sure all basic functinalities are working - - accept so far is not which should be fixed + - accept does not work currently and needs immediate attention 2) Create a test application that simulates heavy usage @@ -9,9 +9,12 @@ check whether we have any memory leaks, broken functionality or fatal blue screen errors. -3) Improve existing IOCTLs. -4) Improve support for netstat (e.g. netstat -na). +3) Investigate performace issues, especially related to throughput +4) Improve existing IOCTLs. +5) Improve support for netstat (e.g. netstat -na). +6) Consider replacing existing version of lwIP with v1.4 + (or if appliable newer) Notes: - 2) Worth looking into how we can take advantage of firefox's

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