Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50542: [KS] - Less spam, more information
by janderwald＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: janderwald Date: Fri Jan 28 19:45:49 2011 New Revision: 50542 URL: http://svn.reactos.org/svn/reactos?rev=50542&view=rev Log: [KS] - Less spam, more information Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Jan 28 19:45:49 2011 @@ -1643,7 +1643,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); // HACK for ms portcls if (IoStack->MajorFunction == IRP_MJ_CREATE)

1 0

[tkreuzer] 50541: [PSDK] Fix inline definition of STRSAFEAPI for MSVC
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 19:41:28 2011 New Revision: 50541 URL: http://svn.reactos.org/svn/reactos?rev=50541&view=rev Log: [PSDK] Fix inline definition of STRSAFEAPI for MSVC Modified: branches/cmake-bringup/include/psdk/strsafe.h Modified: branches/cmake-bringup/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/strs… ============================================================================== --- branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] Fri Jan 28 19:41:28 2011 @@ -239,7 +239,11 @@ #else // !STRSAFE_LIB /* Create inlined versions */ +#ifdef __GNUC__ #define STRSAFEAPI HRESULT static __inline__ +#else +#define STRSAFEAPI HRESULT __inline +#endif #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) @@ -497,7 +501,7 @@ if (SUCCEEDED(hr)) { - if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && ((size_t)iResult + 1 < cchMax)) { memset(pszDest + iResult + 1, dwFlags & 0xff,

1 0

[tkreuzer] 50540: [CMAKE] Set linker language for win32ksys to C. Fixes MSVC compilation
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 19:37:22 2011 New Revision: 50540 URL: http://svn.reactos.org/svn/reactos?rev=50540&view=rev Log: [CMAKE] Set linker language for win32ksys to C. Fixes MSVC compilation Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Fri Jan 28 19:37:22 2011 @@ -2,3 +2,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) add_dependencies(win32ksys win32k_S asm) +set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE C)

1 0

[tkreuzer] 50539: [CMAKE] Remove module name from ntoskrnl add_importlib_target
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 18:16:48 2011 New Revision: 50539 URL: http://svn.reactos.org/svn/reactos?rev=50539&view=rev Log: [CMAKE] Remove module name from ntoskrnl add_importlib_target Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt 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] Fri Jan 28 18:16:48 2011 @@ -450,4 +450,4 @@ add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) -add_importlib_target(ntoskrnl.spec ntoskrnl.exe) +add_importlib_target(ntoskrnl.spec)

1 0

[tkreuzer] 50538: [HID] Fix spec file. All of the functions are present, either stubbed or implemented.
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 18:13:54 2011 New Revision: 50538 URL: http://svn.reactos.org/svn/reactos?rev=50538&view=rev Log: [HID] Fix spec file. All of the functions are present, either stubbed or implemented. Modified: branches/cmake-bringup/dll/win32/hid/hid.spec Modified: branches/cmake-bringup/dll/win32/hid/hid.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/hid… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/hid.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hid/hid.spec [iso-8859-1] Fri Jan 28 18:13:54 2011 @@ -1,44 +1,44 @@ -@ stub HidD_FlushQueue -@ stub HidD_FreePreparsedData -@ stub HidD_GetAttributes -@ stub HidD_GetConfiguration -@ stub HidD_GetFeature +@ stdcall HidD_FlushQueue(ptr) +@ stdcall HidD_FreePreparsedData(ptr) +@ stdcall HidD_GetAttributes(ptr ptr) +@ stdcall HidD_GetConfiguration(ptr ptr long) +@ stdcall HidD_GetFeature(ptr ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString -@ stub HidD_GetInputReport -@ stub HidD_GetManufacturerString -@ stub HidD_GetMsGenreDescriptor -@ stub HidD_GetNumInputBuffers -@ stub HidD_GetPhysicalDescriptor -@ stub HidD_GetPreparsedData -@ stub HidD_GetProductString -@ stub HidD_GetSerialNumberString -@ stub HidD_Hello -@ stub HidD_SetConfiguration -@ stub HidD_SetFeature -@ stub HidD_SetNumInputBuffers -@ stub HidD_SetOutputReport -@ stub HidP_GetButtonCaps -@ stub HidP_GetCaps -@ stub HidP_GetData -@ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes -@ stub HidP_GetScaledUsageValue -@ stub HidP_GetSpecificButtonCaps -@ stub HidP_GetSpecificValueCaps -@ stub HidP_GetUsageValue -@ stub HidP_GetUsageValueArray -@ stub HidP_GetUsages -@ stub HidP_GetUsagesEx -@ stub HidP_GetValueCaps -@ stub HidP_InitializeReportForID -@ stub HidP_MaxDataListLength -@ stub HidP_MaxUsageListLength -@ stub HidP_SetData -@ stub HidP_SetScaledUsageValue -@ stub HidP_SetUsageValue -@ stub HidP_SetUsageValueArray -@ stub HidP_SetUsages -@ stub HidP_TranslateUsagesToI8042ScanCodes -@ stub HidP_UnsetUsages -@ stub HidP_UsageListDifference +@ stdcall HidD_GetIndexedString(ptr long ptr long) +@ stdcall HidD_GetInputReport(ptr ptr long) +@ stdcall HidD_GetManufacturerString(ptr ptr long) +@ stdcall HidD_GetMsGenreDescriptor(ptr ptr long) +@ stdcall HidD_GetNumInputBuffers(ptr ptr) +@ stdcall HidD_GetPhysicalDescriptor(ptr ptr long) +@ stdcall HidD_GetPreparsedData(ptr ptr) +@ stdcall HidD_GetProductString(ptr ptr long) +@ stdcall HidD_GetSerialNumberString(ptr ptr long) +@ stdcall HidD_Hello(ptr long) +@ stdcall HidD_SetConfiguration(ptr ptr long) +@ stdcall HidD_SetFeature(ptr ptr long) +@ stdcall HidD_SetNumInputBuffers(ptr long) +@ stdcall HidD_SetOutputReport(ptr ptr long) +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) +@ stdcall HidP_GetCaps(ptr ptr) +@ stdcall HidP_GetData(long ptr ptr ptr ptr long) +@ stdcall HidP_GetExtendedAttributes(long long ptr ptr ptr) +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) +@ stdcall HidP_MaxDataListLength(long ptr) +@ stdcall HidP_MaxUsageListLength(long long ptr) +@ stdcall HidP_SetData(long ptr ptr ptr ptr long) +@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long)

1 0

[tkreuzer] 50537: [CRT] add a single prototype, instead of including math.h
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 17:44:30 2011 New Revision: 50537 URL: http://svn.reactos.org/svn/reactos?rev=50537&view=rev Log: [CRT] add a single prototype, instead of including math.h Modified: branches/cmake-bringup/lib/sdk/crt/math/powf.c Modified: branches/cmake-bringup/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/powf.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/powf.c [iso-8859-1] Fri Jan 28 17:44:30 2011 @@ -3,7 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include <math.h> + +double __cdecl pow(double x, double y); float powf(float x, float y) {

1 0

[tkreuzer] 50536: [CMAKE] - Preserve case of symbols when assembling (this is not default) - link to msvcsup
by tkreuzer＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: tkreuzer Date: Fri Jan 28 17:40:36 2011 New Revision: 50536 URL: http://svn.reactos.org/svn/reactos?rev=50536&view=rev Log: [CMAKE] - Preserve case of symbols when assembling (this is not default) - link to msvcsup Modified: branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=505… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Jan 28 17:40:36 2011 @@ -120,6 +120,7 @@ set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) + target_link_libraries(${MODULE} msvcsup) endif() endmacro() @@ -157,7 +158,7 @@ # Assemble the stub file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm") # Add neccessary importlibs for redirections Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Fri Jan 28 17:40:36 2011 @@ -17,7 +17,7 @@ SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")

1 0

[spetreolle] 50535: [CMAKE] Fix crt/bootcdregtest regression, due to _USER32_WSPRINTF. add_definitions does not apply to target, but current directory.
by spetreolle＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: spetreolle Date: Fri Jan 28 13:41:55 2011 New Revision: 50535 URL: http://svn.reactos.org/svn/reactos?rev=50535&view=rev Log: [CMAKE] Fix crt/bootcdregtest regression, due to _USER32_WSPRINTF. add_definitions does not apply to target, but current directory. Added: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Jan 28 13:41:55 2011 @@ -626,15 +626,4 @@ add_dependencies(msvcsup psdk buildno_header asm) endif() -add_definitions(-D_USER32_WSPRINTF) -add_library(user32_wsprintf - printf/streamout.c - printf/wstreamout.c - printf/wsprintfA.c - printf/wsprintfW.c - printf/wvsprintfA.c - printf/wvsprintfW.c - printf/wvsnprintfA.c - printf/wvsnprintfW.c - string/mbstowcs_nt.c - string/wcstombs_nt.c) +add_subdirectory(printf) Added: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/print… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt [iso-8859-1] Fri Jan 28 13:41:55 2011 @@ -1,0 +1,16 @@ + +include_directories(.. ../include) + +add_definitions(-D_USER32_WSPRINTF) + +add_library(user32_wsprintf + streamout.c + wstreamout.c + wsprintfA.c + wsprintfW.c + wvsprintfA.c + wvsprintfW.c + wvsnprintfA.c + wvsnprintfW.c + ../string/mbstowcs_nt.c + ../string/wcstombs_nt.c) Propchange: branches/cmake-bringup/lib/sdk/crt/printf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 50534: [CMAKE] - Share freeldr_arch as a static lib between freeldr and setupldr. - Some formatting fixes.
by akhaldi＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: akhaldi Date: Fri Jan 28 11:40:45 2011 New Revision: 50534 URL: http://svn.reactos.org/svn/reactos?rev=50534&view=rev Log: [CMAKE] - Share freeldr_arch as a static lib between freeldr and setupldr. - Some formatting fixes. Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Jan 28 11:40:45 2011 @@ -9,44 +9,42 @@ endif() if(ARCH MATCHES i386) -if(MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - arch/i386/realmode.S) -else() -list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/fathelp.S - arch/i386/arch.S) -endif() + if(MSVC) + list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/realmode.S) + else() + list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/i386/arch.S) + endif() elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/fathelp.S - arch/amd64/arch.S) -endif(ARCH MATCHES i386) - -if(ARCH MATCHES i386) -if(NOT MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - arch/i386/boot.S - arch/i386/drvmap.S - arch/i386/i386cpu.S - arch/i386/i386idt.S - arch/i386/i386pnp.S - arch/i386/i386trap.S - arch/i386/int386.S - arch/i386/linux.S - arch/i386/mb.S - arch/i386/i386bug.c) -endif() + list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/amd64/arch.S) +endif() + +if(ARCH MATCHES i386) + if(NOT MSVC) + list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/boot.S + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386pnp.S + arch/i386/i386trap.S + arch/i386/int386.S + arch/i386/linux.S + arch/i386/mb.S + arch/i386/i386bug.c) + endif() elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_BASE64K_SOURCE - arch/i386/drvmap.S - arch/i386/i386cpu.S - arch/i386/i386idt.S - arch/i386/i386trap.S - arch/amd64/mb.S) -endif(ARCH MATCHES i386) - - + list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386trap.S + arch/amd64/mb.S) +endif() set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") @@ -105,10 +103,10 @@ oslist.c) if(ARCH MATCHES i386) -list(APPEND FREELDR_BASE_SOURCE - windows/headless.c - disk/scsiport.c) -endif(ARCH MATCHES i386) + list(APPEND FREELDR_BASE_SOURCE + windows/headless.c + disk/scsiport.c) +endif() set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") @@ -116,75 +114,61 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) if(ARCH MATCHES i386) -list(APPEND FREELDR_ARCH_SOURCE - arch/i386/archmach.c - arch/i386/custom.c - arch/i386/drivemap.c - arch/i386/halstub.c - arch/i386/hardware.c - arch/i386/hwacpi.c - arch/i386/hwapm.c - arch/i386/hwpci.c - arch/i386/i386disk.c - arch/i386/i386rtl.c - arch/i386/i386vid.c - arch/i386/loader.c - arch/i386/machpc.c - arch/i386/miscboot.c - arch/i386/ntoskrnl.c - arch/i386/pccons.c - arch/i386/pcdisk.c - arch/i386/pcmem.c - arch/i386/pcrtc.c - arch/i386/pcvideo.c - arch/i386/machxbox.c - arch/i386/xboxcons.c - arch/i386/xboxdisk.c - arch/i386/xboxfont.c - arch/i386/xboxhw.c - arch/i386/xboxi2c.c - arch/i386/xboxmem.c - arch/i386/xboxrtc.c - arch/i386/xboxvideo.c - windows/i386/ntsetup.c - windows/i386/wlmemory.c) + list(APPEND FREELDR_ARCH_SOURCE + arch/i386/archmach.c + arch/i386/custom.c + arch/i386/drivemap.c + arch/i386/halstub.c + arch/i386/hardware.c + arch/i386/hwacpi.c + arch/i386/hwapm.c + arch/i386/hwpci.c + arch/i386/i386disk.c + arch/i386/i386rtl.c + arch/i386/i386vid.c + arch/i386/loader.c + arch/i386/machpc.c + arch/i386/miscboot.c + arch/i386/ntoskrnl.c + arch/i386/pccons.c + arch/i386/pcdisk.c + arch/i386/pcmem.c + arch/i386/pcrtc.c + arch/i386/pcvideo.c + arch/i386/machxbox.c + arch/i386/xboxcons.c + arch/i386/xboxdisk.c + arch/i386/xboxfont.c + arch/i386/xboxhw.c + arch/i386/xboxi2c.c + arch/i386/xboxmem.c + arch/i386/xboxrtc.c + arch/i386/xboxvideo.c + windows/i386/ntsetup.c + windows/i386/wlmemory.c) else() #TBD -endif(ARCH MATCHES i386) +endif() set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") - -list(APPEND SETUPLDR_MAIN_SOURCE - bootmgr.c - inffile/inffile.c - reactos/setupldr.c) - -if(ARCH MATCHES i386) -list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) -elseif(ARCH MATCHES amd64) -list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) -endif(ARCH MATCHES i386) - -set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") - - +add_library(freeldr_arch ${FREELDR_ARCH_SOURCE}) list(APPEND FREELDR_SOURCE bootmgr.c ${FREELDR_STARTUP_SOURCE} ${FREELDR_BASE64K_SOURCE} ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE}) + ) add_library(freeldr SHARED ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch ${FREELDR_SOURCE}) if(NOT MSVC) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys") + set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys") set_image_base(freeldr 0x8000) else() -set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") + set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") set_image_base(freeldr 0x10000) endif() @@ -192,42 +176,55 @@ set_entrypoint(freeldr mainCRTStartup) if(ARCH MATCHES i386) -target_link_libraries(freeldr mini_hal) -endif(ARCH MATCHES i386) + target_link_libraries(freeldr mini_hal) +endif() target_link_libraries(freeldr + freeldr_arch cportlib rossym cmlib rtl libcntpr) + add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE}) add_dependencies(freeldr asm) + +list(APPEND SETUPLDR_MAIN_SOURCE + bootmgr.c + inffile/inffile.c + reactos/setupldr.c) + +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) + list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) +endif() + +set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") list(APPEND SETUPLDR_SOURCE ${FREELDR_STARTUP_SOURCE} ${FREELDR_BASE64K_SOURCE} ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE} ${SETUPLDR_MAIN_SOURCE}) add_library(setupldr SHARED ${SETUPLDR_SOURCE}) if(NOT MSVC) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") set_image_base(setupldr 0x8000) else() -set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() set_subsystem(setupldr native) set_entrypoint(setupldr mainCRTStartup) if(ARCH MATCHES i386) -target_link_libraries(setupldr mini_hal) -endif(ARCH MATCHES i386) + target_link_libraries(setupldr mini_hal) +endif() target_link_libraries(setupldr + freeldr_arch cportlib rossym cmlib @@ -239,4 +236,4 @@ # Bootcd files add_minicd_target(setupldr loader setupldr.sys) add_minicd_target(freeldr loader freeldr.sys) -add_livecd_target(setupldr loader) +add_livecd_target(setupldr loader)

1 0

[akhaldi] 50533: [CMAKE] - Properly handle setting the suffix variable. Fixes import libs creation.
by akhaldi＠svn.reactos.org 28 Jan '11

28 Jan '11

Author: akhaldi Date: Fri Jan 28 11:25:24 2011 New Revision: 50533 URL: http://svn.reactos.org/svn/reactos?rev=50533&view=rev Log: [CMAKE] - Properly handle setting the suffix variable. Fixes import libs creation. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=505… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Jan 28 11:25:24 2011 @@ -269,6 +269,14 @@ get_filename_component(_name ${_exports_file} NAME_WE) get_filename_component(_extension ${_exports_file} EXT) get_target_property(_suffix ${_name} SUFFIX) + if(${_suffix} STREQUAL "_suffix-NOTFOUND") + get_target_property(_type ${_name} TYPE) + if(${_type} MATCHES EXECUTABLE) + set(_suffix ".exe") + else() + set(_suffix ".dll") + endif() + endif() if (${_extension} STREQUAL ".spec") Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=505… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Jan 28 11:25:24 2011 @@ -139,6 +139,14 @@ macro(add_importlib_target _exports_file) get_filename_component(_name ${_exports_file} NAME_WE) get_target_property(_suffix ${_name} SUFFIX) + if(${_suffix} STREQUAL "_suffix-NOTFOUND") + get_target_property(_type ${_name} TYPE) + if(${_type} MATCHES EXECUTABLE) + set(_suffix ".exe") + else() + set(_suffix ".dll") + endif() + endif() # Generate the asm stub file and the export def file add_custom_command(

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