Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[hbelusca] 73110: [CONUTILS]: Remove that overengineered splitted library stuff, and just rely on the splitting of the source code files instead. This is simpler and does the same job as I wanted t...
by hbelusca＠svn.reactos.org 03 Nov '16

03 Nov '16

Author: hbelusca Date: Thu Nov 3 15:47:45 2016 New Revision: 73110 URL: http://svn.reactos.org/svn/reactos?rev=73110&view=rev Log: [CONUTILS]: Remove that overengineered splitted library stuff, and just rely on the splitting of the source code files instead. This is simpler and does the same job as I wanted to do initially (thanks Amine and Thomas for the feedback). CORE-10504 #resolve [APPS]: Use again just the conutils library. The effect of these two modifications above is to partly revert r73024 (the code splitting remains on the contrary). [CMAKE]: Remove the "evil workaround" (revert r73027). See CORE-12206 for more details. Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/system/chkdsk/CMakeLists.txt trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/subst/CMakeLists.txt trunk/reactos/sdk/cmake/CMakeMacros.cmake trunk/reactos/sdk/lib/conutils/CMakeLists.txt trunk/reactos/sdk/lib/conutils/README.txt Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… ============================================================================== --- trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,6 +3,6 @@ add_executable(cacls cacls.c cacls.rc) set_module_type(cacls win32cui UNICODE) -target_link_libraries(cacls conutils_stream ${PSEH_LIB}) +target_link_libraries(cacls conutils ${PSEH_LIB}) add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32) add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,6 +3,6 @@ add_executable(clip clip.c clip.rc) set_module_type(clip win32cui UNICODE) -target_link_libraries(clip conutils_stream ${PSEH_LIB}) +target_link_libraries(clip conutils ${PSEH_LIB}) add_importlibs(clip advapi32 user32 msvcrt kernel32) add_cd_file(TARGET clip DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,6 +3,6 @@ add_executable(comp comp.c comp.rc) set_module_type(comp win32cui UNICODE) -target_link_libraries(comp conutils_stream ${PSEH_LIB}) +target_link_libraries(comp conutils ${PSEH_LIB}) add_importlibs(comp msvcrt kernel32) add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -7,6 +7,6 @@ add_executable(eventcreate eventcreate.c eventcreate.rc) set_module_type(eventcreate win32cui UNICODE) add_dependencies(eventcreate evtmsgstr) -target_link_libraries(eventcreate conutils_stream ${PSEH_LIB}) +target_link_libraries(eventcreate conutils ${PSEH_LIB}) add_importlibs(eventcreate advapi32 msvcrt kernel32) add_cd_file(TARGET eventcreate DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,7 +3,7 @@ add_executable(cmd_help help.c help.rc) set_module_type(cmd_help win32cui UNICODE) -target_link_libraries(cmd_help conutils_stream ${PSEH_LIB}) +target_link_libraries(cmd_help conutils ${PSEH_LIB}) add_importlibs(cmd_help msvcrt kernel32) set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help") add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,7 +3,7 @@ add_executable(mode mode.c mode.rc) set_module_type(mode win32cui UNICODE) -target_link_libraries(mode conutils_stream ${PSEH_LIB}) +target_link_libraries(mode conutils ${PSEH_LIB}) add_importlibs(mode user32 msvcrt kernel32) set_target_properties(mode PROPERTIES SUFFIX ".com") add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -5,7 +5,7 @@ add_executable(more more.c more.rc) set_module_type(more win32cui UNICODE) -target_link_libraries(more conutils_pager ${PSEH_LIB}) +target_link_libraries(more conutils ${PSEH_LIB}) add_importlibs(more advapi32 user32 msvcrt kernel32) set_target_properties(more PROPERTIES SUFFIX ".com") add_cd_file(TARGET more DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… ============================================================================== --- trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,6 +3,6 @@ add_executable(logoff logoff.c logoff.rc) set_module_type(logoff win32cui UNICODE) -target_link_libraries(logoff conutils_stream ${PSEH_LIB}) +target_link_libraries(logoff conutils ${PSEH_LIB}) add_importlibs(logoff advapi32 user32 msvcrt kernel32) add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -19,7 +19,7 @@ add_executable(net ${SOURCE} net.rc) set_module_type(net win32cui UNICODE) -target_link_libraries(net conutils_stream ${PSEH_LIB}) +target_link_libraries(net conutils ${PSEH_LIB}) add_importlibs(net advapi32 netapi32 mpr msvcrt kernel32 ntdll) add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -7,6 +7,6 @@ add_executable(wlanconf wlanconf.c wlanconf.rc) set_module_type(wlanconf win32cui UNICODE) -target_link_libraries(wlanconf conutils_stream ${PSEH_LIB}) +target_link_libraries(wlanconf conutils ${PSEH_LIB}) add_importlibs(wlanconf msvcrt iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -9,7 +9,7 @@ add_executable(shutdown ${SOURCE} shutdown.rc) set_module_type(shutdown win32cui UNICODE) -target_link_libraries(shutdown conutils_stream ${PSEH_LIB}) +target_link_libraries(shutdown conutils ${PSEH_LIB}) add_importlibs(shutdown advapi32 user32 powrprof msvcrt kernel32) add_pch(shutdown precomp.h SOURCE) add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/chkdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/chkdsk/CMakeLi… ============================================================================== --- trunk/reactos/base/system/chkdsk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/chkdsk/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -4,6 +4,6 @@ add_executable(chkdsk chkdsk.c chkdsk.rc) set_module_type(chkdsk win32cui UNICODE) -target_link_libraries(chkdsk conutils_stream ${PSEH_LIB}) +target_link_libraries(chkdsk conutils ${PSEH_LIB}) add_importlibs(chkdsk fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET chkdsk DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -45,7 +45,7 @@ add_executable(diskpart ${SOURCE} diskpart.rc) set_module_type(diskpart win32cui UNICODE) -target_link_libraries(diskpart conutils_stream ${PSEH_LIB}) +target_link_libraries(diskpart conutils ${PSEH_LIB}) add_importlibs(diskpart advapi32 msvcrt kernel32 ntdll) if(MSVC) Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… ============================================================================== --- trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -4,7 +4,7 @@ add_executable(format format.c format.rc) set_module_type(format win32cui UNICODE) -target_link_libraries(format conutils_stream ${PSEH_LIB}) +target_link_libraries(format conutils ${PSEH_LIB}) add_importlibs(format fmifs msvcrt kernel32 ntdll) set_target_properties(format PROPERTIES SUFFIX ".com") add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/subst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/CMakeLis… ============================================================================== --- trunk/reactos/base/system/subst/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -3,6 +3,6 @@ add_executable(subst subst.c subst.rc) set_module_type(subst win32cui UNICODE) -target_link_libraries(subst conutils_stream ${PSEH_LIB}) +target_link_libraries(subst conutils ${PSEH_LIB}) add_importlibs(subst msvcrt kernel32 ntdll) add_cd_file(TARGET subst DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -496,18 +496,6 @@ function(add_library name) _add_library(${name} ${ARGN}) -## -## The following is a workaround for a CMake bug. Inspired by: -## http://stackoverflow.com/questions/24926868/cmake-3-0-add-library-of-type-i… -## -## Beginning of the workaround: - get_target_property(_TARGET_TYPE ${name} TYPE) - if(_TARGET_TYPE STREQUAL "INTERFACE_LIBRARY") - unset(_target_excluded) - else() -## -## This is the original code: -## get_target_property(_target_excluded ${name} EXCLUDE_FROM_ALL) if(_target_excluded AND ${name} MATCHES "^lib.*") set_property(TARGET "${name}" PROPERTY FOLDER "Importlibs") @@ -515,10 +503,6 @@ string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") endif() -## -## End of workaround - endif() -## endfunction() function(add_executable name) Modified: trunk/reactos/sdk/lib/conutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/CMakeList… ============================================================================== --- trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -1,36 +1,14 @@ -## -## 'conutils_base': the base utility library. -## -add_library(conutils_base utils.c) -add_dependencies(conutils_base xdk) -target_link_libraries(conutils_base ${PSEH_LIB}) -add_importlibs(conutils_base msvcrt kernel32) +list(APPEND SOURCE + pager.c + screen.c + stream.c + utils.c + # conutils.h + ) -## -## 'conutils_stream': Console Stream API library. -## -add_library(conutils_stream stream.c) -target_link_libraries(conutils_stream PUBLIC conutils_base) -# add_dependencies(conutils_stream conutils_base xdk) - -## -## 'conutils_screen': Console Screen API library. -## -add_library(conutils_screen screen.c) -target_link_libraries(conutils_screen PUBLIC conutils_stream conutils_base) -# add_dependencies(conutils_screen conutils_stream conutils_base xdk) - -## -## 'conutils_pager': Console Pager API library. -## -add_library(conutils_pager pager.c) -target_link_libraries(conutils_pager PUBLIC conutils_screen conutils_stream conutils_base) -# add_dependencies(conutils_pager conutils_screen conutils_stream conutils_base xdk) - -## -## 'conutils': Library target that groups everything together. -## -add_library(conutils INTERFACE) -target_link_libraries(conutils INTERFACE conutils_pager conutils_screen conutils_stream conutils_base) -# add_dependencies(conutils conutils_pager conutils_screen conutils_stream conutils_base xdk) +add_library(conutils ${SOURCE}) +# add_pch(conutils conutils.h SOURCE) +add_dependencies(conutils xdk) +target_link_libraries(conutils ${PSEH_LIB}) +add_importlibs(conutils msvcrt kernel32) Modified: trunk/reactos/sdk/lib/conutils/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/README.tx… ============================================================================== --- trunk/reactos/sdk/lib/conutils/README.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/conutils/README.txt [iso-8859-1] Thu Nov 3 15:47:45 2016 @@ -21,23 +21,23 @@ CONTENTS ~-~-~-~- -0. 'conutils_base' library (utils.c and utils.h): Base set of functions for - loading string resources and message strings, and handle type identification. +0. 'conutils_base' (utils.c and utils.h): Base set of functions for loading + string resources and message strings, and handle type identification. -1. 'conutils_stream' library (stream.c and stream.h): Console Stream API (CON_STREAM): +1. 'conutils_stream' (stream.c and stream.h): Console Stream API (CON_STREAM): Stream initialization, basic ConStreamRead/Write. Stream utility functions: ConPuts/Printf, ConResPuts/Printf, ConMsgPuts/Printf. - Depends on the 'conutils_base' library. + Depends on 'conutils_base'. -2. 'conutils_screen' library (screen.c and screen.h): Console Screen API (CON_SCREEN): +2. 'conutils_screen' (screen.c and screen.h): Console Screen API (CON_SCREEN): Introduces the notion of console/terminal screen around the streams. Manages console/terminal screen metrics for Win32 consoles and TTYs (serial...). Additional Screen utility functions. - Depends on the 'conutils_stream' library, and indirectly on 'conutils_base'. + Depends on 'conutils_stream', and indirectly on 'conutils_base'. -3. 'conutils_pager' library (pager.c and pager.h): Console Pager API (CON_PAGER): +3. 'conutils_pager' (pager.c and pager.h): Console Pager API (CON_PAGER): Implements core console/terminal paging functionality around console screens. - Depends on the 'conutils_screen' library, and indirectly on 'conutils_stream' - and 'conutils_base'. + Depends on 'conutils_screen' and indirectly on 'conutils_stream' and + 'conutils_base'. 4. More to come!

