Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 56111: [RSYM64] Fix incorrect memset usage
by pschweitzer＠svn.reactos.org 11 Mar '12

11 Mar '12

Author: pschweitzer Date: Sun Mar 11 10:58:21 2012 New Revision: 56111 URL: http://svn.reactos.org/svn/reactos?rev=56111&view=rev Log: [RSYM64] Fix incorrect memset usage Modified: trunk/reactos/tools/rsym/rsym64.c Modified: trunk/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym64.c?rev=56… ============================================================================== --- trunk/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym64.c [iso-8859-1] Sun Mar 11 10:58:21 2012 @@ -557,7 +557,7 @@ /* Allocate .pdata buffer */ pdata = File->pdata.p = malloc(pshp->SizeOfRawData); - memset(File->pdata.p, pshp->SizeOfRawData, 0); + memset(File->pdata.p, 0, pshp->SizeOfRawData,); /* Init exception data dir */ Dir = &File->OptionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION]; @@ -581,7 +581,7 @@ /* Allocate .xdata buffer */ File->xdata.p = malloc(pshx->SizeOfRawData); - memset(File->xdata.p, pshx->SizeOfRawData, 0); + memset(File->xdata.p, 0, pshx->SizeOfRawData); i = 0; Offset = File->eh_frame.psh->VirtualAddress; @@ -890,7 +890,7 @@ } File.AlignBuf = malloc(File.OptionalHeader->FileAlignment); - memset(File.AlignBuf, File.OptionalHeader->FileAlignment, 0); + memset(File.AlignBuf, 0, File.OptionalHeader->FileAlignment); GeneratePData(&File);

1 0

[cwittich] 56110: [setup16] 32-Bit stub installer for 16-Bit Microsoft installers TODO: -load this installer instead of the original 16bit Microsoft installer -improve error handling and string all...
by cwittich＠svn.reactos.org 11 Mar '12

11 Mar '12

Author: cwittich Date: Sun Mar 11 10:51:40 2012 New Revision: 56110 URL: http://svn.reactos.org/svn/reactos?rev=56110&view=rev Log: [setup16] 32-Bit stub installer for 16-Bit Microsoft installers TODO: -load this installer instead of the original 16bit Microsoft installer -improve error handling and string allocation Added: trunk/reactos/base/applications/setup16/ (with props) trunk/reactos/base/applications/setup16/CMakeLists.txt (with props) trunk/reactos/base/applications/setup16/main.c (with props) Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Sun Mar 11 10:51:40 2012 @@ -29,6 +29,7 @@ add_subdirectory(regedt32) add_subdirectory(sc) add_subdirectory(screensavers) +add_subdirectory(setup16) add_subdirectory(shutdown) add_subdirectory(sndrec32) add_subdirectory(sndvol32) Propchange: trunk/reactos/base/applications/setup16/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 11 10:51:40 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/setup16/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/setup16/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/setup16/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/setup16/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/CMakeLists.txt (added) +++ trunk/reactos/base/applications/setup16/CMakeLists.txt [iso-8859-1] Sun Mar 11 10:51:40 2012 @@ -1,0 +1,10 @@ + +set_rc_compiler() + +add_executable(setup16 + main.c) + +set_module_type(setup16 win32gui UNICODE) +add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi) + +add_cd_file(TARGET setup16 DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/setup16/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c (added) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sun Mar 11 10:51:40 2012 @@ -1,0 +1,148 @@ +#include <windows.h> +#include <shlobj.h> +#include <setupapi.h> + +#define NT_PARAMS L"NT3.51 Intel Params" +#define MSSETUP_PATH L"~MSSETUP.T\\" + +static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) +{ + FILE_IN_CABINET_INFO_W *pInfo; + FILEPATHS_W *pFilePaths; + + switch(Notification) + { + case SPFILENOTIFY_FILEINCABINET: + pInfo = (FILE_IN_CABINET_INFO_W*)Param1; + wcscpy(pInfo->FullTargetName, (LPCWSTR)Context); + wcscat(pInfo->FullTargetName, pInfo->NameInCabinet); + return FILEOP_DOIT; + case SPFILENOTIFY_FILEEXTRACTED: + pFilePaths = (FILEPATHS_W*)Param1; + return NO_ERROR; + } + return NO_ERROR; +} + +BOOL DeleteDirectory(LPWSTR lpszDir) +{ + DWORD len = wcslen(lpszDir); + WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + wcscpy(pszFrom, lpszDir); + pszFrom[len] = 0; + pszFrom[len+1] = 0; + + SHFILEOPSTRUCT fileop; + fileop.hwnd = NULL; + fileop.wFunc = FO_DELETE; + fileop.pFrom = pszFrom; + fileop.pTo = NULL; + fileop.fFlags = FOF_NOCONFIRMATION|FOF_SILENT; + fileop.fAnyOperationsAborted = FALSE; + fileop.lpszProgressTitle = NULL; + fileop.hNameMappings = NULL; + + int ret = SHFileOperation(&fileop); + HeapFree(GetProcessHeap(), 0, &pszFrom); + return (ret == 0); +} + +VOID GetSystemDrive(LPWSTR lpszDrive) +{ + WCHAR szWindir[MAX_PATH]; + GetWindowsDirectoryW(szWindir, MAX_PATH); + _wsplitpath(szWindir, lpszDrive, NULL, NULL, NULL); + wcscat(lpszDrive, L"\\"); +} + +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(nCmdShow); + + WCHAR szSetupPath[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; + WCHAR szCabFileName[MAX_PATH]; + WCHAR szCabFilePath[MAX_PATH]; + WCHAR szTempDirName[50]; + WCHAR szCmdLine[MAX_PATH]; + WCHAR szTempCmdLine[MAX_PATH]; + WCHAR szTempPath[MAX_PATH]; + WCHAR szFullTempPath[MAX_PATH]; + WCHAR szDrive[4]; + DWORD dwAttrib; + PROCESS_INFORMATION processInfo; + STARTUPINFO startupInfo; + + GetCurrentDirectory(MAX_PATH, szSetupPath); + wcscat(szSetupPath, L"\\"); + wcscpy(szFileName, szSetupPath); + wcscat(szFileName, L"setup.lst"); + + /* read information from setup.lst */ + GetPrivateProfileStringW(NT_PARAMS, L"CabinetFile", NULL, szCabFileName, MAX_PATH, szFileName); + GetPrivateProfileStringW(NT_PARAMS, L"TmpDirName", NULL, szTempDirName, 50, szFileName); + GetPrivateProfileStringW(NT_PARAMS, L"CmdLine", NULL, szCmdLine, MAX_PATH, szFileName); + + wcscpy(szCabFilePath, szSetupPath); + wcscat(szCabFilePath, szCabFileName); + + /* ceate temp directory */ + GetSystemDrive(szDrive); + wcscpy(szTempPath, szDrive); + wcscat(szTempPath, MSSETUP_PATH); + wcscpy(szFullTempPath, szTempPath); + wcscat(szFullTempPath, szTempDirName); + wcscat(szFullTempPath, L"\\"); + + if (SHCreateDirectoryEx(0, szFullTempPath, NULL) != ERROR_SUCCESS) + { + MessageBoxW(0, L"Could not create Temp Directory.", L"Error", MB_OK | MB_ICONERROR); + return 1; + } + + dwAttrib = GetFileAttributes(szTempPath); + SetFileAttributes(szTempPath, dwAttrib | FILE_ATTRIBUTE_HIDDEN); + + /* extract files */ + if (!SetupIterateCabinetW(szCabFilePath, 0, ExtCabCallback, szFullTempPath)) + { + MessageBoxW(0, L"Could not extract cab file", L"Error", MB_OK | MB_ICONERROR); + DeleteDirectory(szTempPath); + return 1; + } + + /* prepare command line */ + wsprintf(szTempCmdLine, szCmdLine, szFullTempPath, lpCmdLine); + wcscpy(szCmdLine, szFullTempPath); + wcscat(szCmdLine, szTempCmdLine); + + /* execute the 32-Bit installer */ + ZeroMemory(&processInfo, sizeof(processInfo)); + ZeroMemory(&startupInfo, sizeof(startupInfo)); + startupInfo.cb = sizeof(startupInfo); + if (CreateProcessW(NULL, szCmdLine, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, szFullTempPath, &startupInfo, &processInfo)) + { + WaitForSingleObject(processInfo.hProcess, INFINITE); + CloseHandle(processInfo.hProcess); + CloseHandle(processInfo.hThread); + } + else + { + WCHAR szMsg[MAX_PATH]; + wsprintf(szMsg, L"Failed to load the installer. Error %d", GetLastError()); + MessageBoxW(0, szMsg, L"Error", MB_OK | MB_ICONERROR); + DeleteDirectory(szTempPath); + return 1; + } + + /* cleanup */ + DeleteDirectory(szTempPath); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/applications/setup16/main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 56109: [CMAKE] Allow to build with link-time code generation.
by dgorbachev＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: dgorbachev Date: Sat Mar 10 23:38:37 2012 New Revision: 56109 URL: http://svn.reactos.org/svn/reactos?rev=56109&view=rev Log: [CMAKE] Allow to build with link-time code generation. Modified: trunk/reactos/cmake/config-amd64.cmake trunk/reactos/cmake/config-arm.cmake trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/cmake/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-amd64.cmake?r… ============================================================================== --- trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -14,6 +14,9 @@ 3 = -O1 4 = -O2 5 = -O3") + +set(LTCG FALSE CACHE BOOL +"Whether to build with link-time code generation") set(DBG TRUE CACHE BOOL "Whether to compile for debugging.") Modified: trunk/reactos/cmake/config-arm.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-arm.cmake?rev… ============================================================================== --- trunk/reactos/cmake/config-arm.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-arm.cmake [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -15,6 +15,9 @@ 3 = -O1 4 = -O2 5 = -O3") + +set(LTCG FALSE CACHE BOOL +"Whether to build with link-time code generation") set(DBG TRUE CACHE BOOL "Whether to compile for debugging.") Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=561… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -20,6 +20,9 @@ 3 = -O1 4 = -O2 5 = -O3") + +set(LTCG FALSE CACHE BOOL +"Whether to build with link-time code generation") set(GDB FALSE CACHE BOOL "Whether to compile for debugging with GDB. Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56109&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -77,6 +77,11 @@ add_compile_flags("-O3") endif() +# Link-time code generation +if(LTCG) + add_compile_flags("-flto -Wno-error=clobbered") +endif() + add_compile_flags("-fno-strict-aliasing") if(ARCH MATCHES i386) @@ -139,19 +144,19 @@ # Normal rsym build get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) set(CMAKE_C_LINK_EXECUTABLE - "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" + "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} <TARGET> <TARGET>") set(CMAKE_CXX_LINK_EXECUTABLE - "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" + "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} <TARGET> <TARGET>") set(CMAKE_C_CREATE_SHARED_LIBRARY - "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" "${RSYM} <TARGET> <TARGET>") set(CMAKE_CXX_CREATE_SHARED_LIBRARY - "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" "${RSYM} <TARGET> <TARGET>") set(CMAKE_RC_CREATE_SHARED_LIBRARY - "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" "${RSYM} <TARGET> <TARGET>") endif() Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -3,6 +3,9 @@ if(NOT MSVC) add_compile_flags("-Wno-main") + if(LTCG) + add_compile_flags("-fno-lto") + endif() endif() list(APPEND MSVCRTEX_SOURCE Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Mar 10 23:38:37 2012 @@ -438,6 +438,11 @@ set_image_base(ntoskrnl 0x80800000) endif() +# Linker bug +if(NOT MSVC AND LTCG) + add_target_link_flags(ntoskrnl "-shared") +endif() + target_link_libraries(ntoskrnl cportlib csq

1 0

[pschweitzer] 56108: [NTOSKRNL] DPRINT1 -> DPRINT an error message so that KVM testbot will stop looping forever (due to status change...)
by pschweitzer＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: pschweitzer Date: Sat Mar 10 21:06:11 2012 New Revision: 56108 URL: http://svn.reactos.org/svn/reactos?rev=56108&view=rev Log: [NTOSKRNL] DPRINT1 -> DPRINT an error message so that KVM testbot will stop looping forever (due to status change...) Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=561… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Mar 10 21:06:11 2012 @@ -405,7 +405,7 @@ { IoStatus->Information = 0; IoStatus->Status = Status; - DPRINT1("ReadCacheSegmentChain failed, Status %x\n", Status); + DPRINT("ReadCacheSegmentChain failed, Status %x\n", Status); return FALSE; }

1 0

[akhaldi] 56107: [CMAKE] * Addendum to my previous commit.
by akhaldi＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: akhaldi Date: Sat Mar 10 20:16:56 2012 New Revision: 56107 URL: http://svn.reactos.org/svn/reactos?rev=56107&view=rev Log: [CMAKE] * Addendum to my previous commit. Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/drivers/usb/usbohci/CMakeLists.txt trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -1,13 +1,24 @@ include_directories(..) -add_library(cdrom_new SHARED cdrom.c data.c ioctl.c mmc.c sec.c) +list(APPEND SOURCE + cdrom.c + data.c + ioctl.c + mmc.c + sec.c) + +add_library(cdrom_new SHARED ${SOURCE}) target_link_libraries(cdrom_new libcntpr wdmguid) + if(ARCH MATCHES i386) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(cdrom_new "/Gz") + #add_target_compile_flags(cdrom_new "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + #add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif() endif() Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -15,10 +15,12 @@ target_link_libraries(disk_new libcntpr wdmguid) if(ARCH MATCHES i386) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(disk_new "/Gz") + #add_target_compile_flags(disk_new "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif() Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -33,10 +33,12 @@ class.rc) if(ARCH MATCHES i386) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(classpnp "/Gz") + #add_target_compile_flags(classpnp "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(classpnp "-mrtd -fno-builtin -w") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w") endif() Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -4,16 +4,16 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb) -include_directories( - ${REACTOS_SOURCE_DIR}/lib/drivers/libusb) - - -add_library(usbehci SHARED +list(APPEND SOURCE usbehci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp + hardware.cpp) + +add_library(usbehci SHARED + ${SOURCE} usbehci.rc) target_link_libraries(usbehci @@ -21,12 +21,15 @@ libcntpr ${PSEH_LIB}) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "/GR-") + #add_target_compile_flags(usbehci "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") else() target_link_libraries(usbehci -lgcc) - set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif(MSVC) + #add_target_compile_flags(usbehci "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif() set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) Modified: trunk/reactos/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -4,14 +4,16 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories( - ${REACTOS_SOURCE_DIR}/lib/drivers/libusb) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb) -add_library(usbohci SHARED +list(APPEND SOURCE usbohci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp + hardware.cpp) + +add_library(usbohci SHARED + ${SOURCE} usbohci.rc) target_link_libraries(usbohci @@ -19,14 +21,17 @@ libcntpr ${PSEH_LIB}) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "/GR-") + #add_target_compile_flags(usbohci "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") else() target_link_libraries(usbohci -lgcc) - set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif(MSVC) + #add_target_compile_flags(usbohci "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif() set_module_type(usbohci kernelmodedriver) add_importlibs(usbohci ntoskrnl hal usbd) -add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -7,11 +7,14 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/drivers/libusb) -add_library(usbuhci SHARED +list(APPEND SOURCE usbuhci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp + hardware.cpp) + +add_library(usbuhci SHARED + ${SOURCE} usbuhci.rc) target_link_libraries(usbuhci @@ -19,12 +22,15 @@ libcntpr ${PSEH_LIB}) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "/GR-") + #add_target_compile_flags(usbuhci "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") else() target_link_libraries(usbuhci -lgcc) - set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif(MSVC) + #add_target_compile_flags(usbuhci "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif() set_module_type(usbuhci kernelmodedriver) add_importlibs(usbuhci ntoskrnl hal usbd) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Sat Mar 10 20:16:56 2012 @@ -58,10 +58,11 @@ libcntpr ${PSEH_LIB}) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(portcls "/GR-") + #add_target_compile_flags(portcls "/GR-") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") else() - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif() @@ -70,4 +71,3 @@ add_pch(portcls private.hpp) add_importlibs(portcls ntoskrnl ks drmk hal) add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) -

1 0

[akhaldi] 56106: [CMAKE] * Temporarily work around the cmake rc handling bug (mentioned previously).
by akhaldi＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: akhaldi Date: Sat Mar 10 19:40:40 2012 New Revision: 56106 URL: http://svn.reactos.org/svn/reactos?rev=56106&view=rev Log: [CMAKE] * Temporarily work around the cmake rc handling bug (mentioned previously). Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:40:40 2012 @@ -10,14 +10,17 @@ list(APPEND SOURCE imm.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) -add_library(imm32 SHARED ${SOURCE}) +add_library(imm32 SHARED + ${SOURCE} + version.rc) if(MSVC) - add_target_compile_flags(imm32 "/FIwine/typeof.h") + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(imm32 "/FIwine/typeof.h") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif() set_module_type(imm32 win32dll) Modified: trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:40:40 2012 @@ -12,10 +12,11 @@ target_link_libraries(vga libcntpr) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) - add_target_compile_flags(vga "/Gz") + #add_target_compile_flags(vga "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(vga "-mrtd -fno-builtin") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif()

1 0

[akhaldi] 56105: [CMAKE] * Make use of the cmake rc handling. As a result we don't need set_rc_compiler() anymore, among other benefits. * There's one minor issue mentioned as a FIXME, we'll get th...
by akhaldi＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: akhaldi Date: Sat Mar 10 19:20:27 2012 New Revision: 56105 URL: http://svn.reactos.org/svn/reactos?rev=56105&view=rev Log: [CMAKE] * Make use of the cmake rc handling. As a result we don't need set_rc_compiler() anymore, among other benefits. * There's one minor issue mentioned as a FIXME, we'll get that sorted out as soon as the bug report we filed upstream gets resolved. * Set set_rc_compiler() to be a dummy, to be removed later. [IMM32] * Properly set the compiler flag. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/include/c++/stlport/stddef.h trunk/reactos/include/c++/stlport/stl/_cprolog.h trunk/reactos/include/c++/stlport/stl/config/compat.h trunk/reactos/include/c++/stlport/stl/config/features.h Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56105&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -162,7 +162,7 @@ SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> ${I18N_DEFS} -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT) @@ -198,18 +198,6 @@ endfunction() function(set_rc_compiler) - get_directory_property(defines COMPILE_DEFINITIONS) - get_directory_property(includes INCLUDE_DIRECTORIES) - - foreach(arg ${defines}) - set(rc_result_defs "${rc_result_defs} -D${arg}") - endforeach() - - foreach(arg ${includes}) - set(rc_result_incs "-I${arg} ${rc_result_incs}") - endforeach() - - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${I18N_DEFS} -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>" PARENT_SCOPE) endfunction() function(add_delay_importlibs MODULE) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56105… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -40,7 +40,7 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE") endif() -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> ${I18N_DEFS} /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") if(MSVC_IDE) # Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized. @@ -111,18 +111,6 @@ endfunction() function(set_rc_compiler) - get_directory_property(defines COMPILE_DEFINITIONS) - get_directory_property(includes INCLUDE_DIRECTORIES) - - foreach(arg ${defines}) - set(rc_result_defs "${rc_result_defs} /D${arg}") - endforeach() - - foreach(arg ${includes}) - set(rc_result_incs "/I${arg} ${rc_result_incs}") - endforeach() - - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${I18N_DEFS} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) endfunction() #define those for having real libraries Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -4,13 +4,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -if(MSVC) - add_definitions(/FIwine/typeof.h) -endif() - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) @@ -22,8 +16,11 @@ add_library(imm32 SHARED ${SOURCE}) +if(MSVC) + add_target_compile_flags(imm32 "/FIwine/typeof.h") +endif() + set_module_type(imm32 win32dll) target_link_libraries(imm32 wine) add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/C… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -11,8 +11,8 @@ add_library(mountmgr SHARED ${SOURCE}) target_link_libraries(mountmgr wdmguid ioevent) -allow_warnings(mountmgr) set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h) add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) + Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -1,13 +1,26 @@ include_directories(..) -add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) +list(APPEND SOURCE + data.c + disk.c + diskwmi.c + enum.c + geometry.c + part.c + pnp.c) + +add_library(disk_new SHARED + ${SOURCE} + disk.rc) target_link_libraries(disk_new libcntpr wdmguid) if(ARCH MATCHES i386) if(MSVC) add_target_compile_flags(disk_new "/Gz") else() - add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif() endif() Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -8,14 +8,6 @@ -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT=0 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) - -if(ARCH MATCHES i386) - if(MSVC) - add_definitions(/Gz) - else() - add_definitions(-mrtd -fno-builtin -w) - endif() -endif() spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) @@ -34,10 +26,22 @@ retry.c utils.c xferpkt.c - class.rc ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) -add_library(classpnp SHARED ${SOURCE}) +add_library(classpnp SHARED + ${SOURCE} + class.rc) + +if(ARCH MATCHES i386) + if(MSVC) + add_target_compile_flags(classpnp "/Gz") + else() + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(classpnp "-mrtd -fno-builtin -w") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w") + endif() +endif() + add_pch(classpnp classp.h) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -8,7 +8,7 @@ set_cpp() set_rc_compiler() -add_library(uniata SHARED +list(APPEND SOURCE id_ata.cpp id_badblock.cpp id_dma.cpp @@ -16,10 +16,18 @@ id_probe.cpp id_queue.cpp id_sata.cpp - idedma.rc ros_glue/ros_glue.cpp) -allow_warnings(uniata) +add_library(uniata SHARED + ${SOURCE} + idedma.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(uniata) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + add_pch(uniata stdafx.h) set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) Modified: trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -4,17 +4,20 @@ vgadata.c vga.c vbemodes.c - vbe.c + vbe.c) + +add_library(vga SHARED + ${SOURCE} vga.rc) - -add_library(vga SHARED ${SOURCE}) target_link_libraries(vga libcntpr) if(MSVC) add_target_compile_flags(vga "/Gz") else() - add_target_compile_flags(vga "-mrtd -fno-builtin") + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(vga "-mrtd -fno-builtin") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif() set_module_type(vga kernelmodedriver) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -6,7 +6,7 @@ spec2def(portcls.sys portcls.spec) -add_library(portcls SHARED +list(APPEND SOURCE adapter.cpp api.cpp connection.cpp @@ -48,8 +48,11 @@ undoc.cpp unregister.cpp version.cpp - portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) + +add_library(portcls SHARED + ${SOURCE} + portcls.rc) target_link_libraries(portcls libcntpr @@ -58,10 +61,13 @@ if(MSVC) add_target_compile_flags(portcls "/GR-") else() - add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif() set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) add_pch(portcls private.hpp) add_importlibs(portcls ntoskrnl ks drmk hal) add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) + Modified: trunk/reactos/include/c++/stlport/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stddef.h [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -12,6 +12,8 @@ * modified is included with the above copyright notice. * */ + +#ifndef RC_INVOKED #ifndef _STLP_OUTERMOST_HEADER_ID # define _STLP_OUTERMOST_HEADER_ID 0x262 @@ -42,3 +44,5 @@ # undef _STLP_DONT_POP_HEADER_ID # endif #endif + +#endif Modified: trunk/reactos/include/c++/stlport/stl/_cprolog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/_cprolog.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/_cprolog.h [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -3,6 +3,8 @@ * please also find #pragma which disables it and put it here, to * allow reentrancy of this header. */ + +#ifndef RC_INVOKED #ifdef std # undef std /* We undef "std" on entry , as STLport headers may include native ones. */ @@ -23,3 +25,5 @@ #if defined (_STLP_HAS_SPECIFIC_PROLOG_EPILOG) # include <stl/config/_prolog.h> #endif + +#endif Modified: trunk/reactos/include/c++/stlport/stl/config/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/config/compat.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/config/compat.h [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -3,6 +3,8 @@ * Compatibility section * This section sets new-style macros based on old-style ones, for compatibility */ + +#ifndef RC_INVOKED #if defined (__STL_DEBUG) && !defined (_STLP_DEBUG) # define _STLP_DEBUG __STL_DEBUG @@ -78,3 +80,5 @@ # error STLport do not support anymore the wrapper mode. If you want to use STLport \ use its iostreams implementation or no iostreams at all. #endif + +#endif /* RC_INVOKED */ Modified: trunk/reactos/include/c++/stlport/stl/config/features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/config/features.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/config/features.h [iso-8859-1] Sat Mar 10 19:20:27 2012 @@ -26,6 +26,8 @@ #ifndef _STLP_FEATURES_H #define _STLP_FEATURES_H +#ifndef RC_INVOKED + /* * Purpose of this file: * @@ -1076,4 +1078,6 @@ #undef _STLP_NO_NEW_STYLE_CASTS #undef __AUTO_CONFIGURED +#endif /* RC_INVOKED */ + #endif /* _STLP_FEATURES_H */

1 0

[akhaldi] 56104: [CMAKE] * Fix a typo.
by akhaldi＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: akhaldi Date: Sat Mar 10 18:02:40 2012 New Revision: 56104 URL: http://svn.reactos.org/svn/reactos?rev=56104&view=rev Log: [CMAKE] * Fix a typo. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56104… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 10 18:02:40 2012 @@ -178,7 +178,7 @@ # add our library # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL + add_library(lib${_file} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm) # set correct "link rule"

1 0

[ekohl] 56103: [DEVMGR] DeviceAdvancedProperties: Show the details page of a device property sheet in extended mode only.
by ekohl＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: ekohl Date: Sat Mar 10 15:26:02 2012 New Revision: 56103 URL: http://svn.reactos.org/svn/reactos?rev=56103&view=rev Log: [DEVMGR] DeviceAdvancedProperties: Show the details page of a device property sheet in extended mode only. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sat Mar 10 15:26:02 2012 @@ -66,6 +66,7 @@ UINT Flags; struct { + UINT Extended : 1; UINT FreeDevPropSheets : 1; UINT CanDisable : 1; UINT DeviceStarted : 1; @@ -2019,7 +2020,8 @@ dap->nDevPropSheets++; /* include the details page */ - dap->nDevPropSheets++; + if (dap->Extended) + dap->nDevPropSheets++; /* add the device property sheets */ if (dap->nDevPropSheets != 0) @@ -2093,8 +2095,9 @@ } } - if (1) - { + if (dap->Extended) + { + /* Add the details page */ PROPSHEETPAGE pspDetails = {0}; pspDetails.dwSize = sizeof(PROPSHEETPAGE); pspDetails.dwFlags = PSP_DEFAULT; @@ -2117,9 +2120,9 @@ dap->DevPropSheets[iPage] = NULL; } } - } - - /* FIXME: Add the resources page */ + + /* FIXME: Add the resources page */ + } /* FIXME: Add the power page */ } @@ -2445,6 +2448,7 @@ DevAdvPropInfo->IsAdmin = IsUserAdmin(); DevAdvPropInfo->DoDefaultDevAction = ((dwFlags & DPF_DEVICE_STATUS_ACTION) != 0); + DevAdvPropInfo->Extended = ((dwFlags & DPF_EXTENDED) != 0); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE | PSH_NOAPPLYNOW;

1 0

[spetreolle] 56102: [ROSAPPS] Add maze and green to build.
by spetreolle＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: spetreolle Date: Sat Mar 10 13:36:45 2012 New Revision: 56102 URL: http://svn.reactos.org/svn/reactos?rev=56102&view=rev Log: [ROSAPPS] Add maze and green to build. Added: trunk/rosapps/demos/CMakelists.txt (with props) trunk/rosapps/demos/maze/CMakeLists.txt (with props) trunk/rosapps/drivers/CMakelists.txt (with props) trunk/rosapps/drivers/green/CMakelists.txt (with props) Modified: trunk/rosapps/CMakeLists.txt Modified: trunk/rosapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/CMakeLists.txt?rev=56102&r… ============================================================================== --- trunk/rosapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/CMakeLists.txt [iso-8859-1] Sat Mar 10 13:36:45 2012 @@ -1,1 +1,3 @@ -add_subdirectory(applications) +add_subdirectory(applications) +add_subdirectory(demos) +add_subdirectory(drivers) Added: trunk/rosapps/demos/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/CMakelists.txt?rev=5… ============================================================================== --- trunk/rosapps/demos/CMakelists.txt (added) +++ trunk/rosapps/demos/CMakelists.txt [iso-8859-1] Sat Mar 10 13:36:45 2012 @@ -1,0 +1,1 @@ +add_subdirectory(maze) Propchange: trunk/rosapps/demos/CMakelists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/demos/maze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/CMakeLists.txt?… ============================================================================== --- trunk/rosapps/demos/maze/CMakeLists.txt (added) +++ trunk/rosapps/demos/maze/CMakeLists.txt [iso-8859-1] Sat Mar 10 13:36:45 2012 @@ -1,0 +1,12 @@ + +set_rc_compiler() + +add_executable(maze + maze.c + maze.rc) + +set_module_type(maze win32gui) + +add_importlibs(maze user32 gdi32 msvcrt kernel32) + +add_cd_file(TARGET maze DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/demos/maze/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/drivers/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/CMakelists.txt?rev… ============================================================================== --- trunk/rosapps/drivers/CMakelists.txt (added) +++ trunk/rosapps/drivers/CMakelists.txt [iso-8859-1] Sat Mar 10 13:36:45 2012 @@ -1,0 +1,1 @@ +add_subdirectory(green) Propchange: trunk/rosapps/drivers/CMakelists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/drivers/green/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/CMakelists.t… ============================================================================== --- trunk/rosapps/drivers/green/CMakelists.txt (added) +++ trunk/rosapps/drivers/green/CMakelists.txt [iso-8859-1] Sat Mar 10 13:36:45 2012 @@ -1,0 +1,19 @@ + +set_rc_compiler() + +add_library(green SHARED + createclose.c + dispatch.c + green.c + keyboard.c + misc.c + pnp.c + power.c + screen.c + green.rc) + +add_pch(green green.h) + +set_module_type(green kernelmodedriver) +add_importlibs(green ntoskrnl hal) +add_cd_file(TARGET green DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/rosapps/drivers/green/CMakelists.txt ------------------------------------------------------------------------------ svn:eol-style = native

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