Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49921: [CMAKE] Fix libshdocvw
by tkreuzer＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: tkreuzer Date: Fri Dec 3 12:08:09 2010 New Revision: 49921 URL: http://svn.reactos.org/svn/reactos?rev=49921&view=rev Log: [CMAKE] Fix libshdocvw Modified: branches/cmake-bringup/dll/win32/shdocvw/shdocvw.spec Modified: branches/cmake-bringup/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Fri Dec 3 12:08:09 2010 @@ -43,7 +43,7 @@ 158 stdcall -noname SHRestricted2A(long str long) 159 stdcall -noname SHRestricted2W(long wstr long) 160 stub -noname SHIsRestricted2W -161 stub @ # CSearchAssistantOC::OnDraw +161 stub shdocvw_161 # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite 164 stub -noname ResetProfileSharing @@ -66,7 +66,7 @@ 185 stub -noname FireEvent_Quit 187 stub -noname SHDGetPageLocation 188 stub -noname SHIEErrorMsgBox -189 stub @ # FIXME: same as ordinal 148 +189 stub shdocvw_189 # FIXME: same as ordinal 148 190 stub -noname SHRunIndirectRegClientCommandForward 191 stub -noname SHIsRegisteredClient 192 stub -noname SHGetHistoryPIDL @@ -75,7 +75,7 @@ 196 stub -noname IEDDE_WindowDestroyed 197 stub -noname IEDDE_NewWindow 198 stub -noname IsErrorUrl -199 stub @ +199 stub shdocvw_199 200 stub -noname SHGetViewStream 203 stub -noname NavToUrlUsingIEA 204 stub -noname NavToUrlUsingIEW @@ -91,7 +91,7 @@ 217 stub -noname GetDefaultInternetSearchUrlA 218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) 219 stub -noname IEILIsEqual -220 stub @ +220 stub shdocvw_220 221 stub -noname IECreateFromPathCPWithBCA 222 stub -noname IECreateFromPathCPWithBCW 223 stub -noname ResetWebSettings

1 0

[janderwald] 49920: [AUDIO-BRINGUP] - Remove wdmaud test code
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 11:53:15 2010 New Revision: 49920 URL: http://svn.reactos.org/svn/reactos?rev=49920&view=rev Log: [AUDIO-BRINGUP] - Remove wdmaud test code Modified: branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.c Modified: branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Fri Dec 3 11:53:15 2010 @@ -11,8 +11,6 @@ #include <ndk/ntndk.h> #include <ks.h> #include <ksmedia.h> -#include "interface.h" - #define _2pi 6.283185307179586476925286766559 @@ -251,161 +249,6 @@ __cdecl main(int argc, char* argv[]) { - ULONG Length; - PSHORT SoundBuffer; - ULONG i = 0; - BOOL Status; - OVERLAPPED Overlapped; - DWORD BytesReturned; - HANDLE hWdmAud; - WDMAUD_DEVICE_INFO DeviceInfo; - TestKs(); return 0; - - hWdmAud = CreateFileW(L"\\\\.\\wdmaud", - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, - NULL); - if (!hWdmAud) - { - printf("Failed to open wdmaud with %lx\n", GetLastError()); - return -1; - } - - printf("WDMAUD: opened\n"); - - /* clear device info */ - RtlZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); - Overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - - DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; - - - Status = DeviceIoControl(hWdmAud, IOCTL_GETNUMDEVS_TYPE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to get num of wave out devices with %lx\n", GetLastError()); - CloseHandle(hWdmAud); - return -1; - } - } - - printf("WDMAUD: Num Devices %lu\n", DeviceInfo.DeviceCount); - - if (!DeviceInfo.DeviceCount) - { - CloseHandle(hWdmAud); - return 0; - } - - Status = DeviceIoControl(hWdmAud, IOCTL_GETCAPABILITIES, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to get iocaps %lx\n", GetLastError()); - } - } - printf("WDMAUD: Capabilites NumChannels %x dwFormats %lx\n", DeviceInfo.u.WaveOutCaps.wChannels, DeviceInfo.u.WaveOutCaps.dwFormats); - - DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); - DeviceInfo.u.WaveFormatEx.wFormatTag = WAVE_FORMAT_PCM; - DeviceInfo.u.WaveFormatEx.nChannels = 2; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 48000; - DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 48000 * 4; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; - - - - Status = DeviceIoControl(hWdmAud, IOCTL_OPEN_WDMAUD, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to open device with %lx\n", GetLastError()); - CloseHandle(hWdmAud); - return -1; - } - } - - printf("WDMAUD: opened device\n"); - - // - // Allocate a buffer for 1 second - // - Length = 48000 * 4; - SoundBuffer = (PSHORT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); - - // - // Fill the buffer with a 500 Hz sine tone - // - while (i < Length / 2) - { - // - // Generate the wave for each channel: - // Amplitude * sin( Sample * Frequency * 2PI / SamplesPerSecond ) - // - SoundBuffer[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); - i++; - SoundBuffer[i] = 0x7FFF * sin((0.5 * i - 2) * 500 * _2pi / 48000); - i++; - } - - DeviceInfo.u.State = KSSTATE_RUN; - Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to set device into run state %lx\n", GetLastError()); - CloseHandle(hWdmAud); - return -1; - } - } - - // - // Play our 1-second buffer - // - DeviceInfo.Header.Data = (PUCHAR)SoundBuffer; - DeviceInfo.Header.DataUsed = DeviceInfo.Header.FrameExtent = Length; - Status = DeviceIoControl(hWdmAud, IOCTL_WRITEDATA, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to play buffer %lx\n", GetLastError()); - CloseHandle(hWdmAud); - return -1; - } - } - - printf("WDMAUD: Played buffer\n"); - - DeviceInfo.u.State = KSSTATE_STOP; - Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); - if (!Status) - { - if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) - { - printf("Failed to set device into stop state %lx\n", GetLastError()); - CloseHandle(hWdmAud); - return -1; - } - } - printf("WDMAUD: STOPPED\n"); - CloseHandle(&Overlapped.hEvent); - CloseHandle(hWdmAud); - printf("WDMAUD: COMPLETE\n"); - return 0; }

