zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correct inverted if blocks in scripts

Browse Source
This commit is contained in:
Yoshi Askharoun
2025-07-20 10:16:46 -05:00
parent 9849ca2a98
commit 8cbf503008
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/UIX.DecompXml/Decompiler.Script.cs
+44 -3
View File
@@ -149,11 +149,11 @@ partial class Decompiler
var jumpCondition = opCode switch
{
OpCode.JumpIfFalse or
OpCode.JumpIfFalsePeek => PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, rawJumpCondition),
OpCode.JumpIfFalsePeek => rawJumpCondition,
OpCode.JumpIfTruePeek => rawJumpCondition,
OpCode.JumpIfTruePeek => LogicalNotOf(rawJumpCondition),
OpCode.JumpIfNullPeek => BinaryExpression(SyntaxKind.EqualsExpression,
OpCode.JumpIfNullPeek => BinaryExpression(SyntaxKind.ExclamationEqualsToken,
rawJumpCondition,
LiteralExpression(SyntaxKind.NullLiteralExpression)),
@@ -164,6 +164,9 @@ partial class Decompiler
blockStack.Push(ifBlock);
break;
case OpCode.ReturnVoid:
break;
default:
if (!TryDecompileExpression(instruction, stack, blockStack))
throw new NotImplementedException();
@@ -366,6 +369,44 @@ partial class Decompiler
return operationExpr;
}
private static ExpressionSyntax LogicalNotOf(ExpressionSyntax originalExpression)
{
if (originalExpression is not BinaryExpressionSyntax binaryExpression)
goto defaultCase;
SyntaxKind notOperatorToken;
switch (binaryExpression.OperatorToken.Kind())
{
case SyntaxKind.EqualsEqualsToken:
notOperatorToken = SyntaxKind.ExclamationEqualsToken;
break;
case SyntaxKind.LessThanToken:
notOperatorToken = SyntaxKind.GreaterThanEqualsToken;
break;
case SyntaxKind.GreaterThanToken:
notOperatorToken = SyntaxKind.LessThanEqualsToken;
break;
case SyntaxKind.LessThanEqualsToken:
notOperatorToken = SyntaxKind.GreaterThanToken;
break;
case SyntaxKind.GreaterThanEqualsToken:
notOperatorToken = SyntaxKind.LessThanToken;
break;
default:
goto defaultCase;
}
return binaryExpression.WithOperatorToken(Token(notOperatorToken));
defaultCase:
return PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, originalExpression);
}
private static SyntaxKind OperationToSyntaxKind(OperationType operation)
{
return operation switch
test/ABOUTDIALOG.31_48_decomp.uix
+3 -3
View File
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-16"?>
<UIX xmlns="http://schemas.microsoft.com/2007/uix" xmlns:dialog="res://UIXControls!Dialog.uix" xmlns:iris="assembly://UIX/Microsoft.Iris" xmlns:zuneUI="assembly://ZuneShell/ZuneUI" xmlns:system="assembly://System.Private.CoreLib/System" xmlns:styles="res://ZuneShellResources!Styles.uix" xmlns:label="res://UIXControls!Label.uix" xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix">
<UIX xmlns="http://schemas.microsoft.com/2007/uix" xmlns:dialog="res://UIXControls!Dialog.uix" xmlns:iris="assembly://UIX/Microsoft.Iris" xmlns:zuneUI="assembly://ZuneShell/ZuneUI" xmlns:styles="res://ZuneShellResources!Styles.uix" xmlns:label="res://UIXControls!Label.uix" xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix">
<Class Name="AboutDialog" Base="dialog:Dialog">
<Properties>
<String String="res://ZuneShellResources!AboutDialog.uix#AboutDialogContentUI" Name="ContentUI" />
<iris:Command Description="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_DIALOG_OK)}" Name="Cancel" />
<zuneUI:WebHelpCommand Description="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_ABOUTDIALOG_TECHNICAL_SUPPORT_INFORMATION)}" Url="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_WWW_ZUNE_NET_SUPPORT_URL)}" Name="TechSupportLink" />
<system:String String="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_ABOUTDIALOG_TITLE)}" Name="AccessibleDescription" />
<String String="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_ABOUTDIALOG_TITLE)}" Name="AccessibleDescription" />
</Properties>
</Class>
<UI Name="AboutDialogContentUI" Base="dialog:DialogContentUI">
@@ -15,7 +15,7 @@
ButtonCommands.Add(Dialog.Cancel);
DefaultButtonModel = Dialog.Cancel;
ButtonModelToFocus = Dialog.Cancel;</Script>
<Script>if (!iris:Application.RenderingType == iris:RenderingType.GDI)
<Script>if (iris:Application.RenderingType == iris:RenderingType.GDI)
{
GDIModeLabel.Visible = True;
GDIModeLabel.Content = zuneUI:Shell.LoadString(zuneUI:StringId.IDS_ABOUTDIALOG_GDI_MODE_NOTICE);