Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[gedmurphy] 35871: Fix return value so we exit ServerMain correctly, thus we now see all log until death
by gedmurphy＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: gedmurphy Date: Tue Sep 2 10:21:13 2008 New Revision: 35871 URL: http://svn.reactos.org/svn/reactos?rev=35871&view=rev Log: Fix return value so we exit ServerMain correctly, thus we now see all log until death Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] Tue Sep 2 10:21:13 2008 @@ -94,8 +94,9 @@ if (hThread[i] == NULL) { - _swprintf(buf, L"\nFailed to start %s server\n", Services[i].lpName); + _swprintf(buf, L"\nError creating %s server thread\n", Services[i].lpName); LogEvent(buf, GetLastError(), 0, LOG_ALL); + return FALSE; } UpdateStatus(pServInfo, 0, 1); @@ -116,7 +117,7 @@ LogEvent(L"Detaching Winsock2", 0, 0, LOG_FILE); WSACleanup(); - return 0; + return TRUE; } VOID WINAPI @@ -188,6 +189,7 @@ if (!CreateServers(&servInfo)) { + LogEvent(L"Error creating servers", GetLastError(), 1, LOG_ALL); servInfo.servStatus.dwServiceSpecificExitCode = 1; UpdateStatus(&servInfo, SERVICE_STOPPED, 0); return;

1 0

[gedmurphy] 35870: allow the log file to be opened whilst the service is running
by gedmurphy＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: gedmurphy Date: Tue Sep 2 10:05:25 2008 New Revision: 35870 URL: http://svn.reactos.org/svn/reactos?rev=35870&view=rev Log: allow the log file to be opened whilst the service is running Modified: trunk/reactos/base/services/tcpsvcs/log.c Modified: trunk/reactos/base/services/tcpsvcs/log.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/log.… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/log.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/log.c [iso-8859-1] Tue Sep 2 10:05:25 2008 @@ -49,7 +49,7 @@ { hLogFile = CreateFileW(lpLogFileName, GENERIC_WRITE, - 0, + FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,

1 0

[tkreuzer] 35869: Don't use a NULL tag with EngAllocMem, that doesn't work anymore.
by tkreuzer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: tkreuzer Date: Tue Sep 2 01:18:40 2008 New Revision: 35869 URL: http://svn.reactos.org/svn/reactos?rev=35869&view=rev Log: Don't use a NULL tag with EngAllocMem, that doesn't work anymore. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Tue Sep 2 01:18:40 2008 @@ -317,7 +317,7 @@ SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_4BPP)); SurfObj->cjBits = SurfObj->lDelta * Size.cy; UncompressedFormat = BMF_4BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, TAG_DIB); Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj->lDelta); } else if (Format == BMF_8RLE)

1 0

[cgutman] 35868: - STATUS_SUCCESS -> NDIS_STATUS_SUCCESS
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Tue Sep 2 00:59:04 2008 New Revision: 35868 URL: http://svn.reactos.org/svn/reactos?rev=35868&view=rev Log: - STATUS_SUCCESS -> NDIS_STATUS_SUCCESS Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Tue Sep 2 00:59:04 2008 @@ -125,7 +125,7 @@ &MiniportBlock->AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; - *Status = STATUS_SUCCESS; + *Status = NDIS_STATUS_SUCCESS; } else {

1 0

[cgutman] 35867: - Set Status
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Tue Sep 2 00:48:03 2008 New Revision: 35867 URL: http://svn.reactos.org/svn/reactos?rev=35867&view=rev Log: - Set Status Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Tue Sep 2 00:48:03 2008 @@ -710,6 +710,7 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { + *Status = NDIS_STATUS_FAILURE; }

1 0

