Alexandre Julliard : fusion: Remove an unneeded file.

Alexandre Julliard julliard at winehq.org
Fri Jan 18 12:07:36 CST 2013


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jan 18 13:04:51 2013 +0100

fusion: Remove an unneeded file.

---

 dlls/fusion/Makefile.in   |    3 +-
 dlls/fusion/fusion.c      |   10 ++++++++
 dlls/fusion/fusion_main.c |   53 ---------------------------------------------
 3 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 63b1b73..314aba9 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -6,8 +6,7 @@ C_SRCS = \
 	asmenum.c \
 	asmname.c \
 	assembly.c \
-	fusion.c \
-	fusion_main.c
+	fusion.c
 
 RC_SRCS = version.rc
 
diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c
index e79fa3a..e638208 100644
--- a/dlls/fusion/fusion.c
+++ b/dlls/fusion/fusion.c
@@ -32,6 +32,16 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(fusion);
 
+
+/******************************************************************
+ *  InitializeFusion   (FUSION.@)
+ */
+HRESULT WINAPI InitializeFusion(void)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
 /******************************************************************
  *  ClearDownloadCache   (FUSION.@)
  */
diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c
deleted file mode 100644
index 3c7958b..0000000
--- a/dlls/fusion/fusion_main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * fusion main
- *
- * Copyright 2008 James Hawkins
- *
- * 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"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(fusion);
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-        case DLL_PROCESS_DETACH:
-            break;
-        default:
-            break;
-    }
-
-    return TRUE;
-}
-
-HRESULT WINAPI InitializeFusion(void)
-{
-    FIXME("\n");
-    return E_NOTIMPL;
-}




More information about the wine-cvs mailing list