Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[janderwald] 49917: [AUDIO-BRINGUP] - Fix opening of mixer / midi devices
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 11:14:29 2010 New Revision: 49917 URL: http://svn.reactos.org/svn/reactos?rev=49917&view=rev Log: [AUDIO-BRINGUP] - Fix opening of mixer / midi devices Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/format.c Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Fri Dec 3 11:14:29 2010 @@ -130,11 +130,11 @@ UINT Message; PSOUND_DEVICE SoundDevice; PSOUND_DEVICE_INSTANCE SoundDeviceInstance; - LPWAVEFORMATEX Format; + LPWAVEFORMATEX Format = NULL; SND_TRACE(L"Opening device"); - VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); /* FIXME? wave in too? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) || IS_MIXER_DEVICE_TYPE(DeviceType) || IS_MIDI_DEVICE_TYPE(DeviceType) ); /* FIXME? wave in too? */ VALIDATE_MMSYS_PARAMETER( OpenParameters ); Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Fri Dec 3 11:14:29 2010 @@ -65,8 +65,6 @@ SND_TRACE(L"Setting wave format\n"); VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - VALIDATE_MMSYS_PARAMETER( Format ); - VALIDATE_MMSYS_PARAMETER( FormatSize >= sizeof(WAVEFORMATEX) ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); if ( ! MMSUCCESS(Result) ) @@ -74,9 +72,14 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + VALIDATE_MMSYS_PARAMETER( Format ); + VALIDATE_MMSYS_PARAMETER( FormatSize >= sizeof(WAVEFORMATEX) ); + } /* Ensure we have a wave device (TODO: check if this applies to wavein as well) */ - VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) || IS_MIDI_DEVICE_TYPE(DeviceType) || IS_MIXER_DEVICE_TYPE(DeviceType)); /* Obtain the function table */ Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable);

1 0

[akhaldi] 49916: [CMAKE] - More work on import lib targets and improving modules.
by akhaldi＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: akhaldi Date: Fri Dec 3 11:01:21 2010 New Revision: 49916 URL: http://svn.reactos.org/svn/reactos?rev=49916&view=rev Log: [CMAKE] - More work on import lib targets and improving modules. Removed: branches/cmake-bringup/dll/win32/user32/user32_stubs.c Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -1,16 +1,19 @@ set_unicode() -add_definitions(-D__WINESRC__) -add_definitions(-D_WINE) -add_definitions(-D_COMCTL32_) +add_definitions( + -D__WINESRC__ + -D_WINE + -D_COMCTL32_) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(comctl32.dll comctl32.spec) -add_library(comctl32 SHARED +list(APPEND SOURCE animate.c comboex.c comctl32undoc.c @@ -51,11 +54,11 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) +add_library(comctl32 SHARED ${SOURCE}) + set_module_type(comctl32 win32dll) -target_link_libraries(comctl32 - uuid - wine) +target_link_libraries(comctl32 uuid wine) add_importlibs(comctl32 user32 Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -8,7 +8,7 @@ spec2def(shdocvw.dll shdocvw.spec) -add_library(shdocvw SHARED +list(APPEND SOURCE classinfo.c client.c dochost.c @@ -30,11 +30,11 @@ shdocvw.rc ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) +add_library(shdocvw SHARED ${SOURCE}) + set_module_type(shdocvw win32dll) -target_link_libraries(shdocvw - uuid - wine) +target_link_libraries(shdocvw uuid wine) add_importlibs(shdocvw comctl32 @@ -51,6 +51,6 @@ kernel32 ntdll) -add_dependencies(shdocvw shdocvw_v1 shdocvw_def) +add_dependencies(shdocvw shdocvw_v1) add_cab_target(shdocvw 1) add_importlib_target(shdocvw.spec) Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -7,7 +7,7 @@ spec2def(shlwapi.dll shlwapi.spec) -add_library(shlwapi SHARED +list(APPEND SOURCE assoc.c clist.c istream.c @@ -25,11 +25,11 @@ shlwapi.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) +add_library(shlwapi SHARED ${SOURCE}) + set_module_type(shlwapi win32dll) -target_link_libraries(shlwapi - wine - uuid) +target_link_libraries(shlwapi wine uuid) add_importlibs(shlwapi user32 @@ -49,6 +49,6 @@ msvcrt ntdll) +add_cab_target(shlwapi 1) -add_cab_target(shlwapi 1) add_importlib_target(shlwapi.spec) Modified: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed… ============================================================================== --- branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -5,7 +5,12 @@ spec2def(t2embed.dll t2embed.spec) -add_library(t2embed SHARED t2embed.c t2embed.rc ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) +list(APPEND SOURCE + t2embed.c + t2embed.rc + ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) + +add_library(t2embed SHARED ${SOURCE}) set_module_type(t2embed win32dll) @@ -13,5 +18,4 @@ add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) - add_cab_target(t2embed 1) Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -64,12 +64,9 @@ windows/text.c windows/window.c windows/winpos.c - user32_stubs.c user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) -set_source_files_properties(user32.def PROPERTIES EXTERNAL_OBJECT TRUE) - add_library(user32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch ${SOURCE}) @@ -85,4 +82,3 @@ add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_cab_target(user32 1) add_importlib_target(user32.spec) - Removed: branches/cmake-bringup/dll/win32/user32/user32_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32_stubs.c (removed) @@ -1,45 +1,0 @@ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "user32.dll"; - -void __wine_stub_user32_dll_22(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "BuildReasonArray"); } -void __wine_stub_user32_dll_23(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CalcMenuBar"); } -void __wine_stub_user32_dll_96(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreateSystemThreads"); } -void __wine_stub_user32_dll_153(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DestroyReasons"); } -void __wine_stub_user32_dll_155(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceEventWorker"); } -void __wine_stub_user32_dll_203(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnterReaderModeHelper"); } -void __wine_stub_user32_dll_266(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetCursorFrameInfo"); } -void __wine_stub_user32_dll_339(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetReasonTitleFromReasonCode"); } -void __wine_stub_user32_dll_396(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "InitializeWin32EntryTable"); } -void __wine_stub_user32_dll_424(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsProcess16Bit"); } -void __wine_stub_user32_dll_426(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsSETEnabled"); } -void __wine_stub_user32_dll_434(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsWow64Message"); } -void __wine_stub_user32_dll_451(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadKeyboardLayoutEx"); } -void __wine_stub_user32_dll_484(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "MessageBoxTimeoutA"); } -void __wine_stub_user32_dll_485(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "MessageBoxTimeoutW"); } -void __wine_stub_user32_dll_511(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PaintMenuBar"); } -void __wine_stub_user32_dll_529(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ReasonCodeNeedsBugID"); } -void __wine_stub_user32_dll_530(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ReasonCodeNeedsComment"); } -void __wine_stub_user32_dll_531(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RecordShutdownReason"); } -void __wine_stub_user32_dll_543(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RegisterMessagePumpHook"); } -void __wine_stub_user32_dll_586(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetConsoleReserveKeys"); } -void __wine_stub_user32_dll_658(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SoftModalMessageBox"); } -void __wine_stub_user32_dll_681(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "TranslateMessageEx"); } -void __wine_stub_user32_dll_693(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UnregisterMessagePumpHook"); } -void __wine_stub_user32_dll_702(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UserLpkPSMTextOut"); } -void __wine_stub_user32_dll_703(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "UserLpkTabbedTextOut"); } -void __wine_stub_user32_dll_718(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "Win32PoolAllocationStats"); } Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -1,14 +1,16 @@ spec2def(dxgthk.sys dxgthk.spec) -add_library(dxgthk SHARED +list(APPEND SOURCE main.c dxgthk.rc ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) +add_library(dxgthk SHARED ${SOURCE}) + set_module_type(dxgthk kernelmodedriver) + add_importlibs(dxgthk win32k) - add_importlib_target(dxgthk.spec) add_cab_target(dxgthk 2) Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -3,12 +3,15 @@ spec2def(drmk.sys drmk.spec) -add_library(drmk SHARED +list(APPEND SOURCE stubs.cpp drmk.rc ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) +add_library(drmk SHARED ${SOURCE}) + set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) +add_importlib_target(drmk.spec) -add_cab_target(drmk 2) +add_cab_target(drmk 2) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 3 11:01:21 2010 @@ -1,12 +1,16 @@ spec2def(wmilib.sys wmilib.spec) -add_library(wmilib SHARED +list(APPEND SOURCE wmilib.c wmilib.rc ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) +add_library(wmilib SHARED ${SOURCE}) + set_module_type(wmilib kernelmodedriver) + add_importlibs(wmilib ntoskrnl) +add_importlib_target(wmilib.spec) -add_cab_target(wmilib 2) +add_cab_target(wmilib 2)

1 0

[greatlrd] 49915: create new branch for ReactX
by greatlrd＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: greatlrd Date: Fri Dec 3 10:31:46 2010 New Revision: 49915 URL: http://svn.reactos.org/svn/reactos?rev=49915&view=rev Log: create new branch for ReactX Added: branches/reactx/ - copied from r49914, trunk/

1 0

[akhaldi] 49914: [CMAKE] - More work on import lib targets and improving modules.
by akhaldi＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: akhaldi Date: Fri Dec 3 10:26:32 2010 New Revision: 49914 URL: http://svn.reactos.org/svn/reactos?rev=49914&view=rev Log: [CMAKE] - More work on import lib targets and improving modules. Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,10 +1,12 @@ + spec2def(ksproxy.ax ksproxy.spec) add_definitions(-D_DLL -D__USE_CRTIMP) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) - add_definitions( +add_definitions( -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) add_library(ksproxy SHARED allocator.cpp @@ -36,14 +38,11 @@ #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif(MSVC) - target_link_libraries(ksproxy - stlport -lsupc++ -lgcc + stlport -lsupc++ -lgcc -lmingw32 -lcoldname strmiids) add_importlibs(ksproxy - mingw32 - coldname advapi32 ole32 setupapi @@ -54,4 +53,4 @@ add_dependencies(ksproxy psdk buildno_header) -add_cab_target(ksproxy 1) +add_cab_target(ksproxy 1) Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -45,10 +45,6 @@ advapi32.rc ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) -if(NOT MSVC) - set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() - add_library(advapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch ${SOURCE}) @@ -66,5 +62,4 @@ add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_cab_target(advapi32 1) -add_importlib_target(advapi32.spec libntdll) - +add_importlib_target(advapi32.spec) Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,3 +1,4 @@ + set_unicode() set_cpp() @@ -13,6 +14,7 @@ ${REACTOS_SOURCE_DIR}/lib/atl) set_rc_compiler() + spec2def(browseui.dll browseui.spec) list(APPEND SOURCE @@ -45,11 +47,11 @@ target_link_libraries(browseui atlnew uuid - wine) + wine + -lmingw32 + -lcoldname) add_importlibs(browseui - mingw32 - coldname shlwapi shell32 comctl32 Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -20,5 +20,7 @@ target_link_libraries(cabinet wine) add_importlibs(cabinet kernel32 ntdll) +add_importlib_target(cabinet.spec) + add_dependencies(cabinet psdk buildno_header) add_cab_target(cabinet 1) Modified: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,9 +1,12 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_WINE) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + spec2def(cryptui.dll cryptui.spec) list(APPEND SOURCE @@ -33,5 +36,6 @@ kernel32 ntdll) +add_importlib_target(cryptui.spec) add_cab_target(cryptui 1) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -54,4 +54,6 @@ add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) +add_importlib_target(dbghelp.spec) + add_cab_target(dbghelp 1) Modified: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== --- branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -28,9 +28,9 @@ set_module_type(dhcpcsvc win32dll) +add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) +add_importlib_target(dhcpcsvc.spec) - -add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) add_cab_target(dhcpcsvc 1) Modified: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus… ============================================================================== --- branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,9 +1,12 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + spec2def(gdiplus.dll gdiplus.spec) list(APPEND SOURCE @@ -26,9 +29,7 @@ set_module_type(gdiplus win32dll) -target_link_libraries(gdiplus - uuid - wine) +target_link_libraries(gdiplus uuid wine) add_importlibs(gdiplus msvcrt @@ -41,9 +42,10 @@ kernel32 ntdll) +add_importlib_target(gdiplus.spec) + if(ARCH MATCHES amd64) target_link_libraries(gdiplus crt) endif(ARCH MATCHES amd64) - add_cab_target(gdiplus 1) Modified: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,6 +1,7 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_IMAGEHLP_SOURCE_) +add_definitions( + -D_DLL -D__USE_CRTIMP + -D_IMAGEHLP_SOURCE_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -23,6 +24,8 @@ target_link_libraries(imagehlp wine) add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) +add_importlib_target(imagehlp.spec) + add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(imagehlp 1) Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -10,7 +10,7 @@ spec2def(iphlpapi.dll iphlpapi.spec) -add_library(iphlpapi SHARED +list(APPEND SOURCE dhcp_reactos.c ifenum_reactos.c ipstats_reactos.c @@ -22,11 +22,11 @@ iphlpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) +add_library(iphlpapi SHARED ${SOURCE}) + set_module_type(iphlpapi win32dll) -target_link_libraries(iphlpapi - wine - tdilib) +target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,7 +1,9 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mlang.dll mlang.spec) @@ -15,9 +17,7 @@ set_entrypoint(mlang 0) -target_link_libraries(mlang - uuid - wine) +target_link_libraries(mlang uuid wine) add_importlibs(mlang ole32 @@ -28,5 +28,7 @@ kernel32 ntdll) +add_importlib_target(mlang.spec) + add_dependencies(mlang psdk buildno_header) -add_cab_target(mlang 1) +add_cab_target(mlang 1) Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree… ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -4,13 +4,16 @@ spec2def(mscoree.dll mscoree.spec) -add_library(mscoree SHARED corruntimehost.c mscoree_main.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) +list(APPEND SOURCE + corruntimehost.c + mscoree_main.c + ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) + +add_library(mscoree SHARED ${SOURCE}) set_module_type(mscoree win32dll) -target_link_libraries(mscoree - wine - uuid) +target_link_libraries(mscoree wine uuid) add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt4… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -6,7 +6,11 @@ spec2def(msvcrt40.dll msvcrt40.spec) -add_library(msvcrt40 SHARED msvcrt40.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) +list(APPEND SOURCE + msvcrt40.c + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) + +add_library(msvcrt40 SHARED ${SOURCE}) set_module_type(msvcrt40 win32dll) Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -20,6 +20,8 @@ ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) +add_importlib_target(psapi.spec) + add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(psapi 1) Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -4,6 +4,8 @@ -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(riched20.dll riched20.spec) add_library(riched20 SHARED caret.c @@ -26,17 +28,11 @@ wrap.c writer.c version.rc - riched20.def) - -if(NOT MSVC) - set_source_files_properties(riched20.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) set_module_type(riched20 win32dll) -target_link_libraries(riched20 - wine - uuid) +target_link_libraries(riched20 wine uuid) if(MSVC) set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") @@ -52,4 +48,6 @@ kernel32 ntdll) +add_importlib_target(riched20.spec) + add_cab_target(riched20 1) Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -16,5 +16,6 @@ target_link_libraries(spoolss wine) add_importlibs(spoolss winspool msvcrt kernel32 ntdll) +add_importlib_target(spoolss.spec) add_cab_target(spoolss 1) Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -1,14 +1,16 @@ -add_library(ufatx SHARED ufatx.rc ufatx.def) +spec2def(ufatx.dll ufatx.spec) -if(NOT MSVC) - set_source_files_properties(ufatx.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(ufatx SHARED + ufatx.rc + ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) set_entrypoint(ufatx 0) -target_link_libraries(ufatx vfatxlib) +target_link_libraries(ufatx vfatxlib -lgcc) -add_importlibs(ufatx gcc kernel32 ntdll) +add_importlibs(ufatx kernel32 ntdll) +add_importlib_target(ufatx.spec) + add_dependencies(ufatx psdk buildno_header) -add_cab_target(ufatx 1) +add_cab_target(ufatx 1) Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -19,5 +19,6 @@ target_link_libraries(usp10 wine) add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll) +add_importlib_target(usp10.spec) add_cab_target(usp10 1) Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -41,8 +41,9 @@ set_module_type(windowscodecs win32dll) -target_link_libraries(windowscodecs wine) +target_link_libraries(windowscodecs wine uuid) -add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) +add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) +add_importlib_target(windowscodecs.spec) add_cab_target(windowscodecs 1) Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 10:26:32 2010 @@ -9,4 +9,6 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_cab_target(dxgthk 2) +add_importlib_target(dxgthk.spec) + +add_cab_target(dxgthk 2)

1 0

[akhaldi] 49913: [CMAKE] - Start adding proper import lib targets. - Improve some modules.
by akhaldi＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: akhaldi Date: Fri Dec 3 09:26:06 2010 New Revision: 49913 URL: http://svn.reactos.org/svn/reactos?rev=49913&view=rev Log: [CMAKE] - Start adding proper import lib targets. - Improve some modules. Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Fri Dec 3 09:26:06 2010 @@ -109,11 +109,9 @@ set_entrypoint(glu32 0) -target_link_libraries(glu32 stlport -lsupc++ -lgcc) +target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 -lcoldname) add_importlibs(glu32 - mingw32 - coldname opengl32 gdi32 msvcrt @@ -122,3 +120,4 @@ add_cab_target(glu32 1) add_importlib_target(glu32.spec) + Modified: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Fri Dec 3 09:26:06 2010 @@ -30,4 +30,7 @@ add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) +add_importlib_target(rsaenh.spec) + add_cab_target(rsaenh 1) + Modified: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/m… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] Fri Dec 3 09:26:06 2010 @@ -3,13 +3,16 @@ spec2def(midimap.dll midimap.spec) -add_library(midimap SHARED midimap.c midimap.rc +add_library(midimap SHARED + midimap.c + midimap.rc ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) set_entrypoint(midimap 0) -target_link_libraries(midimap wine) +target_link_libraries(midimap uuid wine) -add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm) +add_importlibs(midimap advapi32 user32 winmm kernel32 ntdll) add_dependencies(midimap psdk) -add_cab_target(midimap 1) +add_cab_target(midimap 1) + Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Fri Dec 3 09:26:06 2010 @@ -24,4 +24,7 @@ add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) +add_importlib_target(wintrust.spec) + add_cab_target(wintrust 1) +