[dreimer] 35866: The arch can now be selected by modifying only one Variable in the Config File. This way the two arch specific Vars are "linked" together. Add a security message which prevents a build with deactivated Debug Symbols and Stripped apps. This most likely causes crap. Update Changelog.
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 00:29:09 2008 New Revision: 35866 URL: http://svn.reactos.org/svn/reactos?rev=35866&view=rev Log: The arch can now be selected by modifying only one Variable in the Config File. This way the two arch specific Vars are "linked" together. Add a security message which prevents a build with deactivated Debug Symbols and Stripped apps. This most likely causes crap. Update Changelog. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Tue Sep 2 00:29:09 2008 @@ -50,6 +50,15 @@ set ROS_LEAN_AND_MEAN=no ) ) + +if %ROS_LEAN_AND_MEAN% == yes ( + if %ROS_BUILDNOSTRIP% == yes ( + cls + echo Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them. + goto :EOC + ) +) + if defined _ROSBE_USECCACHE ( if %_ROSBE_USECCACHE% == 1 ( set CCACHE_DIR=%APPDATA%\RosBE\.ccache Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Sep 2 00:29:09 2008 @@ -11,6 +11,9 @@ - Other small Fixes here and there (Daniel Reimer) - Added: Basic PowerShell Version of RosBE (Daniel Reimer) - Added: Update command (Daniel Reimer) +- Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel Reimer) +- Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer) +- Fixed: Stripped apps and removed Debug Symbols at once may not be possible. (Daniel Reimer) *** January 23rd, 2008 - RosBE 1.2 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Sep 2 00:29:09 2008 @@ -21,6 +21,28 @@ set _ROSBE_MODE=MinGW set _ROSBE_MINGWPATH=%CD% set _ROSBE_ORIGINALPATH=%PATH% +) + +:: +:: Set the Arch Variables +:: +if defined _ROSBE_ARCH ( + if %_ROSBE_ARCH% == 0 ( + set ROS_ARCH= + set ROS_PREFIX= + ) + if %_ROSBE_ARCH% == 1 ( + set ROS_ARCH=arm + set ROS_PREFIX=mingw32-arm + ) + if %_ROSBE_ARCH% == 2 ( + set ROS_ARCH=ppc + set ROS_PREFIX=mingw32-ppc + ) + if %_ROSBE_ARCH% == 3 ( + set ROS_ARCH=amd64 + set ROS_PREFIX=mingw32-x86_64 + ) ) ::

1 0

[hbirr] 3586: WideCharToMultiByte accept each code page like MultiByteToWideChar. Wmc.exe will now produce correct header files (bugcode.h) on ros.
by hbirr＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: hbirr Date: Mon Sep 30 23:01:32 2002 New Revision: 3586 URL: http://svn.reactos.org/svn/reactos?rev=3586&view=rev Log: WideCharToMultiByte accept each code page like MultiByteToWideChar. Wmc.exe will now produce correct header files (bugcode.h) on ros. Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/kernel32/misc/stubs.c?… ============================================================================== --- trunk/reactos/lib/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/kernel32/misc/stubs.c [iso-8859-1] Mon Sep 30 23:01:32 2002 @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.34 2002/09/27 15:29:03 hbirr Exp $ +/* $Id: stubs.c,v 1.35 2002/09/30 21:01:32 hbirr Exp $ * * KERNEL32.DLL stubs (unimplemented functions) * Remove from this file, if you implement them. @@ -1385,62 +1385,73 @@ { int wi, di; // wide counter, dbcs byte count + /* + * Check the parameters. + */ + if ( /* --- CODE PAGE --- */ + ( (CP_ACP != CodePage) + && (CP_MACCP != CodePage) + && (CP_OEMCP != CodePage) + && (CP_SYMBOL != CodePage) + && (CP_THREAD_ACP != CodePage) + && (CP_UTF7 != CodePage) + && (CP_UTF8 != CodePage) + && (FALSE == IsInstalledCP (CodePage)) + ) + /* --- FLAGS --- */ + || (dwFlags & ~(/*WC_NO_BEST_FIT_CHARS + |*/ WC_COMPOSITECHECK + | WC_DISCARDNS + | WC_SEPCHARS + | WC_DEFAULTCHAR + ) + ) + /* --- INPUT BUFFER --- */ + || (NULL == lpWideCharStr) + ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + // for now, make no difference but only convert cut the characters to 7Bit - switch( CodePage ) + if( cchWideChar == -1 ) // assume its a 0-terminated str + { // and determine its length + for( cchWideChar=0; lpWideCharStr[cchWideChar]!=0; cchWideChar++) + cchWideChar++; + } + + // user wants to determine needed space + if( cchMultiByte == 0 ) { - case CP_ACP: //ANSI code page - case CP_MACCP: //Macintosh code page - case CP_OEMCP: //OEM code page - case CP_SYMBOL: //Symbol code page (42) - case CP_THREAD_ACP: //ACP Current thread's ANSI code page - case CP_UTF7: //Translate using UTF-7 - case CP_UTF8: //Translate using UTF-8 - if( cchWideChar == -1 ) // assume its a 0-terminated str - { // and determine its length - for( cchWideChar=0; lpWideCharStr[cchWideChar]!=0; ) - cchWideChar++; - } - - // user wants to determine needed space - if( cchMultiByte == 0 ) + SetLastError(ERROR_SUCCESS); + return cchWideChar; // FIXME: determine correct. + } + // the lpWideCharStr is cchWideChar characters long. + for( wi=0, di=0; wi<cchWideChar && di<cchMultiByte; ++wi, ++di) + { + // Flag and a not displayable char FIXME + /*if( (dwFlags&WC_NO_BEST_FIT_CHARS) && (lpWideCharStr[wi] >127) ) { - SetLastError(ERROR_SUCCESS); - return cchWideChar; // FIXME: determine correct. - } - // the lpWideCharStr is cchWideChar characters long. - for( wi=0, di=0; wi<cchWideChar && di<cchMultiByte; ++wi) - { - // Flag and a not displayable char FIXME - /*if( (dwFlags&WC_NO_BEST_FIT_CHARS) && (lpWideCharStr[wi] >127) ) - { - lpMultiByteStr[di]= - *lpUsedDefaultChar = TRUE; - - }*/ - // FIXME - // just cut off the upper 9 Bit, since vals>=128 mean LeadByte. - lpMultiByteStr[di] = lpWideCharStr[wi] & 0x007F; - ++di; - } - // has MultiByte exceeded but Wide is still in the string? - if( wi < cchWideChar && di >= cchMultiByte) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return di; - } - // else return # of bytes wirtten to MBCSbuffer (di) - SetLastError(ERROR_SUCCESS); - // FIXME: move that elsewhere - if( lpUsedDefaultChar!=NULL ) *lpUsedDefaultChar=FALSE; - return di; - break; - default: - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - break; + lpMultiByteStr[di]= + *lpUsedDefaultChar = TRUE; + + }*/ + // FIXME + // just cut off the upper 9 Bit, since vals>=128 mean LeadByte. + lpMultiByteStr[di] = lpWideCharStr[wi] & 0x007F; } - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + // has MultiByte exceeded but Wide is still in the string? + if( wi < cchWideChar && di >= cchMultiByte) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + // else return # of bytes wirtten to MBCSbuffer (di) + SetLastError(ERROR_SUCCESS); + // FIXME: move that elsewhere + if( lpUsedDefaultChar!=NULL ) *lpUsedDefaultChar=FALSE; + return di; }

1 0

[dreimer] 35865: Fix the ROS_ARCH Param to be amd64 and not x64 for the 64 bit Port
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Mon Sep 1 23:16:21 2008 New Revision: 35865 URL: http://svn.reactos.org/svn/reactos?rev=35865&view=rev Log: Fix the ROS_ARCH Param to be amd64 and not x64 for the 64 bit Port Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Sep 1 23:16:21 2008 @@ -63,7 +63,7 @@ set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ ) - if %ROS_ARCH% == x64 ( + if %ROS_ARCH% == amd64 ( set TARGET_CC=ccache x86_64-pc-mingw32-gcc set TARGET_CPP=ccache x86_64-pc-mingw32-g++ ) @@ -82,7 +82,7 @@ set TARGET_CC=gcc set TARGET_CPP=g++ ) - if %ROS_ARCH% == x64 ( + if %ROS_ARCH% == amd64 ( set TARGET_CC=x86_64-pc-mingw32-gcc set TARGET_CPP=x86_64-pc-mingw32-g++ ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Mon Sep 1 23:16:21 2008 @@ -108,7 +108,7 @@ echo ERROR: There is no compiler output to clean. ) ) -if %ROS_ARCH% == x64 ( +if %ROS_ARCH% == amd64 ( :: :: Check if we have something to clean, if so, clean it. :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Sep 1 23:16:21 2008 @@ -40,7 +40,7 @@ goto :EOC ) if /i "%_1%" == "x64" ( - set ROS_ARCH==x64 + set ROS_ARCH==amd64 set ROS_PREFIX=mingw32-x86_64 goto :EOC )

1 0

[dreimer] 35864: Start support of multiple arches in rosbe.
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Mon Sep 1 22:52:26 2008 New Revision: 35864 URL: http://svn.reactos.org/svn/reactos?rev=35864&view=rev Log: Start support of multiple arches in rosbe. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Sep 1 22:52:26 2008 @@ -55,13 +55,41 @@ set CCACHE_DIR=%APPDATA%\RosBE\.ccache set HOST_CC=ccache gcc set HOST_CPP=ccache g++ - set TARGET_CC=ccache gcc - set TARGET_CPP=ccache g++ + if %ROS_ARCH% == arm ( + set TARGET_CC=ccache arm-pc-mingw32-gcc + set TARGET_CPP=ccache arm-pc-mingw32-g++ + ) + if %ROS_ARCH% == x86 ( + set TARGET_CC=ccache gcc + set TARGET_CPP=ccache g++ + ) + if %ROS_ARCH% == x64 ( + set TARGET_CC=ccache x86_64-pc-mingw32-gcc + set TARGET_CPP=ccache x86_64-pc-mingw32-g++ + ) + if %ROS_ARCH% == ppc ( + set TARGET_CC=ccache ppc-pc-mingw32-gcc + set TARGET_CPP=ccache ppc-pc-mingw32-g++ + ) ) else ( set HOST_CC=gcc set HOST_CPP=g++ - set TARGET_CC=gcc - set TARGET_CPP=g++ + if %ROS_ARCH% == arm ( + set TARGET_CC=arm-pc-mingw32-gcc + set TARGET_CPP=arm-pc-mingw32-g++ + ) + if %ROS_ARCH% == x86 ( + set TARGET_CC=gcc + set TARGET_CPP=g++ + ) + if %ROS_ARCH% == x64 ( + set TARGET_CC=x86_64-pc-mingw32-gcc + set TARGET_CPP=x86_64-pc-mingw32-g++ + ) + if %ROS_ARCH% == ppc ( + set TARGET_CC=ppc-pc-mingw32-gcc + set TARGET_CPP=ppc-pc-mingw32-g++ + ) ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Mon Sep 1 22:52:26 2008 @@ -47,30 +47,95 @@ goto :EOF :DEL -:: -:: Check if we have something to clean, if so, clean it. -:: -if exist "obj-i386\." ( - echo Cleaning ReactOS source directory... + +if %ROS_ARCH% == arm ( :: - : Remove directories/makefile.auto created by the build. + :: Check if we have something to clean, if so, clean it. + :: + if exist "obj-arm\." ( + echo Cleaning ReactOS source directory... + :: + : Remove directories created by the build. + :: + if exist "obj-arm\." ( + rd /s /q "obj-arm" 1> NUL 2> NUL + ) + if exist "output-arm\." ( + rd /s /q "output-arm" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. + ) else ( + echo ERROR: There is no compiler output to clean. + ) +) +if %ROS_ARCH% == x86 ( + :: + :: Check if we have something to clean, if so, clean it. :: if exist "obj-i386\." ( - rd /s /q "obj-i386" 1> NUL 2> NUL + echo Cleaning ReactOS source directory... + :: + : Remove directories created by the build. + :: + if exist "obj-i386\." ( + rd /s /q "obj-i386" 1> NUL 2> NUL + ) + if exist "output-i386\." ( + rd /s /q "output-i386" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. + ) else ( + echo ERROR: There is no compiler output to clean. ) - if exist "output-i386\." ( - rd /s /q "output-i386" 1> NUL 2> NUL +) +if %ROS_ARCH% == ppc ( + :: + :: Check if we have something to clean, if so, clean it. + :: + if exist "obj-ppc\." ( + echo Cleaning ReactOS source directory... + :: + : Remove directories created by the build. + :: + if exist "obj-ppc\." ( + rd /s /q "obj-ppc" 1> NUL 2> NUL + ) + if exist "output-ppc\." ( + rd /s /q "output-ppc" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. + ) else ( + echo ERROR: There is no compiler output to clean. ) - if exist "reactos\." ( - rd /s /q "reactos" 1> NUL 2> NUL +) +if %ROS_ARCH% == x64 ( + :: + :: Check if we have something to clean, if so, clean it. + :: + if exist "obj-x86_64\." ( + echo Cleaning ReactOS source directory... + :: + : Remove directories created by the build. + :: + if exist "obj-x86_64\." ( + rd /s /q "obj-x86_64" 1> NUL 2> NUL + ) + if exist "output-x86_64\." ( + rd /s /q "output-x86_64" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. + ) else ( + echo ERROR: There is no compiler output to clean. ) - if exist "makefile.auto" ( - del "makefile.auto" 1> NUL 2> NUL - ) - echo Done cleaning ReactOS source directory. -) else ( - echo ERROR: There is no compiler output to clean. ) + +if exist "reactos\." ( + rd /s /q "reactos" 1> NUL 2> NUL +) +if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL +) + goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Sep 1 22:52:26 2008 @@ -15,8 +15,8 @@ :: :: Parse the command line arguments. -:: ROS_ARCH: Set to x86, ppc or arm. -:: ROS_PREFIX: Default is mingw32. ppc could be mingw32-ppc, arm mingw32-arm. +:: ROS_ARCH: Set to x86, x64, ppc or arm. +:: ROS_PREFIX: Default is mingw32. ppc could be mingw32-ppc, arm mingw32-arm, x64 mingw32-x86_64. :: if "%1" == "" ( @@ -37,6 +37,11 @@ if /i "%_1%" == "ppc" ( set ROS_ARCH==ppc set ROS_PREFIX=mingw32-ppc + goto :EOC +) +if /i "%_1%" == "x64" ( + set ROS_ARCH==x64 + set ROS_PREFIX=mingw32-x86_64 goto :EOC ) if not "%_1%" == "" (

1 0

[tkreuzer] 35863: patch by Cristo Silva criso-c<at>lycos<dot>com: Initialize keyboard layout before startung the keyboard thread.
by tkreuzer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: tkreuzer Date: Mon Sep 1 22:45:26 2008 New Revision: 35863 URL: http://svn.reactos.org/svn/reactos?rev=35863&view=rev Log: patch by Cristo Silva criso-c<at>lycos<dot>com: Initialize keyboard layout before startung the keyboard thread. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Sep 1 22:45:26 2008 @@ -839,6 +839,12 @@ KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); + /* Initialize the default keyboard layout */ + if(!UserInitDefaultKeyboardLayout()) + { + DPRINT1("Failed to initialize default keyboard layout!\n"); + } + Status = PsCreateSystemThread(&KeyboardThreadHandle, THREAD_ALL_ACCESS, NULL, @@ -849,12 +855,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Win32K: Failed to create keyboard thread.\n"); - } - - /* Initialize the default keyboard layout */ - if(!UserInitDefaultKeyboardLayout()) - { - DPRINT1("Failed to initialize default keyboard layout!\n"); } Status = PsCreateSystemThread(&MouseThreadHandle,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008