[v2 PATCH 08/14] dlls/evr: use correct integral type

[Nikolay Sivov]

From: Eric Pouech

Signed-off-by: Eric Pouech 
Signed-off-by: Nikolay Sivov 
---

v2: keeps existing formatting for declarations.

dlls/evr/mixer.c     | 5 +++--
 dlls/evr/presenter.c | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 5af5b2861b3..3d72270fc16 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -906,8 +906,9 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D
     const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES;
     struct video_mixer *mixer = impl_from_IMFTransform(iface);
     HRESULT hr = MF_E_INVALIDMEDIATYPE;
-    unsigned int i, compare_flags;
     BOOL is_compressed = TRUE;
+    DWORD compare_flags;
+    unsigned int i;

TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);

@@ -1557,7 +1558,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology
         IMFTopologyServiceLookup *service_lookup)
 {
     struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface);
-    unsigned int count;
+    DWORD count;
     HRESULT hr;

TRACE("%p, %p.\n", iface, service_lookup);
diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index fd02404b7af..cf8ba20cbb8 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -282,7 +282,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter)

static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type)
 {
-    unsigned int flags;
+    DWORD flags;
     HRESULT hr;

if (!media_type)
@@ -328,9 +328,9 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter,
 static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture,
         IMFMediaType *media_type)
 {
-    unsigned int size;
     GUID subtype;
     LONG stride;
+    DWORD size;
     HRESULT hr;

hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy);
@@ -1104,8 +1104,8 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter)
 static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup)
 {
     IMFVideoDeviceID *device_id;
-    unsigned int count;
     GUID id = { 0 };
+    DWORD count;
     HRESULT hr;

count = 1;
@@ -1143,8 +1143,8 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo
         IMFTopologyServiceLookup *service_lookup)
 {
     struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface);
-    unsigned int count;
     HRESULT hr = S_OK;
+    DWORD count;

TRACE("%p, %p.\n", iface, service_lookup);