From f8bcf5274151cd2ec2c40ced12f129ec00081a6c Mon Sep 17 00:00:00 2001
From: yuyoyuppe <yuyoyuppe@users.noreply.github.com>
Date: Thu, 23 Jan 2020 14:42:28 +0300
Subject: [PATCH] MSIX: add a dedicated .rc for UWPUI which joins both UI and
 DLL .rc's (#1139)

---
 .../powerrename/UWPui/PowerRenameUWPUI.rc     | 64 +++++++++++++++++++
 .../UWPui/PowerRenameUWPUI.vcxproj            |  2 +-
 .../UWPui/PowerRenameUWPUI.vcxproj.filters    |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/powerrename/UWPui/PowerRenameUWPUI.rc

diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc
new file mode 100644
index 0000000000..a504197c17
--- /dev/null
+++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc
@@ -0,0 +1,64 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+// We need both DLL and UI resource files for UWP UI.
+#include "..\dll\PowerRenameExt.rc"
+#undef IDC_STATIC
+#include "..\ui\PowerRenameUI.rc"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE  
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE  
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
index b314910133..b880c02f47 100644
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
+++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
@@ -117,7 +117,7 @@
     <Image Include="..\ui\PowerRename.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\ui\PowerRenameUI.rc" />
+    <ResourceCompile Include="PowerRenameUWPUI.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
index 11e345d451..ea6394725d 100644
--- a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
+++ b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
@@ -42,7 +42,7 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\ui\PowerRenameUI.rc">
+    <ResourceCompile Include="PowerRenameUWPUI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>