[ACTIVEDS]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=61231

diff --git a/reactos/dll/win32/activeds/CMakeLists.txt b/reactos/dll/win32/activeds/CMakeLists.txt
index a4c7b42..399e654 100644 (file)
--- a/reactos/dll/win32/activeds/CMakeLists.txt
+++ b/reactos/dll/win32/activeds/CMakeLists.txt
@@ -1,8 +1,6 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(activeds.dll activeds.spec)
 
 list(APPEND SOURCE
@@ -11,11 +9,7 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 
 add_library(activeds SHARED ${SOURCE})
-
 set_module_type(activeds win32dll)
-
 target_link_libraries(activeds wine)
-
 add_importlibs(activeds msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET activeds DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/activeds/activeds.spec b/reactos/dll/win32/activeds/activeds.spec
index 2b79ca3..1463c2b 100644 (file)
--- a/reactos/dll/win32/activeds/activeds.spec
+++ b/reactos/dll/win32/activeds/activeds.spec
@@ -5,7 +5,7 @@
 7 stdcall ADsBuildVarArrayStr(ptr long ptr)
 8 stdcall ADsBuildVarArrayInt(ptr long ptr)
 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr)
-12 stdcall ADsSetLastError(long str str)
+12 stdcall ADsSetLastError(long ptr ptr)
 13 stdcall ADsGetLastError(ptr ptr long ptr long)
 14 stdcall AllocADsMem(long)
 15 stdcall FreeADsMem(ptr)

diff --git a/reactos/dll/win32/activeds/activeds_main.c b/reactos/dll/win32/activeds/activeds_main.c
index 983f13b..b995fd0 100644 (file)
--- a/reactos/dll/win32/activeds/activeds_main.c
+++ b/reactos/dll/win32/activeds/activeds_main.c
@@ -79,6 +79,15 @@ HRESULT WINAPI ADsBuildEnumerator(IADsContainer * pADsContainer, IEnumVARIANT**
     return E_NOTIMPL;
 }
 
+/*****************************************************
+ * ADsFreeEnumerator     [ACTIVEDS.5]
+ */
+HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant)
+{
+    FIXME("(%p)!stub\n",pEnumVariant);
+    return E_NOTIMPL;
+}
+
 /*****************************************************
  * ADsEnumerateNext     [ACTIVEDS.6]
  */
@@ -88,16 +97,42 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VAR
     return E_NOTIMPL;
 }
 
+/*****************************************************
+ * ADsBuildVarArrayStr     [ACTIVEDS.7]
+ */
+HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar)
+{
+    FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar);
+    return E_NOTIMPL;
+}
+
+/*****************************************************
+ * ADsBuildVarArrayInt     [ACTIVEDS.8]
+ */
+HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar)
+{
+    FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar);
+    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),
+    FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName),
           debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject);
     return E_NOTIMPL;
 }
 
+/*****************************************************
+ * ADsSetLastError    [ACTIVEDS.12]
+ */
+VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider)
+{
+    FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider);
+}
+
 /*****************************************************
  * ADsGetLastError    [ACTIVEDS.13]
  */
@@ -107,6 +142,15 @@ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbufle
     return E_NOTIMPL;
 }
 
+/*****************************************************
+ * AllocADsMem             [ACTIVEDS.14]
+ */
+LPVOID WINAPI AllocADsMem(DWORD cb)
+{
+    FIXME("(%d)!stub\n",cb);
+    return NULL;
+}
+
 /*****************************************************
  * FreeADsMem             [ACTIVEDS.15]
  */
@@ -115,3 +159,48 @@ BOOL WINAPI FreeADsMem(LPVOID pMem)
     FIXME("(%p)!stub\n",pMem);
     return FALSE;
 }
+
+/*****************************************************
+ * ReallocADsMem             [ACTIVEDS.16]
+ */
+LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew)
+{
+    FIXME("(%p,%d,%d)!stub\n", pOldMem, cbOld, cbNew);
+    return NULL;
+}
+
+/*****************************************************
+ * AllocADsStr             [ACTIVEDS.17]
+ */
+LPWSTR WINAPI AllocADsStr(LPWSTR pStr)
+{
+    FIXME("(%p)!stub\n",pStr);
+    return NULL;
+}
+
+/*****************************************************
+ * FreeADsStr             [ACTIVEDS.18]
+ */
+BOOL WINAPI FreeADsStr(LPWSTR pStr)
+{
+    FIXME("(%p)!stub\n",pStr);
+    return FALSE;
+}
+
+/*****************************************************
+ * ReallocADsStr             [ACTIVEDS.19]
+ */
+BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr)
+{
+    FIXME("(%p,%p)!stub\n",*ppStr, pStr);
+    return FALSE;
+}
+
+/*****************************************************
+ * ADsEncodeBinaryData     [ACTIVEDS.20]
+ */
+HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData)
+{
+    FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData);
+    return E_NOTIMPL;
+}

diff --git a/reactos/dll/win32/activeds/stubs.c b/reactos/dll/win32/activeds/stubs.c
index 4393f40..09e3389 100644 (file)
--- a/reactos/dll/win32/activeds/stubs.c
+++ b/reactos/dll/win32/activeds/stubs.c
@@ -11,104 +11,6 @@
 // FIXME: should go to iads.h
 typedef struct _adsvalue *PADSVALUE;
 
-HRESULT
-WINAPI
-ADsFreeEnumerator(
-    IN IEnumVARIANT *pEnumVariant)
-{
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
-}
-
-HRESULT
-WINAPI
-ADsBuildVarArrayStr(
-    LPWSTR *lppPathNames,
-    DWORD dwPathNames,
-    VARIANT *pVar)
-{
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
-}
-
-HRESULT
-WINAPI
-ADsBuildVarArrayInt(
-    LPDWORD lpdwObjectTypes,
-    DWORD dwObjectTypes,
-    VARIANT *pVar)
-{
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
-}
-
-VOID
-WINAPI
-ADsSetLastError(
-    IN DWORD dwErr,
-    IN LPCWSTR pszError,
-    IN LPCWSTR pszProvider)
-
-{
-       UNIMPLEMENTED;
-}
-
-LPVOID
-WINAPI
-AllocADsMem(DWORD cb)
-{
-       UNIMPLEMENTED;
-       return NULL;
-}
-
-LPVOID
-WINAPI
-ReallocADsMem(
-   LPVOID pOldMem,
-   DWORD cbOld,
-   DWORD cbNew)
-{
-       UNIMPLEMENTED;
-       return NULL;
-}
-
-LPWSTR
-WINAPI
-AllocADsStr(LPCWSTR pStr)
-{
-       UNIMPLEMENTED;
-       return NULL;
-}
-
-BOOL
-WINAPI
-FreeADsStr(IN LPWSTR pStr)
-{
-       UNIMPLEMENTED;
-       return FALSE;
-}
-
-BOOL
-WINAPI
-ReallocADsStr(
-   IN OUT LPWSTR *ppStr,
-   IN LPWSTR pStr)
-{
-       UNIMPLEMENTED;
-       return FALSE;
-}
-
-HRESULT
-WINAPI
-ADsEncodeBinaryData(
-   PBYTE pbSrcData,
-   DWORD dwSrcLen,
-   OUT LPWSTR *ppszDestData)
-{
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
-}
-
 HRESULT
 WINAPI
 PropVariantToAdsType(
@@ -117,8 +19,8 @@ PropVariantToAdsType(
     PADSVALUE *ppAdsValues,
     PDWORD pdwNumValues)
 {
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
 }
 
 HRESULT
@@ -128,8 +30,8 @@ AdsTypeToPropVariant(
     DWORD dwNumValues,
     VARIANT * pVariant)
 {
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
 }
 
 void
@@ -138,7 +40,7 @@ AdsFreeAdsValues(
     PADSVALUE pAdsValues,
     DWORD dwNumValues)
 {
-       UNIMPLEMENTED;
+    UNIMPLEMENTED;
 }
 
 HRESULT
@@ -148,35 +50,34 @@ ADsDecodeBinaryData(
    PBYTE  *ppbDestData,
    ULONG  *pdwDestLen)
 {
-       UNIMPLEMENTED;
-       return E_NOTIMPL;
+    UNIMPLEMENTED;
+    return E_NOTIMPL;
 }
 
 int AdsTypeToPropVariant2()
 {
-       DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n");
-       __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
-       return 0;
+    DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n");
+    __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
+    return 0;
 }
 
 int PropVariantToAdsType2()
 {
-       DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n");
-       __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
-       return 0;
+    DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n");
+    __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
+    return 0;
 }
 
 int ConvertSecDescriptorToVariant()
 {
-       DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n");
-       __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
-       return 0;
+    DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n");
+    __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
+    return 0;
 }
 
 int ConvertSecurityDescriptorToSecDes()
 {
-       DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n");
-       __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
-       return 0;
+    DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n");
+    __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
+    return 0;
 }
-

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 23d4992..c79473d 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -48,7 +48,7 @@ reactos/dll/directx/wine/qedit          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/quartz         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/wined3d        # Synced to Wine-1.7.1
 
-reactos/dll/win32/activeds         # Synced to Wine-1.1.43?
+reactos/dll/win32/activeds         # Synced to Wine-1.7.1
 reactos/dll/win32/actxprxy         # Synced to Wine-1.7.1
 reactos/dll/win32/advpack          # Synced to Wine-1.7.1
 reactos/dll/win32/atl              # Synced to Wine-1.7.1