Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 73023: [MODE]: Forgot this change too (related to kbd rate before delay).
by hbelusca＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: hbelusca Date: Sat Oct 22 21:46:58 2016 New Revision: 73023 URL: http://svn.reactos.org/svn/reactos?rev=73023&view=rev Log: [MODE]: Forgot this change too (related to kbd rate before delay). Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Sat Oct 22 21:46:58 2016 @@ -216,13 +216,13 @@ ConResPrintf(StdOut, IDS_CONSOLE_STATUS_LINES, csbi.dwSize.Y); ConResPrintf(StdOut, IDS_CONSOLE_STATUS_COLS , csbi.dwSize.X); } + if (SystemParametersInfoW(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) + { + ConResPrintf(StdOut, IDS_CONSOLE_KBD_RATE, dwKbdSpeed); + } if (SystemParametersInfoW(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { ConResPrintf(StdOut, IDS_CONSOLE_KBD_DELAY, dwKbdDelay); - } - if (SystemParametersInfoW(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) - { - ConResPrintf(StdOut, IDS_CONSOLE_KBD_RATE, dwKbdSpeed); } ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); return 0;

1 0

[hbelusca] 73022: [CLIP]: Check read status before number of bytes read. Update main resource file. [COMP]: Code style fix; remove an unused define. [EVENTCREATE]: Remove an unused define. [HELP] -...
by hbelusca＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: hbelusca Date: Sat Oct 22 21:42:13 2016 New Revision: 73022 URL: http://svn.reactos.org/svn/reactos?rev=73022&view=rev Log: [CLIP]: Check read status before number of bytes read. Update main resource file. [COMP]: Code style fix; remove an unused define. [EVENTCREATE]: Remove an unused define. [HELP] - Remove unneeded headers; minor code formatting. - Remove an unused define. - Add placeholder Czech resource translation. [MODE]: Update translation (part 2/x); show the keyboard rate before the delay. Added: trunk/reactos/base/applications/cmdutils/help/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/clip/clip.c trunk/reactos/base/applications/cmdutils/clip/clip.rc trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/comp/resource.h trunk/reactos/base/applications/cmdutils/eventcreate/resource.h trunk/reactos/base/applications/cmdutils/help/help.c trunk/reactos/base/applications/cmdutils/help/help.rc trunk/reactos/base/applications/cmdutils/help/resource.h trunk/reactos/base/applications/cmdutils/mode/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc trunk/reactos/base/applications/cmdutils/mode/resource.h Modified: trunk/reactos/base/applications/cmdutils/clip/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.c [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -89,7 +89,7 @@ hBuffer = hTemp; } - while (dwBytesRead > 0 && bStatus); + while (bStatus && dwBytesRead > 0); /* * Resize the buffer to the total size of data read. Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -2,9 +2,11 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clip Command" -#define REACTOS_STR_INTERNAL_NAME "clip" -#define REACTOS_STR_ORIGINAL_FILENAME "clip.exe" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clip Command" +#define REACTOS_STR_INTERNAL_NAME "clip" +#define REACTOS_STR_ORIGINAL_FILENAME "clip.exe" #include <reactos/version.rc> /* UTF-8 */ Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -38,7 +38,7 @@ #define STRBUF 1024 -/* getline: read a line, return length */ +/* getline: read a line, return length */ INT GetBuff(PBYTE buff, FILE* in) { return fread(buff, sizeof(BYTE), STRBUF, in); @@ -56,7 +56,7 @@ } -int wmain (int argc, WCHAR* argv[]) +int wmain(int argc, WCHAR* argv[]) { INT i; @@ -202,13 +202,9 @@ /* Reporting here a mismatch */ if (bLineNos) - { ConResPrintf(StdOut, IDS_MISMATCHLINE, LineNumber); - } else - { ConResPrintf(StdOut, IDS_MISMATCHOFFSET, Offset); - } if (bAscii) { Modified: trunk/reactos/base/applications/cmdutils/comp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -1,6 +1,4 @@ #pragma once - -#define RC_STRING_MAX_SIZE 4096 #define IDS_HELP 100 #define IDS_INVALIDSWITCH 101 Modified: trunk/reactos/base/applications/cmdutils/eventcreate/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/resource.h [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -1,6 +1,4 @@ #pragma once - -#define RC_STRING_MAX_SIZE 4096 #define IDS_USAGE 100 #define IDS_HELP 101 Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -7,9 +7,7 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#include <stdio.h> #include <stdlib.h> -#include <wchar.h> #define WIN32_NO_STATUS #include <windef.h> @@ -22,7 +20,8 @@ #include "help.h" #include "resource.h" -BOOL IsInternalCommand(LPCWSTR Cmd) +static BOOL +IsInternalCommand(PCWSTR Cmd) { size_t i; int res; @@ -73,7 +72,7 @@ /* * Bad usage (too much options) or we use the /? switch. - * Display help for the help command. + * Display help for the HELP command. */ if ((argc > 2) || (wcscmp(argv[1], L"/?") == 0)) { Modified: trunk/reactos/base/applications/cmdutils/help/help.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.rc [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -5,9 +5,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Line Help Utility" -#define REACTOS_STR_INTERNAL_NAME "help" -#define REACTOS_STR_ORIGINAL_FILENAME "help.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Command Line Help Utility" +#define REACTOS_STR_INTERNAL_NAME "help" +#define REACTOS_STR_ORIGINAL_FILENAME "help.exe" #include <reactos/version.rc> /* UTF-8 */ Added: trunk/reactos/base/applications/cmdutils/help/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/help/lang/cs-CZ.rc [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -0,0 +1,73 @@ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." +END + +STRINGTABLE +BEGIN + IDS_USAGE "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" + IDS_HELP1 "List of all available commands (+ description)\n\n\ + help command\n\ + command /? For more information on a specific command\n\n\ +? List all available commands (without description).\n\ +ALIAS Sets, removes or shows aliases.\n\ +ATTRIB Displays or changes file attributes.\n\ +BEEP Beep the speaker.\n\ +CALL Calls one batch program from another.\n\ +CD Displays the name of or changes the current directory.\n\ +CHCP Displays or sets the active code page number.\n\ +CHOICE Waits for the user to choose one of a set of choices.\n\ +CLS Clears the screen.\n\ +CMD Starts a new instance of the ReactOS command interpreter.\n\ +COLOR Sets the default console foreground and background colors.\n\ +COPY Copies one or more files to another location.\n\ +DATE Displays or sets the date.\n\ +DELETE Deletes one or more files.\n\ +DIR Displays a list of files and subdirectories in a directory.\n\ +ECHO Displays messages, or turns command echoing on or off.\n\ +ERASE Deletes one or more files.\n\ +EXIT Quits the CMD.EXE program (command interpreter).\n\ +FOR Runs a specified command for each file in a set of files.\n\ +FREE (free) disc space.\n\ +GOTO Directs the ReactOS command interpreter to a labeled line in\n\ + a batch program.\n\ +HELP Provides Help information for ReactOS commands.\n\ +HISTORY List all commands which has been used\n\ +IF Performs conditional processing in batch programs.\n\ +LABEL Creates, changes, or deletes the volume label of a disk.\n\ +MD Creates a directory.\n\ +MKDIR Creates a directory.\n\ +MKLINK Creates a filesystem link object.\n\ +MOVE Moves one or more files from one directory to another\n\ + directory.\n\ +PATH Displays or sets a search path for executable files.\n\ +PAUSE Suspends processing of a batch file and displays a message.\n\ +POPD Restores the previous value of the current directory saved by\n\ + PUSHD.\n\ +PROMPT Changes the command prompt.\n\ +PUSHD Saves the current directory then changes it.\n\ +RD Removes a directory.\n\ +REM Records comments (remarks) in batch files.\n\ +REN Renames a file or files.\n\ +RENAME Renames a file or files.\n\ +REPLACE Replaces files.\n\ +RMDIR Removes a directory.\n\ +SCREEN Move cursor and optionally print text.\n\ +SET Displays, sets, or removes ReactOS environment variables.\n\ +SHIFT Shifts the position of replaceable parameters in batch files.\n" + IDS_HELP2 "START Starts a separate window to run a specified program or command.\n\ + Executes command.\n\ +TIME Displays or sets the system time.\n\ +TIMER Allow the use of ten stopwatches.\n\ +TITLE Sets the window title for a CMD.EXE session.\n\ +TYPE Displays the contents of a text file.\n\ +VER Displays the ReactOS version.\n\ +VERIFY Tells ReactOS whether to verify that your files are written\n\ + correctly to a disk.\n\ +VOL Displays a disk volume label and serial number.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/help/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/help/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/resource.h [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -1,6 +1,4 @@ #pragma once - -#define RC_STRING_MAX_SIZE 4096 #define IDS_USAGE 100 #define IDS_HELP1 101 Modified: trunk/reactos/base/applications/cmdutils/mode/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/lang/de-DE.rc [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -42,11 +42,11 @@ IDS_COM_STATUS_DTR_CIRCUIT " DTR circuit: %s\n" IDS_COM_STATUS_RTS_CIRCUIT " RTS circuit: %s\n" - IDS_CONSOLE_STATUS_LINES " Zeilen: %d\n" - IDS_CONSOLE_STATUS_COLS " Spalten: %d\n" - IDS_CONSOLE_KBD_DELAY " VerzÃ¶gerungszeit:%ld\n" - IDS_CONSOLE_KBD_RATE " Wiederholrate: %ld\n" - IDS_CONSOLE_CODEPAGE " Codepage: %d\n" + IDS_CONSOLE_STATUS_LINES " Zeilen: %d\n" + IDS_CONSOLE_STATUS_COLS " Spalten: %d\n" + IDS_CONSOLE_KBD_RATE " Wiederholrate: %ld\n" + IDS_CONSOLE_KBD_DELAY " VerzÃ¶gerungszeit: %ld\n" + IDS_CONSOLE_CODEPAGE " Codepage: %d\n" IDS_PRINTER_OUTPUT_NOT_REROUTED " Druckausgabe wird nicht umgeleitet.\n" IDS_PRINTER_OUTPUT_REROUTED_SERIAL " Druckausgabe wird an seriellen Anschluss %s umgeleitet.\n" @@ -64,4 +64,5 @@ IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" + IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n" END Modified: trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/lang/en-US.rc [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -44,8 +44,8 @@ IDS_CONSOLE_STATUS_LINES " Lines: %d\n" IDS_CONSOLE_STATUS_COLS " Columns: %d\n" + IDS_CONSOLE_KBD_RATE " Keyboard rate: %ld\n" IDS_CONSOLE_KBD_DELAY " Keyboard delay: %ld\n" - IDS_CONSOLE_KBD_RATE " Keyboard rate: %ld\n" IDS_CONSOLE_CODEPAGE " Code page: %d\n" IDS_PRINTER_OUTPUT_NOT_REROUTED " Printer output is not being rerouted.\n" @@ -64,4 +64,5 @@ IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" + IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n" END Modified: trunk/reactos/base/applications/cmdutils/mode/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/resource.h [iso-8859-1] Sat Oct 22 21:42:13 2016 @@ -27,8 +27,8 @@ #define IDS_COM_STATUS_RTS_CIRCUIT 16 #define IDS_CONSOLE_STATUS_LINES 17 #define IDS_CONSOLE_STATUS_COLS 18 -#define IDS_CONSOLE_KBD_DELAY 19 -#define IDS_CONSOLE_KBD_RATE 20 +#define IDS_CONSOLE_KBD_RATE 19 +#define IDS_CONSOLE_KBD_DELAY 20 #define IDS_CONSOLE_CODEPAGE 21 #define IDS_PRINTER_OUTPUT_NOT_REROUTED 22 #define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23 @@ -43,5 +43,6 @@ #define IDS_ERROR_INVALID_PARITY_BITS 31 #define IDS_ERROR_INVALID_STOP_BITS 32 #define IDS_ERROR_NO_MEMORY 33 +#define IDS_ERROR_SCREEN_LINES_COL 34 #endif /* RESOURCE_H */

1 0

[janderwald] 73021: [KS] - enable topology property handlers
by janderwald＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: janderwald Date: Sat Oct 22 19:52:51 2016 New Revision: 73021 URL: http://svn.reactos.org/svn/reactos?rev=73021&view=rev Log: [KS] - enable topology property handlers Modified: trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sat Oct 22 19:52:51 2016 @@ -1019,7 +1019,8 @@ UNICODE_STRING GuidString; PKSPROPERTY Property; ULONG SetCount = 0; - //PKSP_NODE NodeProperty; + PKSP_NODE NodeProperty; + PKSNODE_DESCRIPTOR NodeDescriptor; /* obtain filter from object header */ Status = IKsFilter_GetFilterFromIrp(Irp, &Filter); @@ -1067,21 +1068,21 @@ { const KSPROPERTY_SET *PropertySet = NULL; ULONG PropertyItemSize = 0; -#if 0 + /* check if the driver supports method sets */ if (Property->Flags & KSPROPERTY_TYPE_TOPOLOGY) { + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(KSP_NODE)); NodeProperty = (PKSP_NODE)Property; - if (FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable != NULL) + NodeDescriptor = (PKSNODE_DESCRIPTOR)((ULONG_PTR)FilterInstance->Descriptor->NodeDescriptors + FilterInstance->Descriptor->NodeDescriptorSize * NodeProperty->NodeId); + if (NodeDescriptor->AutomationTable != NULL) { - SetCount = FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable->PropertySetsCount; - PropertySet = FilterInstance->Descriptor->NodeDescriptors[NodeProperty->NodeId].AutomationTable->PropertySets; + SetCount = NodeDescriptor->AutomationTable->PropertySetsCount; + PropertySet = NodeDescriptor->AutomationTable->PropertySets; PropertyItemSize = 0; } - - } else -#endif - if (FilterInstance->Descriptor->AutomationTable->PropertySetsCount) + } + else if (FilterInstance->Descriptor->AutomationTable->PropertySetsCount) { SetCount = FilterInstance->Descriptor->AutomationTable->PropertySetsCount; PropertySet = FilterInstance->Descriptor->AutomationTable->PropertySets;

