winmm: Use MCI_HWND and MCI_HDC in resource files.

diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc
index beffdd58b0dd944c9bef3822303888ffbf8b0dec..e2e4caa805c1289ff0105bbd42868e1555d741ea 100644 (file)
--- a/dlls/mciavi32/mciavi_res.rc
+++ b/dlls/mciavi32/mciavi_res.rc
@@ -205,7 +205,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER,
 L"popup\0", 0x80880000L, MCI_INTEGER,
 L"child\0", 0x40000000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
-L"parent\0", 0x00020000L, MCI_INTEGER,
+L"parent\0", 0x00020000L, MCI_HWND,
 L"nostatic\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"paste\0", MCI_PASTE, 0, MCI_COMMAND_HEAD,
@@ -529,7 +529,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
 L"at\0", 0x00010000L, MCI_RECT,
-L"hdc\0", 0x00020000L, MCI_INTEGER,
+L"hdc\0", 0x00020000L, MCI_HDC,
 L"paint\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", MCI_WHERE, 0, MCI_COMMAND_HEAD,
@@ -550,7 +550,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
 L"handle\0", 0x00010000L, MCI_CONSTANT,
-L"default\0", 0x00000000L, MCI_INTEGER,
+L"default\0", 0x00000000L, MCI_HWND,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"state\0", 0x00040000L, MCI_CONSTANT,
 L"hide\0", 0x00000000L, MCI_INTEGER,

diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc
index beffdd58b0dd944c9bef3822303888ffbf8b0dec..e2e4caa805c1289ff0105bbd42868e1555d741ea 100644 (file)
--- a/dlls/mciqtz32/mciavi_res.rc
+++ b/dlls/mciqtz32/mciavi_res.rc
@@ -205,7 +205,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER,
 L"popup\0", 0x80880000L, MCI_INTEGER,
 L"child\0", 0x40000000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
-L"parent\0", 0x00020000L, MCI_INTEGER,
+L"parent\0", 0x00020000L, MCI_HWND,
 L"nostatic\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"paste\0", MCI_PASTE, 0, MCI_COMMAND_HEAD,
@@ -529,7 +529,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
 L"at\0", 0x00010000L, MCI_RECT,
-L"hdc\0", 0x00020000L, MCI_INTEGER,
+L"hdc\0", 0x00020000L, MCI_HDC,
 L"paint\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"where\0", MCI_WHERE, 0, MCI_COMMAND_HEAD,
@@ -550,7 +550,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"test\0", 0x00000020L, MCI_FLAG,
 L"handle\0", 0x00010000L, MCI_CONSTANT,
-L"default\0", 0x00000000L, MCI_INTEGER,
+L"default\0", 0x00000000L, MCI_HWND,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"state\0", 0x00040000L, MCI_CONSTANT,
 L"hide\0", 0x00000000L, MCI_INTEGER,

diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 3558d2bc9fd1cd2346573ac5c1173bd154442089..30db36355267ecd1957b33278aee834666332eee 100644 (file)
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -601,6 +601,9 @@ static      BOOL            MCI_IsCommandTableValid(UINT uTbl)
         switch (eid) {
         case MCI_COMMAND_HEAD:          if (!*str || !flg) return FALSE; idx = 0;              break;  /* check unicity of str in table */
         case MCI_STRING:                if (inCst) return FALSE;                               break;
+        case MCI_HWND:                  /* Occurs inside MCI_CONSTANT as in "window handle default" */
+        case MCI_HPAL:
+        case MCI_HDC:
         case MCI_INTEGER:               if (!*str) return FALSE;                               break;
         case MCI_END_COMMAND:           if (*str || flg || idx == 0) return FALSE; idx = 0;    break;
         case MCI_RETURN:               if (*str || idx != 1) return FALSE;                     break;
@@ -1087,6 +1090,9 @@ static    DWORD   MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd,
                    *dwFlags |= flg;
                    TRACE("flag=%08x\n", flg);
                    break;
+               case MCI_HWND:
+               case MCI_HPAL:
+               case MCI_HDC:
                case MCI_INTEGER:
                    if (inCst) {
                        data[offset] |= flg;
@@ -1132,6 +1138,9 @@ static    DWORD   MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd,
                case MCI_END_COMMAND_LIST:
                case MCI_CONSTANT:
                case MCI_FLAG:                  break;
+               case MCI_HWND:
+               case MCI_HPAL:
+               case MCI_HDC:                   if (!inCst) offset += sizeof(HANDLE)/sizeof(DWORD); break;
                case MCI_INTEGER:               if (!inCst) offset++;   break;
                case MCI_END_CONSTANT:          offset++; break;
                case MCI_STRING:                offset += sizeof(LPWSTR)/sizeof(DWORD); break;

diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc
index 949d55caf48d573939f5df62be05db8733e3b318..64c42b42ea05c74e28068285cfa68daa5565c2f4 100644 (file)
--- a/dlls/winmm/winmm_res.rc
+++ b/dlls/winmm/winmm_res.rc
@@ -537,7 +537,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER,
 L"popup\0", 0x80880000L, MCI_INTEGER,
 L"child\0", 0x40000000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
-L"parent\0", 0x00020000L, MCI_INTEGER,
+L"parent\0", 0x00020000L, MCI_HWND,
 L"nostatic\0", 0x00040000L, MCI_FLAG,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD,
@@ -639,7 +639,7 @@ L"window\0", MCI_WINDOW, 0, MCI_COMMAND_HEAD,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"handle\0", 0x00010000L, MCI_CONSTANT,
-L"default\0", 0x00000000L, MCI_INTEGER,
+L"default\0", 0x00000000L, MCI_HWND,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"state\0", 0x00040000L, MCI_CONSTANT,
 L"hide\0", 0x00000000L, MCI_INTEGER,
@@ -674,7 +674,7 @@ L"update\0", MCI_UPDATE, 0, MCI_COMMAND_HEAD,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"at\0", 0x00010000L, MCI_RECT,
-L"hdc\0", 0x00020000L, MCI_INTEGER,
+L"hdc\0", 0x00020000L, MCI_HDC,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"\0", 0x00000000L, MCI_END_COMMAND_LIST
 END
@@ -694,7 +694,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER,
 L"popup\0", 0x80880000L, MCI_INTEGER,
 L"child\0", 0x40000000L, MCI_INTEGER,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
-L"parent\0", 0x00020000L, MCI_INTEGER,
+L"parent\0", 0x00020000L, MCI_HWND,
 L"\0", 0x00000000L, MCI_END_COMMAND,
 L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
 L"\0", MCI_DWORD_PTR, 0, MCI_RETURN,
@@ -744,7 +744,7 @@ L"window\0", MCI_WINDOW, 0, MCI_COMMAND_HEAD,
 L"notify\0", 0x00000001L, MCI_FLAG,
 L"wait\0", 0x00000002L, MCI_FLAG,
 L"handle\0", 0x00010000L, MCI_CONSTANT,
-L"default\0", 0x00000000L, MCI_INTEGER,
+L"default\0", 0x00000000L, MCI_HWND,
 L"\0", 0x00000000L, MCI_END_CONSTANT,
 L"state\0", 0x00040000L, MCI_CONSTANT,
 L"hide\0", 0x00000000L, MCI_INTEGER,