[APPHELP] Change the ApphelpCheckInstallShieldPackage stub to a non-throwing one, use OutputDebugString by default. CORE-8591

svn path=/trunk/; revision=71154
This commit is contained in:
Mark Jansen 2016-04-13 18:23:54 +00:00
parent d58a87beca
commit 278ccfd7c8
2 changed files with 12 additions and 3 deletions

View file

@ -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
}

View file

@ -1,6 +1,6 @@
@ stdcall AllowPermLayer(wstr)
@ stub ApphelpCheckExe
@ stub ApphelpCheckInstallShieldPackage
@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr)
@ stub ApphelpCheckMsiPackage
@ stub ApphelpCheckRunApp
@ stub ApphelpCheckRunAppEx