Francois Gouget : netapi32: Add lmuseflg.h and include it from lmuse.h.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Aug 6 08:03:46 CDT 2007


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Aug  4 03:20:00 2007 +0200

netapi32: Add lmuseflg.h and include it from lmuse.h.

Also add some prototypes to lmuse.h, and use it in the implementation.

---

 dlls/netapi32/access.c |    1 +
 include/Makefile.in    |    1 +
 include/lmuse.h        |   38 +++++++++++++++++++++++++++++---------
 include/lmuseflg.h     |   26 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c
index 70adc97..40b448d 100644
--- a/dlls/netapi32/access.c
+++ b/dlls/netapi32/access.c
@@ -29,6 +29,7 @@
 #include "lmaccess.h"
 #include "lmapibuf.h"
 #include "lmerr.h"
+#include "lmuse.h"
 #include "ntsecapi.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
diff --git a/include/Makefile.in b/include/Makefile.in
index 4d71204..f3702d5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -207,6 +207,7 @@ SRCDIR_INCLUDES = \
 	lmshare.h \
 	lmstats.h \
 	lmuse.h \
+	lmuseflg.h \
 	lmwksta.h \
 	lzexpand.h \
 	mapi.h \
diff --git a/include/lmuse.h b/include/lmuse.h
index 786fb01..043cfac 100644
--- a/include/lmuse.h
+++ b/include/lmuse.h
@@ -22,20 +22,40 @@
 extern "C" {
 #endif
 
-typedef struct _USE_INFO_1 {
-  LMSTR ui1_local, ui1_remote, ui1_password;
-  DWORD ui1_status, ui1_asg_type, ui1_refcount, ui1_usecount;
+#include "lmcons.h"
+#include "lmuseflg.h"
+
+typedef struct _USE_INFO_1
+{
+    LMSTR ui1_local;
+    LMSTR ui1_remote;
+    LMSTR ui1_password;
+    DWORD ui1_status;
+    DWORD ui1_asg_type;
+    DWORD ui1_refcount;
+    DWORD ui1_usecount;
 } USE_INFO_1, *PUSE_INFO_1, *LPUSE_INFO_1;
 
-typedef struct _USE_INFO_2 {
-  LMSTR ui2_local, ui2_remote, ui2_password;
-  DWORD ui2_status, ui2_asg_type, ui2_refcount, ui2_usecount;
-  LPWSTR ui2_username;
-  LMSTR ui2_domainname;
+typedef struct _USE_INFO_2
+{
+    LMSTR ui2_local;
+    LMSTR ui2_remote;
+    LMSTR ui2_password;
+    DWORD ui2_status;
+    DWORD ui2_asg_type;
+    DWORD ui2_refcount;
+    DWORD ui2_usecount;
+    LMSTR ui2_username;
+    LMSTR ui2_domainname;
 } USE_INFO_2, *PUSE_INFO_2, *LPUSE_INFO_2;
 
+NET_API_STATUS WINAPI NetUseAdd(LMSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetUseDel(LMSTR,LMSTR,DWORD);
+NET_API_STATUS WINAPI NetUseEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetUseGetInfo(LMSTR,LMSTR,DWORD,LPBYTE*);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ndef _LMUSE_H */
+#endif /* _LMUSE_H */
diff --git a/include/lmuseflg.h b/include/lmuseflg.h
new file mode 100644
index 0000000..cf00317
--- /dev/null
+++ b/include/lmuseflg.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2007 Francois Gouget
+ *
+ * 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
+ */
+
+#ifndef __WINE_LMUSEFLG_H
+#define __WINE_LMUSEFLG_H
+
+#define USE_NOFORCE           0
+#define USE_FORCE             1
+#define USE_LOTS_OF_FORCE     2
+
+#endif  /* __WINE_LMUSEFLG_H */




More information about the wine-cvs mailing list