[CMAKE]
authorSylvain Petreolle <spetreolle@yahoo.fr>
Mon, 31 Jan 2011 21:47:39 +0000 (21:47 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Mon, 31 Jan 2011 21:47:39 +0000 (21:47 +0000)
Sync trunk up to r50570.

svn path=/branches/cmake-bringup/; revision=50581

57 files changed:
1  2 
base/shell/explorer-new/traywnd.c
dll/cpl/desk/appearance.c
dll/cpl/desk/theme.c
dll/win32/kernel32/file/dir.c
dll/win32/kernel32/file/file.c
dll/win32/wdmaud.drv/legacy.c
dll/win32/wdmaud.drv/mmixer.c
dll/win32/wdmaud.drv/wdmaud.h
drivers/filesystems/npfs/dirctl.c
drivers/filesystems/npfs/npfs.h
drivers/ksfilter/CMakeLists.txt
drivers/ksfilter/ks/CMakeLists.txt
drivers/ksfilter/ks/allocators.c
drivers/ksfilter/ks/api.c
drivers/ksfilter/ks/clocks.c
drivers/ksfilter/ks/device.c
drivers/ksfilter/ks/filter.c
drivers/ksfilter/ks/filterfactory.c
drivers/ksfilter/ks/irp.c
drivers/ksfilter/ks/ksfunc.h
drivers/ksfilter/ks/ksiface.h
drivers/ksfilter/ks/kstypes.h
drivers/ksfilter/ks/misc.c
drivers/ksfilter/ks/pin.c
drivers/ksfilter/ks/priv.h
drivers/ksfilter/ks/swenum.c
drivers/ksfilter/swenum/CMakeLists.txt
drivers/ksfilter/swenum/swenum.c
drivers/network/tdi/CMakeLists.txt
drivers/network/tdi/cte/events.c
drivers/network/tdi/cte/timer.c
drivers/network/tdi/misc/main.c
drivers/network/tdi/misc/tdi.spec
drivers/network/tdi/tdi/dereg.c
drivers/network/tdi/tdi/stubs.c
drivers/wdm/audio/legacy/wdmaud/mmixer.c
include/psdk/ks.h
include/reactos/libs/sound/mmebuddy.h
include/reactos/wine/port.h
include/reactos/winlogon.h
lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
lib/drivers/sound/mmebuddy/mmewrap.c
lib/drivers/sound/mmebuddy/wave/format.c
lib/drivers/sound/mmebuddy/wave/streaming.c
lib/drivers/sound/mmebuddy/wave/wodMessage.c
lib/drivers/sound/mmixer/TODO
lib/drivers/sound/mmixer/controls.c
lib/drivers/sound/mmixer/midi.c
lib/drivers/sound/mmixer/mixer.c
lib/drivers/sound/mmixer/mmixer.h
lib/drivers/sound/mmixer/priv.h
lib/drivers/sound/mmixer/sup.c
lib/drivers/sound/mmixer/topology.c
lib/drivers/sound/mmixer/wave.c
lib/lsalib/lsa.c
subsystems/win32/win32k/ntuser/painting.c
subsystems/win32/win32k/ntuser/timer.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 6a8aaa1,0000000..521247b
mode 100644,000000..100644
--- /dev/null
@@@ -1,2 -1,0 +1,3 @@@
 +
 +add_subdirectory(ks)
++add_subdirectory(swenum)
index bd19acd,0000000..a4888e7
mode 100644,000000..100644
--- /dev/null
@@@ -1,47 -1,0 +1,48 @@@
 +
 +spec2def(ks.sys ks.spec)
 +
 +add_definitions(
 +    -DBUILDING_KS
 +    -D_COMDDK_)
 +
 +list(APPEND SOURCE
 +    api.c
 +    allocators.c
 +    bag.c
 +    device.c
 +    deviceinterface.c
 +    driver.c
 +    clocks.c
 +    connectivity.c
 +    event.c
 +    filter.c
 +    filterfactory.c
 +    image.c
 +    irp.c
 +    methods.c
 +    misc.c
 +    pin.c
 +    property.c
 +    topology.c
 +    unknown.c
 +    worker.c
 +    kcom.c
++    swenum.c
 +    ks.rc
 +    ${CMAKE_CURRENT_BINARY_DIR}/ks.def)
 +
 +add_library(ks SHARED ${SOURCE})
 +
 +set_target_properties(ks PROPERTIES SUFFIX ".sys")
 +
 +set_entrypoint(ks 0)
 +set_subsystem(ks native)
 +set_image_base(ks 0x00010000)
 +
 +target_link_libraries(ks ${PSEH_LIB})
 +
 +add_importlibs(ks ntoskrnl hal)
 +add_dependencies(ks psdk bugcodes)
 +
 +add_cab_target(ks 2)
 +add_importlib_target(ks.spec)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,08d5286..08d5286
mode 000000,100644..100644
--- /dev/null
index 0000000,0000000..fbf53f7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,11 @@@
++
++list(APPEND SOURCE
++    swenum.c)
++
++add_library(swenum SHARED ${SOURCE})
++
++set_module_type(swenum kernelmodedriver)
++add_importlibs(swenum ks ntoskrnl hal)
++
++add_minicd_target(swenum reactos)
++add_livecd_target(swenum reactos/system32/drivers)
Simple merge
index 4afa013,0000000..1b57c6f
mode 100644,000000..100644
--- /dev/null
@@@ -1,28 -1,0 +1,30 @@@
-     -D_NTDRIVER_)
 +
 +include_directories(
 +    BEFORE include
 +    ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
 +
 +add_definitions(
 +    -DNDIS40
-     cte/stubs.c
++    -D_NTDRIVER_
++    -D_TDI_)
 +
 +spec2def(tdi.sys misc/tdi.spec)
 +
 +list(APPEND SOURCE
++    cte/events.c
 +    cte/string.c
++    cte/timer.c
 +    misc/main.c
 +    misc/tdi.rc
 +    tdi/dereg.c
 +    tdi/handler.c
 +    tdi/obsolete.c
 +    tdi/stubs.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/tdi.def)
 +
 +add_library(tdi SHARED ${SOURCE})
 +
 +set_module_type(tdi kernelmodedriver)
 +add_importlibs(tdi ntoskrnl hal)
 +
 +add_cab_target(tdi 2)
index 0000000,dd6aff1..dd6aff1
mode 000000,100644..100644
--- /dev/null
index 0000000,aa82dfe..aa82dfe
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b5c93b8,0000000..a105012
mode 100644,000000..100644
--- /dev/null
@@@ -1,340 -1,0 +1,343 @@@
 +/*
 + * Wine porting definitions
 + *
 + * Copyright 1996 Alexandre Julliard
 + *
 + * This library is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * This library is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with this library; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 + */
 +
 +#ifndef __WINE_WINE_PORT_H
 +#define __WINE_WINE_PORT_H
 +
 +#ifndef __WINE_CONFIG_H
 +# error You must include config.h to use this header
 +#endif
 +
 +#define _GNU_SOURCE  /* for pread/pwrite */
 +#include <fcntl.h>
 +#include <math.h>
 +#include <sys/types.h>
 +#include <sys/stat.h>
 +#ifdef HAVE_DIRECT_H
 +# include <direct.h>
 +#endif
 +#ifdef HAVE_IO_H
 +# include <io.h>
 +#endif
 +#ifdef HAVE_PROCESS_H
 +# include <process.h>
 +#endif
 +#include <string.h>
 +#ifdef HAVE_UNISTD_H
 +# include <unistd.h>
 +#endif
 +
 +
 +/****************************************************************
 + * Type definitions
 + */
 +
 +#if !defined(_MSC_VER) && !defined(__int64)
 +#  if defined(__x86_64__) || defined(_WIN64)
 +#    define __int64 long
 +#  else
 +#    define __int64 long long
 +#  endif
 +#endif
 +
 +#ifndef HAVE_MODE_T
 +typedef int mode_t;
 +#endif
 +#ifndef HAVE_OFF_T
 +typedef long off_t;
 +#endif
 +#ifndef HAVE_PID_T
 +typedef int pid_t;
 +#endif
 +#ifndef HAVE_SIZE_T
 +typedef unsigned int size_t;
 +#endif
 +#ifndef HAVE_SSIZE_T
 +typedef int ssize_t;
 +#endif
 +//#ifndef HAVE_SOCKLEN_T
 +//typedef unsigned int socklen_t;
 +//#endif
 +
 +#ifndef HAVE_STATFS
 +# ifdef __BEOS__
 +#  define HAVE_STRUCT_STATFS_F_BFREE
 +struct statfs {
 +  long   f_bsize;  /* block_size */
 +  long   f_blocks; /* total_blocks */
 +  long   f_bfree;  /* free_blocks */
 +};
 +# else /* defined(__BEOS__) */
 +struct statfs;
 +# endif /* defined(__BEOS__) */
 +#endif /* !defined(HAVE_STATFS) */
 +
 +
 +/****************************************************************
 + * Macro definitions
 + */
 +
 +#ifdef HAVE_DLFCN_H
 +#include <dlfcn.h>
 +#else
 +#define RTLD_LAZY    0x001
 +#define RTLD_NOW     0x002
 +#define RTLD_GLOBAL  0x100
 +#endif
 +
 +#if !defined(HAVE_FTRUNCATE) && defined(HAVE_CHSIZE)
 +#define ftruncate chsize
 +#endif
 +
 +#if !defined(HAVE_POPEN) && defined(HAVE__POPEN)
 +#define popen _popen
 +#endif
 +
 +#if !defined(HAVE_PCLOSE) && defined(HAVE__PCLOSE)
 +#define pclose _pclose
 +#endif
 +
 +#if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF)
 +#define snprintf _snprintf
 +#endif
 +
 +#if !defined(HAVE_VSNPRINTF) && defined(HAVE__VSNPRINTF)
 +#define vsnprintf _vsnprintf
 +#endif
 +
 +#ifndef S_ISLNK
 +# define S_ISLNK(mod) (0)
 +#endif /* S_ISLNK */
 +
 +/* So we open files in 64 bit access mode on Linux */
 +#ifndef O_LARGEFILE
 +# define O_LARGEFILE 0
 +#endif
 +
 +#ifndef O_BINARY
 +# define O_BINARY 0
 +#endif
 +
 +/****************************************************************
 + * Constants
 + */
 +
 +#ifndef M_PI
 +#define M_PI 3.14159265358979323846
 +#endif
 +
 +#ifndef M_PI_2
 +#define M_PI_2 1.570796326794896619
 +#endif
 +
++#ifndef M_PI_4
++#define M_PI_4 0.785398163397448309616
++#endif
 +
 +/* Constructor functions */
 +
 +#ifdef _MSC_VER // ReactOS
 +#pragma message("DECL_GLOBAL_CONSTRUCTOR is not properly defined")
 +# define DECL_GLOBAL_CONSTRUCTOR(func) \
 +    static void func(void)
 +#elif defined(__GNUC__)
 +# define DECL_GLOBAL_CONSTRUCTOR(func) \
 +    static void func(void) __attribute__((constructor)); \
 +    static void func(void)
 +#elif defined(__i386__)
 +# define DECL_GLOBAL_CONSTRUCTOR(func) \
 +    static void __dummy_init_##func(void) { \
 +        asm(".section .init,\"ax\"\n\t" \
 +            "call " #func "\n\t" \
 +            ".previous"); } \
 +    static void func(void)
 +#elif defined(__sparc__)
 +# define DECL_GLOBAL_CONSTRUCTOR(func) \
 +    static void __dummy_init_##func(void) { \
 +        asm("\t.section \".init\",#alloc,#execinstr\n" \
 +            "\tcall " #func "\n" \
 +            "\tnop\n" \
 +            "\t.section \".text\",#alloc,#execinstr\n" ); } \
 +    static void func(void)
 +#else
 +# error You must define the DECL_GLOBAL_CONSTRUCTOR macro for your platform
 +#endif
 +
 +
 +/* Register functions */
 +
 +#ifdef __i386__
 +#define DEFINE_REGS_ENTRYPOINT( name, fn, args, pop_args ) \
 +    __ASM_GLOBAL_FUNC( name, \
 +                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
 +                       ".long " __ASM_NAME(#fn) "\n\t" \
 +                       ".byte " #args "," #pop_args )
 +/* FIXME: add support for other CPUs */
 +#endif  /* __i386__ */
 +
 +
 +/****************************************************************
 + * Function definitions (only when using libwine_port)
 + */
 +
 +#ifndef NO_LIBWINE_PORT
 +
 +#ifndef HAVE_GETOPT_LONG
 +extern char *optarg;
 +extern int optind;
 +extern int opterr;
 +extern int optopt;
 +struct option;
 +
 +#ifndef HAVE_STRUCT_OPTION_NAME
 +struct option
 +{
 +    const char *name;
 +    int has_arg;
 +    int *flag;
 +    int val;
 +};
 +#endif
 +
 +extern int getopt_long (int ___argc, char *const *___argv,
 +                        const char *__shortopts,
 +                        const struct option *__longopts, int *__longind);
 +extern int getopt_long_only (int ___argc, char *const *___argv,
 +                             const char *__shortopts,
 +                             const struct option *__longopts, int *__longind);
 +#endif  /* HAVE_GETOPT_LONG */
 +
 +#ifndef HAVE_GETPAGESIZE
 +size_t getpagesize(void);
 +#endif  /* HAVE_GETPAGESIZE */
 +
 +#ifndef HAVE_LSTAT
 +int lstat(const char *file_name, struct stat *buf);
 +#endif /* HAVE_LSTAT */
 +
 +#ifndef HAVE_MEMMOVE
 +void *memmove(void *dest, const void *src, size_t len);
 +#endif /* !defined(HAVE_MEMMOVE) */
 +
 +#ifndef __REACTOS__
 +#ifndef HAVE_PREAD
 +ssize_t pread( int fd, void *buf, size_t count, off_t offset );
 +#endif /* HAVE_PREAD */
 +
 +#ifndef HAVE_PWRITE
 +ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset );
 +#endif /* HAVE_PWRITE */
 +#endif /* __REACTOS__ */
 +
 +#ifdef WIN32
 +#ifndef HAVE_SIGSETJMP
 +# include <setjmp.h>
 +typedef jmp_buf sigjmp_buf;
 +int sigsetjmp( sigjmp_buf buf, int savesigs );
 +void siglongjmp( sigjmp_buf buf, int val );
 +#endif /* HAVE_SIGSETJMP */
 +#endif
 +
 +#ifndef HAVE_STATFS
 +int statfs(const char *name, struct statfs *info);
 +#endif /* !defined(HAVE_STATFS) */
 +
 +#ifndef HAVE_STRNCASECMP
 +# ifndef HAVE__STRNICMP
 +int strncasecmp(const char *str1, const char *str2, size_t n);
 +# else
 +# define strncasecmp _strnicmp
 +# endif
 +#endif /* !defined(HAVE_STRNCASECMP) */
 +
 +#ifndef HAVE_STRERROR
 +const char *strerror(int err);
 +#endif /* !defined(HAVE_STRERROR) */
 +
 +#ifndef HAVE_STRCASECMP
 +# ifndef HAVE__STRICMP
 +int strcasecmp(const char *str1, const char *str2);
 +# else
 +# define strcasecmp _stricmp
 +# endif
 +#endif /* !defined(HAVE_STRCASECMP) */
 +
 +#if !defined(HAVE_USLEEP) && !defined(__CYGWIN__)
 +int usleep (unsigned int useconds);
 +#endif /* !defined(HAVE_USLEEP) */
 +
 +#ifdef __i386__
 +static inline void *memcpy_unaligned( void *dst, const void *src, size_t size )
 +{
 +    return memcpy( dst, src, size );
 +}
 +#else
 +extern void *memcpy_unaligned( void *dst, const void *src, size_t size );
 +#endif /* __i386__ */
 +
 +extern int mkstemps(char *template, int suffix_len);
 +
 +/* Process creation flags */
 +#ifndef _P_WAIT
 +# define _P_WAIT    0
 +# define _P_NOWAIT  1
 +# define _P_OVERLAY 2
 +# define _P_NOWAITO 3
 +# define _P_DETACH  4
 +#endif
 +#ifndef HAVE_SPAWNVP
 +extern int spawnvp(int mode, const char *cmdname, const char * const argv[]);
 +#endif
 +
 +/* Interlocked functions */
 +
 +#if defined(_MSC_VER) || (defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED))
 +
 +#define interlocked_cmpxchg InterlockedCompareExchange
 +#define interlocked_cmpxchg_ptr InterlockedCompareExchangePtr
 +#define interlocked_xchg InterlockedExchange
 +#define interlocked_xchg_ptr InterlockedExchangePtr
 +#define interlocked_xchg_add InterlockedExchangeAdd
 +
 +
 +#endif  /* __i386___ && __GNUC__ */
 +
 +#else /* NO_LIBWINE_PORT */
 +
 +#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable
 +
 +#define getopt_long             __WINE_NOT_PORTABLE(getopt_long)
 +#define getopt_long_only        __WINE_NOT_PORTABLE(getopt_long_only)
 +#define getpagesize             __WINE_NOT_PORTABLE(getpagesize)
 +#define lstat                   __WINE_NOT_PORTABLE(lstat)
 +#define memcpy_unaligned        __WINE_NOT_PORTABLE(memcpy_unaligned)
 +#define memmove                 __WINE_NOT_PORTABLE(memmove)
 +#define pread                   __WINE_NOT_PORTABLE(pread)
 +#define pwrite                  __WINE_NOT_PORTABLE(pwrite)
 +#define spawnvp                 __WINE_NOT_PORTABLE(spawnvp)
 +#define statfs                  __WINE_NOT_PORTABLE(statfs)
 +#define strcasecmp              __WINE_NOT_PORTABLE(strcasecmp)
 +#define strerror                __WINE_NOT_PORTABLE(strerror)
 +#define strncasecmp             __WINE_NOT_PORTABLE(strncasecmp)
 +#define usleep                  __WINE_NOT_PORTABLE(usleep)
 +
 +#endif /* NO_LIBWINE_PORT */
 +
 +#endif /* !defined(__WINE_WINE_PORT_H) */
Simple merge
Simple merge
index 0000000,05cf9c2..05cf9c2
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge