From: Hermès Bélusca-Maïto Date: Sat, 1 Feb 2014 22:56:13 +0000 (+0000) Subject: Sync with trunk rev.61910 to get latest improvements and bugfixes. X-Git-Tag: backups/0.3.17@66124~1365^2~101 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=538011301663df17c3b12b5c57e75ca80ffebb3d Sync with trunk rev.61910 to get latest improvements and bugfixes. svn path=/branches/ntvdm/; revision=61911 --- 538011301663df17c3b12b5c57e75ca80ffebb3d diff --cc dll/directx/wine/wined3d/cs.c index 00000000000,338a3e13971..338a3e13971 mode 000000,100644..100644 --- a/dll/directx/wine/wined3d/cs.c +++ b/dll/directx/wine/wined3d/cs.c diff --cc dll/win32/gdiplus/guid.c index 00000000000,6075a471188..6075a471188 mode 000000,100644..100644 --- a/dll/win32/gdiplus/guid.c +++ b/dll/win32/gdiplus/guid.c diff --cc dll/win32/msimtf/precomp.h index 00000000000,bf62888ba14..bf62888ba14 mode 000000,100644..100644 --- a/dll/win32/msimtf/precomp.h +++ b/dll/win32/msimtf/precomp.h diff --cc dll/win32/msvfw32/resource.h index 00000000000,2309c61014c..2309c61014c mode 000000,100644..100644 --- a/dll/win32/msvfw32/resource.h +++ b/dll/win32/msvfw32/resource.h diff --cc dll/win32/sti/guid.c index 00000000000,1c276f9817d..1c276f9817d mode 000000,100644..100644 --- a/dll/win32/sti/guid.c +++ b/dll/win32/sti/guid.c diff --cc dll/win32/sti/precomp.h index 00000000000,8c0b0f6342a..8c0b0f6342a mode 000000,100644..100644 --- a/dll/win32/sti/precomp.h +++ b/dll/win32/sti/precomp.h diff --cc dll/win32/sxs/guid.c index 00000000000,613a04b95bb..613a04b95bb mode 000000,100644..100644 --- a/dll/win32/sxs/guid.c +++ b/dll/win32/sxs/guid.c diff --cc dll/win32/winspool/precomp.h index 00000000000,ef6c1bd2ebc..ef6c1bd2ebc mode 000000,100644..100644 --- a/dll/win32/winspool/precomp.h +++ b/dll/win32/winspool/precomp.h diff --cc drivers/bus/acpi/cmbatt/guid.c index 00000000000,3f4468bf330..3f4468bf330 mode 000000,100644..100644 --- a/drivers/bus/acpi/cmbatt/guid.c +++ b/drivers/bus/acpi/cmbatt/guid.c diff --cc drivers/bus/acpi/compbatt/guid.c index 00000000000,fde0eaaa18f..fde0eaaa18f mode 000000,100644..100644 --- a/drivers/bus/acpi/compbatt/guid.c +++ b/drivers/bus/acpi/compbatt/guid.c diff --cc drivers/bus/acpi/precomp.h index 00000000000,fcb766d3eeb..fcb766d3eeb mode 000000,100644..100644 --- a/drivers/bus/acpi/precomp.h +++ b/drivers/bus/acpi/precomp.h diff --cc drivers/crypto/ksecdd/random.c index 00000000000,392ad0f70ca..392ad0f70ca mode 000000,100644..100644 --- a/drivers/crypto/ksecdd/random.c +++ b/drivers/crypto/ksecdd/random.c diff --cc drivers/hid/hidclass/guid.c index 00000000000,a24db4d729d..a24db4d729d mode 000000,100644..100644 --- a/drivers/hid/hidclass/guid.c +++ b/drivers/hid/hidclass/guid.c diff --cc drivers/input/kbdclass/guid.c index 00000000000,542ffa1e9fb..542ffa1e9fb mode 000000,100644..100644 --- a/drivers/input/kbdclass/guid.c +++ b/drivers/input/kbdclass/guid.c diff --cc drivers/input/mouclass/guid.c index 00000000000,0dd88914f27..0dd88914f27 mode 000000,100644..100644 --- a/drivers/input/mouclass/guid.c +++ b/drivers/input/mouclass/guid.c diff --cc include/reactos/drivers/ksecdd/ksecioctl.h index 00000000000,004db5a7cd0..004db5a7cd0 mode 000000,100644..100644 --- a/include/reactos/drivers/ksecdd/ksecioctl.h +++ b/include/reactos/drivers/ksecdd/ksecioctl.h diff --cc lib/3rdparty/libwine/isfinite.c index 00000000000,9909f6d294e..9909f6d294e mode 000000,100644..100644 --- a/lib/3rdparty/libwine/isfinite.c +++ b/lib/3rdparty/libwine/isfinite.c diff --cc lib/CMakeLists.txt index 4bb532590b5,00000000000..a030ad192e9 mode 100644,000000..100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@@ -1,33 -1,0 +1,34 @@@ + +add_subdirectory(cmlib) +add_subdirectory(inflib) + +if(CMAKE_CROSSCOMPILING) + +add_subdirectory(3rdparty) +add_subdirectory(atl) +add_subdirectory(cportlib) ++add_subdirectory(cryptlib) +#add_subdirectory(dnslib) Nothing links to this lib. +add_subdirectory(drivers) +add_subdirectory(epsapi) +add_subdirectory(fast486) +add_subdirectory(fslib) +add_subdirectory(lsalib) +add_subdirectory(ppcmmu) +add_subdirectory(pseh) +add_subdirectory(recyclebin) + +if(KDBG) + add_subdirectory(rossym) +endif() + +add_subdirectory(rtl) +add_subdirectory(sdk) +add_subdirectory(smlib) +add_subdirectory(tdilib) + +else() + +add_subdirectory(3rdparty/zlib) + +endif() diff --cc lib/cryptlib/CMakeLists.txt index 00000000000,015d13bebf4..015d13bebf4 mode 000000,100644..100644 --- a/lib/cryptlib/CMakeLists.txt +++ b/lib/cryptlib/CMakeLists.txt diff --cc lib/cryptlib/README.txt index 00000000000,631e8761237..631e8761237 mode 000000,100644..100644 --- a/lib/cryptlib/README.txt +++ b/lib/cryptlib/README.txt diff --cc lib/cryptlib/md4.h index 00000000000,9611ccabece..9611ccabece mode 000000,100644..100644 --- a/lib/cryptlib/md4.h +++ b/lib/cryptlib/md4.h diff --cc lib/cryptlib/md5.h index 00000000000,57ee7164769..57ee7164769 mode 000000,100644..100644 --- a/lib/cryptlib/md5.h +++ b/lib/cryptlib/md5.h diff --cc lib/cryptlib/mvAesAlg.c index 00000000000,f71201e381f..f71201e381f mode 000000,100644..100644 --- a/lib/cryptlib/mvAesAlg.c +++ b/lib/cryptlib/mvAesAlg.c diff --cc lib/cryptlib/mvAesAlg.h index 00000000000,ec81e403fac..ec81e403fac mode 000000,100644..100644 --- a/lib/cryptlib/mvAesAlg.h +++ b/lib/cryptlib/mvAesAlg.h diff --cc lib/cryptlib/mvAesBoxes.dat index 00000000000,4011b187b43..4011b187b43 mode 000000,100644..100644 --- a/lib/cryptlib/mvAesBoxes.dat +++ b/lib/cryptlib/mvAesBoxes.dat diff --cc lib/cryptlib/mvOs.h index 00000000000,da6a573f446..da6a573f446 mode 000000,100644..100644 --- a/lib/cryptlib/mvOs.h +++ b/lib/cryptlib/mvOs.h diff --cc lib/cryptlib/rc4.h index 00000000000,964881cbdba..964881cbdba mode 000000,100644..100644 --- a/lib/cryptlib/rc4.h +++ b/lib/cryptlib/rc4.h diff --cc lib/cryptlib/sha1.h index 00000000000,e9e094efd7f..e9e094efd7f mode 000000,100644..100644 --- a/lib/cryptlib/sha1.h +++ b/lib/cryptlib/sha1.h diff --cc lib/cryptlib/util.c index 00000000000,7416faab2de..7416faab2de mode 000000,100644..100644 --- a/lib/cryptlib/util.c +++ b/lib/cryptlib/util.c diff --cc lib/cryptlib/util.h index 00000000000,c3c864f428d..c3c864f428d mode 000000,100644..100644 --- a/lib/cryptlib/util.h +++ b/lib/cryptlib/util.h diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp index 3060dffc136,65b66dec5d8..65b66dec5d8 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp index 004d13d664a,805c1491c04..805c1491c04 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp index 00000000000,03c3a5a121f..03c3a5a121f mode 000000,100644..100644 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp index 00000000000,346bd18b8fc..346bd18b8fc mode 000000,100644..100644 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTON.bmp index faa0a48b780,ffb3fe5e946..ffb3fe5e946 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp index 86e1b2c3b90,231aedd634d..231aedd634d Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp index 2105fafac51,14a433b18b5..14a433b18b5 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_GROUPBOX.bmp index 9746328236f,44181632d03..44181632d03 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp index 4a46dcabf43,5d4c4b71d41..5d4c4b71d41 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp index abf1d0c30dd,43135e8bdf6..43135e8bdf6 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp index d53f603c1f0,89a49c45a85..89a49c45a85 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp index 95ccd6cdfb5,d614e473bfb..d614e473bfb Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp index ddf53bff3b7,5bc68001093..5bc68001093 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp index a9b70c70f73,27d77358a50..27d77358a50 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp index dd0d29801d8,57d8f2f9f59..57d8f2f9f59 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp index ae88eb09f59,36f121e67bf..36f121e67bf Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp index a8254201bd5,97b4e2a2e43..97b4e2a2e43 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp index 71be6eec5b1,3ec182ec8ec..3ec182ec8ec Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp index aec8bee4df0,b0348d61cd5..b0348d61cd5 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp index 00000000000,6cb7cd09e30..6cb7cd09e30 mode 000000,100644..100644 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp index 02522f2b5ee,7d1af69944d..7d1af69944d Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp index 745aff8c512,fcbf995e726..fcbf995e726 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp index f466a1203dc,d688e83fcee..d688e83fcee Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp index 91eeeab7c66,233f1331071..233f1331071 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp index 78ff5701d86,a92c7648458..a92c7648458 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp index 11c71d275e6,6bbe71ed95d..6bbe71ed95d Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp index c79c484a608,c454c5c069e..c454c5c069e Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp index 54278457734,916582ab309..916582ab309 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp index 50107bf6300,cc55eb9c6a4..cc55eb9c6a4 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp index 4df9c48b6fb,b581ffc113f..b581ffc113f Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEM.bmp index 7f9451a6174,ab1d7412b58..ab1d7412b58 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp index 7f9451a6174,d3e4f27eb53..d3e4f27eb53 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp index 7f9451a6174,e5975d457a5..e5975d457a5 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp index 7f9451a6174,d9bd13719c1..d9bd13719c1 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp index 7f9451a6174,92473af5aec..92473af5aec Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp index 7f9451a6174,92473af5aec..92473af5aec Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp index 7f9451a6174,92473af5aec..92473af5aec Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp index 7f9451a6174,92473af5aec..92473af5aec Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp index ab499452d5b,39266b1c831..39266b1c831 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp index 0ec3a587f96,4a949079729..4a949079729 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp index 6dd07619884,28ff67af7cc..28ff67af7cc Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp index c3ba2b766f2,269e6ae3043..269e6ae3043 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp index f03106d4e1e,7330949f3a6..7330949f3a6 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp index bf6552ef48a,93e7ec2f60c..93e7ec2f60c Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp index 421bd808135,8ced9314976..8ced9314976 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp index b3d5971c664,0174ac3c4c9..0174ac3c4c9 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUND.bmp index c3c719e1241,323353e861c..323353e861c Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp index ae0c6e04a0d,46ec94945d0..46ec94945d0 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp index da6198c5d86,a1e5916dff4..a1e5916dff4 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp index 76196200d77,c6ea57b81cf..c6ea57b81cf Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp index 9b41ce88d1d,3d3e76db839..3d3e76db839 Binary files differ diff --cc media/themes/lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp index 6e051a8a393,f91c442a77e..f91c442a77e Binary files differ diff --cc media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI index fc031b218db,493f982ffff..493f982ffff Binary files differ diff --cc media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI index 5eb87d4e2d3,7e9fb21c13e..7e9fb21c13e Binary files differ diff --cc media/themes/lautus.msstyles/textfiles/NormalNormal.INI index 0b7877b9283,4111ce3099b..4111ce3099b Binary files differ