mirror of
https://github.com/reactos/reactos.git
synced 2024-10-01 15:07:53 +00:00
[DINPUT8]
* Sync with Wine 1.5.26. svn path=/trunk/; revision=58774
This commit is contained in:
parent
317d0908d3
commit
9e746b60f4
|
@ -1,36 +1,17 @@
|
|||
|
||||
|
||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||
add_definitions(-D_WIN32_WINNT=0x600)
|
||||
|
||||
add_definitions(-D__WINESRC__)
|
||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||
|
||||
spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB)
|
||||
|
||||
add_library(dinput8 SHARED
|
||||
dinput8_main.c
|
||||
regsvr.c
|
||||
version.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
|
||||
|
||||
set_module_type(dinput8 win32dll UNICODE)
|
||||
|
||||
target_link_libraries(dinput8
|
||||
dxguid
|
||||
uuid
|
||||
wine)
|
||||
|
||||
add_importlibs(dinput8
|
||||
msvcrt
|
||||
user32
|
||||
advapi32
|
||||
ole32
|
||||
winmm
|
||||
dinput
|
||||
kernel32
|
||||
ntdll)
|
||||
|
||||
add_dependencies(dinput8 psdk)
|
||||
|
||||
target_link_libraries(dinput8 dxguid uuid wine)
|
||||
add_importlibs(dinput8 dinput ole32 advapi32 msvcrt kernel32 ntdll)
|
||||
add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all)
|
||||
|
||||
|
|
33
reactos/dll/directx/dinput8/dinput8.idl
Normal file
33
reactos/dll/directx/dinput8/dinput8.idl
Normal file
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* COM Classes for dinput8
|
||||
*
|
||||
* Copyright 2010 Alexandre Julliard
|
||||
*
|
||||
* This library 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.1 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 St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
[
|
||||
helpstring("DirectInput8 Object"),
|
||||
threading(both),
|
||||
uuid(25e609e4-b259-11cf-bfc7-444553540000)
|
||||
]
|
||||
coclass DirectInput8 { interface IDirectInput8; }
|
||||
|
||||
[
|
||||
helpstring("DirectInputDevice8 Object"),
|
||||
threading(both),
|
||||
uuid(25e609e5-b259-11cf-bfc7-444553540000)
|
||||
]
|
||||
coclass DirectInputDevice { interface IDirectInputDevice8; }
|
17
reactos/dll/directx/dinput8/dinput8.rgs
Normal file
17
reactos/dll/directx/dinput8/dinput8.rgs
Normal file
|
@ -0,0 +1,17 @@
|
|||
HKCR
|
||||
{
|
||||
NoRemove Interface
|
||||
{
|
||||
}
|
||||
NoRemove CLSID
|
||||
{
|
||||
'{25E609E4-B259-11CF-BFC7-444553540000}' = s 'DirectInput8 Object'
|
||||
{
|
||||
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
|
||||
}
|
||||
'{25E609E5-B259-11CF-BFC7-444553540000}' = s 'DirectInputDevice8 Object'
|
||||
{
|
||||
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -32,9 +32,13 @@
|
|||
//#include "windef.h"
|
||||
#include <winbase.h>
|
||||
//#include "winerror.h"
|
||||
#include <objbase.h>
|
||||
#include <rpcproxy.h>
|
||||
#include <dinput.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
|
||||
|
||||
static HINSTANCE instance;
|
||||
static LONG dll_count;
|
||||
|
||||
/*
|
||||
|
@ -53,37 +57,65 @@ static void UnlockModule(void)
|
|||
/******************************************************************************
|
||||
* DirectInput8Create (DINPUT8.@)
|
||||
*/
|
||||
HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) {
|
||||
HRESULT hr;
|
||||
HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) {
|
||||
IDirectInputA *pDI;
|
||||
HRESULT hr, hrCo;
|
||||
|
||||
TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
|
||||
|
||||
/* The specified version needs to be dinput8 (0x800) or higher */
|
||||
if(dwVersion < 0x800)
|
||||
return DIERR_OLDDIRECTINPUTVERSION;
|
||||
if (!ppDI)
|
||||
return E_POINTER;
|
||||
|
||||
if( !(IsEqualGUID(&IID_IDirectInput8A, riid) || IsEqualGUID(&IID_IDirectInput8W, riid) || IsEqualGUID(&IID_IUnknown, riid)) )
|
||||
return DIERR_INVALIDPARAM;
|
||||
|
||||
CoInitialize(NULL);
|
||||
|
||||
hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI);
|
||||
if(FAILED(hr)) {
|
||||
ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr);
|
||||
return DIERR_INVALIDPARAM;
|
||||
if (!IsEqualGUID(&IID_IDirectInput8A, riid) &&
|
||||
!IsEqualGUID(&IID_IDirectInput8W, riid) &&
|
||||
!IsEqualGUID(&IID_IUnknown, riid))
|
||||
{
|
||||
*ppDI = NULL;
|
||||
return DIERR_NOINTERFACE;
|
||||
}
|
||||
|
||||
hrCo = CoInitialize(NULL);
|
||||
|
||||
hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
|
||||
|
||||
/* Ensure balance of calls. */
|
||||
if (SUCCEEDED(hrCo))
|
||||
CoUninitialize();
|
||||
|
||||
if (FAILED(hr)) {
|
||||
ERR("CoCreateInstance failed with hr = 0x%08x\n", hr);
|
||||
return hr;
|
||||
}
|
||||
|
||||
hr = IDirectInput_QueryInterface(pDI, riid, ppDI);
|
||||
IDirectInput_Release(pDI);
|
||||
|
||||
if (FAILED(hr))
|
||||
return hr;
|
||||
|
||||
/* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */
|
||||
if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) {
|
||||
LPDIRECTINPUTA DI = *ppDI;
|
||||
IDirectInput8_Initialize(DI, hinst, dwVersion);
|
||||
IDirectInput8A *DI = *ppDI;
|
||||
|
||||
hr = IDirectInput8_Initialize(DI, hinst, dwVersion);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
IDirectInput8_Release(DI);
|
||||
*ppDI = NULL;
|
||||
return hr;
|
||||
}
|
||||
}
|
||||
|
||||
if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) {
|
||||
LPDIRECTINPUTW DI = *ppDI;
|
||||
IDirectInput8_Initialize(DI, hinst, dwVersion);
|
||||
IDirectInput8W *DI = *ppDI;
|
||||
|
||||
hr = IDirectInput8_Initialize(DI, hinst, dwVersion);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
IDirectInput8_Release(DI);
|
||||
*ppDI = NULL;
|
||||
return hr;
|
||||
}
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
|
@ -95,11 +127,16 @@ HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid,
|
|||
typedef struct
|
||||
{
|
||||
/* IUnknown fields */
|
||||
const IClassFactoryVtbl *lpVtbl;
|
||||
IClassFactory IClassFactory_iface;
|
||||
} IClassFactoryImpl;
|
||||
|
||||
static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
|
||||
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
|
||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
||||
FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj);
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
@ -115,11 +152,21 @@ static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) {
|
|||
}
|
||||
|
||||
static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) {
|
||||
IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
|
||||
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
|
||||
|
||||
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
|
||||
if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) {
|
||||
return DirectInputCreateEx(0, DIRECTINPUT_VERSION, riid, ppobj, pOuter);
|
||||
IDirectInputA *ppDI;
|
||||
HRESULT hr;
|
||||
|
||||
hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&ppDI);
|
||||
if (FAILED(hr))
|
||||
return hr;
|
||||
|
||||
hr = IDirectInput_QueryInterface(ppDI, riid, ppobj);
|
||||
IDirectInput_Release(ppDI);
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj);
|
||||
|
@ -144,7 +191,7 @@ static const IClassFactoryVtbl DI8CF_Vtbl = {
|
|||
DI8CF_CreateInstance,
|
||||
DI8CF_LockServer
|
||||
};
|
||||
static IClassFactoryImpl DINPUT8_CF = { &DI8CF_Vtbl };
|
||||
static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } };
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
|
@ -170,3 +217,34 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
|||
FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DllMain
|
||||
*/
|
||||
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
|
||||
{
|
||||
switch (reason)
|
||||
{
|
||||
case DLL_PROCESS_ATTACH:
|
||||
instance = hInstDLL;
|
||||
DisableThreadLibraryCalls( hInstDLL );
|
||||
break;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DllRegisterServer (DINPUT8.@)
|
||||
*/
|
||||
HRESULT WINAPI DllRegisterServer(void)
|
||||
{
|
||||
return __wine_register_resources( instance );
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DllUnregisterServer (DINPUT8.@)
|
||||
*/
|
||||
HRESULT WINAPI DllUnregisterServer(void)
|
||||
{
|
||||
return __wine_unregister_resources( instance );
|
||||
}
|
||||
|
|
|
@ -1,298 +0,0 @@
|
|||
/*
|
||||
* self-registerable dll functions for dinput8.dll
|
||||
*
|
||||
* Copyright (C) 2003 John K. Hohm
|
||||
* Copyright (C) 2007 Francois Gouget for CodeWeavers
|
||||
*
|
||||
* This library 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.1 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 St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <string.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winreg.h>
|
||||
//#include "wingdi.h"
|
||||
//#include "winuser.h"
|
||||
//#include "winerror.h"
|
||||
|
||||
#include <dinput.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
|
||||
|
||||
/*
|
||||
* Near the bottom of this file are the exported DllRegisterServer and
|
||||
* DllUnregisterServer, which make all this worthwhile.
|
||||
*/
|
||||
|
||||
/***********************************************************************
|
||||
* interface for self-registering
|
||||
*/
|
||||
|
||||
struct regsvr_coclass
|
||||
{
|
||||
CLSID const *clsid; /* NULL for end of list */
|
||||
LPCSTR name; /* can be NULL to omit */
|
||||
LPCSTR ips; /* can be NULL to omit */
|
||||
LPCSTR ips32; /* can be NULL to omit */
|
||||
LPCSTR ips32_tmodel; /* can be NULL to omit */
|
||||
LPCSTR clsid_str; /* can be NULL to omit */
|
||||
LPCSTR progid; /* can be NULL to omit */
|
||||
};
|
||||
|
||||
static HRESULT register_coclasses(struct regsvr_coclass const *list);
|
||||
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
|
||||
|
||||
/***********************************************************************
|
||||
* static string constants
|
||||
*/
|
||||
static WCHAR const interface_keyname[10] = {
|
||||
'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
|
||||
static WCHAR const base_ifa_keyname[14] = {
|
||||
'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
|
||||
'e', 0 };
|
||||
static WCHAR const num_methods_keyname[11] = {
|
||||
'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
|
||||
static WCHAR const ps_clsid_keyname[15] = {
|
||||
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
|
||||
'i', 'd', 0 };
|
||||
static WCHAR const ps_clsid32_keyname[17] = {
|
||||
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
|
||||
'i', 'd', '3', '2', 0 };
|
||||
static WCHAR const clsid_keyname[6] = {
|
||||
'C', 'L', 'S', 'I', 'D', 0 };
|
||||
static WCHAR const ips_keyname[13] = {
|
||||
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
|
||||
0 };
|
||||
static WCHAR const ips32_keyname[15] = {
|
||||
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
|
||||
'3', '2', 0 };
|
||||
static WCHAR const progid_keyname[7] = {
|
||||
'P', 'r', 'o', 'g', 'I', 'D', 0 };
|
||||
static char const tmodel_valuename[] = "ThreadingModel";
|
||||
|
||||
/***********************************************************************
|
||||
* static helper functions
|
||||
*/
|
||||
static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
|
||||
WCHAR const *value);
|
||||
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
|
||||
char const *value);
|
||||
|
||||
/***********************************************************************
|
||||
* register_coclasses
|
||||
*/
|
||||
static HRESULT register_coclasses(struct regsvr_coclass const *list)
|
||||
{
|
||||
LONG res = ERROR_SUCCESS;
|
||||
HKEY coclass_key;
|
||||
|
||||
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
|
||||
KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
|
||||
if (res != ERROR_SUCCESS) goto error_return;
|
||||
|
||||
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
|
||||
WCHAR buf[39];
|
||||
HKEY clsid_key;
|
||||
|
||||
StringFromGUID2(list->clsid, buf, 39);
|
||||
res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
|
||||
KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
|
||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
||||
|
||||
if (list->name) {
|
||||
res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
|
||||
(CONST BYTE*)(list->name),
|
||||
strlen(list->name) + 1);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
}
|
||||
|
||||
if (list->ips) {
|
||||
res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
}
|
||||
|
||||
if (list->ips32) {
|
||||
HKEY ips32_key;
|
||||
|
||||
res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
|
||||
KEY_READ | KEY_WRITE, NULL,
|
||||
&ips32_key, NULL);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
|
||||
res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
|
||||
(CONST BYTE*)list->ips32,
|
||||
lstrlenA(list->ips32) + 1);
|
||||
if (res == ERROR_SUCCESS && list->ips32_tmodel)
|
||||
res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
|
||||
(CONST BYTE*)list->ips32_tmodel,
|
||||
strlen(list->ips32_tmodel) + 1);
|
||||
RegCloseKey(ips32_key);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
}
|
||||
|
||||
if (list->clsid_str) {
|
||||
res = register_key_defvalueA(clsid_key, clsid_keyname,
|
||||
list->clsid_str);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
}
|
||||
|
||||
if (list->progid) {
|
||||
HKEY progid_key;
|
||||
|
||||
res = register_key_defvalueA(clsid_key, progid_keyname,
|
||||
list->progid);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
|
||||
res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0,
|
||||
NULL, 0, KEY_READ | KEY_WRITE, NULL,
|
||||
&progid_key, NULL);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
|
||||
res = register_key_defvalueW(progid_key, clsid_keyname, buf);
|
||||
RegCloseKey(progid_key);
|
||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
||||
}
|
||||
|
||||
error_close_clsid_key:
|
||||
RegCloseKey(clsid_key);
|
||||
}
|
||||
|
||||
error_close_coclass_key:
|
||||
RegCloseKey(coclass_key);
|
||||
error_return:
|
||||
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* unregister_coclasses
|
||||
*/
|
||||
static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
|
||||
{
|
||||
LONG res = ERROR_SUCCESS;
|
||||
HKEY coclass_key;
|
||||
|
||||
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
|
||||
KEY_READ | KEY_WRITE, &coclass_key);
|
||||
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
|
||||
if (res != ERROR_SUCCESS) goto error_return;
|
||||
|
||||
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
|
||||
WCHAR buf[39];
|
||||
|
||||
StringFromGUID2(list->clsid, buf, 39);
|
||||
res = RegDeleteTreeW(coclass_key, buf);
|
||||
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
|
||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
||||
|
||||
if (list->progid) {
|
||||
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
|
||||
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
|
||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
||||
}
|
||||
}
|
||||
|
||||
error_close_coclass_key:
|
||||
RegCloseKey(coclass_key);
|
||||
error_return:
|
||||
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* regsvr_key_defvalueW
|
||||
*/
|
||||
static LONG register_key_defvalueW(
|
||||
HKEY base,
|
||||
WCHAR const *name,
|
||||
WCHAR const *value)
|
||||
{
|
||||
LONG res;
|
||||
HKEY key;
|
||||
|
||||
res = RegCreateKeyExW(base, name, 0, NULL, 0,
|
||||
KEY_READ | KEY_WRITE, NULL, &key, NULL);
|
||||
if (res != ERROR_SUCCESS) return res;
|
||||
res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
|
||||
(lstrlenW(value) + 1) * sizeof(WCHAR));
|
||||
RegCloseKey(key);
|
||||
return res;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* regsvr_key_defvalueA
|
||||
*/
|
||||
static LONG register_key_defvalueA(
|
||||
HKEY base,
|
||||
WCHAR const *name,
|
||||
char const *value)
|
||||
{
|
||||
LONG res;
|
||||
HKEY key;
|
||||
|
||||
res = RegCreateKeyExW(base, name, 0, NULL, 0,
|
||||
KEY_READ | KEY_WRITE, NULL, &key, NULL);
|
||||
if (res != ERROR_SUCCESS) return res;
|
||||
res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
|
||||
lstrlenA(value) + 1);
|
||||
RegCloseKey(key);
|
||||
return res;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* coclass list
|
||||
*/
|
||||
|
||||
static struct regsvr_coclass const coclass_list[] = {
|
||||
{ &CLSID_DirectInput8,
|
||||
"DirectInput8 Object",
|
||||
NULL,
|
||||
"dinput8.dll",
|
||||
"Both"
|
||||
},
|
||||
{ NULL } /* list terminator */
|
||||
};
|
||||
|
||||
/***********************************************************************
|
||||
* DllRegisterServer (DINPUT8.@)
|
||||
*/
|
||||
HRESULT WINAPI DllRegisterServer(void)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("\n");
|
||||
|
||||
hr = register_coclasses(coclass_list);
|
||||
return hr;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DllUnregisterServer (DINPUT8.@)
|
||||
*/
|
||||
HRESULT WINAPI DllUnregisterServer(void)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("\n");
|
||||
|
||||
hr = unregister_coclasses(coclass_list);
|
||||
return hr;
|
||||
}
|
|
@ -16,6 +16,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
1 WINE_REGISTRY dinput8.rgs
|
||||
|
||||
#define WINE_FILEDESCRIPTION_STR "Wine DirectInput 8"
|
||||
#define WINE_FILENAME_STR "dinput8.dll"
|
||||
#define WINE_FILEVERSION 5,1,2600,881
|
||||
|
@ -23,4 +25,4 @@
|
|||
#define WINE_PRODUCTVERSION 5,1,2600,881
|
||||
#define WINE_PRODUCTVERSION_STR "5.1"
|
||||
|
||||
#include "wine/wine_common_ver.rc"
|
||||
#include <wine/wine_common_ver.rc>
|
||||
|
|
|
@ -29,7 +29,7 @@ The following libraries are shared with Wine.
|
|||
|
||||
reactos/dll/directx/amstream # Synced to Wine-1.3.37
|
||||
reactos/dll/directx/dinput # Synced to Wine-1.5.26
|
||||
reactos/dll/directx/dinput8 # Synced to Wine-20090208
|
||||
reactos/dll/directx/dinput8 # Synced to Wine-1.5.26
|
||||
reactos/dll/directx/dmusic # Synced to Wine-1.5.26
|
||||
reactos/dll/directx/dplay # Synced to Wine-1.5.26
|
||||
reactos/dll/directx/dplayx # Synced to Wine-1.5.26
|
||||
|
|
Loading…
Reference in a new issue