Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[mkupfer] 48955: Yugoslavia no longer exists for some time, replaced by Serbia as successor of country code (phone)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Oct 1 19:54:27 2010 New Revision: 48955 URL: http://svn.reactos.org/svn/reactos?rev=48955&view=rev Log: Yugoslavia no longer exists for some time, replaced by Serbia as successor of country code (phone) Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Fri Oct 1 19:54:27 2010 @@ -1078,7 +1078,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","CountryCode",0x00010001,0x0000017c HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","Name",0x00000000,"Ukraine" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","CountryCode",0x00010001,0x0000017d -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Yugoslavia" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Serbia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","CountryCode",0x00010001,0x00000181 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","Name",0x00000000,"Croatia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\386","CountryCode",0x00010001,0x00000182 Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Fri Oct 1 19:54:27 2010 @@ -994,7 +994,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","CountryCode",0x00010001,0x0000017c HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","Name",0x00000000,"Ukraine" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","CountryCode",0x00010001,0x0000017d -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Yugoslavia" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Serbia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","CountryCode",0x00010001,0x00000181 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","Name",0x00000000,"Croatia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\386","CountryCode",0x00010001,0x00000182 Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Fri Oct 1 19:54:27 2010 @@ -1078,7 +1078,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","CountryCode",0x00010001,0x0000017c HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\380","Name",0x00000000,"Ukraine" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","CountryCode",0x00010001,0x0000017d -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Yugoslavia" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\381","Name",0x00000000,"Serbia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","CountryCode",0x00010001,0x00000181 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\385","Name",0x00000000,"Croatia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\386","CountryCode",0x00010001,0x00000182

14 years

[janderwald] 48954: [VIDEOPRT] - Add sanity checks - Implement VideoPortGetCommonBuffer, VideoPortLockPages See issue #5629 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 1 17:43:03 2010 New Revision: 48954 URL: http://svn.reactos.org/svn/reactos?rev=48954&view=rev Log: [VIDEOPRT] - Add sanity checks - Implement VideoPortGetCommonBuffer, VideoPortLockPages See issue #5629 for more details. Modified: trunk/reactos/drivers/video/videoprt/dma.c trunk/reactos/drivers/video/videoprt/resource.c trunk/reactos/drivers/video/videoprt/stubs.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dma… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] Fri Oct 1 17:43:03 2010 @@ -14,8 +14,10 @@ typedef struct { + LIST_ENTRY Entry; PDMA_ADAPTER Adapter; ULONG MapRegisters; + PVOID HwDeviceExtension; }VIP_DMA_ADAPTER, *PVIP_DMA_ADAPTER; @@ -46,7 +48,14 @@ { PVIP_DMA_ADAPTER Adapter = (PVIP_DMA_ADAPTER)VpDmaAdapter; - + /* check for valid arguments */ + if (!Adapter || !Adapter->Adapter) + { + /* invalid parameter */ + return NULL; + } + + /* allocate common buffer */ return Adapter->Adapter->DmaOperations->AllocateCommonBuffer(Adapter->Adapter, DesiredLength, LogicalAddress, CacheEnabled); } @@ -64,6 +73,14 @@ { PVIP_DMA_ADAPTER Adapter = (PVIP_DMA_ADAPTER)VpDmaAdapter; + /* check for valid arguments */ + if (!Adapter || !Adapter->Adapter) + { + /* invalid parameter */ + return; + } + + /* release common buffer */ Adapter->Adapter->DmaOperations->FreeCommonBuffer(Adapter->Adapter, Length, LogicalAddress, VirtualAddress, CacheEnabled); } @@ -75,9 +92,22 @@ VideoPortPutDmaAdapter(IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter) { + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; PVIP_DMA_ADAPTER Adapter = (PVIP_DMA_ADAPTER)VpDmaAdapter; + /* get hw device extension */ + DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + + /* sanity check */ + ASSERT(!IsListEmpty(&DeviceExtension->DmaAdapterList)); + + /* remove dma adapter from list */ + RemoveEntryList(&Adapter->Entry); + + /* release dma adapter */ Adapter->Adapter->DmaOperations->PutDmaAdapter(Adapter->Adapter); + + /* free memory */ ExFreePool(Adapter); } @@ -95,13 +125,21 @@ PVIP_DMA_ADAPTER Adapter; PDMA_ADAPTER DmaAdapter; + /* allocate private adapter structure */ + Adapter = ExAllocatePool(NonPagedPool, sizeof(VIP_DMA_ADAPTER)); + if (!Adapter) + { + /* failed to allocate adapter structure */ + return NULL; + } + /* Zero the structure */ RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); /* Initialize the structure */ DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; - DeviceDescription.Master = TRUE /* ?? */; + DeviceDescription.Master = TRUE; DeviceDescription.DmaWidth = Width8Bits; DeviceDescription.DmaSpeed = Compatible; @@ -115,21 +153,28 @@ DeviceDescription.BusNumber = DeviceExtension->SystemIoBusNumber; DeviceDescription.InterfaceType = DeviceExtension->AdapterInterfaceType; - Adapter = ExAllocatePool(NonPagedPool, sizeof(VIP_DMA_ADAPTER)); - if (!Adapter) - return NULL; - - + /* acquire dma adapter */ DmaAdapter = IoGetDmaAdapter(DeviceExtension->PhysicalDeviceObject, &DeviceDescription, &NumberOfMapRegisters); if (!DmaAdapter) { + /* failed to acquire dma */ ExFreePool(Adapter); return NULL; } + /* store dma adapter */ Adapter->Adapter = DmaAdapter; + + /* store map register count */ Adapter->MapRegisters = NumberOfMapRegisters; + /* store hw device extension */ + Adapter->HwDeviceExtension = HwDeviceExtension; + + /* store in dma adapter list */ + InsertTailList(&DeviceExtension->DmaAdapterList, &Adapter->Entry); + + /* return result */ return (PVP_DMA_ADAPTER)Adapter; } @@ -144,21 +189,26 @@ IN PHYSICAL_ADDRESS LogicalAddress, IN BOOLEAN CacheEnabled) { - DEVICE_DESCRIPTION DeviceDescription; - PVP_DMA_ADAPTER VpDmaAdapter; - - /* FIXME: Broken code*/ - VpDmaAdapter = VideoPortGetDmaAdapter(HwDeviceExtension, - (PVP_DEVICE_DESCRIPTION)&DeviceDescription); - HalFreeCommonBuffer((PADAPTER_OBJECT)VpDmaAdapter, - Length, - LogicalAddress, - VirtualAddress, - CacheEnabled); -} - -/* - * @unimplemented + PVIP_DMA_ADAPTER VpDmaAdapter; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + + /* sanity check */ + ASSERT(!IsListEmpty(&DeviceExtension->DmaAdapterList)); + + /* grab first dma adapter */ + VpDmaAdapter = (PVIP_DMA_ADAPTER)CONTAINING_RECORD(DeviceExtension->DmaAdapterList.Flink, VIP_DMA_ADAPTER, Entry); + + /* sanity checks */ + ASSERT(VpDmaAdapter->HwDeviceExtension == HwDeviceExtension); + ASSERT(VpDmaAdapter->Adapter != NULL); + ASSERT(VpDmaAdapter->MapRegisters != 0); + + return VideoPortReleaseCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter, Length, LogicalAddress, VirtualAddress, CacheEnabled); + +} + +/* + * @implemented */ PVOID NTAPI @@ -169,8 +219,44 @@ OUT PULONG pActualLength, IN BOOLEAN CacheEnabled) { - UNIMPLEMENTED; - return NULL; + PVOID Result; + PVIP_DMA_ADAPTER VpDmaAdapter; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + + /* maximum palette size */ + if (DesiredLength > 262144) + { + /* size exceeded */ + return NULL; + } + + /* sanity check */ + ASSERT(!IsListEmpty(&DeviceExtension->DmaAdapterList)); + + /* grab first dma adapter */ + VpDmaAdapter = (PVIP_DMA_ADAPTER)CONTAINING_RECORD(DeviceExtension->DmaAdapterList.Flink, VIP_DMA_ADAPTER, Entry); + + /* sanity checks */ + ASSERT(VpDmaAdapter->HwDeviceExtension == HwDeviceExtension); + ASSERT(VpDmaAdapter->Adapter != NULL); + ASSERT(VpDmaAdapter->MapRegisters != 0); + + + /* allocate common buffer */ + Result = VideoPortAllocateCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter, DesiredLength, LogicalAddress, CacheEnabled, NULL); + + if (Result) + { + /* store length */ + *pActualLength = DesiredLength; + } + else + { + /* failed to allocate common buffer */ + *pActualLength = 0; + } + + return Result; } /* @@ -185,7 +271,7 @@ PDMA BoardMemoryHandle) { /* Deprecated */ - return FALSE; + return FALSE; } /* @@ -203,7 +289,7 @@ IN OUT PVOID *VirtualAddress) { /* Deprecated */ - return NULL; + return NULL; } /* @@ -216,7 +302,7 @@ IN PVOID InstanceContext) { /* Deprecated */ - return; + return; } /* @@ -228,7 +314,7 @@ IN PDMA pDmaHandle) { /* Deprecated */ - return FALSE; + return FALSE; } @@ -327,7 +413,7 @@ IN PDMA pDma) { /* Deprecated */ - return NULL; + return NULL; } /* @@ -344,7 +430,7 @@ } /* - * @unimplemented + * @implemented */ PDMA NTAPI @@ -353,8 +439,8 @@ IN PVOID MappedUserEvent, IN PVOID DisplayDriverEvent) { - UNIMPLEMENTED; - return NULL; + /* Deprecated */ + return NULL; } /* Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Fri Oct 1 17:43:03 2010 @@ -760,7 +760,49 @@ } /* - * @unimplemented + * @implemented + */ + +BOOLEAN +NTAPI +VideoPortLockPages( + IN PVOID HwDeviceExtension, + IN OUT PVIDEO_REQUEST_PACKET pVrp, + IN PEVENT pUEvent, + IN PEVENT pDisplayEvent, + IN DMA_FLAGS DmaFlags) +{ + PVOID Buffer; + + /* clear output buffer */ + pVrp->OutputBuffer = NULL; + + if (DmaFlags != VideoPortDmaInitOnly) + { + /* VideoPortKeepPagesLocked / VideoPortUnlockAfterDma is no-op */ + return FALSE; + } + + /* lock the buffer */ + Buffer = VideoPortLockBuffer(HwDeviceExtension, pVrp->InputBuffer, pVrp->InputBufferLength, IoModifyAccess); + + if (Buffer) + { + /* store result buffer & length */ + pVrp->OutputBuffer = Buffer; + pVrp->OutputBufferLength = pVrp->InputBufferLength; + + /* operation succeeded */ + return TRUE; + } + + /* operation failed */ + return FALSE; +} + + +/* + * @implemented */ VOID NTAPI Modified: trunk/reactos/drivers/video/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/stu… ============================================================================== --- trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] Fri Oct 1 17:43:03 2010 @@ -62,19 +62,6 @@ return 0; } -BOOLEAN -NTAPI -VideoPortLockPages( - IN PVOID HwDeviceExtension, - IN OUT PVIDEO_REQUEST_PACKET pVrp, - IN PEVENT pUEvent, - IN PEVENT pDisplayEvent, - IN DMA_FLAGS DmaFlags) -{ - UNIMPLEMENTED; - return 0; -} - LONG NTAPI VideoPortReadStateEvent( Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Fri Oct 1 17:43:03 2010 @@ -304,6 +304,8 @@ } InitializeListHead(&DeviceExtension->AddressMappingListHead); + InitializeListHead(&DeviceExtension->DmaAdapterList); + KeInitializeDpc( &DeviceExtension->DpcObject, IntVideoPortDeferredRoutine, Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Fri Oct 1 17:43:03 2010 @@ -95,6 +95,7 @@ ULONG DeviceOpened; AGP_BUS_INTERFACE_STANDARD AgpInterface; KMUTEX DeviceLock; + LIST_ENTRY DmaAdapterList; CHAR MiniPortDeviceExtension[1]; } VIDEO_PORT_DEVICE_EXTENSION, *PVIDEO_PORT_DEVICE_EXTENSION;

14 years

[akhaldi] 48953: [CMAKE] - Add ws2help, wshirda, wshtcpip, wsock32, wtsapi32, wuapi, xinput*, xmllite, cmbatt, compbatt, dxapi, dxg, dxgthk, fs_rec, msfs and mup to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 1 16:30:49 2010 New Revision: 48953 URL: http://svn.reactos.org/svn/reactos?rev=48953&view=rev Log: [CMAKE] - Add ws2help, wshirda, wshtcpip, wsock32, wtsapi32, wuapi, xinput*, xmllite, cmbatt, compbatt, dxapi, dxg, dxgthk, fs_rec, msfs and mup to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/directx/CMakeLists.txt (with props) branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt (with props) branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt (with props) branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libbattc.a (with props) branches/cmake-bringup/importlibs/libdxgthk.a (with props) branches/cmake-bringup/importlibs/libwmilib.a (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -214,14 +214,14 @@ #add_subdirectory(wmi) #add_subdirectory(ws2_32) #add_subdirectory(ws2_32_new) -#add_subdirectory(ws2help) -#add_subdirectory(wshirda) -#add_subdirectory(wshtcpip) -#add_subdirectory(wsock32) -#add_subdirectory(wtsapi32) -#add_subdirectory(wuapi) -#add_subdirectory(xinput1_1) -#add_subdirectory(xinput1_2) -#add_subdirectory(xinput1_3) -#add_subdirectory(xinput9_1_0) -#add_subdirectory(xmllite) +add_subdirectory(ws2help) +add_subdirectory(wshirda) +add_subdirectory(wshtcpip) +add_subdirectory(wsock32) +add_subdirectory(wtsapi32) +add_subdirectory(wuapi) +add_subdirectory(xinput1_1) +add_subdirectory(xinput1_2) +add_subdirectory(xinput1_3) +add_subdirectory(xinput9_1_0) +add_subdirectory(xmllite) Added: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,17 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) + +spec2def(ws2help ${CMAKE_CURRENT_SOURCE_DIR}/ws2help.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) + +add_library(ws2help SHARED + apc.c + context.c + dllmain.c + handle.c + notify.c) + +set_module_type(ws2help win32dll) + +target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) +add_importlibs(ws2help advapi32 ntdll ws2_32) +add_dependencies(ws2help ws2help_def psdk) Propchange: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,10 @@ + +spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) + +add_library(wshirda SHARED wshirda.c wshirda.rc) + +set_module_type(wshirda win32dll) + +target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) +add_importlibs(wshirda ntdll ws2_32) +add_dependencies(wshirda wshirda_def psdk) Propchange: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,15 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) + +spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) + +add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc) + +set_module_type(wshtcpip win32dll) + +target_link_libraries(wshtcpip + ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def + tdilib) + +add_importlibs(wshtcpip ntdll ws2_32) +add_dependencies(wshtcpip wshtcpip_def psdk) Propchange: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,8 @@ + +add_library(wsock32 SHARED stubs.c wsock32.rc) + +set_module_type(wsock32 win32dll) + +target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) +add_importlibs(wsock32 ntdll ws2_32) +add_dependencies(wsock32 psdk) Propchange: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wtsapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,16 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(wtsapi32 ${CMAKE_CURRENT_SOURCE_DIR}/wtsapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def) + +add_library(wtsapi32 SHARED wtsapi32.c) + +set_module_type(wtsapi32 win32dll) + +target_link_libraries(wtsapi32 + ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def + wine) + +add_importlibs(wtsapi32 advapi32 ntdll) +add_dependencies(wtsapi32 wtsapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,27 @@ + +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(wuapi ${CMAKE_CURRENT_SOURCE_DIR}/wuapi.spec ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) + +add_library(wuapi SHARED + downloader.c + installer.c + main.c + regsvr.c + searcher.c + session.c + updates.c) + +set_module_type(wuapi win32dll) + +target_link_libraries(wuapi + ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def + wine) + +add_importlibs(wuapi uuid ole32 advapi32 ntdll) +add_dependencies(wuapi wuapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,11 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(xinput1_1 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_1.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) + +add_library(xinput1_1 SHARED xinput1_1_main.c version.rc) + +set_module_type(xinput1_1 win32dll) +target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) +add_dependencies(xinput1_1 xinput1_1_def psdk) Propchange: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,11 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(xinput1_2 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_2.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) + +add_library(xinput1_2 SHARED xinput1_2_main.c version.rc) + +set_module_type(xinput1_2 win32dll) +target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) +add_dependencies(xinput1_2 xinput1_2_def psdk) Propchange: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(xinput1_3 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_3.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) + +add_library(xinput1_3 SHARED xinput1_3_main.c version.rc) + +set_module_type(xinput1_3 win32dll) + +target_link_libraries(xinput1_3 + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def + wine) + +add_dependencies(xinput1_3 xinput1_3_def psdk) Propchange: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,11 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(xinput9_1_0 ${CMAKE_CURRENT_SOURCE_DIR}/xinput9_1_0.spec ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) + +add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc) + +set_module_type(xinput9_1_0 win32dll) +target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) +add_dependencies(xinput9_1_0 xinput9_1_0_def psdk) Propchange: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(xmllite ${CMAKE_CURRENT_SOURCE_DIR}/xmllite.spec ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) + +add_library(xmllite SHARED reader.c xmllite_main.c) + +set_module_type(xmllite win32dll) + +target_link_libraries(xmllite + ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def + wine) + +add_dependencies(xmllite xmllite_def psdk) Propchange: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -2,6 +2,7 @@ add_subdirectory(base) add_subdirectory(battery) add_subdirectory(bus) +add_subdirectory(directx) add_subdirectory(filesystems) add_subdirectory(input) add_subdirectory(ksfilter) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -145,3 +145,6 @@ add_importlibs(acpi ntoskrnl hal) add_dependencies(acpi psdk bugcodes) + +add_subdirectory(cmbatt) +add_subdirectory(compbatt) Added: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,16 @@ + +list(APPEND SOURCE + cmbatt.c + cmexec.c + cmbpnp.c + cmbwmi.c + cmbatt.rc) + +add_library(cmbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/cmbatt_cmbatt.h.gch ${SOURCE}) + +set_target_properties(cmbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(cmbatt ntoskrnl hal battc wmilib) + +add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE}) +add_dependencies(cmbatt psdk bugcodes) Propchange: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,14 @@ + +list(APPEND SOURCE + compbatt.c + compmisc.c + comppnp.c + compbatt.rc) + +add_library(compbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/compbatt_compbatt.h.gch ${SOURCE}) + +set_target_properties(compbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(compbatt ntoskrnl hal battc) +add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE}) +add_dependencies(compbatt psdk bugcodes) Propchange: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/C… ============================================================================== --- branches/cmake-bringup/drivers/directx/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/directx/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,4 @@ + +add_subdirectory(dxapi) +add_subdirectory(dxg) +add_subdirectory(dxgthk) Propchange: branches/cmake-bringup/drivers/directx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,12 @@ + +add_definitions(-D_DXAPI_) + +spec2def(dxapi ${CMAKE_CURRENT_SOURCE_DIR}/dxapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def) + +add_library(dxapi SHARED main.c dxapi.rc) + +set_target_properties(dxapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(dxapi ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def) +add_importlibs(dxapi ntoskrnl hal videoprt) +add_dependencies(dxapi dxapi_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,15 @@ + +spec2def(dxg ${CMAKE_CURRENT_SOURCE_DIR}/dxg.spec ${CMAKE_CURRENT_BINARY_DIR}/dxg.def) + +add_library(dxg SHARED + main.c + ddhmg.c + eng.c + historic.c + dxg.rc) + +set_target_properties(dxg PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(dxg ${CMAKE_CURRENT_BINARY_DIR}/dxg.def) +add_importlibs(dxg dxgthk ntoskrnl) +add_dependencies(dxg dxg_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,10 @@ + +spec2def(dxgthk ${CMAKE_CURRENT_SOURCE_DIR}/dxgthk.spec ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) + +add_library(dxgthk SHARED main.c dxgthk.rc) + +set_target_properties(dxgthk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(dxgthk ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) +add_importlibs(dxgthk win32k) +add_dependencies(dxgthk dxgthk_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -3,5 +3,8 @@ add_subdirectory(ext2) add_subdirectory(fastfat) #add_subdirectory(fastfat_new) +add_subdirectory(fs_rec) +add_subdirectory(msfs) +add_subdirectory(mup) add_subdirectory(npfs) add_subdirectory(ntfs) Added: branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,15 @@ + +add_library(fs_rec SHARED + blockdev.c + cdfs.c + ext2.c + fat.c + fs_rec.c + ntfs.c + udfs.c + fs_rec.rc) + +set_target_properties(fs_rec PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(fs_rec ntoskrnl hal) +add_dependencies(fs_rec psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,16 @@ + +list(APPEND SOURCE + create.c + finfo.c + fsctrl.c + msfs.c + rw.c + msfs.rc) + +add_library(msfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/msfs_msfs.h.gch ${SOURCE}) + +set_target_properties(msfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(msfs ntoskrnl hal) +add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) +add_dependencies(msfs psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Fri Oct 1 16:30:49 2010 @@ -1,0 +1,10 @@ + +add_library(mup SHARED + create.c + mup.c + mup.rc) + +set_target_properties(mup PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(mup ntoskrnl hal) +add_dependencies(mup psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libbattc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libbat… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libbattc.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libdxgthk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdxg… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libdxgthk.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libwmilib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwmi… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwmilib.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years

[akhaldi] 48952: [CMAKE] - Add libdrmk.a and libks.a

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 1 08:41:45 2010 New Revision: 48952 URL: http://svn.reactos.org/svn/reactos?rev=48952&view=rev Log: [CMAKE] - Add libdrmk.a and libks.a Added: branches/cmake-bringup/importlibs/libdrmk.a (with props) branches/cmake-bringup/importlibs/libks.a (with props) Added: branches/cmake-bringup/importlibs/libdrmk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdrm… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libdrmk.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libks.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libks.… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libks.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years

[akhaldi] 48951: [CMAKE] - Add ksuser, npfs, ntfs, ks, parallel, serenum, serial, pciide, pciidex, usbdriver, usbd, framebuf, framebuf_new and portcls to build. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 1 00:15:10 2010 New Revision: 48951 URL: http://svn.reactos.org/svn/reactos?rev=48951&view=rev Log: [CMAKE] - Add ksuser, npfs, ntfs, ks, parallel, serenum, serial, pciide, pciidex, usbdriver, usbd, framebuf, framebuf_new and portcls to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/directx/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt (with props) branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt (with props) branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt (with props) branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt (with props) branches/cmake-bringup/drivers/ksfilter/ks/ks.def (with props) branches/cmake-bringup/drivers/parallel/CMakeLists.txt (with props) branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt (with props) branches/cmake-bringup/drivers/serial/CMakeLists.txt (with props) branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt (with props) branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/nt4compat/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libpciidex.a (with props) Modified: branches/cmake-bringup/dll/CMakeLists.txt branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt Modified: branches/cmake-bringup/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,4 +1,4 @@ +add_subdirectory(directx) +add_subdirectory(ntdll) add_subdirectory(win32) -add_subdirectory(ntdll) - Added: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(ksuser) Propchange: branches/cmake-bringup/dll/directx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksuse… ============================================================================== --- branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,11 @@ + +spec2def(ksuser ${CMAKE_CURRENT_SOURCE_DIR}/ksuser.spec ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) + +add_library(ksuser SHARED ksuser.c ksuser.rc) + +set_module_type(ksuser win32dll) + +target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) + +add_importlibs(ksuser ntdll advapi32) +add_dependencies(ksuser ksuser_def psdk bugcodes) Propchange: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -4,9 +4,13 @@ add_subdirectory(bus) add_subdirectory(filesystems) add_subdirectory(input) +add_subdirectory(ksfilter) add_subdirectory(network) +add_subdirectory(parallel) +add_subdirectory(serial) add_subdirectory(setup) add_subdirectory(storage) +add_subdirectory(usb) add_subdirectory(video) add_subdirectory(wdm) add_subdirectory(wmi) Modified: branches/cmake-bringup/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -3,3 +3,5 @@ add_subdirectory(ext2) add_subdirectory(fastfat) #add_subdirectory(fastfat_new) +add_subdirectory(npfs) +add_subdirectory(ntfs) Added: branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,18 @@ + +list(APPEND SOURCE + create.c + finfo.c + fsctrl.c + npfs.c + rw.c + volume.c + npfs.rc) + +add_library(npfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/npfs_npfs.h.gch ${SOURCE}) + +set_target_properties(npfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(npfs ntoskrnl hal) + +add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) +add_dependencies(npfs psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,26 @@ + +list(APPEND SOURCE + attrib.c + blockdev.c + close.c + create.c + dirctl.c + dispatch.c + fastio.c + fcb.c + finfo.c + fsctl.c + mft.c + misc.c + ntfs.c + rw.c + volinfo.c + ntfs.rc) + +add_library(ntfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/ntfs_ntfs.h.gch ${SOURCE}) + +set_target_properties(ntfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(ntfs ntoskrnl hal) +add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE}) +add_dependencies(ntfs psdk bugcodes) Propchange: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(ks) Propchange: branches/cmake-bringup/drivers/ksfilter/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,38 @@ + +add_definitions(-DBUILDING_KS) +add_definitions(-D_COMDDK_) + +add_library(ks SHARED + api.c + allocators.c + bag.c + device.c + deviceinterface.c + driver.c + clocks.c + connectivity.c + event.c + filter.c + filterfactory.c + image.c + irp.c + methods.c + misc.c + pin.c + property.c + topology.c + unknown.c + worker.c + kcom.c + ks.rc) + +set_target_properties(ks PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +set_module_type(ks kernelmodedriver) + +target_link_libraries(ks + ${CMAKE_CURRENT_SOURCE_DIR}/ks.def + pseh) + +add_importlibs(ks ntoskrnl hal msvcrt) +add_dependencies(ks ks_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/ksfilter/ks/ks.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/ks.def (added) +++ branches/cmake-bringup/drivers/ksfilter/ks/ks.def [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,222 @@ +LIBRARY ks.dll + +EXPORTS + @??0CBaseUnknown@@QAE@ABU_GUID@@PAUIUnknown@@@Z@16=@CBaseUnknown_ConstructorWithGUID@16 @1 + @??0CBaseUnknown@@QAE@PAUIUnknown@@@Z@12=@CBaseUnknown_Constructor@12 @2 + @??1CBaseUnknown@@UAE@XZ@8=@CBaseUnknown_DefaultDestructor@8 @3 + @??_FCBaseUnknown@@QAEXXZ@12=@CBaseUnknown_Destructor@12 @4 + ?IndirectedAddRef@CBaseUnknown@@UAGKXZ@4=IIndirectedUnknown_fnAddRef@4 @5 + ?IndirectedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z@12=IIndirectedUnknown_fnQueryInterface@12 @6 + ?IndirectedRelease@CBaseUnknown@@UAGKXZ@4=IIndirectedUnknown_fnRelease@4 @7 + ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ@4=INonDelegatedUnknown_fnAddRef@4 @8 + ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z@12=INonDelegatedUnknown_fnQueryInterface@12 @9 + ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ@4=IIndirectedUnknown_fnRelease@4 @10 + DllInitialize@4 @11 + KoCreateInstance@20 @12 + KoDeviceInitialize@4 @13 + KoDriverInitialize@12 @14 + KoRelease@4 @15 + KsAcquireControl@4 @16 + KsAcquireDevice@4 @17 + KsAcquireDeviceSecurityLock@8 @18 + KsAcquireResetValue@8 @19 + KsAddDevice@8 @20 + KsAddEvent@8 @21 + KsAddIrpToCancelableQueue@20 @22 + KsAddItemToObjectBag@12 @23 + KsAddObjectCreateItemToDeviceHeader@20 @24 + KsAddObjectCreateItemToObjectHeader@20 @25 + KsAllocateDefaultClock@4 @26 + KsAllocateDefaultClockEx@28 @27 + KsAllocateDeviceHeader@12 @28 + KsAllocateExtraData@12 @29 + KsAllocateObjectBag@8 @30 + KsAllocateObjectCreateItem@16 @31 + KsAllocateObjectHeader@20 @32 + KsCacheMedium@12 @33 + KsCancelIo@8 @34 + KsCancelRoutine@8 @35 + KsCompletePendingRequest@4 @36 + KsCopyObjectBagItems@8 @37 + KsCreateAllocator@12 @38 + KsCreateBusEnumObject@24 @39 + KsCreateClock@12 @40 + KsCreateDefaultAllocator@4 @41 + KsCreateDefaultAllocatorEx@24 @42 + KsCreateDefaultClock@8 @43 + KsCreateDefaultSecurity@8 @44 + KsCreateDevice@20 @45 + KsCreateFilterFactory@32 @46 + KsCreatePin@16 @47 + KsCreateTopologyNode@16 @48 + KsDecrementCountedWorker@4 @49 + KsDefaultAddEventHandler@12 @50 + KsDefaultDeviceIoCompletion@8 @51 + KsDefaultDispatchPnp@8 @52 + KsDefaultDispatchPower@8 @53 + KsDefaultForwardIrp@8 @54 + KsDereferenceBusObject@4 @55 + KsDereferenceSoftwareBusObject@4 @56 + KsDeviceGetBusData@20 @57 + KsDeviceRegisterAdapterObject@16 @58 + KsDeviceSetBusData@20 @59 + KsDisableEvent@16 @60 + KsDiscardEvent@4 @61 + KsDispatchFastIoDeviceControlFailure@36 @62 + KsDispatchFastReadFailure@32 @63 + KsDispatchInvalidDeviceRequest@8 @64 + KsDispatchIrp@8 @65 + KsDispatchQuerySecurity@8 @66 + KsDispatchSetSecurity@8 @67 + KsDispatchSpecificMethod@8 @68 + KsDispatchSpecificProperty@8 @69 + _KsEdit@20 @70 + KsEnableEvent@24 @71 + KsEnableEventWithAllocator@32 @72 + KsFastMethodHandler@32 @73 + KsFastPropertyHandler@32 @74 + KsFilterAcquireProcessingMutex@4 @75 + KsFilterAddTopologyConnections@12 @76 + KsFilterAttemptProcessing@8 @77 + KsFilterCreateNode@12 @78 + KsFilterCreatePinFactory@12 @79 + KsFilterFactoryAddCreateItem@16 @80 + KsFilterFactoryGetSymbolicLink@4 @81 + KsFilterFactorySetDeviceClassesState@8 @82 + KsFilterFactoryUpdateCacheData@8 @83 + KsFilterGetAndGate@4 @84 + KsFilterGetChildPinCount@8 @85 + KsFilterGetFirstChildPin@8 @86 + KsFilterRegisterPowerCallbacks@12 @87 + KsFilterReleaseProcessingMutex@4 @88 + KsForwardAndCatchIrp@16 @89 + KsForwardIrp@12 @90 + KsFreeDefaultClock@4 @91 + KsFreeDeviceHeader@4 @92 + KsFreeEventList@16 @93 + KsFreeObjectBag@4 @94 + KsFreeObjectCreateItem@8 @95 + KsFreeObjectCreateItemsByContext@8 @96 + KsFreeObjectHeader@4 @97 + KsGenerateDataEvent@12 @98 + KsGenerateEvent@4 @99 + KsGenerateEventList@20 @100 + KsGenerateEvents@28 @101 + KsGetBusEnumIdentifier@4 @102 + KsGetBusEnumParentFDOFromChildPDO@8 @103 + KsGetBusEnumPnpDeviceObject@8 @104 + KsGetDefaultClockState@4 @105 + KsGetDefaultClockTime@4 @106 + KsGetDevice@4 @107 + KsGetDeviceForDeviceObject@4 @108 + KsGetFilterFromIrp@4 @109 + KsGetFirstChild@4 @110 + KsGetImageNameAndResourceId@16 @111 + KsGetNextSibling@4 @112 + KsGetNodeIdFromIrp@4 @113 + KsGetObjectFromFileObject@4 @114 + KsGetObjectTypeFromFileObject@4 @115 + KsGetObjectTypeFromIrp@4 @116 + KsGetOuterUnknown@4 @117 + KsGetParent@4 @118 + KsGetPinFromIrp@4 @119 + KsHandleSizedListQuery@16 @120 + KsIncrementCountedWorker@4 @121 + KsInitializeDevice@16 @122 + KsInitializeDriver@12 @123 + KsInstallBusEnumInterface@4 @124 + KsIsBusEnumChildDevice@8 @125 + KsLoadResource@24 @126 + KsMapModuleName@20 @127 + KsMergeAutomationTables@16 @128 + KsMethodHandler@12 @129 + KsMethodHandlerWithAllocator@20 @130 + KsMoveIrpsOnCancelableQueue@28 @131 + KsNullDriverUnload@4 @132 + KsPinAcquireProcessingMutex@4 @133 + KsPinAttachAndGate@8 @134 + KsPinAttachOrGate@8 @135 + KsPinAttemptProcessing@8 @136 + KsPinDataIntersection@24 @137 + KsPinGetAndGate@4 @138 + KsPinGetAvailableByteCount@12 @139 + KsPinGetConnectedFilterInterface@12 @140 + KsPinGetConnectedPinDeviceObject@4 @141 + KsPinGetConnectedPinFileObject@4 @142 + KsPinGetConnectedPinInterface@12 @143 + KsPinGetCopyRelationships@12 @144 + KsPinGetFirstCloneStreamPointer@4 @145 + KsPinGetLeadingEdgeStreamPointer@8 @146 + KsPinGetNextSiblingPin@4 @147 + KsPinGetParentFilter@4 @148 + KsPinGetReferenceClockInterface@8 @149 + KsPinGetTrailingEdgeStreamPointer@8 @150 + KsPinPropertyHandler@20 @151 + KsPinRegisterFrameReturnCallback@8 @152 + KsPinRegisterHandshakeCallback@8 @153 + KsPinRegisterIrpCompletionCallback@8 @154 + KsPinRegisterPowerCallbacks@12 @155 + KsPinReleaseProcessingMutex@4 @156 + KsPinSetPinClockTime@12 @157 + KsPinSubmitFrame@20 @158 + KsPinSubmitFrameMdl@16 @159 + KsProbeStreamIrp@12 @160 + KsProcessPinUpdate@4 @161 + KsPropertyHandler@12 @162 + KsPropertyHandlerWithAllocator@20 @163 + KsQueryDevicePnpObject@4 @164 + KsQueryInformationFile@16 @165 + KsQueryObjectAccessMask@4 @166 + KsQueryObjectCreateItem@4 @167 + KsQueueWorkItem@8 @168 + KsReadFile@32 @169 + KsRecalculateStackDepth@8 @170 + KsReferenceBusObject@4 @171 + KsReferenceSoftwareBusObject@4 @172 + KsRegisterAggregatedClientUnknown@8 @173 + KsRegisterCountedWorker@12 @174 + KsRegisterFilterWithNoKSPins@24 @175 + KsRegisterWorker@8 @176 + KsReleaseControl@4 @177 + KsReleaseDevice@4 @178 + KsReleaseDeviceSecurityLock@4 @179 + KsReleaseIrpOnCancelableQueue@8 @180 + KsRemoveBusEnumInterface@4 @181 + KsRemoveIrpFromCancelableQueue@16 @182 + KsRemoveItemFromObjectBag@12 @183 + KsRemoveSpecificIrpFromCancelableQueue@4 @184 + KsServiceBusEnumCreateRequest@8 @185 + KsServiceBusEnumPnpRequest@8 @186 + KsSetDefaultClockState@8 @187 + KsSetDefaultClockTime@12 @188 + KsSetDevicePnpAndBaseObject@12 @189 + KsSetInformationFile@16 @190 + KsSetMajorFunctionHandler@8 @191 + KsSetPowerDispatch@12 @192 + KsSetTargetDeviceObject@8 @193 + KsSetTargetState@8 @194 + KsStreamIo@44 @195 + KsStreamPointerAdvance@4 @196 + KsStreamPointerAdvanceOffsets@16 @197 + KsStreamPointerAdvanceOffsetsAndUnlock@16 @198 + KsStreamPointerCancelTimeout@4 @199 + KsStreamPointerClone@16 @200 + KsStreamPointerDelete@4 @201 + KsStreamPointerGetIrp@12 @202 + KsStreamPointerGetMdl@4 @203 + KsStreamPointerGetNextClone@4 @204 + KsStreamPointerLock@4 @205 + KsStreamPointerScheduleTimeout@16 @206 + KsStreamPointerSetStatusCode@8 @207 + KsStreamPointerUnlock@8 @208 + KsSynchronousIoControlDevice@32 @209 + KsTerminateDevice@4 @210 + KsTopologyPropertyHandler@16 @211 + KsUnregisterWorker@4 @212 + KsUnserializeObjectPropertiesFromRegistry@12 @213 + KsValidateAllocatorCreateRequest@8 @214 + KsValidateAllocatorFramingEx@12 @215 + KsValidateClockCreateRequest@8 @216 + KsValidateConnectRequest@16 @217 + KsValidateTopologyNodeCreateRequest@12 @218 + KsWriteFile@32 @219 Propchange: branches/cmake-bringup/drivers/ksfilter/ks/ks.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/parallel/… ============================================================================== --- branches/cmake-bringup/drivers/parallel/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/parallel/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(parallel) Propchange: branches/cmake-bringup/drivers/parallel/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/parallel/… ============================================================================== --- branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,7 @@ + +add_library(parallel SHARED parallel.c parallel.rc) + +set_target_properties(parallel PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(parallel ntoskrnl hal) +add_dependencies(parallel psdk bugcodes) Propchange: branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/serial/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/CM… ============================================================================== --- branches/cmake-bringup/drivers/serial/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/serial/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(serenum) +add_subdirectory(serial) Propchange: branches/cmake-bringup/drivers/serial/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/se… ============================================================================== --- branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,13 @@ + +add_library(serenum SHARED + detect.c + fdo.c + misc.c + pdo.c + serenum.c + serenum.rc) + +set_target_properties(serenum PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(serenum ntoskrnl hal) +add_dependencies(serenum psdk bugcodes) Propchange: branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/se… ============================================================================== --- branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,20 @@ + +add_library(serial SHARED + circularbuffer.c + cleanup.c + close.c + create.c + devctrl.c + info.c + legacy.c + misc.c + pnp.c + power.c + rw.c + serial.c + serial.rc) + +set_target_properties(serial PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(serial ntoskrnl hal) +add_dependencies(serial psdk bugcodes) Propchange: branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,3 +1,5 @@ add_subdirectory(atapi) +add_subdirectory(pciide) +add_subdirectory(pciidex) add_subdirectory(uniata) Added: branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,7 @@ + +add_library(pciide SHARED pciide.c pciide.rc) + +set_target_properties(pciide PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(pciide pciidex ntoskrnl) +add_dependencies(pciide psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,18 @@ + +spec2def(pciidex ${CMAKE_CURRENT_SOURCE_DIR}/pciidex.spec ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) + +add_library(pciidex SHARED + fdo.c + miniport.c + misc.c + pciidex.c + pdo.c + pciidex.rc) + +set_target_properties(pciidex PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pciidex + ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) + +add_importlibs(pciidex ntoskrnl) +add_dependencies(pciidex pciidex_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/CMake… ============================================================================== --- branches/cmake-bringup/drivers/usb/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(nt4compat) +add_subdirectory(usbd) Propchange: branches/cmake-bringup/drivers/usb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/nt4compat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/nt4co… ============================================================================== --- branches/cmake-bringup/drivers/usb/nt4compat/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/nt4compat/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(usbdriver) Propchange: branches/cmake-bringup/drivers/usb/nt4compat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/nt4co… ============================================================================== --- branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,33 @@ + +add_definitions(-DINCLUDE_EHCI) +add_definitions(-D_MULTI_UHCI) +add_definitions(-D_MULTI_EHCI) +add_definitions(-D_X86) + +list(APPEND SOURCE + ehci.c + ohci.c + uhci.c + roothub.c + hub.c + td.c + usb.c + umss.c + bulkonly.c + cbi.c + devmgr.c + dmgrdisp.c + compdrv.c + etd.c + gendrv.c + mouse.c + keyboard.c + usbdriver.rc) + +add_library(usbdriver SHARED ${CMAKE_CURRENT_BINARY_DIR}/usbdriver_usbdriver.h.gch ${SOURCE}) + +set_target_properties(usbdriver PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(usbdriver ntoskrnl hal) +add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) +add_dependencies(usbdriver psdk bugcodes) Propchange: branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbd/… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,12 @@ + +spec2def(usbd ${CMAKE_CURRENT_SOURCE_DIR}/usbd.spec ${CMAKE_CURRENT_BINARY_DIR}/usbd.def) + +add_library(usbd SHARED usbd.c usbd.rc) + +set_target_properties(usbd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(usbd + ${CMAKE_CURRENT_BINARY_DIR}/usbd.def) + +add_importlibs(usbd ntoskrnl hal) +add_dependencies(usbd usbd_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/video/displays/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,2 +1,4 @@ +add_subdirectory(framebuf) +add_subdirectory(framebuf_new) add_subdirectory(vga) Added: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,18 @@ + +spec2def(framebuf ${CMAKE_CURRENT_SOURCE_DIR}/framebuf.spec ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) + +add_library(framebuf SHARED + enable.c + palette.c + pointer.c + screen.c + surface.c + framebuf.rc) + +set_target_properties(framebuf PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") + +target_link_libraries(framebuf + ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) + +add_importlibs(framebuf win32k) +add_dependencies(framebuf framebuf_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,29 @@ + +spec2def(framebuf_new ${CMAKE_CURRENT_SOURCE_DIR}/framebuf_new.spec ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) + +list(APPEND SOURCE + debug.c + enable.c + palette.c + pointer.c + screen.c + framebuf_new.rc) + +add_library(framebuf_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new_driver.h.gch ${SOURCE}) + +if(ARCH MATCHES i386) + if(MSVC) + else() + set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") + endif() +endif() + +set_target_properties(framebuf_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") + +target_link_libraries(framebuf_new + ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def + libcntpr) + +add_importlibs(framebuf_new win32k) +add_pch(framebuf_new ${CMAKE_CURRENT_SOURCE_DIR}/driver.h ${SOURCE}) +add_dependencies(framebuf_new framebuf_new_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,2 +1,3 @@ add_subdirectory(audio_test) +add_subdirectory(portcls) Added: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Fri Oct 1 00:15:10 2010 @@ -1,0 +1,65 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(portcls ${CMAKE_CURRENT_SOURCE_DIR}/portcls.spec ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) + +add_library(portcls SHARED + adapter.cpp + api.cpp + connection.cpp + dispatcher.cpp + dll.cpp + dma_slave.cpp + drm.cpp + drm_port.cpp + filter_topology.cpp + filter_dmus.cpp + filter_wavecyclic.cpp + filter_wavepci.cpp + filter_wavert.cpp + guids.cpp + interrupt.cpp + irp.cpp + irpstream.cpp + miniport.cpp + miniport_dmus.cpp + miniport_fmsynth.cpp + pin_dmus.cpp + pin_wavecyclic.cpp + pin_wavepci.cpp + pin_wavert.cpp + pool.cpp + port.cpp + port_dmus.cpp + port_topology.cpp + port_wavecyclic.cpp + port_wavepci.cpp + port_wavert.cpp + port_wavertstream.cpp + power.cpp + propertyhandler.cpp + purecall.cpp + registry.cpp + resource.cpp + service_group.cpp + undoc.cpp + unregister.cpp + version.cpp + portcls.rc) + +target_link_libraries(portcls + ${CMAKE_CURRENT_BINARY_DIR}/portcls.def + libcntpr + pseh) + +if(MSVC) + set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-") +else() + set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif(MSVC) + +set_target_properties(portcls PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) +add_dependencies(portcls portcls_def psdk bugcodes) Propchange: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libpciidex.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libpci… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libpciidex.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010