1 0

[janderwald] 73020: [USBAUDIO] - fix warnings & leaks based on Thomas feedback
by janderwald＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: janderwald Date: Sat Oct 22 12:34:03 2016 New Revision: 73020 URL: http://svn.reactos.org/svn/reactos?rev=73020&view=rev Log: [USBAUDIO] - fix warnings & leaks based on Thomas feedback Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/pin.c 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] Sat Oct 22 12:34:03 2016 @@ -1083,6 +1083,11 @@ /* store result */ *OutDescriptor = Descriptor; } + else + { + /* failed */ + FreeFunction(Descriptor); + } /* done */ return Status; @@ -1098,7 +1103,6 @@ OUT PVOID *OutDescriptor) { NTSTATUS Status; - PUSB_STRING_DESCRIPTOR StringDescriptor; /* retrieve descriptor */ Status = USBAudioGetDescriptor(DeviceObject, USB_STRING_DESCRIPTOR_TYPE, DescriptorLength, DescriptorIndex, LanguageId, OutDescriptor); @@ -1124,14 +1128,14 @@ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\MediaCategories\\"); /* initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_KERNEL_HANDLE, NULL, NULL); /* create the key */ Status = ZwOpenKey(&Handle, KEY_ALL_ACCESS, &ObjectAttributes); if (NT_SUCCESS(Status)) { /* initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, Name, OBJ_CASE_INSENSITIVE, Handle, NULL); + InitializeObjectAttributes(&ObjectAttributes, Name, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, Handle, NULL); Status = ZwCreateKey(OutHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, NULL); ZwClose(Handle); @@ -1228,8 +1232,8 @@ if (!NT_SUCCESS(Status)) { /* failed*/ - //FreeFunction(ComponentId); - //return Status; + FreeFunction(ComponentId); + return Status; } FilterDescriptor->ComponentId = ComponentId; @@ -1247,8 +1251,8 @@ if (!NT_SUCCESS(Status)) { /* failed*/ - //FreeFunction(ComponentId); - //return Status; + FreeFunction(ComponentId); + return Status; } /* lets create the filter */ 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] Sat Oct 22 12:34:03 2016 @@ -789,7 +789,6 @@ PPIN_CONTEXT PinContext; PLIST_ENTRY CurEntry; PIRP Irp; - PIO_STACK_LOCATION IoStack; PURB Urb; PUCHAR TransferBuffer, OutBuffer; ULONG Offset, Length; @@ -827,7 +826,6 @@ Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); /* get urb from irp */ - IoStack = IoGetNextIrpStackLocation(Irp); Urb = (PURB)Irp->Tail.Overlay.DriverContext[0]; ASSERT(Urb); @@ -882,6 +880,7 @@ else { Status = KsStreamPointerAdvanceOffsets(LeadingStreamPointer, 0, Length, FALSE); + NT_ASSERT(NT_SUCCESS(Status)); ASSERT(Length == Urb->UrbIsochronousTransfer.TransferBufferLength - Offset); } @@ -1102,7 +1101,7 @@ } /* get pin descriptor */ - PinDescriptor = &Filter->Descriptor->PinDescriptors[Pin->PinId]; + PinDescriptor = (PKSPIN_DESCRIPTOR_EX)&Filter->Descriptor->PinDescriptors[Pin->PinId]; *DataSize = sizeof(KSDATAFORMAT_WAVEFORMATEX); if (DataBufferSize == 0)

