[uxtheme]

- Merge from the themes branch

svn path=/trunk/; revision=53748

diff --cc reactos/dll/win32/uxtheme/CMakeLists.txt
index 8d7631f,0000000..ff0b710
mode 100644,000000..100644
--- 1/reactos/dll/win32/uxtheme/CMakeLists.txt
--- /dev/null
+++ b/reactos/dll/win32/uxtheme/CMakeLists.txt
@@@ -1,28 -1,0 +1,31 @@@
 +
 +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 +add_definitions(-D__WINESRC__)
 +set_rc_compiler()
 +
 +spec2def(uxtheme.dll uxtheme.spec)
 +
 +list(APPEND SOURCE
 +    buffer.c
 +    draw.c
 +    main.c
 +    metric.c
 +    msstyles.c
++    ncscrollbar.c
++    nonclient.c
 +    property.c
 +    stylemap.c
 +    system.c
++    themehooks.c
 +    uxini.c
 +    version.rc
 +    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c
 +    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
 +
 +add_library(uxtheme SHARED ${SOURCE})
 +set_module_type(uxtheme win32dll)
 +target_link_libraries(uxtheme wine)
 +add_delay_importlibs(uxtheme msimg32)
 +add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll)
 +add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all)
 +add_importlib_target(uxtheme.spec)

diff --cc reactos/dll/win32/uxtheme/draw.c
Simple merge

diff --cc reactos/dll/win32/uxtheme/msstyles.c
Simple merge

diff --cc reactos/dll/win32/uxtheme/ncscrollbar.c
index 0000000,f8f729f..f8f729f
mode 000000,100644..100644
--- /dev/null
--- 2/dll/win32/uxtheme/ncscrollbar.c
+++ b/reactos/dll/win32/uxtheme/ncscrollbar.c

diff --cc reactos/dll/win32/uxtheme/ncthm.h
index 0000000,4b9e76b..4b9e76b
mode 000000,100644..100644
--- /dev/null
--- 2/dll/win32/uxtheme/ncthm.h
+++ b/reactos/dll/win32/uxtheme/ncthm.h

diff --cc reactos/dll/win32/uxtheme/nonclient.c
index 0000000,ffcbb36..ffcbb36
mode 000000,100644..100644
--- /dev/null
--- 2/dll/win32/uxtheme/nonclient.c
+++ b/reactos/dll/win32/uxtheme/nonclient.c

diff --cc reactos/dll/win32/uxtheme/system.c
Simple merge

diff --cc reactos/dll/win32/uxtheme/themehooks.c
index 0000000,94df23a..94df23a
mode 000000,100644..100644
--- /dev/null
--- 2/dll/win32/uxtheme/themehooks.c
+++ b/reactos/dll/win32/uxtheme/themehooks.c

diff --cc reactos/dll/win32/uxtheme/uxtheme.rbuild
Simple merge

diff --cc reactos/dll/win32/uxtheme/uxtheme.spec
Simple merge

diff --cc reactos/dll/win32/uxtheme/uxthemedll.h
Simple merge