[PATCH 0/3] MR115: winex11.drv: Define ControlMask when not available

[Alistair Leslie-Hughes (＠alesliehughes)]

Signed-off-by: Alistair Leslie-Hughes

[PATCH 1/3] winex11.drv: Define ControlMask when not available

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/winex11.drv/keyboard.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 6157548474b..5bd8fb5ca43 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -64,6 +64,11 @@
 WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
 WINE_DECLARE_DEBUG_CHANNEL(key);

+/* X.h defines ControlMask but conflicts with struct variable name */
+#ifndef ControlMask
+#define ControlMask (1<<2)
+#endif
+
 static int min_keycode, max_keycode, keysyms_per_keycode;
 static KeySym *key_mapping;
 static WORD keyc2vkey[256], keyc2scan[256];

[PATCH 2/3] include: Add THREAD_POWER_THROTTLING_STATE type

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes 
---
 include/processthreadsapi.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h
index 8cdaff4796a..3c376359fc4 100644
--- a/include/processthreadsapi.h
+++ b/include/processthreadsapi.h
@@ -23,6 +23,14 @@
 extern "C" {
 #endif

+#undef ControlMask
+typedef struct _THREAD_POWER_THROTTLING_STATE
+{
+    ULONG Version;
+    ULONG ControlMask;
+    ULONG StateMask;
+} THREAD_POWER_THROTTLING_STATE;
+
 WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *);
 WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR);

[PATCH 2/3] include: Add THREAD_POWER_THROTTLING_STATE type

[Marvin]

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=115255

Your paranoid android.

=== debian11 (build log) ===

error: patch failed: include/processthreadsapi.h:23
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: include/processthreadsapi.h:23
Task: Patch failed to apply

[PATCH 3/3] ntdll: Fake success for ThreadPowerThrottlingState

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956
Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/ntdll/unix/thread.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 503230e4634..90c26009c46 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -2255,6 +2255,12 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
         FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" );
         return STATUS_SUCCESS;

+    case ThreadPowerThrottlingState:
+        if (length != sizeof(THREAD_POWER_THROTTLING_STATE)) return STATUS_INFO_LENGTH_MISMATCH;
+        if (!data) return STATUS_ACCESS_VIOLATION;
+        FIXME( "ThreadPowerThrottling stub!\n" );
+        return STATUS_SUCCESS;
+
     case ThreadBasicInformation:
     case ThreadTimes:
     case ThreadPriority:

[PATCH 3/3] ntdll: Fake success for ThreadPowerThrottlingState

[Marvin]

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=115256

Your paranoid android.

=== debian11 (build log) ===

error: patch failed: include/processthreadsapi.h:23
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: include/processthreadsapi.h:23
Task: Patch failed to apply