[ros-diffs] [dchapyshev] 39208: - Add activeds from Wine

Author: dchapyshev
Date: Fri Jan 30 02:51:45 2009
New Revision: 39208

URL: http://svn.reactos.org/svn/reactos?rev=39208&view=rev
Log:
- Add activeds from Wine

Added:
    trunk/reactos/dll/win32/activeds/   (with props)
    trunk/reactos/dll/win32/activeds/activeds.rbuild   (with props)
    trunk/reactos/dll/win32/activeds/activeds.spec   (with props)
    trunk/reactos/dll/win32/activeds/activeds_main.c   (with props)
Modified:
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/win32/win32.rbuild

Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=392…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Jan 30 02:51:45 2009
@@ -192,6 +192,7 @@
   <property name="BASEADDRESS_VERSION" value="0x77a40000" />
   <property name="BASEADDRESS_OLE32" value="0x77a50000" />
   <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" />
+  <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" />
   <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
   <property name="BASEADDRESS_USER32" value="0x77e30000" />
   <property name="BASEADDRESS_GDI32" value="0x77f70000" />

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Jan 30 02:51:45
2009
@@ -124,6 +124,7 @@
 dll\cpl\ncpa\ncpa.cpl                               1
 dll\cpl\powercfg\powercfg.cpl                       1
 dll\cpl\sysdm\sysdm.cpl                             1
+;dll\cpl\telephon\telephon.cpl                      1
 dll\cpl\timedate\timedate.cpl                       1
 dll\cpl\input\input.dll                             1
 dll\cpl\joy\joy.cpl                                 1
@@ -230,6 +231,7 @@
 
 dll\win32\acledit\acledit.dll                       1
 dll\win32\aclui\aclui.dll                           1
+dll\win32\activeds\activeds.dll                     1
 dll\win32\advapi32\advapi32.dll                     1
 dll\win32\advpack\advpack.dll                       1
 dll\win32\atl\atl.dll                               1

Propchange: trunk/reactos/dll/win32/activeds/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Fri Jan 30 02:51:45 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/dll/win32/activeds/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/dll/win32/activeds/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/dll/win32/activeds/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/reactos/dll/win32/activeds/activeds.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived…
==============================================================================
--- trunk/reactos/dll/win32/activeds/activeds.rbuild (added)
+++ trunk/reactos/dll/win32/activeds/activeds.rbuild [iso-8859-1] Fri Jan 30 02:51:45
2009
@@ -1,0 +1,11 @@
+<group>
+<module name="activeds" type="win32dll"
baseaddress="${BASEADDRESS_ACTIVEDS}" installbase="system32"
installname="activeds.dll">
+	<importlibrary definition="activeds.spec" />
+	<include base="activeds">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<library>kernel32</library>
+	<library>wine</library>
+	<file>activeds_main.c</file>
+</module>
+</group>

Propchange: trunk/reactos/dll/win32/activeds/activeds.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/activeds/activeds.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived…
==============================================================================
--- trunk/reactos/dll/win32/activeds/activeds.spec (added)
+++ trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] Fri Jan 30 02:51:45 2009
@@ -1,0 +1,28 @@
+3 stdcall ADsGetObject(wstr ptr ptr)
+4 stdcall ADsBuildEnumerator(ptr ptr)
+5 stub ADsFreeEnumerator
+6 stdcall ADsEnumerateNext(ptr long ptr ptr)
+7 stub ADsBuildVarArrayStr
+8 stub ADsBuildVarArrayInt
+9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr)
+12 stub ADsSetLastError
+13 stub ADsGetLastError
+14 stub AllocADsMem
+15 stdcall FreeADsMem(ptr)
+16 stub ReallocADsMem
+17 stub AllocADsStr
+18 stub FreeADsStr
+19 stub ReallocADsStr
+20 stub ADsEncodeBinaryData
+21 stub PropVariantToAdsType
+22 stub AdsTypeToPropVariant
+23 stub AdsFreeAdsValues
+24 stub ADsDecodeBinaryData
+25 stub AdsTypeToPropVariant2
+26 stub PropVariantToAdsType2
+27 stub ConvertSecDescriptorToVariant
+28 stub ConvertSecurityDescriptorToSecDes
+#@ stub DllCanUnloadNow
+#@ stub DllGetClassObject
+#@ stub DllRegisterServer
+#@ stub DllUnregisterServer

Propchange: trunk/reactos/dll/win32/activeds/activeds.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/activeds/activeds_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived…
==============================================================================
--- trunk/reactos/dll/win32/activeds/activeds_main.c (added)
+++ trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] Fri Jan 30 02:51:45
2009
@@ -1,0 +1,104 @@
+/*
+ * Implementation of the Active Directory Service Interface
+ *
+ * Copyright 2005 Detlef Riekenberg
+ *
+ * This file contains only stubs to get the printui.dll up and running
+ * activeds.dll is much much more than this
+ *
+ * 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>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+
+#include "objbase.h"
+#include "iads.h"
+#include "adshlp.h"
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(activeds);
+
+/*****************************************************
+ * DllMain
+ */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
+
+    switch(fdwReason)
+    {
+    case DLL_WINE_PREATTACH:
+        return FALSE;  /* prefer native version */
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls( hinstDLL );
+        break;
+    }
+    return TRUE;
+}
+
+/*****************************************************
+ * ADsGetObject     [ACTIVEDS.3]
+ */
+HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject)
+{
+    FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName),
debugstr_guid(riid), ppObject);
+    return E_NOTIMPL;
+}
+
+/*****************************************************
+ * ADsBuildEnumerator    [ACTIVEDS.4]
+ */
+HRESULT WINAPI ADsBuildEnumerator(IADsContainer * pADsContainer, IEnumVARIANT**
ppEnumVariant)
+{
+    FIXME("(%p)->(%p)!stub\n",pADsContainer, ppEnumVariant);
+    return E_NOTIMPL;
+}
+
+/*****************************************************
+ * ADsEnumerateNext     [ACTIVEDS.6]
+ */
+HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT*
pvar, ULONG * pcElementsFetched)
+{
+    FIXME("(%p)->(%u, %p, %p)!stub\n",pEnumVariant, cElements, pvar,
pcElementsFetched);
+    return E_NOTIMPL;
+}
+
+/*****************************************************
+ * ADsOpenObject     [ACTIVEDS.9]
+ */
+HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR
lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject)
+{
+    FIXME("(%s,%s,%u,%p,%p)!stub\n", debugstr_w(lpszPathName),
+          debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject);
+    return E_NOTIMPL;
+}
+
+/*****************************************************
+ * FreeADsMem             [ACTIVEDS.15]
+ */
+BOOL WINAPI FreeADsMem(LPVOID pMem)
+{
+    FIXME("(%p)!stub\n",pMem);
+    return FALSE;
+}

Propchange: trunk/reactos/dll/win32/activeds/activeds_main.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Jan 30 02:51:45 2009
@@ -7,6 +7,9 @@
 <directory name="aclui">
 	<xi:include href="aclui/aclui.rbuild" />
 </directory>
+<directory name="activeds">
+	<xi:include href="activeds/activeds.rbuild" />
+</directory>
 <directory name="advapi32">
 	<xi:include href="advapi32/advapi32.rbuild" />
 </directory>