Sync with trunk r58151 to bring the latest changes from Amine and Timo.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 9 Jan 2013 20:12:23 +0000 (20:12 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 9 Jan 2013 20:12:23 +0000 (20:12 +0000)
svn path=/branches/ros-csrss/; revision=58152

180 files changed:
1  2 
base/applications/fontview/lang/ro-RO.rc
base/applications/mscutils/devmgmt/lang/ro-RO.rc
base/applications/rapps/rapps/7zip.txt
base/applications/rapps/rapps/abiword.txt
base/applications/rapps/rapps/abiword28x.txt
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/ac97forvirtualbox.txt
base/applications/rapps/rapps/audiograbber.txt
base/applications/rapps/rapps/bittorrent.txt
base/applications/rapps/rapps/cnt.txt
base/applications/rapps/rapps/comctl32ocx.txt
base/applications/rapps/rapps/diablo2.txt
base/applications/rapps/rapps/dosblaster.txt
base/applications/rapps/rapps/dosbox.txt
base/applications/rapps/rapps/doublecommander.txt
base/applications/rapps/rapps/fap.txt
base/applications/rapps/rapps/firefox2.txt
base/applications/rapps/rapps/firefox3.txt
base/applications/rapps/rapps/firefox36.txt
base/applications/rapps/rapps/firefox5.txt
base/applications/rapps/rapps/freebasic.txt
base/applications/rapps/rapps/glidewrapzbag.txt
base/applications/rapps/rapps/irfanview.txt
base/applications/rapps/rapps/irfanviewplugins.txt
base/applications/rapps/rapps/kdewin.txt
base/applications/rapps/rapps/lbreakout2.txt
base/applications/rapps/rapps/lgeneral.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/lmarbles.txt
base/applications/rapps/rapps/mfc40.txt
base/applications/rapps/rapps/mirandaim.txt
base/applications/rapps/rapps/mirc.txt
base/applications/rapps/rapps/mirc6.txt
base/applications/rapps/rapps/mono2.txt
base/applications/rapps/rapps/mpc.txt
base/applications/rapps/rapps/msxml3.txt
base/applications/rapps/rapps/net11.txt
base/applications/rapps/rapps/net20.txt
base/applications/rapps/rapps/net20sp2.txt
base/applications/rapps/rapps/offbyone.txt
base/applications/rapps/rapps/openoffice2.4.txt
base/applications/rapps/rapps/openoffice3.0.txt
base/applications/rapps/rapps/openttd.txt
base/applications/rapps/rapps/opera.txt
base/applications/rapps/rapps/opera9.txt
base/applications/rapps/rapps/putty.txt
base/applications/rapps/rapps/python.txt
base/applications/rapps/rapps/python3.txt
base/applications/rapps/rapps/remood.txt
base/applications/rapps/rapps/rosbe.txt
base/applications/rapps/rapps/rosbeamd64.txt
base/applications/rapps/rapps/rosbearm.txt
base/applications/rapps/rapps/sambatng.txt
base/applications/rapps/rapps/sbforvmware.txt
base/applications/rapps/rapps/scite.txt
base/applications/rapps/rapps/scummvm.txt
base/applications/rapps/rapps/sdl_mixer.txt
base/applications/rapps/rapps/sdl_runtime.txt
base/applications/rapps/rapps/smplayer.txt
base/applications/rapps/rapps/steam.txt
base/applications/rapps/rapps/sumatrapdf.txt
base/applications/rapps/rapps/superfinder.txt
base/applications/rapps/rapps/tahoma.txt
base/applications/rapps/rapps/thunderbird.txt
base/applications/rapps/rapps/thunderbird5.txt
base/applications/rapps/rapps/tileworld.txt
base/applications/rapps/rapps/totalcommander.txt
base/applications/rapps/rapps/tuxpaint.txt
base/applications/rapps/rapps/ultravnc.txt
base/applications/rapps/rapps/utorrent.txt
base/applications/rapps/rapps/vb5run.txt
base/applications/rapps/rapps/vb6run.txt
base/applications/rapps/rapps/vc2005sp1run.txt
base/applications/rapps/rapps/vc2008sp1run.txt
base/applications/rapps/rapps/vc6run.txt
base/applications/rapps/rapps/vlc.txt
base/applications/rapps/rapps/winboard.txt
base/applications/rapps/rapps/wme9.txt
base/applications/regedit/lang/ro-RO.rc
base/shell/cmd/lang/ja-JP.rc
base/shell/explorer-new/CMakeLists.txt
base/shell/explorer-new/dragdrop.c
base/shell/explorer-new/explorer.c
base/shell/explorer-new/lang/bg-BG.rc
base/shell/explorer-new/lang/cs-CZ.rc
base/shell/explorer-new/lang/de-DE.rc
base/shell/explorer-new/lang/en-US.rc
base/shell/explorer-new/lang/es-ES.rc
base/shell/explorer-new/lang/fr-FR.rc
base/shell/explorer-new/lang/it-IT.rc
base/shell/explorer-new/lang/ja-JP.rc
base/shell/explorer-new/lang/ko-KR.rc
base/shell/explorer-new/lang/lt-LT.rc
base/shell/explorer-new/lang/nl-NL.rc
base/shell/explorer-new/lang/no-NO.rc
base/shell/explorer-new/lang/pl-PL.rc
base/shell/explorer-new/lang/pt-BR.rc
base/shell/explorer-new/lang/ro-RO.rc
base/shell/explorer-new/lang/ru-RU.rc
base/shell/explorer-new/lang/sk-SK.rc
base/shell/explorer-new/lang/uk-UA.rc
base/shell/explorer-new/lang/zh-CN.rc
base/shell/explorer-new/precomp.h
base/shell/explorer-new/settings.c
base/shell/explorer-new/startmnu.c
base/shell/explorer-new/taskband.c
base/shell/explorer-new/taskswnd.c
base/shell/explorer-new/trayntfy.c
base/shell/explorer-new/trayprop.c
base/shell/explorer-new/traywnd.c
base/system/diskpart/lang/ro-RO.rc
boot/freeldr/freeldr/CMakeLists.txt
cmake/CMakeMacros.cmake
cmake/gcc.cmake
cmake/msvc.cmake
dll/cpl/desk/lang/pl-PL.rc
dll/cpl/input/lang/pl-PL.rc
dll/cpl/timedate/dateandtime.c
dll/ntdll/CMakeLists.txt
dll/win32/kernel32/CMakeLists.txt
dll/win32/kernel32/client/path.c
dll/win32/kernel32/client/thread.c
dll/win32/msgina/resources/reactos.bmp
dll/win32/msgina/resources/reactos.svg
dll/win32/netapi32/user.c
dll/win32/oleaut32/CMakeLists.txt
dll/win32/rpcrt4/CMakeLists.txt
dll/win32/samsrv/samrpc.c
dll/win32/samsrv/setup.c
dll/win32/shdocvw/CMakeLists.txt
drivers/CMakeLists.txt
drivers/base/bootvid/i386/vga.c
drivers/base/bootvid/precomp.h
drivers/ksfilter/ks/CMakeLists.txt
drivers/storage/class/ramdisk/ramdisk.c
drivers/storage/ide/uniata/atapi.h
drivers/storage/ide/uniata/id_ata.cpp
hal/CMakeLists.txt
hal/halx86/CMakeLists.txt
include/psdk/lmaccess.h
include/psdk/sal.h
include/reactos/debug.h
include/reactos/version.cmake
lib/cmlib/hivecell.c
lib/pseh/CMakeLists.txt
lib/rtl/CMakeLists.txt
lib/rtl/timezone.c
lib/sdk/crt/CMakeLists.txt
lib/sdk/crt/crt.cmake
lib/sdk/crt/include/internal/misc.h
lib/sdk/crt/libcntpr.cmake
lib/sdk/crt/misc/__crt_MessageBoxA.c
lib/sdk/crt/misc/assert.c
lib/sdk/crt/msvcrtex.cmake
lib/sdk/crt/oldnames.cmake
lib/sdk/crt/precomp.h
lib/sdk/crt/stdlib/_set_abort_behavior.c
lib/sdk/crt/stdlib/abort.c
ntoskrnl/CMakeLists.txt
ntoskrnl/cache/cachesub.c
ntoskrnl/cache/copysup.c
ntoskrnl/cache/fssup.c
ntoskrnl/cache/logsup.c
ntoskrnl/inbv/logo/1.bmp
ntoskrnl/include/internal/i386/ke.h
ntoskrnl/io/iomgr/irp.c
ntoskrnl/io/pnpmgr/pnpmgr.c
ntoskrnl/kd64/amd64/kdx64.c
ntoskrnl/kd64/arm/kdarm.c
ntoskrnl/ke/dpc.c
ntoskrnl/ke/i386/context.c
ntoskrnl/ke/i386/traphdlr.c
ntoskrnl/mm/ARM3/arm/init.c
ntoskrnl/mm/ARM3/largepag.c
ntoskrnl/mm/ARM3/sysldr.c
ntoskrnl/mm/arm/page.c
ntoskrnl/mm/arm/stubs.c
ntoskrnl/po/povolume.c
win32ss/CMakeLists.txt
win32ss/gdi/ntgdi/dibobj.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmake/gcc.cmake
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 85ffc2a,0000000..92fde07
mode 100644,000000..100644
--- /dev/null
@@@ -1,98 -1,0 +1,99 @@@
-     list(APPEND SOURCE
 +
 +add_definitions(-D_KERNEL32_)
 +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 +spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB)
 +
 +list(APPEND SOURCE
 +    client/appcache.c
 +    client/atom.c
 +    client/compname.c
 +    client/debugger.c
 +    client/dosdev.c
 +    client/dllmain.c
 +    client/environ.c
 +    client/except.c
 +    client/fiber.c
 +    client/handle.c
 +    client/heapmem.c
 +    client/job.c
 +    client/loader.c
 +    client/path.c
 +    client/perfcnt.c
 +    client/power.c
 +    client/proc.c
 +    client/resntfy.c
 +    client/session.c
 +    client/synch.c
 +    client/sysinfo.c
 +    client/time.c
 +    client/timerqueue.c
 +    client/toolhelp.c
 +    client/utils.c
 +    client/thread.c
 +    client/vdm.c
 +    client/version.c
 +    client/virtmem.c
 +    client/vista.c
 +    client/console/alias.c
 +    client/console/console.c
 +    client/console/history.c
 +    client/console/readwrite.c
 +    client/console/vista.c
 +    client/file/backup.c
 +    client/file/cnotify.c
 +    client/file/copy.c
 +    client/file/create.c
 +    client/file/delete.c
 +    client/file/deviceio.c
 +    client/file/dir.c
 +    client/file/fileinfo.c
 +    client/file/filemap.c
 +    client/file/filename.c
 +    client/file/find.c
 +    client/file/hardlink.c
 +    client/file/iocompl.c
 +    client/file/lfile.c
 +    client/file/lock.c
 +    client/file/mailslot.c
 +    client/file/move.c
 +    client/file/npipe.c
 +    client/file/rw.c
 +    client/file/tape.c
 +    client/file/volume.c
 +    wine/actctx.c
 +    wine/comm.c
 +    wine/lzexpand.c
 +    wine/muldiv.c
 +    wine/profile.c
 +    wine/res.c
 +    wine/timezone.c
 +    winnls/string/casemap.c
 +    winnls/string/collation.c
 +    winnls/string/fold.c
 +    winnls/string/format_msg.c
 +    winnls/string/lang.c
 +    winnls/string/lcformat.c
 +    winnls/string/lstring.c
 +    winnls/string/nls.c
 +    winnls/string/sortkey.c
 +    kernel32.rc
 +    ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
 +
 +if(ARCH STREQUAL "i386")
-     list(APPEND SOURCE
++    list(APPEND ASM_SOURCE
 +        client/i386/fiber.S
 +        client/i386/thread.S)
 +elseif(ARCH STREQUAL "amd64")
- add_library(kernel32 SHARED ${SOURCE})
++    list(APPEND ASM_SOURCE
 +        client/amd64/fiber.S
 +        client/amd64/thread.S)
 +endif()
 +
++add_asm_files(kernel32_asm ${ASM_SOURCE})
++add_library(kernel32 SHARED ${SOURCE} ${kernel32_asm})
 +set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12)
 +target_link_libraries(kernel32 wine chkstk ${PSEH_LIB})
 +add_importlibs(kernel32 ntdll)
 +add_pch(kernel32 k32.h)
 +add_dependencies(kernel32 psdk errcodes asm)
 +add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all)
Simple merge
Simple merge
index 7fd0563,57637ec..57637ec
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 5d68b17,1262b61..1262b61
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0516dba,0000000..30110dd
mode 100644,000000..100644
--- /dev/null
@@@ -1,239 -1,0 +1,241 @@@
-     win32k.rc)
 +
 +set(USE_DIBLIB FALSE)
 +set(USE_NEW_CURSORICON FALSE)
 +
 +# Give WIN32 subsystem its own project.
 +PROJECT(WIN32SS)
 +
 +add_subdirectory(drivers)
 +
 +if(USE_DIBLIB)
 +    add_subdirectory(gdi/diblib)
 +endif()
 +
 +if(USE_NEW_CURSORICON)
 +    add_definitions(-DNEW_CURSORICON)
 +endif()
 +
 +add_subdirectory(gdi/gdi32)
 +add_subdirectory(reactx)
 +add_subdirectory(user/consrv)
 +add_subdirectory(user/user32)
 +add_subdirectory(user/winsrv)
 +
 +spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
 +
 +include_directories(
 +    .
 +    include
 +    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
 +    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
 +    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
 +    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 +
 +add_definitions(
 +    -DLANGPACK
 +    -D_WIN32K_)
 +
 +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib)
 +
 +list(APPEND GENDIB_FILES
 +    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c)
 +
 +add_custom_command(
 +    OUTPUT ${GENDIB_FILES}
 +    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib
 +    DEPENDS native-gendib)
 +
 +list(APPEND SOURCE
 +    gdi/dib/alphablend.c
 +    gdi/dib/dib1bpp.c
 +    gdi/dib/dib4bpp.c
 +    gdi/dib/dib8bpp.c
 +    gdi/dib/dib16bpp.c
 +    gdi/dib/dib24bpp.c
 +    gdi/dib/dib32bpp.c
 +    gdi/dib/floodfill.c
 +    gdi/dib/stretchblt.c
 +    gdi/eng/alphablend.c
 +    gdi/eng/bitblt.c
 +    gdi/eng/engbrush.c
 +    gdi/eng/engevent.c
 +    gdi/eng/clip.c
 +    gdi/eng/debug.c
 +    gdi/eng/device.c
 +    gdi/eng/driverobj.c
 +    gdi/eng/error.c
 +    gdi/eng/float.c
 +    gdi/eng/gradient.c
 +    gdi/eng/lineto.c
 +    gdi/eng/ldevobj.c
 +    gdi/eng/mapping.c
 +    gdi/eng/math.c
 +    gdi/eng/mem.c
 +    gdi/eng/engmisc.c
 +    gdi/eng/mouse.c
 +    gdi/eng/paint.c
 +    gdi/eng/pdevobj.c
 +    gdi/eng/perfcnt.c
 +    gdi/eng/rlecomp.c
 +    gdi/eng/semaphor.c
 +    gdi/eng/sort.c
 +    gdi/eng/string.c
 +    gdi/eng/stretchblt.c
 +    gdi/eng/surface.c
 +    gdi/eng/transblt.c
 +    gdi/eng/engwindow.c
 +    gdi/eng/xlateobj.c
 +    user/ntuser/main.c
 +    user/ntuser/misc/file.c
 +    user/ntuser/misc/rtlstr.c
 +    user/ntuser/misc/copy.c
 +    user/ntuser/misc/registry.c
 +    reactx/ntddraw/ddraw.c
 +    reactx/ntddraw/dd.c
 +    reactx/ntddraw/ddsurf.c
 +    reactx/ntddraw/d3d.c
 +    reactx/ntddraw/dvp.c
 +    reactx/ntddraw/mocomp.c
 +    reactx/ntddraw/eng.c
 +    reactx/ntddraw/dxeng.c
 +    user/ntuser/accelerator.c
 +    user/ntuser/callback.c
 +    user/ntuser/callproc.c
 +    user/ntuser/caret.c
 +    user/ntuser/class.c
 +    user/ntuser/clipboard.c
 +    user/ntuser/defwnd.c
 +    user/ntuser/desktop.c
 +    user/ntuser/display.c
 +    user/ntuser/event.c
 +    user/ntuser/focus.c
 +    user/ntuser/guicheck.c
 +    user/ntuser/hook.c
 +    user/ntuser/hotkey.c
 +    user/ntuser/input.c
 +    user/ntuser/keyboard.c
 +    user/ntuser/kbdlayout.c
 +    user/ntuser/menu.c
 +    user/ntuser/message.c
 +    user/ntuser/metric.c
 +    user/ntuser/misc.c
 +    user/ntuser/monitor.c
 +    user/ntuser/mouse.c
 +    user/ntuser/msgqueue.c
 +    user/ntuser/ntstubs.c
 +    user/ntuser/ntuser.c
 +    user/ntuser/painting.c
 +    user/ntuser/prop.c
 +    user/ntuser/scrollbar.c
 +    user/ntuser/session.c
 +    user/ntuser/simplecall.c
 +    user/ntuser/sysparams.c
 +    user/ntuser/timer.c
 +    user/ntuser/useratom.c
 +    user/ntuser/usrheap.c
 +    user/ntuser/vis.c
 +    user/ntuser/windc.c
 +    user/ntuser/window.c
 +    user/ntuser/winpos.c
 +    user/ntuser/winsta.c
 +    user/ntuser/object.c
 +    gdi/ntgdi/arc.c
 +    gdi/ntgdi/bezier.c
 +    gdi/ntgdi/bitblt.c
 +    gdi/ntgdi/bitmaps.c
 +    gdi/ntgdi/brush.c
 +    gdi/ntgdi/cliprgn.c
 +    gdi/ntgdi/coord.c
 +    gdi/ntgdi/dcattr.c
 +    gdi/ntgdi/dclife.c
 +    gdi/ntgdi/dcobjs.c
 +    gdi/ntgdi/dcstate.c
 +    gdi/ntgdi/dcutil.c
 +    gdi/ntgdi/device.c
 +    gdi/ntgdi/dibobj.c
 +    gdi/ntgdi/drawing.c
 +    gdi/ntgdi/fillshap.c
 +    gdi/ntgdi/font.c
 +    gdi/ntgdi/freetype.c
 +    gdi/ntgdi/gdibatch.c
 +    gdi/ntgdi/gdidbg.c
 +    gdi/ntgdi/gdiobj.c
 +    gdi/ntgdi/gdipool.c
 +    gdi/ntgdi/icm.c
 +    gdi/ntgdi/line.c
 +    gdi/ntgdi/metafile.c
 +    gdi/ntgdi/palette.c
 +    gdi/ntgdi/path.c
 +    gdi/ntgdi/pen.c
 +    gdi/ntgdi/polyfill.c
 +    gdi/ntgdi/print.c
 +    gdi/ntgdi/rect.c
 +    gdi/ntgdi/region.c
 +    gdi/ntgdi/stockobj.c
 +    gdi/ntgdi/text.c
 +    gdi/ntgdi/wingl.c
 +    gdi/ntgdi/xformobj.c
 +    gdi/eng/stubs.c
 +    gdi/eng/umpdstubs.c
- list(APPEND SOURCE
++    win32k.rc
++    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
 +
 +if(USE_DIBLIB)
 +    add_definitions(-D_USE_DIBLIB_)
 +    list(APPEND SOURCE
 +        gdi/dib/dib_new.c
 +        gdi/eng/bitblt_new.c)
 +else()
 +    list(APPEND SOURCE
 +        gdi/dib/dib.c
 +        gdi/eng/copybits.c
 +        ${GENDIB_FILES})
 +endif()
 +
 +if(USE_NEW_CURSORICON)
 +    list(APPEND SOURCE user/ntuser/cursoricon_new.c)
 +else()
 +    list(APPEND SOURCE user/ntuser/cursoricon.c)
 +endif()
 +
 +if(ARCH STREQUAL "i386")
- add_library(win32k SHARED
-     ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
-     ${SOURCE})
++list(APPEND ASM_SOURCE
 +    gdi/dib/i386/dib24bpp_hline.s
 +    gdi/dib/i386/dib32bpp_hline.s
 +    gdi/dib/i386/dib32bpp_colorfill.s
 +    gdi/eng/i386/floatobj.S)
 +else()
 +list(APPEND SOURCE
 +    gdi/dib/dib24bppc.c
 +    gdi/dib/dib32bppc.c)
 +endif()
 +
 +if(KDBG)
 +    list(APPEND SOURCE
 +        gdi/ntgdi/gdikdbgext.c)
 +endif()
 +
- add_library(win32ksys sys-stubs.S)
++add_asm_files(win32k_asm ${ASM_SOURCE})
++add_library(win32k SHARED ${SOURCE} ${win32k_asm})
 +
 +set_module_type(win32k kernelmodedriver)
 +
 +target_link_libraries(win32k
 +    ${PSEH_LIB}
 +    dxguid
 +    libcntpr)
 +
 +if(USE_DIBLIB)
 +    target_link_libraries(win32k diblib)
 +endif()
 +
 +add_importlibs(win32k ntoskrnl hal ftfd)
 +add_pch(win32k pch.h)
 +add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
 +
 +set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
++add_asm_files(win32ksys_asm sys-stubs.S)
++add_library(win32ksys ${win32ksys_asm})
++set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")
Simple merge