Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[pschweitzer] 73100: [BTRFS] Import the BTRFS driver shell extension. It allows having a finer control on btrfs volumes. Note that not everything works in ReactOS and its usage may lead to bugcheck...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 2 19:36:59 2016 New Revision: 73100 URL: http://svn.reactos.org/svn/reactos?rev=73100&view=rev Log: [BTRFS] Import the BTRFS driver shell extension. It allows having a finer control on btrfs volumes. Note that not everything works in ReactOS and its usage may lead to bugchecks... CORE-10892 Added: trunk/reactos/dll/shellext/shellbtrfs/ trunk/reactos/dll/shellext/shellbtrfs/CMakeLists.txt (with props) trunk/reactos/dll/shellext/shellbtrfs/contextmenu.cpp (with props) trunk/reactos/dll/shellext/shellbtrfs/contextmenu.h (with props) trunk/reactos/dll/shellext/shellbtrfs/factory.cpp (with props) trunk/reactos/dll/shellext/shellbtrfs/factory.h (with props) trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.cpp (with props) trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.h (with props) trunk/reactos/dll/shellext/shellbtrfs/main.cpp (with props) trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp (with props) trunk/reactos/dll/shellext/shellbtrfs/propsheet.h (with props) trunk/reactos/dll/shellext/shellbtrfs/resource.h (with props) trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.manifest (with props) trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.rc (with props) trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.spec (with props) trunk/reactos/dll/shellext/shellbtrfs/subvol.ico (with props) Modified: trunk/reactos/dll/shellext/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/CMakeLists.tx… Added: trunk/reactos/dll/shellext/shellbtrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/CM… Added: trunk/reactos/dll/shellext/shellbtrfs/contextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/co… Added: trunk/reactos/dll/shellext/shellbtrfs/contextmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/co… Added: trunk/reactos/dll/shellext/shellbtrfs/factory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/fa… Added: trunk/reactos/dll/shellext/shellbtrfs/factory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/fa… Added: trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/ic… Added: trunk/reactos/dll/shellext/shellbtrfs/iconoverlay.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/ic… Added: trunk/reactos/dll/shellext/shellbtrfs/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/ma… Added: trunk/reactos/dll/shellext/shellbtrfs/propsheet.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/pr… Added: trunk/reactos/dll/shellext/shellbtrfs/propsheet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/pr… Added: trunk/reactos/dll/shellext/shellbtrfs/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/re… Added: trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/sh… Added: trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/sh… Added: trunk/reactos/dll/shellext/shellbtrfs/shellbtrfs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/sh… Added: trunk/reactos/dll/shellext/shellbtrfs/subvol.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellbtrfs/su…

7 years, 11 months

[akhaldi] 73099: [CHARMAP_NEW] Fix a copy pasta.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 2 19:19:17 2016 New Revision: 73099 URL: http://svn.reactos.org/svn/reactos?rev=73099&view=rev Log: [CHARMAP_NEW] Fix a copy pasta. Modified: trunk/reactos/base/applications/charmap_new/charmap.cpp Modified: trunk/reactos/base/applications/charmap_new/charmap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/charmap.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/charmap.cpp [iso-8859-1] Wed Nov 2 19:19:17 2016 @@ -1,8 +1,7 @@ /* -* PROJECT: ReactOS Device Managment +* PROJECT: ReactOS Character Map * LICENSE: GPL - See COPYING in the top level directory -* FILE: base/applications/mscutils/devmgmt/devmgmt.c -* PURPOSE: Bootstrap for the device manager +* FILE: base/applications/charmap/charmap.cpp * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> */

7 years, 11 months

[akhaldi] 73098: [SERVMAN] Sort out header inclusions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Nov 2 18:55:51 2016 New Revision: 73098 URL: http://svn.reactos.org/svn/reactos?rev=73098&view=rev Log: [SERVMAN] Sort out header inclusions. Modified: trunk/reactos/base/applications/mscutils/servman/export.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] Wed Nov 2 18:55:51 2016 @@ -9,8 +9,7 @@ #include "precomp.h" -//#include <commdlg.h> -//#include <cderr.h> +#include <cderr.h> static DWORD GetTextFromListView(PMAIN_WND_INFO Info, Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Wed Nov 2 18:55:51 2016 @@ -1,8 +1,5 @@ #ifndef __SERVMAN_PRECOMP_H #define __SERVMAN_PRECOMP_H - -#if 0 -#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -14,13 +11,9 @@ #include <winsvc.h> #include <wincon.h> #include <shlobj.h> +#include <commdlg.h> #include <strsafe.h> -#else -#include <windows.h> -#include <commctrl.h> -#include <process.h> -#include <strsafe.h> -#endif + #include "resource.h" #ifdef _MSC_VER Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Wed Nov 2 18:55:51 2016 @@ -9,6 +9,8 @@ #include "precomp.h" +#include <process.h> + #define PROGRESS_RANGE 20 #define PROGRESS_STEP_MAX 15

7 years, 11 months

[mjansen] 73097: [SETUPAPI] Forward pSetup[Malloc|Realloc|Free] to My[Malloc|Realloc|Free] as wine does. Spotted by Jared Smudde. CORE-12262

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Nov 2 18:31:46 2016 New Revision: 73097 URL: http://svn.reactos.org/svn/reactos?rev=73097&view=rev Log: [SETUPAPI] Forward pSetup[Malloc|Realloc|Free] to My[Malloc|Realloc|Free] as wine does. Spotted by Jared Smudde. CORE-12262 Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Nov 2 18:31:46 2016 @@ -548,7 +548,7 @@ @ stdcall pSetupDoesUserHavePrivilege(wstr) DoesUserHavePrivilege @ stdcall pSetupDuplicateString(wstr) @ stdcall pSetupEnablePrivilege(wstr long) -@ stub pSetupFree +@ stdcall pSetupFree(ptr) MyFree @ stub pSetupFreeStringArray @ stub pSetupGetCurrentDriverSigningPolicy @ stdcall pSetupGetField(ptr long) @@ -568,13 +568,13 @@ @ stub pSetupIsLocalSystem @ stdcall pSetupIsUserAdmin() @ stub pSetupMakeSurePathExists -@ stub pSetupMalloc +@ stdcall pSetupMalloc(long) MyMalloc @ stdcall pSetupModifyGlobalFlags(long long) @ stdcall pSetupMultiByteToUnicode(str long) @ stdcall pSetupOpenAndMapFileForRead(wstr ptr ptr ptr ptr) @ stub pSetupOutOfMemory @ stub pSetupQueryMultiSzValueToArray -@ stub pSetupRealloc +@ stdcall pSetupRealloc(ptr long) MyRealloc @ stdcall pSetupRegistryDelnode(long long) @ stub pSetupRetrieveServiceConfig @ stub pSetupSetArrayToMultiSzValue

7 years, 11 months

[phater] 73096: [MSAFD] Add more checks for lpErrno. Rearrange start of some functions to avoid creation and disposal of event of socket handle or parameter(s) is wrong. Other small changes CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Wed Nov 2 15:36:26 2016 New Revision: 73096 URL: http://svn.reactos.org/svn/reactos?rev=73096&view=rev Log: [MSAFD] Add more checks for lpErrno. Rearrange start of some functions to avoid creation and disposal of event of socket handle or parameter(s) is wrong. Other small changes CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed Nov 2 15:36:26 2016 @@ -202,6 +202,9 @@ Socket->SharedData->ProviderFlags = lpProtocolInfo->dwProviderFlags; Socket->SharedData->UseSAN = FALSE; Socket->SharedData->NonBlocking = FALSE; /* Sockets start blocking */ + Socket->SharedData->RecvTimeout = INFINITE; + Socket->SharedData->SendTimeout = INFINITE; + Socket->SharedData->OobInline = FALSE; /* Ask alex about this */ if( Socket->SharedData->SocketType == SOCK_DGRAM || @@ -210,7 +213,7 @@ TRACE("Connectionless socket\n"); Socket->SharedData->ServiceFlags1 |= XP1_CONNECTIONLESS; } - Socket->Handle = -1; + Socket->Handle = INVALID_SOCKET; } Socket->HelperContext = HelperDLLContext; @@ -578,6 +581,9 @@ case STATUS_ACCESS_DENIED: return WSAEACCES; + + case STATUS_NOT_IMPLEMENTED: + return WSAEOPNOTSUPP; default: ERR("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status); @@ -607,6 +613,14 @@ LONG LingerWait = -1; DWORD References; + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + /* Create the Wait Event */ Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, @@ -618,14 +632,6 @@ { ERR("NtCreateEvent failed: 0x%08x", Status); return SOCKET_ERROR; - } - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - if (lpErrno) *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; } if (Socket->HelperEvents & WSH_NOTIFY_CLOSE) @@ -829,11 +835,12 @@ SOCKADDR_INFO SocketInfo; HANDLE SockEvent; - /* See below */ - BindData = HeapAlloc(GlobalHeap, 0, 0xA + SocketAddressLength); - if (!BindData) - { - return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; } Status = NtCreateEvent(&SockEvent, @@ -844,17 +851,14 @@ if (!NT_SUCCESS(Status)) { - HeapFree(GlobalHeap, 0, BindData); return SOCKET_ERROR; } - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - HeapFree(GlobalHeap, 0, BindData); - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + /* See below */ + BindData = HeapAlloc(GlobalHeap, 0, 0xA + SocketAddressLength); + if (!BindData) + { + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); } /* Set up Address in TDI Format */ @@ -951,12 +955,12 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } if (Socket->SharedData->Listening) - return 0; + return NO_ERROR; Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, @@ -965,7 +969,7 @@ FALSE); if( !NT_SUCCESS(Status) ) - return -1; + return SOCKET_ERROR; /* Set Up Listen Structure */ ListenData.UseSAN = FALSE; @@ -1340,6 +1344,14 @@ UCHAR ReceiveBuffer[0x1A]; HANDLE SockEvent; + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, @@ -1348,21 +1360,11 @@ if( !NT_SUCCESS(Status) ) { - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return SOCKET_ERROR; } /* Dynamic Structure...ugh */ ListenReceiveData = (PAFD_RECEIVED_ACCEPT_DATA)ReceiveBuffer; - - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; - return INVALID_SOCKET; - } /* If this is non-blocking, make sure there's something for us to accept */ FD_ZERO(&ReadSet); @@ -1373,14 +1375,14 @@ if (WSPSelect(0, &ReadSet, NULL, NULL, &Timeout, lpErrno) == SOCKET_ERROR) { NtClose(SockEvent); - return INVALID_SOCKET; + return SOCKET_ERROR; } if (ReadSet.fd_array[0] != Socket->Handle) { NtClose(SockEvent); - *lpErrno = WSAEWOULDBLOCK; - return INVALID_SOCKET; + if (lpErrno) *lpErrno = WSAEWOULDBLOCK; + return SOCKET_ERROR; } /* Send IOCTL */ @@ -1405,8 +1407,7 @@ if (!NT_SUCCESS(Status)) { NtClose( SockEvent ); - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } if (lpfnCondition != NULL) @@ -1439,8 +1440,7 @@ if (!NT_SUCCESS(Status)) { NtClose( SockEvent ); - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } /* How much data to allocate */ @@ -1452,8 +1452,7 @@ PendingData = HeapAlloc(GlobalHeap, 0, PendingDataLength); if (!PendingData) { - MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); } /* We want the data now */ @@ -1481,8 +1480,7 @@ if (!NT_SUCCESS(Status)) { NtClose( SockEvent ); - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } } } @@ -1499,8 +1497,7 @@ RemoteAddress = HeapAlloc(GlobalHeap, 0, sizeof(*RemoteAddress)); if (!RemoteAddress) { - MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); - return INVALID_SOCKET; + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); } /* Set up Address in SOCKADDR Format */ @@ -1522,8 +1519,7 @@ /* Allocate Buffer for Callee Data */ CalleeDataBuffer = HeapAlloc(GlobalHeap, 0, 4096); if (!CalleeDataBuffer) { - MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); } CalleeData.buf = CalleeDataBuffer; CalleeData.len = 4096; @@ -1590,19 +1586,18 @@ if (!NT_SUCCESS(Status)) { - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } if (CallBack == CF_REJECT ) { - *lpErrno = WSAECONNREFUSED; - return INVALID_SOCKET; + if (lpErrno) *lpErrno = WSAECONNREFUSED; + return SOCKET_ERROR; } else { - *lpErrno = WSAECONNREFUSED; - return INVALID_SOCKET; + if (lpErrno) *lpErrno = WSAECONNREFUSED; + return SOCKET_ERROR; } } } @@ -1616,7 +1611,7 @@ Socket->SharedData->CreateFlags, lpErrno); if (AcceptSocket == INVALID_SOCKET) - return INVALID_SOCKET; + return SOCKET_ERROR; /* Set up the Accept Structure */ AcceptData.ListenHandle = (HANDLE)AcceptSocket; @@ -1645,8 +1640,7 @@ { NtClose(SockEvent); WSPCloseSocket( AcceptSocket, lpErrno ); - MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } AcceptSocketInfo = GetSocketStructure(AcceptSocket); @@ -1654,8 +1648,7 @@ { NtClose(SockEvent); WSPCloseSocket( AcceptSocket, lpErrno ); - MsafdReturnWithErrno( STATUS_PROTOCOL_NOT_SUPPORTED, lpErrno, 0, NULL ); - return INVALID_SOCKET; + return MsafdReturnWithErrno( STATUS_PROTOCOL_NOT_SUPPORTED, lpErrno, 0, NULL ); } AcceptSocketInfo->SharedData->State = SocketConnected; @@ -1688,11 +1681,11 @@ if (Status) { if (lpErrno) *lpErrno = Status; - return INVALID_SOCKET; - } - } - - *lpErrno = 0; + return SOCKET_ERROR; + } + } + + if (lpErrno) *lpErrno = NO_ERROR; /* Return Socket */ return AcceptSocket; @@ -1721,6 +1714,16 @@ HANDLE SockEvent; int SocketDataLength; + TRACE("Called (%lx) %lx:%d\n", Handle, ((const struct sockaddr_in *)SocketAddress)->sin_addr, ((const struct sockaddr_in *)SocketAddress)->sin_port); + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, @@ -1728,18 +1731,7 @@ FALSE); if (!NT_SUCCESS(Status)) - return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); - - TRACE("Called\n"); - - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; - } /* Bind us First */ if (Socket->SharedData->State == SocketOpen) @@ -1899,7 +1891,7 @@ } } - TRACE("Ending\n"); + TRACE("Ending %lx\n", IOSB.Status); notify: if (ConnectInfo) HeapFree(GetProcessHeap(), 0, ConnectInfo); @@ -1956,6 +1948,16 @@ NTSTATUS Status; HANDLE SockEvent; + TRACE("Called\n"); + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, @@ -1963,18 +1965,7 @@ FALSE); if( !NT_SUCCESS(Status) ) - return -1; - - TRACE("Called\n"); - - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } + return SOCKET_ERROR; /* Set AFD Disconnect Type */ switch (HowTo) @@ -2038,6 +2029,20 @@ NTSTATUS Status; HANDLE SockEvent; + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + if (!Name || !NameLength) + { + if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, @@ -2047,22 +2052,6 @@ if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } - - if (!Name || !NameLength) - { - NtClose(SockEvent); - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; - } - /* Allocate a buffer for the address */ TdiAddressSize = sizeof(TRANSPORT_ADDRESS) + Socket->SharedData->SizeOfLocalAddress; @@ -2071,7 +2060,7 @@ if ( TdiAddress == NULL ) { NtClose( SockEvent ); - *lpErrno = WSAENOBUFS; + if (lpErrno) *lpErrno = WSAENOBUFS; return SOCKET_ERROR; } @@ -2116,7 +2105,7 @@ else { HeapFree(GlobalHeap, 0, TdiAddress); - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } } @@ -2141,6 +2130,26 @@ NTSTATUS Status; HANDLE SockEvent; + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(s); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + if (Socket->SharedData->State != SocketConnected) + { + if (lpErrno) *lpErrno = WSAENOTCONN; + return SOCKET_ERROR; + } + + if (!Name || !NameLength) + { + if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, @@ -2150,29 +2159,6 @@ if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(s); - if (!Socket) - { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } - - if (Socket->SharedData->State != SocketConnected) - { - NtClose(SockEvent); - *lpErrno = WSAENOTCONN; - return SOCKET_ERROR; - } - - if (!Name || !NameLength) - { - NtClose(SockEvent); - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; - } - /* Allocate a buffer for the address */ TdiAddressSize = sizeof(TRANSPORT_ADDRESS) + Socket->SharedData->SizeOfRemoteAddress; SocketAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); @@ -2180,7 +2166,7 @@ if ( SocketAddress == NULL ) { NtClose( SockEvent ); - *lpErrno = WSAENOBUFS; + if (lpErrno) *lpErrno = WSAENOBUFS; return SOCKET_ERROR; } @@ -2223,7 +2209,7 @@ else { HeapFree(GlobalHeap, 0, SocketAddress); - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } } @@ -2316,9 +2302,16 @@ Errno = WSAEINVAL; break; } - - /* FIXME: Return false for now */ - *(BOOL*)lpvOutBuffer = FALSE; + if (Socket->SharedData->SocketType != SOCK_STREAM) + { + Errno = WSAEINVAL; + break; + } + + /* FIXME: Return false if OOBINLINE is true for now + We should MSG_PEEK|MSG_OOB check with driver + */ + *(BOOL*)lpvOutBuffer = !Socket->SharedData->OobInline; cbRet = sizeof(BOOL); Errno = NO_ERROR; @@ -2413,12 +2406,13 @@ INT BufferSize; BOOL BoolBuffer; INT IntBuffer; + INT Errno; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); if (Socket == NULL) { - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } @@ -2471,7 +2465,7 @@ case SO_LINGER: if (Socket->SharedData->SocketType == SOCK_DGRAM) { - *lpErrno = WSAENOPROTOOPT; + if (lpErrno) *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; } Buffer = &Socket->SharedData->LingerData; @@ -2534,13 +2528,13 @@ default: DbgPrint("MSAFD: Get unknown optname %x\n", OptionName); - *lpErrno = WSAENOPROTOOPT; + if (lpErrno) *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; } if (*OptionLength < BufferSize) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; *OptionLength = BufferSize; return SOCKET_ERROR; } @@ -2549,20 +2543,21 @@ return 0; default: - *lpErrno = WSAEINVAL; + if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } SendToHelper: - *lpErrno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, - Handle, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - Level, - OptionName, - OptionValue, - (LPINT)OptionLength); - return (*lpErrno == 0) ? 0 : SOCKET_ERROR; + Errno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + OptionValue, + (LPINT)OptionLength); + if (lpErrno) *lpErrno = Errno; + return (Errno == NO_ERROR) ? NO_ERROR : SOCKET_ERROR; } INT @@ -2576,12 +2571,13 @@ OUT LPINT lpErrno) { PSOCKET_INFORMATION Socket; + INT Errno; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(s); if (Socket == NULL) { - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } @@ -2594,84 +2590,93 @@ case SO_BROADCAST: if (optlen < sizeof(BOOL)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } Socket->SharedData->Broadcast = (*optval != 0) ? 1 : 0; - return 0; + return NO_ERROR; + + case SO_OOBINLINE: + if (optlen < sizeof(BOOL)) + { + if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Socket->SharedData->OobInline = (*optval != 0) ? 1 : 0; + return NO_ERROR; case SO_DONTLINGER: if (optlen < sizeof(BOOL)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } Socket->SharedData->LingerData.l_onoff = (*optval != 0) ? 0 : 1; - return 0; + return NO_ERROR; case SO_REUSEADDR: if (optlen < sizeof(BOOL)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } Socket->SharedData->ReuseAddresses = (*optval != 0) ? 1 : 0; - return 0; + return NO_ERROR; case SO_EXCLUSIVEADDRUSE: if (optlen < sizeof(BOOL)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } Socket->SharedData->ExclusiveAddressUse = (*optval != 0) ? 1 : 0; - return 0; + return NO_ERROR; case SO_LINGER: if (optlen < sizeof(struct linger)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } RtlCopyMemory(&Socket->SharedData->LingerData, optval, sizeof(struct linger)); - return 0; + return NO_ERROR; case SO_SNDBUF: if (optlen < sizeof(DWORD)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } /* TODO: The total per-socket buffer space reserved for sends */ ERR("Setting send buf to %x is not implemented yet\n", optval); - return 0; + return NO_ERROR; case SO_SNDTIMEO: if (optlen < sizeof(DWORD)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } RtlCopyMemory(&Socket->SharedData->SendTimeout, optval, sizeof(DWORD)); - return 0; + return NO_ERROR; case SO_RCVTIMEO: if (optlen < sizeof(DWORD)) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } RtlCopyMemory(&Socket->SharedData->RecvTimeout, optval, sizeof(DWORD)); - return 0; + return NO_ERROR; case SO_KEEPALIVE: case SO_DONTROUTE: @@ -2681,20 +2686,21 @@ default: /* Obviously this is a hack */ ERR("MSAFD: Set unknown optname %x\n", optname); - return 0; + return NO_ERROR; } } SendToHelper: - *lpErrno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, - s, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - level, - optname, - (PCHAR)optval, - optlen); - return (*lpErrno == 0) ? 0 : SOCKET_ERROR; + Errno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + s, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + level, + optname, + (PCHAR)optval, + optlen); + if (lpErrno) *lpErrno = Errno; + return (Errno == NO_ERROR) ? NO_ERROR : SOCKET_ERROR; } /* @@ -2788,7 +2794,7 @@ if (!lpsaAddress || !lpszAddressString || !lpdwAddressStringLength) { - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } @@ -2797,7 +2803,7 @@ case AF_INET: if (dwAddressLength < sizeof(SOCKADDR_IN)) { - *lpErrno = WSAEINVAL; + if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } swprintf(buffer, @@ -2815,7 +2821,7 @@ } break; default: - *lpErrno = WSAEINVAL; + if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } @@ -2824,7 +2830,7 @@ if (*lpdwAddressStringLength < size) { *lpdwAddressStringLength = size; - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; return SOCKET_ERROR; } @@ -2849,7 +2855,7 @@ if (!lpAddressLength || !lpAddress || !AddressString) { - *lpErrno = WSAEINVAL; + if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } @@ -2871,7 +2877,7 @@ if (*lpAddressLength < (INT)sizeof(SOCKADDR_IN)) { *lpAddressLength = sizeof(SOCKADDR_IN); - *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; } else { @@ -2908,13 +2914,13 @@ pos += wcscspn(&AddressString[pos], L".") + 1; } - *lpErrno = 0; + if (lpErrno) *lpErrno = NO_ERROR; sockaddr->sin_addr.s_addr = inetaddr; } } - if (!*lpErrno) + if (lpErrno && !*lpErrno) { return 0; } @@ -2935,7 +2941,8 @@ { TRACE("Leaving.\n"); - *lpErrno = NO_ERROR; + + if (lpErrno) *lpErrno = NO_ERROR; return 0; } @@ -2965,7 +2972,7 @@ IO_STATUS_BLOCK DummyIOSB; AFD_INFO InfoData; NTSTATUS Status; - PVOID APCContext; + PAFDAPCCONTEXT APCContext; PIO_APC_ROUTINE APCFunction; HANDLE Event = NULL; HANDLE SockEvent; @@ -2977,7 +2984,7 @@ FALSE); if( !NT_SUCCESS(Status) ) - return -1; + return SOCKET_ERROR; /* Set Info Class */ InfoData.InformationClass = AfdInformationClass; @@ -3002,7 +3009,7 @@ if (CompletionRoutine == NULL) { /* Using Overlapped Structure, but no Completition Routine, so no need for APC */ - APCContext = Overlapped; + APCContext = (PAFDAPCCONTEXT)Overlapped; APCFunction = NULL; Event = Overlapped->hEvent; } @@ -3016,9 +3023,9 @@ ERR("Not enough memory for APC Context\n"); return WSAEFAULT; } - ((PAFDAPCCONTEXT)APCContext)->lpCompletionRoutine = CompletionRoutine; - ((PAFDAPCCONTEXT)APCContext)->lpOverlapped = Overlapped; - ((PAFDAPCCONTEXT)APCContext)->lpSocket = Socket; + APCContext->lpCompletionRoutine = CompletionRoutine; + APCContext->lpOverlapped = Overlapped; + APCContext->lpSocket = Socket; } IOSB = (PIO_STATUS_BLOCK)&Overlapped->Internal; @@ -3054,7 +3061,7 @@ } if (Status != STATUS_SUCCESS) - return -1; + return SOCKET_ERROR; /* Return Information */ if (Ulong != NULL) @@ -3072,7 +3079,7 @@ NtClose( SockEvent ); - return 0; + return NO_ERROR; } @@ -3090,7 +3097,7 @@ IO_STATUS_BLOCK DummyIOSB; AFD_INFO InfoData; NTSTATUS Status; - PVOID APCContext; + PAFDAPCCONTEXT APCContext; PIO_APC_ROUTINE APCFunction; HANDLE Event = NULL; HANDLE SockEvent; @@ -3102,7 +3109,7 @@ FALSE); if( !NT_SUCCESS(Status) ) - return -1; + return SOCKET_ERROR; /* Set Info Class */ InfoData.InformationClass = AfdInformationClass; @@ -3141,7 +3148,7 @@ if (CompletionRoutine == NULL) { /* Using Overlapped Structure, but no Completition Routine, so no need for APC */ - APCContext = Overlapped; + APCContext = (PAFDAPCCONTEXT)Overlapped; APCFunction = NULL; Event = Overlapped->hEvent; } @@ -3155,9 +3162,9 @@ ERR("Not enough memory for APC Context\n"); return WSAEFAULT; } - ((PAFDAPCCONTEXT)APCContext)->lpCompletionRoutine = CompletionRoutine; - ((PAFDAPCCONTEXT)APCContext)->lpOverlapped = Overlapped; - ((PAFDAPCCONTEXT)APCContext)->lpSocket = Socket; + APCContext->lpCompletionRoutine = CompletionRoutine; + APCContext->lpOverlapped = Overlapped; + APCContext->lpSocket = Socket; } IOSB = (PIO_STATUS_BLOCK)&Overlapped->Internal; @@ -3194,7 +3201,7 @@ return WSA_IO_PENDING; } - return Status == STATUS_SUCCESS ? 0 : -1; + return Status == STATUS_SUCCESS ? NO_ERROR : SOCKET_ERROR; } @@ -3236,7 +3243,7 @@ FALSE); if( !NT_SUCCESS(Status) ) - return -1; + return SOCKET_ERROR; /* Create Context */ ContextData.SharedData = *Socket->SharedData; @@ -3269,7 +3276,7 @@ NtClose( SockEvent ); - return Status == STATUS_SUCCESS ? 0 : -1; + return Status == STATUS_SUCCESS ? NO_ERROR : SOCKET_ERROR; } BOOLEAN SockCreateOrReferenceAsyncThread(VOID) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Wed Nov 2 15:36:26 2016 @@ -30,19 +30,18 @@ BOOLEAN BlockMode; HANDLE SockEvent; - Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); - - if( !NT_SUCCESS(Status) ) return -1; - /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); if (!Socket) { - NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } + + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, + NULL, 1, FALSE ); + + if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; /* Set Socket to Non-Blocking */ BlockMode = TRUE; @@ -157,7 +156,7 @@ if( !NT_SUCCESS(Status) ) { ERR("Could not make an event %x\n", Status); - return -1; + return SOCKET_ERROR; } /* Get the Socket Structure associate to this Socket*/ @@ -165,7 +164,7 @@ if (!Socket) { NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; }

7 years, 11 months

[phater] 73095: [TCPIP] Copy back unicast IP if broadcast is specified for listen. CORE-12152

by phater＠svn.reactos.org

Author: phater Date: Wed Nov 2 11:24:08 2016 New Revision: 73095 URL: http://svn.reactos.org/svn/reactos?rev=73095&view=rev Log: [TCPIP] Copy back unicast IP if broadcast is specified for listen. CORE-12152 Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ip/transpo… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Nov 2 11:24:08 2016 @@ -337,6 +337,12 @@ if (NT_SUCCESS(Status)) { + /* Check if we had an unspecified address */ + if (Connection->AddressFile->Address.Address.IPv4Address != bindaddr.addr) + { + /* We did, so we need to copy back the address */ + Connection->AddressFile->Address.Address.IPv4Address = bindaddr.addr; + } /* Check if we had an unspecified port */ if (!Connection->AddressFile->Port) {

7 years, 11 months

[janderwald] 73094: [USBAUDIO] - remove setting InstancesNecessary as it causes problems with KsStudio - start implementing support for usb headsets - use endpoint address in UsbAudioSetFormat - re...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Nov 2 09:55:18 2016 New Revision: 73094 URL: http://svn.reactos.org/svn/reactos?rev=73094&view=rev Log: [USBAUDIO] - remove setting InstancesNecessary as it causes problems with KsStudio - start implementing support for usb headsets - use endpoint address in UsbAudioSetFormat - rewrite USBAudioSelectAudioStreamingInterface to select the interface based on the format index chosen Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Wed Nov 2 09:55:18 2016 @@ -1258,7 +1258,6 @@ /* irp sinks / sources can be instantiated */ Pins[Index].InstancesPossible = 1; - Pins[Index].InstancesNecessary = 1; } else { Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Wed Nov 2 09:55:18 2016 @@ -136,6 +136,9 @@ return STATUS_INSUFFICIENT_RESOURCES; } + /* get pin context */ + PinContext = Pin->Context; + /* FIXME: determine controls and format urb */ UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_ENDPOINT, @@ -144,14 +147,13 @@ 0, 0x01, // SET_CUR 0x100, - 0x81, //FIXME bEndpointAddress + PinContext->DeviceExtension->InterfaceInfo->Pipes[0].EndpointAddress, SampleRateBuffer, NULL, 3, NULL); - /* get pin context */ - PinContext = Pin->Context; + /* submit urb */ Status = SubmitUrbSync(PinContext->LowerDevice, Urb); @@ -164,13 +166,23 @@ NTSTATUS USBAudioSelectAudioStreamingInterface( + IN PKSPIN Pin, IN PPIN_CONTEXT PinContext, IN PDEVICE_EXTENSION DeviceExtension, - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN ULONG FormatDescriptorIndex) { PURB Urb; PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; NTSTATUS Status; + ULONG Found, Index; + + PUSB_AUDIO_STREAMING_INTERFACE_DESCRIPTOR StreamingInterfaceDescriptor; + PUSB_AUDIO_CONTROL_INPUT_TERMINAL_DESCRIPTOR TerminalDescriptor = NULL; + + /* search for terminal descriptor of that irp sink / irp source */ + TerminalDescriptor = UsbAudioGetStreamingTerminalDescriptorByIndex(DeviceExtension->ConfigurationDescriptor, Pin->Id); + ASSERT(TerminalDescriptor != NULL); /* grab interface descriptor */ InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); @@ -180,19 +192,37 @@ return STATUS_INVALID_PARAMETER; } - /* FIXME selects the first interface with audio streaming and non zero num of endpoints */ + Found = FALSE; + Index = 0; + + /* selects the interface which has an audio streaming interface descriptor associated to the input / output terminal at the given format index */ while (InterfaceDescriptor != NULL) { if (InterfaceDescriptor->bInterfaceSubClass == 0x02 /* AUDIO_STREAMING */ && InterfaceDescriptor->bNumEndpoints > 0) { - break; + StreamingInterfaceDescriptor = (PUSB_AUDIO_STREAMING_INTERFACE_DESCRIPTOR)USBD_ParseDescriptors(ConfigurationDescriptor, ConfigurationDescriptor->wTotalLength, InterfaceDescriptor, USB_AUDIO_CONTROL_TERMINAL_DESCRIPTOR_TYPE); + if (StreamingInterfaceDescriptor != NULL) + { + ASSERT(StreamingInterfaceDescriptor->bDescriptorSubtype == 0x01); + ASSERT(StreamingInterfaceDescriptor->wFormatTag == WAVE_FORMAT_PCM); + if (StreamingInterfaceDescriptor->bTerminalLink == TerminalDescriptor->bTerminalID) + { + if (FormatDescriptorIndex == Index) + { + Found = TRUE; + break; + } + Index++; + } + } } InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); } - if (!InterfaceDescriptor) + if (!Found) { /* no such interface */ + DPRINT1("No Interface found\n"); return STATUS_INVALID_PARAMETER; } @@ -200,7 +230,7 @@ if (!Urb) { /* no memory */ - return USBD_STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } /* now prepare interface urb */ @@ -209,7 +239,7 @@ /* now select the interface */ Status = SubmitUrbSync(DeviceExtension->LowerDevice, Urb); - DPRINT1("USBAudioSelectAudioStreamingInterface Status %x UrbStatus %x\n", Status, Urb->UrbSelectInterface.Hdr.Status); + DPRINT1("USBAudioSelectAudioStreamingInterface Status %x UrbStatus %x InterfaceNumber %x AlternateSetting %x\n", Status, Urb->UrbSelectInterface.Hdr.Status, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting); /* did it succeeed */ if (NT_SUCCESS(Status)) @@ -534,12 +564,54 @@ InitStreamPin( IN PKSPIN Pin) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - - - + ULONG Index; + PIRP Irp; + PPIN_CONTEXT PinContext; + PIO_STACK_LOCATION IoStack; + + DPRINT1("InitStreamPin\n"); + + /* get pin context */ + PinContext = Pin->Context; + + /* init irps */ + for (Index = 0; Index < 12; Index++) + { + /* allocate irp */ + Irp = AllocFunction(IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize)); + if (!Irp) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + DPRINT1("InitStreamPin Irp %p\n", Irp); + + /* initialize irp */ + IoInitializeIrp(Irp, IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize), PinContext->DeviceExtension->LowerDevice->StackSize); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + Irp->Flags = 0; + Irp->UserBuffer = NULL; + + IoStack = IoGetNextIrpStackLocation(Irp); + IoStack->DeviceObject = PinContext->DeviceExtension->LowerDevice; + IoStack->Parameters.Others.Argument2 = NULL; + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + IoSetCompletionRoutine(Irp, UsbAudioRenderComplete, Pin, TRUE, TRUE, TRUE); + + /* insert into irp list */ + InsertTailList(&PinContext->IrpListHead, &Irp->Tail.Overlay.ListEntry); + + /* add to object bag*/ + KsAddItemToObjectBag(Pin->Bag, Irp, ExFreePool); + } + + return STATUS_SUCCESS; +} NTSTATUS NTAPI @@ -589,10 +661,12 @@ } /* select streaming interface */ - Status = USBAudioSelectAudioStreamingInterface(PinContext, PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor); + /* FIXME choose correct dataformat */ + Status = USBAudioSelectAudioStreamingInterface(Pin, PinContext, PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor, 0); if (!NT_SUCCESS(Status)) { /* failed */ + DPRINT1("USBAudioSelectAudioStreamingInterface failed with %x\n", Status); return Status; } @@ -607,7 +681,7 @@ Status = InitStreamPin(Pin); } - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -618,6 +692,52 @@ { UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsbAudioRenderComplete( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PKSPIN Pin; + PPIN_CONTEXT PinContext; + KIRQL OldLevel; + PKSSTREAM_POINTER StreamPointerClone; + NTSTATUS Status; + + /* get pin context */ + Pin = Context; + PinContext = Pin->Context; + + /* get status */ + Status = Irp->IoStatus.Status; + + /* get streampointer */ + StreamPointerClone = Irp->Tail.Overlay.DriverContext[1]; + + /* acquire lock */ + KeAcquireSpinLock(&PinContext->IrpListLock, &OldLevel); + + /* insert entry into ready list */ + InsertTailList(&PinContext->IrpListHead, &Irp->Tail.Overlay.ListEntry); + + /* release lock */ + KeReleaseSpinLock(&PinContext->IrpListLock, OldLevel); + + if (!NT_SUCCESS(Status)) + { + /* set status code because it failed */ + //KsStreamPointerSetStatusCode(StreamPointerClone, STATUS_DEVICE_DATA_ERROR); + DPRINT1("UsbAudioRenderComplete failed with %x\n", Status); + } + + /* lets delete the stream pointer clone */ + KsStreamPointerDelete(StreamPointerClone); + + /* done */ + return STATUS_MORE_PROCESSING_REQUIRED; } NTSTATUS @@ -667,6 +787,135 @@ /* done */ return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +PinRenderProcess( + IN PKSPIN Pin) +{ + PKSSTREAM_POINTER LeadingStreamPointer; + PKSSTREAM_POINTER CloneStreamPointer; + NTSTATUS Status; + KIRQL OldLevel; + PPIN_CONTEXT PinContext; + PURB Urb; + ULONG PacketCount, TotalPacketSize, Index; + PKSDATAFORMAT_WAVEFORMATEX WaveFormatEx; + PIO_STACK_LOCATION IoStack; + PLIST_ENTRY CurEntry; + PIRP Irp = NULL; + + //DPRINT1("PinRenderProcess\n"); + + LeadingStreamPointer = KsPinGetLeadingEdgeStreamPointer(Pin, KSSTREAM_POINTER_STATE_LOCKED); + if (LeadingStreamPointer == NULL) + { + return STATUS_SUCCESS; + } + + if (NULL == LeadingStreamPointer->StreamHeader->Data) + { + Status = KsStreamPointerAdvance(LeadingStreamPointer); + DPRINT1("Advancing Streampointer\n"); + } + + + /* get pin context */ + PinContext = Pin->Context; + + /* acquire spin lock */ + KeAcquireSpinLock(&PinContext->IrpListLock, &OldLevel); + + if (!IsListEmpty(&PinContext->IrpListHead)) + { + /* remove entry from list */ + CurEntry = RemoveHeadList(&PinContext->IrpListHead); + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + } + + /* release lock */ + KeReleaseSpinLock(&PinContext->IrpListLock, OldLevel); + + if (!Irp) + { + /* no irps available */ + DPRINT1("No irps available"); + KsStreamPointerUnlock(LeadingStreamPointer, TRUE); + return STATUS_SUCCESS; + } + + /* clone stream pointer */ + Status = KsStreamPointerClone(LeadingStreamPointer, NULL, 0, &CloneStreamPointer); + if (!NT_SUCCESS(Status)) + { + /* failed */ + KsStreamPointerUnlock(LeadingStreamPointer, TRUE); + DPRINT1("Leaking Irp %p\n", Irp); + return STATUS_SUCCESS; + } + + + /* initialize irp */ + IoInitializeIrp(Irp, IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize), PinContext->DeviceExtension->LowerDevice->StackSize); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + Irp->Flags = 0; + Irp->UserBuffer = NULL; + + IoStack = IoGetNextIrpStackLocation(Irp); + IoStack->DeviceObject = PinContext->DeviceExtension->LowerDevice; + IoStack->Parameters.Others.Argument2 = NULL; + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + IoSetCompletionRoutine(Irp, UsbAudioRenderComplete, Pin, TRUE, TRUE, TRUE); + + /* calculate packet count */ + WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; + TotalPacketSize = WaveFormatEx->WaveFormatEx.nAvgBytesPerSec / 1000; + ASSERT(TotalPacketSize <= PinContext->DeviceExtension->InterfaceInfo->Pipes[0].MaximumPacketSize); + + /* FIXME correct MaximumPacketSize ? */ + PacketCount = CloneStreamPointer->OffsetIn.Remaining / TotalPacketSize; + + ASSERT(PacketCount < 255); + + //DPRINT1("PinRenderProcess Irp %p TotalPacketSize %lu MaximumPacketSize %lu PacketCount %lu Count %lu Data %p\n", Irp, TotalPacketSize, PinContext->DeviceExtension->InterfaceInfo->Pipes[0].MaximumPacketSize, PacketCount, CloneStreamPointer->OffsetIn.Count, CloneStreamPointer->OffsetIn.Data); + + Urb = (PURB)AllocFunction(GET_ISO_URB_SIZE(PacketCount)); + ASSERT(Urb); + + /* init urb */ + Urb->UrbIsochronousTransfer.Hdr.Function = URB_FUNCTION_ISOCH_TRANSFER; + Urb->UrbIsochronousTransfer.Hdr.Length = GET_ISO_URB_SIZE(PacketCount); + Urb->UrbIsochronousTransfer.PipeHandle = PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle; + Urb->UrbIsochronousTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_START_ISO_TRANSFER_ASAP; + Urb->UrbIsochronousTransfer.TransferBufferLength = CloneStreamPointer->OffsetIn.Remaining; + Urb->UrbIsochronousTransfer.TransferBuffer = CloneStreamPointer->OffsetIn.Data; + Urb->UrbIsochronousTransfer.NumberOfPackets = PacketCount; + Urb->UrbIsochronousTransfer.StartFrame = 0; + + for (Index = 0; Index < PacketCount; Index++) + { + Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset = Index * TotalPacketSize; + } + + /* store urb */ + IoStack = IoGetNextIrpStackLocation(Irp); + IoStack->Parameters.Others.Argument1 = Urb; + + /* store in irp context */ + Irp->Tail.Overlay.DriverContext[0] = Urb; + Irp->Tail.Overlay.DriverContext[1] = CloneStreamPointer; + + Status = IoCallDriver(PinContext->LowerDevice, Irp); + + /* unlock stream pointer and finish*/ + KsStreamPointerUnlock(LeadingStreamPointer, TRUE); + return Status; } NTSTATUS @@ -830,8 +1079,7 @@ } else { - UNIMPLEMENTED; - Status = STATUS_NOT_IMPLEMENTED; + Status = PinRenderProcess(Pin); } return Status; @@ -914,7 +1162,7 @@ _In_ KSSTATE ToState, _In_ KSSTATE FromState) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; if (FromState != ToState) { @@ -957,7 +1205,7 @@ else { UNIMPLEMENTED - Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_SUCCESS; } return Status; Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Wed Nov 2 09:55:18 2016 @@ -203,6 +203,11 @@ USBAudioCreateFilterContext( PKSDEVICE Device); +PUSB_AUDIO_CONTROL_INPUT_TERMINAL_DESCRIPTOR +UsbAudioGetStreamingTerminalDescriptorByIndex( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN ULONG Index); + /* pool.c */ PVOID NTAPI @@ -344,6 +349,13 @@ NTSTATUS NTAPI +UsbAudioRenderComplete( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context); + +NTSTATUS +NTAPI USBAudioPinCreate( _In_ PKSPIN Pin, _In_ PIRP Irp);

7 years, 11 months

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 November 2016