Author: akhaldi
Date: Fri Dec 6 10:20:01 2013
New Revision: 61231
URL: http://svn.reactos.org/svn/reactos?rev=61231&view=rev
Log:
[ACTIVEDS]
* Sync with Wine 1.7.1.
CORE-7469
Modified:
trunk/reactos/dll/win32/activeds/CMakeLists.txt
trunk/reactos/dll/win32/activeds/activeds.spec
trunk/reactos/dll/win32/activeds/activeds_main.c
trunk/reactos/dll/win32/activeds/stubs.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/activeds/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/CMakeLists.txt?rev=61231&r1=61230&r2=61231&view=diff
==============================================================================
--- trunk/reactos/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Fri Dec 6
10:20:01 2013
@@ -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 @@
${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)
Modified: trunk/reactos/dll/win32/activeds/activeds.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/activeds.spec?rev=61231&r1=61230&r2=61231&view=diff
==============================================================================
--- trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] Fri Dec 6
10:20:01 2013
@@ -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)
Modified: trunk/reactos/dll/win32/activeds/activeds_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/activeds_main.c?rev=61231&r1=61230&r2=61231&view=diff
==============================================================================
--- trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] Fri Dec 6
10:20:01 2013
@@ -80,6 +80,15 @@
}
/*****************************************************
+ * ADsFreeEnumerator [ACTIVEDS.5]
+ */
+HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant)
+{
+ FIXME("(%p)!stub\n",pEnumVariant);
+ return E_NOTIMPL;
+}
+
+/*****************************************************
* ADsEnumerateNext [ACTIVEDS.6]
*/
HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements,
VARIANT* pvar, ULONG * pcElementsFetched)
@@ -89,22 +98,57 @@
}
/*****************************************************
+ * 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]
*/
HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD
errorbuflen, LPWSTR namebuf, DWORD namebuflen)
{
FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf,
namebuflen);
return E_NOTIMPL;
+}
+
+/*****************************************************
+ * AllocADsMem [ACTIVEDS.14]
+ */
+LPVOID WINAPI AllocADsMem(DWORD cb)
+{
+ FIXME("(%d)!stub\n",cb);
+ return NULL;
}
/*****************************************************
@@ -115,3 +159,48 @@
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;
+}
Modified: trunk/reactos/dll/win32/activeds/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/stubs.c?rev=61231&r1=61230&r2=61231&view=diff
==============================================================================
--- trunk/reactos/dll/win32/activeds/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/activeds/stubs.c [iso-8859-1] Fri Dec 6
10:20:01 2013
@@ -13,112 +13,14 @@
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(
VARIANT * pVariant,
DWORD dwNumVariant,
PADSVALUE *ppAdsValues,
PDWORD pdwNumValues)
{
- UNIMPLEMENTED;
- return E_NOTIMPL;
+ UNIMPLEMENTED;
+ return E_NOTIMPL;
}
HRESULT
@@ -128,8 +30,8 @@
DWORD dwNumValues,
VARIANT * pVariant)
{
- UNIMPLEMENTED;
- return E_NOTIMPL;
+ UNIMPLEMENTED;
+ return E_NOTIMPL;
}
void
@@ -138,7 +40,7 @@
PADSVALUE pAdsValues,
DWORD dwNumValues)
{
- UNIMPLEMENTED;
+ UNIMPLEMENTED;
}
HRESULT
@@ -148,35 +50,34 @@
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;
}
-
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=61231&r1=61230&r2=61231&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Dec 6 10:20:01 2013
@@ -48,7 +48,7 @@
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
