Bruno Jesus : xinput1_2: Prefer builtin DLL.

Alexandre Julliard julliard at winehq.org
Fri Dec 9 13:37:33 CST 2016


Module: wine
Branch: master
Commit: 07258c7d4b5143b0a33db933d71882bfbcfc3e55
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=07258c7d4b5143b0a33db933d71882bfbcfc3e55

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Fri Dec  9 06:49:04 2016 -0200

xinput1_2: Prefer builtin DLL.

Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/xinput1_2/Makefile.in      |  3 ---
 dlls/xinput1_2/xinput1_2_main.c | 37 -------------------------------------
 2 files changed, 40 deletions(-)

diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in
index 3eaec14..16fed94 100644
--- a/dlls/xinput1_2/Makefile.in
+++ b/dlls/xinput1_2/Makefile.in
@@ -1,6 +1,3 @@
 MODULE    = xinput1_2.dll
 
-C_SRCS = \
-	xinput1_2_main.c
-
 RC_SRCS = version.rc
diff --git a/dlls/xinput1_2/xinput1_2_main.c b/dlls/xinput1_2/xinput1_2_main.c
deleted file mode 100644
index 2de4317..0000000
--- a/dlls/xinput1_2/xinput1_2_main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * The Wine project - Xinput Joystick Library
- * Copyright 2008 Andrew Fenn
- *
- * 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
- */
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
-    switch(reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE; /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(inst);
-        break;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list