[APPHELP] Change the ApphelpCheckInstallShieldPackage stub to a non-throwing one...

svn path=/trunk/; revision=71154

diff --git a/reactos/dll/appcompat/apphelp/apphelp.c b/reactos/dll/appcompat/apphelp/apphelp.c
index 7a888af..4c97581 100644 (file)
--- a/reactos/dll/appcompat/apphelp/apphelp.c
+++ b/reactos/dll/appcompat/apphelp/apphelp.c
@@ -26,8 +26,6 @@
 #include "apphelp.h"
 
 #include "wine/winternl.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
 
 /* from dpfilter.h */
 #define DPFLTR_APPCOMPAT_ID 123
@@ -82,6 +80,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
     return TRUE;
 }
 
+BOOL WINAPI ApphelpCheckInstallShieldPackage(void* ptr, LPCWSTR path)
+{
+    SHIM_WARN("stub: ptr=%p path='%S'\r\n", ptr, path);
+    return TRUE;
+}
+
 
 /**
  * Outputs diagnostic info.
@@ -130,6 +134,11 @@ BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format
     va_start(ArgList, Format);
     StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList);
     va_end(ArgList);
+#if defined(APPCOMPAT_USE_DBGPRINTEX) && APPCOMPAT_USE_DBGPRINTEX
     return NT_SUCCESS(DbgPrintEx(DPFLTR_APPCOMPAT_ID, Level, "%s", Buffer));
+#else
+    OutputDebugStringA(Buffer);
+    return TRUE;
+#endif
 }
 

diff --git a/reactos/dll/appcompat/apphelp/apphelp.spec b/reactos/dll/appcompat/apphelp/apphelp.spec
index 61f3302..76eaaa7 100644 (file)
--- a/reactos/dll/appcompat/apphelp/apphelp.spec
+++ b/reactos/dll/appcompat/apphelp/apphelp.spec
@@ -1,6 +1,6 @@
 @ stdcall AllowPermLayer(wstr)
 @ stub ApphelpCheckExe
-@ stub ApphelpCheckInstallShieldPackage
+@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr)
 @ stub ApphelpCheckMsiPackage
 @ stub ApphelpCheckRunApp
 @ stub ApphelpCheckRunAppEx