1 0

[janderwald] 49919: [AUDIO-BRINGUP] - Check if library has already been initialized - Remove function macro for legacy (wdmaud.sys connection)
by janderwald＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: janderwald Date: Fri Dec 3 11:47:43 2010 New Revision: 49919 URL: http://svn.reactos.org/svn/reactos?rev=49919&view=rev Log: [AUDIO-BRINGUP] - Check if library has already been initialized - Remove function macro for legacy (wdmaud.sys connection) Modified: branches/audio-bringup/dll/win32/wdmaud.drv/ (props changed) branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.rbuild Propchange: branches/audio-bringup/dll/win32/wdmaud.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 3 11:47:43 2010 @@ -2,4 +2,4 @@ /branches/reactos-yarotows/dll/win32/wdmaud.drv:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup/dll/win32/wdmaud.drv:36852 /branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos/dll/win32/wdmaud.drv:49194-49490 +/trunk/reactos/dll/win32/wdmaud.drv:49194-49917 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 11:47:43 2010 @@ -16,6 +16,10 @@ PSOUND_OVERLAPPED Overlap; LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; }IO_PACKET, *LPIO_PACKET; + +BOOL MMixerLibraryInitialized = FALSE; + + PVOID Alloc(ULONG NumBytes); MIXER_STATUS Close(HANDLE hDevice); @@ -331,6 +335,13 @@ HDEVINFO DeviceHandle; MIXER_STATUS Status; + if (MMixerLibraryInitialized) + { + /* library is already initialized */ + return TRUE; + } + + /* create a device list */ DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, NULL, @@ -356,6 +367,9 @@ DPRINT1("Failed to initialize mixer library with %x\n", Status); return FALSE; } + + /* library is now initialized */ + MMixerLibraryInitialized = TRUE; /* completed successfully */ return TRUE; Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Fri Dec 3 11:47:43 2010 @@ -14,13 +14,6 @@ #include "wdmaud.h" - -#ifndef USE_MMIXER_LIB -#define FUNC_NAME(x) x##ByLegacy -#else -#define FUNC_NAME(x) x##ByMMixer -#endif - MMRESULT QueryWdmWaveDeviceFormatSupport( IN PSOUND_DEVICE Device, @@ -43,7 +36,7 @@ VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); - Result = FUNC_NAME(WdmAudGetNumWdmDevs)(DeviceType, &DeviceCount); + Result = WdmAudGetNumWdmDevsByMMixer(DeviceType, &DeviceCount); if ( ! MMSUCCESS(Result) ) { @@ -66,35 +59,35 @@ /* Set up our function table */ ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); - FuncTable.GetCapabilities = FUNC_NAME(WdmAudGetCapabilities); + FuncTable.GetCapabilities = WdmAudGetCapabilitiesByMMixer; FuncTable.QueryWaveFormatSupport = QueryWdmWaveDeviceFormatSupport; //FIXME - FuncTable.Open = FUNC_NAME(WdmAudOpenSoundDevice); - FuncTable.Close = FUNC_NAME(WdmAudCloseSoundDevice); - FuncTable.GetDeviceInterfaceString = FUNC_NAME(WdmAudGetDeviceInterfaceString); + FuncTable.Open = WdmAudOpenSoundDeviceByMMixer; + FuncTable.Close = WdmAudCloseSoundDeviceByMMixer; + FuncTable.GetDeviceInterfaceString = WdmAudGetDeviceInterfaceStringByMMixer; if (DeviceType == MIXER_DEVICE_TYPE) { - FuncTable.SetWaveFormat = FUNC_NAME(WdmAudSetMixerDeviceFormat); - FuncTable.QueryMixerInfo = FUNC_NAME(WdmAudQueryMixerInfo); + FuncTable.SetWaveFormat = WdmAudSetMixerDeviceFormatByMMixer; + FuncTable.QueryMixerInfo = WdmAudQueryMixerInfoByMMixer; } else if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) { - FuncTable.SetWaveFormat = FUNC_NAME(WdmAudSetWaveDeviceFormat); - FuncTable.SetState = FUNC_NAME(WdmAudSetWaveState); - FuncTable.ResetStream = FUNC_NAME(WdmAudResetStream); - FuncTable.GetPos = FUNC_NAME(WdmAudGetWavePosition); + FuncTable.SetWaveFormat = WdmAudSetWaveDeviceFormatByMMixer; + FuncTable.SetState = WdmAudSetWaveStateByMMixer; + FuncTable.ResetStream = WdmAudResetStreamByMMixer; + FuncTable.GetPos = WdmAudGetWavePositionByMMixer; #ifndef USERMODE_MIXER - FuncTable.CommitWaveBuffer = FUNC_NAME(WdmAudCommitWaveBuffer); + FuncTable.CommitWaveBuffer = WdmAudCommitWaveBufferByMMixer; #else FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; #endif } else if (DeviceType == MIDI_IN_DEVICE_TYPE || DeviceType == MIDI_OUT_DEVICE_TYPE) { - FuncTable.SetWaveFormat = FUNC_NAME(WdmAudSetMixerDeviceFormat); - FuncTable.SetState = FUNC_NAME(WdmAudSetWaveState); - FuncTable.GetPos = FUNC_NAME(WdmAudGetWavePosition); + FuncTable.SetWaveFormat = WdmAudSetWaveDeviceFormatByMMixer; + FuncTable.SetState = WdmAudSetWaveStateByMMixer; + FuncTable.GetPos = WdmAudGetWavePositionByMMixer; } SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); @@ -127,7 +120,7 @@ if ( ! MMSUCCESS(Result) ) return 0L; - Result = FUNC_NAME(WdmAudOpenSoundDevice)(NULL, &Handle); + Result = WdmAudOpenSoundDeviceByMMixer(NULL, &Handle); if ( Result != MMSYSERR_NOERROR ) { @@ -155,7 +148,7 @@ { SND_TRACE(L"DRV_FREE\n"); - FUNC_NAME(WdmAudCleanup)(); + WdmAudCleanupByMMixer(); /* TODO: Clean up the path names! */ UnlistAllSoundDevices(); 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 11:47:43 2010 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/libs/sound</include> <include base="mmixer">.</include> <include base="libsamplerate">.</include> - <define name="NDEBUG">1</define> <define name="USE_MMIXER_LIB">1</define>  <library>mmebuddy</library>

1 0

[tkreuzer] 49918: revert accidental change from r49499
by tkreuzer＠svn.reactos.org 03 Dec '10

03 Dec '10

Author: tkreuzer Date: Fri Dec 3 11:46:52 2010 New Revision: 49918 URL: http://svn.reactos.org/svn/reactos?rev=49918&view=rev Log: revert accidental change from r49499 Modified: trunk/reactos/modules/directory.rbuild Modified: trunk/reactos/modules/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/directory.rbuild?r… ============================================================================== --- trunk/reactos/modules/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/modules/directory.rbuild [iso-8859-1] Fri Dec 3 11:46:52 2010 @@ -22,11 +22,4 @@ </xi:fallback> </xi:include> </directory> -  </group>

1 0

[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

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