Hans Leidekker : netprofm: Register interfaces.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Apr  7 14:58:26 2014 +0200

netprofm: Register interfaces.

---

 configure                   |    2 +-
 configure.ac                |    2 +-
 dlls/netprofm/Makefile.in   |    2 ++
 dlls/netprofm/main.c        |   16 ++++++++++++++++
 dlls/netprofm/netprofm.idl  |   23 +++++++++++++++++++++++
 dlls/netprofm/netprofm.spec |    4 ++--
 include/netlistmgr.idl      |    5 +++++
 7 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index d65c398..ceae545 100755
--- a/configure
+++ b/configure
@@ -17053,7 +17053,7 @@ wine_fn_config_dll netapi32 enable_netapi32 implib
 wine_fn_config_test dlls/netapi32/tests netapi32_test
 wine_fn_config_dll netcfgx enable_netcfgx clean
 wine_fn_config_test dlls/netcfgx/tests netcfgx_test
-wine_fn_config_dll netprofm enable_netprofm
+wine_fn_config_dll netprofm enable_netprofm clean
 wine_fn_config_dll newdev enable_newdev implib
 wine_fn_config_dll normaliz enable_normaliz implib
 wine_fn_config_dll npmshtml enable_npmshtml
diff --git a/configure.ac b/configure.ac
index fbdc269..3a70159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3031,7 +3031,7 @@ WINE_CONFIG_DLL(netapi32,,[implib])
 WINE_CONFIG_TEST(dlls/netapi32/tests)
 WINE_CONFIG_DLL(netcfgx,,[clean])
 WINE_CONFIG_TEST(dlls/netcfgx/tests)
-WINE_CONFIG_DLL(netprofm)
+WINE_CONFIG_DLL(netprofm,,[clean])
 WINE_CONFIG_DLL(newdev,,[implib])
 WINE_CONFIG_DLL(normaliz,,[implib])
 WINE_CONFIG_DLL(npmshtml)
diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in
index 133b82a..4dadfb0 100644
--- a/dlls/netprofm/Makefile.in
+++ b/dlls/netprofm/Makefile.in
@@ -3,3 +3,5 @@ MODULE    = netprofm.dll
 C_SRCS = \
 	list.c \
 	main.c
+
+IDL_SRCS = netprofm.idl
diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c
index ff694d9..4ba3cd5 100644
--- a/dlls/netprofm/main.c
+++ b/dlls/netprofm/main.c
@@ -144,3 +144,19 @@ HRESULT WINAPI DllCanUnloadNow( void )
 {
     return S_FALSE;
 }
+
+/***********************************************************************
+ *      DllRegisterServer (NETPROFM.@)
+ */
+HRESULT WINAPI DllRegisterServer( void )
+{
+    return __wine_register_resources( instance );
+}
+
+/***********************************************************************
+ *      DllUnregisterServer (NETPROFM.@)
+ */
+HRESULT WINAPI DllUnregisterServer( void )
+{
+    return __wine_unregister_resources( instance );
+}
diff --git a/dlls/netprofm/netprofm.idl b/dlls/netprofm/netprofm.idl
new file mode 100644
index 0000000..31a4565
--- /dev/null
+++ b/dlls/netprofm/netprofm.idl
@@ -0,0 +1,23 @@
+/*
+ * COM Classes for netprofm
+ *
+ * Copyright 2014 Hans Leidekker for CodeWeavers
+ *
+ * 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
+ */
+
+#pragma makedep register
+
+#include "netlistmgr.idl"
diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec
index c534b4f..b16365d 100644
--- a/dlls/netprofm/netprofm.spec
+++ b/dlls/netprofm/netprofm.spec
@@ -1,4 +1,4 @@
 @ stdcall -private DllCanUnloadNow()
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
-@ stub DllRegisterServer
-@ stub DllUnregisterServer
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl
index 51393b9..6adca14 100644
--- a/include/netlistmgr.idl
+++ b/include/netlistmgr.idl
@@ -19,6 +19,10 @@
 import "oaidl.idl";
 import "objidl.idl";
 
+#ifndef __WIDL__
+#define threading(model)
+#endif
+
 interface IEnumNetworks;
 interface IEnumNetworkConnections;
 interface INetwork;
@@ -80,6 +84,7 @@ interface INetworkListManager : IDispatch
 }
 
 [
+    threading(both),
     uuid(dcb00c01-570f-4a9b-8d69-199fdba5723b)
 ]
 coclass NetworkListManager { interface INetworkListManager; }