[ros-diffs] [gvg] 20134: Sync to Wine-0_9_3:

Sync to Wine-0_9_3:
Francois Gouget <fgouget(a)free.fr>
- Better stick to the PSDK types and to the dsrole.h prototype.
  Update win32.api.
Paul Vriens <Paul.Vriens(a)xs4all.nl>
- Added some stubbed Ds-calls
  Start of conformance tests for these Ds-calls.
Ge van Geldorp <gvg(a)reactos.org>
- Match PSDK STATUS_* definitions.
Vincent Béron <vberon(a)mecano.gme.usherb.ca>
- Add a few missing #includes.
- Add some prototypes to include/ for already existing functions in
  netapi32.
Modified: trunk/reactos/lib/netapi32/browsr.c
Added: trunk/reactos/lib/netapi32/ds.c
Modified: trunk/reactos/lib/netapi32/netapi32.c
Modified: trunk/reactos/lib/netapi32/netapi32.spec
Modified: trunk/reactos/lib/netapi32/netapi32.xml
Modified: trunk/reactos/lib/netapi32/wksta.c
Added: trunk/reactos/w32api/include/dsrole.h
  _____  

Modified: trunk/reactos/lib/netapi32/browsr.c
--- trunk/reactos/lib/netapi32/browsr.c	2005-12-12 23:01:12 UTC (rev
20133)
+++ trunk/reactos/lib/netapi32/browsr.c	2005-12-12 23:04:15 UTC (rev
20134)
@@ -25,6 +25,7 @@

 #include "winerror.h"
 #include "lmcons.h"
 #include "lmbrowsr.h"
+#include "lmshare.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
  _____  

Copied: trunk/reactos/lib/netapi32/ds.c (from rev 20133,
vendor/wine/dlls/netapi32/current/ds.c)
Property changes on: trunk/reactos/lib/netapi32/ds.c
___________________________________________________________________
Name: svn:keywords   + Author Date Id Revision Name: svn:eol-style   +
native 
  _____  

Modified: trunk/reactos/lib/netapi32/netapi32.c
--- trunk/reactos/lib/netapi32/netapi32.c	2005-12-12 23:01:12 UTC
(rev 20133)
+++ trunk/reactos/lib/netapi32/netapi32.c	2005-12-12 23:04:15 UTC
(rev 20134)
@@ -19,6 +19,7 @@

 #include "config.h"
 
 #include "wine/debug.h"
+#include "lm.h"
 #include "netbios.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(netbios);
  _____  

Modified: trunk/reactos/lib/netapi32/netapi32.spec
--- trunk/reactos/lib/netapi32/netapi32.spec	2005-12-12 23:01:12 UTC
(rev 20133)
+++ trunk/reactos/lib/netapi32/netapi32.spec	2005-12-12 23:04:15 UTC
(rev 20134)
@@ -1,3 +1,18 @@

+@ stub DsAddressToSiteNames
+@ stub DsAddressToSiteNamesEx
+@ stub DsDeregisterDnsHostRecords
+@ stub DsEnumerateDomainTrusts
+@ stub DsGetDcClose
+@ stub DsGetDcName
+@ stub DsGetDcNext
+@ stub DsGetDcOpen
+@ stub DsGetDcSiteCoverage
+@ stub DsGetForestTrustInformationW
+@ stub DsGetSiteName
+@ stub DsMergeForestTrustInformationW
+@ stdcall DsRoleFreeMemory(ptr)
+@ stdcall DsRoleGetPrimaryDomainInformation(wstr long ptr)
+@ stub DsValidateSubnetName
 @ stub I_BrowserDebugCall
 @ stub I_BrowserDebugTrace
 @ stdcall I_BrowserQueryEmulatedDomains(wstr ptr ptr)
  _____  

Modified: trunk/reactos/lib/netapi32/netapi32.xml
--- trunk/reactos/lib/netapi32/netapi32.xml	2005-12-12 23:01:12 UTC
(rev 20133)
+++ trunk/reactos/lib/netapi32/netapi32.xml	2005-12-12 23:04:15 UTC
(rev 20134)
@@ -17,6 +17,7 @@

 	<file>access.c</file>
 	<file>apibuf.c</file>
 	<file>browsr.c</file>
+	<file>ds.c</file>
 	<file>nbcmdqueue.c</file>
 	<file>nbnamecache.c</file>
 	<file>nbt.c</file>
  _____  

Modified: trunk/reactos/lib/netapi32/wksta.c
--- trunk/reactos/lib/netapi32/wksta.c	2005-12-12 23:01:12 UTC (rev
20133)
+++ trunk/reactos/lib/netapi32/wksta.c	2005-12-12 23:04:15 UTC (rev
20134)
@@ -23,6 +23,7 @@

 
 #include <stdarg.h>
 #include <stdlib.h>
+#include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
@@ -34,8 +35,6 @@
 #include "lmwksta.h"
 #include "iphlpapi.h"
 #include "winerror.h"
-#undef WIN32_NO_STATUS
-#include "ntstatus.h"
 #include "winreg.h"
 #include "ntsecapi.h"
 #include "netbios.h"
  _____  

Added: trunk/reactos/w32api/include/dsrole.h
--- trunk/reactos/w32api/include/dsrole.h	2005-12-12 23:01:12 UTC
(rev 20133)
+++ trunk/reactos/w32api/include/dsrole.h	2005-12-12 23:04:15 UTC
(rev 20134)
@@ -0,0 +1,84 @@

+/*
+ * Directory Services definitions
+ *
+ * Copyright 2005 Paul Vriens
+ *
+ * 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_DSROLE_H
+#define __WINE_DSROLE_H
+
+#define DSROLE_PRIMARY_DS_RUNNING           0x00000001
+#define DSROLE_PRIMARY_DS_MIXED_MODE        0x00000002
+#define DSROLE_UPGRADE_IN_PROGRESS          0x00000004
+#define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT  0x01000000
+
+typedef enum _DSROLE_PRIMARY_DOMAIN_INFO_LEVEL
+{
+    DsRolePrimaryDomainInfoBasic = 1,
+    DsRoleUpgradeStatus,
+    DsRoleOperationState
+} DSROLE_PRIMARY_DOMAIN_INFO_LEVEL;
+
+typedef enum _DSROLE_MACHINE_ROLE
+{
+  DsRole_RoleStandaloneWorkstation = 0,
+  DsRole_RoleMemberWorkstation,
+  DsRole_RoleStandaloneServer,
+  DsRole_RoleMemberServer,
+  DsRole_RoleBackupDomainController,
+  DsRole_RolePrimaryDomainController
+} DSROLE_MACHINE_ROLE;
+
+typedef enum _DSROLE_SERVER_STATE
+{
+  DsRoleServerUnknown = 0,
+  DsRoleServerPrimary,
+  DsRoleServerBackup
+} DSROLE_SERVER_STATE;
+
+typedef enum _DSROLE_OPERATION_STATE
+{
+  DsRoleOperationIdle = 0,
+  DsRoleOperationActive,
+  DsRoleOperationNeedReboot
+} DSROLE_OPERATION_STATE;
+
+typedef struct _DSROLE_PRIMARY_DOMAIN_INFO_BASIC
+{
+    DSROLE_MACHINE_ROLE MachineRole;
+    ULONG Flags;
+    LPWSTR DomainNameFlat;
+    LPWSTR DomainNameDns;
+    LPWSTR DomainForestName;
+    GUID DomainGuid;
+} DSROLE_PRIMARY_DOMAIN_INFO_BASIC, *PDSROLE_PRIMARY_DOMAIN_INFO_BASIC;
+
+typedef struct _DSROLE_UPGRADE_STATUS_INFO
+{
+    ULONG OperationState;
+    DSROLE_SERVER_STATE PreviousServerState;
+} DSROLE_UPGRADE_STATUS_INFO, *PDSROLE_UPGRADE_STATUS_INFO;
+
+typedef struct _DSROLE_OPERATION_STATE_INFO
+{
+    DSROLE_OPERATION_STATE OperationState;
+} DSROLE_OPERATION_STATE_INFO, *PDSROLE_OPERATION_STATE_INFO;
+
+VOID WINAPI DsRoleFreeMemory(IN PVOID Buffer);
+DWORD WINAPI DsRoleGetPrimaryDomainInformation(IN LPCWSTR lpServer
OPTIONAL, IN DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, OUT PBYTE
*Buffer);
+
+#endif /* __WINE_DSROLE_H */
Property changes on: trunk/reactos/w32api/include/dsrole.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native