1 0

[mjansen] 73019: [FRAGINATOR] Silence a ton of warnings.
by mjansen＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: mjansen Date: Sat Oct 22 12:13:34 2016 New Revision: 73019 URL: http://svn.reactos.org/svn/reactos?rev=73019&view=rev Log: [FRAGINATOR] Silence a ton of warnings. Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/CM… ============================================================================== --- trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] Sat Oct 22 12:13:34 2016 @@ -1,5 +1,5 @@ -set_cpp(WITH_RUNTIME WITH_STL) +set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS) list(APPEND SOURCE Fraginator.cpp @@ -10,7 +10,7 @@ Unfrag.cpp Defragment.cpp DriveVolume.cpp) - + add_executable(frag ${SOURCE} ${UNFRAG_SOURCE} Fraginator.rc) set_module_type(frag win32gui UNICODE) add_importlibs(frag user32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll)

1 0

[mjansen] 73018: [OLE32] Stub and export CoGetCancelObject. CORE-12199
by mjansen＠svn.reactos.org 22 Oct '16

22 Oct '16

Author: mjansen Date: Sat Oct 22 12:03:33 2016 New Revision: 73018 URL: http://svn.reactos.org/svn/reactos?rev=73018&view=rev Log: [OLE32] Stub and export CoGetCancelObject. CORE-12199 Modified: trunk/reactos/dll/win32/ole32/ole32.spec Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sat Oct 22 12:03:33 2016 @@ -35,7 +35,7 @@ # CoGetApartmentID @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallerTID(ptr) -# CoGetCancelObject +@ stdcall -stub CoGetCancelObject(long ptr ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) # CoGetClassVersion # CoGetComCatalog

1 0

[janderwald] 73017: - implement MMixerGetDeviceNameWithComponentId, which retrieves the device name via component id - start implement MMixerHandleTopologyFilter, does not yet fully work
by janderwald＠svn.reactos.org 21 Oct '16

21 Oct '16

Author: janderwald Date: Fri Oct 21 21:26:12 2016 New Revision: 73017 URL: http://svn.reactos.org/svn/reactos?rev=73017&view=rev Log: - implement MMixerGetDeviceNameWithComponentId, which retrieves the device name via component id - start implement MMixerHandleTopologyFilter, does not yet fully work Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/controls.c trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h trunk/reactos/sdk/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/sound/mmix… ============================================================================== --- trunk/reactos/sdk/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Fri Oct 21 21:26:12 2016 @@ -1269,6 +1269,110 @@ } MIXER_STATUS +MMixerHandleTopologyFilter( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN OUT LPMIXER_INFO MixerInfo, + IN ULONG bInput, + IN ULONG Pin) +{ + MIXER_STATUS Status; + ULONG PinsCount, LineTerminator, DestinationLineID; + PULONG Pins; + PTOPOLOGY Topology; + + /* re-use existing topology */ + Topology = MixerData->Topology; + + if (!bInput) + { + /* allocate pin index array which will hold all referenced pins */ + Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to create topology */ + return Status; + } + + /* the mixer is an output mixer + * find end pin of the node path + */ + PinsCount = 0; + Status = MMixerGetAllUpOrDownstreamPinsFromPinIndex(MixerContext, Topology, Pin, FALSE, &PinsCount, Pins); + + /* check for success */ + if (Status != MM_STATUS_SUCCESS) + { + /* failed to get end pin */ + MixerContext->Free(Pins); + //MMixerFreeTopology(Topology); + + /* return error code */ + return Status; + } + /* HACK: + * some topologies do not have strict boundaries + * WorkArround: remove all pin ids which have a physical connection + * because bridge pins may belong to different render paths + */ + MMixerApplyOutputFilterHack(MixerContext, MixerData, MixerData->hDevice, &PinsCount, Pins); + + /* sanity checks */ + ASSERT(PinsCount != 0); + if (PinsCount != 1) + { + DPRINT1("MMixerHandlePhysicalConnection Expected 1 pin but got %lu\n", PinsCount); + } + + /* create destination line */ + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInput); + + /* calculate destination line id */ + DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations - 1); + + if (Status != MM_STATUS_SUCCESS) + { + /* failed to build destination line */ + MixerContext->Free(Pins); + + /* return error code */ + return Status; + } + + /* add mixer controls to destination line */ + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); + + if (Status == MM_STATUS_SUCCESS) + { + /* now add the rest of the source lines */ + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); + } + + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, Pins[0]); + + /* free topology pin array */ + MixerContext->Free(Pins); + } + else + { + /* calculate destination line id */ + DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations - 1); + + /* add mixer controls */ + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, Pin, bInput, DestinationLineID, &LineTerminator); + + if (Status == MM_STATUS_SUCCESS) + { + /* now add the rest of the source lines */ + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); + } + } + return Status; +} + +MIXER_STATUS MMixerHandlePhysicalConnection( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, @@ -1450,7 +1554,12 @@ MixerInfo->MixCaps.cDestinations = 0; /* get mixer name */ - MMixerGetDeviceName(MixerContext, MixerInfo->MixCaps.szPname, MixerData->hDeviceInterfaceKey); + Status = MMixerGetDeviceName(MixerContext, MixerInfo->MixCaps.szPname, MixerData->hDeviceInterfaceKey); + if (Status != MM_STATUS_SUCCESS) + { + /* try get name with component id */ + Status = MMixerGetDeviceNameWithComponentId(MixerContext, MixerData->hDevice, MixerInfo->MixCaps.szPname); + } /* initialize line list */ InitializeListHead(&MixerInfo->LineList); @@ -1546,10 +1655,8 @@ } else { - /* FIXME - * handle drivers which expose their topology on the same filter - */ - ASSERT(0); + /* topology is on the same filter */ + Status = MMixerHandleTopologyFilter(MixerContext, MixerList, MixerData, MixerInfo, bInputMixer, Pins[0]); } /* free pins */ Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/sound/mmix… ============================================================================== --- trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1] Fri Oct 21 21:26:12 2016 @@ -359,6 +359,12 @@ OUT LPWSTR DeviceName, IN HANDLE hKey); +MIXER_STATUS +MMixerGetDeviceNameWithComponentId( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + OUT LPWSTR DeviceName); + VOID MMixerInitializePinConnect( IN OUT PKSPIN_CONNECT PinConnect, Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/sound/mmix… ============================================================================== --- trunk/reactos/sdk/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Fri Oct 21 21:26:12 2016 @@ -802,6 +802,53 @@ } MIXER_STATUS +MMixerGetDeviceNameWithComponentId( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hMixer, + OUT LPWSTR OutDeviceName) +{ + MIXER_STATUS Status; + KSPROPERTY Property; + KSCOMPONENTID ComponentId; + ULONG Length; + UNICODE_STRING GuidString; + ULONG ResultLength, KeyType; + HANDLE hMediaKey, hGuidKey; + LPWSTR DeviceName; + + /* prepare property */ + Property.Flags = KSPROPERTY_TYPE_GET; + Property.Set = KSPROPSETID_General; + Property.Id = KSPROPERTY_GENERAL_COMPONENTID; + + /* try get component id */ + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), &ComponentId, sizeof(KSCOMPONENTID), &Length); + + if (Status == MM_STATUS_SUCCESS) + { + Status = MixerContext->OpenKey(NULL, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\MediaCategories", KEY_READ, &hMediaKey); + if (Status == MM_STATUS_SUCCESS) + { + RtlStringFromGUID(&ComponentId.Name, &GuidString); + Status = MixerContext->OpenKey(hMediaKey, GuidString.Buffer, KEY_READ, &hGuidKey); + RtlFreeUnicodeString(&GuidString); + if (Status == MM_STATUS_SUCCESS) + { + Status = MixerContext->QueryKeyValue(hGuidKey, L"Name", (PVOID*)&DeviceName, &ResultLength, &KeyType); + if (Status == MM_STATUS_SUCCESS) + { + MixerContext->Copy(OutDeviceName, DeviceName, min(ResultLength, (MAXPNAMELEN-1)*2)); + } + + MixerContext->CloseKey(hGuidKey); + } + MixerContext->CloseKey(hMediaKey); + } + } + return Status; +} + +MIXER_STATUS MMixerGetDeviceName( IN PMIXER_CONTEXT MixerContext, OUT LPWSTR DeviceName,

