Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49370: [CMAKE] Fix a typo
by tkreuzer＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: tkreuzer Date: Sun Oct 31 09:16:35 2010 New Revision: 49370 URL: http://svn.reactos.org/svn/reactos?rev=49370&view=rev Log: [CMAKE] Fix a typo Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt 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] Sun Oct 31 09:16:35 2010 @@ -36,7 +36,7 @@ uuid) if(MSVC) - set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") + set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif(MSVC) add_importlibs(riched20

1 0

[pschweitzer] 49369: [DISK] Implemented support for IOCTL_DISK_GET_LENGTH_INFO
by pschweitzer＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: pschweitzer Date: Sun Oct 31 08:13:33 2010 New Revision: 49369 URL: http://svn.reactos.org/svn/reactos?rev=49369&view=rev Log: [DISK] Implemented support for IOCTL_DISK_GET_LENGTH_INFO Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sun Oct 31 08:13:33 2010 @@ -2808,6 +2808,53 @@ // Fall through and let the class driver process the request. // + case IOCTL_DISK_GET_LENGTH_INFO: + + // + // Validate buffer length. + // + + if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(GET_LENGTH_INFORMATION)) { + status = STATUS_BUFFER_TOO_SMALL; + + } else { + + PGET_LENGTH_INFORMATION lengthInformation = Irp->AssociatedIrp.SystemBuffer; + + // + // Update the geometry in case it has changed. + // + + status = UpdateRemovableGeometry (DeviceObject, Irp); + + if (!NT_SUCCESS(status)) { + + // + // Note the drive is not ready. + // + + diskData->DriveNotReady = TRUE; + break; + } + + // + // Note the drive is now ready. + // + + diskData->DriveNotReady = FALSE; + + // + // Output data, and return + // + + lengthInformation->Length.QuadPart = deviceExtension->PartitionLength.QuadPart; + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(GET_LENGTH_INFORMATION); + } + + break; + default: //

1 0

[janderwald] 49368: [PORTCLS] - Revert 49356 - This change breaks portcls on WinXP
by janderwald＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: janderwald Date: Sat Oct 30 23:17:34 2010 New Revision: 49368 URL: http://svn.reactos.org/svn/reactos?rev=49368&view=rev Log: [PORTCLS] - Revert 49356 - This change breaks portcls on WinXP Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Oct 30 23:17:34 2010 @@ -293,7 +293,7 @@ { PKSSTREAM_HEADER StreamHeader; ULONG Size, NumData, Index; - PMDL CurMdl, NextMdl; + //PMDL CurMdl, NextMdl; if (!m_Irp) { @@ -385,7 +385,7 @@ // done return; } - +#if 0 // now free allocated mdls CurMdl = m_Irp->MdlAddress; for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) @@ -418,6 +418,7 @@ // is this really needed? m_Irp->AssociatedIrp.SystemBuffer = NULL; +#endif // store operation status m_Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[akhaldi] 49367: [CMAKE] - "cmake gracefully handles def files as source files" You mean it gracefully ignores them, right ? - Fix the kernel and class2 exports. More to come. - Fix imaadp32.acm
by akhaldi＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: akhaldi Date: Sat Oct 30 22:03:40 2010 New Revision: 49367 URL: http://svn.reactos.org/svn/reactos?rev=49367&view=rev Log: [CMAKE] - "cmake gracefully handles def files as source files" You mean it gracefully ignores them, right ? - Fix the kernel and class2 exports. More to come. - Fix imaadp32.acm Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -6,14 +6,14 @@ spec2def(imaadp32.acm imaadp32.acm.spec) -add_library(imaadp32 SHARED imaadp32.c +add_library(imaadp32.acm SHARED imaadp32.c ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def) -set_entrypoint(imaadp32 0) -set_target_properties(imaadp32 PROPERTIES SUFFIX "acm") +set_entrypoint(imaadp32.acm 0) +set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm") -target_link_libraries(imaadp32 wine) +target_link_libraries(imaadp32.acm wine) -add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll) -add_dependencies(imaadp32 psdk buildno_header) -add_cab_target(imaadp32 1) +add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(imaadp32.acm psdk buildno_header) +add_cab_target(imaadp32.acm 1) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -5,12 +5,12 @@ spec2def(class2.sys class2.spec) -add_library(class2 SHARED class2.c class2.rc - ${CMAKE_CURRENT_BINARY_DIR}/class2.def) +add_library(class2 SHARED class2.c class2.rc) set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(class2 + ${CMAKE_CURRENT_BINARY_DIR}/class2.def -lscsiport -lntoskrnl -lhal) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -241,8 +241,7 @@ vf/driver.c wmi/wmi.c ntoskrnl.rc - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S - ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def) + ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -405,6 +404,7 @@ set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native") target_link_libraries(ntoskrnl + ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def cportlib csq -lhal

1 0

[ekohl] 49366: Merge ScmControlService() and ScmSendStartCommand() into ScmSendServiceCommand().
by ekohl＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: ekohl Date: Sat Oct 30 19:25:23 2010 New Revision: 49366 URL: http://svn.reactos.org/svn/reactos?rev=49366&view=rev Log: Merge ScmControlService() and ScmSendStartCommand() into ScmSendServiceCommand(). Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Oct 30 19:25:23 2010 @@ -678,66 +678,10 @@ DWORD -ScmControlService(PSERVICE Service, - DWORD dwControl) -{ - PSCM_CONTROL_PACKET ControlPacket; - SCM_REPLY_PACKET ReplyPacket; - - DWORD dwWriteCount = 0; - DWORD dwReadCount = 0; - DWORD TotalLength; - DWORD dwError = ERROR_SUCCESS; - - DPRINT("ScmControlService() called\n"); - - TotalLength = wcslen(Service->lpServiceName) + 1; - - ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); - if (ControlPacket == NULL) - return ERROR_NOT_ENOUGH_MEMORY; - - ControlPacket->dwControl = dwControl; - ControlPacket->dwSize = TotalLength; - ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; - wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); - - /* Send the control packet */ - WriteFile(Service->ControlPipeHandle, - ControlPacket, - sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)), - &dwWriteCount, - NULL); - - /* Read the reply */ - ReadFile(Service->ControlPipeHandle, - &ReplyPacket, - sizeof(SCM_REPLY_PACKET), - &dwReadCount, - NULL); - - /* Release the contol packet */ - HeapFree(GetProcessHeap(), - 0, - ControlPacket); - - if (dwReadCount == sizeof(SCM_REPLY_PACKET)) - { - dwError = ReplyPacket.dwError; - } - - DPRINT("ScmControlService() done\n"); - - return dwError; -} - - -static DWORD -ScmSendStartCommand(PSERVICE Service, - DWORD argc, - LPWSTR *argv) +ScmSendServiceCommand(PSERVICE Service, + DWORD dwControl, + DWORD argc, + LPWSTR *argv) { PSCM_CONTROL_PACKET ControlPacket; SCM_REPLY_PACKET ReplyPacket; @@ -750,7 +694,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD i; - DPRINT("ScmSendStartCommand() called\n"); + DPRINT("ScmSendServiceCommand() called\n"); /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1; @@ -774,7 +718,7 @@ if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; - ControlPacket->dwControl = SERVICE_CONTROL_START; + ControlPacket->dwControl = dwControl; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; ControlPacket->dwSize = TotalLength; Ptr = &ControlPacket->szArguments[0]; @@ -819,7 +763,7 @@ dwError = ReplyPacket.dwError; } - DPRINT("ScmSendStartCommand() done\n"); + DPRINT("ScmSendServiceCommand() done\n"); return dwError; } @@ -998,7 +942,10 @@ DPRINT("Received service process ID %lu\n", dwProcessId); /* Send start command */ - dwError = ScmSendStartCommand(Service, argc, argv); + dwError = ScmSendServiceCommand(Service, + SERVICE_CONTROL_START, + argc, + argv); } } else @@ -1227,7 +1174,10 @@ CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) { /* shutdown service */ - ScmControlService(CurrentService, SERVICE_CONTROL_STOP); + ScmSendServiceCommand(CurrentService, + SERVICE_CONTROL_STOP, + 0, + NULL); } ServiceEntry = ServiceEntry->Flink; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Oct 30 19:25:23 2010 @@ -699,8 +699,10 @@ } /* Send control code to the service */ - dwError = ScmControlService(lpService, - dwControl); + dwError = ScmSendServiceCommand(lpService, + dwControl, + 0, + NULL); /* Return service status information */ RtlCopyMemory(lpServiceStatus, @@ -2864,7 +2866,10 @@ } /* Start the service */ - dwError = ScmStartService(lpService, argc, (LPWSTR *)argv); + dwError = ScmSendServiceCommand(lpService, + SERVICE_CONTROL_START, + argc, + (LPWSTR *)argv); return dwError; } @@ -4072,7 +4077,10 @@ /* FIXME: Convert argument vector to Unicode */ /* Start the service */ - dwError = ScmStartService(lpService, 0, NULL); + dwError = ScmSendServiceCommand(lpService, + SERVICE_CONTROL_START, + 0, + NULL); /* FIXME: Free argument vector */ Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sat Oct 30 19:25:23 2010 @@ -104,9 +104,10 @@ VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); VOID ScmAutoShutdownServices(VOID); -DWORD ScmStartService(PSERVICE Service, - DWORD argc, - LPWSTR *argv); +DWORD ScmSendServiceCommand(PSERVICE Service, + DWORD dwControl, + DWORD argc, + LPWSTR *argv); PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); @@ -115,9 +116,6 @@ PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); - -DWORD ScmControlService(PSERVICE Service, - DWORD dwControl); BOOL ScmLockDatabaseExclusive(VOID); BOOL ScmLockDatabaseShared(VOID);

