Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][KERNEL32] Fix regression CORE-16630

Browse source 
Fixes symptom "MSVCPP2017 setup crash due to missing export"
The issue very likely got introduced by
0.4.13-dev-986-g
029b8f2cf9
because our loader exports stuff from neweer Windows versions
since then in case an executables manifest states compatibility.

Original commit message from patches author William Kent:

Stub GetCurrentPackageId() (#1942)

* [KERNEL32] Add stub implementation for GetCurrentPackageId() function

This Windows 8+ function is called by WiX bundles (EXE-based installers) upon exit, if the export is present. If it is a stub in the spec, they will crash, even if they are coded to be compatible with Windows XP/ReactOS.
Also add GetCurrentPackageId() forwarder to apiset.

cherry picked from commit 0.4.14-dev-482-g
192926ee02
This commit is contained in:
William Kent 2019-11-29 02:56:02 -05:00 committed by Joachim Henze
parent 3803e58bb5
commit 3862cc6f03
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/apisets/CMakeLists.txt
View file

@ -40,7 +40,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1d
# Apisets will be appended
add_apiset(api-ms-win-appmodel-identity-l1-1-0 0x60000000 )
add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 )
add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 kernel32)
add_apiset(api-ms-win-appmodel-runtime-l1-1-2 0x60040000 )
add_apiset(api-ms-win-core-apiquery-l1-1-0 0x60060000 )
add_apiset(api-ms-win-core-appcompat-l1-1-1 0x60070000 kernel32)

2
dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec
View file

@ -8,7 +8,7 @@
@ stub GetCurrentApplicationUserModelId
@ stub GetCurrentPackageFamilyName
@ stub GetCurrentPackageFullName
@ stub GetCurrentPackageId
@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
@ stub GetCurrentPackageInfo
@ stub GetCurrentPackagePath
@ stub GetPackageApplicationIds

12
dll/win32/kernel32/client/sysinfo.c
View file

@ -584,3 +584,15 @@ SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize,
STUB;
return FALSE;
}
/*
* @unimplemented
*/
LONG
WINAPI
GetCurrentPackageId(UINT32 *BufferLength,
BYTE *Buffer)
{
STUB;
return APPMODEL_ERROR_NO_PACKAGE;
}

1
dll/win32/kernel32/kernel32.spec
View file

@ -430,6 +430,7 @@
@ stub -version=0x600+ GetCurrentConsoleFontEx
@ stdcall GetCurrentDirectoryA(long ptr)
@ stdcall GetCurrentDirectoryW(long ptr)
@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr)
@ stdcall -norelay GetCurrentProcess()
@ stdcall -norelay GetCurrentProcessId()
@ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber