Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[dchapyshev] 72730: [KERNEL32] Implement MB_ERR_INVALID_CHARS flag for DBCS codepages * Fixes 3 tests for kernel32:codepage

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 18 18:21:30 2016 New Revision: 72730 URL: http://svn.reactos.org/svn/reactos?rev=72730&view=rev Log: [KERNEL32] Implement MB_ERR_INVALID_CHARS flag for DBCS codepages * Fixes 3 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 18:21:30 2016 @@ -439,6 +439,7 @@ PUSHORT MultiByteTable; LPCSTR TempString; INT TempLength; + USHORT WideChar; /* Get code page table. */ CodePageEntry = IntGetCodePageEntry(CodePage); @@ -471,8 +472,48 @@ if (Flags & MB_ERR_INVALID_CHARS) { - /* FIXME */ - DPRINT1("IntMultiByteToWideCharCP: MB_ERR_INVALID_CHARS case not implemented!\n"); + TempString = MultiByteString; + + while (TempString < MbsEnd) + { + DBCSOffset = CodePageTable->DBCSOffsets[*TempString]; + + if (DBCSOffset) + { + /* If lead byte is presented, but behind it there is no symbol */ + if (((TempString + 1) == MbsEnd) || (*(TempString + 1) == 0)) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + WideChar = CodePageTable->DBCSOffsets[*(TempString + 1) + DBCSOffset]; + + if (WideChar == CodePageTable->UniDefaultChar && + MAKEWORD(*(TempString + 1), *TempString) != CodePageTable->TransUniDefaultChar) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + TempString++; + } + else + { + USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + + if ((WideChar == CodePageTable->UniDefaultChar && + *TempString != CodePageTable->TransUniDefaultChar) || + /* "Private Use" characters */ + (WideChar >= 0xE000 && WideChar <= 0xF8FF)) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + } + + TempString++; + } } /* Does caller query for output buffer size? */ @@ -536,10 +577,10 @@ TempLength > 0; TempString++, TempLength--) { - USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + WideChar = MultiByteTable[(UCHAR)*TempString]; if ((WideChar == CodePageTable->UniDefaultChar && - *TempString != CodePageEntry->CodePageTable.TransUniDefaultChar) || + *TempString != CodePageTable->TransUniDefaultChar) || /* "Private Use" characters */ (WideChar >= 0xE000 && WideChar <= 0xF8FF)) {

8 years

[dchapyshev] 72729: [KERNEL32] Implement MB_USEGLYPHCHARS flag for MultiByteToWideChar. Add checks for "Private Use" characters. More correct checks for input parameters. * Fixes 6 tests for kernel...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 18 17:26:59 2016 New Revision: 72729 URL: http://svn.reactos.org/svn/reactos?rev=72729&view=rev Log: [KERNEL32] Implement MB_USEGLYPHCHARS flag for MultiByteToWideChar. Add checks for "Private Use" characters. More correct checks for input parameters. * Fixes 6 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 17:26:59 2016 @@ -436,6 +436,7 @@ { PCODEPAGE_ENTRY CodePageEntry; PCPTABLEINFO CodePageTable; + PUSHORT MultiByteTable; LPCSTR TempString; INT TempLength; @@ -446,10 +447,22 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; } + CodePageTable = &CodePageEntry->CodePageTable; + /* If MB_USEGLYPHCHARS flag present and glyph table present */ + if ((Flags & MB_USEGLYPHCHARS) && CodePageTable->MultiByteTable[256]) + { + /* Use glyph table */ + MultiByteTable = CodePageTable->MultiByteTable + 256 + 1; + } + else + { + MultiByteTable = CodePageTable->MultiByteTable; + } + /* Different handling for DBCS code pages. */ - if (CodePageTable->MaximumCharacterSize > 1) + if (CodePageTable->DBCSCodePage) { UCHAR Char; USHORT DBCSOffset; @@ -498,7 +511,7 @@ if (!DBCSOffset) { - *WideCharString++ = CodePageTable->MultiByteTable[Char]; + *WideCharString++ = MultiByteTable[Char]; continue; } @@ -523,9 +536,12 @@ TempLength > 0; TempString++, TempLength--) { - if (CodePageTable->MultiByteTable[(UCHAR)*TempString] == - CodePageTable->UniDefaultChar && - *TempString != CodePageEntry->CodePageTable.DefaultChar) + USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + + if ((WideChar == CodePageTable->UniDefaultChar && + *TempString != CodePageEntry->CodePageTable.TransUniDefaultChar) || + /* "Private Use" characters */ + (WideChar >= 0xE000 && WideChar <= 0xF8FF)) { SetLastError(ERROR_NO_UNICODE_TRANSLATION); return 0; @@ -542,7 +558,7 @@ TempLength > 0; MultiByteString++, TempLength--) { - *WideCharString++ = CodePageTable->MultiByteTable[(UCHAR)*MultiByteString]; + *WideCharString++ = MultiByteTable[(UCHAR)*MultiByteString]; } /* Adjust buffer size. Wine trick ;-) */ @@ -1434,9 +1450,9 @@ { /* Check the parameters. */ if (MultiByteString == NULL || - MultiByteCount == 0 || - (WideCharString == NULL && WideCharCount > 0) || - (PVOID)MultiByteString == (PVOID)WideCharString) + MultiByteCount == 0 || WideCharCount < 0 || + (WideCharCount && (WideCharString == NULL || + (PVOID)MultiByteString == (PVOID)WideCharString))) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

8 years

[akhaldi] 72728: [WS2_32_WINETEST] Disable test_address_list_query() as the ioctl is not supported yet by winsock helper dll (wshtcpip.dll) and the test is assuming there is info returned which is ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 18 16:20:20 2016 New Revision: 72728 URL: http://svn.reactos.org/svn/reactos?rev=72728&view=rev Log: [WS2_32_WINETEST] Disable test_address_list_query() as the ioctl is not supported yet by winsock helper dll (wshtcpip.dll) and the test is assuming there is info returned which is wrong and crashes. By Peter Hater. CORE-10440 CORE-12000 Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sun Sep 18 16:20:20 2016 @@ -9287,6 +9287,8 @@ CloseHandle(previous_port); } +#if CORE_12000_IS_FIXED /* CORE-12000 */ +/* WSHIoctl is not supported by wshtcpip.dll and crashes. Test should be fixed also! */ static void test_address_list_query(void) { SOCKET_ADDRESS_LIST *address_list; @@ -9349,6 +9351,7 @@ HeapFree(GetProcessHeap(), 0, address_list); closesocket(s); } +#endif /* CORE-12000 */ static DWORD WINAPI inet_ntoa_thread_proc(void *param) { @@ -9807,7 +9810,9 @@ test_WSAAsyncGetServByName(); test_completion_port(); +#if CORE_12000_IS_FIXED /* FIXME: CORE-12000 */ test_address_list_query(); +#endif /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

8 years

[akhaldi] 72727: [ADNS] Use dynamic memory for network info and set domain for searches. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 18 16:07:29 2016 New Revision: 72727 URL: http://svn.reactos.org/svn/reactos?rev=72727&view=rev Log: [ADNS] Use dynamic memory for network info and set domain for searches. By Peter Hater. CORE-10440 Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/adns/src/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] Sun Sep 18 16:07:29 2016 @@ -572,9 +572,14 @@ #define SECURE_PATH_LEN (MAX_PATH - 64) char PathBuf[MAX_PATH]; struct in_addr addr; +#ifdef __REACTOS__ + PFIXED_INFO network_info; + ULONG network_info_blen = 0; +#else #define ADNS_PFIXED_INFO_BLEN (2048) PFIXED_INFO network_info = (PFIXED_INFO)_alloca(ADNS_PFIXED_INFO_BLEN); ULONG network_info_blen = ADNS_PFIXED_INFO_BLEN; +#endif /* __REACTOS__ */ DWORD network_info_result; PIP_ADDR_STRING pip; const char *network_err_str = ""; @@ -601,6 +606,10 @@ GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); readconfig(ads,PathBuf,0); +#ifdef __REACTOS__ + network_info_result = GetNetworkParams(NULL, &network_info_blen); + network_info = (PFIXED_INFO)malloc((size_t)network_info_blen); +#endif network_info_result = GetNetworkParams(network_info, &network_info_blen); if (network_info_result != ERROR_SUCCESS){ switch(network_info_result) { @@ -616,8 +625,17 @@ addr.s_addr = inet_addr(pip->IpAddress.String); if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) addserver(ads, addr); - } - } +#ifdef __REACTOS__ + if (network_info->DomainName) + ccf_search(ads, "LOCALDOMAIN", -1, network_info->DomainName); + else + ccf_search(ads, "LOCALDOMAIN", -1, ""); +#endif + } + } +#ifdef __REACTOS__ + if (network_info) free(network_info); +#endif #else readconfig(ads,"/etc/resolv.conf",1); readconfig(ads,"/etc/resolv-adns.conf",0);

8 years

[akhaldi] 72726: [DNSAPI] Request adns to search servers and domains. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 18 14:25:39 2016 New Revision: 72726 URL: http://svn.reactos.org/svn/reactos?rev=72726&view=rev Log: [DNSAPI] Request adns to search servers and domains. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun Sep 18 14:25:39 2016 @@ -53,7 +53,7 @@ PVOID *Reserved) { adns_state astate; - int quflags = 0; + int quflags = adns_qf_search; int adns_error; adns_answer *answer; LPSTR CurrentName;

8 years

[janderwald] 72725: [USBAUDIO] - start implementing init routines - not yet added to build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Sep 18 14:24:21 2016 New Revision: 72725 URL: http://svn.reactos.org/svn/reactos?rev=72725&view=rev Log: [USBAUDIO] - start implementing init routines - not yet added to build Added: trunk/reactos/drivers/usb/usbaudio/ (with props) trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt (with props) trunk/reactos/drivers/usb/usbaudio/filter.c (with props) trunk/reactos/drivers/usb/usbaudio/guid.c (with props) trunk/reactos/drivers/usb/usbaudio/pin.c (with props) trunk/reactos/drivers/usb/usbaudio/pool.c (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.c (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.h (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.rc (with props) Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 18 14:24:21 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/CMake… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt (added) +++ trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,25 @@ + +set_cpp() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +list(APPEND SOURCE + usbaudio.c + pool.c + filter.c + pin.c + guid.c) + +add_library(usbaudio SHARED + ${SOURCE} + usbaudio.rc) + +target_link_libraries(usbaudio + libcntpr + ${PSEH_LIB}) + +set_module_type(usbaudio kernelmodedriver) +add_importlibs(usbaudio ntoskrnl hal usbd ks) + +add_cd_file(TARGET usbaudio DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,101 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/filter.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + +NTSTATUS +BuildUSBAudioFilterTopology( + PKSDEVICE Device) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +USBAudioPinBuildDescriptors( + PKSDEVICE Device, + PKSPIN_DESCRIPTOR_EX *PinDescriptors, + PULONG PinDescriptorsCount, + PULONG PinDescriptorSize) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +USBAudioInitComponentId( + PKSDEVICE Device, + IN PKSCOMPONENTID ComponentId) +{ + PDEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = Device->Context; + + INIT_USBAUDIO_MID(&ComponentId->Manufacturer, DeviceExtension->DeviceDescriptor->idVendor); + INIT_USBAUDIO_PID(&ComponentId->Product, DeviceExtension->DeviceDescriptor->idProduct); + + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +USBAudioCreateFilterContext( + PKSDEVICE Device) +{ + KSFILTER_DESCRIPTOR FilterDescriptor; + PKSCOMPONENTID ComponentId; + NTSTATUS Status; + + /* clear filter descriptor */ + RtlZeroMemory(&FilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + + /* init filter descriptor*/ + FilterDescriptor.Version = KSFILTER_DESCRIPTOR_VERSION; + FilterDescriptor.ReferenceGuid = &KSNAME_Filter; + + /* init component id*/ + ComponentId = AllocFunction(sizeof(KSCOMPONENTID)); + if (!ComponentId) + { + /* no memory */ + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + Status = USBAudioInitComponentId(Device, ComponentId); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + FilterDescriptor.ComponentId = ComponentId; + + /* build pin descriptors */ + Status = USBAudioPinBuildDescriptors(Device, (PKSPIN_DESCRIPTOR_EX *)&FilterDescriptor.PinDescriptors, &FilterDescriptor.PinDescriptorsCount, &FilterDescriptor.PinDescriptorSize); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + + /* build topology */ + Status = BuildUSBAudioFilterTopology(Device); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + + return Status; +} + + Propchange: trunk/reactos/drivers/usb/usbaudio/filter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/guid.… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/guid.c (added) +++ trunk/reactos/drivers/usb/usbaudio/guid.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +//#include <wdm.h> +#include <portcls.h> + +#include <initguid.h> +#include <wdmguid.h> +#include <hubbusif.h> +#include <usbbusif.h> + +/* FIXME */ +DEFINE_GUID(KSNAME_Filter, 0x9b365890L, 0x165f, 0x11d0, 0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbaudio/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,11 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/pin.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + Propchange: trunk/reactos/drivers/usb/usbaudio/pin.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pool.… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pool.c (added) +++ trunk/reactos/drivers/usb/usbaudio/pool.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,35 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/pool.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ +#include "usbaudio.h" + +PVOID +NTAPI +AllocFunction( + IN ULONG ItemSize) +{ + PVOID Item = ExAllocatePoolWithTag(NonPagedPool, ItemSize, USBAUDIO_TAG); + if (Item) + { + // zero item + RtlZeroMemory(Item, ItemSize); + } + + // done + return Item; +} + +VOID +NTAPI +FreeFunction( + IN PVOID Item) +{ + /* free item */ + ExFreePoolWithTag(Item, USBAUDIO_TAG); +} + Propchange: trunk/reactos/drivers/usb/usbaudio/pool.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/usbaudio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.c (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,484 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/usbaudio.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + +static KSDEVICE_DISPATCH KsDeviceDispatch = { + USBAudioAddDevice, + USBAudioPnPStart, + NULL, + USBAudioPnPQueryStop, + USBAudioPnPCancelStop, + USBAudioPnPStop, + USBAudioPnPQueryRemove, + USBAudioPnPCancelRemove, + USBAudioPnPRemove, + USBAudioPnPQueryCapabilities, + USBAudioPnPSurpriseRemoval, + USBAudioPnPQueryPower, + USBAudioPnPSetPower +}; + +static KSDEVICE_DESCRIPTOR KsDeviceDescriptor = { + &KsDeviceDispatch, + 0, + NULL, + 0x100, //KSDEVICE_DESCRIPTOR_VERSION, + 0 +}; + +NTSTATUS +NTAPI +USBAudioCancelCompleteSynch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + /* signal event */ + KeSetEvent(Context, 0, FALSE); + + /* done */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +SubmitUrbSync( + IN PKSDEVICE Device, + IN PURB Urb) +{ + PIRP Irp; + KEVENT Event; + PDEVICE_EXTENSION DeviceExtension; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // init event + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // get device extension + DeviceExtension = (PDEVICE_EXTENSION)Device->Context; + + // build irp + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, + DeviceExtension->LowerDevice, + NULL, + 0, + NULL, + 0, + TRUE, + &Event, + &IoStatus); + + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // get next stack location + IoStack = IoGetNextIrpStackLocation(Irp); + + // store urb + IoStack->Parameters.Others.Argument1 = Urb; + + // set completion routine + IoSetCompletionRoutine(Irp, USBAudioCancelCompleteSynch, &Event, TRUE, TRUE, TRUE); + + // call driver + Status = IoCallDriver(DeviceExtension->LowerDevice, Irp); + + // wait for the request to finish + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // complete request + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + if (Status == STATUS_PENDING) + { + // get final status + Status = IoStatus.Status; + } + + // done + return Status; +} + +NTSTATUS +NTAPI +USBAudioSelectConfiguration( + IN PKSDEVICE Device, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PDEVICE_EXTENSION DeviceExtension; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; + PURB Urb; + NTSTATUS Status; + ULONG InterfaceDescriptorCount; + + /* alloc item for configuration request */ + InterfaceList = AllocFunction(sizeof(USBD_INTERFACE_LIST_ENTRY) * (ConfigurationDescriptor->bNumInterfaces + 1)); + if (!InterfaceList) + { + /* insufficient resources*/ + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + /* grab interface descriptor */ + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + if (!InterfaceDescriptor) + { + /* no such interface */ + return STATUS_INVALID_PARAMETER; + } + + /* lets enumerate the interfaces */ + InterfaceDescriptorCount = 0; + while (InterfaceDescriptor != NULL) + { + if (InterfaceDescriptor->bInterfaceSubClass == 0x01) /* AUDIO_CONTROL*/ + { + InterfaceList[InterfaceDescriptorCount++].InterfaceDescriptor = InterfaceDescriptor; + } + else if (InterfaceDescriptor->bInterfaceSubClass == 0x03) /* MIDI_STREAMING*/ + { + InterfaceList[InterfaceDescriptorCount++].InterfaceDescriptor = InterfaceDescriptor; + } + + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + } + + /* build urb */ + Urb = USBD_CreateConfigurationRequestEx(ConfigurationDescriptor, InterfaceList); + if (!Urb) + { + /* no memory */ + FreeFunction(InterfaceList); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* submit configuration urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + ExFreePool(Urb); + FreeFunction(InterfaceList); + return Status; + } + + /* store configuration handle */ + DeviceExtension = Device->Context; + DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; + + /* alloc interface info */ + DeviceExtension->InterfaceInfo = AllocFunction(Urb->UrbSelectConfiguration.Interface.Length); + if (DeviceExtension->InterfaceInfo) + { + /* copy interface info */ + RtlCopyMemory(DeviceExtension->InterfaceInfo, &Urb->UrbSelectConfiguration.Interface, Urb->UrbSelectConfiguration.Interface.Length); + } + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +USBAudioStartDevice( + IN PKSDEVICE Device) +{ + PURB Urb; + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PDEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + ULONG Length; + + /* allocate urb */ + Urb = AllocFunction(sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST)); + if (!Urb) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* alloc buffer for device descriptor */ + DeviceDescriptor = AllocFunction(sizeof(USB_DEVICE_DESCRIPTOR)); + if (!DeviceDescriptor) + { + /* insufficient resources */ + FreeFunction(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, DeviceDescriptor, NULL, sizeof(USB_DEVICE_DESCRIPTOR), NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* now allocate some space for partial configuration descriptor */ + ConfigurationDescriptor = AllocFunction(sizeof(USB_CONFIGURATION_DESCRIPTOR)); + if (!ConfigurationDescriptor) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, ConfigurationDescriptor, NULL, sizeof(USB_CONFIGURATION_DESCRIPTOR), NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + FreeFunction(ConfigurationDescriptor); + return Status; + } + + /* backup length */ + Length = ConfigurationDescriptor->wTotalLength; + + /* free old descriptor */ + FreeFunction(ConfigurationDescriptor); + + /* now allocate some space for full configuration descriptor */ + ConfigurationDescriptor = AllocFunction(Length); + if (!ConfigurationDescriptor) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, ConfigurationDescriptor, NULL, Length, NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + + /* free urb */ + FreeFunction(Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(DeviceDescriptor); + FreeFunction(ConfigurationDescriptor); + return Status; + } + + /* lets add to object bag */ + KsAddItemToObjectBag(Device->Bag, DeviceDescriptor, ExFreePool); + KsAddItemToObjectBag(Device->Bag, ConfigurationDescriptor, ExFreePool); + + Status = USBAudioSelectConfiguration(Device, ConfigurationDescriptor); + if (NT_SUCCESS(Status)) + { + DeviceExtension = Device->Context; + DeviceExtension->ConfigurationDescriptor = ConfigurationDescriptor; + DeviceExtension->DeviceDescriptor = DeviceDescriptor; + } + return Status; +} + + +NTSTATUS +NTAPI +USBAudioAddDevice( + _In_ PKSDEVICE Device) +{ + /* no op */ + DPRINT1("USBAudioAddDevice\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +USBAudioPnPStart( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_opt_ PCM_RESOURCE_LIST TranslatedResourceList, + _In_opt_ PCM_RESOURCE_LIST UntranslatedResourceList) +{ + NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_EXTENSION DeviceExtension; + + if (!Device->Started) + { + /* alloc context */ + DeviceExtension = AllocFunction(sizeof(DEVICE_EXTENSION)); + if (DeviceExtension == NULL) + { + /* insufficient resources */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init context */ + Device->Context = DeviceExtension; + DeviceExtension->LowerDevice = Device->NextDeviceObject; + + /* add to object bag*/ + KsAddItemToObjectBag(Device->Bag, Device->Context, ExFreePool); + + /* init device*/ + Status = USBAudioStartDevice(Device); + if (NT_SUCCESS(Status)) + { + /* TODO build filter topology and pin descriptors and retrieve interface */ + UNIMPLEMENTED + } + } + + return Status; +} + +NTSTATUS +NTAPI +USBAudioPnPQueryStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPCancelStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ +} + +VOID +NTAPI +USBAudioPnPStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop device */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ + return STATUS_SUCCESS; +} + + +VOID +NTAPI +USBAudioPnPCancelRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ +} + +VOID +NTAPI +USBAudioPnPRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop device */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryCapabilities( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _Inout_ PDEVICE_CAPABILITIES Capabilities) +{ + /* TODO: set caps */ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPSurpriseRemoval( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop streams */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE DeviceTo, + _In_ DEVICE_POWER_STATE DeviceFrom, + _In_ SYSTEM_POWER_STATE SystemTo, + _In_ SYSTEM_POWER_STATE SystemFrom, + _In_ POWER_ACTION Action) +{ + /* no op */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPSetPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE To, + _In_ DEVICE_POWER_STATE From) +{ + /* TODO: stop streams */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + + // initialize driver + Status = KsInitializeDriver(DriverObject, RegistryPath, &KsDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + // failed to initialize driver + DPRINT1("Failed to initialize driver with %x\n", Status); + return Status; + } + return Status; +} Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,129 @@ +#pragma once + +#include <ntddk.h> +#include <portcls.h> +#include <ksmedia.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <usbdlib.h> +#include <debug.h> + +#define USBAUDIO_TAG 'AbsU' + +typedef struct __DEVICE_EXTENSION__ +{ + PDEVICE_OBJECT LowerDevice; /* lower device*/ + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; /* usb configuration descriptor */ + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; /* usb device descriptor */ + PUSBD_INTERFACE_INFORMATION InterfaceInfo; /* interface information */ + USBD_CONFIGURATION_HANDLE ConfigurationHandle; /* configuration handle */ + +}DEVICE_EXTENSION, *PDEVICE_EXTENSION; + +/* pool.c */ +PVOID +NTAPI +AllocFunction( + IN ULONG ItemSize); + +VOID +NTAPI +FreeFunction( + IN PVOID Item); + +/* usbaudio.c */ + +NTSTATUS +NTAPI +USBAudioAddDevice( + _In_ PKSDEVICE Device +); + +NTSTATUS +NTAPI +USBAudioPnPStart( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_opt_ PCM_RESOURCE_LIST TranslatedResourceList, + _In_opt_ PCM_RESOURCE_LIST UntranslatedResourceList +); + +NTSTATUS +NTAPI +USBAudioPnPQueryStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPCancelStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPCancelRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryCapabilities( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _Inout_ PDEVICE_CAPABILITIES Capabilities +); + +VOID +NTAPI +USBAudioPnPSurpriseRemoval( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE DeviceTo, + _In_ DEVICE_POWER_STATE DeviceFrom, + _In_ SYSTEM_POWER_STATE SystemTo, + _In_ SYSTEM_POWER_STATE SystemFrom, + _In_ POWER_ACTION Action +); + +VOID +NTAPI +USBAudioPnPSetPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE To, + _In_ DEVICE_POWER_STATE From +); Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/usbaudio.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.rc (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.rc [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBAUDIO Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "usbaudio\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbaudio.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years

