[INCLUDES]

* Do not mix ReactOS and Wine style debugging.
[SPEC2DEF]
* Use DbgPrint instead of DPRINT1 for the stub functions.
[ACTIVEDS]
* Cleanup the stubs file.
CORE-7716

svn path=/trunk/; revision=61578

diff --git a/reactos/dll/win32/activeds/stubs.c b/reactos/dll/win32/activeds/stubs.c
index 09e3389..a952359 100644 (file)
--- a/reactos/dll/win32/activeds/stubs.c
+++ b/reactos/dll/win32/activeds/stubs.c
@@ -19,7 +19,7 @@ PropVariantToAdsType(
     PADSVALUE *ppAdsValues,
     PDWORD pdwNumValues)
 {
-    UNIMPLEMENTED;
+    DbgPrint("ACTIVEDS: %s is unimplemented, please try again later.\n", __FUNCTION__);
     return E_NOTIMPL;
 }
 
@@ -30,7 +30,7 @@ AdsTypeToPropVariant(
     DWORD dwNumValues,
     VARIANT * pVariant)
 {
-    UNIMPLEMENTED;
+    DbgPrint("ACTIVEDS: %s is unimplemented, please try again later.\n", __FUNCTION__);
     return E_NOTIMPL;
 }
 
@@ -40,7 +40,7 @@ AdsFreeAdsValues(
     PADSVALUE pAdsValues,
     DWORD dwNumValues)
 {
-    UNIMPLEMENTED;
+    DbgPrint("ACTIVEDS: %s is unimplemented, please try again later.\n", __FUNCTION__);
 }
 
 HRESULT
@@ -50,34 +50,34 @@ ADsDecodeBinaryData(
    PBYTE  *ppbDestData,
    ULONG  *pdwDestLen)
 {
-    UNIMPLEMENTED;
+    DbgPrint("ACTIVEDS: %s is unimplemented, please try again later.\n", __FUNCTION__);
     return E_NOTIMPL;
 }
 
 int AdsTypeToPropVariant2()
 {
-    DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n");
+    DbgPrint("WARNING: calling stub AdsTypeToPropVariant2()\n");
     __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
     return 0;
 }
 
 int PropVariantToAdsType2()
 {
-    DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n");
+    DbgPrint("WARNING: calling stub PropVariantToAdsType2()\n");
     __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
     return 0;
 }
 
 int ConvertSecDescriptorToVariant()
 {
-    DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n");
+    DbgPrint("WARNING: calling stub ConvertSecDescriptorToVariant()\n");
     __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
     return 0;
 }
 
 int ConvertSecurityDescriptorToSecDes()
 {
-    DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n");
+    DbgPrint("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n");
     __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__);
     return 0;
 }

diff --git a/reactos/include/reactos/stubs.h b/reactos/include/reactos/stubs.h
index 0dcbf20..52e6fa9 100644 (file)
--- a/reactos/include/reactos/stubs.h
+++ b/reactos/include/reactos/stubs.h
@@ -1,11 +1,11 @@
-
 #include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wine/config.h"
-#include "wine/exception.h"
+#include <windef.h>
+#include <winbase.h>
+
+#include <wine/config.h>
+#include <wine/exception.h>
 
-#include <reactos/debug.h>
+ULONG __cdecl DbgPrint(_In_z_ _Printf_format_string_ PCSTR Format, ...);
 
 #define __wine_spec_unimplemented_stub(module, function) \
 { \

diff --git a/reactos/tools/spec2def/spec2def.c b/reactos/tools/spec2def/spec2def.c
index 7601800..ce8ac0b 100644 (file)
--- a/reactos/tools/spec2def/spec2def.c
+++ b/reactos/tools/spec2def/spec2def.c
@@ -204,7 +204,7 @@ OutputLine_stub(FILE *file, EXPORT *pexp)
         }
         fprintf(file, " a%d", i);
     }
-    fprintf(file, ")\n{\n\tDPRINT1(\"WARNING: calling stub %.*s(",
+    fprintf(file, ")\n{\n\tDbgPrint(\"WARNING: calling stub %.*s(",
             pexp->strName.len, pexp->strName.buf);
 
     for (i = 0; i < pexp->nArgCount; i++)