1 0

[greatlrd] 49912: all code are in ReactOS trunk for ReactX delete the old branch and prepare create new one Most of the code will be focus on dxg.sys and few part of gdi32.dll in the new branch of ...
by greatlrd＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: greatlrd Date: Fri Dec 3 09:19:53 2010 New Revision: 49912 URL: http://svn.reactos.org/svn/reactos?rev=49912&view=rev Log: all code are in ReactOS trunk for ReactX delete the old branch and prepare create new one Most of the code will be focus on dxg.sys and few part of gdi32.dll in the new branch of reactx Removed: branches/reactx/

1 0

[janderwald] 49911: [AUDIO-BRINGUP] - Activate dsound rewrite
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 03:42:10 2010 New Revision: 49911 URL: http://svn.reactos.org/svn/reactos?rev=49911&view=rev Log: [AUDIO-BRINGUP] - Activate dsound rewrite Removed: branches/audio-bringup/dll/directx/dsound/ Modified: branches/audio-bringup/dll/directx/directx.rbuild Modified: branches/audio-bringup/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/directx/direc… ============================================================================== --- branches/audio-bringup/dll/directx/directx.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/dll/directx/directx.rbuild [iso-8859-1] Fri Dec 3 03:42:10 2010 @@ -28,8 +28,8 @@ <directory name="dplayx"> <xi:include href="dplayx/dplayx.rbuild" /> </directory> - <directory name="dsound"> - <xi:include href="dsound/dsound.rbuild" /> + <directory name="dsound_new"> + <xi:include href="dsound_new/dsound.rbuild" /> </directory> <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" />

1 0

[janderwald] 49910: [AUDIO-BRINGUP] - Enable mmixer library in wdmaud.drv - Delete unused code - Don't call wave streaming handler again from the io completion callback. As this will sooner or late...
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 03:39:55 2010 New Revision: 49910 URL: http://svn.reactos.org/svn/reactos?rev=49910&view=rev Log: [AUDIO-BRINGUP] - Enable mmixer library in wdmaud.drv - Delete unused code - Don't call wave streaming handler again from the io completion callback. As this will sooner or later will cause crash because the stack got eaten - Create a thread for each io packet and handle the completion callback within it. - Audio packets are now directly routed from winmm -> wdmaud.drv -> portcls instead of winmm -> wdmaud.drv -> wdmaud.sys -> sysaudio.sys -> kmixer.sys -> portcls.sys - Needs more testing & fine tuning, to fixup audio glitches Removed: branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff branches/audio-bringup/dll/win32/wdmaud.drv/mixer.c branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.rbuild branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/pac… ============================================================================== --- branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -542,9 +542,6 @@ drivers\video\videoprt\videoprt.sys 2 drivers\video\font\ftfd\ftfd.dll 1 -drivers\wdm\audio\filters\kmixer\kmixer.sys 2 -drivers\wdm\audio\sysaudio\sysaudio.sys 2 -drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 drivers\wdm\audio\backpln\portcls\portcls.sys 2 drivers\wdm\audio\drm\drmk\drmk.sys 2 drivers\wmi\wmilib.sys 2 Removed: branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c (removed) @@ -1,875 +1,0 @@ -/* - * PROJECT: ReactOS Sound System - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/wdmaud.drv/wdmaud.c - * - * PURPOSE: WDM Audio Driver (User-mode part) - * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) - Johannes Anderwald - * - * NOTES: Looking for wodMessage & co? You won't find them here. Try - * the MME Buddy library, which is where these routines are - * actually implemented. - * - */ - -#include "wdmaud.h" - -#include <stdio.h> - -#define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" - -HANDLE KernelHandle = INVALID_HANDLE_VALUE; -DWORD OpenCount = 0; - -DWORD -WINAPI -MixerEventThreadRoutine( - LPVOID Parameter) -{ - HANDLE WaitObjects[2]; - DWORD dwResult; - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)Parameter; - - /* setup wait objects */ - WaitObjects[0] = Instance->hNotifyEvent; - WaitObjects[1] = Instance->hStopEvent; - - /* zero device info */ - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.hDevice = Instance->Handle; - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - - do - { - dwResult = WaitForMultipleObjects(2, WaitObjects, FALSE, INFINITE); - - if (dwResult == WAIT_OBJECT_0 + 1) - { - /* stop event was signalled */ - break; - } - - do - { - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GET_MIXER_EVENT, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if (Result == MMSYSERR_NOERROR) - { - DriverCallback(Instance->WinMM.ClientCallback, - HIWORD(Instance->WinMM.Flags), - Instance->WinMM.Handle, - DeviceInfo.u.MixerEvent.NotificationType, - Instance->WinMM.ClientCallbackInstanceData, - (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, - 0); - } - }while(Result == MMSYSERR_NOERROR); - }while(TRUE); - - /* done */ - return 0; -} - -MMRESULT -WdmAudCleanupByLegacy() -{ - if (KernelHandle != INVALID_HANDLE_VALUE) - { - CloseHandle(KernelHandle); - KernelHandle = INVALID_HANDLE_VALUE; - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudGetNumWdmDevsByLegacy( - IN MMDEVICE_TYPE DeviceType, - OUT DWORD* DeviceCount) -{ - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - - VALIDATE_MMSYS_PARAMETER( KernelHandle != INVALID_HANDLE_VALUE ); - VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); - VALIDATE_MMSYS_PARAMETER( DeviceCount ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GETNUMDEVS_TYPE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS( Result ) ) - { - SND_ERR(L"Call to IOCTL_GETNUMDEVS_TYPE failed\n"); - *DeviceCount = 0; - return TranslateInternalMmResult(Result); - } - - *DeviceCount = DeviceInfo.DeviceCount; - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudGetCapabilitiesByLegacy( - IN PSOUND_DEVICE SoundDevice, - IN DWORD DeviceId, - OUT PVOID Capabilities, - IN DWORD CapabilitiesSize) -{ - MMRESULT Result; - MMDEVICE_TYPE DeviceType; - WDMAUD_DEVICE_INFO DeviceInfo; - - SND_ASSERT( SoundDevice ); - SND_ASSERT( Capabilities ); - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - if ( ! MMSUCCESS(Result) ) - return Result; - - SND_TRACE(L"WDMAUD - GetWdmDeviceCapabilities DeviceType %u DeviceId %u\n", DeviceType, DeviceId); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GETCAPABILITIES, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - /* This is pretty much a big hack right now */ - switch ( DeviceType ) - { - case MIXER_DEVICE_TYPE: - { - LPMIXERCAPSW MixerCaps = (LPMIXERCAPSW) Capabilities; - - DeviceInfo.u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; - CopyWideString(MixerCaps->szPname, DeviceInfo.u.MixCaps.szPname); - - MixerCaps->cDestinations = DeviceInfo.u.MixCaps.cDestinations; - MixerCaps->fdwSupport = DeviceInfo.u.MixCaps.fdwSupport; - MixerCaps->vDriverVersion = DeviceInfo.u.MixCaps.vDriverVersion; - MixerCaps->wMid = DeviceInfo.u.MixCaps.wMid; - MixerCaps->wPid = DeviceInfo.u.MixCaps.wPid; - break; - } - case WAVE_OUT_DEVICE_TYPE : - { - LPWAVEOUTCAPSW WaveOutCaps = (LPWAVEOUTCAPSW) Capabilities; - - DeviceInfo.u.WaveOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; - WaveOutCaps->wMid = DeviceInfo.u.WaveOutCaps.wMid; - WaveOutCaps->wPid = DeviceInfo.u.WaveOutCaps.wPid; - - WaveOutCaps->vDriverVersion = DeviceInfo.u.WaveOutCaps.vDriverVersion; - CopyWideString(WaveOutCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); - - WaveOutCaps->dwFormats = DeviceInfo.u.WaveOutCaps.dwFormats; - WaveOutCaps->wChannels = DeviceInfo.u.WaveOutCaps.wChannels; - WaveOutCaps->dwSupport = DeviceInfo.u.WaveOutCaps.dwSupport; - break; - } - case WAVE_IN_DEVICE_TYPE : - { - LPWAVEINCAPSW WaveInCaps = (LPWAVEINCAPSW) Capabilities; - - DeviceInfo.u.WaveInCaps.szPname[MAXPNAMELEN-1] = L'\0'; - - WaveInCaps->wMid = DeviceInfo.u.WaveInCaps.wMid; - WaveInCaps->wPid = DeviceInfo.u.WaveInCaps.wPid; - - WaveInCaps->vDriverVersion = DeviceInfo.u.WaveInCaps.vDriverVersion; - CopyWideString(WaveInCaps->szPname, DeviceInfo.u.WaveInCaps.szPname); - - WaveInCaps->dwFormats = DeviceInfo.u.WaveInCaps.dwFormats; - WaveInCaps->wChannels = DeviceInfo.u.WaveInCaps.wChannels; - WaveInCaps->wReserved1 = 0; - break; - } - case MIDI_IN_DEVICE_TYPE : - { - LPMIDIINCAPSW MidiInCaps = (LPMIDIINCAPSW)Capabilities; - - DeviceInfo.u.MidiInCaps.szPname[MAXPNAMELEN-1] = L'\0'; - - MidiInCaps->vDriverVersion = DeviceInfo.u.MidiInCaps.vDriverVersion; - MidiInCaps->wMid = DeviceInfo.u.MidiInCaps.wMid; - MidiInCaps->wPid = DeviceInfo.u.MidiInCaps.wPid; - MidiInCaps->dwSupport = DeviceInfo.u.MidiInCaps.dwSupport; - - CopyWideString(MidiInCaps->szPname, DeviceInfo.u.MidiInCaps.szPname); - break; - } - case MIDI_OUT_DEVICE_TYPE : - { - LPMIDIOUTCAPSW MidiOutCaps = (LPMIDIOUTCAPSW)Capabilities; - - DeviceInfo.u.MidiOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; - - MidiOutCaps->vDriverVersion = DeviceInfo.u.MidiOutCaps.vDriverVersion; - MidiOutCaps->wMid = DeviceInfo.u.MidiOutCaps.wMid; - MidiOutCaps->wPid = DeviceInfo.u.MidiOutCaps.wPid; - MidiOutCaps->dwSupport = DeviceInfo.u.MidiOutCaps.dwSupport; - - CopyWideString(MidiOutCaps->szPname, DeviceInfo.u.MidiOutCaps.szPname); - break; - } - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudOpenSoundDeviceByLegacy() -{ - /* Only open this if it's not already open */ - if ( KernelHandle == INVALID_HANDLE_VALUE ) - { - SND_TRACE(L"Opening wdmaud device\n"); - KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, - NULL); - } - - if ( KernelHandle == INVALID_HANDLE_VALUE ) - return MMSYSERR_ERROR; - - ++ OpenCount; - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudCloseSoundDeviceByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN PVOID Handle) -{ - WDMAUD_DEVICE_INFO DeviceInfo; - MMRESULT Result; - MMDEVICE_TYPE DeviceType; - PSOUND_DEVICE SoundDevice; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - if ( OpenCount == 0 ) - { - return MMSYSERR_NOERROR; - } - - SND_ASSERT( KernelHandle != INVALID_HANDLE_VALUE ); - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - if (SoundDeviceInstance->Handle != (PVOID)KernelHandle) - { - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.hDevice = SoundDeviceInstance->Handle; - - /* First stop the stream */ - if (DeviceType != MIXER_DEVICE_TYPE) - { - DeviceInfo.u.State = KSSTATE_PAUSE; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - DeviceInfo.u.State = KSSTATE_ACQUIRE; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - - DeviceInfo.u.State = KSSTATE_STOP; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } - - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_CLOSE_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } - - if (DeviceType == MIXER_DEVICE_TYPE) - { - SetEvent(SoundDeviceInstance->hStopEvent); - CloseHandle(SoundDeviceInstance->hStopEvent); - CloseHandle(SoundDeviceInstance->hNotifyEvent); - } - - --OpenCount; - - if ( OpenCount < 1 ) - { - CloseHandle(KernelHandle); - KernelHandle = INVALID_HANDLE_VALUE; - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudSetMixerDeviceFormatByLegacy( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize) -{ - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - HANDLE hThread; - - Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! Instance->hNotifyEvent ) - return MMSYSERR_NOMEM; - - if (Instance->Handle != NULL) - { - /* device is already open */ - return MMSYSERR_NOERROR; - } - - Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! Instance->hStopEvent ) - return MMSYSERR_NOMEM; - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - DeviceInfo.DeviceIndex = DeviceId; - DeviceInfo.u.hNotifyEvent = Instance->hNotifyEvent; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - CloseHandle(Instance->hNotifyEvent); - CloseHandle(Instance->hStopEvent); - return TranslateInternalMmResult(Result); - } - - hThread = CreateThread(NULL, 0, MixerEventThreadRoutine, (LPVOID)Instance, 0, NULL); - if ( hThread ) - { - CloseHandle(hThread); - } - - /* Store sound device handle instance handle */ - Instance->Handle = (PVOID)DeviceInfo.hDevice; - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudSetWaveDeviceFormatByLegacy( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PVOID Identifier; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - - Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceIdentifier(SoundDevice, &Identifier); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - if (Instance->Handle != NULL) - { - /* device is already open */ - return MMSYSERR_NOERROR; - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); //WaveFormat->cbSize; - DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; -#ifdef USERMODE_MIXER - DeviceInfo.u.WaveFormatEx.nChannels = 2; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 44100; - DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 176400; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; -#else - DeviceInfo.u.WaveFormatEx.nChannels = WaveFormat->nChannels; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; - DeviceInfo.u.WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; -#endif - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - /* Store format */ - Instance->WaveFormatEx.cbSize = WaveFormat->cbSize; - Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; - Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; - Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; - Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; - Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - Instance->WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; - - /* Store sound device handle instance handle */ - Instance->Handle = (PVOID)DeviceInfo.hDevice; - - /* Now determine framing requirements */ - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GETFRAMESIZE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( MMSUCCESS(Result) ) - { - if (DeviceInfo.u.FrameSize) - { - Instance->FrameSize = DeviceInfo.u.FrameSize * 2; - Instance->BufferCount = WaveFormat->nAvgBytesPerSec / Instance->FrameSize; - SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); - } - } - else - { - // use a default of 100 buffers - Instance->BufferCount = 100; - } - - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - /* Now start the stream */ - DeviceInfo.u.State = KSSTATE_RUN; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudCommitWaveBufferByLegacy( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID OffsetPtr, - IN DWORD Length, - IN PSOUND_OVERLAPPED Overlap, - IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) -{ - HANDLE Handle; - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - PSOUND_DEVICE SoundDevice; - MMDEVICE_TYPE DeviceType; - BOOL Ret; - - VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); - VALIDATE_MMSYS_PARAMETER( OffsetPtr ); - VALIDATE_MMSYS_PARAMETER( Overlap ); - VALIDATE_MMSYS_PARAMETER( CompletionRoutine ); - - GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT(Handle); - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.Header.FrameExtent = Length; - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - DeviceInfo.Header.DataUsed = Length; - } - DeviceInfo.Header.Data = OffsetPtr; - DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); - DeviceInfo.Header.PresentationTime.Numerator = 1; - DeviceInfo.Header.PresentationTime.Denominator = 1; - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - - - Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - if (Ret) - WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } - else if (DeviceType == WAVE_IN_DEVICE_TYPE) - { - Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - //if (Ret) - // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } - - return MMSYSERR_NOERROR; -} - - - -MMRESULT -WdmAudSetWaveStateByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN BOOL bStart) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - HANDLE Handle; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - if (bStart) - DeviceInfo.u.State = KSSTATE_RUN; - else - DeviceInfo.u.State = KSSTATE_PAUSE; - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - return Result; -} - -MMRESULT -WdmAudGetDeviceInterfaceStringByLegacy( - IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, - IN LPWSTR Interface, - IN DWORD InterfaceLength, - OUT DWORD * InterfaceSize) -{ - WDMAUD_DEVICE_INFO DeviceInfo; - MMRESULT Result; - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_QUERYDEVICEINTERFACESTRING, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - - if (!Interface) - { - SND_ASSERT(InterfaceSize); - - *InterfaceSize = DeviceInfo.u.Interface.DeviceInterfaceStringSize; - return MMSYSERR_NOERROR; - } - - if (InterfaceLength < DeviceInfo.u.Interface.DeviceInterfaceStringSize) - { - /* buffer is too small */ - return MMSYSERR_MOREDATA; - } - - DeviceInfo.u.Interface.DeviceInterfaceStringSize = InterfaceLength; - DeviceInfo.u.Interface.DeviceInterfaceString = Interface; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_QUERYDEVICEINTERFACESTRING, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( MMSUCCESS(Result) && InterfaceLength > 2) - { - Interface[1] = L'\\'; - Interface[InterfaceLength-1] = L'\0'; - } - - return Result; -} - -MMRESULT -WdmAudGetWavePositionByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMTIME* Time) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - HANDLE Handle; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Time->wType = TIME_BYTES; - Time->u.cb = (DWORD)DeviceInfo.u.Position; - - return MMSYSERR_NOERROR; -} - - -MMRESULT -WdmAudResetStreamByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMDEVICE_TYPE DeviceType, - IN BOOLEAN bStartReset) -{ - MMRESULT Result; - HANDLE Handle; - WDMAUD_DEVICE_INFO DeviceInfo; - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.u.ResetStream = (bStartReset ? KSRESET_BEGIN : KSRESET_END); - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_RESET_STREAM, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - return Result; -} - -MMRESULT -WdmAudQueryMixerInfoByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN UINT uMsg, - IN LPVOID Parameter, - IN DWORD Flags) -{ - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - HANDLE Handle; - DWORD IoControlCode; - LPMIXERLINEW MixLine; - LPMIXERLINECONTROLSW MixControls; - LPMIXERCONTROLDETAILS MixDetails; - - SND_TRACE(L"uMsg %x Flags %x\n", uMsg, Flags); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - DeviceInfo.Flags = Flags; - - MixLine = (LPMIXERLINEW)Parameter; - MixControls = (LPMIXERLINECONTROLSW)Parameter; - MixDetails = (LPMIXERCONTROLDETAILS)Parameter; - - switch(uMsg) - { - case MXDM_GETLINEINFO: - RtlCopyMemory(&DeviceInfo.u.MixLine, MixLine, sizeof(MIXERLINEW)); - IoControlCode = IOCTL_GETLINEINFO; - break; - case MXDM_GETLINECONTROLS: - RtlCopyMemory(&DeviceInfo.u.MixControls, MixControls, sizeof(MIXERLINECONTROLSW)); - IoControlCode = IOCTL_GETLINECONTROLS; - break; - case MXDM_SETCONTROLDETAILS: - RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); - IoControlCode = IOCTL_SETCONTROLDETAILS; - break; - case MXDM_GETCONTROLDETAILS: - RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); - IoControlCode = IOCTL_GETCONTROLDETAILS; - break; - default: - SND_ASSERT(0); - return MMSYSERR_NOTSUPPORTED; - } - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IoControlCode, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return Result; - } - - switch(uMsg) - { - case MXDM_GETLINEINFO: - { - RtlCopyMemory(MixLine, &DeviceInfo.u.MixLine, sizeof(MIXERLINEW)); - break; - } - } - - return Result; -} Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -18,7 +18,7 @@ #include <samplerate.h> #include <float_cast.h> #include <debug.h> -#include "interface.h" + extern HANDLE KernelHandle; @@ -423,7 +423,7 @@ /* Call mmebuddy overlap routine */ Overlap->OriginalCompletionRoutine(dwErrorCode, Overlap->OriginalBufferSize, lpOverlapped); } - +#if 0 MMRESULT WriteFileEx_Remixer( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -556,4 +556,4 @@ return MMSYSERR_NOERROR; } - +#endif Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -9,6 +9,13 @@ #include "wdmaud.h" +typedef struct +{ + KSSTREAM_HEADER Header; + HANDLE hDevice; + PSOUND_OVERLAPPED Overlap; + LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; +}IO_PACKET, *LPIO_PACKET; PVOID Alloc(ULONG NumBytes); MIXER_STATUS Close(HANDLE hDevice); @@ -719,6 +726,39 @@ return MMSYSERR_NOTSUPPORTED; } +DWORD +WINAPI +IoStreamingThread( + LPVOID lpParameter) +{ + DWORD Length; + MMRESULT Result; + LPIO_PACKET Packet = (LPIO_PACKET)lpParameter; + + Result = SyncOverlappedDeviceIoControl(Packet->hDevice, + IOCTL_KS_WRITE_STREAM, //FIXME IOCTL_KS_READ_STREAM + NULL, + 0, + &Packet->Header, + sizeof(KSSTREAM_HEADER), + &Length); + + /* HACK: + * don't call completion routine directly + */ + + Packet->CompletionRoutine(ERROR_SUCCESS, Packet->Header.DataUsed, (LPOVERLAPPED)Packet->Overlap); + + HeapFree(GetProcessHeap(), 0, Packet); + return 0; +} + + + + + + + MMRESULT WdmAudCommitWaveBufferByMMixer( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -727,10 +767,11 @@ IN PSOUND_OVERLAPPED Overlap, IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) { - KSSTREAM_HEADER Packet; PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; MMRESULT Result; + LPIO_PACKET Packet; + HANDLE hThread; Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -742,31 +783,36 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); + Packet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IO_PACKET)); + if ( ! Packet ) + { + /* no memory */ + return MMSYSERR_NOMEM; + } + /* setup stream packet */ - ZeroMemory(&Packet, sizeof(KSSTREAM_HEADER)); - Packet.Size = sizeof(KSSTREAM_HEADER); - Packet.PresentationTime.Numerator = 1; - Packet.PresentationTime.Denominator = 1; - Packet.Data = OffsetPtr; - Packet.FrameExtent = Length; + Packet->Header.Size = sizeof(KSSTREAM_HEADER); + Packet->Header.PresentationTime.Numerator = 1; + Packet->Header.PresentationTime.Denominator = 1; + Packet->Header.Data = OffsetPtr; + Packet->Header.FrameExtent = Length; + Packet->hDevice = SoundDeviceInstance->Handle; + Packet->Overlap = Overlap; + Packet->CompletionRoutine = CompletionRoutine; if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - Packet.DataUsed = Length; - } - - Result = SyncOverlappedDeviceIoControl(SoundDeviceInstance->Handle, - IOCTL_KS_WRITE_STREAM, - NULL, - 0, - &Packet, - sizeof(KSSTREAM_HEADER), - &Length); - - /* HACK: - * don't call completion routine directly - */ - CompletionRoutine(ERROR_SUCCESS, Length, (LPOVERLAPPED)Overlap); + Packet->Header.DataUsed = Length; + } + + hThread = CreateThread(NULL, 0, IoStreamingThread, (LPVOID)Packet, 0, NULL); + if (hThread == NULL) + { + /* error */ + return MMSYSERR_ERROR; + } + + CloseHandle(hThread); return MMSYSERR_NOERROR; } Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -10,7 +10,6 @@ #include <ks.h> #include <ksmedia.h> -#include "interface.h" #include "mmixer.h" #include <debug.h> Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -2,11 +2,10 @@ <importlibrary definition="wdmaud.spec" /> <include base="wdmaud.drv">.</include> <include base="ReactOS">include/reactos/libs/sound</include> - <include base="wdmaud_kernel">.</include> <include base="mmixer">.</include> <include base="libsamplerate">.</include> <define name="NDEBUG">1</define> -  + <define name="USE_MMIXER_LIB">1</define>  <library>mmebuddy</library> <library>ntdll</library> @@ -21,6 +20,5 @@ <file>wdmaud.c</file> <file>mixer.c</file> <file>mmixer.c</file> - <file>legacy.c</file> <file>wdmaud.rc</file> </module> Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Fri Dec 3 03:39:55 2010 @@ -232,7 +232,7 @@ }while(dwNumberOfBytesTransferred); - DoWaveStreaming(SoundDeviceInstance); + //DoWaveStreaming(SoundDeviceInstance); //CompleteWavePortion(SoundDeviceInstance, dwNumberOfBytesTransferred);