[janderwald] 72724: try fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Sep 18 14:11:47 2016 New Revision: 72724 URL: http://svn.reactos.org/svn/reactos?rev=72724&view=rev Log: try fix build Modified: trunk/reactos/sdk/include/psdk/ksmedia.h Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Sun Sep 18 14:11:47 2016 @@ -116,7 +116,7 @@ // USB Component ID #define STATIC_KSCOMPONENTID_USBAUDIO \ - 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA + 0x8F1275F0, 0x26E9, 0x4264, {0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA} DEFINE_GUIDSTRUCT("8F1275F0-26E9-4264-BA4D-39FFF01D94AA", KSCOMPONENTID_USBAUDIO); #define KSCOMPONENTID_USBAUDIO DEFINE_GUIDNAMED(KSCOMPONENTID_USBAUDIO)

8 years

[janderwald] 72723: [PSDK] - add missing definitions

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Sep 18 14:02:22 2016 New Revision: 72723 URL: http://svn.reactos.org/svn/reactos?rev=72723&view=rev Log: [PSDK] - add missing definitions Modified: trunk/reactos/sdk/include/psdk/ksmedia.h Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Sun Sep 18 14:02:22 2016 @@ -15,6 +15,112 @@ */ typedef LONGLONG REFERENCE_TIME; + + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +#if !defined(INIT_USBAUDIO_MID) +#define INIT_USBAUDIO_MID(guid, id)\ +{\ + (guid)->Data1 = 0x4e1cecd2 + (USHORT)(id);\ + (guid)->Data2 = 0x1679;\ + (guid)->Data3 = 0x463b;\ + (guid)->Data4[0] = 0xa7;\ + (guid)->Data4[1] = 0x2f;\ + (guid)->Data4[2] = 0xa5;\ + (guid)->Data4[3] = 0xbf;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xc8;\ + (guid)->Data4[6] = 0x6e;\ + (guid)->Data4[7] = 0xba;\ +} +#define EXTRACT_USBAUDIO_MID(guid)\ + (USHORT)((guid)->Data1 - 0x4e1cecd2) +#define DEFINE_USBAUDIO_MID_GUID(id)\ + 0x4e1cecd2+(USHORT)(id), 0x1679, 0x463b, 0xa7, 0x2f, 0xa5, 0xbf, 0x64, 0xc8, 0x6e, 0xba + +#define INIT_EXBUS_MANUFACTURER_ID INIT_USBAUDIO_MID + +#define IS_COMPATIBLE_USBAUDIO_MID(guid)\ + (((guid)->Data1 >= 0x4e1cecd2) &&\ + ((guid)->Data1 < 0x4e1cecd2 + 0xffff) &&\ + ((guid)->Data2 == 0x1679) &&\ + ((guid)->Data3 == 0x463b) &&\ + ((guid)->Data4[0] == 0xa7) &&\ + ((guid)->Data4[1] == 0x2f) &&\ + ((guid)->Data4[2] == 0xa5) &&\ + ((guid)->Data4[3] == 0xbf) &&\ + ((guid)->Data4[4] == 0x64) &&\ + ((guid)->Data4[5] == 0xc8) &&\ + ((guid)->Data4[6] == 0x6e) &&\ + ((guid)->Data4[7] == 0xba)) +#endif // !defined(INIT_USBAUDIO_MID) + +#if !defined(INIT_USBAUDIO_PID) +#define INIT_USBAUDIO_PID(guid, id)\ +{\ + (guid)->Data1 = 0xabcc5a5e + (USHORT)(id);\ + (guid)->Data2 = 0xc263;\ + (guid)->Data3 = 0x463b;\ + (guid)->Data4[0] = 0xa7;\ + (guid)->Data4[1] = 0x2f;\ + (guid)->Data4[2] = 0xa5;\ + (guid)->Data4[3] = 0xbf;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xc8;\ + (guid)->Data4[6] = 0x6e;\ + (guid)->Data4[7] = 0xba;\ +} +#define EXTRACT_USBAUDIO_PID(guid)\ + (USHORT)((guid)->Data1 - 0xabcc5a5e) +#define DEFINE_USBAUDIO_PID_GUID(id)\ + 0xabcc5a5e+(USHORT)(id), 0xc263, 0x463b, 0xa7, 0x2f, 0xa5, 0xbf, 0x64, 0xc8, 0x6e, 0xba + +#define INIT_EXBUS_PRODUCT_ID INIT_USBAUDIO_PID + +#define IS_COMPATIBLE_USBAUDIO_PID(guid)\ + (((guid)->Data1 >= 0xabcc5a5e) &&\ + ((guid)->Data1 < 0xabcc5a5e + 0xffff) &&\ + ((guid)->Data2 == 0xc263) &&\ + ((guid)->Data3 == 0x463b) &&\ + ((guid)->Data4[0] == 0xa7) &&\ + ((guid)->Data4[1] == 0x2f) &&\ + ((guid)->Data4[2] == 0xa5) &&\ + ((guid)->Data4[3] == 0xbf) &&\ + ((guid)->Data4[4] == 0x64) &&\ + ((guid)->Data4[5] == 0xc8) &&\ + ((guid)->Data4[6] == 0x6e) &&\ + ((guid)->Data4[7] == 0xba)) +#endif // !defined(INIT_USBAUDIO_PID) + +#if !defined(INIT_USBAUDIO_PRODUCT_NAME) +#define INIT_USBAUDIO_PRODUCT_NAME(guid, vid, pid, strIndex)\ +{\ + (guid)->Data1 = 0XFC575048 + (USHORT)(vid);\ + (guid)->Data2 = 0x2E08 + (USHORT)(pid);\ + (guid)->Data3 = 0x463B + (USHORT)(strIndex);\ + (guid)->Data4[0] = 0xA7;\ + (guid)->Data4[1] = 0x2F;\ + (guid)->Data4[2] = 0xA5;\ + (guid)->Data4[3] = 0xBF;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xC8;\ + (guid)->Data4[6] = 0x6E;\ + (guid)->Data4[7] = 0xBA;\ +} +#define DEFINE_USBAUDIO_PRODUCT_NAME(vid, pid, strIndex)\ + 0xFC575048+(USHORT)(vid), 0x2E08+(USHORT)(pid), 0x463B+(USHORT)(strIndex), 0xA7, 0x2F, 0xA5, 0xBF, 0x64, 0xC8, 0x6E, 0xBA +#endif + +#define INIT_EXBUS_PRODUCT_NAME INIT_USBAUDIO_PRODUCT_NAME + +// USB Component ID +#define STATIC_KSCOMPONENTID_USBAUDIO \ + 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA +DEFINE_GUIDSTRUCT("8F1275F0-26E9-4264-BA4D-39FFF01D94AA", KSCOMPONENTID_USBAUDIO); +#define KSCOMPONENTID_USBAUDIO DEFINE_GUIDNAMED(KSCOMPONENTID_USBAUDIO) + +#endif // (NTDDI_VERSION >= NTDDI_WINXP) #define EXTRACT_WAVEFORMATEX_ID(Guid)\ (USHORT)((Guid)->Data1)

8 years

[akhaldi] 72722: [KERNEL32] Try to read 'DhcpDomain' registry value if present, otherwise return 'Domain' one, when domain part is requested from GetComputerNameEx(). By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 18 12:55:45 2016 New Revision: 72722 URL: http://svn.reactos.org/svn/reactos?rev=72722&view=rev Log: [KERNEL32] Try to read 'DhcpDomain' registry value if present, otherwise return 'Domain' one, when domain part is requested from GetComputerNameEx(). By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/kernel32/client/compname.c Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Sun Sep 18 12:55:45 2016 @@ -137,6 +137,7 @@ NTSTATUS Status; BOOL ret = TRUE; DWORD HostSize; + DWORD nBufferSize; if ((nSize == NULL) || (lpBuffer == NULL && *nSize > 0)) @@ -155,11 +156,27 @@ nSize); case ComputerNameDnsDomain: - return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize); + /* Save original buffer size for the second call if neccessery */ + nBufferSize = *nSize; + if (!GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"DhcpDomain", + lpBuffer, + nSize)) + { + /* The value is there, just the buffer is insufficient in length */ + if (GetLastError() == ERROR_MORE_DATA) + return FALSE; + /* Restore original buffer size for the second call */ + *nSize = nBufferSize; + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); + } + else + return TRUE; case ComputerNameDnsFullyQualified: ResultString.Length = 0; @@ -195,7 +212,7 @@ RtlFreeUnicodeString(&DomainPart); RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"Domain"; + QueryTable[0].Name = L"DhcpDomain"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &DomainPart; @@ -207,7 +224,9 @@ NULL, NULL); - if (NT_SUCCESS(Status)) + if ((NT_SUCCESS(Status)) && + (DomainPart.Buffer != NULL) && + (wcslen(DomainPart.Buffer) > 0)) { Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); if ((!NT_SUCCESS(Status)) || (!ret)) @@ -221,6 +240,36 @@ *nSize = ResultString.Length / sizeof(WCHAR) - 1; return TRUE; } + else + { + RtlInitUnicodeString(&DomainPart, NULL); + QueryTable[0].Name = L"Domain"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &DomainPart; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System" + L"\\CurrentControlSet\\Services\\Tcpip" + L"\\Parameters", + QueryTable, + NULL, + NULL); + + if (NT_SUCCESS(Status)) + { + Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); + if ((!NT_SUCCESS(Status)) || (!ret)) + { + *nSize = HostSize + DomainPart.Length; + SetLastError(ERROR_MORE_DATA); + RtlFreeUnicodeString(&DomainPart); + return FALSE; + } + RtlFreeUnicodeString(&DomainPart); + *nSize = ResultString.Length / sizeof(WCHAR) - 1; + return TRUE; + } + } } return FALSE; @@ -232,11 +281,9 @@ nSize); case ComputerNamePhysicalDnsDomain: - return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize); + return GetComputerNameExW(ComputerNameDnsDomain, + lpBuffer, + nSize); /* XXX Redo these */ case ComputerNamePhysicalDnsFullyQualified:

