Signed-off-by "Myah Caron" qsniyg@mail.com --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/environ.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 1 + include/winnt.h | 13 ++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-)
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 4998af04d9..cba1133f14 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 @@ -25,7 +25,7 @@ @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW -@ stub GetFirmwareType +@ stdcall GetFirmwareType(ptr) kernel32.GetFirmwareType @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 93ca37fccf..75da15634c 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -134,3 +134,12 @@ DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareType (KERNEL32.@) + */ +BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE firmware_type) { + FIXME("stub: %p\n", firmware_type); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e285207a7..88fb9616b6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -690,6 +690,7 @@ @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr) @ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) +@ stdcall GetFirmwareType(ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW diff --git a/include/winnt.h b/include/winnt.h index 50a6213ef0..0df06f0f33 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2227,9 +2227,9 @@ typedef struct DWORD Ctr;
DWORD ContextFlags; - + DWORD Dar; /* Fault registers for coredump */ - DWORD Dsisr; + DWORD Dsisr; DWORD Trap; /* number of powerpc exception taken */
/* These are selected by CONTEXT_DEBUG_REGISTERS */ @@ -4285,7 +4285,7 @@ typedef struct _ACL {
typedef enum _ACL_INFORMATION_CLASS { - AclRevisionInformation = 1, + AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS;
@@ -6713,6 +6713,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY;
+typedef enum _FIRMWARE_TYPE { + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; + #ifdef __cplusplus } #endif -- 2.25.1
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67155
Your paranoid android.
=== debiant (build log) ===
error: patch failed: dlls/kernel32/environ.c:67 error: patch failed: include/winnt.h:2227 Task: Patch failed to apply
=== debiant (build log) ===
error: patch failed: dlls/kernel32/environ.c:67 error: patch failed: include/winnt.h:2227 Task: Patch failed to apply
-
Marvin -
Myah Caron