Jacek Caban : wininet: Moved DllInstall to internet.c.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Jul 24 12:20:00 2014 +0200

wininet: Moved DllInstall to internet.c.

---

dlls/wininet/Makefile.in    |  3 +--
 dlls/wininet/internet.c     |  9 +++++++++
 dlls/wininet/wininet_main.c | 42 ------------------------------------------
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 357b924..5379e03 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -14,7 +14,6 @@ C_SRCS = \
    internet.c \
    netconnection.c \
    urlcache.c \
-	utility.c \
-	wininet_main.c
+	utility.c

RC_SRCS = wininet.rc
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 3ed9bb1..2a2876c 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -341,6 +341,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 }

/***********************************************************************
+ *		DllInstall (WININET.@)
+ */
+HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
+{
+    FIXME("(%x %s): stub\n", bInstall, debugstr_w(cmdline));
+    return S_OK;
+}
+
+/***********************************************************************
  *           INTERNET_SaveProxySettings
  *
  * Stores the proxy settings given by lpwai into the registry
diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c
deleted file mode 100644
index cf4a6f2..0000000
--- a/dlls/wininet/wininet_main.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * WinInet
- *
- * Copyright (c) 2000 Patrik Stridvall
- *
- * 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 <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "winreg.h"
-#include "shlwapi.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-/***********************************************************************
- *		DllInstall (WININET.@)
- */
-HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
-{
-  FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE",
-	debugstr_w(cmdline));
-
-  return S_OK;
-}