8 years

[hbelusca] 72721: [MSGINA][SHELL32]: Temporarily disable the WM_ACTIVATE check because it blocks for whatever reason the dialog to properly close and return its correct return value when the user s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 23:07:46 2016 New Revision: 72721 URL: http://svn.reactos.org/svn/reactos?rev=72721&view=rev Log: [MSGINA][SHELL32]: Temporarily disable the WM_ACTIVATE check because it blocks for whatever reason the dialog to properly close and return its correct return value when the user selects e.g. "Shutdown" and validate by pressing "OK" (effectively disables commit r72720). Modified: trunk/reactos/dll/win32/msgina/shutdown.c trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.… ============================================================================== --- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Sat Sep 17 23:07:46 2016 @@ -299,12 +299,14 @@ return TRUE; } +#if 0 case WM_ACTIVATE: { if (LOWORD(wParam) == WA_INACTIVE) EndDialog(hWnd, 0); return FALSE; } +#endif case WM_PAINT: { Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Sep 17 23:07:46 2016 @@ -900,12 +900,14 @@ EndDialog(hwnd, IDCANCEL); break; +#if 0 case WM_ACTIVATE: { if (LOWORD(wParam) == WA_INACTIVE) EndDialog(hwnd, 0); return FALSE; } +#endif case WM_COMMAND: switch (LOWORD(wParam))

8 years

← Newer
1
...
12
13
14
15
16
17
18
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2016