Enabling uiribbon, fixing compilation and rewrite all include to new …

…way, to turn wrappers highly portable

CMakeLists.txt

@@ -215,14 +215,16 @@ else()
     include_directories(
         sdk/include
         sdk/include/psdk
-        sdk/include/dxsdk
+        sdk/include/dxsdk		
         ${REACTOS_BINARY_DIR}/sdk/include
         ${REACTOS_BINARY_DIR}/sdk/include/psdk
         ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/ddk
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
         ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
-        ${REACTOS_BINARY_DIR}/wrappers/includes
+		#Please, include these directories when integrate wrappers to reactos environment
+		wrappers/sdk/include/wsdk
+        ${REACTOS_BINARY_DIR}/wrappers/sdk/include/wsdk
         sdk/include/crt
         sdk/include/ddk
         sdk/include/ndk
@@ -271,7 +273,11 @@ else()
     add_subdirectory(subsystems)
     add_subdirectory(sdk/tools/wpp)
     add_subdirectory(win32ss)
+
+	#Please, include these directories when integrate wrappers to reactos environment
     add_subdirectory(wrappers)
+    add_subdirectory(wrappers/sdk/include/wsdk)
+    add_subdirectory(wrappers/sdk/lib)
 
     # Create the registry hives
     create_registry_hives()

sdk/include/reactos/wine/CMakeLists.txt

@@ -1,20 +1,2 @@
 
-add_idl_headers(wineheaders 
-				fil_data.idl 
-				itss.idl 
-				evr.idl 
-				orpc.idl 
-				rtworkq.idl 
-				d3d10.idl 
-				d3d10_1.idl 
-				d3d10sdklayers.idl 
-				d3d11sdklayers.idl 
-				d3d11.idl 
-				dxgi.idl 
-				dxgitype.idl 
-				dxgicommon.idl 
-				mfmediaengine.idl 
-				mfplay.idl 
-				mfreadwrite.idl 
-				schrpc.idl 
-				)
+add_idl_headers(wineheaders fil_data.idl itss.idl)

wrappers/CMakeLists.txt

@@ -4,6 +4,4 @@ add_subdirectory(base)
 add_subdirectory(dependencies)
 add_subdirectory(drivers)
 add_subdirectory(ext-sets)
-add_subdirectory(includes)
-add_subdirectory(lib)
 add_subdirectory(new-dlls)

wrappers/base/kernelbase_wrapper/CMakeLists.txt

@@ -9,7 +9,7 @@ include_directories(
 	${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
 	${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys
 	${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys/win
-	${REACTOS_SOURCE_DIR}/wrappers/includes)	
+	${REACTOS_SOURCE_DIR}/wrappers/sdk/include/wsdk)	
 spec2def(kernelbase.dll kernelbase.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE