Accept two possible arguments for the ADD opcode

hmartinez82 · hmartinez82 · commit 1a35d6e03a42 · 2024-05-10T01:58:27.000-06:00
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
@@ -234,7 +234,8 @@ BOOL Validate_SetPreferredAppMode(const BYTE* functionPtr)
 		(functionPtr[0x06] == 0x87) && (functionPtr[0x07] == 0x0D) &&   // xchg    ecx,dword ptr [uxtheme!g_preferredAppMode]
 		(functionPtr[0x0C] == 0xC3);                                    // ret
 #elif defined(_M_ARM64)
-	if ((functionPtr[0x10] & 0x1F) == 0x08 && (functionPtr[0x13] & 0x90) == 0x90)  // adrp x8,wil::details::g_enabledStateManager+40h
+	if (*(const DWORD*)(&functionPtr[0x1C]) == 0x912F6100 ||            // add x0,x8,#0xBD8
+		*(const DWORD*)(&functionPtr[0x1C]) == 0x912EE100)              // add x0,x8,#0xBB8
 	{
 		return TRUE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,8 @@ BOOL Validate_SetPreferredAppMode(const BYTE* functionPtr)`
`234`	`234`	`(functionPtr[0x06] == 0x87) && (functionPtr[0x07] == 0x0D) && // xchg ecx,dword ptr [uxtheme!g_preferredAppMode]`
`235`	`235`	`(functionPtr[0x0C] == 0xC3); // ret`
`236`	`236`	`#elif defined(_M_ARM64)`
`237`		`- if ((functionPtr[0x10] & 0x1F) == 0x08 && (functionPtr[0x13] & 0x90) == 0x90) // adrp x8,wil::details::g_enabledStateManager+40h`
	`237`	`+ if ((const DWORD)(&functionPtr[0x1C]) == 0x912F6100 \|\| // add x0,x8,#0xBD8`
	`238`	`+ (const DWORD)(&functionPtr[0x1C]) == 0x912EE100) // add x0,x8,#0xBB8`
`238`	`239`	`{`
`239`	`240`	`return TRUE;`
`240`	`241`	`}`