Hans Leidekker : netapi32: Merge browsr.c into netapi32.c.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Tue Nov 12 10:02:02 2013 +0100

netapi32: Merge browsr.c into netapi32.c.

---

dlls/netapi32/Makefile.in |    1 -
 dlls/netapi32/browsr.c    |   48 ---------------------------------------------
 dlls/netapi32/netapi32.c  |   21 +++++++++++++++++++
 3 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 9d8531f..7ea1adc 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -4,7 +4,6 @@ IMPORTLIB = netapi32
 IMPORTS   = iphlpapi ws2_32 advapi32

C_SRCS = \
-	browsr.c \
    ds.c \
    local_group.c \
    nbcmdqueue.c \
diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c
deleted file mode 100644
index 8b0a5ed..0000000
--- a/dlls/netapi32/browsr.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002 Andriy Palamarchuk
- *
- * netapi32 browser functions
- *
- * 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 "lmcons.h"
-#include "lmbrowsr.h"
-#include "lmshare.h"
-
-/************************************************************
- *                I_BrowserSetNetlogonState  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI I_BrowserSetNetlogonState(
-    LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName,
-    DWORD Role)
-{
-    return ERROR_NOT_SUPPORTED;
-}
-
-/************************************************************
- *                I_BrowserQueryEmulatedDomains  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains(
-    LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains,
-    LPDWORD EntriesRead)
-{
-    return ERROR_NOT_SUPPORTED;
-}
diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
index 857f5e0..9e9b478 100644
--- a/dlls/netapi32/netapi32.c
+++ b/dlls/netapi32/netapi32.c
@@ -37,6 +37,7 @@
 #include "lmaccess.h"
 #include "lmat.h"
 #include "lmapibuf.h"
+#include "lmbrowsr.h"
 #include "lmshare.h"
 #include "lmwksta.h"
 #include "netbios.h"
@@ -1975,3 +1976,23 @@ NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond
     FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond);
     return NERR_Success;
 }
+
+/************************************************************
+ *                I_BrowserSetNetlogonState  (NETAPI32.@)
+ */
+NET_API_STATUS WINAPI I_BrowserSetNetlogonState(
+    LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName,
+    DWORD Role)
+{
+    return ERROR_NOT_SUPPORTED;
+}
+
+/************************************************************
+ *                I_BrowserQueryEmulatedDomains  (NETAPI32.@)
+ */
+NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains(
+    LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains,
+    LPDWORD EntriesRead)
+{
+    return ERROR_NOT_SUPPORTED;
+}