Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 48769: - Fix GetTextExtentExPointI and GetTextExtentPointI prototypes to match Platform SDK.
by fireball＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: fireball Date: Mon Sep 13 20:45:45 2010 New Revision: 48769 URL: http://svn.reactos.org/svn/reactos?rev=48769&view=rev Log: - Fix GetTextExtentExPointI and GetTextExtentPointI prototypes to match Platform SDK. Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Mon Sep 13 20:45:45 2010 @@ -969,7 +969,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, +BOOL WINAPI GetTextExtentExPointI( HDC hdc, LPWORD indices, int count, int max_ext, LPINT nfit, LPINT dxs, LPSIZE size ) { BOOL ret = FALSE; @@ -1010,7 +1010,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetTextExtentPointI( HDC hdc, const WORD *indices, INT count, LPSIZE size ) +BOOL WINAPI GetTextExtentPointI( HDC hdc, LPWORD indices, int count, LPSIZE size ) { return GetTextExtentExPointI( hdc, indices, count, 0, NULL, NULL, size ); }

1 0

[sir_richard] 48768: Patch by Anton Yarotsky: [FREELDR]: Implement support for /redirect=comX (usebiossettings not yet supported) and /redirectbaudrate. Uses cportlib. Tested, serial output works a...
by sir_richard＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: sir_richard Date: Mon Sep 13 20:36:49 2010 New Revision: 48768 URL: http://svn.reactos.org/svn/reactos?rev=48768&view=rev Log: Patch by Anton Yarotsky: [FREELDR]: Implement support for /redirect=comX (usebiossettings not yet supported) and /redirectbaudrate. Uses cportlib. Tested, serial output works and kernel reports "Headless support is not yet implemented". Future revisions should support ACPI SRT for PCI-based serial ports on server systems. Added: trunk/reactos/boot/freeldr/freeldr/windows/headless.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -32,5 +32,6 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> + <library>cportlib</library> </module> </ifnot> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -75,6 +75,7 @@ <file>winldr.c</file> <file>wlmemory.c</file> <file>wlregistry.c</file> + <file>headless.c</file> </directory> <file>freeldr.c</file> <file>debug.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -14,6 +14,7 @@ <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> + <library>cportlib</library> <library>rtl</library> <library>libcntpr</library> </module> Added: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -1,0 +1,313 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/freeldr/windows/headless.c + * PURPOSE: Provides support for Windows Emergency Management Services + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#include <cportlib/cportlib.h> + +/* Note: Move these to some smbios.h header */ +#define SYSID_TYPE_UUID "_UUID_" +#define SYSID_UUID_DATA_SIZE 16 +#include <pshpack1.h> +typedef struct _SYSID_UUID_ENTRY +{ + UCHAR Type[6]; + UCHAR Checksum; + USHORT Length; + UCHAR UUID[SYSID_UUID_DATA_SIZE]; +} SYSID_UUID_ENTRY, *PSYSID_UUID_ENTRY; +#include <poppack.h> + +/* GLOBALS ********************************************************************/ + +HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +BOOLEAN WinLdrTerminalConnected; +ULONG WinLdrTerminalDeviceId; +ULONG WinLdrTerminalDelay; + +CPPORT Port[4] = +{ + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE} +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +WinLdrLoadGUID(OUT PGUID SystemGuid) +{ + PSYSID_UUID_ENTRY CurrentAddress; + + CurrentAddress = (PSYSID_UUID_ENTRY)0xE0000; + while (CurrentAddress < (PSYSID_UUID_ENTRY)0x100000) + { + if (RtlCompareMemory(&CurrentAddress->Type, SYSID_TYPE_UUID, 6) == 6) + { + RtlCopyMemory(SystemGuid, &CurrentAddress->UUID, SYSID_UUID_DATA_SIZE); + return; + } + CurrentAddress = (PSYSID_UUID_ENTRY)((ULONG_PTR)CurrentAddress + 1); + } + + RtlZeroMemory(SystemGuid, SYSID_UUID_DATA_SIZE); +} + +BOOLEAN +WinLdrPortInitialize(IN ULONG BaudRate, + IN ULONG PortNumber, + IN PUCHAR PortAddress, + IN BOOLEAN TerminalConnected, + OUT PULONG PortId) +{ + /* Set default baud rate */ + if (BaudRate == 0) BaudRate = 19200; + + /* Check if port or address given */ + if (PortNumber) + { + /* Pick correct address for port */ + if (!PortAddress) + { + switch (PortNumber) + { + case 1: + PortAddress = (PUCHAR)0x3F8; + break; + + case 2: + PortAddress = (PUCHAR)0x2F8; + break; + + case 3: + PortAddress = (PUCHAR)0x3E8; + break; + + default: + PortNumber = 4; + PortAddress = (PUCHAR)0x2E8; + } + } + } + else + { + /* Pick correct port for address */ + PortAddress = (PUCHAR)0x2F8; + if (CpDoesPortExist(PortAddress)) + { + PortNumber = 2; + } + else + { + PortAddress = (PUCHAR)0x3F8; + if (!CpDoesPortExist(PortAddress)) return FALSE; + PortNumber = 1; + } + } + + /* Not yet supported */ + ASSERT(LoaderRedirectionInformation.IsMMIODevice == FALSE); + + /* Check if port exists */ + if ((CpDoesPortExist(PortAddress)) || (CpDoesPortExist(PortAddress))) + { + /* Initialize port for first time, or re-initialize if specified */ + if (((TerminalConnected) && (Port[PortNumber - 1].Address)) || + !(Port[PortNumber - 1].Address)) + { + /* Initialize the port, return it */ + CpInitialize(&Port[PortNumber - 1], PortAddress, BaudRate); + *PortId = PortNumber - 1; + return TRUE; + } + } + + return FALSE; +} + +VOID +WinLdrPortPutByte(IN ULONG PortId, + IN UCHAR Data) +{ + CpPutByte(&Port[PortId], Data); +} + +BOOLEAN +WinLdrPortGetByte(IN ULONG PortId, + OUT PUCHAR Data) +{ + return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; +} + +BOOLEAN +WinLdrPortPollOnly(IN ULONG PortId) +{ + UCHAR Dummy; + + return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; +} + +VOID +WinLdrEnableFifo(IN ULONG PortId, + IN BOOLEAN Enable) +{ + CpEnableFifo(Port[PortId].Address, Enable); +} + +VOID +WinLdrInitializeHeadlessPort(VOID) +{ + ULONG PortNumber, BaudRate; + PUCHAR PortAddress; + PCHAR AnsiReset = "\x1B[m"; + ULONG i; + + PortNumber = LoaderRedirectionInformation.PortNumber; + PortAddress = LoaderRedirectionInformation.PortAddress; + BaudRate = LoaderRedirectionInformation.BaudRate; + + /* Pick a port address */ + if (PortNumber) + { + if (!PortAddress) + { + switch (PortNumber) + { + case 2: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x2F8; + break; + + case 3: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x3E8; + break; + + case 4: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x2E8; + break; + + default: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x3F8; + break; + } + } + } + else + { + /* No number, so no EMS */ + WinLdrTerminalConnected = FALSE; + return; + } + + /* Call arch code to initialize the port */ + PortAddress = LoaderRedirectionInformation.PortAddress; + WinLdrTerminalConnected = WinLdrPortInitialize( + BaudRate, + PortNumber, + PortAddress, + WinLdrTerminalConnected, + &WinLdrTerminalDeviceId); + + if (WinLdrTerminalConnected) + { + /* Port seems usable, set it up and get the BIOS GUID */ + WinLdrEnableFifo(WinLdrTerminalDeviceId, TRUE); + + WinLdrLoadGUID(&LoaderRedirectionInformation.SystemGUID); + + /* Calculate delay in us based on the baud, assume 9600 if none given */ + if (!BaudRate) + { + BaudRate = 9600; + LoaderRedirectionInformation.BaudRate = BaudRate; + } + + WinLdrTerminalDelay = (10 * 1000 * 1000) / (BaudRate / 10) / 6; + + /* Sent an ANSI reset sequence to get the terminal up and running */ + for (i = 0; i < strlen(AnsiReset); i++) + { + WinLdrPortPutByte(WinLdrTerminalDeviceId, AnsiReset[i]); + StallExecutionProcessor(WinLdrTerminalDelay); + } + } + else + { + /* The port was bogus, so don't give any information to the kernel */ + RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK)); + } +} + +VOID +WinLdrSetupEms(IN PCHAR BootOptions) +{ + PCHAR RedirectPort; + + /* Use a direction port if one was given, or use ACPI to detect one instead */ + RedirectPort = strstr(BootOptions, "/redirect="); + + if (RedirectPort) + { + RedirectPort = strstr(RedirectPort, "com"); + if (RedirectPort) + { + RedirectPort += sizeof("com") - 1; + LoaderRedirectionInformation.PortNumber = atoi(RedirectPort); + } + else + { + RedirectPort = strstr(RedirectPort, "usebiossettings"); + if (RedirectPort) + { + UiDrawStatusText("ACPI SRT Table Not Supported..."); + } + else + { + LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(RedirectPort, 0, 16); + if (LoaderRedirectionInformation.PortAddress) + { + LoaderRedirectionInformation.PortNumber = 3; + } + } + } + } + + /* Use a direction baudrate if one was given */ + RedirectPort = strstr(BootOptions, "/redirectbaudrate="); + if (RedirectPort) + { + if (strstr(RedirectPort, "115200")) + { + LoaderRedirectionInformation.BaudRate = 115200; + } + else if (strstr(RedirectPort, "57600")) + { + LoaderRedirectionInformation.BaudRate = 57600; + } + else if (strstr(RedirectPort, "19200")) + { + LoaderRedirectionInformation.BaudRate = 19200; + } + else + { + LoaderRedirectionInformation.BaudRate = 9600; + } + } + + /* Enable headless support if parameters were found */ + if (LoaderRedirectionInformation.PortNumber) + { + if (!LoaderRedirectionInformation.BaudRate) + { + LoaderRedirectionInformation.BaudRate = 9600; + } + + WinLdrInitializeHeadlessPort(); + } +} Propchange: trunk/reactos/boot/freeldr/freeldr/windows/headless.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -513,6 +513,10 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); + + /* Setup redirection support */ + extern void WinLdrSetupEms(IN PCHAR BootOptions); + WinLdrSetupEms(BootOptions); /* Detect hardware */ UseRealHeap = TRUE; @@ -597,6 +601,10 @@ /* Save final value of LoaderPagesSpanned */ LoaderBlockVA->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + + /* Set headless block pointer */ + extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; + LoaderBlockVA->Extension->HeadlessLoaderBlock = PaToVa(&LoaderRedirectionInformation); DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA);

1 0

[akhaldi] 48767: [USETUP] - Sylvain Petreolle: Improve debug prints for disk space check.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 17:25:00 2010 New Revision: 48767 URL: http://svn.reactos.org/svn/reactos?rev=48767&view=rev Log: [USETUP] - Sylvain Petreolle: Improve debug prints for disk space check. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Sep 13 17:25:00 2010 @@ -1401,26 +1401,24 @@ static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) { - ULONGLONG m; + ULONGLONG m1, m2; /* check for unpartitioned space */ - m = PartEntry->UnpartitionedLength; - m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - - DPRINT1("Unpartitioned space is %lu MB\n", m); - - if( m > RequiredPartitionDiskSpace) + m1 = PartEntry->UnpartitionedLength; + m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ + + if( m1 > RequiredPartitionDiskSpace) { return TRUE; } /* check for partitioned space */ - m = PartEntry->PartInfo[0].PartitionLength.QuadPart; - m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (m < RequiredPartitionDiskSpace) + m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart; + m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */ + if (m2 < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small (%lu MB), required disk space is %lu MB\n", m, RequiredPartitionDiskSpace); + DPRINT1("Partition is too small(unpartitioned: %I64u MB, partitioned: %I64u MB), required disk space is %lu MB\n", m1, m2, RequiredPartitionDiskSpace); return FALSE; } else

1 0

[akhaldi] 48766: [USETUP] - Christoph von Wittich: Add a debug print, and improve an existing one.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 16:34:15 2010 New Revision: 48766 URL: http://svn.reactos.org/svn/reactos?rev=48766&view=rev Log: [USETUP] - Christoph von Wittich: Add a debug print, and improve an existing one. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Sep 13 16:34:15 2010 @@ -1406,6 +1406,9 @@ /* check for unpartitioned space */ m = PartEntry->UnpartitionedLength; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ + + DPRINT1("Unpartitioned space is %lu MB\n", m); + if( m > RequiredPartitionDiskSpace) { return TRUE; @@ -1417,7 +1420,7 @@ if (m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (%lu MB), required disk space is %lu MB\n", m, RequiredPartitionDiskSpace); return FALSE; } else

1 0

[akhaldi] 48765: [CMAKE] - Add pci, pcixn pcmcia, videoprt and wmilib to build.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 13:48:29 2010 New Revision: 48765 URL: http://svn.reactos.org/svn/reactos?rev=48765&view=rev Log: [CMAKE] - Add pci, pcixn pcmcia, videoprt and wmilib to build. Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wmi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/bus/CMakeLists.txt branches/cmake-bringup/drivers/video/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/videoprt.spec Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -7,3 +7,4 @@ add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) +add_subdirectory(wmi) Modified: branches/cmake-bringup/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/CMake… ============================================================================== --- branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,3 +1,6 @@ add_subdirectory(acpi) add_subdirectory(isapnp) +add_subdirectory(pci) +add_subdirectory(pcix) +add_subdirectory(pcmcia) Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 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>") + +add_library(pci SHARED + fdo.c + pci.c + pdo.c + pci.rc) + +set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pci + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pci psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,50 @@ + +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>") + +list(APPEND SOURCE + arb/ar_busno.c + arb/ar_memio.c + arb/arb_comn.c + arb/tr_irq.c + intrface/agpintrf.c + intrface/busintrf.c + intrface/cardbus.c + intrface/devhere.c + intrface/ideintrf.c + intrface/intrface.c + intrface/lddintrf.c + intrface/locintrf.c + intrface/pmeintf.c + intrface/routintf.c + pci/busno.c + pci/config.c + pci/devhere.c + pci/id.c + pci/ppbridge.c + pci/romimage.c + pci/state.c + debug.c + device.c + dispatch.c + enum.c + fdo.c + guid.c + hookhal.c + init.c + pcivrify.c + pdo.c + power.c + usage.c + utils.c + pci.rc) + +add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE}) + +set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcix + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) +add_dependencies(pcix pcix_def psdk pciclass) Propchange: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 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>") + +add_library(pcmcia SHARED + fdo.c + pcmcia.c + pdo.c + pcmcia.rc) + +set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcmcia + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pcmcia psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/video/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/CMa… ============================================================================== --- branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,2 +1,3 @@ add_subdirectory(font) +add_subdirectory(videoprt) Added: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,37 @@ + +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}/ntoskrnl/include) + +add_definitions(-D_VIDEOPORT_) + +spec2def(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.spec ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) + +list(APPEND SOURCE + agp.c + ddc.c + dispatch.c + dma.c + event.c + funclist.c + int10.c + interrupt.c + resource.c + services.c + spinlock.c + stubs.c + timer.c + videoprt.c + videoprt.rc) + +add_library(videoprt SHARED ${CMAKE_CURRENT_BINARY_DIR}/videoprt_videoprt.h.gch ${SOURCE}) + +set_target_properties(videoprt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(videoprt + ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) +add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -44,9 +44,9 @@ @ stdcall VideoPortGetVgaStatus(ptr ptr) @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) -@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ stdcall -norelay VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ stdcall -norelay VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ stdcall -norelay VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long) Added: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,14 @@ + +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>") + +spec2def(wmilib ${CMAKE_CURRENT_SOURCE_DIR}/wmilib.spec ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) + +add_library(wmilib SHARED wmilib.c wmilib.rc) + +set_target_properties(wmilib PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(wmilib + ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a) + +add_dependencies(wmilib wmilib_def psdk buildno_header bugcodes) Propchange: branches/cmake-bringup/drivers/wmi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 48764: [BATT] Add missing 4th parameter to BatteryClassCoInstaller.
by ekohl＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: ekohl Date: Mon Sep 13 11:48:59 2010 New Revision: 48764 URL: http://svn.reactos.org/svn/reactos?rev=48764&view=rev Log: [BATT] Add missing 4th parameter to BatteryClassCoInstaller. Modified: trunk/reactos/dll/win32/batt/batt.c trunk/reactos/dll/win32/batt/batt.spec Modified: trunk/reactos/dll/win32/batt/batt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.c [iso-8859-1] Mon Sep 13 11:48:59 2010 @@ -38,7 +38,8 @@ WINAPI BatteryClassCoInstaller(IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context) { switch (InstallFunction) { Modified: trunk/reactos/dll/win32/batt/batt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.spec?r… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] Mon Sep 13 11:48:59 2010 @@ -1,3 +1,3 @@ -@ stdcall BatteryClassCoInstaller(long ptr ptr) +@ stdcall BatteryClassCoInstaller(long ptr ptr ptr) @ stdcall BatteryClassInstall(long ptr ptr)

1 0

[akhaldi] 48763: [CMAKE] - Introduce support for the amd64 toolchain. Using it is as simple as adding -DARCH=amd64 to the cmake line (next to the toolchain file define). - Dedicated to Sylvain (Usu...
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 21:03:47 2010 New Revision: 48763 URL: http://svn.reactos.org/svn/reactos?rev=48763&view=rev Log: [CMAKE] - Introduce support for the amd64 toolchain. Using it is as simple as adding -DARCH=amd64 to the cmake line (next to the toolchain file define). - Dedicated to Sylvain (Usurp) ;) 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] Sun Sep 12 21:03:47 2010 @@ -1,12 +1,20 @@ +if(NOT ARCH) set(ARCH i386) +endif(NOT ARCH) # Choose the right MinGW prefix -if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) +if(ARCH MATCHES i386) + +if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") else() set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") -endif() +endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + +elseif(ARCH MATCHES amd64) +set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +endif(ARCH MATCHES i386) # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) @@ -23,7 +31,8 @@ # 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 -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search

1 0

[akhaldi] 48762: [CMAKE] - Improve bootvid, crt and ntoskrnl.
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 21:02:18 2010 New Revision: 48762 URL: http://svn.reactos.org/svn/reactos?rev=48762&view=rev Log: [CMAKE] - Improve bootvid, crt and ntoskrnl. Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… ============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -3,14 +3,18 @@ spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) +list(APPEND SOURCE bootvid.rc) + +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) list(APPEND SOURCE - ${ARCH}/bootvid.c - ${ARCH}/bootdata.c - bootvid.rc) - -if(ARCH MATCHES i386) -list(APPEND SOURCE i386/vga.c) -endif(ARCH MATCHES i386) + i386/bootvid.c + i386/bootdata.c + i386/vga.c) +elseif(ARCH MATCHES arm) +list(APPEND SOURCE + arm/bootvid.c + arm/bootdata.c) +endif(ARCH MATCHES i386 OR ARCH MATCHES amd64) add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -40,11 +40,6 @@ float/isnan.c float/nafter.c float/scalb.c - float/${ARCH}/clearfp.c - float/${ARCH}/cntrlfp.c - float/${ARCH}/fpreset.c - float/${ARCH}/logb.c - float/${ARCH}/statfp.c locale/locale.c math/acos.c math/adjust.c @@ -287,9 +282,23 @@ wine/undname.c) if(ARCH MATCHES i386) -list(APPEND CRT_SOURCE except/i386/prolog.s except/i386/unwind.c) +list(APPEND CRT_SOURCE + except/i386/chkstk_asm.s + except/i386/prolog.s + except/i386/unwind.c + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c) elseif(ARCH MATCHES amd64) -list(APPEND CRT_SOURCE chkstk_asm.s) +list(APPEND CRT_SOURCE + except/amd64/chkstk_asm.s + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c) endif(ARCH MATCHES i386) if(ARCH MATCHES i386) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -23,7 +23,6 @@ cc/mdl.c cc/pin.c cc/view.c - config/${ARCH}/cmhardwr.c config/cmalloc.c config/cmapi.c config/cmboot.c @@ -251,6 +250,7 @@ if(ARCH MATCHES i386) list(APPEND SOURCE + config/i386/cmhardwr.c ex/i386/interlck_asm.S ex/i386/fastinterlck_asm.S ex/i386/ioport.S @@ -280,6 +280,7 @@ vdm/vdmexec.c) elseif(ARCH MATCHES amd64) list(APPEND SOURCE + config/i386/cmhardwr.c ex/amd64/fastinterlck.c ke/amd64/boot.S ke/amd64/context.c @@ -298,6 +299,7 @@ ps/amd64/psctx.c) elseif(ARCH MATCHES arm) list(APPEND SOURCE + config/arm/cmhardwr.c ke/arm/boot.s ke/arm/cpu.c ke/arm/ctxswtch.s @@ -314,6 +316,7 @@ rtl/arm/rtlexcpt.c) elseif(ARCH MATCHES powerpc) list(APPEND SOURCE + config/powerpc/cmhardwr.c ke/powerpc/main_asm.S ke/powerpc/cpu.c ke/powerpc/exp.c

1 0

[cgutman] 48761: [DESK] - "repair DragFullWindows setting" - Patch by Matthias Kupfer
by cgutman＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: cgutman Date: Sun Sep 12 20:10:27 2010 New Revision: 48761 URL: http://svn.reactos.org/svn/reactos?rev=48761&view=rev Log: [DESK] - "repair DragFullWindows setting" - Patch by Matthias Kupfer Modified: trunk/reactos/dll/cpl/desk/effappdlg.c trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Sun Sep 12 20:10:27 2010 @@ -28,7 +28,7 @@ g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE; state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0); g->ThemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE; - + g->bHasChanged = TRUE; } @@ -105,12 +105,12 @@ { case IDOK: SaveCurrentValues(hwndDlg, g); - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, IDOK); break; case IDCANCEL: g->ThemeAdv = g->Theme; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, IDCANCEL); break; case IDC_EFFAPPEARANCE_ANIMATION: Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Sun Sep 12 20:10:27 2010 @@ -124,8 +124,7 @@ theme->Effects.bTooltipFade = theme->Effects.bMenuFade; /* show content of windows during dragging */ - //SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0); + SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0); /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &theme->Effects.bKeyboardCues, 0); @@ -307,7 +306,7 @@ */ theme->Effects.bTooltipAnimation = theme->Effects.bMenuAnimation; theme->Effects.bTooltipFade = theme->Effects.bMenuFade; - SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, (PVOID)&theme->Effects.bDragFullWindows, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); UPDATE_USERPREF(KEYBOARDCUES, &theme->Effects.bKeyboardCues); //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &theme->Effects.bActiveWindowTracking); //UPDATE_USERPREF(MENUANIMATION, &theme->Effects.bMenuAnimation);

1 0

[akhaldi] 48760: [CMAKE] - Fix usetup build.
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 19:38:21 2010 New Revision: 48760 URL: http://svn.reactos.org/svn/reactos?rev=48760&view=rev Log: [CMAKE] - Fix usetup build. Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 12 19:38:21 2010 @@ -1,6 +1,10 @@ set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_NtProcessStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") + +include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_executable(usetup WIN32 interface/usetup.c @@ -26,10 +30,13 @@ progress.c registry.c settings.c -) + usetup.rc) -include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -target_link_libraries(usetup mingw_main zlib newinflib ext2lib vfatlib ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a - mingw_common -lmsvcrt) +target_link_libraries(usetup + mingw_main + zlib + newinflib + ext2lib + vfatlib + mingw_common + -lmsvcrt)

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