From 3324614ed3d8ca12da7c65ded50f89e2431ac23b Mon Sep 17 00:00:00 2001
From: Octavian Voicu <octavian.voicu@gmail.com>
Date: Wed, 1 Sep 2010 20:07:08 +0300
Subject: [PATCH] winmm: Replace return types with symbolic constants in mci
 command resources.

---
 dlls/mciavi32/mciavi_res.rc | 12 ++++-----
 dlls/mciqtz32/mciavi_res.rc | 12 ++++-----
 dlls/winmm/winmm_res.rc     | 52 ++++++++++++++++++-------------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc
index d1e8faca3ec..c231807ae7f 100644
--- a/dlls/mciavi32/mciavi_res.rc
+++ b/dlls/mciavi32/mciavi_res.rc
@@ -37,7 +37,7 @@ L"fullscreen by 2\0", 0x04000000L, MCI_FLAG,
 L"fullscreen\0", 0x02000000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -128,7 +128,7 @@ L"at\0", 0x00010000L, MCI_RECT,
 L"outside\0", 0x00020000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -147,7 +147,7 @@ L"video quality\0", 0x00004003L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"list\0", 0x00000878L, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -187,7 +187,7 @@ L"direct\0", 0x0000a002L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -415,7 +415,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG,
 L"return position\0", 0x00100000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -527,7 +527,7 @@ L"hdc\0", 0x00020000L, MCI_INTEGER,
 L"paint\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", 0x00000843L, MCI_COMMAND_HEAD,
-L"\0", 0x00000007L, MCI_RETURN,
+L"\0", MCI_RECT, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc
index d1e8faca3ec..c231807ae7f 100644
--- a/dlls/mciqtz32/mciavi_res.rc
+++ b/dlls/mciqtz32/mciavi_res.rc
@@ -37,7 +37,7 @@ L"fullscreen by 2\0", 0x04000000L, MCI_FLAG,
 L"fullscreen\0", 0x02000000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -128,7 +128,7 @@ L"at\0", 0x00010000L, MCI_RECT,
 L"outside\0", 0x00020000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -147,7 +147,7 @@ L"video quality\0", 0x00004003L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"list\0", 0x00000878L, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -187,7 +187,7 @@ L"direct\0", 0x0000a002L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -415,7 +415,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG,
 L"return position\0", 0x00100000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
@@ -527,7 +527,7 @@ L"hdc\0", 0x00020000L, MCI_INTEGER,
 L"paint\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", 0x00000843L, MCI_COMMAND_HEAD,
-L"\0", 0x00000007L, MCI_RETURN,
+L"\0", MCI_RECT, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc
index 808220d8fba..e7783a4702a 100644
--- a/dlls/winmm/winmm_res.rc
+++ b/dlls/winmm/winmm_res.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 CORE RCDATA
 BEGIN
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -72,7 +72,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -88,7 +88,7 @@ L"track\0", 0x00000010L, MCI_INTEGER,
 L"start\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -104,7 +104,7 @@ L"can save\0", 0x00000009L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -128,7 +128,7 @@ L"on\0", 0x00002000L, MCI_FLAG,
 L"off\0", 0x00004000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"sysinfo\0", 0x00000810L, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"quantity\0", 0x00000100L, MCI_FLAG,
@@ -218,7 +218,7 @@ L"on\0", 0x00002000L, MCI_FLAG,
 L"off\0", 0x00004000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -240,7 +240,7 @@ L"track\0", 0x00000010L, MCI_INTEGER,
 L"start\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"clv\0", 0x00010000L, MCI_FLAG,
@@ -267,7 +267,7 @@ L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_STRING,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -279,7 +279,7 @@ END
 WAVEAUDIO RCDATA
 BEGIN
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -289,7 +289,7 @@ L"shareable\0", 0x00000100L, MCI_FLAG,
 L"buffer\0", 0x00010000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -347,7 +347,7 @@ L"alignment\0", 0x00100000L, MCI_INTEGER,
 L"bitspersample\0", 0x00200000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -365,7 +365,7 @@ L"outputs\0", 0x00004002L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -391,7 +391,7 @@ END
 CDAUDIO RCDATA
 BEGIN
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -429,7 +429,7 @@ L"door open\0", 0x00000100L, MCI_FLAG,
 L"door closed\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -442,7 +442,7 @@ END
 SEQUENCER RCDATA
 BEGIN
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -505,7 +505,7 @@ L"door open\0", 0x00000100L, MCI_FLAG,
 L"door closed\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -519,7 +519,7 @@ END
 ANIMATION RCDATA
 BEGIN
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -571,7 +571,7 @@ L"door open\0", 0x00000100L, MCI_FLAG,
 L"door closed\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -593,7 +593,7 @@ L"track\0", 0x00000010L, MCI_INTEGER,
 L"start\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -601,7 +601,7 @@ L"file\0", 0x00000200L, MCI_FLAG,
 L"window text\0", 0x00010000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -658,7 +658,7 @@ L"source\0", 0x00020000L, MCI_FLAG,
 L"destination\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", 0x00000843L, MCI_COMMAND_HEAD,
-L"\0", 0x00000007L, MCI_RETURN,
+L"\0", MCI_RECT, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"source\0", 0x00020000L, MCI_FLAG,
@@ -676,7 +676,7 @@ END
 OVERLAY RCDATA
 BEGIN
 L"open\0", 0x00000803L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"type\0", 0x00002000L, MCI_STRING,
@@ -691,7 +691,7 @@ L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"parent\0", 0x00020000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", 0x00000814L, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -708,7 +708,7 @@ L"track\0", 0x00000010L, MCI_INTEGER,
 L"start\0", 0x00000200L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"info\0", 0x0000080aL, MCI_COMMAND_HEAD,
-L"\0", 0x00000001L, MCI_RETURN,
+L"\0", MCI_STRING, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"product\0", 0x00000100L, MCI_FLAG,
@@ -716,7 +716,7 @@ L"file\0", 0x00000200L, MCI_FLAG,
 L"window text\0", 0x00010000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"capability\0", 0x0000080bL, MCI_COMMAND_HEAD,
-L"\0", 0x00000002L, MCI_RETURN,
+L"\0", MCI_INTEGER, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"\0", 0x00000100L, MCI_CONSTANT,
@@ -765,7 +765,7 @@ L"frame\0", 0x00080000L, MCI_FLAG,
 L"video\0", 0x00100000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", 0x00000843L, MCI_COMMAND_HEAD,
-L"\0", 0x00000007L, MCI_RETURN,
+L"\0", MCI_RECT, 0, MCI_RETURN,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"source\0", 0x00020000L, MCI_FLAG,