Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 49871: [CMAKE] Stubs: Fix some win32 modules.
by spetreolle＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: spetreolle Date: Mon Nov 29 23:08:38 2010 New Revision: 49871 URL: http://svn.reactos.org/svn/reactos?rev=49871&view=rev Log: [CMAKE] Stubs: Fix some win32 modules. Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt branches/cmake-bringup/dll/win32/itss/CMakeLists.txt branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/security/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/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt 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] Mon Nov 29 23:08:38 2010 @@ -5,7 +5,11 @@ spec2def(activeds.dll activeds.spec) -add_library(activeds SHARED activeds_main.c ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) +list(APPEND SOURCE + activeds_main.c + ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) + +add_library(activeds SHARED ${SOURCE}) set_module_type(activeds win32dll) Modified: branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/bcrypt/… ============================================================================== --- branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -2,18 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(bcrypt.dll bcrypt.spec) -add_library(bcrypt SHARED +list(APPEND SOURCE bcrypt_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def) +add_library(bcrypt SHARED ${SOURCE}) set_module_type(bcrypt win32dll) target_link_libraries(bcrypt wine) add_importlibs(bcrypt msvcrt kernel32 ntdll) - add_cab_target(bcrypt 1) Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,4 +1,3 @@ - set_unicode() set_cpp() @@ -13,9 +12,10 @@ ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/lib/atl) +set_rc_compiler() spec2def(browseui.dll browseui.spec) -add_library(browseui SHARED +list(APPEND SOURCE aclmulti.cpp addressband.cpp addresseditbox.cpp @@ -38,6 +38,7 @@ browseui.rc ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) +add_library(browseui SHARED ${SOURCE}) set_module_type(browseui win32dll) target_link_libraries(browseui Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,9 +1,12 @@ spec2def(cfgmgr32.dll cfgmgr32.spec) -add_library(cfgmgr32 SHARED cfgmgr32.rc ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) +list(APPEND SOURCE + cfgmgr32.rc + ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) +add_library(cfgmgr32 SHARED ${SOURCE}) set_entrypoint(cfgmgr32 0) - +add_importlibs(cfgmgr32 kernel32 ntdll) add_dependencies(cfgmgr32 psdk buildno_header) add_cab_target(cfgmgr32 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(clusapi.dll clusapi.spec) -add_library(clusapi SHARED clusapi.c ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def) +list(APPEND SOURCE + clusapi.c + ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def) + +add_library(clusapi SHARED ${SOURCE}) set_module_type(clusapi win32dll) Modified: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,10 @@ add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(comdlg32.dll comdlg32.spec) -add_library(comdlg32 SHARED +list(APPEND SOURCE cdlg32.c colordlg.c filedlg.c @@ -17,6 +18,8 @@ printdlg.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) + +add_library(comdlg32 SHARED ${SOURCE}) set_module_type(comdlg32 win32dll) Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(credui.dll credui.spec) -add_library(credui SHARED credui_main.c credui.rc ${CMAKE_CURRENT_BINARY_DIR}/credui.def) +list(APPEND SOURCE + credui_main.c + credui.rc + ${CMAKE_CURRENT_BINARY_DIR}/credui.def) + +add_library(credui SHARED ${SOURCE}) set_module_type(credui win32dll) Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -10,9 +10,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(crypt32.dll crypt32.spec) -add_library(crypt32 SHARED +list(APPEND SOURCE base64.c cert.c chain.c @@ -41,6 +42,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) +add_library(crypt32 SHARED ${SOURCE}) + set_module_type(crypt32 win32dll) target_link_libraries(crypt32 Modified: branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -2,9 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(cryptdlg.dll cryptdlg.spec) -add_library(cryptdlg SHARED main.c cryptdlg.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def) +list(APPEND SOURCE + main.c + cryptdlg.rc + ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def) + +add_library(cryptdlg SHARED ${SOURCE}) set_module_type(cryptdlg win32dll) Modified: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptne… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,11 @@ spec2def(cryptnet.dll cryptnet.spec) -add_library(cryptnet SHARED cryptnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) +list(APPEND SOURCE + cryptnet_main.c + ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) + +add_library(cryptnet SHARED ${SOURCE}) set_module_type(cryptnet win32dll) Modified: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,15 @@ add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(cryptui.dll cryptui.spec) -add_library(cryptui SHARED main.c cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) +list(APPEND SOURCE + main.c + cryptui.rc + ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) + +add_library(cryptui SHARED ${SOURCE}) set_module_type(cryptui win32dll) Modified: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dciman3… ============================================================================== --- branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(dciman32.dll dciman32.spec) -add_library(dciman32 SHARED dciman_main.c ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def) +list(APPEND SOURCE + dciman_main.c + ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def) + +add_library(dciman32 SHARED ${SOURCE}) set_module_type(dciman32 win32dll) Modified: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/faultre… ============================================================================== --- branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(faultrep.dll faultrep.spec) -add_library(faultrep SHARED faultrep.c ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def) +list(APPEND SOURCE + faultrep.c + ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def) + +add_library(faultrep SHARED ${SOURCE}) set_module_type(faultrep win32dll) Modified: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… ============================================================================== --- branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(fusion.dll fusion.spec) -add_library(fusion SHARED +list(APPEND SOURCE asmcache.c asmenum.c asmname.c @@ -14,6 +15,8 @@ fusion_main.c ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) +add_library(fusion SHARED ${SOURCE}) + set_module_type(fusion win32dll) target_link_libraries(fusion wine) Modified: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus… ============================================================================== --- branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,9 +3,10 @@ add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(gdiplus.dll gdiplus.spec) -add_library(gdiplus SHARED +list(APPEND SOURCE brush.c customlinecap.c font.c @@ -20,6 +21,8 @@ region.c stringformat.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) + +add_library(gdiplus SHARED ${SOURCE}) set_module_type(gdiplus win32dll) Modified: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hlink/C… ============================================================================== --- branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,12 +4,14 @@ spec2def(hlink.dll hlink.spec) -add_library(hlink SHARED +list(APPEND SOURCE browse_ctx.c extserv.c hlink_main.c link.c ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) + +add_library(hlink SHARED ${SOURCE}) set_module_type(hlink win32dll) Modified: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -5,7 +5,11 @@ spec2def(httpapi.dll httpapi.spec) -add_library(httpapi SHARED httpapi_main.c ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) +list(APPEND SOURCE + httpapi_main.c + ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) + +add_library(httpapi SHARED ${SOURCE}) set_module_type(httpapi win32dll) Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,9 +1,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(icmp.dll icmp.spec) -add_library(icmp SHARED icmp_main.c icmp.rc ${CMAKE_CURRENT_BINARY_DIR}/icmp.def) +list(APPEND SOURCE + icmp_main.c + icmp.rc + ${CMAKE_CURRENT_BINARY_DIR}/icmp.def) + +add_library(icmp SHARED ${SOURCE}) set_module_type(icmp win32dll) Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,9 +6,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(imm32.dll imm32.spec) -add_library(imm32 SHARED imm.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) +list(APPEND SOURCE + imm.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) + +add_library(imm32 SHARED ${SOURCE}) set_module_type(imm32 win32dll) Modified: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetcom… ============================================================================== --- branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,7 +6,7 @@ spec2def(inetcomm.dll inetcomm.spec) -add_library(inetcomm SHARED +list(APPEND SOURCE imaptransport.c inetcomm_main.c internettransport.c @@ -16,6 +16,8 @@ regsvr.c smtptransport.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) + +add_library(inetcomm SHARED ${SOURCE}) set_module_type(inetcomm win32dll) @@ -33,5 +35,4 @@ kernel32 ntdll) - add_cab_target(inetcomm 1) Modified: branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetmib… ============================================================================== --- branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -5,7 +5,11 @@ spec2def(inetmib1.dll inetmib1.spec) -add_library(inetmib1 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) + +add_library(inetmib1 SHARED ${SOURCE}) set_module_type(inetmib1 win32dll) @@ -18,5 +22,4 @@ kernel32 ntdll) - add_cab_target(inetmib1 1) Modified: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… ============================================================================== --- branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,11 @@ spec2def(initpki.dll initpki.spec) -add_library(initpki SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) + +add_library(initpki SHARED ${SOURCE}) set_module_type(initpki win32dll) Modified: branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inseng/… ============================================================================== --- branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,7 +6,12 @@ spec2def(inseng.dll inseng.spec) -add_library(inseng SHARED inseng_main.c regsvr.c ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) +list(APPEND SOURCE + inseng_main.c + regsvr.c + ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) + +add_library(inseng SHARED ${SOURCE}) set_module_type(inseng win32dll) Modified: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… ============================================================================== --- branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,11 @@ spec2def(itircl.dll itircl.spec) -add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) +list(APPEND SOURCE + itircl_main.c + ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) + +add_library(itircl SHARED ${SOURCE}) set_module_type(itircl win32dll) Modified: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itss/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -2,9 +2,10 @@ add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(itss.dll itss.spec) -add_library(itss SHARED +list(APPEND SOURCE chm_lib.c lzx.c itss.c @@ -13,6 +14,8 @@ storage.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/itss.def) + +add_library(itss SHARED ${SOURCE}) set_module_type(itss win32dll) Modified: branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localsp… ============================================================================== --- branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,14 +4,17 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(localspl.dll localspl.spec) -add_library(localspl SHARED +list(APPEND SOURCE localmon.c localspl_main.c provider.c localspl.rc ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) + +add_library(localspl SHARED ${SOURCE}) set_module_type(localspl win32dll) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,12 +1,12 @@ - set_unicode() include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass) +set_rc_compiler() spec2def(lsasrv.dll lsasrv.spec) -add_library(lsasrv SHARED +list(APPEND SOURCE authport.c lsarpc.c lsasrv.c @@ -14,6 +14,8 @@ sids.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def) + +add_library(lsasrv SHARED ${SOURCE}) set_entrypoint(lsasrv 0) Modified: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,10 +1,10 @@ - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(mapi32.dll mapi32.spec) -add_library(mapi32 SHARED +list(APPEND SOURCE imalloc.c mapi32_main.c prop.c @@ -12,6 +12,8 @@ util.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) + +add_library(mapi32 SHARED ${SOURCE}) set_module_type(mapi32 win32dll) Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,8 +6,12 @@ spec2def(mlang.dll mlang.spec) -add_library(mlang SHARED mlang.c regsvr.c +list(APPEND SOURCE + mlang.c + regsvr.c ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) + +add_library(mlang SHARED ${SOURCE}) set_entrypoint(mlang 0) Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -3,10 +3,15 @@ spec2def(modemui.dll modemui.spec) -add_library(modemui SHARED modemui.c modemui.rc ${CMAKE_CURRENT_BINARY_DIR}/modemui.def) +list(APPEND SOURCE + modemui.c + modemui.rc + ${CMAKE_CURRENT_BINARY_DIR}/modemui.def) + +add_library(modemui SHARED ${SOURCE}) set_module_type(modemui win32dll) -add_importlibs(modemui msvcrt kernel32) +add_importlibs(modemui msvcrt kernel32 ntdll) add_cab_target(modemui 1) Modified: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,11 @@ spec2def(mprapi.dll mprapi.spec) -add_library(mprapi SHARED mprapi.c ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) +list(APPEND SOURCE + mprapi.c + ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) + +add_library(mprapi SHARED ${SOURCE}) set_module_type(mprapi win32dll) Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,10 @@ add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msacm32.dll msacm32.spec) -add_library(msacm32 SHARED +list(APPEND SOURCE driver.c filter.c format.c @@ -16,13 +17,14 @@ stream.c ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) +add_library(msacm32 SHARED ${SOURCE}) + set_module_type(msacm32 win32dll) target_link_libraries(msacm32 wine) add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) - add_subdirectory(msacm32.drv) add_cab_target(msacm32 1) add_importlib_target(msacm32.spec) Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,10 +1,10 @@ - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(mscms.dll mscms.spec) -add_library(mscms SHARED +list(APPEND SOURCE handle.c icc.c mscms_main.c @@ -14,6 +14,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/mscms.def) +add_library(mscms SHARED ${SOURCE}) + set_module_type(mscms win32dll) target_link_libraries(mscms wine) Modified: branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msctf/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,13 +1,13 @@ - add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msctf.dll msctf.spec) -add_library(msctf SHARED +list(APPEND SOURCE categorymgr.c compartmentmgr.c context.c @@ -22,6 +22,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/msctf.def) +add_library(msctf SHARED ${SOURCE}) + set_module_type(msctf win32dll) target_link_libraries(msctf Modified: branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msftedi… ============================================================================== --- branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,13 +1,15 @@ - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msftedit.dll msftedit.spec) -add_library(msftedit SHARED +list(APPEND SOURCE msftedit_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def) + +add_library(msftedit SHARED ${SOURCE}) set_module_type(msftedit win32dll) Modified: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/… ============================================================================== --- branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,16 +1,18 @@ - include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msgina.dll msgina.spec) -add_library(msgina SHARED +list(APPEND SOURCE gui.c msgina.c stubs.c tui.c msgina.rc ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) + +add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) Modified: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,5 +1,3 @@ - -ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -11,9 +9,12 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) + +set_rc_compiler() spec2def(mshtml.dll mshtml.spec) -add_library(mshtml SHARED +list(APPEND SOURCE conpoint.c dispex.c editor.c @@ -78,6 +79,8 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) +add_library(mshtml SHARED ${SOURCE}) + set_module_type(mshtml win32dll) target_link_libraries(mshtml Modified: branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimtf/… ============================================================================== --- branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,14 +1,16 @@ - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msimtf.dll msimtf.spec) -add_library(msimtf SHARED +list(APPEND SOURCE activeimmapp.c main.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) + +add_library(msimtf SHARED ${SOURCE}) set_module_type(msimtf win32dll) Modified: branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisip/… ============================================================================== --- branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,11 @@ spec2def(msisip.dll msisip.spec) -add_library(msisip SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) + +add_library(msisip SHARED ${SOURCE}) set_module_type(msisip win32dll) Modified: branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,9 +6,11 @@ spec2def(msvcrt20.dll msvcrt20.spec) -add_library(msvcrt20 SHARED msvcrt20.c +list(APPEND SOURCE + msvcrt20.c ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def) +add_library(msvcrt20 SHARED ${SOURCE}) set_entrypoint(msvcrt20 0) target_link_libraries(msvcrt20 wine) Modified: branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/nddeapi… ============================================================================== --- branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/nddeapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,11 @@ spec2def(nddeapi.dll nddeapi.spec) -add_library(nddeapi SHARED nddeapi.c +list(APPEND SOURCE + nddeapi.c ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def) +add_library(nddeapi SHARED ${SOURCE}) set_entrypoint(nddeapi 0) target_link_libraries(nddeapi wine) Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… ============================================================================== --- branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,11 @@ spec2def(ntdsapi.dll ntdsapi.spec) -add_library(ntdsapi SHARED ntdsapi.c +list(APPEND SOURCE + ntdsapi.c ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def) +add_library(ntdsapi SHARED ${SOURCE}) set_entrypoint(ntdsapi 0) target_link_libraries(ntdsapi wine) Modified: branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbccp3… ============================================================================== --- branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -6,9 +6,11 @@ spec2def(odbccp32.dll odbccp32.spec) -add_library(odbccp32 SHARED odbccp32.c +list(APPEND SOURCE + odbccp32.c ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) +add_library(odbccp32 SHARED ${SOURCE}) set_entrypoint(odbccp32 0) target_link_libraries(odbccp32 Modified: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleacc/… ============================================================================== --- branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,12 +1,15 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(oleacc.dll oleacc.spec) -add_library(oleacc SHARED main.c oleacc.rc +list(APPEND SOURCE + main.c oleacc.rc ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) + +add_library(oleacc SHARED ${SOURCE}) set_entrypoint(oleacc 0) Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… ============================================================================== --- branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -2,11 +2,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(olecli32.dll olecli32.spec) -add_library(olecli32 SHARED olecli_main.c +list(APPEND SOURCE + olecli_main.c ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def) +add_library(olecli32 SHARED ${SOURCE}) set_entrypoint(olecli32 0) target_link_libraries(olecli32 wine) Modified: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pdh/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -8,9 +8,11 @@ spec2def(pdh.dll pdh.spec) -add_library(pdh SHARED pdh_main.c +list(APPEND SOURCE + pdh_main.c ${CMAKE_CURRENT_BINARY_DIR}/pdh.def) +add_library(pdh SHARED ${SOURCE}) set_entrypoint(pdh 0) target_link_libraries(pdh wine) Modified: branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasapi32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -2,11 +2,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(rasapi32.dll rasapi32.spec) -add_library(rasapi32 SHARED rasapi.c +list(APPEND SOURCE + rasapi.c ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def) +add_library(rasapi32 SHARED ${SOURCE}) set_entrypoint(rasapi32 0) target_link_libraries(rasapi32 wine) Modified: branches/cmake-bringup/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/securit… ============================================================================== --- branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,15 +1,16 @@ - set_unicode() - add_definitions(-D__SECURITY__) +set_rc_compiler() spec2def(security.dll security.spec) -add_library(security SHARED security.rc +list(APPEND SOURCE + security.rc ${CMAKE_CURRENT_BINARY_DIR}/security.def) +add_library(security SHARED ${SOURCE}) set_entrypoint(security 0) -add_importlibs(security advapi32 ntdll) +add_importlibs(security advapi32 ntdll kernel32) add_cab_target(security 1) Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,10 +4,16 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +set_rc_compiler() spec2def(snmpapi.dll snmpapi.spec) -add_library(snmpapi SHARED main.c snmpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) +list(APPEND SOURCE + main.c + snmpapi.rc + ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) + +add_library(snmpapi SHARED ${SOURCE}) set_module_type(snmpapi win32dll) Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,7 +4,12 @@ spec2def(spoolss.dll spoolss.spec) -add_library(spoolss SHARED spoolss_main.c router.c ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) +list(APPEND SOURCE + spoolss_main.c + router.c + ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) + +add_library(spoolss SHARED ${SOURCE}) set_module_type(spoolss win32dll) Modified: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclien… ============================================================================== --- branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -1,9 +1,11 @@ spec2def(srclient.dll srclient.spec) -add_library(srclient SHARED srclient_main.c +list(APPEND SOURCE + srclient_main.c ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) +add_library(srclient SHARED ${SOURCE}) set_entrypoint(srclient 0) add_importlibs(srclient kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,11 @@ spec2def(sxs.dll sxs.spec) -add_library(sxs SHARED sxs.c +list(APPEND SOURCE + sxs.c ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) +add_library(sxs SHARED ${SOURCE}) set_entrypoint(sxs 0) target_link_libraries(sxs wine) Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,12 +4,13 @@ spec2def(tapi32.dll tapi32.spec) -add_library(tapi32 SHARED +list(APPEND SOURCE assisted.c internal.c line.c phone.c ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def) +add_library(tapi32 SHARED ${SOURCE}) set_entrypoint(tapi32 0) Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… ============================================================================== --- branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,11 @@ spec2def(traffic.dll traffic.spec) -add_library(traffic SHARED +list(APPEND SOURCE traffic_main.c ${CMAKE_CURRENT_BINARY_DIR}/traffic.def) + +add_library(traffic SHARED ${SOURCE}) set_module_type(traffic win32dll) Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspap… ============================================================================== --- branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Mon Nov 29 23:08:38 2010 @@ -4,9 +4,11 @@ spec2def(updspapi.dll updspapi.spec) -add_library(updspapi SHARED main.c +list(APPEND SOURCE + main.c ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def) +add_library(updspapi SHARED ${SOURCE}) set_entrypoint(updspapi 0) target_link_libraries(updspapi wine)

1 0

[tkreuzer] 49870: [CMAKE] Fix stubs and imports for wine dx
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 19:42:58 2010 New Revision: 49870 URL: http://svn.reactos.org/svn/reactos?rev=49870&view=rev Log: [CMAKE] Fix stubs and imports for wine dx Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -4,6 +4,10 @@ add_definitions(-D__WINESRC__) add_definitions(-DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif() spec2def(d3d8.dll d3d8.spec) @@ -21,7 +25,7 @@ volume.c volumetexture.c version.rc - d3d8.def) + ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) add_library(d3d8 SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -4,6 +4,10 @@ add_definitions(-D__WINESRC__) add_definitions(-DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +if(MSVC) + add_definitions(-FImsvchelper.h) +endif() spec2def(d3d9.dll d3d9.spec) @@ -23,7 +27,8 @@ volume.c volumetexture.c version.rc - d3d9.def) + ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) add_library(d3d9 SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_25_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def) add_definitions(-D__WINESRC__) @@ -18,6 +19,7 @@ wine) add_importlibs(d3dx9_25 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +30,5 @@ ntdll) add_dependencies(d3dx9_25 wineheaders) -add_cab_target(d3dx9_25 1) +add_cab_target(d3dx9_25 1) +add_importlib_target(d3dx9_25.spec libd3dx9_36) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_26_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_26 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_26 wineheaders) -add_cab_target(d3dx9_26 1) +add_cab_target(d3dx9_26 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_27_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_27 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_27 wineheaders) -add_cab_target(d3dx9_27 1) +add_cab_target(d3dx9_27 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_28_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_28 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_28 wineheaders) -add_cab_target(d3dx9_28 1) +add_cab_target(d3dx9_28 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_29_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_29 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_29 wineheaders) -add_cab_target(d3dx9_29 1) +add_cab_target(d3dx9_29 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_30_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_30 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_30 wineheaders) -add_cab_target(d3dx9_30 1) +add_cab_target(d3dx9_30 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_31_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_31 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_31 wineheaders) -add_cab_target(d3dx9_31 1) +add_cab_target(d3dx9_31 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_32_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_32 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_32 wineheaders) -add_cab_target(d3dx9_32 1) +add_cab_target(d3dx9_32 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_33_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_33 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_33 wineheaders) -add_cab_target(d3dx9_33 1) +add_cab_target(d3dx9_33 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_34_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def) add_definitions(-D__WINESRC__) @@ -19,6 +20,7 @@ add_importlibs(d3dx9_34 d3d9 + d3dx9_36 user32 gdi32 advapi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_34 wineheaders) -add_cab_target(d3dx9_34 1) +add_cab_target(d3dx9_34 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_35 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_35 wineheaders) -add_cab_target(d3dx9_35 1) +add_cab_target(d3dx9_35 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_37 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_37 wineheaders) -add_cab_target(d3dx9_37 1) +add_cab_target(d3dx9_37 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_38 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_38 wineheaders) -add_cab_target(d3dx9_38 1) +add_cab_target(d3dx9_38 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_39 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_39 wineheaders) -add_cab_target(d3dx9_39 1) +add_cab_target(d3dx9_39 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_40 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_40 wineheaders) -add_cab_target(d3dx9_40 1) +add_cab_target(d3dx9_40 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_41 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_41 wineheaders) -add_cab_target(d3dx9_41 1) +add_cab_target(d3dx9_41 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -18,6 +18,7 @@ wine) add_importlibs(d3dx9_42 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +29,4 @@ ntdll) add_dependencies(d3dx9_42 wineheaders) -add_cab_target(d3dx9_42 1) +add_cab_target(d3dx9_42 1) Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:42:58 2010 @@ -19,7 +19,8 @@ vertexbuffer.c viewport.c version.rc - ddraw.def) + ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) add_definitions( -D__WINESRC__ @@ -51,4 +52,4 @@ add_dependencies(ddraw wineheaders) add_cab_target(ddraw 1) -add_importlib_target(ddraw.spec) +add_importlib_target(ddraw.spec)

1 0

[tkreuzer] 49869: [CMAKE] - Add stub file for d3dx9_26 and d3dx9_36 - d3dx9_26 imports from d3dx9_36 (def redirection)
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 19:31:43 2010 New Revision: 49869 URL: http://svn.reactos.org/svn/reactos?rev=49869&view=rev Log: [CMAKE] - Add stub file for d3dx9_26 and d3dx9_36 - d3dx9_26 imports from d3dx9_36 (def redirection) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:31:43 2010 @@ -5,6 +5,7 @@ list(APPEND SOURCE d3dx9_24_main.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24.def) add_definitions(-D__WINESRC__) @@ -18,6 +19,7 @@ wine) add_importlibs(d3dx9_24 + d3dx9_36 d3d9 user32 gdi32 @@ -28,4 +30,4 @@ ntdll) add_dependencies(d3dx9_24 wineheaders) -add_cab_target(d3dx9_24 1) +add_cab_target(d3dx9_24 1) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Mon Nov 29 19:31:43 2010 @@ -14,6 +14,7 @@ texture.c util.c version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def) add_definitions(-D__WINESRC__) @@ -37,4 +38,5 @@ ntdll) add_dependencies(d3dx9_36 wineheaders) -add_cab_target(d3dx9_36 1) +add_cab_target(d3dx9_36 1) +add_importlib_target(d3dx9_36.spec)

