Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[jgardou] 49295: [WIN32 DLLS] - fix MIDL_user_allocate once and for all
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:58:46 2010 New Revision: 49295 URL: http://svn.reactos.org/svn/reactos?rev=49295&view=rev Log: [WIN32 DLLS] - fix MIDL_user_allocate once and for all Modified: branches/cmake-bringup/dll/win32/advapi32/service/rpc.c branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c branches/cmake-bringup/dll/win32/ole32/moniker.c branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c branches/cmake-bringup/dll/win32/setupapi/rpc.c branches/cmake-bringup/dll/win32/wlanapi/main.c Modified: branches/cmake-bringup/dll/win32/advapi32/service/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -12,7 +12,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -72,7 +72,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/m… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -1657,7 +1657,7 @@ return S_OK; } -void * __RPC_USER MIDL_user_allocate(SIZE_T size) +void * __RPC_USER MIDL_user_allocate(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } Modified: branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -596,7 +596,7 @@ return RPC_S_OK; } -void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } Modified: branches/cmake-bringup/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -111,7 +111,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] Tue Oct 26 18:58:46 2010 @@ -198,7 +198,7 @@ } void __RPC_FAR * __RPC_USER -midl_user_allocate(SIZE_T len) +midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49294: [PSDK] - fix definition of MIDL_STUB_DESC
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:43:25 2010 New Revision: 49294 URL: http://svn.reactos.org/svn/reactos?rev=49294&view=rev Log: [PSDK] - fix definition of MIDL_STUB_DESC Modified: branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 18:43:25 2010 @@ -343,7 +343,7 @@ typedef struct _MIDL_STUB_DESC { void *RpcInterfaceInformation; - void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); union { handle_t *pAutoHandle;

1 0

[jgardou] 49293: [SERVICES] - fix definition of midl_user_allocate, RQueryServiceConfigW and RQueryServiceConfigA
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:39:27 2010 New Revision: 49293 URL: http://svn.reactos.org/svn/reactos?rev=49293&view=rev Log: [SERVICES] - fix definition of midl_user_allocate, RQueryServiceConfigW and RQueryServiceConfigA Modified: branches/cmake-bringup/base/system/services/rpcserver.c Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Tue Oct 26 18:39:27 2010 @@ -2564,11 +2564,10 @@ /* Function 17 */ DWORD RQueryServiceConfigW( SC_RPC_HANDLE hService, - LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, + LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -3742,11 +3741,10 @@ /* Function 29 */ DWORD RQueryServiceConfigA( SC_RPC_HANDLE hService, - LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig, + LPQUERY_SERVICE_CONFIGA lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { - LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -5355,7 +5353,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49292: [UMPNPMGR] - Fix definition of midl_user_allocate
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:38:03 2010 New Revision: 49292 URL: http://svn.reactos.org/svn/reactos?rev=49292&view=rev Log: [UMPNPMGR] - Fix definition of midl_user_allocate Modified: branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c Modified: branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Tue Oct 26 18:38:03 2010 @@ -137,7 +137,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49291: [CMAKE] - rpcss depends on winesdk [RPCSS] - fix declaration of MIDL_user_allocate
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:30:13 2010 New Revision: 49291 URL: http://svn.reactos.org/svn/reactos?rev=49291&view=rev Log: [CMAKE] - rpcss depends on winesdk [RPCSS] - fix declaration of MIDL_user_allocate Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/irotp.c Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Tue Oct 26 18:30:13 2010 @@ -19,4 +19,5 @@ set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_livecd_target(rpcss reactos/system32) +add_livecd_target(rpcss reactos/system32) +add_dependencies(rpcss winesdk) Modified: branches/cmake-bringup/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] Tue Oct 26 18:30:13 2010 @@ -368,7 +368,7 @@ rot_entry_release(rot_entry); } -void * __RPC_USER MIDL_user_allocate(SIZE_T size) +void * __RPC_USER MIDL_user_allocate(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); }

1 0

[jgardou] 49290: [CMAKE] - fix typo
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 18:01:37 2010 New Revision: 49290 URL: http://svn.reactos.org/svn/reactos?rev=49290&view=rev Log: [CMAKE] - fix typo Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Oct 26 18:01:37 2010 @@ -152,6 +152,4 @@ set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library -endmacro() - endif()

1 0

[jgardou] 49289: [CMAKE] - midl support for building rpc server/client libraries
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 17:42:02 2010 New Revision: 49289 URL: http://svn.reactos.org/svn/reactos?rev=49289&view=rev Log: [CMAKE] - midl support for building rpc server/client libraries Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.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] Tue Oct 26 17:42:02 2010 @@ -150,109 +150,122 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport) set(IS_CPP 1) endmacro() - -MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd - - get_target_property(FILENAME ${_targetname} LOCATION) - - if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) - endif() - - add_custom_command( - OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(${_targetname}_livecd ${_targetname}) - add_dependencies(livecd ${_targetname}_livecd) -ENDMACRO(add_livecd_target _targetname _dir _nameoncd) - -MACRO(add_livecd FILENAME _dir _nameoncd) - add_custom_command( - OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} - DEPENDS ${FILENAME} - COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) - - add_dependencies(livecd ${_nameoncd}_livecd) -ENDMACRO(add_livecd) - -macro(custom_incdefs) - if(NOT DEFINED result_incs) #rpc_defines - get_directory_property(rpc_defines COMPILE_DEFINITIONS) - get_directory_property(rpc_includes INCLUDE_DIRECTORIES) - - foreach(arg ${rpc_defines}) - set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) - - foreach(arg ${rpc_includes}) - set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) - endif() -endmacro(custom_incdefs) - -macro(rpcproxy TARGET) - custom_incdefs() - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) - - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - PROPERTIES GENERATED TRUE) - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) - add_custom_target(${TARGET}_${FILE}_p - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) - endforeach(_in_FILE ${ARGN}) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - PROPERTIES GENERATED TRUE) - - add_library(${TARGET}_proxy ${SOURCE}) - add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) -endmacro(rpcproxy) - -macro (MACRO_IDL_FILES) - custom_incdefs() - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) - add_dependencies(${FILE}_server psdk) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) - add_dependencies(${FILE}_client psdk) - endforeach(_in_FILE ${ARGN}) - -endmacro (MACRO_IDL_FILES) + +MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd + + get_target_property(FILENAME ${_targetname} LOCATION) + + if("${ARGN}" STREQUAL "") + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) + endif() + + add_custom_command( + OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(${_targetname}_livecd ${_targetname}) + add_dependencies(livecd ${_targetname}_livecd) +ENDMACRO(add_livecd_target _targetname _dir _nameoncd) + +MACRO(add_livecd FILENAME _dir _nameoncd) + add_custom_command( + OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${FILENAME} + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(livecd ${_nameoncd}_livecd) +ENDMACRO(add_livecd) + +macro(custom_incdefs) + if(NOT DEFINED result_incs) #rpc_defines + get_directory_property(rpc_defines COMPILE_DEFINITIONS) + get_directory_property(rpc_includes INCLUDE_DIRECTORIES) + + foreach(arg ${rpc_defines}) + set(result_defs ${result_defs} -D${arg}) + endforeach(arg ${defines}) + + foreach(arg ${rpc_includes}) + set(result_incs -I${arg} ${result_incs}) + endforeach(arg ${includes}) + endif() +endmacro(custom_incdefs) + +macro(rpcproxy TARGET) + custom_incdefs() + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) + + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c + PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) + list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) + list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) + add_custom_target(${TARGET}_${FILE}_p + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) + #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) + endforeach(_in_FILE ${ARGN}) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + PROPERTIES GENERATED TRUE) + + add_library(${TARGET}_proxy ${SOURCE}) + add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) +endmacro(rpcproxy) + +macro (MACRO_IDL_FILES) + custom_incdefs() + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS ${_in_file}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + add_dependencies(${FILE}_server psdk) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS ${_in_file}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + add_dependencies(${FILE}_client psdk) + endforeach(_in_FILE ${ARGN}) + +endmacro (MACRO_IDL_FILES) + +macro(ADD_TYPELIB TARGET) + custom_incdefs() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb + COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} + DEPENDS ${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Oct 26 17:42:02 2010 @@ -123,8 +123,6 @@ endif() endmacro() -endif() - macro(set_unicode) add_definitions(-DUNICODE -D_UNICODE) set(IS_UNICODE 1) @@ -146,15 +144,14 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() -#typelib support -macro(ADD_TYPELIB TARGET) - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - add_custom_command(OUTPUT ${OBJECT} - COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS native-widl) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +#idl files support +set(IDL_COMPILER native-widl) +set(IDL_FLAGS -m32 --win32) +set(IDL_HEADER_ARG -h -H) #.h +set(IDL_TYPELIB_ARG -t -T) #.tlb +set(IDL_SERVER_ARG -s -S) #.c for server library +set(IDL_CLIENT_ARG -c -C) #.c for stub client library + endmacro() + +endif() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Oct 26 17:42:02 2010 @@ -72,8 +72,6 @@ add_definitions(-DUNICODE -D_UNICODE) endmacro() -endif() - set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") @@ -81,14 +79,12 @@ # dummy, this workaround is only needed in mingw due to lack of RC support in cmake endmacro() -#typelib support -macro(ADD_TYPELIB TARGET) - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - add_custom_command(OUTPUT ${OBJECT} - COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) -endmacro() +#idl files support +set(IDL_COMPILER midl) +set(IDL_FLAGS /win32) +set(IDL_HEADER_ARG /h) #.h +set(IDL_TYPELIB_ARG /tlb) #.tlb +set(IDL_SERVER_ARG /sstub) #.c for stub server library +set(IDL_CLIENT_ARG /cstub) #.c for stub client library + +endif()

1 0

[jgardou] 49288: [WLANSVC] - Fix wlansvc.idl for parsing with midl
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 17:36:57 2010 New Revision: 49288 URL: http://svn.reactos.org/svn/reactos?rev=49288&view=rev Log: [WLANSVC] - Fix wlansvc.idl for parsing with midl Modified: branches/cmake-bringup/include/reactos/idl/wlansvc.idl Modified: branches/cmake-bringup/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/wlansvc.idl [iso-8859-1] Tue Oct 26 17:36:57 2010 @@ -72,7 +72,7 @@ DWORD _RpcQueryAutoConfigParameter( [in] WLANSVC_RPC_HANDLE hClientHandle, [in] /* enum32 */ DWORD OpCode, - [out] LPDWORD pdwDataSize, + [in, out] LPDWORD pdwDataSize, [out][ref][size_is(*pdwDataSize)] char ** ppData, [out] /* enum32 */ DWORD * pWlanOpcodeValueType); @@ -95,7 +95,7 @@ [in] WLANSVC_RPC_HANDLE hClientHandle, [in] GUID* pInterfaceGuid, [in] /* enum32 */ long OpCode, - [out] LPDWORD pdwDataSize, + [in, out] LPDWORD pdwDataSize, [out][ref][size_is(*pdwDataSize)] LPBYTE* ppData, [out] /* enum32 */ LPDWORD pWlanOpcodeValueType); @@ -131,7 +131,7 @@ [in][unique] PDOT11_SSID pDot11Ssid, [in] /* enum16 */ short dot11BssType, [in] DWORD bSecurityEnabled, - [out] LPDWORD dwBssListSize, + [in, out] LPDWORD dwBssListSize, [out][ref][size_is(*dwBssListSize)] LPBYTE *ppWlanBssList); /* Function: 0x0C */ @@ -231,7 +231,7 @@ [in] WLANSVC_RPC_HANDLE hClientHandle, [in] GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, - [out] LPDWORD dwDataSize, + [in, out] LPDWORD dwDataSize, [out][ref][size_is(*dwDataSize)] LPBYTE *pData); /* Function: 0x1A */ @@ -325,7 +325,7 @@ /* Function: 0x26 */ DWORD _RpcQueryPlapCredentials( [in] wchar_t * arg_1, - [out] LPDWORD dwSize, + [in, out] LPDWORD dwSize, [out][ref][size_is(*dwSize)] struct_E ** arg_3, [out][ref][string] wchar_t ** arg_4, [out] GUID* pInterfaceGuid,

1 0

[jgardou] 49287: [CMAKE] - WINNT isn't defined, don't redefine it. Pointed by Usurp.
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 17:23:00 2010 New Revision: 49287 URL: http://svn.reactos.org/svn/reactos?rev=49287&view=rev Log: [CMAKE] - WINNT isn't defined, don't redefine it. Pointed by Usurp. Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Tue Oct 26 17:23:00 2010 @@ -8,8 +8,6 @@ wlansvc.idl) MACRO_IDL_FILES(${SOURCE}) -remove_definitions(-DWINNT=0x502) -add_definitions(-DWINNT=0x600) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) MACRO_IDL_FILES(pnp.idl)

1 0

[jgardou] 49286: [SVCCTL] - fix parsing of svcctl.idl with midl
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 17:20:00 2010 New Revision: 49286 URL: http://svn.reactos.org/svn/reactos?rev=49286&view=rev Log: [SVCCTL] - fix parsing of svcctl.idl with midl Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Tue Oct 26 17:20:00 2010 @@ -434,8 +434,7 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, - /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ + [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -546,8 +545,7 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, - /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ + [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
44
Older →

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 October 2010