[ros-diffs] [gvg] 19391: New netapi32 vendor import

New netapi32 vendor import
Added: trunk/reactos/include/wine/lmbrowsr.h
Modified: trunk/reactos/lib/aclui/precomp.h
Modified: trunk/reactos/lib/directory.xml
Added: trunk/reactos/lib/netapi32/
Deleted: trunk/reactos/lib/netapi32/Makefile.in
Modified: trunk/reactos/lib/netapi32/access.c
Modified: trunk/reactos/lib/netapi32/netapi32.c
Added: trunk/reactos/lib/netapi32/netapi32.xml
Modified: trunk/reactos/lib/netapi32/wksta.c
Modified: trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/w32api/include/lm.h
Deleted: trunk/reactos/w32api/include/lmbrowsr.h
Added: trunk/reactos/w32api/include/lmjoin.h
Modified: trunk/reactos/w32api/include/ntsecapi.h
  _____  

Added: trunk/reactos/include/wine/lmbrowsr.h
--- trunk/reactos/include/wine/lmbrowsr.h	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/include/wine/lmbrowsr.h	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -0,0 +1,47 @@

+/*
+ * Copyright 2002 Andriy Palamarchuk
+ *
+ * Browser NET API calls
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
+ */
+
+#ifndef __WINE_LMBROWSR_H
+#define __WINE_LMBROWSR_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _BROWSER_EMULATED_DOMAIN {
+    LPWSTR DomainName;
+    LPWSTR EmulatedServerName;
+    DWORD Role;
+} BROWSER_EMULATED_DOMAIN, *PBROWSER_EMULATED_DOMAIN;
+
+NET_API_STATUS WINAPI I_BrowserSetNetlogonState(
+    LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName,
+    DWORD Role);
+
+NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains(
+    LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains,
+    LPDWORD EntriesRead);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: trunk/reactos/include/wine/lmbrowsr.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/aclui/precomp.h
--- trunk/reactos/lib/aclui/precomp.h	2005-11-20 21:13:09 UTC (rev
19390)
+++ trunk/reactos/lib/aclui/precomp.h	2005-11-20 21:19:17 UTC (rev
19391)
@@ -5,6 +5,7 @@

 #include <prsht.h>
 #include <aclui.h>
 #include <sddl.h>
+#include <winternl.h>
 #include <ntsecapi.h>
 #if SUPPORT_UXTHEME
 #include <uxtheme.h>
  _____  

Modified: trunk/reactos/lib/directory.xml
--- trunk/reactos/lib/directory.xml	2005-11-20 21:13:09 UTC (rev
19390)
+++ trunk/reactos/lib/directory.xml	2005-11-20 21:19:17 UTC (rev
19391)
@@ -176,6 +176,9 @@

 <directory name="mswsock">
 	<xi:include href="mswsock/mswsock.xml" />
 </directory>
+<directory name="netapi32">
+	<xi:include href="netapi32/netapi32.xml" />
+</directory>
 <directory name="netcfgx">
 	<xi:include href="netcfgx/netcfgx.xml" />
 </directory>
  _____  

Copied: trunk/reactos/lib/netapi32 (from rev 19390,
vendor/wine/dlls/netapi32/current)
Property changes on: trunk/reactos/lib/netapi32
___________________________________________________________________
Name: svn:ignore   + GNUmakefile 
  _____  

Deleted: trunk/reactos/lib/netapi32/Makefile.in
--- vendor/wine/dlls/netapi32/current/Makefile.in	2005-11-20
21:13:09 UTC (rev 19390)
+++ trunk/reactos/lib/netapi32/Makefile.in	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -1,25 +0,0 @@

-EXTRADEFS = -D_SVRAPI_
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = netapi32.dll
-IMPORTLIB = libnetapi32.$(IMPLIBEXT)
-IMPORTS   = iphlpapi ws2_32 advapi32 kernel32
-
-C_SRCS = \
-	access.c \
-	apibuf.c \
-	browsr.c \
-	nbcmdqueue.c \
-	nbnamecache.c \
-	nbt.c \
-	netapi32.c \
-	netbios.c \
-	wksta.c
-
-SUBDIRS = tests
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Modified: trunk/reactos/lib/netapi32/access.c
--- vendor/wine/dlls/netapi32/current/access.c	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/lib/netapi32/access.c	2005-11-20 21:19:17 UTC (rev
19391)
@@ -95,8 +95,8 @@

 /************************************************************
  *                NetUserAdd (NETAPI32.@)
  */
-NET_API_STATUS WINAPI NetUserAdd(LMSTR servername,
-                  DWORD level, LPBYTE* bufptr, LPDWORD parm_err)
+NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername,
+                  DWORD level, LPBYTE bufptr, LPDWORD parm_err)
 {
     NET_API_STATUS status;
     FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level,
bufptr, parm_err);
@@ -433,7 +433,7 @@
  */
 NET_API_STATUS WINAPI
 NetQueryDisplayInformation(
-    LPWSTR ServerName, DWORD Level, DWORD Index, DWORD
EntriesRequested,
+    LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD
EntriesRequested,
     DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount,
     PVOID *SortedBuffer)
 {
@@ -540,7 +540,7 @@
  */
 
 NET_API_STATUS WINAPI
-NetGetDCName(LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr)
+NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr)
 {
   FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername),
                  debugstr_w(domainname), bufptr);
  _____  

Modified: trunk/reactos/lib/netapi32/netapi32.c
--- vendor/wine/dlls/netapi32/current/netapi32.c	2005-11-20
21:13:09 UTC (rev 19390)
+++ trunk/reactos/lib/netapi32/netapi32.c	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -71,7 +71,7 @@

 /************************************************************
  *                NetServerGetInfo  (NETAPI32.@)
  */
-NET_API_STATUS WINAPI NetServerGetInfo(LPCWSTR servername, DWORD level,
LPBYTE* bufptr)
+NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level,
LPBYTE* bufptr)
 {
     FIXME("stub (%p, %ld, %p)\n", servername, level, bufptr);
     return ERROR_ACCESS_DENIED;
  _____  

Added: trunk/reactos/lib/netapi32/netapi32.xml
--- vendor/wine/dlls/netapi32/current/netapi32.xml	2005-11-20
21:13:09 UTC (rev 19390)
+++ trunk/reactos/lib/netapi32/netapi32.xml	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -0,0 +1,27 @@

+<module name="netapi32" type="win32dll"
baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32"
installname="netapi32.dll" allowwarnings="true">
+	<importlibrary definition="netapi32.spec.def" />
+	<include base="netapi32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_SVRAPI_" />
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>access.c</file>
+	<file>apibuf.c</file>
+	<file>browsr.c</file>
+	<file>nbcmdqueue.c</file>
+	<file>nbnamecache.c</file>
+	<file>nbt.c</file>
+	<file>netapi32.c</file>
+	<file>netbios.c</file>
+	<file>wksta.c</file>
+	<file>netapi32.spec</file>
+</module>
Property changes on: trunk/reactos/lib/netapi32/netapi32.xml
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/netapi32/wksta.c
--- vendor/wine/dlls/netapi32/current/wksta.c	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/lib/netapi32/wksta.c	2005-11-20 21:19:17 UTC (rev
19391)
@@ -23,6 +23,7 @@

 
 #include <stdarg.h>
 #include <stdlib.h>
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winsock2.h"
@@ -33,6 +34,7 @@
 #include "lmwksta.h"
 #include "iphlpapi.h"
 #include "winerror.h"
+#undef WIN32_NO_STATUS
 #include "ntstatus.h"
 #include "winreg.h"
 #include "winternl.h"
  _____  

Modified: trunk/reactos/media/doc/README.WINE
--- trunk/reactos/media/doc/README.WINE	2005-11-20 21:13:09 UTC (rev
19390)
+++ trunk/reactos/media/doc/README.WINE	2005-11-20 21:19:17 UTC (rev
19391)
@@ -54,7 +54,7 @@

 reactos/lib/msimg32		# Synced to Wine-0_9_1
 reactos/lib/msi			# Synced to Wine-0_9_1
 reactos/lib/msvideo		# Out of sync
-reactos/lib/netapi32		# Out of sync
+reactos/lib/netapi32		# Synced to Wine-0_9_1
 reactos/lib/objsel		# Synced to Wine-0_9_1
 reactos/lib/odbc32		# Out of sync. Depends on port of Linux
ODBC.
 reactos/lib/ole32               # Synced to Wine-0_9_1
  _____  

Modified: trunk/reactos/w32api/include/lm.h
--- trunk/reactos/w32api/include/lm.h	2005-11-20 21:13:09 UTC (rev
19390)
+++ trunk/reactos/w32api/include/lm.h	2005-11-20 21:19:17 UTC (rev
19391)
@@ -23,5 +23,6 @@

 #include <lmwksta.h>
 #include <lmserver.h>
 #include <lmstats.h>
+#include <lmjoin.h>
 
 #endif
  _____  

Deleted: trunk/reactos/w32api/include/lmbrowsr.h
--- trunk/reactos/w32api/include/lmbrowsr.h	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/w32api/include/lmbrowsr.h	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -1,74 +0,0 @@

-#ifndef _LMBROWSR_H
-#define _LMBROWSR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define BROWSER_ROLE_PDC 1
-#define BROWSER_ROLE_BDC 2
-typedef struct _BROWSER_STATISTICS {
-	LARGE_INTEGER StatisticsStartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	ULONG NumberOfServerEnumerations;
-	ULONG NumberOfDomainEnumerations;
-	ULONG NumberOfOtherEnumerations;
-	ULONG NumberOfMissedServerAnnouncements;
-	ULONG NumberOfMissedMailslotDatagrams;
-	ULONG NumberOfMissedGetBrowserServerListRequests;
-	ULONG NumberOfFailedServerAnnounceAllocations;
-	ULONG NumberOfFailedMailslotAllocations;
-	ULONG NumberOfFailedMailslotReceives;
-	ULONG NumberOfFailedMailslotWrites;
-	ULONG NumberOfFailedMailslotOpens;
-	ULONG NumberOfDuplicateMasterAnnouncements;
-LARGE_INTEGER NumberOfIllegalDatagrams;
-} BROWSER_STATISTICS,*PBROWSER_STATISTICS,*LPBROWSER_STATISTICS;
-typedef struct _BROWSER_STATISTICS_100 {
-	LARGE_INTEGER StartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	LARGE_INTEGER NumberOfIllegalDatagrams;
-} BROWSER_STATISTICS_100,*PBROWSER_STATISTICS_100;
-typedef struct _BROWSER_STATISTICS_101 {
-	LARGE_INTEGER StartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	LARGE_INTEGER NumberOfIllegalDatagrams;
-	ULONG NumberOfMissedServerAnnouncements;
-	ULONG NumberOfMissedMailslotDatagrams;
-	ULONG NumberOfMissedGetBrowserServerListRequests;
-	ULONG NumberOfFailedServerAnnounceAllocations;
-	ULONG NumberOfFailedMailslotAllocations;
-	ULONG NumberOfFailedMailslotReceives;
-	ULONG NumberOfFailedMailslotWrites;
-	ULONG NumberOfFailedMailslotOpens;
-	ULONG NumberOfDuplicateMasterAnnouncements;
-} BROWSER_STATISTICS_101,*PBROWSER_STATISTICS_101;
-
-NET_API_STATUS WINAPI
I_BrowserServerEnum(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PD
WORD,DWORD,LPCWSTR,PDWORD);
-NET_API_STATUS WINAPI
I_BrowserServerEnumEx(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,
PDWORD,DWORD,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI
I_BrowserQueryEmulatedDomains(LPWSTR,PBYTE*,PDWORD);
-NET_API_STATUS
I_BrowserQueryOtherDomains(LPCWSTR,PBYTE*,PDWORD,PDWORD);
-NET_API_STATUS I_BrowserResetNetlogonState(LPCWSTR);
-NET_API_STATUS WINAPI
I_BrowserSetNetlogonState(LPWSTR,LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS I_BrowserQueryStatistics(LPCWSTR,LPBROWSER_STATISTICS*);
-NET_API_STATUS I_BrowserResetStatistics(LPCWSTR);
-WORD
I_BrowserServerEnumForXactsrv(LPCWSTR,LPCWSTR,ULONG,USHORT,PVOID,WORD,DW
ORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR,PWORD);
-NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR);
-#ifdef __cplusplus
-}
-#endif
-#endif
  _____  

Added: trunk/reactos/w32api/include/lmjoin.h
--- trunk/reactos/w32api/include/lmjoin.h	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/w32api/include/lmjoin.h	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -0,0 +1,43 @@

+/*
+ * Copyright 2005 Ulrich Czekalla (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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
+ */
+
+#ifndef __WINE_LMJOIN_H
+#define __WINE_LMJOIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum tagNETSETUP_JOIN_STATUS
+{
+    NetSetupUnknownStatus = 0,
+    NetSetupUnjoined,
+    NetSetupWorkgroupName,
+    NetSetupDomainName
+} NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS;
+
+NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation(
+    LPCWSTR Server,
+    LPWSTR *Name,
+    PNETSETUP_JOIN_STATUS type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: trunk/reactos/w32api/include/lmjoin.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/w32api/include/ntsecapi.h
--- trunk/reactos/w32api/include/ntsecapi.h	2005-11-20 21:13:09 UTC
(rev 19390)
+++ trunk/reactos/w32api/include/ntsecapi.h	2005-11-20 21:19:17 UTC
(rev 19391)
@@ -125,16 +125,6 @@

 
 #if !defined(_NTDEF_H) && !defined(_SUBAUTH_H)
 typedef LONG NTSTATUS, *PNTSTATUS;
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-typedef struct _STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PCHAR Buffer;
-} STRING, *PSTRING;
 #endif
 
 #if defined (_NTDEF_H)