1 0

[akhaldi] 49365: [CMAKE] - Fix mshtml.tlb
by akhaldi＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: akhaldi Date: Sat Oct 30 17:45:01 2010 New Revision: 49365 URL: http://svn.reactos.org/svn/reactos?rev=49365&view=rev Log: [CMAKE] - Fix mshtml.tlb Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:45:01 2010 @@ -8,10 +8,11 @@ spec2def(mshtml.tlb mshtml.tlb.spec) -add_library(mshtml.tlb SHARED rsrc.rc - mshtml.def) +add_library(mshtml.tlb SHARED + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") - +add_dependencies(mshtml.tlb mshtml_tlb) add_cab_target(mshtml.tlb 1)

1 0

[cgutman] 49364: [REGEDIT] - Fix a bug causing registry entries with names containing a backslash to be displayed incorrectly
by cgutman＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: cgutman Date: Sat Oct 30 17:41:51 2010 New Revision: 49364 URL: http://svn.reactos.org/svn/reactos?rev=49364&view=rev Log: [REGEDIT] - Fix a bug causing registry entries with names containing a backslash to be displayed incorrectly Modified: trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Sat Oct 30 17:41:51 2010 @@ -556,18 +556,12 @@ /* } */ /* dwValSize = max_val_size; */ while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) { - /* Remove unwanted path from key name */ - TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\')); - if (pLastBl != NULL) - ++pLastBl; - else - pLastBl = ValName; /* Add a terminating 0 character. Usually this is only necessary for strings. */ ValBuf[dwValSize] = 0; #ifdef UNICODE ValBuf[dwValSize + 1] = 0; #endif - AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE); + AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1, TRUE); dwValNameLen = max_val_name_len; dwValSize = max_val_size; dwValType = 0L;

1 0

[spetreolle] 49363: [CMAKE] Leftover from 49358.
by spetreolle＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: spetreolle Date: Sat Oct 30 17:37:44 2010 New Revision: 49363 URL: http://svn.reactos.org/svn/reactos?rev=49363&view=rev Log: [CMAKE] Leftover from 49358. Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:37:44 2010 @@ -9,7 +9,7 @@ spec2def(mshtml.tlb mshtml.tlb.spec) add_library(mshtml.tlb SHARED rsrc.rc - ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.def) + mshtml.def) set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "")

1 0

[jgardou] 49362: [CMAKE] - leftover from r49358
by jgardou＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: jgardou Date: Sat Oct 30 17:05:21 2010 New Revision: 49362 URL: http://svn.reactos.org/svn/reactos?rev=49362&view=rev Log: [CMAKE] - leftover from r49358 Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -36,7 +36,8 @@ objects/text.c objects/utils.c objects/path.c - gdi32.rc) + gdi32.rc + gdi32.def) add_library(gdi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch @@ -45,7 +46,6 @@ set_module_type(gdi32 win32dll) target_link_libraries(gdi32 - ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.def win32ksys dxguid pseh) Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(hhctrl ${CMAKE_CURRENT_SOURCE_DIR}/hhctrl.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) +spec2def(hhctrl.ocx hhctrl.ocx.spec) add_library(hhctrl SHARED chm.c @@ -14,12 +14,12 @@ search.c stream.c webbrowser.c - hhctrl.rc) + hhctrl.rc + ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) set_module_type(hhctrl win32ocx) target_link_libraries(hhctrl - ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def uuid wine) Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -4,22 +4,16 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/imaadp32.acm.spec --filename imaadp32.acm - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def PROPERTIES GENERATED TRUE) -add_custom_target(imaadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def) +spec2def(imaadp32.acm imaadp32.acm.spec) -add_library(imaadp32.acm SHARED imaadp32.c) +add_library(imaadp32 SHARED imaadp32.c + ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def) -set_entrypoint(imaadp32.acm 0) -set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") +set_entrypoint(imaadp32 0) +set_target_properties(imaadp32 PROPERTIES SUFFIX "acm") -target_link_libraries(imaadp32.acm - ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def - wine) +target_link_libraries(imaadp32 wine) -add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) -add_dependencies(imaadp32.acm psdk buildno_header) -add_cab_target(imaadp32.acm 1) +add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll) +add_dependencies(imaadp32 psdk buildno_header) +add_cab_target(imaadp32 1) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -93,7 +93,8 @@ thread/thread.c thread/tls.c kernel32.rc - kernel32_stubs.c) + kernel32_stubs.c + ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -111,8 +112,7 @@ set_module_type(kernel32 win32dll) -target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def - pseh) +target_link_libraries(kernel32 pseh) add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -3,21 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.drv.spec --filename msacm32.drv - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def PROPERTIES GENERATED TRUE) -add_custom_target(msacm32.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def) +spec2def(msacm32.drv msacm32.drv.spec) -add_library(msacm32.drv SHARED wavemap.c wavemap.rc) +add_library(msacm32.drv SHARED wavemap.c wavemap.rc + ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) set_entrypoint(msacm32.drv 0) set_target_properties(msacm32.drv PROPERTIES SUFFIX "") -target_link_libraries(msacm32.drv - ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def - wine) +target_link_libraries(msacm32.drv wine) add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) add_dependencies(msacm32.drv psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -4,21 +4,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msadp32.acm.spec --filename msadp32.acm - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def PROPERTIES GENERATED TRUE) -add_custom_target(msadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def) +spec2def(msadp32.acm msadp32.acm.spec) -add_library(msadp32.acm SHARED msadp32.c) +add_library(msadp32.acm SHARED msadp32.c + ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def) set_entrypoint(msadp32.acm 0) set_target_properties(msadp32.acm PROPERTIES SUFFIX "") -target_link_libraries(msadp32.acm - ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def - wine) +target_link_libraries(msadp32.acm wine) add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msadp32.acm psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… ============================================================================== --- branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -4,21 +4,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msg711.acm.spec --filename msg711.acm - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def PROPERTIES GENERATED TRUE) -add_custom_target(msg711.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def) +spec2def(msg711.acm msg711.acm.spec) -add_library(msg711.acm SHARED msg711.c) +add_library(msg711.acm SHARED msg711.c + ${CMAKE_CURRENT_BINARY_DIR}/msg711.def) set_entrypoint(msg711.acm 0) set_target_properties(msg711.acm PROPERTIES SUFFIX "") -target_link_libraries(msg711.acm - ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def - wine) +target_link_libraries(msg711.acm wine) add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msg711.acm psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -4,21 +4,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msgsm32.acm.spec --filename msgsm32.acm - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def PROPERTIES GENERATED TRUE) -add_custom_target(msgsm32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def) +spec2def(msgsm32.acm msgsm32.acm.spec) -add_library(msgsm32.acm SHARED msgsm32.c) +add_library(msgsm32.acm SHARED msgsm32.c + ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def) set_entrypoint(msgsm32.acm 0) set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") -target_link_libraries(msgsm32.acm - ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def - wine) +target_link_libraries(msgsm32.acm wine) add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msgsm32.acm psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -6,19 +6,12 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.tlb.spec --filename mshtml.tlb - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def PROPERTIES GENERATED TRUE) -add_custom_target(mshtml.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) +spec2def(mshtml.tlb mshtml.tlb.spec) -add_library(mshtml.tlb SHARED rsrc.rc) +add_library(mshtml.tlb SHARED rsrc.rc + ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.def) set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") - - -add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def) add_cab_target(mshtml.tlb 1) Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -2,14 +2,14 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msisys ${CMAKE_CURRENT_SOURCE_DIR}/msisys.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) +spec2def(msisys.ocx msisys.ocx.spec) -add_library(msisys SHARED msisys.c) +add_library(msisys SHARED msisys.c + ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) set_module_type(msisys win32ocx) target_link_libraries(msisys - ${CMAKE_CURRENT_BINARY_DIR}/msisys.def uuid wine) Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -5,19 +5,15 @@ ADD_TYPELIB(std_ole_v2 std_ole_v2.idl) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole2.tlb.spec --filename stdole2.tlb - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def PROPERTIES GENERATED TRUE) -add_custom_target(stdole2.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) +spec2def(stdole2.tlb stdole2.tlb.spec) -add_library(stdole2.tlb SHARED rsrc.rc) +add_library(stdole2.tlb SHARED rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") -add_dependencies(stdole2.tlb std_ole_v2 stdole2.tlb_def) +add_dependencies(stdole2.tlb std_ole_v2) add_cab_target(stdole2.tlb 1) Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -5,19 +5,13 @@ ADD_TYPELIB(std_ole_v1 std_ole_v1.idl) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole32.tlb.spec --filename stdole32.tlb - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def PROPERTIES GENERATED TRUE) -add_custom_target(stdole32.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) +spec2def(stdole32.tlb stdole32.tlb.spec) -add_library(stdole32.tlb SHARED rsrc.rc) +add_library(stdole32.tlb SHARED rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) set_entrypoint(stdole32.tlb 0) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") - - -add_dependencies(stdole32.tlb std_ole_v1 stdole32.tlb_def) +add_dependencies(stdole32.tlb std_ole_v1) add_cab_target(stdole32.tlb 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] Sat Oct 30 17:05:21 2010 @@ -63,7 +63,8 @@ windows/window.c windows/winpos.c user32_stubs.c - user32.rc) + user32.rc + ${CMAKE_CURRENT_SOURCE_DIR}/user32.def) add_library(user32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch @@ -72,7 +73,6 @@ set_module_type(user32 win32dll) target_link_libraries(user32 - ${CMAKE_CURRENT_SOURCE_DIR}/user32.def wine win32ksys pseh) Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -9,25 +9,20 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv - DEPENDS native-winebuild) - -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE) -add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def) +spec2def(wdmaud.drv wdmaud.spec) add_library(wdmaud.drv SHARED wdmaud.c mixer.c mmixer.c legacy.c - wdmaud.rc) + wdmaud.rc + ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) set_module_type(wdmaud.drv win32dll) set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") target_link_libraries(wdmaud.drv - ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def mmebuddy libsamplerate mmixer) Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3… ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -5,20 +5,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/winemp3.acm.spec --filename winemp3.acm - DEPENDS native-winebuild) -set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def PROPERTIES GENERATED TRUE) -add_custom_target(winemp3.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def) +spec2def(winemp3.acm winemp3.acm.spec) -add_library(winemp3.acm SHARED mpegl3.c) +add_library(winemp3.acm SHARED mpegl3.c + ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def) set_entrypoint(winemp3.acm 0) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm - ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def mingw_common wine libmpg123) Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -4,7 +4,7 @@ include_directories(inc) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) -spec2def(ws2_32_new ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def) +spec2def(ws2_32_new.dll ws2_32.spec) add_library(ws2_32_new SHARED src/addrconv.c @@ -43,13 +43,12 @@ src/sputil.c src/startup.c src/wsautil.c - ws2_32.rc) + ws2_32.rc + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) set_module_type(ws2_32_new win32dll) -target_link_libraries(ws2_32_new - ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def - wine) +target_link_libraries(ws2_32_new wine) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -5,7 +5,7 @@ add_definitions(-DNDIS40) add_definitions(-D_NTDRIVER_) -spec2def(tdi ${CMAKE_CURRENT_SOURCE_DIR}/misc/tdi.spec ${CMAKE_CURRENT_BINARY_DIR}/tdi.def) +spec2def(tdi.sys misc/tdi.spec) list(APPEND SOURCE cte/string.c @@ -15,14 +15,14 @@ tdi/dereg.c tdi/handler.c tdi/obsolete.c - tdi/stubs.c) + tdi/stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/tdi.def) add_library(tdi SHARED ${SOURCE}) set_module_type(tdi kernelmodedriver) target_link_libraries(tdi - ${CMAKE_CURRENT_BINARY_DIR}/tdi.def -lntoskrnl -lhal) Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Oct 30 17:05:21 2010 @@ -26,13 +26,13 @@ utils.c xferpkt.c class.rc + ${CMAKE_CURRENT_BINARY_DIR}/class.def ) -spec2def(classpnp ${CMAKE_CURRENT_SOURCE_DIR}/class.spec ${CMAKE_CURRENT_BINARY_DIR}/class.def) +spec2def(classpnp.sys class.spec) add_library(classpnp SHARED ${SOURCE}) -target_link_libraries(classpnp ${CMAKE_CURRENT_BINARY_DIR}/class.def pseh libcntpr) - +target_link_libraries(classpnp pseh libcntpr) set_module_type(classpnp kernelmodedriver)

1 0

[spetreolle] 49361: [CMAKE] Add boot drivers to reactos.cab.
by spetreolle＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: spetreolle Date: Sat Oct 30 16:44:31 2010 New Revision: 49361 URL: http://svn.reactos.org/svn/reactos?rev=49361&view=rev Log: [CMAKE] Add boot drivers to reactos.cab. Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… ============================================================================== --- branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] Sat Oct 30 16:44:31 2010 @@ -11,4 +11,4 @@ add_dependencies(nmidebug psdk bugcodes) add_minicd_target(nmidebug reactos) -add_livecd_target(nmidebug reactos/system32/drivers) +add_cab_target(nmidebug 2) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] Sat Oct 30 16:44:31 2010 @@ -11,3 +11,4 @@ add_importlibs(serenum ntoskrnl hal) add_dependencies(serenum psdk bugcodes) +add_cab_target(serenum 2) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] Sat Oct 30 16:44:31 2010 @@ -18,3 +18,4 @@ add_importlibs(serial ntoskrnl hal) add_dependencies(serial psdk bugcodes) +add_cab_target(serial 2) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] Sat Oct 30 16:44:31 2010 @@ -5,3 +5,4 @@ add_importlibs(pciide pciidex ntoskrnl) add_dependencies(pciide psdk bugcodes) +add_cab_target(pciide 2) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Sat Oct 30 16:44:31 2010 @@ -14,3 +14,4 @@ add_importlibs(pciidex ntoskrnl) add_dependencies(pciidex psdk bugcodes) +add_cab_target(pciidex 2)

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