1 0

[janderwald] 49909: [AUDIO-BRINGUP] - Delete wdmaud, sysaudio, kmixer
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 03:36:28 2010 New Revision: 49909 URL: http://svn.reactos.org/svn/reactos?rev=49909&view=rev Log: [AUDIO-BRINGUP] - Delete wdmaud, sysaudio, kmixer Removed: branches/audio-bringup/drivers/wdm/audio/filters/kmixer/ branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/ branches/audio-bringup/drivers/wdm/audio/sysaudio/ Modified: branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/directory.rbuild branches/audio-bringup/drivers/wdm/audio/filters/directory.rbuild branches/audio-bringup/drivers/wdm/audio/legacy/directory.rbuild Modified: branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.rbuild [iso-8859-1] Fri Dec 3 03:36:28 2010 @@ -3,7 +3,6 @@ <module name="audio_test" type="win32cui" installbase="system32" installname="audio_test.exe"> <define name="PC_NO_IMPORTS" /> <include base="ReactOS">include/reactos/libs/sound</include> - <include base="wdmaud_kernel">.</include> <include base="libsamplerate">.</include> <library>setupapi</library> <library>libsamplerate</library> Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri Dec 3 03:36:28 2010 @@ -702,7 +702,7 @@ if (Gap > BufferLength) { // insert silence samples - DPRINT("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); + DPRINT1("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -761,7 +761,7 @@ if (Gap > BufferLength) { // insert silence samples - DPRINT("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); + DPRINT1("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; Modified: branches/audio-bringup/drivers/wdm/audio/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/directory.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/directory.rbuild [iso-8859-1] Fri Dec 3 03:36:28 2010 @@ -16,7 +16,4 @@ <directory name="legacy"> <xi:include href="legacy/directory.rbuild" /> </directory> - <directory name="sysaudio"> - <xi:include href="sysaudio/sysaudio.rbuild" /> - </directory> </group> Modified: branches/audio-bringup/drivers/wdm/audio/filters/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/filters/directory.rbuild [iso-8859-1] Fri Dec 3 03:36:28 2010 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="kmixer"> - <xi:include href="kmixer/kmixer.rbuild" /> - </directory>  Modified: branches/audio-bringup/drivers/wdm/audio/legacy/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/legacy/directory.rbuild [iso-8859-1] Fri Dec 3 03:36:28 2010 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="wdmaud"> - <xi:include href="wdmaud/wdmaud.rbuild" /> - </directory>

1 0

[akhaldi] 49908: [CMAKE] - Adapt to the new spec2def syntax.
by akhaldi＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: akhaldi Date: Thu Dec 2 23:37:33 2010 New Revision: 49908 URL: http://svn.reactos.org/svn/reactos?rev=49908&view=rev Log: [CMAKE] - Adapt to the new spec2def syntax. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=499… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Dec 2 23:37:33 2010 @@ -198,7 +198,7 @@ get_filename_component(_name ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def + COMMAND native-spec2def -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) add_custom_target(

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010