Author: mjansen
Date: Wed Apr 13 18:23:54 2016
New Revision: 71154
URL:
http://svn.reactos.org/svn/reactos?rev=71154&view=rev
Log:
[APPHELP] Change the ApphelpCheckInstallShieldPackage stub to a non-throwing one, use
OutputDebugString by default. CORE-8591
Modified:
trunk/reactos/dll/appcompat/apphelp/apphelp.c
trunk/reactos/dll/appcompat/apphelp/apphelp.spec
Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph…
==============================================================================
--- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Wed Apr 13 18:23:54 2016
@@ -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 @@
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 @@
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
}
Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph…
==============================================================================
--- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Wed Apr 13 18:23:54
2016
@@ -1,6 +1,6 @@
@ stdcall AllowPermLayer(wstr)
@ stub ApphelpCheckExe
-@ stub ApphelpCheckInstallShieldPackage
+@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr)
@ stub ApphelpCheckMsiPackage
@ stub ApphelpCheckRunApp
@ stub ApphelpCheckRunAppEx