diff --git a/patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch b/patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch deleted file mode 100644 index a02ea395..00000000 --- a/patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 61b96f3dab24d3aec26237c8760d75f964474bc5 Mon Sep 17 00:00:00 2001 -From: Louis Lenders -Date: Mon, 8 Apr 2019 17:06:58 +0200 -Subject: [PATCH 2/2] combase: Add GetRestrictedErrorInfo and - RoOriginateLanguageException stubs. - -Signed-off-by: Louis Lenders ---- - .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- - .../api-ms-win-core-winrt-error-l1-1-1.spec | 4 ++-- - dlls/combase/combase.spec | 4 ++-- - dlls/combase/roapi.c | 19 +++++++++++++++++++ - 4 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec -index de0a6d8..99f1ca3 100644 ---- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec -+++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec -@@ -1,4 +1,4 @@ --@ stub GetRestrictedErrorInfo -+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo - @ stub RoCaptureErrorContext - @ stub RoFailFastWithErrorContext - @ stub RoGetErrorReportingFlags -diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec -index b1ad813..0b390f1 100644 ---- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec -+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec -@@ -1,4 +1,4 @@ --@ stub GetRestrictedErrorInfo -+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo - @ stub IsErrorPropagationEnabled - @ stub RoCaptureErrorContext - @ stub RoClearError -@@ -9,7 +9,7 @@ - @ stub RoInspectThreadErrorInfo - @ stub RoOriginateError - @ stub RoOriginateErrorW --@ stub RoOriginateLanguageException -+@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException - @ stub RoReportFailedDelegate - @ stub RoReportUnhandledError - @ stub RoResolveRestrictedErrorInfoReference -diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec -index 93575d5..f67527a 100644 ---- a/dlls/combase/combase.spec -+++ b/dlls/combase/combase.spec -@@ -180,7 +180,7 @@ - @ stub GetFuncDescs - @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream - @ stub GetHookInterface --@ stub GetRestrictedErrorInfo -+@ stdcall GetRestrictedErrorInfo(ptr) - @ stub HSTRING_UserFree - @ stub HSTRING_UserFree64 - @ stub HSTRING_UserMarshal -@@ -260,7 +260,7 @@ - @ stub RoInspectThreadErrorInfo - @ stub RoOriginateError - @ stub RoOriginateErrorW --@ stub RoOriginateLanguageException -+@ stdcall RoOriginateLanguageException(long ptr ptr) - @ stub RoParameterizedTypeExtraGetTypeSignature - @ stdcall RoRegisterActivationFactories(ptr ptr long ptr) - @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) -diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c -index c9fe80f..2a6dcdf 100644 ---- a/dlls/combase/roapi.c -+++ b/dlls/combase/roapi.c -@@ -21,6 +21,7 @@ - #include "initguid.h" - #include "roapi.h" - #include "roparameterizediid.h" -+#include "restrictederrorinfo.h" - #include "winstring.h" - - #include "wine/debug.h" -@@ -276,6 +277,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF - } - - /*********************************************************************** -+ * GetRestrictedErrorInfo (combase.@) -+ */ -+HRESULT WINAPI GetRestrictedErrorInfo( IRestrictedErrorInfo **info ) -+{ -+ FIXME( "(%p)\n", info ); -+ return E_NOTIMPL; -+} -+ -+/*********************************************************************** -+ * RoOriginateLanguageException (combase.@) -+ */ -+BOOL WINAPI RoOriginateLanguageException( HRESULT error, HSTRING message, IUnknown *language_exception ) -+{ -+ FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); -+ return FALSE; -+} -+ -+/*********************************************************************** - * CleanupTlsOleState (combase.@) - */ - void WINAPI CleanupTlsOleState(void *unknown) --- -1.9.1 - diff --git a/patches/combase-GetRestrictedErrorInfo/definition b/patches/combase-GetRestrictedErrorInfo/definition deleted file mode 100644 index 1e53e2f3..00000000 --- a/patches/combase-GetRestrictedErrorInfo/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [46972] combase: Add GetRestrictedErrorInfo/RoOriginateLanguageException stubs. diff --git a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch index 21542bc3..9946bad5 100644 --- a/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch +++ b/patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch @@ -1,4 +1,4 @@ -From e51af93f24d248e0f20fe0688c2dba4a6f3f9344 Mon Sep 17 00:00:00 2001 +From 7889f94f7680ac2a42e279f7a6e8662e0748a4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 4 Feb 2017 16:20:37 +0100 Subject: [PATCH] kernel32: Implement some processor group functions. @@ -13,7 +13,7 @@ Subject: [PATCH] kernel32: Implement some processor group functions. 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec -index e653ac6d2..b6af37ab0 100644 +index e653ac6d212..b6af37ab0aa 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec @@ -21,7 +21,7 @@ @@ -26,7 +26,7 @@ index e653ac6d2..b6af37ab0 100644 @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec -index fd1a0bcf0..b281fd963 100644 +index 4998af04d9b..5ce8e24713b 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -26,7 +26,7 @@ @@ -39,10 +39,10 @@ index fd1a0bcf0..b281fd963 100644 @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c -index 0849ac551..f0b06dcc1 100644 +index 993bc8588f4..199a54b9deb 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c -@@ -122,7 +122,9 @@ err: +@@ -106,7 +106,9 @@ err: */ WORD WINAPI GetActiveProcessorGroupCount(void) { @@ -53,7 +53,7 @@ index 0849ac551..f0b06dcc1 100644 return 1; } -@@ -131,14 +133,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void) +@@ -115,14 +117,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void) */ DWORD WINAPI GetActiveProcessorCount(WORD group) { @@ -87,11 +87,11 @@ index 0849ac551..f0b06dcc1 100644 /*********************************************************************** diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index 04fa5f2e7..44681ebb3 100644 +index a14bed04bef..a2feb9dfa14 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -717,7 +717,7 @@ - @ stdcall -import GetLongPathNameW (wstr long long) + @ stdcall -import GetLongPathNameW(wstr ptr long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @ stdcall GetMaximumProcessorCount(long) -# @ stub GetMaximumProcessorGroupCount @@ -100,7 +100,7 @@ index 04fa5f2e7..44681ebb3 100644 @ stdcall -import GetModuleFileNameW(long ptr long) @ stdcall -import GetModuleHandleA(str) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c -index a3118d11b..520c2b09f 100644 +index 5cdc9fa03be..4c998e2fe6e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -92,6 +92,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); @@ -119,7 +119,7 @@ index a3118d11b..520c2b09f 100644 return TRUE; } -@@ -3923,6 +3925,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) +@@ -4101,6 +4103,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } } @@ -146,7 +146,7 @@ index a3118d11b..520c2b09f 100644 START_TEST(process) { HANDLE job; -@@ -4013,6 +4035,7 @@ START_TEST(process) +@@ -4191,6 +4213,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); @@ -155,10 +155,10 @@ index a3118d11b..520c2b09f 100644 test_ProcThreadAttributeList(); test_SuspendProcessState(); diff --git a/include/winnt.h b/include/winnt.h -index d18b2e03b..86f30ade4 100644 +index 40534338d05..068a5782465 100644 --- a/include/winnt.h +++ b/include/winnt.h -@@ -6459,6 +6459,8 @@ typedef struct _GROUP_AFFINITY +@@ -6475,6 +6475,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; @@ -168,5 +168,5 @@ index d18b2e03b..86f30ade4 100644 { WORD Group; -- -2.23.0 +2.24.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 16ef635a..d3b842a9 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "37dec9f144501fb93e173214578b759122ac999a" + echo "6b839a0f85236aac2cc794d5d586f1ba371866b1" } # Show version information @@ -94,7 +94,6 @@ patch_enable_all () enable_api_ms_win_Stub_DLLs="$1" enable_atl_AtlAxDialogBox="$1" enable_cmd_launch_association="$1" - enable_combase_GetRestrictedErrorInfo="$1" enable_comctl32_Listview_DrawItem="$1" enable_comctl32_alpha_bitmaps="$1" enable_comctl32_version_6="$1" @@ -417,9 +416,6 @@ patch_enable () cmd-launch-association) enable_cmd_launch_association="$2" ;; - combase-GetRestrictedErrorInfo) - enable_combase_GetRestrictedErrorInfo="$2" - ;; comctl32-Listview_DrawItem) enable_comctl32_Listview_DrawItem="$2" ;; @@ -2372,22 +2368,6 @@ if test "$enable_cmd_launch_association" -eq 1; then ) >> "$patchlist" fi -# Patchset combase-GetRestrictedErrorInfo -# | -# | This patchset fixes the following Wine bugs: -# | * [#46972] combase: Add GetRestrictedErrorInfo/RoOriginateLanguageException stubs. -# | -# | Modified files: -# | * dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec, dlls/api-ms-win-core-winrt-error-l1-1-1 -# | /api-ms-win-core-winrt-error-l1-1-1.spec, dlls/combase/combase.spec, dlls/combase/roapi.c -# | -if test "$enable_combase_GetRestrictedErrorInfo" -eq 1; then - patch_apply combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch - ( - printf '%s\n' '+ { "Louis Lenders", "combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.", 1 },'; - ) >> "$patchlist" -fi - # Patchset comctl32-Listview_DrawItem # | # | This patchset fixes the following Wine bugs: