[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 24 Apr 2011 13:44:58 +0000 (13:44 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 24 Apr 2011 13:44:58 +0000 (13:44 +0000)
* Sync with trunk r51445.

svn path=/branches/cmake-bringup/; revision=51446

407 files changed:
1  2 
apistatus.lst
base/applications/CMakeLists.txt
base/applications/cacls/lang/sv-SE.rc
base/applications/cacls/rsrc.rc
base/applications/calc/lang/sv-SE.rc
base/applications/calc/resource.rc
base/applications/charmap/lang/sv-SE.rc
base/applications/charmap/rsrc.rc
base/applications/cmdutils/doskey/doskey.rc
base/applications/cmdutils/doskey/lang/sv-SE.rc
base/applications/cmdutils/more/lang/sv-SE.rc
base/applications/cmdutils/more/rsrc.rc
base/applications/dxdiag/lang/sv-SE.rc
base/applications/dxdiag/rsrc.rc
base/applications/findstr/lang/sv-SE.rc
base/applications/fontview/fontview.rc
base/applications/fontview/lang/sv-SE.rc
base/applications/games/spider/spigame.cpp
base/applications/kbswitch/lang/sv-SE.rc
base/applications/kbswitch/rsrc.rc
base/applications/logoff/lang/sv-SE.rc
base/applications/logoff/rsrc.rc
base/applications/magnify/lang/sv-SE.rc
base/applications/magnify/magnifier.c
base/applications/magnify/rsrc.rc
base/applications/mmc/lang/sv-SE.rc
base/applications/mmc/rsrc.rc
base/applications/mplay32/lang/bg-BG.rc
base/applications/mplay32/lang/cs-CZ.rc
base/applications/mplay32/lang/de-DE.rc
base/applications/mplay32/lang/en-US.rc
base/applications/mplay32/lang/es-ES.rc
base/applications/mplay32/lang/fr-FR.rc
base/applications/mplay32/lang/it-IT.rc
base/applications/mplay32/lang/ja-JP.rc
base/applications/mplay32/lang/nl-NL.rc
base/applications/mplay32/lang/no-NO.rc
base/applications/mplay32/lang/pl-PL.rc
base/applications/mplay32/lang/ru-RU.rc
base/applications/mplay32/lang/sk-SK.rc
base/applications/mplay32/lang/uk-UA.rc
base/applications/mplay32/resource.h
base/applications/mscutils/eventvwr/eventvwr.c
base/applications/mscutils/eventvwr/lang/bg-BG.rc
base/applications/mscutils/eventvwr/lang/de-DE.rc
base/applications/mscutils/eventvwr/lang/el-GR.rc
base/applications/mscutils/eventvwr/lang/en-US.rc
base/applications/mscutils/eventvwr/lang/es-ES.rc
base/applications/mscutils/eventvwr/lang/fr-FR.rc
base/applications/mscutils/eventvwr/lang/it-IT.rc
base/applications/mscutils/eventvwr/lang/ja-JP.rc
base/applications/mscutils/eventvwr/lang/ko-KR.rc
base/applications/mscutils/eventvwr/lang/no-NO.rc
base/applications/mscutils/eventvwr/lang/pl-PL.rc
base/applications/mscutils/eventvwr/lang/ro-RO.rc
base/applications/mscutils/eventvwr/lang/ru-RU.rc
base/applications/mscutils/eventvwr/lang/sk-SK.rc
base/applications/mscutils/eventvwr/lang/uk-UA.rc
base/applications/mscutils/eventvwr/resource.h
base/applications/mspaint/CMakeLists.txt
base/applications/mspaint/definitions.h
base/applications/mspaint/dialogs.c
base/applications/mspaint/dialogs.h
base/applications/mspaint/dib.c
base/applications/mspaint/dib.h
base/applications/mspaint/drawing.c
base/applications/mspaint/drawing.h
base/applications/mspaint/globalvar.h
base/applications/mspaint/help/Paint.chm
base/applications/mspaint/help/Paint.hhp
base/applications/mspaint/help/Table of Contents.hhc
base/applications/mspaint/help/airbrush.png
base/applications/mspaint/help/appwindow.png
base/applications/mspaint/help/bezier.png
base/applications/mspaint/help/brush.png
base/applications/mspaint/help/color.png
base/applications/mspaint/help/ellipse.png
base/applications/mspaint/help/fill.png
base/applications/mspaint/help/freesel.png
base/applications/mspaint/help/line.png
base/applications/mspaint/help/palette.png
base/applications/mspaint/help/pen.png
base/applications/mspaint/help/rect.png
base/applications/mspaint/help/rectsel.png
base/applications/mspaint/help/rrect.png
base/applications/mspaint/help/rubber.png
base/applications/mspaint/help/settings.html
base/applications/mspaint/help/settings1.png
base/applications/mspaint/help/settings2.png
base/applications/mspaint/help/settings3.png
base/applications/mspaint/help/settings4.png
base/applications/mspaint/help/settings5.png
base/applications/mspaint/help/settings6.png
base/applications/mspaint/help/shape.png
base/applications/mspaint/help/text.png
base/applications/mspaint/help/toolbox.png
base/applications/mspaint/help/tools.html
base/applications/mspaint/help/usage.html
base/applications/mspaint/help/zoom.png
base/applications/mspaint/history.c
base/applications/mspaint/history.h
base/applications/mspaint/icons.rc
base/applications/mspaint/icons/airbrush_cur.ico
base/applications/mspaint/icons/color_cur.ico
base/applications/mspaint/icons/fill_cur.ico
base/applications/mspaint/icons/horzstretch.ico
base/applications/mspaint/icons/iconbar.bmp
base/applications/mspaint/icons/nontransparent.ico
base/applications/mspaint/icons/paint.ico
base/applications/mspaint/icons/paint.svg
base/applications/mspaint/icons/pen_cur.ico
base/applications/mspaint/icons/transparency.xcf
base/applications/mspaint/icons/transparent.ico
base/applications/mspaint/icons/vertstretch.ico
base/applications/mspaint/icons/zoom_cur.ico
base/applications/mspaint/lang/bg-BG.rc
base/applications/mspaint/lang/cs-CZ.rc
base/applications/mspaint/lang/de-DE.rc
base/applications/mspaint/lang/en-GB.rc
base/applications/mspaint/lang/en-US.rc
base/applications/mspaint/lang/es-ES.rc
base/applications/mspaint/lang/eu-ES.rc
base/applications/mspaint/lang/fr-FR.rc
base/applications/mspaint/lang/hu-HU.rc
base/applications/mspaint/lang/it-IT.rc
base/applications/mspaint/lang/ja-JP.rc
base/applications/mspaint/lang/nl-NL.rc
base/applications/mspaint/lang/no-NO.rc
base/applications/mspaint/lang/pl-PL.rc
base/applications/mspaint/lang/pt-BR.rc
base/applications/mspaint/lang/pt-PT.rc
base/applications/mspaint/lang/ro-RO.rc
base/applications/mspaint/lang/ru-RU.rc
base/applications/mspaint/lang/sk-SK.rc
base/applications/mspaint/lang/uk-UA.rc
base/applications/mspaint/main.c
base/applications/mspaint/mouse.c
base/applications/mspaint/mouse.h
base/applications/mspaint/mspaint.exe.amd64.manifest
base/applications/mspaint/mspaint.exe.manifest
base/applications/mspaint/mspaint.rbuild
base/applications/mspaint/palette.c
base/applications/mspaint/palette.h
base/applications/mspaint/registry.c
base/applications/mspaint/registry.h
base/applications/mspaint/rsrc.rc
base/applications/mspaint/selection.c
base/applications/mspaint/selection.h
base/applications/mspaint/sizebox.c
base/applications/mspaint/sizebox.h
base/applications/mspaint/toolsettings.c
base/applications/mspaint/toolsettings.h
base/applications/mspaint/winproc.c
base/applications/mspaint/winproc.h
base/applications/network/ipconfig/ipconfig.c
base/applications/taskmgr/trayicon.c
base/setup/welcome/res/title.bmp
base/setup/welcome/resource.h
base/setup/welcome/welcome.c
base/setup/welcome/welcome.rc
base/shell/explorer-new/lang/ru-RU.rc
base/shell/explorer-new/lang/uk-UA.rc
base/system/CMakeLists.txt
base/system/format/format.c
base/system/services/database.c
base/system/services/rpcserver.c
base/system/subst/CMakeLists.txt
base/system/subst/subst.c
base/system/subst/subst.rbuild
base/system/subst/subst.rc
boot/armllb/hw/keyboard.c
boot/armllb/hw/matrix.c
boot/armllb/hw/omap3-beagle/hwinfo.c
boot/armllb/hw/omap3-beagle/hwinit.c
boot/armllb/hw/omap3-beagle/hwuart.c
boot/armllb/hw/omap3-zoom2/hwinfo.c
boot/armllb/hw/omap3-zoom2/hwinit.c
boot/armllb/hw/omap3-zoom2/hwlcd.c
boot/armllb/hw/omap3-zoom2/hwsynkp.c
boot/armllb/hw/omap3-zoom2/hwtwl40x.c
boot/armllb/hw/omap3-zoom2/hwuart.c
boot/armllb/hw/serial.c
boot/armllb/hw/time.c
boot/armllb/hw/versatile/hwclcd.c
boot/armllb/hw/versatile/hwinfo.c
boot/armllb/hw/versatile/hwinit.c
boot/armllb/hw/versatile/hwkmi.c
boot/armllb/hw/versatile/hwuart.c
boot/armllb/inc/envir.h
boot/armllb/inc/fw.h
boot/armllb/inc/hw.h
boot/armllb/inc/keyboard.h
boot/armllb/inc/omap3.h
boot/armllb/inc/precomp.h
boot/armllb/inc/serial.h
boot/armllb/inc/versa.h
boot/armllb/inc/video.h
boot/armllb/main.c
boot/armllb/os/loader.c
boot/bootdata/autorun.inf
boot/bootdata/icon.ico
dll/win32/CMakeLists.txt
dll/win32/aclui/aclui_Fr.rc
dll/win32/advapi32/service/scm.c
dll/win32/dhcpcsvc/dhcpcsvc.rc
dll/win32/kernel32/file/dosdev.c
dll/win32/kernel32/include/kernel32.h
dll/win32/kernel32/k32.h
dll/win32/kernel32/misc/computername.c
dll/win32/kernel32/nls/csy.nls
dll/win32/msafd/msafd.h
dll/win32/netid/lang/bg-BG.rc
dll/win32/netid/lang/cs-CZ.rc
dll/win32/netid/lang/de-DE.rc
dll/win32/netid/lang/el-GR.rc
dll/win32/netid/lang/en-US.rc
dll/win32/netid/lang/es-ES.rc
dll/win32/netid/lang/fr-FR.rc
dll/win32/netid/lang/id-ID.rc
dll/win32/netid/lang/it-IT.rc
dll/win32/netid/lang/ja-JP.rc
dll/win32/netid/lang/nl-NL.rc
dll/win32/netid/lang/no-NO.rc
dll/win32/netid/lang/pl-PL.rc
dll/win32/netid/lang/ru-RU.rc
dll/win32/netid/lang/sk-SK.rc
dll/win32/netid/lang/uk-UA.rc
dll/win32/oledlg/CMakeLists.txt
dll/win32/rasapi32/CMakeLists.txt
dll/win32/sensapi/CMakeLists.txt
dll/win32/shell32/lang/bg-BG.rc
dll/win32/shell32/lang/ca-ES.rc
dll/win32/shell32/lang/cs-CZ.rc
dll/win32/shell32/lang/da-DK.rc
dll/win32/shell32/lang/de-DE.rc
dll/win32/shell32/lang/el-GR.rc
dll/win32/shell32/lang/en-GB.rc
dll/win32/shell32/lang/en-US.rc
dll/win32/shell32/lang/es-ES.rc
dll/win32/shell32/lang/fi-FI.rc
dll/win32/shell32/lang/fr-FR.rc
dll/win32/shell32/lang/hu-HU.rc
dll/win32/shell32/lang/it-IT.rc
dll/win32/shell32/lang/ja-JP.rc
dll/win32/shell32/lang/ko-KR.rc
dll/win32/shell32/lang/nl-NL.rc
dll/win32/shell32/lang/no-NO.rc
dll/win32/shell32/lang/pl-PL.rc
dll/win32/shell32/lang/pt-BR.rc
dll/win32/shell32/lang/pt-PT.rc
dll/win32/shell32/lang/ro-RO.rc
dll/win32/shell32/lang/ru-RU.rc
dll/win32/shell32/lang/sk-SK.rc
dll/win32/shell32/lang/sl-SI.rc
dll/win32/shell32/lang/sv-SE.rc
dll/win32/shell32/lang/tr-TR.rc
dll/win32/shell32/lang/uk-UA.rc
dll/win32/shell32/lang/zh-CN.rc
dll/win32/shell32/lang/zh-TW.rc
dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp
dll/win32/shell32/shlexec.c
dll/win32/shell32/shresdef.h
dll/win32/shell32/shv_def_cmenu.c
dll/win32/shimgvw/lang/bg-BG.rc
dll/win32/shimgvw/lang/cs-CZ.rc
dll/win32/shimgvw/lang/de-DE.rc
dll/win32/shimgvw/lang/en-US.rc
dll/win32/shimgvw/lang/es-ES.rc
dll/win32/shimgvw/lang/it-IT.rc
dll/win32/shimgvw/lang/lt-LT.rc
dll/win32/shimgvw/lang/no-NO.rc
dll/win32/shimgvw/lang/pl-PL.rc
dll/win32/shimgvw/lang/ru-RU.rc
dll/win32/shimgvw/lang/sk-SK.rc
dll/win32/shimgvw/lang/uk-UA.rc
dll/win32/shimgvw/resource.h
dll/win32/shimgvw/rsrc.rc
dll/win32/syssetup/globals.h
dll/win32/syssetup/install.c
dll/win32/syssetup/lang/bg-BG.rc
dll/win32/syssetup/lang/cs-CZ.rc
dll/win32/syssetup/lang/de-DE.rc
dll/win32/syssetup/lang/el-GR.rc
dll/win32/syssetup/lang/en-US.rc
dll/win32/syssetup/lang/es-ES.rc
dll/win32/syssetup/lang/et-EE.rc
dll/win32/syssetup/lang/fr-FR.rc
dll/win32/syssetup/lang/hu-HU.rc
dll/win32/syssetup/lang/id-ID.rc
dll/win32/syssetup/lang/it-IT.rc
dll/win32/syssetup/lang/no-NO.rc
dll/win32/syssetup/lang/pl-PL.rc
dll/win32/syssetup/lang/pt-BR.rc
dll/win32/syssetup/lang/ro-RO.rc
dll/win32/syssetup/lang/ru-RU.rc
dll/win32/syssetup/lang/sk-SK.rc
dll/win32/syssetup/lang/uk-UA.rc
dll/win32/syssetup/wizard.c
dll/win32/unicows/CMakeLists.txt
dll/win32/unicows/unicows.rbuild
dll/win32/unicows/unicows.spec
drivers/bluetooth/fbtusb/fbtdev.c
drivers/bluetooth/fbtusb/fbtpnp.c
drivers/bluetooth/fbtusb/fbtpwr.c
drivers/bluetooth/fbtusb/fbtrwr.c
drivers/bluetooth/fbtusb/fbtusb.c
drivers/bluetooth/fbtusb/fbtwmi.c
drivers/bluetooth/fbtusb/include/fbtHciCmdStructs.h
drivers/bluetooth/fbtusb/include/fbtHciCmds.h
drivers/bluetooth/fbtusb/include/fbtHciDefs.h
drivers/bluetooth/fbtusb/include/fbtHciErrors.h
drivers/bluetooth/fbtusb/include/fbtHciEventStructs.h
drivers/bluetooth/fbtusb/include/fbtHciEvents.h
drivers/bluetooth/fbtusb/include/fbtHciLocal.h
drivers/bluetooth/fbtusb/include/fbtHciOpCodes.h
drivers/bluetooth/fbtusb/include/fbtHciParms.h
drivers/bluetooth/fbtusb/include/fbtHciRoundTrip.h
drivers/bluetooth/fbtusb/include/fbtHciSizes.h
drivers/bluetooth/fbtusb/include/fbtSeXcpt.h
drivers/bluetooth/fbtusb/include/fbtdev.h
drivers/bluetooth/fbtusb/include/fbthci.h
drivers/bluetooth/fbtusb/include/fbthw.h
drivers/bluetooth/fbtusb/include/fbtlog.h
drivers/bluetooth/fbtusb/include/fbtpnp.h
drivers/bluetooth/fbtusb/include/fbtpwr.h
drivers/bluetooth/fbtusb/include/fbtreg.h
drivers/bluetooth/fbtusb/include/fbtrwr.h
drivers/bluetooth/fbtusb/include/fbtusb.h
drivers/bluetooth/fbtusb/include/fbtusr.h
drivers/bluetooth/fbtusb/include/fbtutil.h
drivers/bluetooth/fbtusb/include/fbtwmi.h
drivers/bluetooth/fbtusb/include/fbtxcpt.h
drivers/filesystems/npfs/fsctrl.c
drivers/filesystems/ntfs/close.c
drivers/filesystems/ntfs/notes.txt
drivers/filesystems/ntfs/rw.c
drivers/multimedia/README
drivers/network/tcpip/include/linux.h
drivers/network/tcpip/include/tcpcore.h
drivers/network/tcpip/include/tcpdef.h
drivers/storage/class/class2/class2.c
drivers/storage/floppy/csqrtns.c
drivers/storage/floppy/csqrtns.h
drivers/storage/floppy/floppy.c
drivers/storage/floppy/floppy.h
drivers/storage/floppy/hardware.c
drivers/storage/floppy/hardware.h
drivers/storage/floppy/ioctl.c
drivers/storage/floppy/ioctl.h
drivers/storage/floppy/readwrite.c
drivers/storage/floppy/readwrite.h
drivers/usb/nt4compat/usbdriver/keyboard.c
drivers/video/displays/framebuf_new/debug.c
drivers/video/displays/framebuf_new/debug.h
drivers/video/displays/framebuf_new/driver.h
drivers/video/displays/framebuf_new/palette.c
drivers/video/displays/framebuf_new/pointer.c
drivers/video/displays/framebuf_new/screen.c
drivers/video/displays/vga_new/debug.c
drivers/video/displays/vga_new/debug.h
drivers/video/displays/vga_new/driver.h
drivers/video/displays/vga_new/palette.c
drivers/video/displays/vga_new/screen.c
drivers/video/videoprt/videoprt.c
include/reactos/libs/fslib/vfatlib.h
include/reactos/subsys/csrss/csrss.h
include/reactos/win32k/ntgdihdl.h
lib/3rdparty/adns/install-sh
lib/3rdparty/cardlib/cardregion.cpp
lib/3rdparty/cardlib/cardregion.h
lib/3rdparty/cardlib/cardrgnmouse.cpp
lib/3rdparty/cardlib/cardwindow.cpp
lib/fslib/vfatlib/check/vfat.h
lib/fslib/vfatlib/vfatlib.c
lib/fslib/vfatlib/vfatlib.h
lib/inflib/inflib.mak
lib/sdk/crt/stdio/_flsbuf.c
lib/sdk/crt/wine/undname.c
ntoskrnl/io/iomgr/rawfs.c
ntoskrnl/ke/i386/thrdini.c
ntoskrnl/ke/procobj.c
subsystems/win32/csrss/win32csr/dllmain.c
subsystems/win32/csrss/win32csr/file.c
subsystems/win32/csrss/win32csr/file.h
subsystems/win32/win32k/eng/bitblt.c
subsystems/win32/win32k/eng/mouse.c
subsystems/win32/win32k/eng/stretchblt.c
subsystems/win32/win32k/eng/surface.c
subsystems/win32/win32k/include/engobjects.h
subsystems/win32/win32k/include/msgqueue.h
subsystems/win32/win32k/ntddraw/dxeng.c
subsystems/win32/win32k/ntuser/clipboard.c
subsystems/win32/win32k/ntuser/cursoricon.c
subsystems/win32/win32k/ntuser/keyboard.c
subsystems/win32/win32k/ntuser/msgqueue.c
subsystems/win32/win32k/ntuser/sysparams.c
subsystems/win32/win32k/ntuser/window.c
subsystems/win32/win32k/objects/bitmaps.c
subsystems/win32/win32k/objects/cliprgn.c
subsystems/win32/win32k/objects/dclife.c
subsystems/win32/win32k/objects/dibobj.c
subsystems/win32/win32k/objects/drawing.c
subsystems/win32/win32k/objects/freetype.c
subsystems/win32/win32k/objects/gdiobj.c
subsystems/win32/win32k/objects/gdipool.c
subsystems/win32/win32k/objects/icm.c
subsystems/win32/win32k/objects/palette.c

diff --cc apistatus.lst
index 2699749,2699749..2699749
mode 100755,100644..100644
index c76ee13,0000000..d98d392
mode 100644,000000..100644
--- /dev/null
@@@ -1,37 -1,0 +1,37 @@@
- add_subdirectory(paint)
 +
 +add_subdirectory(cacls)
 +add_subdirectory(calc)
 +add_subdirectory(charmap)
 +add_subdirectory(cmdutils)
 +add_subdirectory(control)
 +add_subdirectory(dxdiag)
 +add_subdirectory(extrac32)
 +add_subdirectory(findstr)
 +add_subdirectory(fontview)
 +add_subdirectory(games)
 +add_subdirectory(hh)
 +add_subdirectory(iexplore)
 +add_subdirectory(kbswitch)
 +add_subdirectory(logoff)
 +add_subdirectory(magnify)
 +add_subdirectory(mmc)
 +add_subdirectory(mplay32)
 +add_subdirectory(msconfig)
 +add_subdirectory(mscutils)
 +add_subdirectory(mstsc)
 +add_subdirectory(network)
 +add_subdirectory(notepad)
++add_subdirectory(mspaint)
 +add_subdirectory(rapps)
 +add_subdirectory(regedit)
 +add_subdirectory(regedt32)
 +add_subdirectory(sc)
 +add_subdirectory(screensavers)
 +add_subdirectory(shutdown)
 +#add_subdirectory(sndrec32)
 +add_subdirectory(sndvol32)
 +add_subdirectory(taskmgr)
 +add_subdirectory(winhlp32)
 +add_subdirectory(winver)
 +add_subdirectory(wordpad)
 +add_subdirectory(write)
Simple merge
index 8b0d15e,0000000..88209d3
mode 100644,000000..100644
--- /dev/null
@@@ -1,64 -1,0 +1,65 @@@
 +/*
 + * ReactOS Calc (global resource file)
 + *
 + * Copyright 2007, Carlo Bramini
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2 of the License, or (at your option) any later version.
 + *
 + * This library is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with this library; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 + */
 +
 +#include <windows.h>
 +
 +#include "resource.h"
 +
 +#ifndef IDC_STATIC
 +#define IDC_STATIC    -1
 +#endif
 +
 +#ifndef DS_SHELLFONT
 +#define DS_SHELLFONT DS_SETFONT|DS_FIXEDSYS
 +#endif
 +
 +// Common resources
 +
 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 +
 +// Icons
 +
 +IDI_CALC_BIG            ICON    DISCARDABLE     "res/calc.ico"
 +IDI_CALC_SMALL          ICON    DISCARDABLE     "res/calc_sm.ico"
 +
 +// Bitmaps
 +
 +IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 +
 +
 +#include "lang/bg-BG.rc"
 +#include "lang/cs-CZ.rc"
 +#include "lang/de-DE.rc"
 +#include "lang/el-GR.rc"
 +#include "lang/en-US.rc"
 +#include "lang/es-ES.rc"
 +#include "lang/fr-FR.rc"
 +#include "lang/it-IT.rc"
 +//#include "lang/ja-JP.rc" FIXME: iconv issue
 +#include "lang/ko-KR.rc"
 +#include "lang/nl-NL.rc"
 +#include "lang/no-NO.rc"
 +#include "lang/pl-PL.rc"
 +#include "lang/ro-RO.rc"
 +#include "lang/ru-RU.rc"
 +#include "lang/sk-SK.rc"
++#include "lang/sv-SE.rc"
 +#include "lang/th-TH.rc"
 +#include "lang/uk-UA.rc"
Simple merge
index 4fde55c,0000000..d2a28b4
mode 100644,000000..100644
--- /dev/null
@@@ -1,22 -1,0 +1,23 @@@
 +
 +#include <windows.h>
 +#include "resource.h"
 +
 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 +
 +#include "lang/bg-BG.rc"
 +#include "lang/cs-CZ.rc"
 +#include "lang/de-DE.rc"
 +#include "lang/en-US.rc"
 +#include "lang/es-ES.rc"
 +#include "lang/fr-FR.rc"
 +//#include "lang/ja-JP.rc" FIXME: iconv issue
 +#include "lang/ko-KR.rc"
 +#include "lang/nl-NL.rc"
 +#include "lang/no-NO.rc"
 +#include "lang/pl-PL.rc"
 +#include "lang/ru-RU.rc"
 +#include "lang/sk-SK.rc"
++#include "lang/sv-SE.rc"
 +#include "lang/ua-UA.rc"
 +#include "lang/zh-CN.rc"
 +//#include "lang/zh-TW.rc"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fb701d8,0000000..c1bfeb5
mode 100644,000000..100644
--- /dev/null
@@@ -1,21 -1,0 +1,21 @@@
- add_executable(paint
 +
 +set_unicode()
 +
- set_module_type(paint win32gui)
- add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
- add_cab_target(paint 1)
++add_executable(mspaint
 +    dialogs.c
 +    dib.c
 +    drawing.c
 +    history.c
 +    main.c
 +    mouse.c
 +    palette.c
 +    registry.c
 +    selection.c
 +    sizebox.c
 +    toolsettings.c
 +    winproc.c
 +    rsrc.rc)
 +
++set_module_type(mspaint win32gui)
++add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
++add_cab_target(mspaint 1)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index da3e902,da3e902..da3e902
Binary files differ
index d313076,d313076..d313076
Binary files differ
index 470d8d7,470d8d7..470d8d7
Binary files differ
index 80aed07,80aed07..80aed07
Binary files differ
index f2c8921,f2c8921..f2c8921
Binary files differ
index 1da4f22,1da4f22..1da4f22
Binary files differ
index 695ba90,695ba90..695ba90
Binary files differ
index bc53d8e,bc53d8e..bc53d8e
Binary files differ
index cfa07bd,cfa07bd..cfa07bd
Binary files differ
index 70c2127,70c2127..70c2127
Binary files differ
index b3e4c02,b3e4c02..b3e4c02
Binary files differ
index 72eb64d,72eb64d..72eb64d
Binary files differ
index c1c2789,c1c2789..c1c2789
Binary files differ
index 9f123ed,9f123ed..9f123ed
Binary files differ
index 5535e1d,5535e1d..5535e1d
Binary files differ
index bef563a,bef563a..bef563a
Binary files differ
index 287bd39,287bd39..287bd39
Binary files differ
index 6233ae0,6233ae0..6233ae0
Binary files differ
Simple merge
Simple merge
Simple merge
index 2d4a0ee,2d4a0ee..2d4a0ee
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
index 335383f,335383f..335383f
mode 100755,100644..100644
Binary files differ
Simple merge
Simple merge
index c0589fa,0000000..80232bc
mode 100644,000000..100644
--- /dev/null
@@@ -1,14 -1,0 +1,15 @@@
 +
 +add_subdirectory(autochk)
 +add_subdirectory(bootok)
 +add_subdirectory(expand)
 +add_subdirectory(format)
 +add_subdirectory(lsass)
 +add_subdirectory(msiexec)
 +add_subdirectory(regsvr32)
 +add_subdirectory(rundll32)
 +add_subdirectory(runonce)
 +add_subdirectory(services)
 +add_subdirectory(smss)
++add_subdirectory(subst)
 +add_subdirectory(userinit)
 +add_subdirectory(winlogon)
Simple merge
Simple merge
index 0000000,0000000..fd3997a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,8 @@@
++
++add_definitions(-D_DLL -D__USE_CRTIMP)
++
++add_executable(subst subst.c subst.rc)
++
++set_module_type(subst win32cui)
++add_importlibs(subst msvcrt kernel32 ntdll)
++add_cab_target(subst 1)
index 0000000,7cb9256..7cb9256
mode 000000,100644..100644
--- /dev/null
index 0000000,fe93acb..fe93acb
mode 000000,100644..100644
--- /dev/null
index 0000000,b81ea2c..b81ea2c
mode 000000,100644..100644
--- /dev/null
index 1be85f5,1be85f5..1be85f5
mode 100755,100644..100644
Binary files differ
index 6d29425,0000000..42e04b5
mode 100644,000000..100644
--- /dev/null
@@@ -1,229 -1,0 +1,230 @@@
 +
 +add_subdirectory(acledit)
 +add_subdirectory(aclui)
 +add_subdirectory(activeds)
 +add_subdirectory(actxprxy)
 +add_subdirectory(advapi32)
 +add_subdirectory(advpack)
 +add_subdirectory(atl)
 +add_subdirectory(authz)
 +add_subdirectory(avicap32)
 +add_subdirectory(avifil32)
 +add_subdirectory(batt)
 +add_subdirectory(bcrypt)
 +add_subdirectory(beepmidi)
 +add_subdirectory(browseui)
 +add_subdirectory(cabinet)
 +add_subdirectory(cards)
 +add_subdirectory(cfgmgr32)
 +add_subdirectory(clusapi)
 +add_subdirectory(comcat)
 +add_subdirectory(comctl32)
 +add_subdirectory(comdlg32)
 +add_subdirectory(compstui)
 +add_subdirectory(credui)
 +add_subdirectory(crtdll)
 +add_subdirectory(crypt32)
 +add_subdirectory(cryptdlg)
 +add_subdirectory(cryptdll)
 +add_subdirectory(cryptnet)
 +add_subdirectory(cryptui)
 +add_subdirectory(dbghelp)
 +add_subdirectory(dciman32)
 +add_subdirectory(devmgr)
 +add_subdirectory(dhcpcsvc)
 +add_subdirectory(dnsapi)
 +add_subdirectory(dwmapi)
 +add_subdirectory(faultrep)
 +add_subdirectory(fmifs)
 +add_subdirectory(fusion)
 +add_subdirectory(gdi32)
 +add_subdirectory(gdiplus)
 +add_subdirectory(getuname)
 +add_subdirectory(glu32)
 +add_subdirectory(hhctrl.ocx)
 +add_subdirectory(hid)
 +add_subdirectory(hlink)
 +add_subdirectory(hnetcfg)
 +add_subdirectory(httpapi)
 +add_subdirectory(iccvid)
 +add_subdirectory(icmp)
 +add_subdirectory(imaadp32.acm)
 +add_subdirectory(imagehlp)
 +add_subdirectory(imm32)
 +add_subdirectory(inetcomm)
 +add_subdirectory(inetmib1)
 +add_subdirectory(initpki)
 +add_subdirectory(inseng)
 +add_subdirectory(iphlpapi)
 +#add_subdirectory(iprtprio) # not built in trunk
 +add_subdirectory(itircl)
 +add_subdirectory(itss)
 +add_subdirectory(jscript)
 +add_subdirectory(kernel32)
 +add_subdirectory(loadperf)
 +add_subdirectory(localspl)
 +add_subdirectory(localui)
 +add_subdirectory(lpk)
 +add_subdirectory(lsasrv)
 +add_subdirectory(lz32)
 +add_subdirectory(mapi32)
 +add_subdirectory(mciavi32)
 +add_subdirectory(mcicda)
 +add_subdirectory(mciqtz32)
 +add_subdirectory(mciseq)
 +add_subdirectory(mciwave)
 +add_subdirectory(mlang)
 +add_subdirectory(mmdrv)
 +add_subdirectory(modemui)
 +add_subdirectory(mpr)
 +add_subdirectory(mprapi)
 +add_subdirectory(msacm32)
 +add_subdirectory(msadp32.acm)
 +add_subdirectory(msafd)
 +add_subdirectory(mscat32)
 +add_subdirectory(mscms)
 +add_subdirectory(mscoree)
 +add_subdirectory(msctf)
 +add_subdirectory(msftedit)
 +add_subdirectory(msg711.acm)
 +add_subdirectory(msgina)
 +add_subdirectory(msgsm32.acm)
 +if(NOT MSVC)
 +add_subdirectory(mshtml)
 +add_subdirectory(mshtml.tlb)
 +endif()
 +add_subdirectory(msi)
 +add_subdirectory(msimg32)
 +add_subdirectory(msimtf)
 +add_subdirectory(msisip)
 +add_subdirectory(msisys.ocx)
 +#add_subdirectory(msnet32) #to be deleted in trunk.
 +add_subdirectory(msrle32)
 +add_subdirectory(mssign32)
 +add_subdirectory(mssip32)
 +add_subdirectory(mstask)
 +add_subdirectory(msvcrt)
 +#add_subdirectory(msvcrt20) FIX spec2def
 +#add_subdirectory(msvcrt40) FIX spec2def
 +add_subdirectory(msvfw32)
 +add_subdirectory(msvidc32)
 +add_subdirectory(mswsock)
 +add_subdirectory(msxml3)
 +add_subdirectory(nddeapi)
 +add_subdirectory(netapi32)
 +add_subdirectory(netcfgx)
 +add_subdirectory(netevent)
 +add_subdirectory(netid)
 +add_subdirectory(netshell)
 +add_subdirectory(newdev)
 +add_subdirectory(ntdsapi)
 +add_subdirectory(ntlanman)
 +add_subdirectory(ntmarta)
 +add_subdirectory(ntprint)
 +add_subdirectory(objsel)
 +add_subdirectory(odbc32)
 +add_subdirectory(odbccp32)
 +add_subdirectory(ole32)
 +add_subdirectory(oleacc)
 +add_subdirectory(oleaut32)
 +add_subdirectory(olecli32)
 +add_subdirectory(oledlg)
 +add_subdirectory(olepro32)
 +add_subdirectory(olesvr32)
 +add_subdirectory(olethk32)
 +add_subdirectory(opengl32)
 +add_subdirectory(pdh)
 +add_subdirectory(pidgen)
 +add_subdirectory(powrprof)
 +add_subdirectory(printui)
 +add_subdirectory(psapi)
 +add_subdirectory(pstorec)
 +add_subdirectory(qmgr)
 +add_subdirectory(qmgrprxy)
 +add_subdirectory(query)
 +add_subdirectory(rasadhlp)
 +add_subdirectory(rasapi32)
 +add_subdirectory(rasdlg)
 +add_subdirectory(rasman)
 +add_subdirectory(resutils)
 +add_subdirectory(riched20)
 +add_subdirectory(riched32)
 +add_subdirectory(rpcrt4)
 +add_subdirectory(rsabase)
 +add_subdirectory(rsaenh)
 +add_subdirectory(samlib)
 +add_subdirectory(samsrv)
 +add_subdirectory(sccbase)
 +add_subdirectory(schannel)
 +add_subdirectory(secur32)
 +add_subdirectory(security)
 +add_subdirectory(sensapi)
 +add_subdirectory(serialui)
 +add_subdirectory(setupapi)
 +add_subdirectory(sfc)
 +add_subdirectory(sfc_os)
 +add_subdirectory(shdoclc)
 +add_subdirectory(shdocvw)
 +add_subdirectory(shell32)
 +add_subdirectory(shfolder)
 +add_subdirectory(shimgvw)
 +add_subdirectory(shlwapi)
 +add_subdirectory(slbcsp)
 +add_subdirectory(smdll)
 +add_subdirectory(sndblst)
 +add_subdirectory(snmpapi)
 +add_subdirectory(softpub)
 +add_subdirectory(spoolss)
 +add_subdirectory(srclient)
 +add_subdirectory(stdole2.tlb)
 +add_subdirectory(stdole32.tlb)
 +add_subdirectory(sti)
 +add_subdirectory(sxs)
 +add_subdirectory(syssetup)
 +add_subdirectory(t2embed)
 +add_subdirectory(tapi32)
 +add_subdirectory(tapiui)
 +add_subdirectory(traffic)
 +add_subdirectory(twain_32)
 +add_subdirectory(uext2)
 +add_subdirectory(ufat)
 +add_subdirectory(ufatx)
++add_subdirectory(unicows)
 +add_subdirectory(untfs)
 +add_subdirectory(updspapi)
 +add_subdirectory(url)
 +add_subdirectory(urlmon)
 +add_subdirectory(user32)
 +add_subdirectory(userenv)
 +add_subdirectory(usp10)
 +add_subdirectory(uxtheme)
 +add_subdirectory(vdmdbg)
 +add_subdirectory(version)
 +add_subdirectory(wdmaud.drv)
 +add_subdirectory(windowscodecs)
 +add_subdirectory(winemp3.acm)
 +add_subdirectory(winfax)
 +add_subdirectory(wing32)
 +add_subdirectory(winhttp)
 +add_subdirectory(wininet)
 +add_subdirectory(winmm)
 +#add_subdirectory(winscard) # not built in trunk
 +add_subdirectory(winspool)
 +add_subdirectory(winsta)
 +add_subdirectory(wintrust)
 +add_subdirectory(wlanapi)
 +add_subdirectory(wldap32)
 +add_subdirectory(wmi)
 +add_subdirectory(ws2_32)
 +add_subdirectory(ws2_32_new)
 +add_subdirectory(ws2help)
 +add_subdirectory(wshirda)
 +add_subdirectory(wshtcpip)
 +add_subdirectory(wsock32)
 +add_subdirectory(wtsapi32)
 +add_subdirectory(wuapi)
 +add_subdirectory(xinput1_1)
 +add_subdirectory(xinput1_2)
 +add_subdirectory(xinput1_3)
 +add_subdirectory(xinput9_1_0)
 +add_subdirectory(xmllite)
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 d3bbd75,0000000..00fdb65
mode 100644,000000..100644
--- /dev/null
@@@ -1,19 -1,0 +1,20 @@@
 +
 +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 +add_definitions(-D__WINESRC__)
 +
 +spec2def(oledlg.dll oledlg.spec)
 +
 +list(APPEND SOURCE
 +    insobjdlg.c
 +    oledlg_main.c
 +    pastespl.c
 +    rsrc.rc
 +    ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
 +
 +add_library(oledlg SHARED ${SOURCE})
 +
 +set_module_type(oledlg win32dll)
 +target_link_libraries(oledlg wine)
 +add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll)
++add_importlib_target(oledlg.spec)
 +add_cab_target(oledlg 1)
index b3bd995,0000000..9acb46d
mode 100644,000000..100644
--- /dev/null
@@@ -1,20 -1,0 +1,21 @@@
 +
 +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 +add_definitions(-D__WINESRC__)
 +
 +set_rc_compiler()
 +spec2def(rasapi32.dll rasapi32.spec)
 +
 +list(APPEND SOURCE
 +    rasapi.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/rasapi32_stubs.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
 +
 +add_library(rasapi32 SHARED ${SOURCE})
 +set_entrypoint(rasapi32 0)
 +
 +target_link_libraries(rasapi32 wine)
 +
 +add_importlibs(rasapi32 kernel32 ntdll)
++add_importlib_target(rasapi32.spec)
 +add_dependencies(rasapi32 psdk)
 +add_cab_target(rasapi32 1)
index 526c4aa,0000000..fb05f6c
mode 100644,000000..100644
--- /dev/null
@@@ -1,16 -1,0 +1,17 @@@
 +
 +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 +add_definitions(-D__WINESRC__)
 +
 +spec2def(sensapi.dll sensapi.spec)
 +
 +list(APPEND SOURCE
 +    sensapi.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
 +
 +add_library(sensapi SHARED ${SOURCE})
 +
 +set_module_type(sensapi win32dll)
 +target_link_libraries(sensapi wine)
 +add_importlibs(sensapi msvcrt kernel32 ntdll)
++add_importlib_target(sensapi.spec)
 +add_cab_target(sensapi 1)
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 335383f,335383f..335383f
mode 100755,100644..100644
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,e48d6e0..e48d6e0
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,1237b39..1237b39
mode 000000,100644..100644
--- /dev/null
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 0000000,0000000..e9e4f79
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,29 @@@
++
++spec2def(unicows.dll unicows.spec)
++
++list(APPEND SOURCE
++    ${CMAKE_CURRENT_BINARY_DIR}/unicows_stubs.c
++    ${CMAKE_CURRENT_BINARY_DIR}/unicows.def)
++
++add_library(unicows SHARED ${SOURCE})
++
++set_module_type(unicows win32dll)
++add_importlibs(unicows
++    avicap32
++    msvfw32
++    oledlg
++    comdlg32
++    shell32
++    winmm
++    winspool
++    rasapi32
++    secur32
++    sensapi
++    version
++    user32
++    mpr
++    gdi32
++    advapi32
++    kernel32
++    ntdll)
++add_cab_target(unicows 1)
index 0000000,8b1acd1..8b1acd1
mode 000000,100644..100644
--- /dev/null
index 0000000,47ba26f..47ba26f
mode 000000,100644..100644
--- /dev/null
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