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

Remove UIXA

Browse Source
This commit is contained in:
Yoshi Askharoun
2025-07-11 19:23:24 -05:00
parent 094198feef
commit cf6ae6e31d
6 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneHost.Wpf/MainWindow.xaml.cs
+1 -2
View File
@@ -88,7 +88,7 @@ namespace ZuneHost.Wpf
if (debug)
{
// Set decompiler breakponts
// Set decompiler breakpoints
IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!QuickplayStrip.uix", 172, 25, false));
IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneMarketplaceResources!SelectionActions.uix", 121, 14, false));
IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!Quickplay.uix", 917, 62, false));
@@ -102,7 +102,6 @@ namespace ZuneHost.Wpf
IrisApp.Initialized += delegate
{
IrisApp.AddImportRedirect("res://ZuneShellResources!", "clr-res://ZuneShell!");
Microsoft.Iris.Asm.Assembler.RegisterLoader();
};
Microsoft.Zune.Shell.ZuneApplication.Launch(strArgs, hWnd);
ZuneHost.Wpf/ZuneHost.Wpf.csproj
-1
View File
@@ -10,7 +10,6 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\ZuneUIXTools\libs\UIX.Asm\UIX.Asm.csproj" />
<ProjectReference Include="..\ZuneShell\ZuneShell.csproj" />
</ItemGroup>
ZuneShell.sln
-19
View File
@@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX.Asm", "..\..\ZuneDev\ZuneUIXTools\libs\UIX.Asm\UIX.Asm.csproj", "{9589AAC1-D006-4985-87BD-960F90867482}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -149,22 +147,6 @@ Global
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x64.Build.0 = Release|Any CPU
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.ActiveCfg = Release|Any CPU
{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.Build.0 = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|ARM32.ActiveCfg = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|ARM32.Build.0 = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x64.ActiveCfg = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x64.Build.0 = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x86.ActiveCfg = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x86.Build.0 = Debug|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|Any CPU.Build.0 = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|ARM32.ActiveCfg = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|ARM32.Build.0 = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|x64.ActiveCfg = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|x64.Build.0 = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|x86.ActiveCfg = Release|Any CPU
{9589AAC1-D006-4985-87BD-960F90867482}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -173,7 +155,6 @@ Global
{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
{CB2B7609-C7B8-4E2A-82D8-DD631B70B621} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
{90A89707-927E-48D2-BFEB-84F95F531258} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
{9589AAC1-D006-4985-87BD-960F90867482} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6B948258-B457-4B3D-955E-05ED3F03CF36}
ZuneShell/Microsoft/Zune/Shell/ZuneApplication.cs
+1 -16
View File
@@ -38,7 +38,6 @@ namespace Microsoft.Zune.Shell
{
public class ZuneApplication
{
private const bool UseUixa = true;
private const string ResourceDllName = "ZuneShellResources.dll";
private const int ApplicationIconResourceId = 1;
private static ZuneLibrary _zuneLibrary;
@@ -482,9 +481,7 @@ namespace Microsoft.Zune.Shell
Application.Window.CloseRequested += new WindowCloseRequestedHandler(CodeDialogManager.Instance.OnWindowCloseRequested);
CodeDialogManager.Instance.WindowCloseNotBlocked += new EventHandler(OnWindowCloseNotBlocked);
Application.Window.SessionConnected += new SessionConnectedHandler(OnSessionConnected);
string source = UseUixa
? "clr-res://ZuneShell!Frame.uixa#Frame"
: "res://ZuneShellResources!Frame.uix#Frame";
string source = "res://ZuneShellResources!Frame.uix#Frame";
_hWndSplashScreen = hWndSplashScreen;
_initializationFailsafe = new InitializationFailsafe();
@@ -540,18 +537,6 @@ namespace Microsoft.Zune.Shell
private static void MarkupSystem_NewMarkupLoaded(object sender, Iris.Markup.LoadResult e)
{
return;
if (e is not Iris.Markup.MarkupLoadResult loadResult)
return;
var watch = Stopwatch.StartNew();
var dis = Iris.Asm.Disassembler.Load(loadResult);
var source = dis.Write();
watch.Stop();
string disasmPath = @"C:\Users\jjask\Documents\Dump\Zune\" + Path.GetFileNameWithoutExtension(e.Uri) + ".uixa";
Debug.WriteLine($"Took {watch.ElapsedMilliseconds} ms to write to {disasmPath}");
File.WriteAllText(disasmPath, source);
}
private static void ErrorReportHandler(Error[] errors)
ZuneShell/ZuneShell.csproj
-2
View File
@@ -35,8 +35,6 @@
<Reference Include="ZuneDBApi">
<HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\ZuneDev\ZuneUIXTools\libs\UIX.Asm\UIX.Asm.csproj" />
<!--<PackageReference Include="UIX.Asm" Version="0.0.2-beta" />-->
<PackageReference Include="StrixMusic.Sdk" Version="0.1.0-alpha" />
libs/MicrosoftIris
+1 -1
Submodule libs/MicrosoftIris updated: 7d9d4b9465...18dba59889