[llvm] r331902 - [llvm-rc] Add support for the RCDATA resource type

[Martin Storsjo via llvm-commits]

Author: mstorsjo
Date: Wed May  9 11:20:56 2018
New Revision: 331902

URL: http://llvm.org/viewvc/llvm-project?rev=331902&view=rev
Log:
[llvm-rc] Add support for the RCDATA resource type

This is the same as any other user defined resource, but with
a specific allocated resource type number.

Differential Revision: https://reviews.llvm.org/D46636

Modified:
    llvm/trunk/test/tools/llvm-rc/Inputs/tag-user.rc
    llvm/trunk/test/tools/llvm-rc/tag-user.test
    llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp
    llvm/trunk/tools/llvm-rc/ResourceScriptStmt.h

Modified: llvm/trunk/test/tools/llvm-rc/Inputs/tag-user.rc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/Inputs/tag-user.rc?rev=331902&r1=331901&r2=331902&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/Inputs/tag-user.rc (original)
+++ llvm/trunk/test/tools/llvm-rc/Inputs/tag-user.rc Wed May  9 11:20:56 2018
@@ -1,6 +1,9 @@
 500 500 {
   1, 2, 3, 4, 5, "data", L"wide data", 0xABCD, 0xABCDEF01L
 }
+501 RCDATA {
+  1, 2, 3, 4, 5, "data", L"wide data", 0xABCD, 0xABCDEF01L
+}
 
 NAME1 NAME2 {}
 

Modified: llvm/trunk/test/tools/llvm-rc/tag-user.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-rc/tag-user.test?rev=331902&r1=331901&r2=331902&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-rc/tag-user.test (original)
+++ llvm/trunk/test/tools/llvm-rc/tag-user.test Wed May  9 11:20:56 2018
@@ -20,6 +20,21 @@
 ; CHECK-NEXT:   0020: CDAB01EF CDAB                        |......|
 ; CHECK-NEXT: )
 
+; CHECK-DAG:  Resource type (int): 10
+; CHECK-NEXT: Resource name (int): 501
+; CHECK-NEXT: Data version: 0
+; CHECK-NEXT: Memory flags: 0x30
+; CHECK-NEXT: Language ID: 1033
+; CHECK-NEXT: Version (major): 0
+; CHECK-NEXT: Version (minor): 0
+; CHECK-NEXT: Characteristics: 0
+; CHECK-NEXT: Data size: 38
+; CHECK-NEXT: Data: (
+; CHECK-NEXT:   0000: 01000200 03000400 05006461 74617700  |..........dataw.|
+; CHECK-NEXT:   0010: 69006400 65002000 64006100 74006100  |i.d.e. .d.a.t.a.|
+; CHECK-NEXT:   0020: CDAB01EF CDAB                        |......|
+; CHECK-NEXT: )
+
 ; CHECK-DAG:  Resource type (string): NAME2
 ; CHECK-NEXT: Resource name (string): NAME1
 ; CHECK-NEXT: Data version: 0

Modified: llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp?rev=331902&r1=331901&r2=331902&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp (original)
+++ llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp Wed May  9 11:20:56 2018
@@ -80,6 +80,8 @@ RCParser::ParseType RCParser::parseSingl
     Result = parseIconResource();
   else if (TypeToken->equalsLower("MENU"))
     Result = parseMenuResource();
+  else if (TypeToken->equalsLower("RCDATA"))
+    Result = parseUserDefinedResource(RkRcData);
   else if (TypeToken->equalsLower("VERSIONINFO"))
     Result = parseVersionInfoResource();
   else

Modified: llvm/trunk/tools/llvm-rc/ResourceScriptStmt.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rc/ResourceScriptStmt.h?rev=331902&r1=331901&r2=331902&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rc/ResourceScriptStmt.h (original)
+++ llvm/trunk/tools/llvm-rc/ResourceScriptStmt.h Wed May  9 11:20:56 2018
@@ -127,6 +127,7 @@ enum ResourceKind {
   RkDialog = 5,
   RkStringTableBundle = 6,
   RkAccelerators = 9,
+  RkRcData = 10,
   RkCursorGroup = 12,
   RkIconGroup = 14,
   RkVersionInfo = 16,