[XINPUT*]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60437
This commit is contained in:
Amine Khaldi
2013-09-28 15:38:10 +00:00
parent 0bc7798f2b
commit 691fa8e676
9 changed files with 10 additions and 31 deletions
+2 -5
View File
@@ -1,16 +1,13 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(xinput1_1.dll xinput1_1.spec)
list(APPEND SOURCE
xinput1_1_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
add_library(xinput1_1 SHARED ${SOURCE})
add_library(xinput1_1 SHARED ${SOURCE} version.rc)
set_module_type(xinput1_1 win32dll)
add_importlibs(xinput1_1 msvcrt kernel32 xinput1_3)
add_importlibs(xinput1_1 xinput1_3 msvcrt kernel32)
add_cd_file(TARGET xinput1_1 DESTINATION reactos/system32 FOR all)
@@ -32,8 +32,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
+2 -5
View File
@@ -1,16 +1,13 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(xinput1_2.dll xinput1_2.spec)
list(APPEND SOURCE
xinput1_2_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
add_library(xinput1_2 SHARED ${SOURCE})
add_library(xinput1_2 SHARED ${SOURCE} version.rc)
set_module_type(xinput1_2 win32dll)
add_importlibs(xinput1_2 msvcrt kernel32 xinput1_3)
add_importlibs(xinput1_2 xinput1_3 msvcrt kernel32)
add_cd_file(TARGET xinput1_2 DESTINATION reactos/system32 FOR all)
@@ -32,8 +32,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
+1 -5
View File
@@ -1,17 +1,13 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(xinput1_3.dll xinput1_3.spec ADD_IMPORTLIB)
list(APPEND SOURCE
xinput1_3_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
add_library(xinput1_3 SHARED ${SOURCE})
add_library(xinput1_3 SHARED ${SOURCE} version.rc)
set_module_type(xinput1_3 win32dll)
target_link_libraries(xinput1_3 wine)
add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
@@ -40,8 +40,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
+1 -4
View File
@@ -1,16 +1,13 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(xinput9_1_0.dll xinput9_1_0.spec)
list(APPEND SOURCE
xinput9_1_0_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
add_library(xinput9_1_0 SHARED ${SOURCE})
add_library(xinput9_1_0 SHARED ${SOURCE} version.rc)
set_module_type(xinput9_1_0 win32dll)
add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3)
add_cd_file(TARGET xinput9_1_0 DESTINATION reactos/system32 FOR all)
@@ -32,8 +32,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}
+4 -4
View File
@@ -212,10 +212,10 @@ reactos/dll/win32/wldap32 # Synced to Wine-1.7.1
reactos/dll/win32/wmi # Synced to Wine-1.7.1
reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1
reactos/dll/win32/wuapi # Synced to Wine-1.7.1
reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19
reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19
reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19
reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.19
reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.1
reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1
reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1
reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1
reactos/dll/win32/xmllite # Synced to Wine-1.5.26
reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21