From 672316dd138b491cc63ea8fb88d46ac70d3b980a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 31 Dec 2004 14:50:49 +0000 Subject: [PATCH] Need to remove existing files before doing vendor import svn path=/trunk/; revision=12506 --- 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/makefile | 9 --- reactos/lib/dinput8/version.rc | 27 -------- reactos/lib/dinput8/winehq2ros.patch | 14 ---- 7 files changed, 184 deletions(-) delete mode 100644 reactos/lib/dinput8/Makefile.in delete mode 100644 reactos/lib/dinput8/Makefile.ros-template delete mode 100644 reactos/lib/dinput8/dinput8.spec delete mode 100644 reactos/lib/dinput8/dinput8_main.c delete mode 100644 reactos/lib/dinput8/makefile delete mode 100644 reactos/lib/dinput8/version.rc delete mode 100644 reactos/lib/dinput8/winehq2ros.patch diff --git a/reactos/lib/dinput8/Makefile.in b/reactos/lib/dinput8/Makefile.in deleted file mode 100644 index 8494fd6e74b..00000000000 --- a/reactos/lib/dinput8/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index d6cd94f3feb..00000000000 --- a/reactos/lib/dinput8/Makefile.ros-template +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: Makefile.ros-template,v 1.3 2004/12/20 00:57:38 greatlrd Exp $ - -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 deleted file mode 100644 index 571ab331c75..00000000000 --- a/reactos/lib/dinput8/dinput8.spec +++ /dev/null @@ -1,5 +0,0 @@ -@ 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 deleted file mode 100644 index 7de9b95079b..00000000000 --- a/reactos/lib/dinput8/dinput8_main.c +++ /dev/null @@ -1,83 +0,0 @@ -/* 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/makefile b/reactos/lib/dinput8/makefile deleted file mode 100644 index c9e7b2addd6..00000000000 --- a/reactos/lib/dinput8/makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: makefile,v 1.1 2004/11/29 00:14:14 greatlrd Exp $ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = winedll - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk diff --git a/reactos/lib/dinput8/version.rc b/reactos/lib/dinput8/version.rc deleted file mode 100644 index e69fa99701d..00000000000 --- a/reactos/lib/dinput8/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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" diff --git a/reactos/lib/dinput8/winehq2ros.patch b/reactos/lib/dinput8/winehq2ros.patch deleted file mode 100644 index f41fe95b31b..00000000000 --- a/reactos/lib/dinput8/winehq2ros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: version.rc -=================================================================== -RCS file: /home/wine/wine/dlls/dinput8/version.rc,v -retrieving revision 1.4 -diff -u -r1.4 version.rc ---- version.rc 23 Nov 2004 13:59:36 -0000 1.4 -+++ version.rc 7 Dec 2004 22:27:53 -0000 -@@ -22,5 +22,6 @@ - #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"