1 0

[phater] 73109: [TCPIP] Always copy back bind IP in connection. Spotted by Thomas. Thanks CORE-12152
by phater＠svn.reactos.org 03 Nov '16

03 Nov '16

Author: phater Date: Thu Nov 3 14:53:00 2016 New Revision: 73109 URL: http://svn.reactos.org/svn/reactos?rev=73109&view=rev Log: [TCPIP] Always copy back bind IP in connection. Spotted by Thomas. Thanks 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] Thu Nov 3 14:53:00 2016 @@ -337,12 +337,8 @@ 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; - } + /* Copy bind address into connection */ + Connection->AddressFile->Address.Address.IPv4Address = bindaddr.addr; /* Check if we had an unspecified port */ if (!Connection->AddressFile->Port) {

1 0

[tfaber] 73108: [USETUP] - A fatal error when creating the install directory is worth a DPRINT1 CORE-11819
by tfaber＠svn.reactos.org 03 Nov '16

03 Nov '16

Author: tfaber Date: Thu Nov 3 14:14:19 2016 New Revision: 73108 URL: http://svn.reactos.org/svn/reactos?rev=73108&view=rev Log: [USETUP] - A fatal error when creating the install directory is worth a DPRINT1 CORE-11819 Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Nov 3 14:14:19 2016 @@ -3602,7 +3602,7 @@ Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); MUIDisplayError(ERROR_CREATE_INSTALL_DIR, Ir, POPUP_WAIT_ENTER); return FALSE; }

1 0

[janderwald] 73107: [USBAUDIO] - frequencies may appear unsorted, handle that
by janderwald＠svn.reactos.org 03 Nov '16

03 Nov '16

Author: janderwald Date: Thu Nov 3 13:44:01 2016 New Revision: 73107 URL: http://svn.reactos.org/svn/reactos?rev=73107&view=rev Log: [USBAUDIO] - frequencies may appear unsorted, handle that Modified: trunk/reactos/drivers/usb/usbaudio/filter.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] Thu Nov 3 13:44:01 2016 @@ -1164,7 +1164,7 @@ PUSB_INTERFACE_DESCRIPTOR Descriptor; PKSDATARANGE_AUDIO DataRangeAudio; PKSDATARANGE *DataRangeAudioArray; - ULONG NumFrequency, DataRangeCount, DataRangeIndex; + ULONG NumFrequency, DataRangeCount, DataRangeIndex, Index; /* count all data ranges */ DataRangeCount = 0; @@ -1229,10 +1229,14 @@ DataRangeAudio->MaximumChannels = StreamingFormatDescriptor->bNrChannels; DataRangeAudio->MinimumBitsPerSample = StreamingFormatDescriptor->bBitResolution; DataRangeAudio->MaximumBitsPerSample = StreamingFormatDescriptor->bBitResolution; - NumFrequency = StreamingFormatDescriptor->bSamFreqType - 1; - DataRangeAudio->MinimumSampleFrequency = StreamingFormatDescriptor->tSamFreq[0] | StreamingFormatDescriptor->tSamFreq[1] << 8 | StreamingFormatDescriptor->tSamFreq[2] << 16; - DataRangeAudio->MaximumSampleFrequency = StreamingFormatDescriptor->tSamFreq[NumFrequency*3] | StreamingFormatDescriptor->tSamFreq[NumFrequency * 3+1] << 8 | StreamingFormatDescriptor->tSamFreq[NumFrequency * 3+2]<<16; - + NumFrequency = StreamingFormatDescriptor->bSamFreqType; + DataRangeAudio->MinimumSampleFrequency = MAXULONG; + DataRangeAudio->MaximumSampleFrequency = 0; + for (Index = 0; Index < NumFrequency; Index++) + { + DataRangeAudio->MinimumSampleFrequency = min(StreamingFormatDescriptor->tSamFreq[Index * 3] | StreamingFormatDescriptor->tSamFreq[(Index * 3) + 1] << 8 | StreamingFormatDescriptor->tSamFreq[(Index * 3) + 2] << 16, DataRangeAudio->MinimumSampleFrequency); + DataRangeAudio->MaximumSampleFrequency = max(StreamingFormatDescriptor->tSamFreq[Index * 3] | StreamingFormatDescriptor->tSamFreq[(Index * 3) + 1] << 8 | StreamingFormatDescriptor->tSamFreq[(Index * 3) + 2] << 16, DataRangeAudio->MaximumSampleFrequency); + } DataRangeAudioArray[DataRangeIndex] = (PKSDATARANGE)DataRangeAudio; DataRangeIndex++; }

