Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[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

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 );

13 years, 7 months

[jgardou] 51961: [CMAKE] - remove unnecessary file

by jgardou＠svn.reactos.org

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)

13 years, 7 months

[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

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.

13 years, 7 months

[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

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); }

13 years, 7 months

[nyadav] 51958: CMAKE: Show Extended Debug Messages while building

by nyadav＠svn.reactos.org

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)

13 years, 7 months

[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

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;

13 years, 7 months

[cmihail] 51956: Slightly updated todo list.

by cmihail＠svn.reactos.org

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

13 years, 7 months

[nyadav] 51955: [AUDSRV] Modify Architecture of server to use RPC

by nyadav＠svn.reactos.org

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

13 years, 7 months

[nyadav] 51954: [AUDSRV] Add a client to test audio server

by nyadav＠svn.reactos.org

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

13 years, 7 months

[nyadav] 51953: [AUDSRV] AUDIO server modified headers and new IDL files

by nyadav＠svn.reactos.org

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

13 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011