Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[akhaldi] 48592: [CMAKE] - Manually add source file (as suggested by Colin). - I've filed a feature request to have the same effect when still using GLOB/GLOB_RECURSE : http://public.kitware.com/Bug/view.php?id=11156

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 13:40:53 2010 New Revision: 48592 URL: http://svn.reactos.org/svn/reactos?rev=48592&view=rev Log: [CMAKE] - Manually add source file (as suggested by Colin). - I've filed a feature request to have the same effect when still using GLOB/GLOB_RECURSE : http://public.kitware.com/Bug/view.php?id=11156 Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt 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] Sun Aug 22 13:40:53 2010 @@ -5,13 +5,14 @@ add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) -file(GLOB_RECURSE SOURCE *.c) -list(REMOVE_ITEM SOURCE - ${CMAKE_CURRENT_SOURCE_DIR}/fun_mpfr.c - ${CMAKE_CURRENT_SOURCE_DIR}/rpn_mpfr.c - ${CMAKE_CURRENT_SOURCE_DIR}/utl_mpfr.c) - -add_executable(calc WIN32 ${SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/resource.rc) +add_executable(calc WIN32 + about.c + convert.c + function.c + rpn.c + utl.c + winmain.c + resource.rc) target_link_libraries(calc mingw_wmain ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a

14 years, 4 months

[akhaldi] 48591: [CMAKE] - Cache the mingw32 prefix. - Improve the RC compiler invocation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 13:38:36 2010 New Revision: 48591 URL: http://svn.reactos.org/svn/reactos?rev=48591&view=rev Log: [CMAKE] - Cache the mingw32 prefix. - Improve the RC compiler invocation. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sun Aug 22 13:38:36 2010 @@ -3,9 +3,9 @@ # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -set(MINGW_PREFIX "") +set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") else() -set(MINGW_PREFIX "mingw32-") +set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") endif() # the name of the target operating system @@ -19,7 +19,7 @@ SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -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/crt/mingw32 -O coff -o <OBJECT> ") +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/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here

14 years, 4 months

[akhaldi] 48590: [PSDK] - Improve _MSC_VER related conditions. - Comment on #endif (for readability). - DECLSPEC_ALIGN : moar underscores ! - Apply a consistent formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 13:25:10 2010 New Revision: 48590 URL: http://svn.reactos.org/svn/reactos?rev=48590&view=rev Log: [PSDK] - Improve _MSC_VER related conditions. - Comment on #endif (for readability). - DECLSPEC_ALIGN : moar underscores ! - Apply a consistent formatting. Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sun Aug 22 13:25:10 2010 @@ -194,7 +194,7 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) #define TYPE_ALIGNMENT(t) __alignof(t) #else -#define TYPE_ALIGNMENT(t) FIELD_OFFSET( struct { char x; t test; }, test ) +#define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) #endif /* Calling Conventions */ @@ -219,7 +219,7 @@ #else #define DECLSPEC_ADDRSAFE #endif -#endif +#endif /* DECLSPEC_ADDRSAFE */ #if !defined(_NTSYSTEM_) #define NTSYSAPI DECLSPEC_IMPORT @@ -235,14 +235,14 @@ /* Inlines */ #ifndef FORCEINLINE -#if (_MSC_VER >= 1200) +#if defined(_MSC_VER) && (_MSC_VER >= 1200) #define FORCEINLINE __forceinline -#elif (_MSC_VER) +#elif defined(_MSC_VER) #define FORCEINLINE __inline -#else +#else /* __GNUC__ */ #define FORCEINLINE extern __inline__ __attribute__((always_inline)) #endif -#endif +#endif /* FORCEINLINE */ #ifndef DECLSPEC_NOINLINE #if (_MSC_VER >= 1300) @@ -252,7 +252,7 @@ #else #define DECLSPEC_NOINLINE #endif -#endif +#endif /* DECLSPEC_NOINLINE */ #if !defined(_M_CEE_PURE) #define NTAPI_INLINE NTAPI @@ -265,11 +265,11 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) #define DECLSPEC_ALIGN(x) __declspec(align(x)) #elif defined(__GNUC__) -#define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) +#define DECLSPEC_ALIGN(x) __attribute__ ((__aligned__ (x))) #else #define DECLSPEC_ALIGN(x) #endif -#endif +#endif /* DECLSPEC_ALIGN */ /* Use to silence unused variable warnings when it is intentional */ #define UNREFERENCED_PARAMETER(P) {(P)=(P);} @@ -507,7 +507,7 @@ #define MAKELCID(lgid, srtid) ((ULONG)((((ULONG)((USHORT)(srtid))) << 16) | \ ((ULONG)((USHORT)(lgid))))) -#define MAKESORTLCID(lgid, srtid, ver) \ +#define MAKESORTLCID(lgid, srtid, ver) \ ((ULONG)((MAKELCID(lgid, srtid)) | \ (((ULONG)((USHORT)(ver))) << 20))) #define LANGIDFROMLCID(lcid) ((USHORT)(lcid)) @@ -549,9 +549,9 @@ /* Product Types */ typedef enum _NT_PRODUCT_TYPE { - NtProductWinNt = 1, - NtProductLanManNt, - NtProductServer + NtProductWinNt = 1, + NtProductLanManNt, + NtProductServer } NT_PRODUCT_TYPE, *PNT_PRODUCT_TYPE; typedef enum _EVENT_TYPE { @@ -560,8 +560,8 @@ } EVENT_TYPE; typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer + NotificationTimer, + SynchronizationTimer } TIMER_TYPE; typedef enum _WAIT_TYPE { @@ -571,25 +571,23 @@ /* Doubly Linked Lists */ typedef struct _LIST_ENTRY { - struct _LIST_ENTRY *Flink; - struct _LIST_ENTRY *Blink; + struct _LIST_ENTRY *Flink; + struct _LIST_ENTRY *Blink; } LIST_ENTRY, *PLIST_ENTRY, *RESTRICTED_POINTER PRLIST_ENTRY; -typedef struct LIST_ENTRY32 -{ - ULONG Flink; - ULONG Blink; +typedef struct LIST_ENTRY32 { + ULONG Flink; + ULONG Blink; } LIST_ENTRY32, *PLIST_ENTRY32; -typedef struct LIST_ENTRY64 -{ - ULONGLONG Flink; - ULONGLONG Blink; +typedef struct LIST_ENTRY64 { + ULONGLONG Flink; + ULONGLONG Blink; } LIST_ENTRY64, *PLIST_ENTRY64; /* Singly Linked Lists */ typedef struct _SINGLE_LIST_ENTRY { - struct _SINGLE_LIST_ENTRY *Next; + struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY; typedef struct _PROCESSOR_NUMBER { @@ -603,10 +601,10 @@ typedef EXCEPTION_DISPOSITION (NTAPI *PEXCEPTION_ROUTINE)( - IN struct _EXCEPTION_RECORD *ExceptionRecord, - IN PVOID EstablisherFrame, - IN OUT struct _CONTEXT *ContextRecord, - IN OUT PVOID DispatcherContext); + struct _EXCEPTION_RECORD *ExceptionRecord, + PVOID EstablisherFrame, + struct _CONTEXT *ContextRecord, + PVOID DispatcherContext); typedef struct _GROUP_AFFINITY { KAFFINITY Mask; @@ -650,155 +648,154 @@ /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] +#define VER_WORKSTATION_NT 0x40000000 +#define VER_SERVER_NT 0x80000000 +#define VER_SUITE_SMALLBUSINESS 0x00000001 +#define VER_SUITE_ENTERPRISE 0x00000002 +#define VER_SUITE_BACKOFFICE 0x00000004 +#define VER_SUITE_COMMUNICATIONS 0x00000008 +#define VER_SUITE_TERMINAL 0x00000010 +#define VER_SUITE_SMALLBUSINESS_RESTRICTED 0x00000020 +#define VER_SUITE_EMBEDDEDNT 0x00000040 +#define VER_SUITE_DATACENTER 0x00000080 +#define VER_SUITE_SINGLEUSERTS 0x00000100 +#define VER_SUITE_PERSONAL 0x00000200 +#define VER_SUITE_BLADE 0x00000400 +#define VER_SUITE_EMBEDDED_RESTRICTED 0x00000800 +#define VER_SUITE_SECURITY_APPLIANCE 0x00001000 +#define VER_SUITE_STORAGE_SERVER 0x00002000 +#define VER_SUITE_COMPUTE_SERVER 0x00004000 +#define VER_SUITE_WH_SERVER 0x00008000 + /* Primary language IDs. */ -#define LANG_NEUTRAL 0x00 -#define LANG_INVARIANT 0x7f - -#define LANG_AFRIKAANS 0x36 -#define LANG_ALBANIAN 0x1c -#define LANG_ALSATIAN 0x84 -#define LANG_AMHARIC 0x5e -#define LANG_ARABIC 0x01 -#define LANG_ARMENIAN 0x2b -#define LANG_ASSAMESE 0x4d -#define LANG_AZERI 0x2c -#define LANG_BASHKIR 0x6d -#define LANG_BASQUE 0x2d -#define LANG_BELARUSIAN 0x23 -#define LANG_BENGALI 0x45 -#define LANG_BRETON 0x7e -#define LANG_BOSNIAN 0x1a -#define LANG_BOSNIAN_NEUTRAL 0x781a -#define LANG_BULGARIAN 0x02 -#define LANG_CATALAN 0x03 -#define LANG_CHINESE 0x04 -#define LANG_CHINESE_SIMPLIFIED 0x04 -#define LANG_CHINESE_TRADITIONAL 0x7c04 -#define LANG_CORSICAN 0x83 -#define LANG_CROATIAN 0x1a -#define LANG_CZECH 0x05 -#define LANG_DANISH 0x06 -#define LANG_DARI 0x8c -#define LANG_DIVEHI 0x65 -#define LANG_DUTCH 0x13 -#define LANG_ENGLISH 0x09 -#define LANG_ESTONIAN 0x25 -#define LANG_FAEROESE 0x38 -#define LANG_FARSI 0x29 -#define LANG_FILIPINO 0x64 -#define LANG_FINNISH 0x0b -#define LANG_FRENCH 0x0c -#define LANG_FRISIAN 0x62 -#define LANG_GALICIAN 0x56 -#define LANG_GEORGIAN 0x37 -#define LANG_GERMAN 0x07 -#define LANG_GREEK 0x08 -#define LANG_GREENLANDIC 0x6f -#define LANG_GUJARATI 0x47 -#define LANG_HAUSA 0x68 -#define LANG_HEBREW 0x0d -#define LANG_HINDI 0x39 -#define LANG_HUNGARIAN 0x0e -#define LANG_ICELANDIC 0x0f -#define LANG_IGBO 0x70 -#define LANG_INDONESIAN 0x21 -#define LANG_INUKTITUT 0x5d -#define LANG_IRISH 0x3c -#define LANG_ITALIAN 0x10 -#define LANG_JAPANESE 0x11 -#define LANG_KANNADA 0x4b -#define LANG_KASHMIRI 0x60 -#define LANG_KAZAK 0x3f -#define LANG_KHMER 0x53 -#define LANG_KICHE 0x86 -#define LANG_KINYARWANDA 0x87 -#define LANG_KONKANI 0x57 -#define LANG_KOREAN 0x12 -#define LANG_KYRGYZ 0x40 -#define LANG_LAO 0x54 -#define LANG_LATVIAN 0x26 -#define LANG_LITHUANIAN 0x27 -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_LUXEMBOURGISH 0x6e -#define LANG_MACEDONIAN 0x2f -#define LANG_MALAY 0x3e -#define LANG_MALAYALAM 0x4c -#define LANG_MALTESE 0x3a -#define LANG_MANIPURI 0x58 -#define LANG_MAORI 0x81 -#define LANG_MAPUDUNGUN 0x7a -#define LANG_MARATHI 0x4e -#define LANG_MOHAWK 0x7c -#define LANG_MONGOLIAN 0x50 -#define LANG_NEPALI 0x61 -#define LANG_NORWEGIAN 0x14 -#define LANG_OCCITAN 0x82 -#define LANG_ORIYA 0x48 -#define LANG_PASHTO 0x63 -#define LANG_PERSIAN 0x29 -#define LANG_POLISH 0x15 -#define LANG_PORTUGUESE 0x16 -#define LANG_PUNJABI 0x46 -#define LANG_QUECHUA 0x6b -#define LANG_ROMANIAN 0x18 -#define LANG_ROMANSH 0x17 -#define LANG_RUSSIAN 0x19 -#define LANG_SAMI 0x3b -#define LANG_SANSKRIT 0x4f -#define LANG_SERBIAN 0x1a -#define LANG_SERBIAN_NEUTRAL 0x7c1a -#define LANG_SINDHI 0x59 -#define LANG_SINHALESE 0x5b -#define LANG_SLOVAK 0x1b -#define LANG_SLOVENIAN 0x24 -#define LANG_SOTHO 0x6c -#define LANG_SPANISH 0x0a -#define LANG_SWAHILI 0x41 -#define LANG_SWEDISH 0x1d -#define LANG_SYRIAC 0x5a -#define LANG_TAJIK 0x28 -#define LANG_TAMAZIGHT 0x5f -#define LANG_TAMIL 0x49 -#define LANG_TATAR 0x44 -#define LANG_TELUGU 0x4a -#define LANG_THAI 0x1e -#define LANG_TIBETAN 0x51 -#define LANG_TIGRIGNA 0x73 -#define LANG_TSWANA 0x32 -#define LANG_TURKISH 0x1f -#define LANG_TURKMEN 0x42 -#define LANG_UIGHUR 0x80 -#define LANG_UKRAINIAN 0x22 -#define LANG_UPPER_SORBIAN 0x2e -#define LANG_URDU 0x20 -#define LANG_UZBEK 0x43 -#define LANG_VIETNAMESE 0x2a -#define LANG_WELSH 0x52 -#define LANG_WOLOF 0x88 -#define LANG_XHOSA 0x34 -#define LANG_YAKUT 0x85 -#define LANG_YI 0x78 -#define LANG_YORUBA 0x6a -#define LANG_ZULU 0x35 - -#define VER_WORKSTATION_NT 0x40000000 -#define VER_SERVER_NT 0x80000000 - -#define VER_SUITE_SMALLBUSINESS 1 -#define VER_SUITE_ENTERPRISE 2 -#define VER_SUITE_BACKOFFICE 4 -#define VER_SUITE_COMMUNICATIONS 8 -#define VER_SUITE_TERMINAL 16 -#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 -#define VER_SUITE_EMBEDDEDNT 64 -#define VER_SUITE_DATACENTER 128 -#define VER_SUITE_SINGLEUSERTS 256 -#define VER_SUITE_PERSONAL 512 -#define VER_SUITE_BLADE 1024 -#define VER_SUITE_EMBEDDED_RESTRICTED 2048 -#define VER_SUITE_SECURITY_APPLIANCE 4096 -#define VER_SUITE_STORAGE_SERVER 8192 -#define VER_SUITE_COMPUTE_SERVER 16384 -#define VER_SUITE_WH_SERVER 32768 +#define LANG_NEUTRAL 0x00 +#define LANG_INVARIANT 0x7f + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ALSATIAN 0x84 +#define LANG_AMHARIC 0x5e +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_ASSAMESE 0x4d +#define LANG_AZERI 0x2c +#define LANG_BASHKIR 0x6d +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BENGALI 0x45 +#define LANG_BRETON 0x7e +#define LANG_BOSNIAN 0x1a +#define LANG_BOSNIAN_NEUTRAL 0x781a +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CHINESE 0x04 +#define LANG_CHINESE_SIMPLIFIED 0x04 +#define LANG_CHINESE_TRADITIONAL 0x7c04 +#define LANG_CORSICAN 0x83 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DARI 0x8c +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI 0x29 +#define LANG_FILIPINO 0x64 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_FRISIAN 0x62 +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GREENLANDIC 0x6f +#define LANG_GUJARATI 0x47 +#define LANG_HAUSA 0x68 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_IGBO 0x70 +#define LANG_INDONESIAN 0x21 +#define LANG_INUKTITUT 0x5d +#define LANG_IRISH 0x3c +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KASHMIRI 0x60 +#define LANG_KAZAK 0x3f +#define LANG_KHMER 0x53 +#define LANG_KICHE 0x86 +#define LANG_KINYARWANDA 0x87 +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LAO 0x54 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_LUXEMBOURGISH 0x6e +#define LANG_MACEDONIAN 0x2f +#define LANG_MALAY 0x3e +#define LANG_MALAYALAM 0x4c +#define LANG_MALTESE 0x3a +#define LANG_MANIPURI 0x58 +#define LANG_MAORI 0x81 +#define LANG_MAPUDUNGUN 0x7a +#define LANG_MARATHI 0x4e +#define LANG_MOHAWK 0x7c +#define LANG_MONGOLIAN 0x50 +#define LANG_NEPALI 0x61 +#define LANG_NORWEGIAN 0x14 +#define LANG_OCCITAN 0x82 +#define LANG_ORIYA 0x48 +#define LANG_PASHTO 0x63 +#define LANG_PERSIAN 0x29 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PUNJABI 0x46 +#define LANG_QUECHUA 0x6b +#define LANG_ROMANIAN 0x18 +#define LANG_ROMANSH 0x17 +#define LANG_RUSSIAN 0x19 +#define LANG_SAMI 0x3b +#define LANG_SANSKRIT 0x4f +#define LANG_SERBIAN 0x1a +#define LANG_SERBIAN_NEUTRAL 0x7c1a +#define LANG_SINDHI 0x59 +#define LANG_SINHALESE 0x5b +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SOTHO 0x6c +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAJIK 0x28 +#define LANG_TAMAZIGHT 0x5f +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TIBETAN 0x51 +#define LANG_TIGRIGNA 0x73 +#define LANG_TSWANA 0x32 +#define LANG_TURKISH 0x1f +#define LANG_TURKMEN 0x42 +#define LANG_UIGHUR 0x80 +#define LANG_UKRAINIAN 0x22 +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VIETNAMESE 0x2a +#define LANG_WELSH 0x52 +#define LANG_WOLOF 0x88 +#define LANG_XHOSA 0x34 +#define LANG_YAKUT 0x85 +#define LANG_YI 0x78 +#define LANG_YORUBA 0x6a +#define LANG_ZULU 0x35 #endif /* _NTDEF_ */

14 years, 4 months

[akhaldi] 48589: [CMAKE] - Add cabinet, cards, cfgmgr32 and clusapi to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 01:17:53 2010 New Revision: 48589 URL: http://svn.reactos.org/svn/reactos?rev=48589&view=rev Log: [CMAKE] - Add cabinet, cards, cfgmgr32 and clusapi to build. Added: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cards/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -8,6 +8,10 @@ add_subdirectory(avicap32) add_subdirectory(batt) add_subdirectory(beepmidi) +add_subdirectory(cabinet) +add_subdirectory(cards) +add_subdirectory(cfgmgr32) +add_subdirectory(clusapi) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Added: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,23 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(cabinet ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.spec ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) + +file(GLOB_RECURSE SOURCE *.c) + +add_library(cabinet SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.rc) + +set_target_properties(cabinet PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(cabinet + ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def + wine + mingw_common) + +add_dependencies(cabinet cabinet_def psdk) Propchange: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +# Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN +add_definitions(-DCARDSTYLE_DEFAULT) + +spec2def(cards ${CMAKE_CURRENT_SOURCE_DIR}/cards.spec ${CMAKE_CURRENT_BINARY_DIR}/cards.def) + +add_library(cards SHARED ${CMAKE_CURRENT_SOURCE_DIR}/cards.c ${CMAKE_CURRENT_SOURCE_DIR}/cards.rc) + +set_target_properties(cards PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(cards + ${CMAKE_CURRENT_BINARY_DIR}/cards.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(cards cards_def psdk) Propchange: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… ============================================================================== --- branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,12 @@ + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(cfgmgr32 ${CMAKE_CURRENT_SOURCE_DIR}/cfgmgr32.spec ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) + +add_library(cfgmgr32 SHARED cfgmgr32.rc) + +set_target_properties(cfgmgr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) + +add_dependencies(cfgmgr32 cfgmgr32_def psdk) Propchange: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/clusapi… ============================================================================== --- branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] Sun Aug 22 01:17:53 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(clusapi ${CMAKE_CURRENT_SOURCE_DIR}/clusapi.spec ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def) + +add_library(clusapi SHARED clusapi.c) + +set_target_properties(clusapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(clusapi + ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def + wine + mingw_common) + +add_dependencies(clusapi clusapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48588: [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 00:52:26 2010 New Revision: 48588 URL: http://svn.reactos.org/svn/reactos?rev=48588&view=rev Log: [CMAKE] - Add avicap32, batt and beepmidi to build. - Fix a typo. Added: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/batt/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -5,6 +5,9 @@ add_subdirectory(advapi32) add_subdirectory(advpack) add_subdirectory(authz) +add_subdirectory(avicap32) +add_subdirectory(batt) +add_subdirectory(beepmidi) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -3,7 +3,7 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) file(GLOB_RECURSE SOURCE *.c) Added: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -1,0 +1,22 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) + +add_library(avicap32 SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.c + ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.rc) + +set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(avicap32 + ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + wine + mingw_common + -lversion) + +add_dependencies(avicap32 avicap32_def psdk) Propchange: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def) + +add_library(batt SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/batt.c + ${CMAKE_CURRENT_SOURCE_DIR}/batt.rc) + +set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(batt + ${CMAKE_CURRENT_BINARY_DIR}/batt.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(batt batt_def psdk) Propchange: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sun Aug 22 00:52:26 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) + +add_library(beepmidi SHARED beepmidi.c) + +set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(beepmidi + ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(beepmidi beepmidi_def psdk) Propchange: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48587: [CMAKE] - Add activeds, advpack and authz to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 21 23:52:17 2010 New Revision: 48587 URL: http://svn.reactos.org/svn/reactos?rev=48587&view=rev Log: [CMAKE] - Add activeds, advpack and authz to build. Added: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/authz/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -1,7 +1,10 @@ add_subdirectory(acledit) add_subdirectory(aclui) +add_subdirectory(activeds) add_subdirectory(advapi32) +add_subdirectory(advpack) +add_subdirectory(authz) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -2,7 +2,6 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DSUPPORT_UXTHEME) file(GLOB_RECURSE SOURCE *.c) Added: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -1,0 +1,19 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) + +spec2def(activeds ${CMAKE_CURRENT_SOURCE_DIR}/activeds.spec ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) + +add_library(activeds SHARED activeds_main.c) + +set_target_properties(activeds PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(activeds + ${CMAKE_CURRENT_BINARY_DIR}/activeds.def + wine + mingw_common) + +add_dependencies(activeds activeds_def psdk) Propchange: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -1,0 +1,25 @@ + +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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(advpack ${CMAKE_CURRENT_SOURCE_DIR}/advpack.spec ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) + +add_library(advpack SHARED ${SOURCE}) + +set_target_properties(advpack PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(advpack + ${CMAKE_CURRENT_BINARY_DIR}/advpack.def + wine + mingw_common + -lole32 + -lsetupapi + -lversion + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + +add_dependencies(advpack advpack_def psdk) Propchange: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/authz/C… ============================================================================== --- branches/cmake-bringup/dll/win32/authz/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:52:17 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(authz ${CMAKE_CURRENT_SOURCE_DIR}/authz.spec ${CMAKE_CURRENT_BINARY_DIR}/authz.def) + +add_library(authz SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/authz.rc + ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch) + +set_target_properties(authz PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(authz + ${CMAKE_CURRENT_BINARY_DIR}/authz.def + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(authz authz_def psdk) Propchange: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48586: [CMAKE] - Add acledit to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 21 23:35:57 2010 New Revision: 48586 URL: http://svn.reactos.org/svn/reactos?rev=48586&view=rev Log: [CMAKE] - Add acledit to build. Added: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:35:57 2010 @@ -1,4 +1,5 @@ +add_subdirectory(acledit) add_subdirectory(aclui) add_subdirectory(advapi32) add_subdirectory(gdi32) Added: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:35:57 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DSUPPORT_UXTHEME) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(acledit ${CMAKE_CURRENT_SOURCE_DIR}/acledit.spec ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) + +add_library(acledit SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/acledit.rc) + +set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(acledit + ${CMAKE_CURRENT_BINARY_DIR}/acledit.def + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(acledit acledit_def psdk) Propchange: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48585: [CMAKE] - Add aclui to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 21 23:25:35 2010 New Revision: 48585 URL: http://svn.reactos.org/svn/reactos?rev=48585&view=rev Log: [CMAKE] - Add aclui to build. Added: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:25:35 2010 @@ -1,4 +1,5 @@ +add_subdirectory(aclui) add_subdirectory(advapi32) add_subdirectory(gdi32) add_subdirectory(kernel32) Added: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sat Aug 21 23:25:35 2010 @@ -1,0 +1,31 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DSUPPORT_UXTHEME) + +file(GLOB_RECURSE SOURCE *.c) + +spec2def(aclui ${CMAKE_CURRENT_SOURCE_DIR}/aclui.spec ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) + +add_library(aclui SHARED + ${SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/aclui.rc + ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch) + +set_target_properties(aclui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(aclui + ${CMAKE_CURRENT_BINARY_DIR}/aclui.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a + -lcomctl32 + -lole32 + -loleaut32 + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -luxtheme + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(aclui aclui_def psdk) Propchange: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48584: [CMAKE] - Add a macro to handle generating definition files from spec files (for Wine dlls)

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 21 23:23:46 2010 New Revision: 48584 URL: http://svn.reactos.org/svn/reactos?rev=48584&view=rev Log: [CMAKE] - Add a macro to handle generating definition files from spec files (for Wine dlls) Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Aug 21 23:23:46 2010 @@ -40,3 +40,14 @@ DEPENDS ${_header_filename}) ENDMACRO(add_pch _target_name _header_filename _src_list) + +MACRO(spec2def _target_name _spec_file _def_file) + + add_custom_command( + OUTPUT ${_def_file} + COMMAND native-winebuild -o ${_def_file} --def -E ${_spec_file} --filename ${_target_name}.dll + DEPENDS native-winebuild) + set_source_files_properties(${_def_file} PROPERTIES GENERATED TRUE) + add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file}) + +ENDMACRO(spec2def _target_name _spec_file _def_file)

14 years, 4 months

[cgutman] 48583: [NTOSKRNL] - Fix a typo that broke handling of DevicePropertyEnumeratorName inside IoGetDeviceProperty

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Aug 21 22:08:00 2010 New Revision: 48583 URL: http://svn.reactos.org/svn/reactos?rev=48583&view=rev Log: [NTOSKRNL] - Fix a typo that broke handling of DevicePropertyEnumeratorName inside IoGetDeviceProperty Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 21 22:08:00 2010 @@ -3327,8 +3327,8 @@ ASSERT(EnumeratorNameEnd); /* This is the format of the returned data */ - PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * 2, - &DeviceNode->ChildBusNumber); + PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * sizeof(WCHAR), + DeviceInstanceName); case DevicePropertyAddress:

14 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010