1 0

[janderwald] 73016: [USBAUDIO] - implement retrieving string descriptor of product and store it in registry.
by janderwald＠svn.reactos.org 21 Oct '16

21 Oct '16

Author: janderwald Date: Fri Oct 21 21:15:01 2016 New Revision: 73016 URL: http://svn.reactos.org/svn/reactos?rev=73016&view=rev Log: [USBAUDIO] - implement retrieving string descriptor of product and store it in registry. Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/guid.c 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] Fri Oct 21 21:15:01 2016 @@ -1024,21 +1024,171 @@ } NTSTATUS +NTAPI +USBAudioGetDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR DescriptorType, + IN ULONG DescriptorLength, + IN UCHAR DescriptorIndex, + IN LANGID LanguageId, + OUT PVOID *OutDescriptor) +{ + PURB Urb; + NTSTATUS Status; + PVOID Descriptor; + + /* sanity checks */ + ASSERT(DeviceObject); + ASSERT(OutDescriptor); + ASSERT(DescriptorLength); + + // + // first allocate descriptor buffer + // + Descriptor = AllocFunction(DescriptorLength); + if (!Descriptor) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate urb */ + Urb = (PURB)AllocFunction(sizeof(URB)); + if (!Urb) + { + /* no memory */ + FreeFunction(Descriptor); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize urb */ + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + DescriptorType, + DescriptorIndex, + LanguageId, + Descriptor, + NULL, + DescriptorLength, + NULL); + + /* submit urb */ + Status = SubmitUrbSync(DeviceObject, Urb); + + /* free urb */ + FreeFunction(Urb); + + if (NT_SUCCESS(Status)) + { + /* store result */ + *OutDescriptor = Descriptor; + } + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +USBAudioGetStringDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DescriptorLength, + IN UCHAR DescriptorIndex, + IN LANGID LanguageId, + OUT PVOID *OutDescriptor) +{ + NTSTATUS Status; + PUSB_STRING_DESCRIPTOR StringDescriptor; + + /* retrieve descriptor */ + Status = USBAudioGetDescriptor(DeviceObject, USB_STRING_DESCRIPTOR_TYPE, DescriptorLength, DescriptorIndex, LanguageId, OutDescriptor); + if (!NT_SUCCESS(Status)) + { + // failed + return Status; + } + return STATUS_SUCCESS; +} + +NTSTATUS +USBAudioRegCreateMediaCategoriesKey( + IN PUNICODE_STRING Name, + OUT PHANDLE OutHandle) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DestinationString; + HANDLE Handle; + + /* initialize root name*/ + RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\MediaCategories\\"); + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, NULL, NULL); + + /* create the key */ + Status = ZwOpenKey(&Handle, KEY_ALL_ACCESS, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, Name, OBJ_CASE_INSENSITIVE, Handle, NULL); + + Status = ZwCreateKey(OutHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, NULL, 0, NULL); + ZwClose(Handle); + + } + return Status; +} + + +NTSTATUS USBAudioInitComponentId( PKSDEVICE Device, IN PKSCOMPONENTID ComponentId) { PDEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + LPWSTR DescriptionBuffer; + UNICODE_STRING GuidString; + UNICODE_STRING Name; + HANDLE hKey; + GUID TempGuid; /* get device extension */ DeviceExtension = Device->Context; + /* init component id */ + ComponentId->Component = KSCOMPONENTID_USBAUDIO; + ComponentId->Version = HIBYTE(DeviceExtension->DeviceDescriptor->bcdDevice); + ComponentId->Revision = LOBYTE(DeviceExtension->DeviceDescriptor->bcdDevice); + INIT_USBAUDIO_MID(&ComponentId->Manufacturer, DeviceExtension->DeviceDescriptor->idVendor); INIT_USBAUDIO_PID(&ComponentId->Product, DeviceExtension->DeviceDescriptor->idProduct); - - //ComponentId->Component = KSCOMPONENTID_USBAUDIO; - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + INIT_USBAUDIO_PRODUCT_NAME(&TempGuid, DeviceExtension->DeviceDescriptor->idVendor, DeviceExtension->DeviceDescriptor->idProduct, 0); + + if (DeviceExtension->DeviceDescriptor->iProduct) + { + Status = USBAudioGetStringDescriptor(DeviceExtension->LowerDevice, 100 * sizeof(WCHAR), DeviceExtension->DeviceDescriptor->iProduct, 0x0409 /* FIXME */, (PVOID*)&DescriptionBuffer); + if (NT_SUCCESS(Status)) + { + Status = RtlStringFromGUID(&TempGuid, &GuidString); + if (NT_SUCCESS(Status)) + { + Status = USBAudioRegCreateMediaCategoriesKey(&GuidString, &hKey); + if (NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&Name, L"Name"); + ZwSetValueKey(hKey, &Name, 0, REG_SZ, DescriptionBuffer, (wcslen(DescriptionBuffer) + 1) * sizeof(WCHAR)); + ZwClose(hKey); + + INIT_USBAUDIO_PRODUCT_NAME(&ComponentId->Name, DeviceExtension->DeviceDescriptor->idVendor, DeviceExtension->DeviceDescriptor->idProduct, 0); + } + RtlFreeUnicodeString(&GuidString); + } + FreeFunction(DescriptionBuffer); + } + } + return STATUS_SUCCESS; } Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/guid.c [iso-8859-1] Fri Oct 21 21:15:01 2016 @@ -15,4 +15,5 @@ DEFINE_GUID(KSNODETYPE_SUM, 0xDA441A60L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0L, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

1 0

[hbelusca] 73015: [ADVAPI32_APITEST]: I wasn't alone for writing these tests!
by hbelusca＠svn.reactos.org 21 Oct '16

21 Oct '16

Author: hbelusca Date: Fri Oct 21 21:08:54 2016 New Revision: 73015 URL: http://svn.reactos.org/svn/reactos?rev=73015&view=rev Log: [ADVAPI32_APITEST]: I wasn't alone for writing these tests! Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c Modified: trunk/rostests/apitests/advapi32/IsTextUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/IsTextU… ============================================================================== --- trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] Fri Oct 21 21:08:54 2016 @@ -2,7 +2,8 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Tests for (Rtl)IsTextUnicode. - * PROGRAMMER: Hermes Belusca-Maito + * PROGRAMMERS: Hermes Belusca-Maito + * Dmitry Chapyshev */ #include <apitest.h>

1 0

[janderwald] 73014: [USBCCGP] - fix invalid device descriptor for composite usb devices
by janderwald＠svn.reactos.org 21 Oct '16

21 Oct '16

Author: janderwald Date: Fri Oct 21 20:52:40 2016 New Revision: 73014 URL: http://svn.reactos.org/svn/reactos?rev=73014&view=rev Log: [USBCCGP] - fix invalid device descriptor for composite usb devices Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] Fri Oct 21 20:52:40 2016 @@ -223,7 +223,7 @@ PDODeviceExtension->ConfigurationHandle = FDODeviceExtension->ConfigurationHandle; PDODeviceExtension->ConfigurationDescriptor = FDODeviceExtension->ConfigurationDescriptor; RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - RtlCopyMemory(&PDODeviceExtension->DeviceDescriptor, &FDODeviceExtension->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + RtlCopyMemory(&PDODeviceExtension->DeviceDescriptor, FDODeviceExtension->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); /* Patch the stack size */ PDODeviceObject->StackSize = DeviceObject->StackSize + 1;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs