From 9605e067937c6976b6c3ca6e5aa6b57cebfc6d62 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 31 May 2011 00:53:00 +0000
Subject: [PATCH] =?UTF-8?q?MMEN=E3=81=8C=E3=81=82=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=81=AE=E3=81=BF=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@291 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/CardCup/OMakefile  |  2 +-
 trunk/CardCup/Readme.txt |  4 ++++
 trunk/CardCup/main.cpp   | 29 ++++++++++++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 trunk/CardCup/Readme.txt

diff --git a/trunk/CardCup/OMakefile b/trunk/CardCup/OMakefile
index bb62ff4..e63494c 100644
--- a/trunk/CardCup/OMakefile
+++ b/trunk/CardCup/OMakefile
@@ -32,7 +32,7 @@ LIBS                +=  lib_demo \
                         libnn_ps
 
 
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/HomeMenuTest.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/SelfCup.desc
 
 TARGET_PROGRAM      =   CardCup
 
diff --git a/trunk/CardCup/Readme.txt b/trunk/CardCup/Readme.txt
new file mode 100644
index 0000000..df7ea21
--- /dev/null
+++ b/trunk/CardCup/Readme.txt
@@ -0,0 +1,4 @@
+■ビルド環境
+・SDK
+ Horizon 0.14.23 branch r33437 +
+ Horizon 2.3 branch r38091 SelfCup.descをコピー
diff --git a/trunk/CardCup/main.cpp b/trunk/CardCup/main.cpp
index e0cb634..4e8016e 100644
--- a/trunk/CardCup/main.cpp
+++ b/trunk/CardCup/main.cpp
@@ -24,6 +24,7 @@
 #include <nn/fs/fs_FileSystemBase.h>
 #include <nn/fs/CTR/MPCore/fs_FileSystemBasePrivate.h>
 #include <nn/applet/CTR/applet_APIForSystem.h>
+#include <nn/am.h>
 
 #include <nn/cup.h>
 
@@ -51,6 +52,9 @@ namespace
         // NuiShell縺ｮ蛻晄悄蛹� (CUP縺ｫ蠢�鬆�)
         NN_UTIL_PANIC_IF_FAILED(nn::ns::CTR::InitializeForShell());
 
+        // am縺ｮ蛻晄悄蛹�
+        nn::am::InitializeForSystemMenu();
+
         // fs縺ｮ蛻晄悄蛹� (繧ｫ繝ｼ繝臥｢ｺ隱咲畑)
         nn::fs::Initialize();
 
@@ -221,17 +225,28 @@ extern "C" void nnMain()
     nn::Result result;
     Initialize();
 
-    /******************** CUP縺ｮ螳溯｡� *******************/
-    bool isHandledError = false;
-    result = UpdateSequence(&isHandledError);
-    if (isHandledError == false && result.IsFailure())
+    nn::am::ProgramInfo outInfos;
+    const nn::ProgramId MMEN_PROGRAM_ID = 0x0004003000008202;
+    result = nn::am::GetProgramInfos(&outInfos, nn::fs::MEDIA_TYPE_NAND, &MMEN_PROGRAM_ID, 1);
+    if (result.IsSuccess())
     {
+
+        /******************** CUP縺ｮ螳溯｡� *******************/
+        bool isHandledError = false;
+        result = UpdateSequence(&isHandledError);
+        if (isHandledError == false && result.IsFailure())
         {
-            // 縺昴ｌ莉･螟悶�ｮ蝣ｴ蜷医�ｯ縲ヽesult繧定｡ｨ遉ｺ
-            s_scrollBuffer->AppendText(" - Unhandled Error: 0x%08x", result.GetPrintableBits());
-            s_scrollBuffer->AppendText("")->Render();
+            {
+                // 縺昴ｌ莉･螟悶�ｮ蝣ｴ蜷医�ｯ縲ヽesult繧定｡ｨ遉ｺ
+                s_scrollBuffer->AppendText(" - Unhandled Error: 0x%08x", result.GetPrintableBits());
+                s_scrollBuffer->AppendText("")->Render();
+            }
         }
     }
+    else if(result == nn::am::ResultNotFound())
+    {
+        s_scrollBuffer->AppendText("Cannot find Home Menu");
+    }
 
     s_scrollBuffer->AppendText("")->Render();