From 7b0b16d1026e2dcc3d291f49da8f47da94ed5f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 31 Dec 2004 14:52:07 +0000 Subject: [PATCH] Import and merge Wine-20041201 svn path=/trunk/; revision=12507 --- reactos/lib/dinput8/Makefile | 9 +++ reactos/lib/dinput8/Makefile.in | 16 +++++ reactos/lib/dinput8/Makefile.ros-template | 30 ++++++++ reactos/lib/dinput8/dinput8.spec | 5 ++ reactos/lib/dinput8/dinput8_main.c | 83 +++++++++++++++++++++++ reactos/lib/dinput8/version.rc | 27 ++++++++ 6 files changed, 170 insertions(+) create mode 100644 reactos/lib/dinput8/Makefile create mode 100644 reactos/lib/dinput8/Makefile.in create mode 100644 reactos/lib/dinput8/Makefile.ros-template create mode 100644 reactos/lib/dinput8/dinput8.spec create mode 100644 reactos/lib/dinput8/dinput8_main.c create mode 100644 reactos/lib/dinput8/version.rc diff --git a/reactos/lib/dinput8/Makefile b/reactos/lib/dinput8/Makefile new file mode 100644 index 00000000000..928654c8d4f --- /dev/null +++ b/reactos/lib/dinput8/Makefile @@ -0,0 +1,9 @@ +# $Id: makefile 11864 2004-11-29 00:15:23Z greatlrd $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk diff --git a/reactos/lib/dinput8/Makefile.in b/reactos/lib/dinput8/Makefile.in new file mode 100644 index 00000000000..271545360eb --- /dev/null +++ b/reactos/lib/dinput8/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dinput8.dll +IMPORTS = dinput +EXTRALIBS = -luuid + +C_SRCS = \ + dinput8_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +### Dependencies: diff --git a/reactos/lib/dinput8/Makefile.ros-template b/reactos/lib/dinput8/Makefile.ros-template new file mode 100644 index 00000000000..bcfc47efd9e --- /dev/null +++ b/reactos/lib/dinput8/Makefile.ros-template @@ -0,0 +1,30 @@ +# $Id: Makefile.ros-template 12241 2004-12-20 00:57:38Z greatlrd $ + +TARGET_NAME = dinput8 + +TARGET_BASE = $(TARGET_BASE_LIB_DINPUT8) + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ + +TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a winmm.a dxguid.a + + + +TARGET_RC_SRCS = @RC_SRCS@ +TARGET_RC_BINSRC = @RC_BINSRC@ +TARGET_RC_BINARIES = @RC_BINARIES@ + +default: all + +authors.c: +ifeq ($(HOST),mingw32-linux) + echo 'const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 };' > authors.c +else + echo const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 }; > authors.c +endif + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk diff --git a/reactos/lib/dinput8/dinput8.spec b/reactos/lib/dinput8/dinput8.spec new file mode 100644 index 00000000000..22baa36a354 --- /dev/null +++ b/reactos/lib/dinput8/dinput8.spec @@ -0,0 +1,5 @@ +@ stdcall DirectInput8Create(long long ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() DINPUT8_DllCanUnloadNow +@ stdcall -private DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject +@ stdcall -private DllRegisterServer() DINPUT8_DllRegisterServer +@ stdcall -private DllUnregisterServer() DINPUT8_DllUnregisterServer diff --git a/reactos/lib/dinput8/dinput8_main.c b/reactos/lib/dinput8/dinput8_main.c new file mode 100644 index 00000000000..77ac6d52618 --- /dev/null +++ b/reactos/lib/dinput8/dinput8_main.c @@ -0,0 +1,83 @@ +/* DirectInput 8 + * + * Copyright 2002 TransGaming Technologies Inc. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include +#include +#include + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "dinput.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +/****************************************************************************** + * DirectInput8Create (DINPUT8.@) + */ +HRESULT WINAPI DirectInput8Create( + HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, + LPUNKNOWN punkOuter +) { + return DirectInputCreateEx(hinst, dwVersion, riid, ppDI, punkOuter); +} + +/*********************************************************************** + * DllCanUnloadNow (DINPUT8.@) + */ +HRESULT WINAPI DINPUT8_DllCanUnloadNow(void) +{ + FIXME("(void): stub\n"); + + return S_FALSE; +} + +/*********************************************************************** + * DllGetClassObject (DINPUT8.@) + */ +HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid, + LPVOID *ppv) +{ + FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), + debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (DINPUT8.@) + */ +HRESULT WINAPI DINPUT8_DllRegisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (DINPUT8.@) + */ +HRESULT WINAPI DINPUT8_DllUnregisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} diff --git a/reactos/lib/dinput8/version.rc b/reactos/lib/dinput8/version.rc new file mode 100644 index 00000000000..0167afa61f1 --- /dev/null +++ b/reactos/lib/dinput8/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2004 Tom Wickline + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DirectInput 8" +#define WINE_FILENAME_STR "dinput8.dll" +#define WINE_FILEVERSION 5,1,2600,881 +#define WINE_FILEVERSION_STR "5.1.2600.881" +#define WINE_PRODUCTVERSION 5,1,2600,881 +#define WINE_PRODUCTVERSION_STR "5.1" +#define WINE_PRODUCTNAME_STR "DirectX" + +#include "wine/wine_common_ver.rc"