uxtheme: winerrror.h must not define the E_PROP_*_UNSUPPORTED macros.

[Francois Gouget]

Include vfwmsgs.h where needed to compensate. This fixes compilation with the PSDK headers.
---
 dlls/uxtheme/draw.c         |    1 +
 dlls/uxtheme/metric.c       |    1 +
 dlls/uxtheme/msstyles.c     |    1 +
 dlls/uxtheme/property.c     |    1 +
 dlls/uxtheme/system.c       |    1 +
 dlls/uxtheme/tests/system.c |    1 +
 include/winerror.h          |    4 ----
 7 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index b31d1ae..7b7c500 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -27,6 +27,7 @@ #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "wingdi.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index fa3bb61..c683a67 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -26,6 +26,7 @@ #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index 0d2210d..919a871 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -28,6 +28,7 @@ #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
index 0d40f4c..7e52e6f 100644
--- a/dlls/uxtheme/property.c
+++ b/dlls/uxtheme/property.c
@@ -26,6 +26,7 @@ #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "wingdi.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 0d13ccd..f92e17e 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -28,6 +28,7 @@ #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 0ece20a..1fd3d97 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 
 #include "windows.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 
 #include "wine/test.h"
diff --git a/include/winerror.h b/include/winerror.h
index 20f443c..c04bd96 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -2012,10 +2012,6 @@ #define E_HANDLE                        
 #define E_OUTOFMEMORY                                      _HRESULT_TYPEDEF_(0x8007000EL)
 #define E_INVALIDARG                                       _HRESULT_TYPEDEF_(0x80070057L)
 
-/* For IKsPropertySets */
-#define E_PROP_ID_UNSUPPORTED				   _HRESULT_TYPEDEF_(0x80070490L)
-#define E_PROP_SET_UNSUPPORTED				   _HRESULT_TYPEDEF_(0x80070492L)
-
 #define CO_S_NOTALLINTERFACES                              _HRESULT_TYPEDEF_(0x00080012L)
 
 #define CO_E_CLASS_CREATE_FAILED                           _HRESULT_TYPEDEF_(0x80080001L)
-- 
1.4.1.1