Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 48639: - Disable ACPI again
by cgutman＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: cgutman Date: Sun Aug 29 03:51:21 2010 New Revision: 48639 URL: http://svn.reactos.org/svn/reactos?rev=48639&view=rev Log: - Disable ACPI again Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Aug 29 03:51:21 2010 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define ENABLE_ACPI +//#define ENABLE_ACPI /* GLOBALS *******************************************************************/

1 0

[cgutman] 48638: [NTOSKRNL] - Fix a regression in ACPI function from r48581 - Enable ACPI for testing purposes (will be disabled next commit)
by cgutman＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: cgutman Date: Sun Aug 29 03:48:59 2010 New Revision: 48638 URL: http://svn.reactos.org/svn/reactos?rev=48638&view=rev Log: [NTOSKRNL] - Fix a regression in ACPI function from r48581 - Enable ACPI for testing purposes (will be disabled next commit) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Aug 29 03:48:59 2010 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -//#define ENABLE_ACPI +#define ENABLE_ACPI /* GLOBALS *******************************************************************/ @@ -2643,32 +2643,30 @@ if (IopIsAcpiComputer()) { InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); - Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, &Disposition); + Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); ZwClose(hRoot); if (!NT_SUCCESS(Status)) return Status; + InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); + Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, &ObjectAttributes, 0, NULL, 0, &Disposition); + ZwClose(hHalAcpiDevice); + if (!NT_SUCCESS(Status)) + return Status; if (Disposition == REG_CREATED_NEW_KEY) { - InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); - Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); - ZwClose(hHalAcpiDevice); - if (!NT_SUCCESS(Status)) - return Status; Status = ZwSetValueKey(hHalAcpiId, &DeviceDescU, 0, REG_SZ, HalAcpiDeviceDesc.Buffer, HalAcpiDeviceDesc.MaximumLength); if (NT_SUCCESS(Status)) Status = ZwSetValueKey(hHalAcpiId, &HardwareIDU, 0, REG_MULTI_SZ, HalAcpiHardwareID.Buffer, HalAcpiHardwareID.MaximumLength); + } + if (NT_SUCCESS(Status)) + { + InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); + Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); if (NT_SUCCESS(Status)) - { - InitializeObjectAttributes(&ObjectAttributes, &LogConfU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiId, NULL); - Status = ZwCreateKey(&hLogConf, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); - if (NT_SUCCESS(Status)) - ZwClose(hLogConf); - } - ZwClose(hHalAcpiId); - return Status; - } - ZwClose(hHalAcpiDevice); - return STATUS_SUCCESS; + ZwClose(hLogConf); + } + ZwClose(hHalAcpiId); + return Status; } else {

1 0

[cgutman] 48637: [TCPIP] - Don't allocate pool if there is nothing in the route table - Fixes bug 5493
by cgutman＠svn.reactos.org 29 Aug '10

29 Aug '10

Author: cgutman Date: Sun Aug 29 02:29:10 2010 New Revision: 48637 URL: http://svn.reactos.org/svn/reactos?rev=48637&view=rev Log: [TCPIP] - Don't allocate pool if there is nothing in the route table - Fixes bug 5493 Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Sun Aug 29 02:29:10 2010 @@ -21,15 +21,21 @@ KIRQL OldIrql; UINT RtCount = CountFIBs(IF); UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount; - PFIB_ENTRY RCache = - ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ), - RCacheCur = RCache; - PIPROUTE_ENTRY RouteEntries = ExAllocatePool( NonPagedPool, Size ), - RtCurrent = RouteEntries; + PFIB_ENTRY RCache, RCacheCur; + PIPROUTE_ENTRY RouteEntries, RtCurrent; UINT i; - TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d, RCache = %08x\n", - RtCount, RCache)); + TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d\n", + RtCount)); + + if (RtCount == 0) + return InfoCopyOut(NULL, 0, NULL, BufferSize); + + RouteEntries = ExAllocatePool( NonPagedPool, Size ); + RtCurrent = RouteEntries; + + RCache = ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ); + RCacheCur = RCache; if( !RCache || !RouteEntries ) { if( RCache ) ExFreePool( RCache );

1 0

[mjmartin] 48636: [win32k] - Mouse messages can be sent before the desktop is initialized. Check for this and return false if its not. FIxes assert when moving mouse before desktop is up.
by mjmartin＠svn.reactos.org 28 Aug '10

28 Aug '10

Author: mjmartin Date: Sat Aug 28 23:55:27 2010 New Revision: 48636 URL: http://svn.reactos.org/svn/reactos?rev=48636&view=rev Log: [win32k] - Mouse messages can be sent before the desktop is initialized. Check for this and return false if its not. FIxes assert when moving mouse before desktop is up. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Aug 28 23:55:27 2010 @@ -350,6 +350,10 @@ PWINDOW_OBJECT CaptureWindow = NULL; HWND hCaptureWin; + /* FIXME: Mouse message can be sent before the Desktop is up and running in which case ScopeWin (Desktop) is 0. + Is this the best fix? */ + if (ScopeWin == 0) return FALSE; + ASSERT_REFS_CO(ScopeWin); /*

1 0

[mjmartin] 48635: [input/i8042prt] - Fix a check when queuing the mouse packet. Check that the buffer size (MouseInBuffer) is not greater or equal to MouseDataQueueSize. Fixes a NonPagedPool corrup...
by mjmartin＠svn.reactos.org 28 Aug '10

28 Aug '10

Author: mjmartin Date: Sat Aug 28 23:23:43 2010 New Revision: 48635 URL: http://svn.reactos.org/svn/reactos?rev=48635&view=rev Log: [input/i8042prt] - Fix a check when queuing the mouse packet. Check that the buffer size (MouseInBuffer) is not greater or equal to MouseDataQueueSize. Fixes a NonPagedPool corruption that occurs when the mouse is moved before the desktop window is up and running. Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Sat Aug 28 23:23:43 2010 @@ -49,7 +49,7 @@ DeviceExtension->MouseComplete = TRUE; DeviceExtension->MouseInBuffer++; - if (DeviceExtension->MouseInBuffer > DeviceExtension->Common.PortDeviceExtension->Settings.MouseDataQueueSize) + if (DeviceExtension->MouseInBuffer >= DeviceExtension->Common.PortDeviceExtension->Settings.MouseDataQueueSize) { WARN_(I8042PRT, "Mouse buffer overflow\n"); DeviceExtension->MouseInBuffer--;

1 0

[akhaldi] 48634: [CMAKE] - Include crt headers when compiling RC files.
by akhaldi＠svn.reactos.org 28 Aug '10

28 Aug '10

Author: akhaldi Date: Sat Aug 28 17:41:06 2010 New Revision: 48634 URL: http://svn.reactos.org/svn/reactos?rev=48634&view=rev Log: [CMAKE] - Include crt headers when compiling RC files. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sat Aug 28 17:41:06 2010 @@ -19,7 +19,7 @@ SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -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/mingw32 -O coff -o <OBJECT> ") +SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -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> ") # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here

1 0

[akhaldi] 48633: [CMAKE] - Add mscoree, msg711.acm, msgina, msgsm32.acm, msimg32, msnet32, mssign32, mssip32, msvcrt20, msvcrt40, msvfw32, msvidc32, mswsock, nddeapi, netapi32, newdev, ntdsapi, ntl...
by akhaldi＠svn.reactos.org 28 Aug '10

28 Aug '10

Author: akhaldi Date: Sat Aug 28 13:20:03 2010 New Revision: 48633 URL: http://svn.reactos.org/svn/reactos?rev=48633&view=rev Log: [CMAKE] - Add mscoree, msg711.acm, msgina, msgsm32.acm, msimg32, msnet32, mssign32, mssip32, msvcrt20, msvcrt40, msvfw32, msvidc32, mswsock, nddeapi, netapi32, newdev, ntdsapi, ntlanman, ntprint, olecli32, oledlg, olesvr32, olethk32, pidgen, powrprof, printui, query, rasapi32, rasdlg, rasman, resutils and samlib to build. Added: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/printui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/query/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -54,5 +54,37 @@ add_subdirectory(msadp32.acm) add_subdirectory(msafd) add_subdirectory(mscms) +add_subdirectory(mscoree) +add_subdirectory(msg711.acm) +add_subdirectory(msgina) +add_subdirectory(msgsm32.acm) +add_subdirectory(msimg32) +add_subdirectory(msnet32) +add_subdirectory(mssign32) +add_subdirectory(mssip32) add_subdirectory(msvcrt) +add_subdirectory(msvcrt20) +add_subdirectory(msvcrt40) +add_subdirectory(msvfw32) +add_subdirectory(msvidc32) +add_subdirectory(mswsock) +add_subdirectory(nddeapi) +add_subdirectory(netapi32) +add_subdirectory(newdev) +add_subdirectory(ntdsapi) +add_subdirectory(ntlanman) +add_subdirectory(ntprint) +add_subdirectory(olecli32) +add_subdirectory(oledlg) +add_subdirectory(olesvr32) +add_subdirectory(olethk32) +add_subdirectory(pidgen) +add_subdirectory(powrprof) +add_subdirectory(printui) +add_subdirectory(query) +add_subdirectory(rasapi32) +add_subdirectory(rasdlg) +add_subdirectory(rasman) +add_subdirectory(resutils) +add_subdirectory(samlib) add_subdirectory(user32) Added: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree… ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,22 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mscoree ${CMAKE_CURRENT_SOURCE_DIR}/mscoree.spec ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) + +add_library(mscoree SHARED corruntimehost.c mscoree_main.c) + +set_target_properties(mscoree PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mscoree + ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def + wine + mingw_common + -ladvapi32 + -lshell32 + -luuid) + +add_dependencies(mscoree mscoree_def psdk) Propchange: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,28 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__) + +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) + +add_library(msg711.acm SHARED msg711.c) + +set_target_properties(msg711.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(msg711.acm + ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def + wine + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(msg711.acm msg711.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/… ============================================================================== --- branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,27 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(include) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msgina ${CMAKE_CURRENT_SOURCE_DIR}/msgina.spec ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) + +add_library(msgina SHARED + gui.c + msgina.c + stubs.c + tui.c + msgina.rc) + +set_target_properties(msgina PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msgina + ${CMAKE_CURRENT_BINARY_DIR}/msgina.def + wine + mingw_common + -ladvapi32 + -luser32 + -lgdi32 + -luserenv) + +add_dependencies(msgina msgina_def psdk) Propchange: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,28 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__) + +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) + +add_library(msgsm32.acm SHARED msgsm32.c) + +set_target_properties(msgsm32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(msgsm32.acm + ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def + wine + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(msgsm32.acm msgsm32.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(msimg32 ${CMAKE_CURRENT_SOURCE_DIR}/msimg32.spec ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) + +add_library(msimg32 SHARED msimg32_main.c) + +set_target_properties(msimg32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msimg32 + ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def + wine + mingw_common + -lgdi32) + +add_dependencies(msimg32 msimg32_def psdk) Propchange: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msnet32… ============================================================================== --- branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(msnet32 ${CMAKE_CURRENT_SOURCE_DIR}/msnet32.spec ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def) + +add_library(msnet32 SHARED msnet_main.c) + +set_target_properties(msnet32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msnet32 + ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def + wine + mingw_common) + +add_dependencies(msnet32 msnet32_def psdk) Propchange: branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssign3… ============================================================================== --- branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(mssign32 ${CMAKE_CURRENT_SOURCE_DIR}/mssign32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def) + +add_library(mssign32 SHARED mssign32_main.c) + +set_target_properties(mssign32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mssign32 + ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def + wine + mingw_common) + +add_dependencies(mssign32 mssign32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssip32… ============================================================================== --- branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(mssip32 ${CMAKE_CURRENT_SOURCE_DIR}/mssip32.spec ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def) + +add_library(mssip32 SHARED main.c) + +set_target_properties(mssip32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mssip32 + ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def + wine + mingw_common) + +add_dependencies(mssip32 mssip32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,21 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) +add_definitions(-DCRTDLL) + +spec2def(msvcrt20 ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt20.spec ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def) + +add_library(msvcrt20 SHARED msvcrt20.c) + +set_target_properties(msvcrt20 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(msvcrt20 + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def + wine + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(msvcrt20 msvcrt20_def psdk) Propchange: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt4… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,21 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) +add_definitions(-DCRTDLL) + +spec2def(msvcrt40 ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt40.spec ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) + +add_library(msvcrt40 SHARED msvcrt40.c) + +set_target_properties(msvcrt40 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msvcrt40 + ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def + wine + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(msvcrt40 msvcrt40_def psdk) Propchange: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,30 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) + +spec2def(msvfw32 ${CMAKE_CURRENT_SOURCE_DIR}/msvfw32.spec ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def) + +add_library(msvfw32 SHARED + mciwnd.c + msvideo_main.c + drawdib.c + rsrc.rc) + +set_target_properties(msvfw32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msvfw32 + ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def + wine + -lwinmm + -lversion + -lcomctl32 + -luser32 + -lgdi32 + -ladvapi32 + mingw_common) + +add_dependencies(msvfw32 msvfw32_def psdk) Propchange: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… ============================================================================== --- branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,21 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) + +spec2def(msvidc32 ${CMAKE_CURRENT_SOURCE_DIR}/msvidc32.spec ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def) + +add_library(msvidc32 SHARED msvideo1.c rsrc.rc) + +set_target_properties(msvidc32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msvidc32 + ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def + wine + -luser32 + mingw_common) + +add_dependencies(msvidc32 msvidc32_def psdk) Propchange: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,23 @@ + +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>") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DLE) + +spec2def(mswsock ${CMAKE_CURRENT_SOURCE_DIR}/mswsock.spec ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) + +add_library(mswsock SHARED + extensions.c + stubs.c + mswsock.rc) + +set_target_properties(mswsock PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mswsock + ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def + -lws2_32 + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(mswsock mswsock_def psdk) Propchange: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/nddeapi… ============================================================================== --- branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(nddeapi ${CMAKE_CURRENT_SOURCE_DIR}/nddeapi.spec ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def) + +add_library(nddeapi SHARED nddeapi.c) + +set_target_properties(nddeapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(nddeapi + ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def + wine + mingw_common) + +add_dependencies(nddeapi nddeapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,34 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(netapi32 ${CMAKE_CURRENT_SOURCE_DIR}/netapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) + +add_library(netapi32 SHARED + access.c + apibuf.c + browsr.c + ds.c + local_group.c + nbcmdqueue.c + nbnamecache.c + nbt.c + netapi32.c + netbios.c + share.c + wksta.c) + +set_target_properties(netapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(netapi32 + ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def + wine + -liphlpapi + -lws2_32 + -ladvapi32 + mingw_common) + +add_dependencies(netapi32 netapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,27 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(newdev ${CMAKE_CURRENT_SOURCE_DIR}/newdev.spec ${CMAKE_CURRENT_BINARY_DIR}/newdev.def) + +add_library(newdev SHARED + newdev.c + stubs.c + wizard.c + newdev.rc) + +set_target_properties(newdev PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(newdev + ${CMAKE_CURRENT_BINARY_DIR}/newdev.def + wine + mingw_common + -lgdi32 + -lcomctl32 + -lsetupapi + -ladvapi32 + -luser32 + -lshell32) + +add_dependencies(newdev newdev_def psdk) Propchange: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… ============================================================================== --- branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(ntdsapi ${CMAKE_CURRENT_SOURCE_DIR}/ntdsapi.spec ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def) + +add_library(ntdsapi SHARED ntdsapi.c) + +set_target_properties(ntdsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(ntdsapi + ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def + wine + -luser32 + mingw_common) + +add_dependencies(ntdsapi ntdsapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntlanma… ============================================================================== --- branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,18 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(ntlanman ${CMAKE_CURRENT_SOURCE_DIR}/ntlanman.spec ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def) + +add_library(ntlanman SHARED ntlanman.c ntlanman.rc) + +set_target_properties(ntlanman PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(ntlanman + ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def + wine + mingw_common + -lnetapi32) + +add_dependencies(ntlanman ntlanman_def psdk) Propchange: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntprint… ============================================================================== --- branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(ntprint ${CMAKE_CURRENT_SOURCE_DIR}/ntprint.spec ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def) + +add_library(ntprint SHARED ntprint.c ntprint.rc) + +set_target_properties(ntprint PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(ntprint + ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def + wine + -lwinspool + mingw_common) + +add_dependencies(ntprint ntprint_def psdk) Propchange: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… ============================================================================== --- branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,21 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(olecli32 ${CMAKE_CURRENT_SOURCE_DIR}/olecli32.spec ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def) + +add_library(olecli32 SHARED olecli_main.c) + +set_target_properties(olecli32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(olecli32 + ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def + wine + -lole32 + -lgdi32 + mingw_common) + +add_dependencies(olecli32 olecli32_def psdk) Propchange: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,27 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(oledlg ${CMAKE_CURRENT_SOURCE_DIR}/oledlg.spec ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def) + +add_library(oledlg SHARED + insobjdlg.c + oledlg_main.c + pastespl.c + rsrc.rc) + +set_target_properties(oledlg PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(oledlg + ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def + wine + -lole32 + -lcomdlg32 + -luser32 + -ladvapi32 + mingw_common) + +add_dependencies(oledlg oledlg_def psdk) Propchange: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr3… ============================================================================== --- branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(olesvr32 ${CMAKE_CURRENT_SOURCE_DIR}/olesvr32.spec ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def) + +add_library(olesvr32 SHARED olesvr_main.c) + +set_target_properties(olesvr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(olesvr32 + ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def + wine + mingw_common) + +add_dependencies(olesvr32 olesvr32_def psdk) Propchange: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olethk3… ============================================================================== --- branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(olethk32 ${CMAKE_CURRENT_SOURCE_DIR}/olethk32.spec ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def) + +add_library(olethk32 SHARED main.c version.rc) + +set_target_properties(olethk32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(olethk32 + ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def + wine + mingw_common) + +add_dependencies(olethk32 olethk32_def psdk) Propchange: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pidgen/… ============================================================================== --- branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(pidgen ${CMAKE_CURRENT_SOURCE_DIR}/pidgen.spec ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def) + +add_library(pidgen SHARED main.c rsrc.rc) + +set_target_properties(pidgen PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(pidgen + ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def + wine + mingw_common) + +add_dependencies(pidgen pidgen_def psdk) Propchange: branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(powrprof ${CMAKE_CURRENT_SOURCE_DIR}/powrprof.spec ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) + +add_library(powrprof SHARED powrprof.c powrprof.rc) + +set_target_properties(powrprof PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(powrprof + ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def + wine + -ladvapi32 + -luser32 + -lcomctl32 + mingw_common) + +add_dependencies(powrprof powrprof_def psdk) Propchange: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/printui… ============================================================================== --- branches/cmake-bringup/dll/win32/printui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/printui/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(printui ${CMAKE_CURRENT_SOURCE_DIR}/printui.spec ${CMAKE_CURRENT_BINARY_DIR}/printui.def) + +add_library(printui SHARED printui.c printui.rc) + +set_target_properties(printui PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(printui + ${CMAKE_CURRENT_BINARY_DIR}/printui.def + wine + -lshell32 + mingw_common) + +add_dependencies(printui printui_def psdk) Propchange: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/C… ============================================================================== --- branches/cmake-bringup/dll/win32/query/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,20 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(query ${CMAKE_CURRENT_SOURCE_DIR}/query.spec ${CMAKE_CURRENT_BINARY_DIR}/query.def) + +add_library(query SHARED query_main.c) + +set_target_properties(query PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(query + ${CMAKE_CURRENT_BINARY_DIR}/query.def + wine + -luuid + mingw_common) + +add_dependencies(query query_def psdk) Propchange: branches/cmake-bringup/dll/win32/query/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(rasapi32 ${CMAKE_CURRENT_SOURCE_DIR}/rasapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def) + +add_library(rasapi32 SHARED rasapi.c) + +set_target_properties(rasapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(rasapi32 + ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def + wine + mingw_common) + +add_dependencies(rasapi32 rasapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,16 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +spec2def(rasdlg ${CMAKE_CURRENT_SOURCE_DIR}/rasdlg.spec ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def) + +add_library(rasdlg SHARED rasdlg.c rasdlg.rc) + +set_target_properties(rasdlg PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(rasdlg + ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def + wine + -luuid + mingw_common) + +add_dependencies(rasdlg rasdlg_def psdk) Propchange: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasman/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,16 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +spec2def(rasman ${CMAKE_CURRENT_SOURCE_DIR}/rasman.spec ${CMAKE_CURRENT_BINARY_DIR}/rasman.def) + +add_library(rasman SHARED rasman.c rasman.rc) + +set_target_properties(rasman PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(rasman + ${CMAKE_CURRENT_BINARY_DIR}/rasman.def + wine + -luuid + mingw_common) + +add_dependencies(rasman rasman_def psdk) Propchange: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/resutil… ============================================================================== --- branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(resutils ${CMAKE_CURRENT_SOURCE_DIR}/resutils.spec ${CMAKE_CURRENT_BINARY_DIR}/resutils.def) + +add_library(resutils SHARED resutils.c) + +set_target_properties(resutils PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(resutils + ${CMAKE_CURRENT_BINARY_DIR}/resutils.def + wine + mingw_common) + +add_dependencies(resutils resutils_def psdk) Propchange: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sat Aug 28 13:20:03 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__WINESRC__) + +spec2def(samlib ${CMAKE_CURRENT_SOURCE_DIR}/samlib.spec ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) + +add_library(samlib SHARED dllmain.c samlib.c samlib.rc) + +set_target_properties(samlib PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(samlib + ${CMAKE_CURRENT_BINARY_DIR}/samlib.def + -ladvapi32 + mingw_common) + +add_dependencies(samlib samlib_def psdk) Propchange: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 48632: [ntoskrnl/ps] - When deleting a Process remove the Process from the MmProcessList. Fixes random NonPaged Pool corruptions. Thanks aicom for assistance.
by mjmartin＠svn.reactos.org 28 Aug '10

28 Aug '10

Author: mjmartin Date: Sat Aug 28 00:26:02 2010 New Revision: 48632 URL: http://svn.reactos.org/svn/reactos?rev=48632&view=rev Log: [ntoskrnl/ps] - When deleting a Process remove the Process from the MmProcessList. Fixes random NonPaged Pool corruptions. Thanks aicom for assistance. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=486… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Aug 28 00:26:02 2010 @@ -300,6 +300,8 @@ /* Detach */ KeUnstackDetachProcess(&ApcState); + + RemoveEntryList(&Process->MmProcessLinks); /* Completely delete the Address Space */ MmDeleteProcessAddressSpace(Process);

1 0

[mjmartin] 48631: [ntoskrnl/ps] - Acquire and Release RundownProtection on the Parent Pocess not the newly created Pcess when setting the SectionObject.
by mjmartin＠svn.reactos.org 27 Aug '10

27 Aug '10

Author: mjmartin Date: Fri Aug 27 22:18:10 2010 New Revision: 48631 URL: http://svn.reactos.org/svn/reactos?rev=48631&view=rev Log: [ntoskrnl/ps] - Acquire and Release RundownProtection on the Parent Pocess not the newly created Pcess when setting the SectionObject. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Fri Aug 27 22:18:10 2010 @@ -469,14 +469,14 @@ if (Parent != PsInitialSystemProcess) { /* It's not, so acquire the process rundown */ - if (ExAcquireRundownProtection(&Process->RundownProtect)) + if (ExAcquireRundownProtection(&Parent->RundownProtect)) { /* If the parent has a section, use it */ SectionObject = Parent->SectionObject; if (SectionObject) ObReferenceObject(SectionObject); /* Release process rundown */ - ExReleaseRundownProtection(&Process->RundownProtect); + ExReleaseRundownProtection(&Parent->RundownProtect); } /* If we don't have a section object */

1 0

[tkreuzer] 48630: [WIN32K] - Rework EngSetPointerShape, to first allocate the neccessary surfaces, before deleting the old ones. Also check in IntShowMousePointer if a saving surface is present. Th...
by tkreuzer＠svn.reactos.org 27 Aug '10

27 Aug '10

Author: tkreuzer Date: Fri Aug 27 10:57:54 2010 New Revision: 48630 URL: http://svn.reactos.org/svn/reactos?rev=48630&view=rev Log: [WIN32K] - Rework EngSetPointerShape, to first allocate the neccessary surfaces, before deleting the old ones. Also check in IntShowMousePointer if a saving surface is present. This way a failure to allocate a surface will not result in a crash, but keep the old mouse pointer. See issue #5402 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Aug 27 10:57:54 2010 @@ -208,6 +208,9 @@ } pgp->Enabled = TRUE; + + /* Check if we have any mouse pointer */ + if (!pgp->psurfSave) return; /* Calculate pointer coordinates */ pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; @@ -318,42 +321,117 @@ { PDEVOBJ *ppdev; GDIPOINTER *pgp; - LONG lDelta; - HBITMAP hbmp; - RECTL rcl; + LONG lDelta = 0; + HBITMAP hbmSave = NULL, hbmColor = NULL, hbmMask = NULL; + PSURFACE psurfSave = NULL, psurfColor = NULL, psurfMask = NULL; + RECTL rectl; + SIZEL sizel = {0, 0}; ASSERT(pso); ppdev = GDIDEV(pso); pgp = &ppdev->Pointer; + /* Do we have any bitmap at all? */ + if (psoColor || psoMask) + { + /* Get the size of the new pointer */ + if (psoColor) + { + sizel.cx = psoColor->sizlBitmap.cx; + sizel.cy = psoColor->sizlBitmap.cy; + } + else// if (psoMask) + { + sizel.cx = psoMask->sizlBitmap.cx; + sizel.cy = psoMask->sizlBitmap.cy / 2; + } + + rectl.left = 0; + rectl.top = 0; + rectl.right = sizel.cx; + rectl.bottom = sizel.cy; + + /* Calculate lDelta for our surfaces. */ + lDelta = DIB_GetDIBWidthBytes(sizel.cx, + BitsPerFormat(pso->iBitmapFormat)); + + /* Create a bitmap for saving the pixels under the cursor. */ + hbmSave = EngCreateBitmap(sizel, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfSave = SURFACE_ShareLockSurface(hbmSave); + if (!psurfSave) goto failure; + } + if (psoColor) { - pgp->Size.cx = psoColor->sizlBitmap.cx; - pgp->Size.cy = psoColor->sizlBitmap.cy; - if (psoMask) - { - // CHECKME: Is this really required? if we have a color surface, - // we only need the AND part of the mask. - /* Check if the sizes match as they should */ - if (psoMask->sizlBitmap.cx != psoColor->sizlBitmap.cx || - psoMask->sizlBitmap.cy != psoColor->sizlBitmap.cy * 2) - { - DPRINT("Sizes of mask (%ld,%ld) and color (%ld,%ld) don't match\n", - psoMask->sizlBitmap.cx, psoMask->sizlBitmap.cy, - psoColor->sizlBitmap.cx, psoColor->sizlBitmap.cy); -// return SPS_ERROR; - } - } - } - else if (psoMask) - { - pgp->Size.cx = psoMask->sizlBitmap.cx; - pgp->Size.cy = psoMask->sizlBitmap.cy / 2; - } - + /* Color bitmap must have the same format as the dest surface */ + if (psoColor->iBitmapFormat != pso->iBitmapFormat) goto failure; + + /* Create a bitmap to copy the color bitmap to */ + hbmColor = EngCreateBitmap(psoColor->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfColor = SURFACE_ShareLockSurface(hbmColor); + if (!psurfColor) goto failure; + + /* Now copy the given bitmap */ + rectl.bottom = psoColor->sizlBitmap.cy; + IntEngCopyBits(&psurfColor->SurfObj, + psoColor, + NULL, + pxlo, + &rectl, + (POINTL*)&rectl); + } + + /* Create a mask surface */ + if (psoMask) + { + EXLATEOBJ exlo; + PPALETTE ppal; + + /* Create a bitmap for the mask */ + hbmMask = EngCreateBitmap(psoMask->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfMask = SURFACE_ShareLockSurface(hbmMask); + if (!psurfMask) goto failure; + + /* Initialize an EXLATEOBJ */ + ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); + EXLATEOBJ_vInitialize(&exlo, + &gpalMono, + ppal, + 0, + RGB(0xff,0xff,0xff), + RGB(0,0,0)); + + /* Copy the mask bitmap */ + rectl.bottom = psoMask->sizlBitmap.cy; + IntEngCopyBits(&psurfMask->SurfObj, + psoMask, + NULL, + &exlo.xlo, + &rectl, + (POINTL*)&rectl); + + /* Cleanup */ + EXLATEOBJ_vCleanup(&exlo); + if (ppal) PALETTE_UnlockPalette(ppal); + } + + /* Hide mouse pointer */ IntHideMousePointer(ppdev, pso); + /* Free old color bitmap */ if (pgp->psurfColor) { EngDeleteSurface(pgp->psurfColor->BaseObject.hHmgr); @@ -361,6 +439,7 @@ pgp->psurfColor = NULL; } + /* Free old mask bitmap */ if (pgp->psurfMask) { EngDeleteSurface(pgp->psurfMask->BaseObject.hHmgr); @@ -368,7 +447,8 @@ pgp->psurfMask = NULL; } - if (pgp->psurfSave != NULL) + /* Free old save bitmap */ + if (pgp->psurfSave) { EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr); SURFACE_ShareUnlockSurface(pgp->psurfSave); @@ -378,94 +458,17 @@ /* See if we are being asked to hide the pointer. */ if (psoMask == NULL && psoColor == NULL) { + /* We're done */ return SPS_ACCEPT_NOEXCLUDE; } + /* Now set the new cursor */ + pgp->psurfColor = psurfColor; + pgp->psurfMask = psurfMask; + pgp->psurfSave = psurfSave; pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; - - /* Calculate lDelta for our surfaces. */ - lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, - BitsPerFormat(pso->iBitmapFormat)); - - rcl.left = 0; - rcl.top = 0; - rcl.right = pgp->Size.cx; - rcl.bottom = pgp->Size.cy; - - /* Create surface for saving the pixels under the cursor. */ - hbmp = EngCreateBitmap(pgp->Size, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfSave = SURFACE_ShareLockSurface(hbmp); - - /* Create a mask surface */ - if (psoMask) - { - EXLATEOBJ exlo; - PPALETTE ppal; - - hbmp = EngCreateBitmap(psoMask->sizlBitmap, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfMask = SURFACE_ShareLockSurface(hbmp); - - if(pgp->psurfMask) - { - ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); - EXLATEOBJ_vInitialize(&exlo, - &gpalMono, - ppal, - 0, - RGB(0xff,0xff,0xff), - RGB(0,0,0)); - - rcl.bottom = psoMask->sizlBitmap.cy; - IntEngCopyBits(&pgp->psurfMask->SurfObj, - psoMask, - NULL, - &exlo.xlo, - &rcl, - (POINTL*)&rcl); - - EXLATEOBJ_vCleanup(&exlo); - if (ppal) - PALETTE_UnlockPalette(ppal); - } - } - else - { - pgp->psurfMask = NULL; - } - - /* Create a color surface */ - if (psoColor) - { - hbmp = EngCreateBitmap(psoColor->sizlBitmap, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - pgp->psurfColor = SURFACE_ShareLockSurface(hbmp); - if (pgp->psurfColor) - { - rcl.bottom = psoColor->sizlBitmap.cy; - IntEngCopyBits(&pgp->psurfColor->SurfObj, - psoColor, - NULL, - pxlo, - &rcl, - (POINTL*)&rcl); - } - } - else - { - pgp->psurfColor = NULL; - } + pgp->Size = sizel; if (x != -1) { @@ -488,6 +491,17 @@ } return SPS_ACCEPT_NOEXCLUDE; + +failure: + /* Cleanup surfaces */ + if (hbmMask) EngDeleteSurface(hbmMask); + if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask); + if (hbmColor) EngDeleteSurface(hbmColor); + if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + if (hbmSave) EngDeleteSurface(hbmSave); + if (psurfSave) SURFACE_ShareUnlockSurface(psurfSave); + + return SPS_ERROR; } /*

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