Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 53009: [AFD] - Clear the sendable flag after a disconnect - Don't set the sendable flag if send has been closed
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 19:51:32 2011 New Revision: 53009 URL: http://svn.reactos.org/svn/reactos?rev=53009&view=rev Log: [AFD] - Clear the sendable flag after a disconnect - Don't set the sendable flag if send has been closed Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Jul 31 19:51:32 2011 @@ -720,6 +720,7 @@ FCB->DisconnectTimeout = DisReq->Timeout; FCB->DisconnectPending = TRUE; FCB->SendClosed = TRUE; + FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); if (Status == STATUS_PENDING) @@ -755,6 +756,8 @@ ExFreePool(FCB->RemoteAddress); FCB->RemoteAddress = NULL; + + FCB->PollState &= ~AFD_EVENT_SEND; } } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jul 31 19:51:32 2011 @@ -176,7 +176,8 @@ break; } - if (FCB->Send.Size - FCB->Send.BytesUsed != 0) + if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && + !FCB->SendClosed) { FCB->PollState |= AFD_EVENT_SEND; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS;

1 0

[tkreuzer] 53008: [NTOSKRNL] Fix OBTRACE definition. the macro used __VA_ARGS__ and passes that to DPRINT(fmt, ...) The preprocessor interpretes all arguments of __VA_ARGS__ as one token. This toke...
by tkreuzer＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: tkreuzer Date: Sun Jul 31 19:26:11 2011 New Revision: 53008 URL: http://svn.reactos.org/svn/reactos?rev=53008&view=rev Log: [NTOSKRNL] Fix OBTRACE definition. the macro used __VA_ARGS__ and passes that to DPRINT(fmt, ...) The preprocessor interpretes all arguments of __VA_ARGS__ as one token. This token was now passed as the first parameter of DPRINT1. This caused wrong parameters being used, resulting in a crash. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Sun Jul 31 19:26:11 2011 @@ -31,7 +31,7 @@ if (x & ObpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define OBTRACE(x, ...) DPRINT(__VA_ARGS__) +#define OBTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif //

1 0

[cgutman] 53007: [FREELDR] - Skip the floppy drive if the reset command failed
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 19:16:48 2011 New Revision: 53007 URL: http://svn.reactos.org/svn/reactos?rev=53007&view=rev Log: [FREELDR] - Skip the floppy drive if the reset command failed Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Jul 31 19:16:48 2011 @@ -670,7 +670,8 @@ if ((FloppyType > 5) || (FloppyType == 0)) continue; - DiskResetController(FloppyNumber); + if (!DiskResetController(FloppyNumber)) + continue; Ptr = GetInt1eTable();

1 0

[cgutman] 53006: [FLOPPY] - Report recalibration failure if the EC flag is set after seeking to fix a hang while trying to read - Thanks to igorko for testing
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 18:47:35 2011 New Revision: 53006 URL: http://svn.reactos.org/svn/reactos?rev=53006&view=rev Log: [FLOPPY] - Report recalibration failure if the EC flag is set after seeking to fix a hang while trying to read - Thanks to igorko for testing Modified: trunk/reactos/drivers/storage/floppy/hardware.c Modified: trunk/reactos/drivers/storage/floppy/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] Sun Jul 31 18:47:35 2011 @@ -448,7 +448,10 @@ /* Is the equipment check flag set? Could be no disk in drive... */ if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK) - INFO_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"); + { + WARN_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning failure\n"); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; }

1 0

[cgutman] 53005: [SERIAL] - Update the I/O manager's global configuration table with the correct number of serial ports
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 17:18:50 2011 New Revision: 53005 URL: http://svn.reactos.org/svn/reactos?rev=53005&view=rev Log: [SERIAL] - Update the I/O manager's global configuration table with the correct number of serial ports Modified: trunk/reactos/drivers/serial/serial/pnp.c Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Sun Jul 31 17:18:50 2011 @@ -24,8 +24,6 @@ NTSTATUS Status; WCHAR DeviceNameBuffer[32]; UNICODE_STRING DeviceName; - static ULONG DeviceNumber = 0; - static ULONG ComPortNumber = 1; TRACE_(SERIAL, "SerialAddDeviceInternal()\n"); @@ -33,7 +31,7 @@ ASSERT(Pdo); /* Create new device object */ - swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); + swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", IoGetConfigurationInformation()->SerialCount); RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); Status = IoCreateDevice(DriverObject, sizeof(SERIAL_DEVICE_EXTENSION), @@ -59,9 +57,9 @@ goto ByeBye; } - DeviceExtension->SerialPortNumber = DeviceNumber++; + DeviceExtension->SerialPortNumber = IoGetConfigurationInformation()->SerialCount++; if (pComPortNumber == NULL) - DeviceExtension->ComPort = ComPortNumber++; + DeviceExtension->ComPort = DeviceExtension->SerialPortNumber + 1; else DeviceExtension->ComPort = *pComPortNumber; DeviceExtension->Pdo = Pdo;

1 0

[ekohl] 53004: [SERVICES] - ScmCreateOrReferenceServiceImage: Link the SERVICE_IMAGE struct to the SERVICE struct in the create and the reference case. Otherwise only the first service started from...
by ekohl＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: ekohl Date: Sun Jul 31 10:29:41 2011 New Revision: 53004 URL: http://svn.reactos.org/svn/reactos?rev=53004&view=rev Log: [SERVICES] - ScmCreateOrReferenceServiceImage: Link the SERVICE_IMAGE struct to the SERVICE struct in the create and the reference case. Otherwise only the first service started from an image gets a valid pImage pointer. - Add some debug code. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Jul 31 10:29:41 2011 @@ -116,7 +116,7 @@ PLIST_ENTRY ImageEntry; PSERVICE_IMAGE CurrentImage; - DPRINT("ScmGetServiceImageByImagePath() called\n"); + DPRINT("ScmGetServiceImageByImagePath(%S) called\n", lpImagePath); ImageEntry = ImageListHead.Flink; while (ImageEntry != &ImageListHead) @@ -149,7 +149,7 @@ NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; - DPRINT("ScmCreateOrReferenceServiceImage()"); + DPRINT("ScmCreateOrReferenceServiceImage(%p)\n", pService); RtlInitUnicodeString(&ImagePath, NULL); @@ -211,17 +211,20 @@ /* Append service record */ InsertTailList(&ImageListHead, &pServiceImage->ImageListEntry); - - pService->lpImage = pServiceImage; } else { - /* Create a new service image */ - pService->lpImage->dwImageRunCount++; - } + /* Increment the run counter */ + pServiceImage->dwImageRunCount++; + } + + /* Link the service image to the service */ + pService->lpImage = pServiceImage; done:; RtlFreeUnicodeString(&ImagePath); + + DPRINT("ScmCreateOrReferenceServiceImage() done (Error: %lu)\n", dwError); return dwError; } @@ -1075,6 +1078,8 @@ BOOL Result; DWORD dwError = ERROR_SUCCESS; DWORD dwProcessId; + + DPRINT("ScmStartUserModeService(%p)\n", Service); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL;

1 0

[tkreuzer] 53003: [ISOBOOT] Use a high segment and 0 offset when loading setupldr. This fixes problems with an award bios. Thanks to Igor Paliychuk (igorko) for his help and patience burning / test...
by tkreuzer＠svn.reactos.org 30 Jul '11

30 Jul '11

Author: tkreuzer Date: Sat Jul 30 20:34:55 2011 New Revision: 53003 URL: http://svn.reactos.org/svn/reactos?rev=53003&view=rev Log: [ISOBOOT] Use a high segment and 0 offset when loading setupldr. This fixes problems with an award bios. Thanks to Igor Paliychuk (igorko) for his help and patience burning / testing dozens of isos Fixes boot regression of cmake builds on real hw. Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Jul 30 20:34:55 2011 @@ -360,10 +360,13 @@ call crlf #endif - mov bx, FREELDR_BASE // bx = load address +// use high segment, as some bios can fail, when offset is too big + mov bx, FREELDR_BASE / 16 // es = load segment + mov es, bx + xor ebx, ebx // bx = load offset mov si, di // restore file pointer - mov cx, HEX(0FFFF) // load the whole file - call getfssec // get the whole file + mov cx, HEX(0FFFF) // load the whole file + call getfssec // get the whole file #ifdef DEBUG_MESSAGES mov si, offset startldr_msg

1 0

[tkreuzer] 53002: update a bunch of files from trunk
by tkreuzer＠svn.reactos.org 30 Jul '11

30 Jul '11

Author: tkreuzer Date: Sat Jul 30 09:04:33 2011 New Revision: 53002 URL: http://svn.reactos.org/svn/reactos?rev=53002&view=rev Log: update a bunch of files from trunk Modified: branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake branches/GSoC_2011/GdiFontDriver/configure.cmd branches/GSoC_2011/GdiFontDriver/configure.sh branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake Modified: branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/cmake/P… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sat Jul 30 09:04:33 2011 @@ -208,13 +208,13 @@ #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug) -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") -SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") -SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") +SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_INIT "") SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") -SET(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") +SET(CMAKE_C_FLAGS_INIT "") SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") Modified: branches/GSoC_2011/GdiFontDriver/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/configu… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/configure.cmd [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/configure.cmd [iso-8859-1] Sat Jul 30 09:04:33 2011 @@ -2,25 +2,37 @@ :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 -set USE_NMAKE= +set USE_NMAKE=0 + +:: Detect presence of cmake +cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound :: Detect build environment (MinGW, VS, WDK, ...) if defined ROS_ARCH ( + echo Detected RosBE for %ROS_ARCH% set BUILD_ENVIRONMENT=MinGW set ARCH=%ROS_ARCH% - echo Detected RosBE for %ROS_ARCH% + if /I "%1" == "Codeblocks" ( + set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" + ) else if /I "%1" == "Eclipse" ( + set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" + ) else ( + set CMAKE_GENERATOR="MinGW Makefiles" + ) + ) else if defined DDK_TARGET_OS ( + echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%% + set BUILD_ENVIRONMENT=WDK if "%_BUILDARCH%" == "x86" ( set ARCH=i386 - ) - if "%_BUILDARCH%" == "AMD64" ( + ) else if "%_BUILDARCH%" == "AMD64" ( set ARCH=amd64 ) - set BUILD_ENVIRONMENT=WDK set USE_NMAKE=1 - echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH% -)else if defined VCINSTALLDIR ( -:: VS command prompt does not put this in enviroment vars + set USE_WDK_HEADERS=0 + +) else if defined VCINSTALLDIR ( + :: VS command prompt does not put this in enviroment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 @@ -30,33 +42,69 @@ echo Error: Visual Studio version too old or version detection failed. exit /b ) + echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% - if not "%1" == "VSSolution" ( + if /I "%1" == "VSSolution" ( + if "%BUILD_ENVIRONMENT%" == "VS8" ( + if "%ARCH%" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 8 2005 Win64" + ) else ( + set CMAKE_GENERATOR="Visual Studio 8 2005" + ) + ) else if "%BUILD_ENVIRONMENT%" == "VS9" ( + if "%ARCH%" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" + ) else ( + set CMAKE_GENERATOR="Visual Studio 9 2008" + ) + ) else if "%BUILD_ENVIRONMENT%" == "VS10" ( + if "%ARCH%" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 10 Win64" + ) else ( + set CMAKE_GENERATOR="Visual Studio 10" + ) + ) + ) else ( set USE_NMAKE=1 echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter. ) + ) else if defined sdkdir ( + echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU% if "%TARGET_CPU%" == "x86" ( set ARCH=i386 - ) - if "%TARGET_CPU%" == "x64" ( + ) else if "%TARGET_CPU%" == "x64" ( set ARCH=amd64 ) + set BUILD_ENVIRONMENT=SDK set USE_NMAKE=1 - echo Detected Windows SDK %TARGET_PLATFORM%-%ARCH% + +) else ( + echo Error: Unable to detect build environment. Configure script failure. + exit /b ) -if defined ARCH if defined BUILD_ENVIRONMENT ( - goto createdirs +:: Checkpoint +if not defined ARCH ( + echo unknown build architecture + exit /b ) -echo Error: Unable to detect a build environment. Configure script failure. -exit /b +:: Detect nmake generator +if %USE_NMAKE% == 1 ( + if /I "%1" == "CodeBlocks" ( + set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" + ) else if /I "%1" == "Eclipse" ( + set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" + ) else if /I "%1" == "JOM" ( + set CMAKE_GENERATOR="NMake Makefiles JOM" + ) else ( + set CMAKE_GENERATOR="NMake Makefiles" + ) +) :: Create directories -:createdirs - set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( echo Creating directories in %REACTOS_OUTPUT_PATH% @@ -74,7 +122,6 @@ mkdir reactos ) -:hostprep echo Preparing host tools... cd host-tools if EXIST CMakeCache.txt ( @@ -82,64 +129,28 @@ ) set REACTOS_BUILD_TOOLS_DIR=%CD% -if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if defined USE_NMAKE ( - cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "VS8" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 8 2005 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 8 2005" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) -) else if "%BUILD_ENVIRONMENT%" == "VS9" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 9 2008 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 9 2008" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) -) else if "%BUILD_ENVIRONMENT%" == "VS10" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 10 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 10" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% - ) -) +cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR% cd.. -:reactprep echo Preparing reactos... - cd reactos if EXIST CMakeCache.txt ( del CMakeCache.txt /q ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if defined USE_NMAKE ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "VS8" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 8 2005" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) -) else if "%BUILD_ENVIRONMENT%" == "VS9" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 9 2008 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 9 2008" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) -) else if "%BUILD_ENVIRONMENT%" == "VS10" ( - if "%ARCH%" == "amd64" ( - cmake -G "Visual Studio 10 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) else ( - cmake -G "Visual Studio 10" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% - ) + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else if "%BUILD_ENVIRONMENT%" == "WDK" ( + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% +) else ( + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) cd.. -echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, etc...). +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, jom, etc...). +exit /b +:cmake_notfound + echo Unable to find cmake, if it is installed, check your PATH variable. + exit /b Modified: branches/GSoC_2011/GdiFontDriver/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/configu… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/configure.sh [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/configure.sh [iso-8859-1] Sat Jul 30 09:04:33 2011 @@ -30,8 +30,14 @@ REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" +echo Preparing reactos... cd ../reactos -cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +if [ -f CMakeCache.txt ] +then + rm -f CMakeCache.txt +fi + +cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: make, makex, etc...$. Modified: branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/toolcha… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake [iso-8859-1] Sat Jul 30 09:04:33 2011 @@ -13,12 +13,6 @@ set(CMAKE_ASM_COMPILER ml) endif() -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <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 /fo <OBJECT> <SOURCE>") - -set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") - set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")

1 0

[spetreolle] 53001: [FULLFAT] Add missing bugcodes dependency, spotted by elhoir.
by spetreolle＠svn.reactos.org 29 Jul '11

29 Jul '11

Author: spetreolle Date: Fri Jul 29 16:36:48 2011 New Revision: 53001 URL: http://svn.reactos.org/svn/reactos?rev=53001&view=rev Log: [FULLFAT] Add missing bugcodes dependency, spotted by elhoir. Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Fri Jul 29 16:36:48 2011 @@ -18,3 +18,5 @@ ff_time.c) add_library(fullfat ${SOURCE}) + +add_dependencies(fullfat bugcodes)

1 0

[tkreuzer] 53000: add missing files
by tkreuzer＠svn.reactos.org 29 Jul '11

29 Jul '11

Author: tkreuzer Date: Fri Jul 29 14:36:34 2011 New Revision: 53000 URL: http://svn.reactos.org/svn/reactos?rev=53000&view=rev Log: add missing files Added: branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/amd64/drvmap.S - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/amd64/fathelp.S - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/amd64/i386cpu.S - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/amd64/i386idt.S - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/amd64/i386trap.S - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S branches/GSoC_2011/GdiFontDriver/boot/freeldr/freeldr/arch/i386/fathelp.asm - copied unchanged from r52920, trunk/reactos/boot/freeldr/freeldr/arch/i386/fathelp.asm branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/CMakeLists.txt (with props) branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/normaliz.spec (with props) branches/GSoC_2011/GdiFontDriver/dll/ntdll/def/ntdll.pspec - copied unchanged from r52920, trunk/reactos/dll/ntdll/def/ntdll.pspec branches/GSoC_2011/GdiFontDriver/dll/win32/imm32/imm.spec - copied unchanged from r52920, trunk/reactos/dll/win32/imm32/imm.spec branches/GSoC_2011/GdiFontDriver/dll/win32/kernel32/kernel32.pspec - copied unchanged from r52920, trunk/reactos/dll/win32/kernel32/kernel32.pspec branches/GSoC_2011/GdiFontDriver/dll/win32/msacm32/msacm.spec.def - copied unchanged from r52920, trunk/reactos/dll/win32/msacm32/msacm.spec.def branches/GSoC_2011/GdiFontDriver/dll/win32/user32/user32.pspec - copied unchanged from r52920, trunk/reactos/dll/win32/user32/user32.pspec branches/GSoC_2011/GdiFontDriver/drivers/base/kddll/kddll.spec - copied unchanged from r52920, trunk/reactos/drivers/base/kddll/kddll.spec branches/GSoC_2011/GdiFontDriver/drivers/storage/scsiport/scsiport.pspec - copied unchanged from r52920, trunk/reactos/drivers/storage/scsiport/scsiport.pspec branches/GSoC_2011/GdiFontDriver/importlibs/oldnames.lib - copied unchanged from r52920, trunk/reactos/importlibs/oldnames.lib branches/GSoC_2011/GdiFontDriver/include/crt/mingw_math.h - copied unchanged from r52920, trunk/reactos/include/crt/mingw_math.h branches/GSoC_2011/GdiFontDriver/include/host/wine/unicode.h - copied unchanged from r52920, trunk/reactos/include/host/wine/unicode.h branches/GSoC_2011/GdiFontDriver/include/reactos/syscalls.inc - copied unchanged from r52920, trunk/reactos/include/reactos/syscalls.inc branches/GSoC_2011/GdiFontDriver/include/reactos/version.h - copied unchanged from r52920, trunk/reactos/include/reactos/version.h branches/GSoC_2011/GdiFontDriver/include/reactos/wine/wpp.h - copied unchanged from r52920, trunk/reactos/include/reactos/wine/wpp.h branches/GSoC_2011/GdiFontDriver/lib/3rdparty/freetype/ChangeLog.23 - copied unchanged from r52920, trunk/reactos/lib/3rdparty/freetype/ChangeLog.23 branches/GSoC_2011/GdiFontDriver/lib/lib.mak - copied unchanged from r52920, trunk/reactos/lib/lib.mak branches/GSoC_2011/GdiFontDriver/lib/rtl/i386/rtlswap.S - copied unchanged from r52920, trunk/reactos/lib/rtl/i386/rtlswap.S branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/math/i386/atan2.c - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/math/i386/atan2.c branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/math/i386/exp.c - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/math/i386/exp.c branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/math/i386/fmod.c - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/math/i386/fmod.c branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/math/i386/fmodf.c - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/math/i386/fmodf.c branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/math/i386/sqrtf.c - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/math/i386/sqrtf.c branches/GSoC_2011/GdiFontDriver/lib/sdk/crt/mem/i386/memcpy_asm.s - copied unchanged from r52920, trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s branches/GSoC_2011/GdiFontDriver/lib/sdk/uuid/uuid.c - copied unchanged from r52920, trunk/reactos/lib/sdk/uuid/uuid.c branches/GSoC_2011/GdiFontDriver/ntoskrnl/kdbg/i386/longjmp.S - copied unchanged from r52920, trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S branches/GSoC_2011/GdiFontDriver/ntoskrnl/kdbg/i386/setjmp.S - copied unchanged from r52920, trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S branches/GSoC_2011/GdiFontDriver/ntoskrnl/ntoskrnl.pspec - copied unchanged from r52920, trunk/reactos/ntoskrnl/ntoskrnl.pspec branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/win32k.pspec - copied unchanged from r52920, trunk/reactos/subsystems/win32/win32k/win32k.pspec Added: branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/dll/nls… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/CMakeLists.txt (added) +++ branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/CMakeLists.txt [iso-8859-1] Fri Jul 29 14:36:34 2011 @@ -1,0 +1,10 @@ + +spec2def(normaliz.dll normaliz.spec) + +add_library(normaliz SHARED normaliz.cpp ${CMAKE_CURRENT_BINARY_DIR}/normaliz.def) + +set_entrypoint(normaliz 0) + +add_importlibs(normaliz kernel32) + +add_dependencies(normaliz psdk) Propchange: branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/normaliz.spec URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/dll/nls… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/normaliz.spec (added) +++ branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/normaliz.spec [iso-8859-1] Fri Jul 29 14:36:34 2011 @@ -1,0 +1,6 @@ + + 1 stdcall IdnToAscii(long wstr long wstr long) + 2 stdcall IdnToNameprepUnicode(long wstr long wstr long) + 3 stdcall IdnToUnicode(long wstr long wstr long) + 4 stdcall IsNormalizedString(long wstr long) + 5 stdcall NormalizeString(long wstr long wstr long) Propchange: branches/GSoC_2011/GdiFontDriver/dll/nls/normaliz_redist/normaliz.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs