Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 49490: [CMAKE] - Improve more libs.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 17:35:39 2010 New Revision: 49490 URL: http://svn.reactos.org/svn/reactos?rev=49490&view=rev Log: [CMAKE] - Improve more libs. Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/card… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,4 +1,16 @@ -file(GLOB_RECURSE SOURCE "*.cpp") + +list(APPEND SOURCE + cardbitmaps.cpp + cardbutton.cpp + cardcolor.cpp + cardcount.cpp + cardlib.cpp + cardregion.cpp + cardrgndraw.cpp + cardrgnmouse.cpp + cardstack.cpp + cardwindow.cpp + dropzone.cpp) add_library(cardlib ${SOURCE}) -add_dependencies(cardlib psdk) +add_dependencies(cardlib psdk) Modified: branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/expa… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,9 +1,13 @@ -include_directories(lib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) +include_directories( + lib + ${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) add_definitions(-DHAVE_EXPAT_CONFIG_H) -file(GLOB_RECURSE SOURCE "lib/*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_impl.c ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_ns.c) -add_library(expat ${SOURCE}) +list(APPEND SOURCE + lib/xmlparse.c + lib/xmlrole.c + lib/xmltok.c) + +add_library(expat ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/free… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,51 +1,52 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DFT2_BUILD_LIBRARY) -add_definitions(-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER) + +add_definitions( + -D__NTDRIVER__ + -DFT2_BUILD_LIBRARY + -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER) include_directories(include) -set(SOURCE - "src/autofit/autofit.c" - "src/base/ftbase.c" - "src/base/ftbbox.c" - "src/base/ftbdf.c" - "src/base/ftbitmap.c" - "src/base/ftdebug.c" - "src/base/ftgasp.c" - "src/base/ftglyph.c" - "src/base/ftgxval.c" - "src/base/ftinit.c" - "src/base/ftlcdfil.c" - "src/base/ftmm.c" - "src/base/ftotval.c" - "src/base/ftpatent.c" - "src/base/ftpfr.c" - "src/base/ftstroke.c" - "src/base/ftsynth.c" - "src/base/ftsystem.c" - "src/base/fttype1.c" - "src/base/ftwinfnt.c" - "src/base/ftxf86.c" - "src/bdf/bdf.c" - "src/cache/ftcache.c" - "src/cff/cff.c" - "src/cid/type1cid.c" - "src/gxvalid/gxvalid.c" - "src/gzip/ftgzip.c" - "src/lzw/ftlzw.c" - "src/otvalid/otvalid.c" - "src/pcf/pcf.c" - "src/pfr/pfr.c" - "src/psaux/psaux.c" - "src/pshinter/pshinter.c" - "src/psnames/psnames.c" - "src/raster/raster.c" - "src/sfnt/sfnt.c" - "src/smooth/smooth.c" - "src/truetype/truetype.c" - "src/type1/type1.c" - "src/type42/type42.c" - "src/winfonts/winfnt.c" -) +list(APPEND SOURCE + src/autofit/autofit.c + src/base/ftbase.c + src/base/ftbbox.c + src/base/ftbdf.c + src/base/ftbitmap.c + src/base/ftdebug.c + src/base/ftgasp.c + src/base/ftglyph.c + src/base/ftgxval.c + src/base/ftinit.c + src/base/ftlcdfil.c + src/base/ftmm.c + src/base/ftotval.c + src/base/ftpatent.c + src/base/ftpfr.c + src/base/ftstroke.c + src/base/ftsynth.c + src/base/ftsystem.c + src/base/fttype1.c + src/base/ftwinfnt.c + src/base/ftxf86.c + src/bdf/bdf.c + src/cache/ftcache.c + src/cff/cff.c + src/cid/type1cid.c + src/gxvalid/gxvalid.c + src/gzip/ftgzip.c + src/lzw/ftlzw.c + src/otvalid/otvalid.c + src/pcf/pcf.c + src/pfr/pfr.c + src/psaux/psaux.c + src/pshinter/pshinter.c + src/psnames/psnames.c + src/raster/raster.c + src/sfnt/sfnt.c + src/smooth/smooth.c + src/truetype/truetype.c + src/type1/type1.c + src/type42/type42.c + src/winfonts/winfnt.c) -add_library(freetype ${SOURCE}) +add_library(freetype ${SOURCE}) Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(APPEND SOURCE +list(APPEND SOURCE dsp_io.c version.c speaker.c

1 0

[akhaldi] 49489: [CMAKE] - Improve drivers' libs.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 17:29:01 2010 New Revision: 49489 URL: http://svn.reactos.org/svn/reactos?rev=49489&view=rev Log: [CMAKE] - Improve drivers' libs. Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM… ============================================================================== --- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,35 @@ + add_definitions(-D__NTDRIVER__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) -file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S) -file(GLOB_RECURSE SOURCE "*.c") +if(ARCH MATCHES i386) +list(APPEND SOURCE network/i386/checksum.S) +endif() -add_library(ip ${ARCH_SOURCE} ${SOURCE}) +list(APPEND SOURCE + network/address.c + network/arp.c + network/checksum.c + network/icmp.c + network/interface.c + network/ip.c + network/loopback.c + network/neighbor.c + network/ports.c + network/receive.c + network/router.c + network/routines.c + network/transmit.c + transport/datagram/datagram.c + transport/rawip/rawip.c + transport/tcp/accept.c + transport/tcp/event.c + transport/tcp/if.c + transport/tcp/tcp.c + transport/udp/udp.c) + +add_library(ip ${SOURCE}) add_dependencies(ip bugcodes) - Modified: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit… ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,18 +1,51 @@ -include_directories(BEFORE include/freebsd/src/sys) -include_directories(include/freebsd) -include_directories(include/freebsd/sys/include) -include_directories(include/freebsd/dev/include) -include_directories(include/freebsd/net/include) +include_directories( + BEFORE include/freebsd/src/sys + include/freebsd + include/freebsd/sys/include + include/freebsd/dev/include + include/freebsd/net/include + include) -include_directories(include) +add_definitions( + -D__NTDRIVER__ + -DKERNEL + -DOSKIT) -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) -add_definitions(-DOSKIT) - -file(GLOB_RECURSE SOURCE "oskittcp/*.c") +list(APPEND SOURCE + oskittcp/defaults.c + oskittcp/in.c + oskittcp/in_cksum.c + oskittcp/in_pcb.c + oskittcp/in_proto.c + oskittcp/in_rmx.c + oskittcp/inet_ntoa.c + oskittcp/interface.c + oskittcp/ip_input.c + oskittcp/ip_output.c + oskittcp/kern_clock.c + oskittcp/kern_subr.c + oskittcp/osenv.c + oskittcp/param.c + oskittcp/radix.c + oskittcp/random.c + oskittcp/raw_cb.c + oskittcp/raw_ip.c + oskittcp/raw_usrreq.c + oskittcp/route.c + oskittcp/rtsock.c + oskittcp/scanc.c + oskittcp/sleep.c + oskittcp/tcp_input.c + oskittcp/tcp_output.c + oskittcp/tcp_subr.c + oskittcp/tcp_usrreq.c + oskittcp/tcp_debug.c + oskittcp/tcp_timer.c + oskittcp/uipc_domain.c + oskittcp/uipc_mbuf.c + oskittcp/uipc_socket.c + oskittcp/uipc_socket2.c) add_library(oskittcp ${SOURCE}) add_dependencies(oskittcp bugcodes) - Modified: branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") - -add_library(audioleg ${SOURCE}) +add_library(audioleg devname.c hardware.c) add_dependencies(audioleg bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,6 +1,7 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) Modified: branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,14 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DDEBUG_NT4=1) +add_definitions( + -DUNICODE -D_UNICODE + -DDEBUG_NT4=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + detect.c + registry.c + control.c) add_library(mment4 ${SOURCE}) add_dependencies(mment4 psdk) Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,17 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + controls.c + filter.c + mixer.c + sup.c + wave.c + topology.c) add_library(mmixer ${SOURCE}) add_dependencies(mmixer bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audio time.c) add_dependencies(audio bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,16 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +file(APPEND SOURCE + dsp_io.c + version.c + speaker.c + rate.c + mixer.c) add_library(soundblaster ${SOURCE}) add_dependencies(soundblaster bugcodes) - Modified: branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(uartmidi midiuart.c) add_dependencies(uartmidi bugcodes)

1 0

[akhaldi] 49488: [CMAKE] - Improve win32k, lib{jpeg, png, tiff, xslt} and win32k.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 17:12:31 2010 New Revision: 49488 URL: http://svn.reactos.org/svn/reactos?rev=49488&view=rev Log: [CMAKE] - Improve win32k, lib{jpeg,png,tiff,xslt} and win32k. Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libj… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -1,10 +1,15 @@ -add_definitions(-DWIN32 -D_WINDOWS -D_MBCS -DJPEG_DLL) -add_definitions(-Dmain=mainptr) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -DWIN32 + -D_WINDOWS + -D_MBCS + -DJPEG_DLL + -Dmain=mainptr + -D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) add_library(libjpeg SHARED jaricom.c Modified: branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libp… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -1,9 +1,14 @@ -add_definitions(-DWIN32 -DNDEBUG -D_WINDOWS -DPNG_BUILD_DLL) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -DWIN32 + -DNDEBUG + -D_WINDOWS + -DPNG_BUILD_DLL + -D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) add_library(libpng SHARED png.c Modified: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libt… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -4,12 +4,12 @@ -DNDEBUG -DBUILD_LIBTIFF_DLL -DDLL_EXPORT - -DUSE_WIN32_FILEIO) + -DUSE_WIN32_FILEIO + -D_DLL -D__USE_CRTIMP) -add_definitions(-D_DLL -D__USE_CRTIMP) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) add_library(libtiff SHARED mkg3states.c Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -8,9 +8,8 @@ -DHAVE_WIN32_THREADS -D_REENTRANT -D_WINSOCKAPI_ - -DLIBXML_STATIC) - -add_definitions(-D_DLL -D__USE_CRTIMP) + -DLIBXML_STATIC + -D_DLL -D__USE_CRTIMP) add_library(libxslt SHARED attributes.c Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -3,9 +3,8 @@ -DUSE_EXTERNAL_DXTN_LIB=1 -DBUILD_GL32 -DWIN32 - -DUSE_3DNOW_ASM) - -add_definitions(-D_DLL -D__USE_CRTIMP) + -DUSE_3DNOW_ASM + -D_DLL -D__USE_CRTIMP) if(ARCH MATCHES i386) add_definitions( @@ -16,17 +15,18 @@ add_definitions(-DGL_NO_STDCALL) endif(ARCH MATCHES i386) -include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/math) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/tnl) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/grammar) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang/OSDependent/Linux) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang/OGLCompilersDLL) +include_directories( + BEFORE include + src + src/main + src/glapi + src/math + src/tnl + src/shader + src/shader/grammar + src/shader/slang + src/shader/slang/OSDependent/Linux + src/shader/slang/OGLCompilersDLL) list(APPEND SOURCE src/drivers/common/driverfuncs.c @@ -221,8 +221,7 @@ src/vbo/vbo_split_inplace.c src/drivers/windows/icd/mesa.def) -set_source_files_properties(src/drivers/windows/icd/mesa.def - PROPERTIES EXTERNAL_OBJECT TRUE) +set_source_files_properties(src/drivers/windows/icd/mesa.def PROPERTIES EXTERNAL_OBJECT TRUE) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -258,13 +257,6 @@ set_entrypoint(mesa32 0) -if (NOT MSVC) -# this hides all warnings, is this really wanted ? -#add_definitions(-w) - -endif(NOT MSVC) - - add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll) add_dependencies(mesa32 psdk buildno_header) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -7,8 +7,9 @@ ${REACTOS_SOURCE_DIR}/include/reactos/subsys ${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_definitions(-DLANGPACK) -add_definitions(-D_WIN32K_) +add_definitions( + -DLANGPACK + -D_WIN32K_) list(APPEND SOURCE dib/alphablend.c

1 0

[akhaldi] 49487: [CMAKE] - Improve the kernel build.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 16:57:33 2010 New Revision: 49487 URL: http://svn.reactos.org/svn/reactos?rev=49487&view=rev Log: [CMAKE] - Improve the kernel build. Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Nov 5 16:57:33 2010 @@ -1,17 +1,20 @@ -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -I${REACTOS_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include -O coff -o <OBJECT> ") - -add_definitions(-D__NTOSKRNL__) -add_definitions(-D_NTOSKRNL_) -add_definitions(-D_NTSYSTEM_) -add_definitions(-D_IN_KERNEL_) -add_definitions(-DNTDDI_VERSION=0x05020400) - -include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) -include_directories(include) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/internal) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + ${REACTOS_SOURCE_DIR} + ${REACTOS_SOURCE_DIR}/lib/cmlib + include + ${CMAKE_CURRENT_BINARY_DIR}/include + ${CMAKE_CURRENT_BINARY_DIR}/include/internal + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_definitions( + -D__NTOSKRNL__ + -D_NTOSKRNL_ + -D_NTSYSTEM_ + -D_IN_KERNEL_ + -DNTDDI_VERSION=0x05020400) + +set_rc_compiler() list(APPEND SOURCE cc/cacheman.c @@ -402,9 +405,11 @@ endif(NOT _WINKD_) -add_executable(ntoskrnl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.h.gch) - -set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native") +add_executable(ntoskrnl ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.h.gch ${SOURCE}) + +set_entrypoint(ntoskrnl KiSystemStartup@4) +set_subsystem(ntoskrnl native) +set_image_base(ntoskrnl 0x80800000) target_link_libraries(ntoskrnl cportlib

1 0

[sir_richard] 49486: [NTOS]: Make idle loop portable. Can be moved out of /i386 now.
by sir_richard＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: sir_richard Date: Fri Nov 5 16:00:05 2010 New Revision: 49486 URL: http://svn.reactos.org/svn/reactos?rev=49486&view=rev Log: [NTOS]: Make idle loop portable. Can be moved out of /i386 now. Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Fri Nov 5 16:00:05 2010 @@ -258,7 +258,8 @@ /* Initialize the idle loop: disable interrupts */ _enable(); - __asm__("nop; nop"); + YieldProcessor(); + YieldProcessor(); _disable(); /* Now loop forever */ @@ -298,7 +299,8 @@ /* We are back in the idle thread -- disable interrupts again */ _enable(); - __asm__("nop"); + YieldProcessor(); + YieldProcessor(); _disable(); } else

1 0

[sir_richard] 49485: [NTOS]: Implement the idle loop in C.
by sir_richard＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: sir_richard Date: Fri Nov 5 15:58:34 2010 New Revision: 49485 URL: http://svn.reactos.org/svn/reactos?rev=49485&view=rev Log: [NTOS]: Implement the idle loop in C. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Fri Nov 5 15:58:34 2010 @@ -498,129 +498,6 @@ ret .endfunc -.globl @KiIdleLoop@0 -.func @KiIdleLoop@0, @KiIdleLoop@0 -@KiIdleLoop@0: - - /* Set EBX */ - mov ebx, fs:[KPCR_SELF] - - /* Jump into mainline code */ - jmp MainLoop - -CpuIdle: - /* Call the CPU's idle function */ - lea ecx, [ebx+KPCR_PRCB_POWER_STATE_IDLE_FUNCTION] - call [ecx] - -MainLoop: - /* Cycle interrupts for 1 cycle */ - sti - nop - nop - cli - - /* Check if we have to deliver DPCs, timers, or deferred threads */ - mov eax, [ebx+KPCR_PRCB_DPC_QUEUE_DEPTH] - or eax, [ebx+KPCR_PRCB_TIMER_REQUEST] -#ifdef CONFIG_SMP - or eax, [ebx+KPCR_PRCB_DEFERRED_READY_LIST_HEAD] -#endif - jz CheckSchedule - - mov cl, DISPATCH_LEVEL - call @HalClearSoftwareInterrupt@4 - - /* Handle the above */ - lea ecx, [ebx+KPCR_PRCB_DATA] - call @KiRetireDpcList@4 - -CheckSchedule: - /* Check if a next thread is queued */ - cmp dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 -#ifdef CONFIG_SMP - jz NoNextThread -#else - jz CpuIdle -#endif - -#ifdef CONFIG_SMP - /* There is, raise IRQL to synch level */ - call _KeRaiseIrqlToSynchLevel@0 -#endif - sti - - /* Set the current thread to ready */ - mov edi, [ebx+KPCR_CURRENT_THREAD] -#ifdef CONFIG_SMP - mov byte ptr [edi+KTHREAD_SWAP_BUSY], 1 - - /* Acquire the PRCB Lock */ - lock bts dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 - jnb CheckNext - lea ecx, [ebx+KPCR_PRCB_PRCB_LOCK] - call @KefAcquireSpinLockAtDpcLevel@4 -#endif - -CheckNext: - /* Check if the next thread is the current */ - mov esi, [ebx+KPCR_PRCB_NEXT_THREAD] -#ifdef CONFIG_SMP - cmp esi, edi - jz SameThread -#endif - - /* Clear the next thread and set this one instead */ - and dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 - mov [ebx+KPCR_CURRENT_THREAD], esi - - /* Set the thread as running */ - mov byte ptr [esi+KTHREAD_STATE_], Running - -#ifdef CONFIG_SMP - /* Disable the idle scheduler and release the PRCB lock */ - and byte ptr [ebx+KPCR_PRCB_IDLE_SCHEDULE], 0 - and dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 -#endif - -SwapContext: - /* Swap context at APC_LEVEL */ - mov ecx, APC_LEVEL - call @KiSwapContextInternal@0 - -#ifdef CONFIG_SMP - /* Lower to DPC level */ - mov ecx, DISPATCH_LEVEL - call @KfLowerIrql@4 -#endif - jmp MainLoop - -#ifdef CONFIG_SMP -SameThread: - /* Clear the next thread, and put the thread as ready after lock release */ - and dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 - and dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 - and byte ptr [edi+KTHREAD_STATE_], Ready - jmp MainLoop - -NoNextThread: - /* Check if the idle scheduler is enabled */ - cmp byte ptr [ebx+KPCR_PRCB_IDLE_SCHEDULE], 0 - jz CpuIdle - - /* It is, so call the scheduler */ - lea ecx, [ebx+KPCR_PRCB_DATA] - call @KiIdleSchedule@4 - test eax, eax - - /* Get new thread pointers and either swap or idle loop again */ - mov esi, eax - mov edi, [ebx+KPCR_PRCB_IDLE_THREAD] - jnz SwapContext - jmp MainLoop -#endif -.endfunc - /* FIXFIX: Move to C code ****/ .globl _Ki386SetupAndExitToV86Mode@4 .func Ki386SetupAndExitToV86Mode@4 Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Fri Nov 5 15:58:34 2010 @@ -249,6 +249,64 @@ Thread->KernelStack = (PVOID)CtxSwitchFrame; } +VOID +FASTCALL +KiIdleLoop(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD OldThread, NewThread; + + /* Initialize the idle loop: disable interrupts */ + _enable(); + __asm__("nop; nop"); + _disable(); + + /* Now loop forever */ + while (TRUE) + { + /* Check for pending timers, pending DPCs, or pending ready threads */ + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + /* Quiesce the DPC software interrupt */ + HalClearSoftwareInterrupt(DISPATCH_LEVEL); + + /* Handle it */ + KiRetireDpcList(Prcb); + } + + /* Check if a new thread is scheduled for execution */ + if (Prcb->NextThread) + { + /* Enable interupts */ + _enable(); + + /* Capture current thread data */ + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + + /* Set new thread data */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NewThread; + + /* The thread is now running */ + NewThread->State = Running; + + /* Switch away from the idle thread */ + KiSwapContext(OldThread, NewThread); + + /* We are back in the idle thread -- disable interrupts again */ + _enable(); + __asm__("nop"); + _disable(); + } + else + { + /* Continue staying idle. Note the HAL returns with interrupts on */ + Prcb->PowerState.IdleFunction(&Prcb->PowerState); + } + } +} + /* EOF */ - -

1 0

[spetreolle] 49484: [CMAKE] Bootcd: Added : syssetup.inf, vgafonts.cab, c_28593.nls, ntvdm. Remove blue from reactos.cab.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: spetreolle Date: Fri Nov 5 14:33:14 2010 New Revision: 49484 URL: http://svn.reactos.org/svn/reactos?rev=49484&view=rev Log: [CMAKE] Bootcd: Added : syssetup.inf, vgafonts.cab, c_28593.nls, ntvdm. Remove blue from reactos.cab. Added: branches/cmake-bringup/media/inf/syssetup.inf - copied unchanged from r49479, branches/cmake-bringup/media/inf/syssetup.inf.trunk Removed: branches/cmake-bringup/media/inf/syssetup.inf.trunk Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/media/inf/CMakeLists.txt branches/cmake-bringup/media/nls/CMakeLists.txt branches/cmake-bringup/media/vgafonts/CMakeLists.txt branches/cmake-bringup/subsystems/CMakeLists.txt branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu… ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -7,4 +7,4 @@ add_importlibs(blue ntoskrnl hal) add_minicd_target(blue reactos blue.sys) -add_cab_target(blue 2) +add_livecd_target(blue reactos/system32/drivers) Modified: branches/cmake-bringup/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/CMakeLi… ============================================================================== --- branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -3,4 +3,4 @@ add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) endforeach(item) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf.trunk reactos/inf syssetup.inf) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf reactos/inf) Removed: branches/cmake-bringup/media/inf/syssetup.inf.trunk URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/syssetu… ============================================================================== --- branches/cmake-bringup/media/inf/syssetup.inf.trunk [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/syssetup.inf.trunk (removed) @@ -1,83 +1,0 @@ -[Version] -Signature = $Windows NT$ -ClassGUID = {00000000-0000-0000-0000-000000000000} - -[DeviceInfsToInstall] -battery.inf -cdrom.inf -display.inf -fdc.inf -hdc.inf -keyboard.inf -machine.inf -msmouse.inf -NET_NIC.inf -ports.inf -scsi.inf -usbport.inf -audio.inf -ks.inf - -[RegistrationPhase2] -RegisterDlls = OleControlDlls - -[OleControlDlls] -11,,actxprxy.dll,1 -11,,amstream.dll,1 -11,,atl.dll,1 -11,,avifil32.dll,1 -11,,browseui.dll,1 -11,,comcat.dll,1 -11,,comctl32.dll,2 -11,,cryptdlg.dll,1 -11,,cryptnet.dll,1 -11,,ddraw.dll,1 -11,,devenum.dll,1 -11,,dinput.dll,1 -11,,dinput8.dll,1 -11,,dmusic.dll,1 -11,,dplayx.dll,1 -11,,dsound.dll,1 -11,,dxdiagn.dll,1 -11,,hhctrl.ocx,1 -11,,hlink.dll,1 -11,,hnetcfg.dll,1 -11,,inetcomm.dll,1 -11,,inseng.dll,1 -11,,itss.dll,1 -11,,jscript.dll,1 -11,,ksproxy.ax,1 -11,,mlang.dll,1 -11,,mscat32.dll,1 -11,,msctf.dll,1 -11,,mshtml.dll,3 -11,,msi.dll,1 -11,,msimtf.dll,1 -11,,msisip.dll,1 -11,,mstask.dll,1 -11,,msxml3.dll,1 -11,,netcfgx.dll,1 -11,,netshell.dll,1 -11,,objsel.dll,1 -11,,ole32.dll,1 -11,,oleacc.dll,1 -11,,oleaut32.dll,1 -11,,olepro32.dll,1 -11,,pstorec.dll,1 -11,,qedit.dll,1 -11,,qmgr.dll,1 -11,,qmgrprxy.dll,1 -11,,quartz.dll,1 -11,,rpcrt4.dll,1 -11,,rsabase.dll,1 -11,,rsaenh.dll,1 -11,,shdocvw.dll,3 -11,,shell32.dll,3 -11,,softpub.dll,1 -11,,sti.dll,1 -11,,urlmon.dll,3 -11,,windowscodecs.dll,1 -11,,winhttp.dll,1 -11,,wininet.dll,2 -11,,wintrust.dll,1 -11,,wuapi.dll,1 Modified: branches/cmake-bringup/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/nls/CMakeLi… ============================================================================== --- branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -51,6 +51,7 @@ c_21866.nls c_28591.nls c_28592.nls + c_28593.nls c_28594.nls c_28595.nls c_28596.nls @@ -67,4 +68,4 @@ foreach(item ${NLS_FILES}) add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 1 ${item}) -endforeach(item) +endforeach(item) Modified: branches/cmake-bringup/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/vgafonts/CM… ============================================================================== --- branches/cmake-bringup/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/vgafonts/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -16,4 +16,5 @@ add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) -add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) +add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) +add_cab(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab 4) Modified: branches/cmake-bringup/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/CMakeL… ============================================================================== --- branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -1,3 +1,4 @@ - -add_subdirectory(ntvdm) +if(ARCH MATCHES i386) + add_subdirectory(ntvdm) +endif() add_subdirectory(win32) Modified: branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/ntvdm/… ============================================================================== --- branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -15,3 +15,5 @@ add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) add_dependencies(ntvdm ndk bugcodes) + +add_cab_target(ntvdm 1)

1 0

[spetreolle] 49483: [CMAKE] Add more dll/ and drivers/ modules to bootcd. Fix mesa32 definitions.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: spetreolle Date: Fri Nov 5 13:46:48 2010 New Revision: 49483 URL: http://svn.reactos.org/svn/reactos?rev=49483&view=rev Log: [CMAKE] Add more dll/ and drivers/ modules to bootcd. Fix mesa32 definitions. Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -14,3 +14,5 @@ msvcrt kernel32 ntdll) + +add_cab_target(wlansvc 1) Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -17,3 +17,5 @@ msvcrt kernel32 ntdll) + +add_cab_target(vmwinst 1) Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -34,3 +34,5 @@ msvcrt kernel32 ntdll) + +add_cab_target(explorer_new 4) Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -3,7 +3,7 @@ -DUSE_EXTERNAL_DXTN_LIB=1 -DBUILD_GL32 -DWIN32 - -D_WINDOWS) + -DUSE_3DNOW_ASM) add_definitions(-D_DLL -D__USE_CRTIMP) Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -5,3 +5,5 @@ set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) + +add_cab_target(battc 2) Modified: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -12,3 +12,6 @@ add_importlibs(cmbatt ntoskrnl hal battc wmilib) add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE}) + + +add_cab_target(cmbatt 2) Modified: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -11,3 +11,5 @@ add_importlibs(compbatt ntoskrnl hal battc) add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE}) + +add_cab_target(compbatt 2) Modified: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -10,3 +10,5 @@ set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) + +add_cab_target(dxapi 2) Modified: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -11,3 +11,5 @@ set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) + +add_cab_target(dxg 2) Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -8,3 +8,5 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) + +add_cab_target(dxgthk 2) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -62,3 +62,5 @@ set_module_type(portcls kernelmodedriver) add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) + +add_cab_target(portcls 2) Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -10,3 +10,5 @@ set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) + +add_cab_target(drmk 2) Modified: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -13,3 +13,5 @@ libsamplerate) add_importlibs(kmixer ntoskrnl ks hal) + +add_cab_target(kmixer 2) Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -21,3 +21,6 @@ ${PSEH_LIB}) add_importlibs(wdmaud ntoskrnl ks hal) + + +add_cab_target(wdmaud 2) Modified: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -14,3 +14,5 @@ target_link_libraries(sysaudio libcntpr) add_importlibs(sysaudio ntoskrnl ks hal) + +add_cab_target(sysaudio 2) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:46:48 2010 @@ -8,3 +8,5 @@ set_module_type(wmilib kernelmodedriver) add_importlibs(wmilib ntoskrnl) + +add_cab_target(wmilib 2)

1 0

[spetreolle] 49482: [CMAKE] Add dlls to bootcd. Fix hhctrl build.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: spetreolle Date: Fri Nov 5 13:25:28 2010 New Revision: 49482 URL: http://svn.reactos.org/svn/reactos?rev=49482&view=rev Log: [CMAKE] Add dlls to bootcd. Fix hhctrl build. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/security/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/softpub/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/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -41,7 +41,7 @@ add_subdirectory(gdiplus) add_subdirectory(getuname) #add_subdirectory(glu32)# FIXME: set_cpp()? -#add_subdirectory(hhctrl.ocx)#FIXME: regsvr.c.obj:regsvr.c:(.text+0x393): undefined reference to `RegDeleteTreeW' +add_subdirectory(hhctrl.ocx) add_subdirectory(hid) add_subdirectory(hlink) add_subdirectory(hnetcfg) Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -1,3 +1,4 @@ +set_cpp() add_definitions(-DRESOLVE_3D_TEXTURE_SUPPORT) add_definitions(-DBUILD_GL32) Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -1,5 +1,8 @@ add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(hhctrl.ocx hhctrl.ocx.spec) @@ -34,4 +37,4 @@ kernel32 ntdll) - +add_cab_target(hhctrl 1) Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -16,3 +16,4 @@ add_importlibs(msisys kernel32 ntdll) +add_cab_target(msisys 1) Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -11,3 +11,5 @@ add_importlibs(samsrv kernel32 ntdll) add_dependencies(samsrv psdk buildno_header) + +add_cab_target(samsrv 1) 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] Fri Nov 5 13:25:28 2010 @@ -12,3 +12,4 @@ add_importlibs(security advapi32 ntdll) +add_cab_target(security 1) Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -12,3 +12,5 @@ add_importlibs(shdoclc kernel32 ntdll) add_dependencies(shdoclc psdk buildno_header) + +add_cab_target(shdoclc 1) Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -14,3 +14,5 @@ add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk buildno_header) + +add_cab_target(shfolder 1) Modified: branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/softpub… ============================================================================== --- branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -13,4 +13,4 @@ add_importlibs(softpub wintrust) - +add_cab_target(softpub 1) 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] Fri Nov 5 13:25:28 2010 @@ -8,3 +8,5 @@ add_importlibs(srclient kernel32 ntdll) add_dependencies(srclient psdk) + +add_cab_target(srclient 1) 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] Fri Nov 5 13:25:28 2010 @@ -13,3 +13,5 @@ add_importlibs(sxs kernel32 ntdll) add_dependencies(sxs psdk) + +add_cab_target(sxs 1) 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] Fri Nov 5 13:25:28 2010 @@ -17,3 +17,5 @@ add_importlibs(tapi32 advapi32 kernel32 ntdll) add_dependencies(tapi32 psdk buildno_header) + +add_cab_target(tapi32 1) Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -2,3 +2,5 @@ add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) add_dependencies(tapiui psdk buildno_header) + +add_cab_target(tapiui 1) 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] Fri Nov 5 13:25:28 2010 @@ -13,3 +13,5 @@ add_importlibs(updspapi setupapi kernel32 ntdll) add_dependencies(updspapi psdk buildno_header) + +add_cab_target(updspapi 1) Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -31,3 +31,5 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) + +add_cab_target(wdmaud.drv 1) Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3… ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -26,3 +26,5 @@ ntdll) add_dependencies(winemp3.acm psdk) + +add_cab_target(winemp3.acm 1) Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -10,3 +10,5 @@ add_importlibs(winfax kernel32 ntdll) add_dependencies(winfax psdk) + +add_cab_target(winfax 1) Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -10,3 +10,5 @@ set_entrypoint(wing32 0) add_importlibs(wing32 user32 gdi32) add_dependencies(wing32 psdk) + +add_cab_target(wing32 1) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -15,3 +15,5 @@ add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi psdk buildno_header) + +add_cab_target(wlanapi 1) Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -9,3 +9,5 @@ add_importlibs(wmi advapi32) add_dependencies(wmi psdk buildno_header) + +add_cab_target(wmi 1) Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -16,4 +16,4 @@ add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip psdk buildno_header) -add_livecd_target(wshtcpip reactos/system32) +add_cab_target(wshtcpip 1)

1 0

[tkreuzer] 49481: [USER32] Convert pspec to spec to fix build
by tkreuzer＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: tkreuzer Date: Fri Nov 5 13:14:37 2010 New Revision: 49481 URL: http://svn.reactos.org/svn/reactos?rev=49481&view=rev Log: [USER32] Convert pspec to spec to fix build Added: branches/cmake-bringup/dll/win32/user32/user32.spec - copied, changed from r49461, branches/cmake-bringup/dll/win32/user32/user32.pspec Removed: branches/cmake-bringup/dll/win32/user32/user32.pspec Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:14:37 2010 @@ -1,7 +1,7 @@ set_unicode() -spec2def(user32.dll user32.pspec) +spec2def(user32.dll user32.spec) add_definitions(-D_DLL -D__USE_CRTIMP) Removed: branches/cmake-bringup/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.pspec (removed) @@ -1,787 +1,0 @@ -; Functions exported by Win 2K3 R2 -@ stdcall ActivateKeyboardLayout(long long) NtUserActivateKeyboardLayout -@ stdcall AdjustWindowRect(ptr long long) -@ stdcall AdjustWindowRectEx(ptr long long long) -@ stdcall AlignRects(ptr long long long) -@ stdcall AllowForegroundActivation() -@ stdcall AllowSetForegroundWindow(long) -@ stdcall AnimateWindow(long long long) -@ stdcall AnyPopup() -@ stdcall AppendMenuA(long long long ptr) -@ stdcall AppendMenuW(long long long ptr) -@ stdcall ArrangeIconicWindows(long) -@ stdcall AttachThreadInput(long long long) NtUserAttachThreadInput -@ stdcall BeginDeferWindowPos(long) -@ stdcall BeginPaint(long ptr) NtUserBeginPaint -@ stdcall BlockInput(long) NtUserBlockInput -@ stdcall BringWindowToTop(long) -@ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA -@ stdcall BroadcastSystemMessageA(long ptr long long long) -@ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) -@ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) -@ stdcall BroadcastSystemMessageW(long ptr long long long) -@ stub BuildReasonArray -@ stub CalcMenuBar -@ stdcall CallMsgFilter(ptr long) CallMsgFilterA -@ stdcall CallMsgFilterA(ptr long) -@ stdcall CallMsgFilterW(ptr long) -@ stdcall CallNextHookEx(long long long long) -@ stdcall CallWindowProcA(ptr long long long long) -@ stdcall CallWindowProcW(ptr long long long long) -@ stdcall CascadeChildWindows(long long) -@ stdcall CascadeWindows(long long ptr long ptr) -@ stdcall ChangeClipboardChain(long long) NtUserChangeClipboardChain -@ stdcall ChangeDisplaySettingsA(ptr long) -@ stdcall ChangeDisplaySettingsExA(str ptr long long ptr) -@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) -@ stdcall ChangeDisplaySettingsW(ptr long) -@ stdcall ChangeMenuA(long long ptr long long) -@ stdcall ChangeMenuW(long long ptr long long) -@ stdcall CharLowerA(str) -@ stdcall CharLowerBuffA(str long) -@ stdcall CharLowerBuffW(wstr long) -@ stdcall CharLowerW(wstr) -@ stdcall CharNextA(str) -@ stdcall CharNextExA(long str long) -@ stdcall CharNextW(wstr) -@ stdcall CharPrevA(str str) -@ stdcall CharPrevExA(long str str long) -@ stdcall CharPrevW(wstr wstr) -@ stdcall CharToOemA(str ptr) -@ stdcall CharToOemBuffA(str ptr long) -@ stdcall CharToOemBuffW(wstr ptr long) -@ stdcall CharToOemW(wstr ptr) -@ stdcall CharUpperA(str) -@ stdcall CharUpperBuffA(str long) -@ stdcall CharUpperBuffW(wstr long) -@ stdcall CharUpperW(wstr) -@ stdcall CheckDlgButton(long long long) -@ stdcall CheckMenuItem(long long long) -@ stdcall CheckMenuRadioItem(long long long long long) -@ stdcall CheckRadioButton(long long long long) -@ stdcall ChildWindowFromPoint(long double) -@ stdcall ChildWindowFromPointEx(long double long) ; Direct call NtUserChildWindowFromPointEx -@ stdcall CliImmSetHotKey(long long long ptr) -@ stdcall ClientThreadSetup() -@ stdcall ClientToScreen(long ptr) -@ stdcall ClipCursor(ptr) NtUserClipCursor -@ stdcall CloseClipboard() NtUserCloseClipboard -@ stdcall CloseDesktop(long) NtUserCloseDesktop -@ stdcall CloseWindow(long) -@ stdcall CloseWindowStation(long) NtUserCloseWindowStation -@ stdcall CopyAcceleratorTableA(long ptr long) -@ stdcall CopyAcceleratorTableW(long ptr long) NtUserCopyAcceleratorTable -@ stdcall CopyIcon(long) -@ stdcall CopyImage(long long long long long) -@ stdcall CopyRect(ptr ptr) -@ stdcall CountClipboardFormats() NtUserCountClipboardFormats -@ stdcall CreateAcceleratorTableA(ptr long) -@ stdcall CreateAcceleratorTableW(ptr long) NtUserCreateAcceleratorTable -@ stdcall CreateCaret(long long long long) NtUserCreateCaret -@ stdcall CreateCursor(long long long long long ptr ptr) -@ stdcall CreateDesktopA(str str ptr long long ptr) -@ stdcall CreateDesktopW(wstr wstr ptr long long ptr) -@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) -@ stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long) -@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) -@ stdcall CreateDialogParamA(long ptr long ptr long) -@ stdcall CreateDialogParamW(long ptr long ptr long) -@ stdcall CreateIcon(long long long long long ptr ptr) -@ stdcall CreateIconFromResource (ptr long long long) -@ stdcall CreateIconFromResourceEx(ptr long long long long long long) -@ stdcall CreateIconIndirect(ptr) -@ stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) -@ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) -@ stdcall CreateMenu() -@ stdcall CreatePopupMenu() -@ stub CreateSystemThreads -@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) -@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) -@ stdcall CreateWindowStationA(str long long ptr) -@ stdcall CreateWindowStationW(wstr long long ptr) -@ stdcall CsrBroadcastSystemMessageExW(long ptr long long long ptr) -@ stdcall CtxInitUser32() -@ stdcall DdeAbandonTransaction(long long long) -@ stdcall DdeAccessData(long ptr) -@ stdcall DdeAddData(long ptr long long) -@ stdcall DdeClientTransaction(ptr long long long long long long ptr) -@ stdcall DdeCmpStringHandles(long long) -@ stdcall DdeConnect(long long long ptr) -@ stdcall DdeConnectList(long long long long ptr) -@ stdcall DdeCreateDataHandle(long ptr long long long long long) -@ stdcall DdeCreateStringHandleA(long str long) -@ stdcall DdeCreateStringHandleW(long wstr long) -@ stdcall DdeDisconnect(long) -@ stdcall DdeDisconnectList(long) -@ stdcall DdeEnableCallback(long long long) -@ stdcall DdeFreeDataHandle(long) -@ stdcall DdeFreeStringHandle(long long) -@ stdcall DdeGetData(long ptr long long) -@ stdcall DdeGetLastError(long) -@ stdcall DdeGetQualityOfService(long long ptr) ; Direct call NtUserDdeGetQualityOfService -@ stdcall DdeImpersonateClient(long) -@ stdcall DdeInitializeA(ptr ptr long long) -@ stdcall DdeInitializeW(ptr ptr long long) -@ stdcall DdeKeepStringHandle(long long) -@ stdcall DdeNameService(long long long long) -@ stdcall DdePostAdvise(long long long) -@ stdcall DdeQueryConvInfo(long long ptr) -@ stdcall DdeQueryNextServer(long long) -@ stdcall DdeQueryStringA(long long ptr long long) -@ stdcall DdeQueryStringW(long long ptr long long) -@ stdcall DdeReconnect(long) -@ stdcall DdeSetQualityOfService(long ptr ptr) ; Direct call NtUserDdeSetQualityOfService -@ stdcall DdeSetUserHandle (long long long) -@ stdcall DdeUnaccessData(long) -@ stdcall DdeUninitialize(long) -@ stdcall DefDlgProcA(long long long long) -@ stdcall DefDlgProcW(long long long long) -@ stdcall DefFrameProcA(long long long long long) -@ stdcall DefFrameProcW(long long long long long) -@ stdcall DefMDIChildProcA(long long long long) -@ stdcall DefMDIChildProcW(long long long long) -@ stdcall DefRawInputProc(ptr long long) -@ stdcall DefWindowProcA(long long long long) -@ stdcall DefWindowProcW(long long long long) -@ stdcall DeferWindowPos(long long long long long long long long) ; Direct call NtUserDeferWindowPos -@ stdcall DeleteMenu(long long long) NtUserDeleteMenu -@ stdcall DeregisterShellHookWindow (long) -@ stdcall DestroyAcceleratorTable(long) -@ stdcall DestroyCaret() -@ stdcall DestroyCursor(long) -@ stdcall DestroyIcon(long) -@ stdcall DestroyMenu(long) NtUserDestroyMenu -@ stub DestroyReasons -@ stdcall DestroyWindow(long) NtUserDestroyWindow -@ stub DeviceEventWorker -@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) -@ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) -@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) -@ stdcall DialogBoxParamA(long str long ptr long) -@ stdcall DialogBoxParamW(long wstr long ptr long) -@ stdcall DisableProcessWindowsGhosting() -@ stdcall DispatchMessageA(ptr) -@ stdcall DispatchMessageW(ptr) -@ stdcall DisplayExitWindowsWarnings(long) -@ stdcall DlgDirListA(long str long long long) -@ stdcall DlgDirListComboBoxA(long ptr long long long) -@ stdcall DlgDirListComboBoxW(long ptr long long long) -@ stdcall DlgDirListW(long wstr long long long) -@ stdcall DlgDirSelectComboBoxExA(long ptr long long) -@ stdcall DlgDirSelectComboBoxExW(long ptr long long) -@ stdcall DlgDirSelectExA(long ptr long long) -@ stdcall DlgDirSelectExW(long ptr long long) -@ stdcall DragDetect(long double) ; Direct call NtUserDragDetect -@ stdcall DragObject(long long long long long) NtUserDragObject -@ stdcall DrawAnimatedRects(long long ptr ptr) NtUserDrawAnimatedRects -@ stdcall DrawCaption(long long ptr long) -@ stdcall DrawCaptionTempA(long long ptr long long str long) -@ stdcall DrawCaptionTempW(long long ptr long long wstr long) -@ stdcall DrawEdge(long ptr long long) -@ stdcall DrawFocusRect(long ptr) -@ stdcall DrawFrame(long ptr long long) -@ stdcall DrawFrameControl(long ptr long long) -@ stdcall DrawIcon(long long long long) -@ stdcall DrawIconEx(long long long long long long long long long) -@ stdcall DrawMenuBar(long) -@ stdcall DrawMenuBarTemp(long long long long long) -@ stdcall DrawStateA(long long ptr long long long long long long long) -@ stdcall DrawStateW(long long ptr long long long long long long long) -@ stdcall DrawTextA(long str long ptr long) -@ stdcall DrawTextExA(long str long ptr long ptr) -@ stdcall DrawTextExW(long wstr long ptr long ptr) -@ stdcall DrawTextW(long wstr long ptr long) -@ stdcall EditWndProc(long long long long) EditWndProcA -@ stdcall EmptyClipboard() NtUserEmptyClipboard -@ stdcall EnableMenuItem(long long long) -@ stdcall EnableScrollBar(long long long) -@ stdcall EnableWindow(long long) -@ stdcall EndDeferWindowPos(long) -@ stdcall EndDialog(long long) -@ stdcall EndMenu() -@ stdcall EndPaint(long ptr) NtUserEndPaint -@ stdcall EndTask(ptr long long) -@ stub EnterReaderModeHelper -@ stdcall EnumChildWindows(long ptr long) -@ stdcall EnumClipboardFormats(long) -@ stdcall EnumDesktopWindows(long ptr ptr) -@ stdcall EnumDesktopsA(ptr ptr long) -@ stdcall EnumDesktopsW(ptr ptr long) -@ stdcall EnumDisplayDevicesA(ptr long ptr long) -@ stdcall EnumDisplayDevicesW(ptr long ptr long) -@ stdcall EnumDisplayMonitors(long ptr ptr long) ; Direct call NtUserEnumDisplayMonitors -@ stdcall EnumDisplaySettingsA(str long ptr) -@ stdcall EnumDisplaySettingsExA(str long ptr long) -@ stdcall EnumDisplaySettingsExW(wstr long ptr long) -@ stdcall EnumDisplaySettingsW(wstr long ptr ) -@ stdcall EnumPropsA(long ptr) -@ stdcall EnumPropsExA(long ptr long) -@ stdcall EnumPropsExW(long ptr long) -@ stdcall EnumPropsW(long ptr) -@ stdcall EnumThreadWindows(long ptr long) -@ stdcall EnumWindowStationsA(ptr long) -@ stdcall EnumWindowStationsW(ptr long) -@ stdcall EnumWindows(ptr long) -@ stdcall EqualRect(ptr ptr) -@ stdcall ExcludeUpdateRgn(long long) NtUserExcludeUpdateRgn -@ stdcall ExitWindowsEx(long long) -@ stdcall FillRect(long ptr long) -@ stdcall FindWindowA(str str) -@ stdcall FindWindowExA(long long str str) -@ stdcall FindWindowExW(long long wstr wstr) -@ stdcall FindWindowW(wstr wstr) -@ stdcall FlashWindow(long long) -@ stdcall FlashWindowEx(ptr) NtUserFlashWindowEx -@ stdcall FrameRect(long ptr long) -@ stdcall FreeDDElParam(long long) -@ stdcall GetActiveWindow() -@ stdcall GetAltTabInfo(long long ptr ptr long) GetAltTabInfoA -@ stdcall GetAltTabInfoA(long long ptr ptr long) -@ stdcall GetAltTabInfoW(long long ptr ptr long) -@ stdcall GetAncestor(long long) ; Direct call NtUserGetAncestor -@ stdcall GetAppCompatFlags(long) -@ stdcall GetAppCompatFlags2(long) -@ stdcall GetAsyncKeyState(long) -@ stdcall GetCapture() -@ stdcall GetCaretBlinkTime() NtUserGetCaretBlinkTime -@ stdcall GetCaretPos(ptr) NtUserGetCaretPos -@ stdcall GetClassInfoA(long str ptr) -@ stdcall GetClassInfoExA(long str ptr) -@ stdcall GetClassInfoExW(long wstr ptr) -@ stdcall GetClassInfoW(long wstr ptr) -@ stdcall GetClassLongA(long long) -#ifdef _WIN64 -@ stdcall GetClassLongPtrA(ptr long) -@ stdcall GetClassLongPtrW(ptr long) -#endif -@ stdcall GetClassLongW(long long) -@ stdcall GetClassNameA(long ptr long) -@ stdcall GetClassNameW(long ptr long) -@ stdcall GetClassWord(long long) -@ stdcall GetClientRect(long long) -@ stdcall GetClipCursor(ptr) NtUserGetClipCursor -@ stdcall GetClipboardData(long) -@ stdcall GetClipboardFormatNameA(long ptr long) -@ stdcall GetClipboardFormatNameW(long ptr long) -@ stdcall GetClipboardOwner() NtUserGetClipboardOwner -@ stdcall GetClipboardSequenceNumber() NtUserGetClipboardSequenceNumber -@ stdcall GetClipboardViewer() NtUserGetClipboardViewer -@ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo -@ stdcall GetCursor() -@ stub GetCursorFrameInfo -@ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo -@ stdcall GetCursorPos(ptr) -@ stdcall GetDC(long) NtUserGetDC -@ stdcall GetDCEx(long long long) NtUserGetDCEx -@ stdcall GetDesktopWindow() -@ stdcall GetDialogBaseUnits() -@ stdcall GetDlgCtrlID(long) -@ stdcall GetDlgItem(long long) -@ stdcall GetDlgItemInt(long long ptr long) -@ stdcall GetDlgItemTextA(long long ptr long) -@ stdcall GetDlgItemTextW(long long ptr long) -@ stdcall GetDoubleClickTime() NtUserGetDoubleClickTime -@ stdcall GetFocus() -@ stdcall GetForegroundWindow() NtUserGetForegroundWindow -@ stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo -@ stdcall GetGuiResources(long long) NtUserGetGuiResources -@ stdcall GetIconInfo(long ptr) -@ stdcall GetInputDesktop() -@ stdcall GetInputState() -@ stdcall GetInternalWindowPos(long ptr ptr) ; direct call NtUserGetInternalWindowPos -@ stdcall GetKBCodePage() -@ stdcall GetKeyNameTextA(long ptr long) -@ stdcall GetKeyNameTextW(long ptr long) -@ stdcall GetKeyState(long) -@ stdcall GetKeyboardLayout(long) -@ stdcall GetKeyboardLayoutList(long ptr) NtUserGetKeyboardLayoutList -@ stdcall GetKeyboardLayoutNameA(ptr) -@ stdcall GetKeyboardLayoutNameW(ptr) -@ stdcall GetKeyboardState(ptr) NtUserGetKeyboardState -@ stdcall GetKeyboardType(long) -@ stdcall GetLastActivePopup(long) -@ stdcall GetLastInputInfo(ptr) -@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes -@ stdcall GetListBoxInfo(long) NtUserGetListBoxInfo -@ stdcall GetMenu(long) -@ stdcall GetMenuBarInfo(long long long ptr) NtUserGetMenuBarInfo -@ stdcall GetMenuCheckMarkDimensions() -@ stdcall GetMenuContextHelpId(long) -@ stdcall GetMenuDefaultItem(long long long) -@ stdcall GetMenuInfo(long ptr) -@ stdcall GetMenuItemCount(long) -@ stdcall GetMenuItemID(long long) -@ stdcall GetMenuItemInfoA(long long long ptr) -@ stdcall GetMenuItemInfoW(long long long ptr) -@ stdcall GetMenuItemRect(long long long ptr) NtUserGetMenuItemRect -@ stdcall GetMenuState(long long long) -@ stdcall GetMenuStringA(long long ptr long long) -@ stdcall GetMenuStringW(long long ptr long long) -@ stdcall GetMessageA(ptr long long long) -@ stdcall GetMessageExtraInfo() -@ stdcall GetMessagePos() -@ stdcall GetMessageTime() -@ stdcall GetMessageW(ptr long long long) -@ stdcall GetMonitorInfoA(long ptr) -@ stdcall GetMonitorInfoW(long ptr) -@ stdcall GetMouseMovePointsEx(long ptr ptr long long) NtUserGetMouseMovePointsEx -@ stdcall GetNextDlgGroupItem(long long long) -@ stdcall GetNextDlgTabItem(long long long) -@ stdcall GetOpenClipboardWindow() NtUserGetOpenClipboardWindow -@ stdcall GetParent(long) -@ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat -@ stdcall GetProcessDefaultLayout(ptr) -@ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation -@ stdcall GetProgmanWindow () -@ stdcall GetPropA(long str) -@ stdcall GetPropW(long wstr) -@ stdcall GetQueueStatus(long) -@ stdcall GetRawInputBuffer(ptr ptr long) -@ stdcall GetRawInputData(ptr long ptr ptr long) -@ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) -@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) -@ stdcall GetRawInputDeviceList(ptr ptr long) -@ stub GetReasonTitleFromReasonCode -@ stdcall GetRegisteredRawInputDevices(ptr ptr long) -@ stdcall GetScrollBarInfo(long long ptr) NtUserGetScrollBarInfo -@ stdcall GetScrollInfo(long long ptr) -@ stdcall GetScrollPos(long long) -@ stdcall GetScrollRange(long long ptr ptr) -@ stdcall GetShellWindow() -@ stdcall GetSubMenu(long long) -@ stdcall GetSysColor(long) -@ stdcall GetSysColorBrush(long) -@ stdcall GetSystemMenu(long long) ; Direct call NtUserGetSystemMenu -@ stdcall GetSystemMetrics(long) -@ stdcall GetTabbedTextExtentA(long str long long ptr) -@ stdcall GetTabbedTextExtentW(long wstr long long ptr) -@ stdcall GetTaskmanWindow () -@ stdcall GetThreadDesktop(long) -@ stdcall GetTitleBarInfo(long ptr) NtUserGetTitleBarInfo -@ stdcall GetTopWindow(long) -@ stdcall GetUpdateRect(long ptr long) -@ stdcall GetUpdateRgn(long long long) -@ stdcall GetUserObjectInformationA(long long ptr long ptr) -@ stdcall GetUserObjectInformationW(long long ptr long ptr) NtUserGetObjectInformation -@ stdcall GetUserObjectSecurity (long ptr ptr long ptr) -; @ stub GetWinStationInfo -@ stdcall GetWindow(long long) -@ stdcall GetWindowContextHelpId(long) -@ stdcall GetWindowDC(long) NtUserGetWindowDC -@ stdcall GetWindowInfo(long ptr) -@ stdcall GetWindowLongA(long long) -#ifdef _WIN64 -@ stdcall GetWindowLongPtrA(ptr long) -@ stdcall GetWindowLongPtrW(ptr long) -#endif -@ stdcall GetWindowLongW(long long) -@ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA -@ stdcall GetWindowModuleFileNameA(long ptr long) -@ stdcall GetWindowModuleFileNameW(long ptr long) -@ stdcall GetWindowPlacement(long ptr) NtUserGetWindowPlacement -@ stdcall GetWindowRect(long ptr) -@ stdcall GetWindowRgn(long long) -@ stdcall GetWindowRgnBox(long ptr) -@ stdcall GetWindowTextA(long ptr long) -@ stdcall GetWindowTextLengthA(long) -@ stdcall GetWindowTextLengthW(long) -@ stdcall GetWindowTextW(long ptr long) -@ stdcall GetWindowThreadProcessId(long ptr) -@ stdcall GetWindowWord(long long) -@ stdcall GrayStringA(long long ptr long long long long long long) -@ stdcall GrayStringW(long long ptr long long long long long long) -@ stdcall HideCaret(long) NtUserHideCaret -@ stdcall HiliteMenuItem(long long long long) NtUserHiliteMenuItem -@ stdcall IMPGetIMEA(long ptr) -@ stdcall IMPGetIMEW(long ptr) -@ stdcall IMPQueryIMEA(ptr) -@ stdcall IMPQueryIMEW(ptr) -@ stdcall IMPSetIMEA(long ptr) -@ stdcall IMPSetIMEW(long ptr) -@ stdcall ImpersonateDdeClientWindow(long long) ; Direct call NtUserImpersonateDdeClientWindow -@ stdcall InSendMessage() -@ stdcall InSendMessageEx(ptr) -@ stdcall InflateRect(ptr long long) -@ stdcall InitializeLpkHooks(ptr) -@ stub InitializeWin32EntryTable -@ stdcall InsertMenuA(long long long long ptr) -@ stdcall InsertMenuItemA(long long long ptr) -@ stdcall InsertMenuItemW(long long long ptr) -@ stdcall InsertMenuW(long long long long ptr) -@ stdcall InternalGetWindowText(long long long) -@ stdcall IntersectRect(ptr ptr ptr) -@ stdcall InvalidateRect(long ptr long) NtUserInvalidateRect -@ stdcall InvalidateRgn(long long long) NtUserInvalidateRgn -@ stdcall InvertRect(long ptr) -@ stdcall IsCharAlphaA(long) -@ stdcall IsCharAlphaNumericA(long) -@ stdcall IsCharAlphaNumericW(long) -@ stdcall IsCharAlphaW(long) -@ stdcall IsCharLowerA(long) -@ stdcall IsCharLowerW(long) -@ stdcall IsCharUpperA(long) -@ stdcall IsCharUpperW(long) -@ stdcall IsChild(long long) -@ stdcall IsClipboardFormatAvailable(long) NtUserIsClipboardFormatAvailable -@ stdcall IsDialogMessage(long ptr) IsDialogMessageA -@ stdcall IsDialogMessageA(long ptr) -@ stdcall IsDialogMessageW(long ptr) -@ stdcall IsDlgButtonChecked(long long) -@ stdcall IsGUIThread(long) -@ stdcall IsHungAppWindow(long) -@ stdcall IsIconic(long) -@ stdcall IsMenu(long) -@ stub IsProcess16Bit -@ stdcall IsRectEmpty(ptr) -@ stub IsSETEnabled -@ stdcall IsServerSideWindow(long) -@ stdcall IsWinEventHookInstalled(long) -@ stdcall IsWindow(long) -@ stdcall IsWindowEnabled(long) -@ stdcall IsWindowInDestroy(long) -@ stdcall IsWindowUnicode(long) -@ stdcall IsWindowVisible(long) -@ stub IsWow64Message -@ stdcall IsZoomed(long) -@ stdcall KillSystemTimer(long long) -@ stdcall KillTimer(long long) NtUserKillTimer -@ stdcall LoadAcceleratorsA(long str) -@ stdcall LoadAcceleratorsW(long wstr) -@ stdcall LoadBitmapA(long str) -@ stdcall LoadBitmapW(long wstr) -@ stdcall LoadCursorA(long str) -@ stdcall LoadCursorFromFileA(str) -@ stdcall LoadCursorFromFileW(wstr) -@ stdcall LoadCursorW(long wstr) -@ stdcall LoadIconA(long str) -@ stdcall LoadIconW(long wstr) -@ stdcall LoadImageA(long str long long long long) -@ stdcall LoadImageW(long wstr long long long long) -@ stdcall LoadKeyboardLayoutA(str long) -@ stub LoadKeyboardLayoutEx -@ stdcall LoadKeyboardLayoutW(wstr long) -@ stdcall LoadLocalFonts() -@ stdcall LoadMenuA(long str) -@ stdcall LoadMenuIndirectA(ptr) -@ stdcall LoadMenuIndirectW(ptr) -@ stdcall LoadMenuW(long wstr) -@ stdcall LoadRemoteFonts() -@ stdcall LoadStringA(long long ptr long) -@ stdcall LoadStringW(long long ptr long) -@ stdcall LockSetForegroundWindow (long) -@ stdcall LockWindowStation(long) NtUserLockWindowStation -@ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate -@ stdcall LockWorkStation() NtUserLockWorkStation -@ stdcall LookupIconIdFromDirectory(ptr long) -@ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) -@ stdcall MBToWCSEx(long str long wstr long long) -@ stdcall MB_GetString(ptr) -@ stdcall MapDialogRect(long ptr) -@ stdcall MapVirtualKeyA(long long) -@ stdcall MapVirtualKeyExA(long long long) -@ stdcall MapVirtualKeyExW(long long long) -@ stdcall MapVirtualKeyW(long long) -@ stdcall MapWindowPoints(long long ptr long) -@ stdcall MenuItemFromPoint(long long double) ; Direct call NtUserMenuItemFromPoint -@ stdcall MenuWindowProcA (long ptr long long long) -@ stdcall MenuWindowProcW (long ptr long long long) -@ stdcall MessageBeep(long) -@ stdcall MessageBoxA(long str str long) -@ stdcall MessageBoxExA(long str str long long) -@ stdcall MessageBoxExW(long wstr wstr long long) -@ stdcall MessageBoxIndirectA(ptr) -@ stdcall MessageBoxIndirectW(ptr) -@ stub MessageBoxTimeoutA -@ stub MessageBoxTimeoutW -@ stdcall MessageBoxW(long wstr wstr long) -@ stdcall ModifyMenuA(long long long long ptr) -@ stdcall ModifyMenuW(long long long long ptr) -@ stdcall MonitorFromPoint(double long) -@ stdcall MonitorFromRect(ptr long) -@ stdcall MonitorFromWindow(long long) -@ stdcall MoveWindow(long long long long long long) NtUserMoveWindow -@ stdcall MsgWaitForMultipleObjects(long ptr long long long) -@ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) -@ stdcall NotifyWinEvent(long long long long) -@ stdcall OemKeyScan(long) -@ stdcall OemToCharA(ptr ptr) -@ stdcall OemToCharBuffA(ptr ptr long) -@ stdcall OemToCharBuffW(ptr ptr long) -@ stdcall OemToCharW(ptr ptr) -@ stdcall OffsetRect(ptr long long) -@ stdcall OpenClipboard(long) -@ stdcall OpenDesktopA(str long long long) -@ stdcall OpenDesktopW(wstr long long long) -@ stdcall OpenIcon(long) -@ stdcall OpenInputDesktop(long long long) NtUserOpenInputDesktop -@ stdcall OpenWindowStationA(str long long) -@ stdcall OpenWindowStationW(wstr long long) -@ stdcall PackDDElParam(long long long) -@ stdcall PaintDesktop(long) NtUserPaintDesktop -@ stub PaintMenuBar -@ stdcall PeekMessageA(ptr long long long long) -@ stdcall PeekMessageW(ptr long long long long) -@ stdcall PostMessageA(long long long long) -@ stdcall PostMessageW(long long long long) -@ stdcall PostQuitMessage(long) -@ stdcall PostThreadMessageA(long long long long) -@ stdcall PostThreadMessageW(long long long long) -; @ stub PrintWindow -@ stdcall PrivateExtractIconExA(str long ptr ptr long) -@ stdcall PrivateExtractIconExW(wstr long ptr ptr long) -@ stdcall PrivateExtractIconsA(str long long long ptr ptr long long) -@ stdcall PrivateExtractIconsW(wstr long long long ptr ptr long long) -@ stdcall PtInRect(ptr double) -@ stdcall QuerySendMessage(ptr) NtUserQuerySendMessage -@ stdcall RealChildWindowFromPoint(long double) ; Direct call NtUserRealChildWindowFromPoint -@ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA -@ stdcall RealGetWindowClassA(long ptr long) -@ stdcall RealGetWindowClassW(long ptr long) -@ stub ReasonCodeNeedsBugID -@ stub ReasonCodeNeedsComment -@ stub RecordShutdownReason -@ stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow -@ stdcall RegisterClassA(ptr) -@ stdcall RegisterClassExA(ptr) -@ stdcall RegisterClassExW(ptr) -@ stdcall RegisterClassW(ptr) -@ stdcall RegisterClipboardFormatA(str) -@ stdcall RegisterClipboardFormatW(wstr) -@ stdcall RegisterDeviceNotificationA(long ptr long) RegisterDeviceNotificationW -@ stdcall RegisterDeviceNotificationW(long ptr long) -@ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey -@ stdcall RegisterLogonProcess(long long) -@ stub RegisterMessagePumpHook -@ stdcall RegisterRawInputDevices(ptr long long) -@ stdcall RegisterServicesProcess(long) -@ stdcall RegisterShellHookWindow(long) -@ stdcall RegisterSystemThread(long long) -@ stdcall RegisterTasklist(long) NtUserRegisterTasklist -@ stdcall RegisterUserApiHook(ptr) -@ stdcall RegisterWindowMessageA(str) -@ stdcall RegisterWindowMessageW(wstr) -@ stdcall ReleaseCapture() -@ stdcall ReleaseDC(long long) -@ stdcall RemoveMenu(long long long) NtUserRemoveMenu -@ stdcall RemovePropA(long str) -@ stdcall RemovePropW(long wstr) -@ stdcall ReplyMessage(long) -; @ stub ResolveDesktopForWOW -@ stdcall ReuseDDElParam(long long long long long) -@ stdcall ScreenToClient(long ptr) -@ stdcall ScrollChildren(long long long long) -@ stdcall ScrollDC(long long long ptr ptr long ptr) -@ stdcall ScrollWindow(long long long ptr ptr) -@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) -@ stdcall SendDlgItemMessageA(long long long long long) -@ stdcall SendDlgItemMessageW(long long long long long) -@ stdcall SendIMEMessageExA(long long) -@ stdcall SendIMEMessageExW(long long) -@ stdcall SendInput(long ptr long) NtUserSendInput -@ stdcall SendMessageA(long long long long) -@ stdcall SendMessageCallbackA(long long long long ptr long) -@ stdcall SendMessageCallbackW(long long long long ptr long) -@ stdcall SendMessageTimeoutA(long long long long long long ptr) -@ stdcall SendMessageTimeoutW(long long long long long long ptr) -@ stdcall SendMessageW(long long long long) -@ stdcall SendNotifyMessageA(long long long long) -@ stdcall SendNotifyMessageW(long long long long) -@ stdcall SetActiveWindow(long) NtUserSetActiveWindow -@ stdcall SetCapture(long) NtUserSetCapture -@ stdcall SetCaretBlinkTime(long) -@ stdcall SetCaretPos(long long) -@ stdcall SetClassLongA(long long long) -#ifdef _WIN64 -@ stdcall SetClassLongPtrA(ptr long ptr) -@ stdcall SetClassLongPtrW(ptr long ptr) -#endif -@ stdcall SetClassLongW(long long long) -@ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord -@ stdcall SetClipboardData(long long) -@ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer -@ stub SetConsoleReserveKeys -@ stdcall SetCursor(long) NtUserSetCursor -@ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents -@ stdcall SetCursorPos(long long) -@ stdcall SetDebugErrorLevel(long) -@ stdcall SetDeskWallpaper(ptr) -@ stdcall SetDlgItemInt(long long long long) -@ stdcall SetDlgItemTextA(long long str) -@ stdcall SetDlgItemTextW(long long wstr) -@ stdcall SetDoubleClickTime(long) -@ stdcall SetFocus(long) NtUserSetFocus -@ stdcall SetForegroundWindow(long) -@ stdcall SetInternalWindowPos(long long ptr ptr) NtUserSetInternalWindowPos -@ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState -@ stdcall SetLastErrorEx(long long) -@ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes -@ stdcall SetLogonNotifyWindow(long long) ; Direct call NtUserSetLogonNotifyWindow -@ stdcall SetMenu(long long) -@ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId -@ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem -@ stdcall SetMenuInfo(long ptr) -@ stdcall SetMenuItemBitmaps(long long long long long) -@ stdcall SetMenuItemInfoA(long long long ptr) -@ stdcall SetMenuItemInfoW(long long long ptr) -@ stdcall SetMessageExtraInfo(long) -@ stdcall SetMessageQueue(long) -@ stdcall SetParent(long long) NtUserSetParent -@ stdcall SetProcessDefaultLayout(long) -@ stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation -@ stdcall SetProgmanWindow (long) -@ stdcall SetPropA(long str long) -@ stdcall SetPropW(long wstr long) -@ stdcall SetRect(ptr long long long long) -@ stdcall SetRectEmpty(ptr) -@ stdcall SetScrollInfo(long long ptr long) ; Direct call NtUserSetScrollInfo -@ stdcall SetScrollPos(long long long long) -@ stdcall SetScrollRange(long long long long long) -@ stdcall SetShellWindow(long) -@ stdcall SetShellWindowEx(long long) NtUserSetShellWindowEx -@ stdcall SetSysColors(long ptr ptr) -@ stdcall SetSysColorsTemp(ptr ptr long) -@ stdcall SetSystemCursor(long long) -@ stdcall SetSystemMenu(long long) ; Direct call NtUserSetSystemMenu -@ stdcall SetSystemTimer(long long long ptr) NtUserSetSystemTimer -@ stdcall SetTaskmanWindow (long) -@ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop -@ stdcall SetTimer(long long long ptr) NtUserSetTimer -@ stdcall SetUserObjectInformationA(long long ptr long) NtUserSetObjectInformation -@ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation -@ stdcall SetUserObjectSecurity(long ptr ptr) -@ stdcall SetWinEventHook(long long long ptr long long long) -@ stdcall SetWindowContextHelpId(long long) -@ stdcall SetWindowLongA(long long long) -#ifdef _WIN64 -@ stdcall SetWindowLongPtrA(ptr long ptr) -@ stdcall SetWindowLongPtrW(ptr long ptr) -#endif -@ stdcall SetWindowLongW(long long long) -@ stdcall SetWindowPlacement(long ptr) NtUserSetWindowPlacement -@ stdcall SetWindowPos(long long long long long long long) NtUserSetWindowPos -@ stdcall SetWindowRgn(long long long) -@ stdcall SetWindowStationUser(long long long long) -@ stdcall SetWindowTextA(long str) -@ stdcall SetWindowTextW(long wstr) -@ stdcall SetWindowWord(long long long) ; Direct call NtUserSetWindowWord -@ stdcall SetWindowsHookA(long ptr) -@ stdcall SetWindowsHookExA(long long long long) -@ stdcall SetWindowsHookExW(long long long long) -@ stdcall SetWindowsHookW(long ptr) -@ stdcall ShowCaret(long) NtUserShowCaret -@ stdcall ShowCursor(long) -@ stdcall ShowOwnedPopups(long long) -@ stdcall ShowScrollBar(long long long) NtUserShowScrollBar -@ stdcall ShowStartGlass(long) -@ stdcall ShowWindow(long long) NtUserShowWindow -@ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync -@ stub SoftModalMessageBox -@ stdcall SubtractRect(ptr ptr ptr) -@ stdcall SwapMouseButton(long) -@ stdcall SwitchDesktop(long) NtUserSwitchDesktop -@ stdcall SwitchToThisWindow(long long) -@ stdcall SystemParametersInfoA(long long ptr long) -@ stdcall SystemParametersInfoW(long long ptr long) -@ stdcall TabbedTextOutA(long long long str long long ptr long) -@ stdcall TabbedTextOutW(long long long wstr long long ptr long) -@ stdcall TileChildWindows(long long) -@ stdcall TileWindows(long long ptr long ptr) -@ stdcall ToAscii(long long ptr ptr long) -@ stdcall ToAsciiEx(long long ptr ptr long long) -@ stdcall ToUnicode(long long ptr ptr long long) -@ stdcall ToUnicodeEx(long long ptr ptr long long long) -@ stdcall TrackMouseEvent(ptr) ; Direct call NtUserTrackMouseEvent -@ stdcall TrackPopupMenu(long long long long long long ptr) -@ stdcall TrackPopupMenuEx(long long long long long ptr) ; Direct call NtUserTrackPopupMenuEx -@ stdcall TranslateAccelerator(long long ptr) TranslateAcceleratorA -@ stdcall TranslateAcceleratorA(long long ptr) -@ stdcall TranslateAcceleratorW(long long ptr) -@ stdcall TranslateMDISysAccel(long ptr) -@ stdcall TranslateMessage(ptr) -@ stub TranslateMessageEx -@ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent -@ stdcall UnhookWindowsHook(long ptr) -@ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx -@ stdcall UnionRect(ptr ptr ptr) -@ stdcall UnloadKeyboardLayout(long) NtUserUnloadKeyboardLayout -@ stdcall UnlockWindowStation(long) NtUserUnlockWindowStation -@ stdcall UnpackDDElParam(long long ptr ptr) -@ stdcall UnregisterClassA(str long) -@ stdcall UnregisterClassW(wstr long) -@ stdcall UnregisterDeviceNotification(long) -@ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey -@ stub UnregisterMessagePumpHook -@ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook -@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) -@ stdcall UpdateLayeredWindowIndirect(long ptr) -@ stdcall UpdatePerUserSystemParameters(long long) -@ stdcall UpdateWindow(long) -@ stdcall User32InitializeImmEntryTable(ptr) -@ stdcall UserClientDllInitialize(long long ptr) DllMain -@ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess -@ stub UserLpkPSMTextOut -@ stub UserLpkTabbedTextOut -@ stdcall UserRealizePalette(long) -@ stdcall UserRegisterWowHandlers(ptr ptr) -@ stdcall ValidateRect(long ptr) NtUserValidateRect -@ stdcall ValidateRgn(long long) -@ stdcall VkKeyScanA(long) -@ stdcall VkKeyScanExA(long long) -@ stdcall VkKeyScanExW(long long) -@ stdcall VkKeyScanW(long) -@ stdcall WCSToMBEx(long wstr long str long long) -@ stdcall WINNLSEnableIME(long long) -@ stdcall WINNLSGetEnableStatus(long) -@ stdcall WINNLSGetIMEHotkey(long) -@ stdcall WaitForInputIdle(long long) -@ stdcall WaitMessage() NtUserWaitMessage -@ stub Win32PoolAllocationStats -@ stdcall WinHelpA(long str long long) -@ stdcall WinHelpW(long wstr long long) -@ stdcall WindowFromDC(long) -@ stdcall WindowFromPoint(double) -@ stdcall WindowFromPhysicalPoint(double) NtUserWindowFromPhysicalPoint -@ stdcall keybd_event(long long long long) -@ stdcall mouse_event(long long long long long) -@ varargs wsprintfA(str str) -@ varargs wsprintfW(wstr wstr) -@ stdcall wvsprintfA(ptr str ptr) -@ stdcall wvsprintfW(ptr wstr ptr) - -; Functions exported by Win Vista -@ stdcall SetProcessDPIAware() - -; Unknown and undocumented functions -; @ stdcall CalcChildScroll(long long) -; @ stdcall CharNextExW(long wstr long) -; @ stdcall CharPrevExW(long wstr wstr long) -; @ stub ClientThreadConnect -; @ stub EnumDisplayDeviceModesA ;(str long ptr long) -; @ stub EnumDisplayDeviceModesW ;(wstr long ptr long) -; @ stdcall GetMenuIndex(ptr ptr) -; @ stub GetNextQueueWindow -; @ stub HasSystemSleepStarted -; @ stub InitSharedTable -; @ stub InitTask -; @ stub IsHungThread -; @ stub ModifyAccess -; @ stub PlaySoundEvent -; @ stub PrivateSetDbgTag -; @ stub PrivateSetRipFlags -; @ stub QueryUserCounters # Direct call NtUserQueryUserCounters -; @ stub RegisterNetworkCapabilities -; @ stub ResetDisplay -; @ stub ServerSetFunctionPointers -; @ stub SetDesktopBitmap -; @ stub SetWindowFullScreenState -; @ stdcall SetWindowText(long str) SetWindowTextA -; @ stub SysErrorBox -; @ stub UserIsSystemResumeAutomatic -; @ stub UserSetDeviceHoldState -; @ stdcall UserSignalProc(long long long long) -; @ stub VRipOutput -; @ stub VTagOutput -; @ stub WNDPROC_CALLBACK -; @ stub WinOldAppHackoMatic -; @ stub YieldTask -; @ stub _SetProcessDefaultLayout Copied: branches/cmake-bringup/dll/win32/user32/user32.spec (from r49461, branches/cmake-bringup/dll/win32/user32/user32.pspec) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.spec [iso-8859-1] Fri Nov 5 13:14:37 2010 @@ -250,10 +250,8 @@ @ stdcall GetClassInfoExW(long wstr ptr) @ stdcall GetClassInfoW(long wstr ptr) @ stdcall GetClassLongA(long long) -#ifdef _WIN64 -@ stdcall GetClassLongPtrA(ptr long) -@ stdcall GetClassLongPtrW(ptr long) -#endif +@ stdcall -arch=x86_64 GetClassLongPtrA(ptr long) +@ stdcall -arch=x86_64 GetClassLongPtrW(ptr long) @ stdcall GetClassLongW(long long) @ stdcall GetClassNameA(long ptr long) @ stdcall GetClassNameW(long ptr long) @@ -370,10 +368,8 @@ @ stdcall GetWindowDC(long) NtUserGetWindowDC @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) -#ifdef _WIN64 -@ stdcall GetWindowLongPtrA(ptr long) -@ stdcall GetWindowLongPtrW(ptr long) -#endif +@ stdcall -arch=x86_64 GetWindowLongPtrA(ptr long) +@ stdcall -arch=x86_64 GetWindowLongPtrW(ptr long) @ stdcall GetWindowLongW(long long) @ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA @ stdcall GetWindowModuleFileNameA(long ptr long) @@ -591,10 +587,8 @@ @ stdcall SetCaretBlinkTime(long) @ stdcall SetCaretPos(long long) @ stdcall SetClassLongA(long long long) -#ifdef _WIN64 -@ stdcall SetClassLongPtrA(ptr long ptr) -@ stdcall SetClassLongPtrW(ptr long ptr) -#endif +@ stdcall -arch=x86_64 SetClassLongPtrA(ptr long ptr) +@ stdcall -arch=x86_64 SetClassLongPtrW(ptr long ptr) @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord @ stdcall SetClipboardData(long long) @@ -652,10 +646,8 @@ @ stdcall SetWinEventHook(long long long ptr long long long) @ stdcall SetWindowContextHelpId(long long) @ stdcall SetWindowLongA(long long long) -#ifdef _WIN64 -@ stdcall SetWindowLongPtrA(ptr long ptr) -@ stdcall SetWindowLongPtrW(ptr long ptr) -#endif +@ stdcall -arch=x86_64 SetWindowLongPtrA(ptr long ptr) +@ stdcall -arch=x86_64 SetWindowLongPtrW(ptr long ptr) @ stdcall SetWindowLongW(long long long) @ stdcall SetWindowPlacement(long ptr) NtUserSetWindowPlacement @ stdcall SetWindowPos(long long long long long long long) NtUserSetWindowPos

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