1 0

[tkreuzer] 49868: [SPEC2DEF] Fix DPRINT output 2
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:39:18 2010 New Revision: 49868 URL: http://svn.reactos.org/svn/reactos?rev=49868&view=rev Log: [SPEC2DEF] Fix DPRINT output 2 Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 18:39:18 2010 @@ -179,7 +179,7 @@ case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; } } - fprintf(file, ")\\n\"); + fprintf(file, ")\\n\""); for (i = 0; i < pexp->nArgCount; i++) {

1 0

[tkreuzer] 49867: [SPEC2DEF] Fix DPRINT output
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:38:09 2010 New Revision: 49867 URL: http://svn.reactos.org/svn/reactos?rev=49867&view=rev Log: [SPEC2DEF] Fix DPRINT output Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 18:38:09 2010 @@ -179,11 +179,11 @@ case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; } } - fprintf(file, ")\\n\", "); + fprintf(file, ")\\n\"); for (i = 0; i < pexp->nArgCount; i++) { - if (i != 0) fprintf(file, ", "); + fprintf(file, ", "); switch (pexp->anArgs[i]) { case ARG_LONG: fprintf(file, "(long)a%d", i); break;

1 0

[akhaldi] 49866: [CMAKE] - Add the stubs file as an output file.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:36:22 2010 New Revision: 49866 URL: http://svn.reactos.org/svn/reactos?rev=49866&view=rev Log: [CMAKE] - Add the stubs file as an output file. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 18:36:22 2010 @@ -195,7 +195,7 @@ macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c

1 0

[akhaldi] 49865: [CMAKE] - Add auto stubs support to the msvc based toolchains.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:35:43 2010 New Revision: 49865 URL: http://svn.reactos.org/svn/reactos?rev=49865&view=rev Log: [CMAKE] - Add auto stubs support to the msvc based toolchains. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 18:35:43 2010 @@ -196,9 +196,9 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endmacro()

1 0

[akhaldi] 49864: [CMAKE] - Add auto stubs support to the gcc based toolchains.
by akhaldi＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: akhaldi Date: Mon Nov 29 18:33:07 2010 New Revision: 49864 URL: http://svn.reactos.org/svn/reactos?rev=49864&view=rev Log: [CMAKE] - Add auto stubs support to the gcc based toolchains. 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=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 29 18:33:07 2010 @@ -200,11 +200,12 @@ macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c + COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endmacro() # Optional 3rd parameter: dllname

1 0

[tkreuzer] 49863: add stubs.h
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 18:07:36 2010 New Revision: 49863 URL: http://svn.reactos.org/svn/reactos?rev=49863&view=rev Log: add stubs.h Added: branches/cmake-bringup/include/reactos/stubs.h (with props) Added: branches/cmake-bringup/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/s… ============================================================================== --- branches/cmake-bringup/include/reactos/stubs.h (added) +++ branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] Mon Nov 29 18:07:36 2010 @@ -1,0 +1,17 @@ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/config.h" +#include "wine/exception.h" + +#include <debug.h> + +void __wine_spec_unimplemented_stub(const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} Propchange: branches/cmake-bringup/include/reactos/stubs.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49862: [SPEC2DEF] - add support for stubs generation - add support for "proper" stubs, with calling convention and parameter dump - handle -private - change invokation a bit [CMAKE] - re...
by tkreuzer＠svn.reactos.org 29 Nov '10

29 Nov '10

Author: tkreuzer Date: Mon Nov 29 17:53:20 2010 New Revision: 49862 URL: http://svn.reactos.org/svn/reactos?rev=49862&view=rev Log: [SPEC2DEF] - add support for stubs generation - add support for "proper" stubs, with calling convention and parameter dump - handle -private - change invokation a bit [CMAKE] - remove the old VARIANT hack Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -201,7 +201,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -131,7 +131,7 @@ #idl files support set(IDL_COMPILER midl) -set(IDL_FLAGS /win32 /DIEnumVARIANT=IEnumXVARIANT) +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 @@ -146,13 +146,13 @@ # Generate the asm stub file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm - COMMAND native-spec2def -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND native-spec2def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) # Generate a the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def + COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) # Assemble the file @@ -196,7 +196,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-spec2def -n --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def + COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE) Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Nov 29 17:53:20 2010 @@ -12,14 +12,23 @@ int nCallingConvention; int nOrdinal; int nStackBytes; + int nArgCount; + int anArgs[30]; + unsigned int uFlags; } EXPORT; -int (*OutputLine)(FILE *, EXPORT *); -void (*OutputHeader)(FILE *, char *); +typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int no_decoration = 0; int no_redirections = 0; char *pszArchString = "i386"; char *pszArchString2; +char *pszDllName = 0; + +enum +{ + FL_PRIVATE = 1, + FL_STUB = 2, +}; enum { @@ -27,6 +36,16 @@ CC_CDECL, CC_FASTCALL, CC_EXTERN, + CC_STUB, +}; + +enum +{ + ARG_LONG, + ARG_PTR, + ARG_STR, + ARG_WSTR, + ARG_DBL }; char* astrCallingConventions[] = @@ -109,16 +128,100 @@ } void -OutputHeader_stub(FILE *file, char *libname) +OutputHeader_stub(FILE *file) +{ + fprintf(file, "/* This file is autogenerated, do not edit. */\n\n" + "#include <stubs.h>\n\n"); +} + +int +OutputLine_stub(FILE *file, EXPORT *pexp) +{ + int i; + + if (pexp->nCallingConvention != CC_STUB && + (pexp->uFlags & FL_STUB) == 0) return 0; + + fprintf(file, "int "); + if (strcmp(pszArchString, "i386") == 0 && + pexp->nCallingConvention == CC_STDCALL) + { + fprintf(file, "__stdcall "); + } + + fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "long"); break; + case ARG_PTR: fprintf(file, "void*"); break; + case ARG_STR: fprintf(file, "char*"); break; + case ARG_WSTR: fprintf(file, "wchar_t*"); break; + case ARG_DBL: fprintf(file, "__int64"); break; + } + fprintf(file, " a%d", i); + } + fprintf(file, ")\n{\n\tDPRINT1(\"WARNING: calling stub %.*s(", + pexp->nNameLength, pexp->pcName); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ","); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "0x%%lx"); break; + case ARG_PTR: fprintf(file, "0x%%p"); break; + case ARG_STR: fprintf(file, "'%%s'"); break; + case ARG_WSTR: fprintf(file, "'%%ws'"); break; + case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; + } + } + fprintf(file, ")\\n\", "); + + for (i = 0; i < pexp->nArgCount; i++) + { + if (i != 0) fprintf(file, ", "); + switch (pexp->anArgs[i]) + { + case ARG_LONG: fprintf(file, "(long)a%d", i); break; + case ARG_PTR: fprintf(file, "(void*)a%d", i); break; + case ARG_STR: fprintf(file, "(char*)a%d", i); break; + case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; + case ARG_DBL: fprintf(file, "(__int64)a%d", i); break; + } + } + fprintf(file, ");\n"); + + if (pexp->nCallingConvention == CC_STUB) + { + fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); + } + + fprintf(file, "\treturn 0;\n}\n\n"); + + return 1; +} + +void +OutputHeader_asmstub(FILE *file, char *libname) { fprintf(file, "; File generated automatically, do not edit! \n\n" ".586\n.model flat\n.code\n"); } int -OutputLine_stub(FILE *fileDest, EXPORT *pexp) -{ - if (pexp->nCallingConvention == CC_STDCALL) +OutputLine_asmstub(FILE *fileDest, EXPORT *pexp) +{ + /* Handle autoname */ + if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') + { + fprintf(fileDest, "PUBLIC ordinal%d\nordinal%d: nop\n", + pexp->nOrdinal, pexp->nOrdinal); + } + else if (pexp->nCallingConvention == CC_STDCALL) { fprintf(fileDest, "PUBLIC _%.*s@%d\n_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, @@ -130,7 +233,8 @@ pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } - else if (pexp->nCallingConvention == CC_CDECL) + else if (pexp->nCallingConvention == CC_CDECL || + pexp->nCallingConvention == CC_STUB) { fprintf(fileDest, "PUBLIC _%.*s\n_%.*s: nop\n", pexp->nNameLength, pexp->pcName, @@ -157,63 +261,77 @@ } int -OutputLine_def(FILE *fileDest, EXPORT *exp) +OutputLine_def(FILE *fileDest, EXPORT *pexp) { fprintf(fileDest, " "); - if (exp->nCallingConvention == CC_FASTCALL && !no_decoration) - { - fprintf(fileDest, "@"); - } - - fprintf(fileDest, "%.*s", exp->nNameLength, exp->pcName); - - if ((exp->nCallingConvention == CC_STDCALL || - exp->nCallingConvention == CC_FASTCALL) && !no_decoration) - { - fprintf(fileDest, "@%d", exp->nStackBytes); - } - - if (exp->pcRedirection && !no_redirections) + + /* Handle autoname */ + if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') + { + fprintf(fileDest, "ordinal%d", pexp->nOrdinal); + } + else + { + if (pexp->nCallingConvention == CC_FASTCALL && !no_decoration) + { + fprintf(fileDest, "@"); + } + + fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); + + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } + } + + if (pexp->pcRedirection && !no_redirections) { int bAddDecorations = 1; fprintf(fileDest, "="); /* No decorations, if switch was passed or this is an external */ - if (no_decoration || ScanToken(exp->pcRedirection, '.')) + if (no_decoration || ScanToken(pexp->pcRedirection, '.')) { bAddDecorations = 0; } - if (exp->nCallingConvention == CC_FASTCALL && bAddDecorations) + if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) { fprintf(fileDest, "@"); } - fprintf(fileDest, "%.*s", exp->nRedirectionLength, exp->pcRedirection); - if ((exp->nCallingConvention == CC_STDCALL || - exp->nCallingConvention == CC_FASTCALL) && bAddDecorations) - { - fprintf(fileDest, "@%d", exp->nStackBytes); - } - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) + fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } + } + + if (pexp->nOrdinal != -1) + { + fprintf(fileDest, " @%d", pexp->nOrdinal); + } + + if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, " DATA"); } + if (pexp->uFlags & FL_PRIVATE) + { + fprintf(fileDest, " PRIVATE"); + } + fprintf(fileDest, "\n"); return 1; } int -ParseFile(char* pcStart, FILE *fileDest) +ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine) { char *pc, *pcLine; int nLine; @@ -228,6 +346,9 @@ { pc = pcLine; + exp.nArgCount = 0; + exp.uFlags = 0; + //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); @@ -264,8 +385,7 @@ { exp.nCallingConvention = CC_CDECL; } - else if (CompareToken(pc, "fastcall") || - CompareToken(pc, "FASTCALL")) + else if (CompareToken(pc, "fastcall")) { exp.nCallingConvention = CC_FASTCALL; } @@ -275,9 +395,7 @@ } else if (CompareToken(pc, "stub")) { - pc = NextToken(pc); - printf("warning: stub skipped: %.*s\n", TokenLength(pc), pc); - continue; + exp.nCallingConvention = CC_STUB; } else { @@ -323,10 +441,17 @@ { if (_stricmp(pszArchString, "i386") != 0) included = 0; } + else if (CompareToken(pc, "-private")) + { + exp.uFlags |= FL_PRIVATE; + } + else if (CompareToken(pc, "-stub")) + { + exp.uFlags |= FL_STUB; + } else if (CompareToken(pc, "-noname") || CompareToken(pc, "-norelay") || - CompareToken(pc, "-ret64") || - CompareToken(pc, "-private")) + CompareToken(pc, "-ret64")) { /* silently ignore these */ } @@ -351,7 +476,8 @@ /* Handle parameters */ exp.nStackBytes = 0; - if (exp.nCallingConvention != CC_EXTERN) + if (exp.nCallingConvention != CC_EXTERN && + exp.nCallingConvention != CC_STUB) { //fprintf(stderr, "info: options:'%.10s'\n", pc); /* Go to next token */ @@ -375,15 +501,26 @@ while (*pc >= '0') { if (CompareToken(pc, "long")) + { exp.nStackBytes += 4; + exp.anArgs[exp.nArgCount] = ARG_LONG; + } else if (CompareToken(pc, "double")) + { exp.nStackBytes += 8; + exp.anArgs[exp.nArgCount] = ARG_DBL; + } else if (CompareToken(pc, "ptr") || CompareToken(pc, "str") || CompareToken(pc, "wstr")) + { exp.nStackBytes += sizeof(void*); + exp.anArgs[exp.nArgCount] = ARG_PTR; // FIXME: handle strings + } else fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc); + + exp.nArgCount++; /* Go to next parameter */ if (!(pc = NextToken(pc))) @@ -431,17 +568,20 @@ { printf("syntax: spec2pdef [<options> ...] <source file> <dest file>\n" "Possible options:\n" - " -d=<file> --dll=<file> names the dll\n" " -h --help prints this screen\n" - " -s --stubs generates an asm lib stub\n" - " -n --no-decoration removes @xx decorations from def file\n" - " --arch <arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); + " -l=<file> generates an asm lib stub\n" + " -d=<file> generates a def file\n" + " -s=<file> generates a stub file\n" + " -n=<file> names the dll\n" + " -@ removes @xx decorations from def file\n" + " -r removes redirections from def file\n" + " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); } int main(int argc, char *argv[]) { size_t nFileSize; - char *pszSource, *pszDllName = 0; + char *pszSource, *pszDefFileName = 0, *pszStubFileName = 0, *pszLibStubName = 0; char achDllName[40]; FILE *file; int result, i; @@ -452,10 +592,6 @@ return -1; } - /* Default to def file */ - OutputLine = OutputLine_def; - OutputHeader = OutputHeader_def; - /* Read options */ for (i = 1; i < argc && *argv[i] == '-'; i++) { @@ -465,32 +601,33 @@ usage(); return 0; } - else if ((_stricmp(argv[i], "--stublib") == 0) || - (_stricmp(argv[i], "-s") == 0)) - { - OutputLine = OutputLine_stub; - OutputHeader = OutputHeader_stub; - } - else if ((_stricmp(argv[i], "--dll") == 0) || - (_stricmp(argv[i], "-d") == 0)) - { - pszDllName = argv[i + 1]; - i++; - } - else if ((_stricmp(argv[i], "--no-decoration") == 0) || - (_stricmp(argv[i], "-n") == 0)) + else if (argv[i][1] == 'd' && argv[i][2] == '=') + { + pszDefFileName = argv[i] + 3; + } + else if (argv[i][1] == 'l' && argv[i][2] == '=') + { + pszLibStubName = argv[i] + 3; + } + else if (argv[i][1] == 's' && argv[i][2] == '=') + { + pszStubFileName = argv[i] + 3; + } + else if (argv[i][1] == 'n' && argv[i][2] == '=') + { + pszDllName = argv[i] + 3; + } + else if ((_stricmp(argv[i], "-@") == 0)) { no_decoration = 1; } - else if ((_stricmp(argv[i], "--no-redirection") == 0) || - (_stricmp(argv[i], "-r") == 0)) + else if ((_stricmp(argv[i], "-r") == 0)) { no_redirections = 1; } - else if ((_stricmp(argv[i], "--arch") == 0)) - { - pszArchString = argv[i + 1]; - i++; + else if (argv[i][1] == 'a' && argv[i][1] == '=') + { + pszArchString = argv[i] + 3; } else { @@ -555,21 +692,52 @@ /* Zero terminate the source */ pszSource[nFileSize] = '\0'; - /* Open output file */ - file = fopen(argv[i + 1], "w"); - if (!file) - { - fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); - return -5; - } - - OutputHeader(file, pszDllName); - - result = ParseFile(pszSource, file); - - if (OutputHeader == OutputHeader_stub) fprintf(file, "\nEND\n"); - - fclose(file); + if (pszDefFileName) + { + /* Open output file */ + file = fopen(pszDefFileName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_def(file, pszDllName); + result = ParseFile(pszSource, file, OutputLine_def); + fclose(file); + } + + if (pszStubFileName) + { + /* Open output file */ + file = fopen(pszStubFileName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_stub(file); + result = ParseFile(pszSource, file, OutputLine_stub); + fclose(file); + } + + if (pszLibStubName) + { + /* Open output file */ + file = fopen(pszLibStubName, "w"); + if (!file) + { + fprintf(stderr, "error: could not open output file %s ", argv[i + 1]); + return -5; + } + + OutputHeader_asmstub(file, pszDllName); + result = ParseFile(pszSource, file, OutputLine_asmstub); + fprintf(file, "\nEND\n"); + fclose(file); + } + return result; }

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