1 0

[janderwald] 73106: [USBAUDIO] - include controls from logical channels - process selector unit descriptors - automatic gain is KSNODETYPE_AGC
by janderwald＠svn.reactos.org 03 Nov '16

03 Nov '16

Author: janderwald Date: Thu Nov 3 13:26:45 2016 New Revision: 73106 URL: http://svn.reactos.org/svn/reactos?rev=73106&view=rev Log: [USBAUDIO] - include controls from logical channels - process selector unit descriptors - automatic gain is KSNODETYPE_AGC Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/guid.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] Thu Nov 3 13:26:45 2016 @@ -326,7 +326,8 @@ PUSB_AUDIO_CONTROL_INPUT_TERMINAL_DESCRIPTOR InputTerminalDescriptor; PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR MixerUnitDescriptor; - ULONG NodeCount = 0; + PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR SelectorUnitDescriptor; + ULONG NodeCount = 0, Length, Index; ULONG DescriptorCount = 0; UCHAR Value; @@ -352,7 +353,15 @@ { FeatureUnitDescriptor = (PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR)InputTerminalDescriptor; DescriptorCount++; - Value = FeatureUnitDescriptor->bmaControls[0]; + + /* get controls from all channels*/ + Value = 0; + Length = FeatureUnitDescriptor->bLength - 7; + for (Index = 0; Index < Length; Index++) + { + Value |= FeatureUnitDescriptor->bmaControls[Index]; + } + if (Value & 0x01) /* MUTE*/ NodeCount++; if (Value & 0x02) /* VOLUME */ @@ -369,14 +378,18 @@ NodeCount++; if (Value & 0x80) /* DELAY */ NodeCount++; - - /* FIXME handle logical channels too */ } else if (InputTerminalDescriptor->bDescriptorSubtype == 0x04 /* MIXER_UNIT */) { MixerUnitDescriptor = (PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR)InputTerminalDescriptor; DescriptorCount++; NodeCount += MixerUnitDescriptor->bNrInPins + 1; /* KSNODETYPE_SUPERMIX for each source pin and KSNODETYPE_SUM for target */ + } + else if (InputTerminalDescriptor->bDescriptorSubtype == 0x05 /* SELECTOR_UNIT */) + { + SelectorUnitDescriptor = (PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR)InputTerminalDescriptor; + DescriptorCount++; + NodeCount++; } else { @@ -417,7 +430,7 @@ PKSFILTER_DESCRIPTOR FilterDescriptor) { PDEVICE_EXTENSION DeviceExtension; - ULONG NodeCount, Index, DescriptorCount, StreamingTerminalIndex, NonStreamingTerminalDescriptorCount, TotalTerminalDescriptorCount, StreamingTerminalPinOffset, ControlDescriptorCount; + ULONG NodeCount, Index, DescriptorCount, StreamingTerminalIndex, NonStreamingTerminalDescriptorCount, TotalTerminalDescriptorCount, StreamingTerminalPinOffset, ControlDescriptorCount, Length; UCHAR Value; PUSB_INTERFACE_DESCRIPTOR Descriptor; PUSB_AUDIO_CONTROL_INTERFACE_HEADER_DESCRIPTOR InterfaceHeaderDescriptor; @@ -426,6 +439,7 @@ PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR MixerUnitDescriptor; PUSB_AUDIO_CONTROL_OUTPUT_TERMINAL_DESCRIPTOR OutputTerminalDescriptor; + PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR SelectorUnitDescriptor; PKSNODE_DESCRIPTOR NodeDescriptors; PNODE_CONTEXT NodeContext, PreviousNodeContext; PKSTOPOLOGY_CONNECTION Connections; @@ -558,7 +572,16 @@ else if (InputTerminalDescriptor->bDescriptorSubtype == 0x06 /* FEATURE_UNIT*/) { FeatureUnitDescriptor = (PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR)CommonDescriptor; - Value = FeatureUnitDescriptor->bmaControls[0]; + + /* get controls from all channels*/ + Value = 0; + Length = FeatureUnitDescriptor->bLength - 7; + for (Index = 0; Index < Length; Index++) + { + Value |= FeatureUnitDescriptor->bmaControls[Index]; + } + + if (Value & 0x01) /* MUTE*/ { NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_MUTE; @@ -651,8 +674,8 @@ if (Value & 0x40) /* AUTOMATIC GAIN */ { - NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_TONE; - NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Name = &KSNODETYPE_TONE; + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_AGC; + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Name = &KSNODETYPE_AGC; NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); /* insert into node context*/ @@ -705,6 +728,19 @@ NodeContext[DescriptorCount].Descriptor = CommonDescriptor; DescriptorCount++; + FilterDescriptor->NodeDescriptorsCount++; + } + else if (InputTerminalDescriptor->bDescriptorSubtype == 0x05 /* SELECTOR UNIT */) + { + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_MUX; + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Name = &KSNODETYPE_MUX; + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); + + /* insert into node context*/ + NodeContext[DescriptorCount].Descriptor = CommonDescriptor; + NodeContext[DescriptorCount].NodeCount = 1; + NodeContext[DescriptorCount].Nodes[0] = FilterDescriptor->NodeDescriptorsCount; + DescriptorCount++; FilterDescriptor->NodeDescriptorsCount++; } else @@ -850,6 +886,24 @@ Connections[FilterDescriptor->ConnectionsCount].ToNodePin = 1 + Index; Connections[FilterDescriptor->ConnectionsCount].ToNode = NodeContext[DescriptorCount].Nodes[NodeContext[DescriptorCount].NodeCount-1]; FilterDescriptor->ConnectionsCount++; + } + DescriptorCount++; + } + else if (InputTerminalDescriptor->bDescriptorSubtype == 0x05 /* SELECTOR_UNIT */) + { + SelectorUnitDescriptor = (PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR)InputTerminalDescriptor; + for (Index = 0; Index < SelectorUnitDescriptor->bNrInPins; Index++) + { + Value = SelectorUnitDescriptor->baSourceID[Index]; + PreviousNodeContext = FindNodeContextWithId(NodeContext, ControlDescriptorCount, Value); + if (PreviousNodeContext) + { + Connections[FilterDescriptor->ConnectionsCount].FromNode = PreviousNodeContext->Nodes[PreviousNodeContext->NodeCount - 1]; + Connections[FilterDescriptor->ConnectionsCount].FromNodePin = 0; + Connections[FilterDescriptor->ConnectionsCount].ToNodePin = 1; + Connections[FilterDescriptor->ConnectionsCount].ToNode = NodeContext[DescriptorCount].Nodes[0]; + FilterDescriptor->ConnectionsCount++; + } } DescriptorCount++; } 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] Thu Nov 3 13:26:45 2016 @@ -15,6 +15,8 @@ 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(KSNODETYPE_MUX, 0x2CEAF780L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_AGC, 0xE88C9BA0L, 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); DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0L, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ 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] Thu Nov 3 13:26:45 2016 @@ -128,6 +128,17 @@ UCHAR bmControls; UCHAR iMixer; }USB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR, *PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR; + +typedef struct +{ + UCHAR bLength; + UCHAR bDescriptorType; + UCHAR bDescriptorSubtype; + UCHAR bUnitID; + UCHAR bNrInPins; + UCHAR baSourceID[1]; + UCHAR iSelector; +}USB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR, *PUSB_AUDIO_CONTROL_SELECTOR_UNIT_DESCRIPTOR; typedef struct

1 0

[hbelusca] 73105: [BOOTDATA]: Fix the indentation of the file(..) commands, noted by Thomas.
by hbelusca＠svn.reactos.org 02 Nov '16

02 Nov '16

Author: hbelusca Date: Wed Nov 2 21:49:50 2016 New Revision: 73105 URL: http://svn.reactos.org/svn/reactos?rev=73105&view=rev Log: [BOOTDATA]: Fix the indentation of the file(..) commands, noted by Thomas. Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Wed Nov 2 21:49:50 2016 @@ -20,10 +20,10 @@ DEPENDS native-fatten fat bootmgfw bcd_hive VERBATIM) -if(USE_MKISOFS) # Create an 'empty' directory (guaranteed to be empty) to be able to add # arbitrary empty directories to the ISO image using mkisofs. -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty) +if(USE_MKISOFS) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty) endif() # Retrieve the full paths to the generated files of the 'isoboot', 'isobtrt' and 'efisys' targets @@ -31,7 +31,6 @@ set(_isobtrt_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) # get_target_property(_isobtrt_file isobtrt LOCATION) set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property(_efisys_file efisys LOCATION) -if(USE_MKISOFS) # Create a mkisofs sort file to specify an explicit ordering for the boot files # to place them at the beginning of the image (makes ISO image analysis easier). # See mkisofs/schilytools/mkisofs/README.sort for more details. @@ -46,8 +45,9 @@ # - the boot catalog file path is meaningful; # - since its contents are included by mkisofs in the root of the ISO image, # using the empty directory ensures that no extra unwanted files are added. -# -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\ +# +if(USE_MKISOFS) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\ ${CMAKE_CURRENT_BINARY_DIR}/empty/boot.catalog 4 ${_isoboot_file} 3 ${_isobtrt_file} 2 @@ -64,7 +64,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "") if(USE_MKISOFS) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(bootcd COMMAND native-mkisofs -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 @@ -86,7 +86,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "") if(USE_MKISOFS) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(bootcdregtest COMMAND native-mkisofs -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 @@ -108,7 +108,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "") if(USE_MKISOFS) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") # Create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") @@ -140,7 +140,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") if(USE_MKISOFS) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") # Create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")

1 0

[hbelusca] 73104: [BOOTDATA]: Diverse improvements for mkisofs support and ISO image configuration: - Make our build system create the required empty directory for mkisofs, instead. (It's not the p...
by hbelusca＠svn.reactos.org 02 Nov '16

02 Nov '16

Author: hbelusca Date: Wed Nov 2 21:43:46 2016 New Revision: 73104 URL: http://svn.reactos.org/svn/reactos?rev=73104&view=rev Log: [BOOTDATA]: Diverse improvements for mkisofs support and ISO image configuration: - Make our build system create the required empty directory for mkisofs, instead. (It's not the purpose of the SVN to hold special files/directories just to make host tools happy; instead it's the job of the buld system to create them.) - Place the boot files (catalog & co.) preferably at the beginning of the ISO image (it makes ISO image analysis easier, and is back-compatible with cdmake & oscdimg & windows ISOs): use the build system to generate the mkisofs sorting file. See the CMakeLists.txt for more details. - Set in one place the ISO manufacturer & volume name strings so that it makes easier to bulk-change them (and makes features like CORE-12233 a bit easier to maintain). - The EFI image must be set up with no emulation mode! (See section "12.3.2.1 ISO-9660 and El Torito" of the UEFI spec v2.4 errata B, for example). [MKISOFS]: Add some useful offline documentation. CORE-11988 Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.compression (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.eltorito (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.hide (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.joliet (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.sort (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.ps Removed: trunk/reactos/boot/bootdata/empty/ Modified: trunk/reactos/boot/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.compression URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.eltorito URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.hide URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.joliet URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/README.sort URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.ps URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…

1 0

[pschweitzer] 73103: [NDK] Properly export functions for C++ code
by pschweitzer＠svn.reactos.org 02 Nov '16

02 Nov '16

Author: pschweitzer Date: Wed Nov 2 19:46:46 2016 New Revision: 73103 URL: http://svn.reactos.org/svn/reactos?rev=73103&view=rev Log: [NDK] Properly export functions for C++ code Modified: trunk/reactos/sdk/include/ndk/iofuncs.h Modified: trunk/reactos/sdk/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/iofuncs.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/iofuncs.h [iso-8859-1] Wed Nov 2 19:46:46 2016 @@ -24,6 +24,10 @@ // #include <umtypes.h> #include <iotypes.h> + +#ifdef __cplusplus +extern "C" { +#endif // // I/O Functions @@ -1064,6 +1068,10 @@ _In_opt_ PULONG Key ); +#ifdef __cplusplus +} #endif - +#endif + +

1 0

[pschweitzer] 73102: [BTRFS] Enable the BTRFS shell registration
by pschweitzer＠svn.reactos.org 02 Nov '16

02 Nov '16

Author: pschweitzer Date: Wed Nov 2 19:40:50 2016 New Revision: 73102 URL: http://svn.reactos.org/svn/reactos?rev=73102&view=rev Log: [BTRFS] Enable the BTRFS shell registration Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Wed Nov 2 19:40:50 2016 @@ -109,6 +109,7 @@ 11,,wuapi.dll,1 11,wbem,wbemdisp.dll,1 11,wbem,wbemprox.dll,1 +11,,shellbtrfs.dll,1 [TypeLibraries] stdole2.tlb

1 0

[pschweitzer] 73101: [DOC] Update sync status reading BTRFS
by pschweitzer＠svn.reactos.org 02 Nov '16

02 Nov '16

Author: pschweitzer Date: Wed Nov 2 19:38:39 2016 New Revision: 73101 URL: http://svn.reactos.org/svn/reactos?rev=73101&view=rev Log: [DOC] Update sync status reading BTRFS Modified: trunk/reactos/media/doc/README.FSD Modified: trunk/reactos/media/doc/README.FSD URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.FSD?rev=7… ============================================================================== --- trunk/reactos/media/doc/README.FSD [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.FSD [iso-8859-1] Wed Nov 2 19:38:39 2016 @@ -3,7 +3,8 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. -reactos/drivers/filesystems/btrfs # Synced to 0.6 +reactos/drivers/filesystems/btrfs # Synced to 0.7 +reactos/dll/shellext/shellbtrfs # Synced to 0.7 The following FSD are shared with: http://www.ext2fsd.com/

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