Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 52085: [CMAKE] * Fix unix build. We need to quote the file paths in reactos.dff for cabman to parse them correctly. Dedicated to Arty.
by akhaldi＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: akhaldi Date: Sat Jun 4 23:45:11 2011 New Revision: 52085 URL: http://svn.reactos.org/svn/reactos?rev=52085&view=rev Log: [CMAKE] * Fix unix build. We need to quote the file paths in reactos.dff for cabman to parse them correctly. Dedicated to Arty. Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Jun 4 23:45:11 2011 @@ -150,7 +150,11 @@ else() #add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + else() + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${_CD_FILE}\" ${_num}\n") + endif() if(_CD_TARGET) #manage dependency add_dependencies(reactos_cab ${_CD_TARGET})

1 0

[ekohl] 52084: [MSPORTS] Protect the COM database from concurrent access.
by ekohl＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: ekohl Date: Sat Jun 4 21:07:28 2011 New Revision: 52084 URL: http://svn.reactos.org/svn/reactos?rev=52084&view=rev Log: [MSPORTS] Protect the COM database from concurrent access. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Sat Jun 4 21:07:28 2011 @@ -17,6 +17,7 @@ typedef struct _COMDB { + HANDLE hMutex; HKEY hKey; } COMDB, *PCOMDB; @@ -44,6 +45,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -52,7 +56,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -61,7 +68,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -102,6 +110,10 @@ } done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap); @@ -135,6 +147,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -143,7 +158,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -152,7 +170,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -203,6 +222,10 @@ } done: + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap); @@ -218,7 +241,8 @@ TRACE("ComDBClose(%p)\n", hComDB); - if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || hComDB == NULL) + if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || + hComDB == NULL) return ERROR_INVALID_PARAMETER; pComDB = (PCOMDB)hComDB; @@ -226,6 +250,10 @@ /* Close the registry key */ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); + + /* Close the mutex */ + if (pComDB->hMutex != NULL) + CloseHandle(pComDB->hMutex); /* Release the database */ HeapFree(GetProcessHeap(), 0, pComDB); @@ -267,8 +295,24 @@ if (pComDB == NULL) { ERR("Failed to allocate the database!\n"); + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; return ERROR_ACCESS_DENIED; } + + /* Create a mutex to protect the database */ + pComDB->hMutex = CreateMutexW(NULL, + FALSE, + L"ComDBMutex"); + if (pComDB->hMutex == NULL) + { + ERR("Failed to create the mutex!\n"); + HeapFree(GetProcessHeap(), 0, pComDB); + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; + return ERROR_ACCESS_DENIED; + } + + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); /* Create or open the database key */ lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, @@ -316,11 +360,17 @@ } done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + if (lError != ERROR_SUCCESS) { /* Clean up in case of failure */ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); + + if (pComDB->hMutex != NULL) + CloseHandle(pComDB->hMutex); HeapFree(GetProcessHeap(), 0, pComDB); @@ -361,6 +411,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -369,7 +422,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -378,7 +434,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -416,6 +473,10 @@ dwSize); done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap);

1 0

[cgutman] 52083: [AFD] - Disassociate the connection from the address file before closing them
by cgutman＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: cgutman Date: Sat Jun 4 20:31:05 2011 New Revision: 52083 URL: http://svn.reactos.org/svn/reactos?rev=52083&view=rev Log: [AFD] - Disassociate the connection from the address file before closing them Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -460,7 +460,10 @@ ExFreePool( FCB->RemoteAddress ); if( FCB->Connection.Object ) + { + TdiDisassociateAddressFile(FCB->Connection.Object); ObDereferenceObject(FCB->Connection.Object); + } if( FCB->AddressFile.Object ) ObDereferenceObject(FCB->AddressFile.Object); Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -420,6 +420,55 @@ return Status; } +NTSTATUS TdiDisassociateAddressFile( + PFILE_OBJECT ConnectionObject) +/* + * FUNCTION: Disassociates a connection endpoint from an address file object + * ARGUMENTS: + * ConnectionObject = Connection endpoint file object + * RETURNS: + * Status of operation + */ +{ + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + KEVENT Event; + PIRP Irp; + + AFD_DbgPrint(MAX_TRACE, ("Called. ConnectionObject (0x%X)\n", ConnectionObject)); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = TdiBuildInternalDeviceControlIrp(TDI_DISASSOCIATE_ADDRESS, /* Sub function */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + &Event, /* Event */ + &Iosb); /* Status */ + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + TdiBuildDisassociateAddress(Irp, + DeviceObject, + ConnectionObject, + NULL, + NULL); + + Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); + + return Status; +} NTSTATUS TdiListen ( PIRP *Irp, @@ -1229,7 +1278,7 @@ } Irp = TdiBuildInternalDeviceControlIrp - ( TDI_SEND_DATAGRAM, /* Sub function */ + ( TDI_DISCONNECT, /* Sub function */ DeviceObject, /* Device object */ TransportObject, /* File object */ &Event, /* Event */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -360,6 +360,9 @@ HANDLE AddressHandle, PFILE_OBJECT ConnectionObject); +NTSTATUS TdiDisassociateAddressFile( + PFILE_OBJECT ConnectionObject); + NTSTATUS TdiListen ( PIRP *Irp, PFILE_OBJECT ConnectionObject,

1 0

[cmihail] 52082: Simple test apps for functionality checks: - server.exe and client.exe do a simple exchange of messages (each sends one message to the other) and then terminate. - server_multi.exe...
by cmihail＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: cmihail Date: Sat Jun 4 20:02:42 2011 New Revision: 52082 URL: http://svn.reactos.org/svn/reactos?rev=52082&view=rev Log: Simple test apps for functionality checks: - server.exe and client.exe do a simple exchange of messages (each sends one message to the other) and then terminate. - server_multi.exe and client_multi.exe exchange 3 message with one another before termination. - client_delayed.exe waits one second before sending any message to the server after a connection ahs been made (otherwise identical to client.exe) Added: branches/GSoC_2011/TcpIpDriver/tests/ (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/ (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.c (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.exe (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_delayed.exe (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_multi.exe (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.c (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.exe (with props) branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server_multi.exe (with props) Propchange: branches/GSoC_2011/TcpIpDriver/tests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jun 4 20:02:42 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/TcpIpDriver/tests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/TcpIpDriver/tests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/TcpIpDriver/tests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jun 4 20:02:42 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.c ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.exe URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client.exe ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_delayed.exe URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_delayed.exe ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_multi.exe URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/client_multi.exe ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.c ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.exe URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server.exe ------------------------------------------------------------------------------ svn:mime-type = octet-stream/ Added: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server_multi.exe URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/tests/sim… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2011/TcpIpDriver/tests/simplesocket/server_multi.exe ------------------------------------------------------------------------------ svn:mime-type = octet-stream/

1 0

[nyadav] 52081: [AUDSRV] Turn Off verbosity
by nyadav＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: nyadav Date: Sat Jun 4 18:39:06 2011 New Revision: 52081 URL: http://svn.reactos.org/svn/reactos?rev=52081&view=rev Log: [AUDSRV] Turn Off verbosity 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] Sat Jun 4 18:39:06 2011 @@ -23,7 +23,7 @@ set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) #Show Debug Output while Building -SET(CMAKE_VERBOSE_MAKEFILE ON) +#SET(CMAKE_VERBOSE_MAKEFILE ON) if(NOT ARCH) set(ARCH i386)

1 0

[tkreuzer] 52080: [DDK/XDK] Merge some changes to wdm.h back to xdk
by tkreuzer＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: tkreuzer Date: Sat Jun 4 16:59:09 2011 New Revision: 52080 URL: http://svn.reactos.org/svn/reactos?rev=52080&view=rev Log: [DDK/XDK] Merge some changes to wdm.h back to xdk Modified: trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Sat Jun 4 16:59:09 2011 @@ -131,14 +131,14 @@ #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) NTKERNELAPI -PSINGLE_LIST_ENTRY +PSINGLE_LIST_ENTRY FASTCALL ExInterlockedPopEntrySList( IN PSLIST_HEADER ListHead, IN PKSPIN_LOCK Lock); NTKERNELAPI -PSINGLE_LIST_ENTRY +PSINGLE_LIST_ENTRY FASTCALL ExInterlockedPushEntrySList( IN PSLIST_HEADER ListHead, Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Sat Jun 4 16:59:09 2011 @@ -161,7 +161,7 @@ OUT PLARGE_INTEGER CurrentTime); #endif /* !_M_AMD64 */ -#if !defined(_X86_) +#if !defined(_X86_) && !defined(_M_ARM) NTKERNELAPI KIRQL NTAPI Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmfuncs.h [iso-8859-1] Sat Jun 4 16:59:09 2011 @@ -118,6 +118,7 @@ ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset)) #define MmGetProcedureAddress(Address) (Address) +#define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address) /* PVOID MmGetSystemAddressForMdl( * IN PMDL Mdl); Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sat Jun 4 16:59:09 2011 @@ -170,7 +170,7 @@ #elif defined(_WDM_INCLUDED_) typedef struct _DMA_ADAPTER *PADAPTER_OBJECT; #else -typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; +typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; #endif #ifndef DEFINE_GUIDEX @@ -191,7 +191,7 @@ #ifdef __cplusplus inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) { - return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && + return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1)) ); } #else

1 0

[tkreuzer] 52079: [NTOSKRNL/DDK] - add definition for KeMemoryBarrierWithoutFence - add x64 version of KeMemoryBarrier and some related defines - Use KeMemoryBarrierWithoutFence in spinlocks as sug...
by tkreuzer＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: tkreuzer Date: Sat Jun 4 15:42:32 2011 New Revision: 52079 URL: http://svn.reactos.org/svn/reactos?rev=52079&view=rev Log: [NTOSKRNL/DDK] - add definition for KeMemoryBarrierWithoutFence - add x64 version of KeMemoryBarrier and some related defines - Use KeMemoryBarrierWithoutFence in spinlocks as suggested by Alex Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/amd64/ke.h trunk/reactos/include/xdk/x86/ke.h trunk/reactos/ntoskrnl/include/internal/spinlock.h trunk/reactos/ntoskrnl/ke/amd64/spinlock.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5207… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Jun 4 15:42:32 2011 @@ -170,7 +170,7 @@ #elif defined(_WDM_INCLUDED_) typedef struct _DMA_ADAPTER *PADAPTER_OBJECT; #else -typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; +typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; #endif #ifndef DEFINE_GUIDEX @@ -191,7 +191,7 @@ #ifdef __cplusplus inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) { - return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && + return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1)) ); } #else @@ -7718,6 +7718,8 @@ #endif } +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() + NTHALAPI KIRQL NTAPI @@ -7875,6 +7877,21 @@ #define KeGetDcacheFillSize() 1L #define YieldProcessor _mm_pause +#define FastFence __faststorefence +#define LoadFence _mm_lfence +#define MemoryFence _mm_mfence +#define StoreFence _mm_sfence +#define LFENCE_ACQUIRE() LoadFence() + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + FastFence(); + LFENCE_ACQUIRE(); +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() FORCEINLINE KIRQL @@ -13290,14 +13307,14 @@ #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) NTKERNELAPI -PSINGLE_LIST_ENTRY +PSINGLE_LIST_ENTRY FASTCALL ExInterlockedPopEntrySList( IN PSLIST_HEADER ListHead, IN PKSPIN_LOCK Lock); NTKERNELAPI -PSINGLE_LIST_ENTRY +PSINGLE_LIST_ENTRY FASTCALL ExInterlockedPushEntrySList( IN PSLIST_HEADER ListHead, Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… ============================================================================== --- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Sat Jun 4 15:42:32 2011 @@ -45,6 +45,22 @@ #define KeGetDcacheFillSize() 1L #define YieldProcessor _mm_pause +#define FastFence __faststorefence +#define LoadFence _mm_lfence +#define MemoryFence _mm_mfence +#define StoreFence _mm_sfence +#define LFENCE_ACQUIRE() LoadFence() + +FORCEINLINE +VOID +KeMemoryBarrier(VOID) +{ + // FIXME: Do we really need lfence after the __faststorefence ? + FastFence(); + LFENCE_ACQUIRE(); +} + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() FORCEINLINE KIRQL Modified: trunk/reactos/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/x86/ke.h?rev=5… ============================================================================== --- trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] Sat Jun 4 15:42:32 2011 @@ -58,6 +58,8 @@ __asm xchg [Barrier], eax #endif } + +#define KeMemoryBarrierWithoutFence() _ReadWriteBarrier() NTHALAPI KIRQL Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Sat Jun 4 15:42:32 2011 @@ -24,7 +24,7 @@ /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ - _ReadWriteBarrier(); + KeMemoryBarrierWithoutFence(); } // @@ -39,7 +39,7 @@ /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ - _ReadWriteBarrier(); + KeMemoryBarrierWithoutFence(); } #else Modified: trunk/reactos/ntoskrnl/ke/amd64/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/spinlock… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] Sat Jun 4 15:42:32 2011 @@ -173,7 +173,7 @@ /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ - _ReadWriteBarrier(); + KeMemoryBarrierWithoutFence(); /* Always return true on UP Machines */ return TRUE; @@ -196,7 +196,7 @@ /* Add an explicit memory barrier to prevent the compiler from reordering memory accesses across the borders of spinlocks */ - _ReadWriteBarrier(); + KeMemoryBarrierWithoutFence(); /* Always return true on UP Machines */ return TRUE;

1 0

[tkreuzer] 52078: [NTOSKRNL/HAL] - Add explicit memory barriers to KxAcquireSpinLock, KxReleaseSpinLock inline functions and KeTryToAcquireQueuedSpinLock, KeTryToAcquireQueuedSpinLockRaiseToSynch i...
by tkreuzer＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: tkreuzer Date: Sat Jun 4 12:33:54 2011 New Revision: 52078 URL: http://svn.reactos.org/svn/reactos?rev=52078&view=rev Log: [NTOSKRNL/HAL] - Add explicit memory barriers to KxAcquireSpinLock, KxReleaseSpinLock inline functions and KeTryToAcquireQueuedSpinLock, KeTryToAcquireQueuedSpinLockRaiseToSynch in the UP case. This will prevent the compiler from reordering memory access instructions across the boundaries of these functions, even when being inlined. - Use the inline functions in x64 spinlock functions, too Modified: trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/ntoskrnl/include/internal/spinlock.h trunk/reactos/ntoskrnl/ke/amd64/spinlock.c Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Sat Jun 4 12:33:54 2011 @@ -188,6 +188,10 @@ /* Simply raise to synch */ KeRaiseIrql(SYNCH_LEVEL, OldIrql); + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); + /* Always return true on UP Machines */ return TRUE; } @@ -208,6 +212,10 @@ /* Simply raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, OldIrql); + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); + /* Always return true on UP Machines */ return TRUE; } Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Sat Jun 4 12:33:54 2011 @@ -21,6 +21,10 @@ { /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ UNREFERENCED_PARAMETER(SpinLock); + + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); } // @@ -32,6 +36,10 @@ { /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ UNREFERENCED_PARAMETER(SpinLock); + + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); } #else Modified: trunk/reactos/ntoskrnl/ke/amd64/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/spinlock… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] Sat Jun 4 12:33:54 2011 @@ -23,14 +23,14 @@ KIRQL KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) { -#ifndef CONFIG_SMP - KIRQL OldIrql; - /* Simply raise to dispatch */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - return OldIrql; -#else - UNIMPLEMENTED; -#endif + KIRQL OldIrql; + + /* Raise to sync */ + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); + + /* Acquire the lock and return */ + KxAcquireSpinLock(SpinLock); + return OldIrql; } /* @@ -40,14 +40,14 @@ NTAPI KeAcquireSpinLockRaiseToDpc(PKSPIN_LOCK SpinLock) { -#ifndef CONFIG_SMP - KIRQL OldIrql; - /* Simply raise to dispatch */ + KIRQL OldIrql; + + /* Raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - return OldIrql; -#else - UNIMPLEMENTED; -#endif + + /* Acquire the lock and return */ + KxAcquireSpinLock(SpinLock); + return OldIrql; } /* @@ -58,12 +58,9 @@ KeReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL OldIrql) { -#ifndef CONFIG_SMP - /* Simply lower IRQL back */ + /* Release the lock and lower IRQL back */ + KxReleaseSpinLock(SpinLock); KeLowerIrql(OldIrql); -#else - UNIMPLEMENTED; -#endif } /* @@ -72,14 +69,14 @@ KIRQL KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { -#ifndef CONFIG_SMP - KIRQL OldIrql; - /* Simply raise to dispatch */ + KIRQL OldIrql; + + /* Raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - return OldIrql; -#else - UNIMPLEMENTED; -#endif + + /* Acquire the lock */ + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + return OldIrql; } /* @@ -88,14 +85,14 @@ KIRQL KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { -#ifndef CONFIG_SMP - KIRQL OldIrql; - /* Simply raise to dispatch */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - return OldIrql; -#else - UNIMPLEMENTED; -#endif + KIRQL OldIrql; + + /* Raise to synch */ + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); + + /* Acquire the lock */ + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + return OldIrql; } /* @@ -105,13 +102,17 @@ KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, IN PKLOCK_QUEUE_HANDLE LockHandle) { -#ifndef CONFIG_SMP - /* Simply raise to dispatch */ + /* Set up the lock */ + LockHandle->LockQueue.Next = NULL; + LockHandle->LockQueue.Lock = SpinLock; + + /* Raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, &LockHandle->OldIrql); -#else - UNIMPLEMENTED; -#endif -} + + /* Acquire the lock */ + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK +} + /* * @implemented @@ -120,13 +121,17 @@ KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, IN PKLOCK_QUEUE_HANDLE LockHandle) { -#ifndef CONFIG_SMP - /* Simply raise to synch */ + /* Set up the lock */ + LockHandle->LockQueue.Next = NULL; + LockHandle->LockQueue.Lock = SpinLock; + + /* Raise to synch */ KeRaiseIrql(SYNCH_LEVEL, &LockHandle->OldIrql); -#else - UNIMPLEMENTED; -#endif -} + + /* Acquire the lock */ + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK +} + /* * @implemented @@ -135,27 +140,25 @@ KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, IN KIRQL OldIrql) { -#ifndef CONFIG_SMP + /* Release the lock */ + KxReleaseSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); +} + + +/* + * @implemented + */ +VOID +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ /* Simply lower IRQL back */ - KeLowerIrql(OldIrql); -#else - UNIMPLEMENTED; -#endif -} - -/* - * @implemented - */ -VOID -KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) -{ -#ifndef CONFIG_SMP - /* Simply lower IRQL back */ + KxReleaseSpinLock(LockHandle->LockQueue.Lock); // HACK KeLowerIrql(LockHandle->OldIrql); -#else - UNIMPLEMENTED; -#endif -} +} + /* * @implemented @@ -167,11 +170,16 @@ #ifndef CONFIG_SMP /* Simply raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, OldIrql); + + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); /* Always return true on UP Machines */ return TRUE; #else UNIMPLEMENTED; + ASSERT(FALSE); #endif } @@ -185,11 +193,16 @@ #ifndef CONFIG_SMP /* Simply raise to dispatch */ KeRaiseIrql(DISPATCH_LEVEL, OldIrql); + + /* Add an explicit memory barrier to prevent the compiler from reordering + memory accesses across the borders of spinlocks */ + _ReadWriteBarrier(); /* Always return true on UP Machines */ return TRUE; #else UNIMPLEMENTED; + ASSERT(FALSE); #endif }

1 0

[ekohl] 52077: [INF] - Add an .inf file to register the unknown device class.
by ekohl＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: ekohl Date: Sat Jun 4 08:03:51 2011 New Revision: 52077 URL: http://svn.reactos.org/svn/reactos?rev=52077&view=rev Log: [INF] - Add an .inf file to register the unknown device class. Added: trunk/reactos/media/inf/unknown.inf (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jun 4 08:03:51 2011 @@ -676,6 +676,7 @@ media\inf\ports.inf 6 media\inf\scsi.inf 6 media\inf\syssetup.inf 6 +media\inf\unknown.inf 6 media\inf\usbport.inf 6 media\inf\usb.inf 6 media\inf\usbstor.inf 6 Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sat Jun 4 08:03:51 2011 @@ -24,6 +24,7 @@ nettcpip.inf ports.inf scsi.inf + unknown.inf usb.inf usbport.inf usbstor.inf Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Sat Jun 4 08:03:51 2011 @@ -27,6 +27,7 @@ <installfile installbase="inf">ports.inf</installfile> <installfile installbase="inf">scsi.inf</installfile> <installfile installbase="inf" root="output">syssetup.inf</installfile> + <installfile installbase="inf">unknown.inf</installfile> <installfile installbase="inf">usb.inf</installfile> <installfile installbase="inf">usbport.inf</installfile> <installfile installbase="inf">usbstor.inf</installfile> Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sat Jun 4 08:03:51 2011 @@ -15,6 +15,7 @@ NET_NIC.inf ports.inf scsi.inf +unknown.inf usbport.inf audio.inf ks.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available. Added: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/unknown.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[nyadav] 52076: [AUDSRV] finish upto actual mixing functions
by nyadav＠svn.reactos.org 03 Jun '11

03 Jun '11

Author: nyadav Date: Fri Jun 3 21:41:26 2011 New Revision: 52076 URL: http://svn.reactos.org/svn/reactos?rev=52076&view=rev Log: [AUDSRV] finish upto actual mixing functions Added: branches/nyadav-audio-branch/base/services/audsrv/mixer.c (with props) Modified: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -7,6 +7,7 @@ audsrv.c audsrv.rc rpc.c + mixer.c stream.c) add_executable(audsrv ${SOURCE}) Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -41,6 +41,7 @@ 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_SUBTYPE_IEEE_FLOAT = {0x00000003L, 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; @@ -152,24 +153,31 @@ - -void fill(MixerEngine * mixer,int buffer) -{ - DWORD Length; - UINT i = 0; -Sleep(100); - Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; - mixer->masterbuf[buffer] = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); - while (i < Length / 2) - { - mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); - i++; - mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * _2pi / 48000); - i++; - } - mixer->bytes_to_play = Length; -} - +void mixandfill(MixerEngine * mixer,int buffer) +{ + while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead) return;} /*Check if there is at least one stream present.*/ + if(mixer->masterdatatype == 0)/*signed int*/ + { + if(mixer->masterbitspersample == 8)mixs8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixs16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixs32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixs64(mixer,buffer); + } + else if (mixer->masterdatatype == 1)/*unsigned int*/ + { + if(mixer->masterbitspersample == 8)mixu8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixu16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixu32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixu64(mixer,buffer); + } + else if(mixer->masterdatatype == 2)/*Float*/ + { + if(mixer->masterbitspersample == 32)mixfl32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixfl64(mixer,buffer); + } + + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); + CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); + mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; +} +void freebuffer() +{ + HeapFree(GetProcessHeap(), 0, pengine->masterbuf[pengine->playcurrent]); + pengine->masterbuf[pengine->playcurrent] = NULL; +} void playbuffer(MixerEngine * mixer,int buffer) { SP_DEVICE_INTERFACE_DATA InterfaceData; @@ -276,7 +284,10 @@ DataFormat->Flags = 0; DataFormat->Reserved = 0; DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; - DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + else + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; DataFormat->SampleSize = mixer->masterchannels * mixer->masterbitspersample / 8; DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); @@ -290,9 +301,11 @@ 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"); + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + else + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + // // Create the pin @@ -367,12 +380,9 @@ SetEvent(mixer->played); while(1) { - while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead)goto DEAD;} /*Check if there is at least one stream present.*/ - while(WaitForSingleObject(mixer->played,100)!=0){if(mixer->dead)goto DEAD;} - fill(mixer,1-mixer->playcurrent); + mixandfill(mixer,1-mixer->playcurrent); SetEvent(mixer->filled); - } DEAD: printf("\nMixer Thread Ended\n"); @@ -386,7 +396,7 @@ while(WaitForSingleObject(mixer->filled,100)!=0){if(mixer->dead)goto DEAD;} SetEvent(mixer->played); playbuffer(mixer,mixer->playcurrent); - + freebuffer(); mixer->playcurrent=1-mixer->playcurrent; } @@ -468,6 +478,7 @@ pengine->mute=FALSE; pengine->dead=0; + pengine->streamidpool=0; pengine->playcurrent=1; pengine->masterbuf[0] = NULL; pengine->masterbuf[1] = NULL; @@ -501,6 +512,7 @@ pengine->mute=FALSE; pengine->dead=0; + pengine->streamidpool=0; pengine->playcurrent=1; pengine->masterbuf[0] = NULL; pengine->masterbuf[1] = NULL; Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -29,15 +29,24 @@ typedef struct ServerStream { + long streamid; int volume; LONG freq; int bitspersample; + int datatype; /*0=signed int,1=unsigned int,2=float*/ int channels; ULONG channelmask; HANDLE played; - HANDLE streamready; + HANDLE threadready; HANDLE thread; float balance; + BOOL ready; + PVOID genuinebuf; + int length_genuine; + PVOID filteredbuf; + int length_filtered; + PVOID minsamplevalue; + PVOID maxsamplevalue; struct ServerStream * next; } ServerStream; @@ -45,6 +54,7 @@ { /*Should be Initialized at Server Start*/ char dead; + long streamidpool; HANDLE played; HANDLE filled; HANDLE streampresent; @@ -60,7 +70,8 @@ int masterchannels; unsigned long masterchannelmask; int masterbitspersample; - PSHORT masterbuf[2]; + int masterdatatype; + PVOID masterbuf[2]; /*Currently don't know the future of following variables*/ long bytes_to_play; HANDLE FilterHandle; @@ -75,10 +86,22 @@ /* rpc.c */ DWORD WINAPI RunRPCThread(LPVOID lpParameter); /* audsrv.c*/ -void fill(MixerEngine * mixer,int buffer); +void mixandfill(MixerEngine * mixer,int buffer); void playbuffer(MixerEngine * mixer,int buffer); /*stream.c*/ -HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); +long getnewstreamid(); +long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); +/*mixer.c*/ +void * mixs8(MixerEngine * mixer,int buffer); +void * mixs16(MixerEngine * mixer,int buffer); +void * mixs32(MixerEngine * mixer,int buffer); +void * mixs64(MixerEngine * mixer,int buffer); +void * mixu8(MixerEngine * mixer,int buffer); +void * mixu16(MixerEngine * mixer,int buffer); +void * mixu32(MixerEngine * mixer,int buffer); +void * mixu64(MixerEngine * mixer,int buffer); +void * mixfl32(MixerEngine * mixer,int buffer); +void * mixfl64(MixerEngine * mixer,int buffer); /********************************/ #endif /* __AUDSRV_H__ */ Added: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c (added) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -1,0 +1,35 @@ + +#include "audsrv.h" +void * mixs8(MixerEngine * mixer,int buffer) +{ +} +void * mixs16(MixerEngine * mixer,int buffer) +{ + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); + CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); + mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; +} +void * mixs32(MixerEngine * mixer,int buffer) +{ +} +void * mixs64(MixerEngine * mixer,int buffer) +{ +} +void * mixu8(MixerEngine * mixer,int buffer) +{ +} +void * mixu16(MixerEngine * mixer,int buffer) +{ +} +void * mixu32(MixerEngine * mixer,int buffer) +{ +} +void * mixu64(MixerEngine * mixer,int buffer) +{ +} +void * mixfl32(MixerEngine * mixer,int buffer) +{ +} +void * mixfl64(MixerEngine * mixer,int buffer) +{ +} Propchange: branches/nyadav-audio-branch/base/services/audsrv/mixer.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/mixer.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -45,13 +45,13 @@ /*************************RPC Functions**********************************/ -int AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +long AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { - HANDLE stream; - printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,channelmask,volume,mute,balance); - stream = addstream(frequency,channels,bitspersample,channelmask,volume,mute,balance); - if( stream == NULL ){return 0;}else{printf("Stream added\n");} - return (int)stream; + long stream; + printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Datatype: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); + stream = addstream(frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); + if( stream != 0 ){printf("Stream added\n");} + return stream; } /*************************************************************************/ void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -1,17 +1,40 @@ #include "audsrv.h" +long getnewstreamid() +{ + long streamid= pengine->streamidpool; + pengine->streamidpool+=1; + return streamid; +} DWORD WINAPI RunStreamThread(LPVOID param) { + UINT i = 0; ServerStream * localstream = (ServerStream *) param; - SetEvent(localstream->streamready); + printf("Signaling Mixer Thread For First Stream\n"); - SetEvent(pengine->streampresent); +/*HACK fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ +/******************************************************/ +PSHORT tempbuf; +localstream->ready =TRUE; +localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; +tempbuf = (PSHORT)HeapAlloc(GetProcessHeap(), 0, localstream->length_filtered); + while (i < localstream->length_filtered / 2) + { + tempbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * 6.28 / 48000); + i++; + tempbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * 6.28 / 48000); + i++; + } +localstream->filteredbuf = tempbuf; +/******************************************************/ + SetEvent(localstream->threadready); + while (1){OutputDebugStringA("Stream Thread Running.");Sleep(100);}; /*Clean Stream's data*/ } -HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { ServerStream * newstream,*localstream; DWORD dwID; @@ -23,37 +46,56 @@ if(volume < 0) {newstream->volume = 0;}else if (volume > 1000) {newstream->volume = 1000;}else {newstream->volume = volume;} if(volume < -1.0) {newstream->volume = -1.0;}else if (volume > 1.0) {newstream->volume = 1.0;}else {newstream->volume = volume;} newstream->freq = frequency; /*TODO frequency validation required*/ + if(datatype==0 || datatype==1 || datatype==2){newstream->datatype=datatype;}else goto error; + if ((datatype==0 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64 )) || + (datatype==1 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64)) || + (datatype==2 && (bitspersample == 32 || bitspersample == 64)) ) newstream->bitspersample = bitspersample; /*TODO bitspersample validation*/ + else goto error; + newstream->channels = channels; /*TODO validation*/ newstream->channelmask = channelmask; /*TODO validation*/ + newstream->ready = FALSE; + newstream->length_genuine = 0; + newstream->genuinebuf = NULL; + newstream->length_filtered = 0; + newstream->filteredbuf = NULL; + newstream->minsamplevalue = NULL; + newstream->maxsamplevalue = NULL; + newstream->next = NULL; newstream->played = CreateEvent(NULL,FALSE,FALSE,NULL); - newstream->streamready = CreateEvent(NULL,FALSE,FALSE,NULL); + newstream->threadready = CreateEvent(NULL,FALSE,FALSE,NULL); - if(newstream->played == NULL || newstream->streamready == NULL) {goto error;} + if(newstream->played == NULL || newstream->threadready == NULL) {goto error;} newstream->thread=CreateThread(NULL,0,RunStreamThread,newstream,0,&dwID); if(newstream->thread == NULL) {goto error;} - WaitForSingleObject(newstream->streamready,INFINITE); + WaitForSingleObject(newstream->threadready,INFINITE); + + newstream->streamid=getnewstreamid(); if(localstream == NULL) { - pengine->serverstreamlist = localstream; + pengine->serverstreamlist = newstream; pengine->masterfreq=frequency; pengine->masterchannels=channels; pengine->masterchannelmask=channelmask; pengine->masterbitspersample=bitspersample; + pengine->masterdatatype = datatype; } else { while(localstream->next != NULL){localstream = localstream->next;} localstream->next = newstream; } - return newstream->thread; + SetEvent(pengine->streampresent); + return newstream->streamid; error: + printf("Stream Rejected \n"); HeapFree(GetProcessHeap(), 0, newstream); - return NULL; + return 0; } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -5,9 +5,9 @@ /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { - int streamid; + long streamid; if (clientstream == NULL ) return -1; if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; /*Validity of all other data will be checked at server*/ @@ -16,8 +16,9 @@ RpcTryExcept { - streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,channelmask,volume,mute,balance); - printf("AUDInitStream Returned %d",streamid); + streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); + printf("AUDInitStream Returned %ld",streamid); + if(streamid != 0) {clientstream->stream = streamid;} } RpcExcept(1) { @@ -28,8 +29,6 @@ /*Analyse the return by the function*/ /*Currently Suppose the return is 0 and a valid streamid is returned*/ - clientstream->stream = &status; - clientstream->ClientEventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); clientstream->dead = 0; Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -1,4 +1,4 @@ -@ stdcall initstream (ptr long long long long long long long) +@ stdcall initstream (ptr long long long long long long long long) @ stdcall playaudio ( ptr); @ stdcall stopaudio (ptr ); @ stdcall Volume(ptr ptr ); Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -8,7 +8,7 @@ void buffercopied (int error ); void playcomplete (int error ); -ClientStream clientstream = {NULL,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ +ClientStream clientstream = {0,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ DWORD WINAPI RunAudioThread(LPVOID param) { @@ -39,12 +39,12 @@ char input='\0'; printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); - error = initstream ( &clientstream , 44100 , 2 , 16 , KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ + error = initstream ( &clientstream , 44100 , 2 , 16 ,0, KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ if ( error ) printf("Failed to Initialize Stream.Error %d\n", error); else { - printf("StreamID : %d\n",*((int *)clientstream.stream)); + printf("StreamID : %ld\n",clientstream.stream); audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); } while ( input != 'a' ) Modified: 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 [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -39,6 +39,6 @@ interface audsrv { - int AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); + long AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in]int datatype,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); } Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Fri Jun 3 21:41:26 2011 @@ -17,14 +17,14 @@ typedef struct ClientStream { -HANDLE stream; +long stream; int dead; HANDLE ClientEventPool[1]; //0]th event is for Activescheduler struct CallBacks callbacks; } ClientStream; /********************API Functions******************/ -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); WINAPI int playaudio ( ClientStream * clientstream); WINAPI int stopaudio (ClientStream * clientstream ); WINAPI int Volume(ClientStream * clientstream, int * volume );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs