Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48809: [CMAKE] - Introduce MSVC toolchain support. Just use -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake for the toolchain. - Sync setjmp.h from trunk. - Improve mingw targets (mingw_commo...
by akhaldi＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: akhaldi Date: Sun Sep 19 00:27:24 2010 New Revision: 48809 URL: http://svn.reactos.org/svn/reactos?rev=48809&view=rev Log: [CMAKE] - Introduce MSVC toolchain support. Just use -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake for the toolchain. - Sync setjmp.h from trunk. - Improve mingw targets (mingw_common, mingw_wmain, oldnames... etc) a bit to make them compile and link with msvc. - Dedicated to Timo ;) Added: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/include/crt/setjmp.h branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjm… ============================================================================== --- branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/setjmp.h [iso-8859-1] Sun Sep 19 00:27:24 2010 @@ -136,29 +136,18 @@ #define _JMP_BUF_DEFINED #endif -static inline __attribute__((always_inline)) void * mingw_getsp(void) -{ - void *value; -#if defined(__x86_64) #ifdef _MSC_VER - __asm {mov value, rsp} +int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); #else - __asm__ __volatile__("movq %%rsp, %[value]" : [value] "=r" (value) ); -#endif -#elif defined(_X86_) -#ifdef _MSC_VER - __asm {mov value, esp} -#else - __asm__ __volatile__("movql %%esp, %[value]" : [value] "=r" (value) ); -#endif -#else - #error mingw_getsp unimplemented -#endif - return value; -} - #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX +#if defined(__x86_64) +# define mingw_getsp() \ + ({ void* value; __asm__ __volatile__("movq %%rsp, %[value]" : [value] "=r" (value)); value; }) +#elif defined(_X86_) +# define mingw_getsp() \ + ({ void* value; __asm__ __volatile__("movl %%esp, %[value]" : [value] "=r" (value)); value; }) +#endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); #else @@ -173,6 +162,7 @@ #endif int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); #endif +#endif __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value); Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Sep 19 00:27:24 2010 @@ -1,7 +1,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/mingw-w64) -add_definitions(-D_CRTBLD -Wno-main) +add_definitions(-D_CRTBLD) + +if(NOT MSVC) +add_definitions(-Wno-main) +endif(NOT MSVC) set(MINGW_COMMON_SOURCE _newmode.c @@ -31,11 +35,14 @@ xthdloc.c xtxtmode.c ofmt_stub.c - cxa_pure_virtual.c -) + cxa_pure_virtual.c) add_library(mingw_common ${MINGW_COMMON_SOURCE}) + +if(NOT MSVC) target_link_libraries(mingw_common oldnames -lkernel32 -lntdll) +endif(NOT MSVC) + set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) add_dependencies(mingw_common psdk) @@ -53,8 +60,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a -) + COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) Added: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake (added) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sun Sep 19 00:27:24 2010 @@ -1,0 +1,18 @@ + +if(NOT ARCH) +set(ARCH i386) +endif(NOT ARCH) + +# the name of the target operating system +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR i686) + +# which compilers to use for C and C++ +set(CMAKE_C_COMPILER cl) +set(CMAKE_CXX_COMPILER cl) + +set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

1 0

[akhaldi] 48808: [CMAKE] - *cough* Separate compiler specific flags.
by akhaldi＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: akhaldi Date: Sun Sep 19 00:15:45 2010 New Revision: 48808 URL: http://svn.reactos.org/svn/reactos?rev=48808&view=rev Log: [CMAKE] - *cough* Separate compiler specific flags. Added: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Sep 19 00:15:45 2010 @@ -19,6 +19,7 @@ include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) include_directories(include) +include_directories(include/host) include_directories(include/reactos) include_directories(include/reactos/wine) include_directories(${REACTOS_BINARY_DIR}/include) @@ -30,10 +31,11 @@ else() -# Linking -link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) -set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +if(MSVC) +include(msc.cmake) +else() +include(gcc.cmake) +endif(MSVC) # Activate support for assembly source files enable_language(ASM) @@ -69,25 +71,6 @@ add_definitions(-DUSE_COMPILER_EXCEPTIONS) add_definitions(-D_USE_32BIT_TIME_T) -# Compiler Core -add_definitions(-pipe -fms-extensions) -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>") - -# Debugging (Note: DWARF-4 on 4.5.1 when we ship) -add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) - -# Tuning -add_definitions(-march=pentium -mtune=i686) - -# Warnings -add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) - -# Optimizations -add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) - -# C++ Flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") - include_directories(include) include_directories(include/psdk) include_directories(include/dxsdk) @@ -96,7 +79,11 @@ include_directories(${REACTOS_BINARY_DIR}/include/psdk) include_directories(${REACTOS_BINARY_DIR}/include/reactos) include_directories(include/crt) +if(MSVC) +include_directories(include/crt/msc) +else() include_directories(include/crt/mingw32) +endif(MSVC) include_directories(include/ddk) include_directories(include/ndk) include_directories(include/reactos) Added: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/gcc.cmake (added) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Sep 19 00:15:45 2010 @@ -1,0 +1,25 @@ + +# Linking +link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") + +# Compiler Core +add_definitions(-pipe -fms-extensions) + +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>") + +# Debugging (Note: DWARF-4 on 4.5.1 when we ship) +add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) + +# Tuning +add_definitions(-march=pentium -mtune=i686) + +# Warnings +add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) + +# Optimizations +add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) + +# C++ Flags +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") Added: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/msc.cmake (added) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Sep 19 00:15:45 2010 @@ -1,0 +1,3 @@ + +add_definitions(/GS- /Zl /Zi) +add_definitions(-Dinline=__inline -D__STDC__=1)

1 0

[tkreuzer] 48807: [CMAKE] Improve winebuild, add getopt and sys/stat.h for build environments that don't have those.
by tkreuzer＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: tkreuzer Date: Sat Sep 18 23:45:55 2010 New Revision: 48807 URL: http://svn.reactos.org/svn/reactos?rev=48807&view=rev Log: [CMAKE] Improve winebuild, add getopt and sys/stat.h for build environments that don't have those. Added: branches/cmake-bringup/tools/winebuild/getopt.c (with props) branches/cmake-bringup/tools/winebuild/include/ (with props) branches/cmake-bringup/tools/winebuild/include/getopt.h (with props) branches/cmake-bringup/tools/winebuild/include/sys/ (with props) branches/cmake-bringup/tools/winebuild/include/sys/stat.h (with props) Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C… ============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Sat Sep 18 23:45:55 2010 @@ -1,10 +1,28 @@ add_definitions(-DEXEEXT=".exe") +add_definitions(-Dpclose=_pclose) +add_definitions(-Dpopen=_popen) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + import.c + main.c + mkstemps.c + parser.c + relay.c + res16.c + res32.c + spec16.c + spec32.c + utils.c +) + +if(MSVC) + list(APPEND SOURCE getopt.c) + include_directories(include) +endif() add_executable(winebuild ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) -ADD_DEPENDENCIES(winebuild build_header) +ADD_DEPENDENCIES(winebuild build_header) Added: branches/cmake-bringup/tools/winebuild/getopt.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/g… ============================================================================== --- branches/cmake-bringup/tools/winebuild/getopt.c (added) +++ branches/cmake-bringup/tools/winebuild/getopt.c [iso-8859-1] Sat Sep 18 23:45:55 2010 @@ -1,0 +1,394 @@ +#include <assert.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <getopt.h> +#include <stdarg.h> +#include <stdio.h> + +#define REPLACE_GETOPT + +#define _DIAGASSERT(x) do {} while (0) + +#ifdef REPLACE_GETOPT +#ifdef __weak_alias +__weak_alias(getopt,_getopt) +#endif +int opterr = 1; +int optind = 1; +int optopt = '?'; +int optreset; +char *optarg; +#endif + +#ifdef __weak_alias +__weak_alias(getopt_long,_getopt_long) +#endif + +#ifndef __CYGWIN__ +#define __progname __argv[0] +#else +extern char __declspec(dllimport) *__progname; +#endif + +#define IGNORE_FIRST (*options == '-' || *options == '+') +#define PRINT_ERROR ((opterr) && ((*options != ':') || (IGNORE_FIRST && options[1] != ':'))) + +#ifndef IS_POSIXLY_CORRECT +#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL) +#endif + +#define PERMUTE (!IS_POSIXLY_CORRECT && !IGNORE_FIRST) + +#define IN_ORDER (!IS_POSIXLY_CORRECT && *options == '-') + +#define BADCH (int)'?' +#define BADARG ((IGNORE_FIRST && options[1] == ':') || (*options == ':') ? (int)':' : (int)'?') +#define INORDER (int)1 + +static char EMSG[1]; + +static int getopt_internal (int,char * const *,const char *); +static int gcd (int,int); +static void permute_args (int,int,int,char * const *); + +static char *place = EMSG; + +static int nonopt_start = -1; +static int nonopt_end = -1; + +static const char recargchar[] = "option requires an argument -- %c"; +static const char recargstring[] = "option requires an argument -- %s"; +static const char ambig[] = "ambiguous option -- %.*s"; +static const char noarg[] = "option doesn't take an argument -- %.*s"; +static const char illoptchar[] = "unknown option -- %c"; +static const char illoptstring[] = "unknown option -- %s"; + +static void +_vwarnx(const char *fmt,va_list ap) +{ + (void)fprintf(stderr,"%s: ",__progname); + if (fmt != NULL) + (void)vfprintf(stderr,fmt,ap); + (void)fprintf(stderr,"\n"); +} + +static void +warnx(const char *fmt,...) +{ + va_list ap; + va_start(ap,fmt); + _vwarnx(fmt,ap); + va_end(ap); +} + +static int +gcd(a,b) + int a; + int b; +{ + int c; + + c = a % b; + while (c != 0) { + a = b; + b = c; + c = a % b; + } + + return b; +} + +static void +permute_args(panonopt_start,panonopt_end,opt_end,nargv) + int panonopt_start; + int panonopt_end; + int opt_end; + char * const *nargv; +{ + int cstart,cyclelen,i,j,ncycle,nnonopts,nopts,pos; + char *swap; + + _DIAGASSERT(nargv != NULL); + + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle = gcd(nnonopts,nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + + for (i = 0; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; + for (j = 0; j < cyclelen; j++) { + if (pos >= panonopt_end) + pos -= nnonopts; + else + pos += nopts; + swap = nargv[pos]; + + ((char **) nargv)[pos] = nargv[cstart]; + + ((char **)nargv)[cstart] = swap; + } + } +} + +static int +getopt_internal(nargc,nargv,options) + int nargc; + char * const *nargv; + const char *options; +{ + char *oli; + int optchar; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + + optarg = NULL; + + if (optind == 0) + optind = 1; + + if (optreset) + nonopt_start = nonopt_end = -1; +start: + if (optreset || !*place) { + optreset = 0; + if (optind >= nargc) { + place = EMSG; + if (nonopt_end != -1) { + + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + else if (nonopt_start != -1) { + + optind = nonopt_start; + } + nonopt_start = nonopt_end = -1; + return -1; + } + if ((*(place = nargv[optind]) != '-') + || (place[1] == '\0')) { + place = EMSG; + if (IN_ORDER) { + + optarg = nargv[optind++]; + return INORDER; + } + if (!PERMUTE) { + + return -1; + } + + if (nonopt_start == -1) + nonopt_start = optind; + else if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end = -1; + } + optind++; + + goto start; + } + if (nonopt_start != -1 && nonopt_end == -1) + nonopt_end = optind; + if (place[1] && *++place == '-') { + place++; + return -2; + } + } + if ((optchar = (int)*place++) == (int)':' || + (oli = strchr(options + (IGNORE_FIRST ? 1 : 0),optchar)) == NULL) { + + if (!*place) + ++optind; + if (PRINT_ERROR) + warnx(illoptchar,optchar); + optopt = optchar; + return BADCH; + } + if (optchar == 'W' && oli[1] == ';') { + + if (*place) + return -2; + + if (++optind >= nargc) { + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar,optchar); + optopt = optchar; + return BADARG; + } else + place = nargv[optind]; + + return -2; + } + if (*++oli != ':') { + if (!*place) + ++optind; + } else { + optarg = NULL; + if (*place) + optarg = place; + + else if (oli[1] != ':') { + if (++optind >= nargc) { + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar,optchar); + optopt = optchar; + return BADARG; + } else + optarg = nargv[optind]; + } + place = EMSG; + ++optind; + } + + return optchar; +} + +#ifdef REPLACE_GETOPT + +int +getopt(nargc,nargv,options) + int nargc; + char * const *nargv; + const char *options; +{ + int retval; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + + if ((retval = getopt_internal(nargc,nargv,options)) == -2) { + ++optind; + + if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + retval = -1; + } + return retval; +} +#endif + +int +getopt_long(nargc,nargv,options,long_options,idx) + int nargc; + char * const *nargv; + const char *options; + const struct option *long_options; + int *idx; +{ + int retval; + + _DIAGASSERT(nargv != NULL); + _DIAGASSERT(options != NULL); + _DIAGASSERT(long_options != NULL); + + if ((retval = getopt_internal(nargc,nargv,options)) == -2) { + char *current_argv,*has_equal; + size_t current_argv_len; + int i,match; + + current_argv = place; + match = -1; + + optind++; + place = EMSG; + + if (*current_argv == '\0') { + + if (nonopt_end != -1) { + permute_args(nonopt_start,nonopt_end,optind,nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + return -1; + } + if ((has_equal = strchr(current_argv,'=')) != NULL) { + + current_argv_len = has_equal - current_argv; + has_equal++; + } else + current_argv_len = strlen(current_argv); + + for (i = 0; long_options[i].name; i++) { + + if (strncmp(current_argv,long_options[i].name,current_argv_len)) + continue; + + if (strlen(long_options[i].name) == + (unsigned)current_argv_len) { + + match = i; + break; + } + if (match == -1) + match = i; + else { + + if (PRINT_ERROR) + warnx(ambig,(int)current_argv_len,current_argv); + optopt = 0; + return BADCH; + } + } + if (match != -1) { + if (long_options[match].has_arg == no_argument + && has_equal) { + if (PRINT_ERROR) + warnx(noarg,(int)current_argv_len,current_argv); + + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + return BADARG; + } + if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { + if (has_equal) + optarg = has_equal; + else if (long_options[match].has_arg == + required_argument) { + + optarg = nargv[optind++]; + } + } + if ((long_options[match].has_arg == required_argument) + && (optarg == NULL)) { + + if (PRINT_ERROR) + warnx(recargstring,current_argv); + + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + --optind; + return BADARG; + } + } else { + if (PRINT_ERROR) + warnx(illoptstring,current_argv); + optopt = 0; + return BADCH; + } + if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; + retval = 0; + } else + retval = long_options[match].val; + if (idx) + *idx = match; + } + return retval; +} Propchange: branches/cmake-bringup/tools/winebuild/getopt.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/cmake-bringup/tools/winebuild/include/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 18 23:45:55 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/tools/winebuild/include/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/tools/winebuild/include/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/tools/winebuild/include/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/tools/winebuild/include/getopt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/i… ============================================================================== --- branches/cmake-bringup/tools/winebuild/include/getopt.h (added) +++ branches/cmake-bringup/tools/winebuild/include/getopt.h [iso-8859-1] Sat Sep 18 23:45:55 2010 @@ -1,0 +1,84 @@ +/* + * Copyright (c) 1987, 1993, 1994, 1996 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __GETOPT_H__ +#define __GETOPT_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +extern int opterr; /* if error message should be printed */ +extern int optind; /* index into parent argv vector */ +extern int optopt; /* character checked for validity */ +extern int optreset; /* reset getopt */ +extern char *optarg; /* argument associated with option */ + +int getopt (int, char * const *, const char *); + +#ifdef __cplusplus +} +#endif + +#endif /* __GETOPT_H__ */ + +#ifndef __UNISTD_GETOPT__ +#ifndef __GETOPT_LONG_H__ +#define __GETOPT_LONG_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +struct option { + const char *name; + int has_arg; + int *flag; + int val; +}; + +int getopt_long (int, char *const *, const char *, const struct option *, int *); +#ifndef HAVE_DECL_GETOPT +#define HAVE_DECL_GETOPT 1 +#endif + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +#ifdef __cplusplus +} +#endif + +#endif /* __GETOPT_LONG_H__ */ +#endif /* __UNISTD_GETOPT__ */ Propchange: branches/cmake-bringup/tools/winebuild/include/getopt.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/cmake-bringup/tools/winebuild/include/sys/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 18 23:45:55 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/tools/winebuild/include/sys/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/tools/winebuild/include/sys/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/tools/winebuild/include/sys/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/tools/winebuild/include/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/i… ============================================================================== --- branches/cmake-bringup/tools/winebuild/include/sys/stat.h (added) +++ branches/cmake-bringup/tools/winebuild/include/sys/stat.h [iso-8859-1] Sat Sep 18 23:45:55 2010 @@ -1,0 +1,43 @@ +#ifndef _INC_STAT +#define _INC_STAT + +#include <sys/types.h> + +#ifndef _STAT_DEFINED +#define _STAT_DEFINED + +#pragma pack(push,_CRT_PACKING) + struct stat { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; + }; +#pragma pack(pop) + +#endif /* !_STAT_DEFINED */ + +#define S_IFMT 0xF000 +#define S_IFDIR 0x4000 +#define S_IFIFO 0x1000 +#define S_IFCHR 0x2000 +#define S_IFBLK 0x3000 +#define S_IFREG 0x8000 + +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) + + _CRTIMP int __cdecl stat(const char *_Filename,struct stat *_Stat); + _CRTIMP int __cdecl fstat(int _Desc,struct stat *_Stat); + +#endif Propchange: branches/cmake-bringup/tools/winebuild/include/sys/stat.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 48806: [IP] - Fix a reference leak when aborting a listen request
by cgutman＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: cgutman Date: Sat Sep 18 15:50:56 2010 New Revision: 48806 URL: http://svn.reactos.org/svn/reactos?rev=48806&view=rev Log: [IP] - Fix a reference leak when aborting a listen request Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Sep 18 15:50:56 2010 @@ -117,6 +117,7 @@ Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); if( Bucket->AssociatedEndpoint == Connection ) { + DereferenceObject(Bucket->AssociatedEndpoint); RemoveEntryList( &Bucket->Entry ); ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG ); Found = TRUE;

1 0

[tkreuzer] 48805: [NCITOOL] - Fix compilation under certain circumstances
by tkreuzer＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: tkreuzer Date: Sat Sep 18 15:28:06 2010 New Revision: 48805 URL: http://svn.reactos.org/svn/reactos?rev=48805&view=rev Log: [NCITOOL] - Fix compilation under certain circumstances Modified: branches/cmake-bringup/tools/nci/ncitool.c Modified: branches/cmake-bringup/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/ncitool… ============================================================================== --- branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] Sat Sep 18 15:28:06 2010 @@ -86,6 +86,18 @@ " call [ecx]\n" \ " ret %xh\n" \ " }\n" + +#define UserModeStub_amd64 " mov eax, %xh\n" \ + " mov r10, rcx\n" \ + " syscall\n" \ + " ret %xh\n\n" + +#define UserModeStub_ppc " \n" + +#define UserModeStub_mips " \n" + +#define UserModeStub_arm " \n" + #else #error Unknown compiler for inline assembler #endif @@ -125,6 +137,17 @@ " call _KiSystemService\n" \ " ret %xh\n" \ " }\n" + +#define KernelModeStub_amd64 " mov eax, %xh\n" \ + " call KiSystemService\n" \ + " ret %xh\n\n" + +#define KernelModeStub_ppc " \n" + +#define KernelModeStub_mips " \n" + +#define KernelModeStub_arm " \n" + #else #error Unknown compiler for inline assembler #endif @@ -670,7 +693,7 @@ int main(int argc, char* argv[]) { - FILE * Files[Arguments] = { }; + FILE * Files[Arguments] = {0}; int FileNumber, ArgOffset = 1; char * OpenType = "r";

1 0

[spetreolle] 48804: [CMAKE] Generalize CMAKE_C_CREATE_SHARED_LIBRARY and remove per project instances. Thanks to Amine for regexxer tool discovery ; )
by spetreolle＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: spetreolle Date: Sat Sep 18 15:22:08 2010 New Revision: 48804 URL: http://svn.reactos.org/svn/reactos?rev=48804&view=rev Log: [CMAKE] Generalize CMAKE_C_CREATE_SHARED_LIBRARY and remove per project instances. Thanks to Amine for regexxer tool discovery ;) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt branches/cmake-bringup/dll/win32/authz/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/hid/CMakeLists.txt branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/printui/CMakeLists.txt branches/cmake-bringup/dll/win32/query/CMakeLists.txt branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/url/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/user32.rc branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/drivers/base/beep/CMakeLists.txt branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt branches/cmake-bringup/drivers/base/null/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… Modified: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/authz/C… Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… Modified: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/clusapi… Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… Modified: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… Modified: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dciman3… Modified: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… Modified: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/faultre… Modified: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… Modified: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… Modified: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/CMa… Modified: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… Modified: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… Modified: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… Modified: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… Modified: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… Modified: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… Modified: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… Modified: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… Modified: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… Modified: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/… Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… Modified: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/C… Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree… Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… Modified: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/… Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… Modified: branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msnet32… Modified: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssign3… Modified: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssip32… Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Modified: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… Modified: branches/cmake-bringup/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt4… Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… Modified: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/nddeapi… Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… Modified: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntlanma… Modified: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntprint… Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… Modified: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr3… Modified: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olethk3… Modified: branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pidgen/… Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… Modified: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/printui… Modified: branches/cmake-bringup/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/C… Modified: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasapi3… Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… Modified: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasman/… Modified: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/resutil… Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… Modified: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sccbase… Modified: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/schanne… Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/… Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… Modified: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclien… Modified: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMa… Modified: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed… Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/… Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspap… Modified: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMa… Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/beep… Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco… Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null… Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn… Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… Modified: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… Modified: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80… Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd… Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mou… Modified: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/ser… Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu… Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… Modified: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… Modified: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… Modified: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/f… Modified: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

1 0

[fireball] 48803: - Merge 48462 by tkreuzer: "Copy the alpha channel as well when doing RGB<->BGR color translations."
by fireball＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: fireball Date: Sat Sep 18 13:14:21 2010 New Revision: 48803 URL: http://svn.reactos.org/svn/reactos?rev=48803&view=rev Log: - Merge 48462 by tkreuzer: "Copy the alpha channel as well when doing RGB<->BGR color translations." Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxlate.c [iso-8859-1] Sat Sep 18 13:14:21 2010 @@ -64,11 +64,11 @@ { ULONG iNewColor; - /* Copy green */ - iNewColor = iColor & 0x00ff00; + /* Copy green and alpha */ + iNewColor = iColor & 0xff00ff00; /* Mask red and blue */ - iColor &= 0xff00ff; + iColor &= 0x00ff00ff; /* Shift and copy red and blue */ iNewColor |= iColor >> 16;

1 0

[akhaldi] 48802: [CMAKE] - Generalize CMAKE_C_LINK_EXECUTABLE and CMAKE_EXE_LINKER_FLAGS, and use additional flags per module. - Fix usetup: make it depend on psdk and buildno_header, and also fix ...
by akhaldi＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: akhaldi Date: Sat Sep 18 12:14:03 2010 New Revision: 48802 URL: http://svn.reactos.org/svn/reactos?rev=48802&view=rev Log: [CMAKE] - Generalize CMAKE_C_LINK_EXECUTABLE and CMAKE_EXE_LINKER_FLAGS, and use additional flags per module. - Fix usetup: make it depend on psdk and buildno_header, and also fix the entry point (_NtProcessStartup -> _NtProcessStartup@4) - Make ext2lib depend on psdk. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Sep 18 12:14:03 2010 @@ -32,6 +32,8 @@ # Linking link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") # Activate support for assembly source files enable_language(ASM) Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Sep 18 12:14:03 2010 @@ -1,6 +1,3 @@ - -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,_WinMainCRTStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) @@ -20,4 +17,6 @@ -lgdi32 -lmsvcrt) +set_target_properties(calc PROPERTIES LINK_FLAGS "-Wl,-entry,_WinMainCRTStartup") + add_dependencies(calc psdk) 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] Sat Sep 18 12:14:03 2010 @@ -1,6 +1,3 @@ - -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) @@ -40,3 +37,7 @@ vfatlib mingw_common -lmsvcrt) + +set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4") + +add_dependencies(usetup psdk buildno_header) Modified: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ext2lib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Sat Sep 18 12:14:03 2010 @@ -1,4 +1,4 @@ -include_directories(.) file(GLOB_RECURSE SOURCE "*.c") add_library(ext2lib ${SOURCE}) +add_dependencies(ext2lib psdk) 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] Sat Sep 18 12:14:03 2010 @@ -1,8 +1,5 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -I${REACTOS_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include -O coff -o <OBJECT> ") - -set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds -Wl,--subsystem,native") add_definitions(-D__NTOSKRNL__) add_definitions(-D_NTOSKRNL_) @@ -406,7 +403,7 @@ add_executable(ntoskrnl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.h.gch) -set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4") +set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native") target_link_libraries(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_i386.def

1 0

[fireball] 48801: [NTOS] - Add support for Cyrix CPUs by checking and applying a workaround for the Cyrix 6x COMA bug (description here: http://gwyn.tux.org/~balsa/linux/cyrix/p11.html). See issue ...
by fireball＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: fireball Date: Sat Sep 18 09:14:45 2010 New Revision: 48801 URL: http://svn.reactos.org/svn/reactos?rev=48801&view=rev Log: [NTOS] - Add support for Cyrix CPUs by checking and applying a workaround for the Cyrix 6x COMA bug (description here: http://gwyn.tux.org/~balsa/linux/cyrix/p11.html). See issue #5610 for more details. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Sep 18 09:14:45 2010 @@ -105,6 +105,17 @@ return __readmsr(Register); } +/* NSC/Cyrix CPU configuration register index */ +#define CX86_CCR1 0xc1 + +/* NSC/Cyrix CPU indexed register access macros */ +#define getCx86(reg) ({ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); }) + +#define setCx86(reg, data) do { \ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); \ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23,(data)); \ +} while (0) + /* FUNCTIONS *****************************************************************/ VOID @@ -241,7 +252,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; ULONG FeatureBits = KF_WORKING_PTE; - ULONG Reg[4], Dummy; + ULONG Reg[4], Dummy, Ccr1; BOOLEAN ExtendedCPUID = TRUE; ULONG CpuFeatures = 0; @@ -352,7 +363,22 @@ /* Cyrix CPUs */ case CPU_CYRIX: - /* FIXME: CMPXCGH8B */ + /* Workaround the "COMA" bug on 6x family of Cyrix CPUs */ + if (Prcb->CpuType == 6 && + Prcb->CpuStep <= 1) + { + /* Get CCR1 value */ + Ccr1 = getCx86(CX86_CCR1); + + /* Enable the NO_LOCK bit */ + Ccr1 |= 0x10; + + /* Set the new CCR1 value */ + setCx86(CX86_CCR1, Ccr1); + } + + /* Set the current features */ + CpuFeatures = Reg[3]; break;

1 0

[fireball] 48800: [SC] - Roel Messiant: Fix a crash when running some operations in sc without providing arguments. Also, provide usage information for the control and unknown commands. - Aleksey B...
by fireball＠svn.reactos.org 18 Sep '10

18 Sep '10

Author: fireball Date: Sat Sep 18 08:41:06 2010 New Revision: 48800 URL: http://svn.reactos.org/svn/reactos?rev=48800&view=rev Log: [SC] - Roel Messiant: Fix a crash when running some operations in sc without providing arguments. Also, provide usage information for the control and unknown commands. - Aleksey Bragin: Take Ged Murphy's comments into account and change pointer arithmetic to a convenient style. See issue #5611 for more details. Modified: trunk/reactos/base/applications/sc/create.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/create.c [iso-8859-1] Sat Sep 18 08:41:06 2010 @@ -4,86 +4,265 @@ * FILE: base/system/sc/create.c * PURPOSE: Create a service * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * Roel Messiant <roelmessiant(a)gmail.com> * */ #include "sc.h" -BOOL Create(LPCTSTR ServiceName, LPCTSTR *ServiceArgs) + +typedef struct +{ + LPCTSTR lpOption; + DWORD dwValue; +} OPTION_INFO; + +typedef struct +{ + LPCTSTR lpServiceName; + LPCTSTR lpDisplayName; + DWORD dwServiceType; + DWORD dwStartType; + DWORD dwErrorControl; + LPCTSTR lpBinaryPathName; + LPCTSTR lpLoadOrderGroup; + DWORD dwTagId; + LPCTSTR lpDependencies; + LPCTSTR lpServiceStartName; + LPCTSTR lpPassword; + + BOOL bTagId; +} SERVICE_CREATE_INFO, *LPSERVICE_CREATE_INFO; + + +static const OPTION_INFO TypeOpts[] = +{ + { _T("own"), SERVICE_WIN32_OWN_PROCESS }, + { _T("share"), SERVICE_WIN32_SHARE_PROCESS }, + { _T("interact"), SERVICE_INTERACTIVE_PROCESS }, + { _T("kernel"), SERVICE_KERNEL_DRIVER }, + { _T("filesys"), SERVICE_FILE_SYSTEM_DRIVER }, + { _T("rec"), SERVICE_RECOGNIZER_DRIVER } +}; + +static const OPTION_INFO StartOpts[] = +{ + { _T("boot"), SERVICE_BOOT_START }, + { _T("system"), SERVICE_SYSTEM_START }, + { _T("auto"), SERVICE_AUTO_START }, + { _T("demand"), SERVICE_DEMAND_START }, + { _T("disabled"), SERVICE_DISABLED } +}; + +static const OPTION_INFO ErrorOpts[] = +{ + { _T("normal"), SERVICE_ERROR_NORMAL }, + { _T("severe"), SERVICE_ERROR_SEVERE }, + { _T("critical"), SERVICE_ERROR_CRITICAL }, + { _T("ignore"), SERVICE_ERROR_IGNORE } +}; + +static const OPTION_INFO TagOpts[] = +{ + { _T("yes"), TRUE }, + { _T("no"), FALSE } +}; + + +static BOOL ParseCreateArguments( + LPCTSTR *ServiceArgs, + INT ArgCount, + OUT LPSERVICE_CREATE_INFO lpServiceInfo +) +{ + INT i, ArgIndex = 1; + + if (ArgCount < 1) + return FALSE; + + ZeroMemory(lpServiceInfo, sizeof(SERVICE_CREATE_INFO)); + + lpServiceInfo->lpServiceName = ServiceArgs[0]; + + ArgCount--; + + while (ArgCount > 1) + { + if (!lstrcmpi(ServiceArgs[ArgIndex], _T("type="))) + { + for (i = 0; i < sizeof(TypeOpts) / sizeof(TypeOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TypeOpts[i].lpOption)) + { + lpServiceInfo->dwServiceType |= TypeOpts[i].dwValue; + break; + } + + if (i == sizeof(TypeOpts) / sizeof(TypeOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("start="))) + { + for (i = 0; i < sizeof(StartOpts) / sizeof(StartOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], StartOpts[i].lpOption)) + { + lpServiceInfo->dwStartType = StartOpts[i].dwValue; + break; + } + + if (i == sizeof(StartOpts) / sizeof(StartOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("error="))) + { + for (i = 0; i < sizeof(ErrorOpts) / sizeof(ErrorOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], ErrorOpts[i].lpOption)) + { + lpServiceInfo->dwErrorControl = ErrorOpts[i].dwValue; + break; + } + + if (i == sizeof(ErrorOpts) / sizeof(ErrorOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("tag="))) + { + for (i = 0; i < sizeof(TagOpts) / sizeof(TagOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TagOpts[i].lpOption)) + { + lpServiceInfo->bTagId = TagOpts[i].dwValue; + break; + } + + if (i == sizeof(TagOpts) / sizeof(TagOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("binpath="))) + { + lpServiceInfo->lpBinaryPathName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("group="))) + { + lpServiceInfo->lpLoadOrderGroup = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("depend="))) + { + lpServiceInfo->lpDependencies = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("obj="))) + { + lpServiceInfo->lpServiceStartName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("displayname="))) + { + lpServiceInfo->lpDisplayName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("password="))) + { + lpServiceInfo->lpPassword = ServiceArgs[ArgIndex + 1]; + } + + ArgIndex += 2; + ArgCount -= 2; + } + + return (ArgCount == 0); +} + +BOOL Create(LPCTSTR *ServiceArgs, INT ArgCount) { SC_HANDLE hSCManager; SC_HANDLE hSc; BOOL bRet = FALSE; - DWORD dwServiceType = SERVICE_WIN32_OWN_PROCESS; - DWORD dwStartType = SERVICE_DEMAND_START; - DWORD dwErrorControl = SERVICE_ERROR_NORMAL; - LPCTSTR lpBinaryPathName = NULL; - LPCTSTR lpLoadOrderGroup = NULL; - DWORD dwTagId = 0; - LPCTSTR lpDependencies = NULL; - LPCTSTR lpServiceStartName = NULL; - LPCTSTR lpPassword = NULL; - - /* quick hack to get it working */ - lpBinaryPathName = *ServiceArgs; - -#ifdef SCDBG - _tprintf(_T("service name - %s\n"), ServiceName); - _tprintf(_T("display name - %s\n"), ServiceName); - _tprintf(_T("service type - %lu\n"), dwServiceType); - _tprintf(_T("start type - %lu\n"), dwStartType); - _tprintf(_T("error control - %lu\n"), dwErrorControl); - _tprintf(_T("Binary path - %s\n"), lpBinaryPathName); - _tprintf(_T("load order group - %s\n"), lpLoadOrderGroup); - _tprintf(_T("tag - %lu\n"), dwTagId); - _tprintf(_T("dependincies - %s\n"), lpDependencies); - _tprintf(_T("account start name - %s\n"), lpServiceStartName); - _tprintf(_T("account password - %s\n"), lpPassword); -#endif - - if (!ServiceName) + INT i; + INT Length; + LPTSTR lpBuffer = NULL; + SERVICE_CREATE_INFO ServiceInfo; + + if (!ParseCreateArguments(ServiceArgs, ArgCount, &ServiceInfo)) { CreateUsage(); return FALSE; } - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CREATE_SERVICE); - if (hSCManager == NULL) - { + if (!ServiceInfo.dwServiceType) + ServiceInfo.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + + if (!ServiceInfo.dwStartType) + ServiceInfo.dwStartType = SERVICE_DEMAND_START; + + if (!ServiceInfo.dwErrorControl) + ServiceInfo.dwErrorControl = SERVICE_ERROR_NORMAL; + + if (ServiceInfo.lpDependencies) + { + Length = lstrlen(ServiceInfo.lpDependencies); + + lpBuffer = HeapAlloc(GetProcessHeap(), + 0, + (Length + 2) * sizeof(TCHAR)); + + for (i = 0; i < Length; i++) + if (ServiceInfo.lpDependencies[i] == _T('/')) + lpBuffer[i] = 0; + else + lpBuffer[i] = ServiceInfo.lpDependencies[i]; + + lpBuffer[Length] = 0; + lpBuffer[Length + 1] = 0; + + ServiceInfo.lpDependencies = lpBuffer; + } + +#ifdef SCDBG + _tprintf(_T("service name - %s\n"), ServiceInfo.lpServiceName); + _tprintf(_T("display name - %s\n"), ServiceInfo.lpDisplayName); + _tprintf(_T("service type - %lu\n"), ServiceInfo.dwServiceType); + _tprintf(_T("start type - %lu\n"), ServiceInfo.dwStartType); + _tprintf(_T("error control - %lu\n"), ServiceInfo.dwErrorControl); + _tprintf(_T("Binary path - %s\n"), ServiceInfo.lpBinaryPathName); + _tprintf(_T("load order group - %s\n"), ServiceInfo.lpLoadOrderGroup); + _tprintf(_T("tag - %lu\n"), ServiceInfo.dwTagId); + _tprintf(_T("dependencies - %s\n"), ServiceInfo.lpDependencies); + _tprintf(_T("account start name - %s\n"), ServiceInfo.lpServiceStartName); + _tprintf(_T("account password - %s\n"), ServiceInfo.lpPassword); +#endif + + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + + if (hSCManager != NULL) + { + hSc = CreateService(hSCManager, + ServiceInfo.lpServiceName, + ServiceInfo.lpDisplayName, + SERVICE_ALL_ACCESS, + ServiceInfo.dwServiceType, + ServiceInfo.dwStartType, + ServiceInfo.dwErrorControl, + ServiceInfo.lpBinaryPathName, + ServiceInfo.lpLoadOrderGroup, + ServiceInfo.bTagId ? &ServiceInfo.dwTagId : NULL, + ServiceInfo.lpDependencies, + ServiceInfo.lpServiceStartName, + ServiceInfo.lpPassword); + + if (hSc != NULL) + { + _tprintf(_T("[SC] CreateService SUCCESS\n")); + + CloseServiceHandle(hSc); + bRet = TRUE; + } + else + ReportLastError(); + + CloseServiceHandle(hSCManager); + } + else ReportLastError(); - return FALSE; - } - - hSc = CreateService(hSCManager, - ServiceName, - ServiceName, - SERVICE_ALL_ACCESS, - dwServiceType, - dwStartType, - dwErrorControl, - lpBinaryPathName, - lpLoadOrderGroup, - &dwTagId, - lpDependencies, - lpServiceStartName, - lpPassword); - - if (hSc == NULL) - { - ReportLastError(); - CloseServiceHandle(hSCManager); - } - else - { - _tprintf(_T("[SC] CreateService SUCCESS\n")); - - CloseServiceHandle(hSc); - CloseServiceHandle(hSCManager); - bRet = TRUE; - } + + if (lpBuffer != NULL) + HeapFree(GetProcessHeap(), 0, lpBuffer); return bRet; } Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Sep 18 08:41:06 2010 @@ -67,11 +67,11 @@ } else if (!lstrcmpi(Command, _T("start"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) - { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Start(ServiceName, ServiceArgs, ArgCount); @@ -81,11 +81,11 @@ } else if (!lstrcmpi(Command, _T("pause"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) - { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Control(SERVICE_CONTROL_PAUSE, ServiceName, ServiceArgs, @@ -96,11 +96,11 @@ } else if (!lstrcmpi(Command, _T("interrogate"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) - { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Control(SERVICE_CONTROL_INTERROGATE, ServiceName, ServiceArgs, @@ -111,11 +111,11 @@ } else if (!lstrcmpi(Command, _T("stop"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) - { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Control(SERVICE_CONTROL_STOP, ServiceName, ServiceArgs, @@ -126,11 +126,11 @@ } else if (!lstrcmpi(Command, _T("continue"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) - { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Control(SERVICE_CONTROL_CONTINUE, ServiceName, ServiceArgs, @@ -141,51 +141,49 @@ } else if (!lstrcmpi(Command, _T("delete"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (ServiceName) + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + Delete(ServiceName); + } else DeleteUsage(); } else if (!lstrcmpi(Command, _T("create"))) { - ServiceName = *ServiceArgs++; - ArgCount--; - - if (*ServiceArgs) - Create(ServiceName, - ServiceArgs); - else - CreateUsage(); + Create(ServiceArgs, ArgCount); } else if (!lstrcmpi(Command, _T("control"))) { INT CtlValue; - ServiceName = *ServiceArgs++; - ArgCount--; - - CtlValue = _ttoi(ServiceArgs[0]); - ServiceArgs++; - ArgCount--; - - if (ServiceName) - { - if ((CtlValue >=128) && CtlValue <= 255) - { + if (ArgCount > 1) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + CtlValue = _ttoi(ServiceArgs[0]); + ServiceArgs++; + ArgCount--; + + if ((CtlValue >= 128) && (CtlValue <= 255)) Control(CtlValue, ServiceName, ServiceArgs, ArgCount); - - return 0; - } - } - - ContinueUsage(); - } + else + ControlUsage(); + } + else + ControlUsage(); + } + else + { + MainUsage(); + } + return 0; } Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Sep 18 08:41:06 2010 @@ -7,7 +7,7 @@ /* control functions */ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount); -BOOL Create(LPCTSTR ServiceName, LPCTSTR *ServiceArgs); +BOOL Create(LPCTSTR *ServiceArgs, INT ArgCount); BOOL Delete(LPCTSTR ServiceName); BOOL Control(DWORD Control, LPCTSTR ServiceName, LPCTSTR *Args, INT ArgCount); BOOL Query(LPCTSTR *ServiceArgs, DWORD ArgCount, BOOL bExtended); @@ -29,3 +29,4 @@ VOID DescriptionUsage(VOID); VOID DeleteUsage(VOID); VOID CreateUsage(VOID); +VOID ControlUsage(VOID); Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Sep 18 08:41:06 2010 @@ -118,7 +118,7 @@ VOID StopUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sends an STOP control request to a service.\n") + _T(" Sends a STOP control request to a service.\n") _T("USAGE:\n") _T(" sc <server> stop [service name]\n")); } @@ -126,7 +126,7 @@ VOID ContinueUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sends an CONTINUE control request to a service.\n") + _T(" Sends a CONTINUE control request to a service.\n") _T("USAGE:\n") _T(" sc <server> continue [service name]\n")); } @@ -179,3 +179,11 @@ _T(" DisplayName= <display name>\n") _T(" password= <password>\n")); } + +VOID ControlUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Sends a CONTROL control request to a service.\n") + _T("USAGE:\n") + _T(" sc <server> control [service name] <value>\n")); +}

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