[PATCH 00/17] Some more int/long mismatch fixes

[Eric Pouech]

- resending last 5 patches from yesterday's serie (git am seems more picky
  that what I use)
- a bunch of new ones

A+
---

Eric Pouech (17):
      dlls/gdiplus: use correct integral type
      dlls/ole32: use correct integral type
      dlls/quartz: use correct integral type
      dlls/riched20: use correct integral type
      dlls/windowscodec: removes useless casts to long
      dlls/mf: use correct integral type
      dlls/mfreadwrite: use correct integral type
      dlls/mfmediaengine: use correct integral type
      dlls/mfplat: use correct integral type
      dlls/mfplay: use correct integral type
      dlls/scrobj: use correct integral type
      dlls/setupapi: use correct integral type
      dlls/shell32: use correct integral type
      dlls/taskschd: use correct integral type
      dlls/user32: use correct integral type
      dlls/uxtheme: use correct integral type
      dlls/vbscript: use correct integral type


 dlls/gdiplus/image.c       | 21 ++++++++++++---------
 dlls/mf/copier.c           |  4 ++--
 dlls/mf/evr.c              |  4 ++--
 dlls/mf/main.c             |  3 ++-
 dlls/mf/sar.c              |  7 ++++---
 dlls/mf/session.c          | 29 ++++++++++++++++-------------
 dlls/mf/topology.c         |  5 +++--
 dlls/mfmediaengine/main.c  |  2 +-
 dlls/mfplat/buffer.c       |  7 ++++---
 dlls/mfplat/main.c         |  8 +++++---
 dlls/mfplat/mediatype.c    | 16 ++++++++++------
 dlls/mfplay/player.c       |  7 ++++---
 dlls/mfreadwrite/reader.c  | 32 +++++++++++++++++---------------
 dlls/ole32/compobj.c       |  2 +-
 dlls/quartz/systemclock.c  |  5 +++--
 dlls/riched20/caret.c      |  8 ++++----
 dlls/riched20/editor.c     | 33 +++++++++++++++++++--------------
 dlls/riched20/editor.h     |  2 +-
 dlls/riched20/editstr.h    |  2 +-
 dlls/riched20/paint.c      |  4 ++--
 dlls/riched20/richole.c    |  6 ++++--
 dlls/riched20/writer.c     |  2 +-
 dlls/scrobj/scrobj.c       |  2 +-
 dlls/setupapi/install.c    |  7 ++++---
 dlls/setupapi/queue.c      |  2 +-
 dlls/shell32/iconcache.c   | 10 +++++++---
 dlls/shell32/shellpath.c   |  8 ++++----
 dlls/shell32/shlview.c     |  2 +-
 dlls/taskschd/regtask.c    |  2 +-
 dlls/user32/input.c        |  2 +-
 dlls/user32/spy.c          |  2 +-
 dlls/user32/user_private.h |  2 +-
 dlls/user32/win.c          |  3 ++-
 dlls/uxtheme/msstyles.c    | 18 ++++++++++++------
 dlls/vbscript/interp.c     |  2 +-
 dlls/vbscript/vbdisp.c     |  2 +-
 dlls/windowscodecs/ungif.c |  3 +--
 37 files changed, 157 insertions(+), 119 deletions(-)

[PATCH 01/17] dlls/gdiplus: use correct integral type

[Eric Pouech]

Note to Esme:
- in GdipGetPropertyIdList, for the call to IWICEnumMetadataItem_Next(),
  MSDN states that the last parameter (items_returned) is optional.
- Wine's implementation doesn't support optional parameter here.
- I leave it to you if of any importance.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/gdiplus/image.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 56eb62392ec..a7297047308 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -95,7 +95,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT
 
             IWICPalette_GetColorCount(wic_palette, &count);
             palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB));
-            IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count);
+            IWICPalette_GetColors(wic_palette, count, (UINT *)palette->Entries, &palette->Count);
 
             IWICPalette_GetType(wic_palette, &type);
             switch(type) {
@@ -140,7 +140,7 @@ static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette)
     IWICImagingFactory_Release(factory);
     if (SUCCEEDED(hr))
     {
-        hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count);
+        hr = IWICPalette_InitializeCustom(wic_palette, (UINT *)palette->Entries, palette->Count);
 
         if (SUCCEEDED(hr))
             hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette);
@@ -2437,7 +2437,8 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list
     HRESULT hr;
     IWICMetadataReader *reader;
     IWICEnumMetadataItem *enumerator;
-    UINT prop_count, i, items_returned;
+    UINT prop_count, i;
+    ULONG items_returned;
 
     TRACE("(%p, %u, %p)\n", image, num, list);
 
@@ -2781,7 +2782,8 @@ GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT *size, UINT *count)
 
     for (i = 0; i < prop_count; i++)
     {
-        UINT items_returned, item_size;
+        ULONG items_returned;
+        UINT item_size;
 
         hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned);
         if (hr != S_OK) break;
@@ -2859,7 +2861,8 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size,
     for (i = 0; i < prop_count; i++)
     {
         PropertyItem *item;
-        UINT items_returned, item_size;
+        ULONG items_returned;
+        UINT item_size;
 
         hr = IWICEnumMetadataItem_Next(enumerator, 1, NULL, &id, &value, &items_returned);
         if (hr != S_OK) break;
@@ -4113,7 +4116,7 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile)
     METAHEADER mh;
     HMETAFILE hmf;
     HRESULT hr;
-    UINT size;
+    ULONG size;
     void *buf;
 
     hr = IStream_Read(stream, &mh, sizeof(mh), &size);
@@ -4192,7 +4195,7 @@ static GpStatus load_emf(IStream *stream, GpMetafile **metafile)
     HENHMETAFILE hemf;
     GpStatus status;
     HRESULT hr;
-    UINT size;
+    ULONG size;
     void *buf;
 
     hr = IStream_Read(stream, &emh, sizeof(emh), &size);
@@ -4281,7 +4284,7 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res
     const BYTE *pattern, *mask;
     LARGE_INTEGER seek;
     HRESULT hr;
-    UINT bytesread;
+    ULONG bytesread;
     int i;
     DWORD j, sig;
 
@@ -5839,7 +5842,7 @@ static GpStatus create_optimal_palette(ColorPalette *palette, INT desired,
             {
                 palette->Flags = 0;
                 IWICPalette_GetColorCount(wic_palette, &palette->Count);
-                IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count);
+                IWICPalette_GetColors(wic_palette, palette->Count, (UINT *)palette->Entries, &palette->Count);
             }
 
             IWICBitmap_Release(bitmap);

[PATCH 01/17] dlls/gdiplus: use correct integral type

[Esme Povirk (she/they)]

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

[PATCH 02/17] dlls/ole32: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/ole32/compobj.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 815fdcb11d0..aafc4cf19f8 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -396,7 +396,7 @@ static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface)
 static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DWORD dwMilliseconds)
 {
     MREImpl *This = impl_from_ISynchronize(iface);
-    UINT index;
+    DWORD index;
     TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds);
     return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index);
 }

[PATCH 03/17] dlls/quartz: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/quartz/systemclock.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index f579ae754ea..659cfab3e58 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -25,7 +25,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
-static int cookie_counter;
+static LONG cookie_counter;
 
 struct advise_sink
 {
@@ -42,7 +42,8 @@ struct system_clock
     IUnknown *outer_unk;
     LONG refcount;
 
-    BOOL thread_created, thread_stopped;
+    LONG thread_created;
+    BOOL thread_stopped;
     HANDLE thread;
     LARGE_INTEGER frequency;
     REFERENCE_TIME last_time;

[PATCH 04/17] dlls/riched20: use correct integral type

[Eric Pouech]

Note to Huw: the change for using LONG for selection from/to
stems for the use directly with CHARRANGE (and its LONG fields).
I preferred changing all types to avoid casts.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/riched20/caret.c   |    8 ++++----
 dlls/riched20/editor.c  |   33 +++++++++++++++++++--------------
 dlls/riched20/editor.h  |    2 +-
 dlls/riched20/editstr.h |    2 +-
 dlls/riched20/paint.c   |    4 ++--
 dlls/riched20/richole.c |    6 ++++--
 dlls/riched20/writer.c  |    2 +-
 7 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c
index ebc137ebf85..cc5ce90ea42 100644
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -39,14 +39,14 @@ static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL fin
 }
 
 
-int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to)
+int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to)
 {
   *from = ME_GetCursorOfs(&editor->pCursors[0]);
   *to =   ME_GetCursorOfs(&editor->pCursors[1]);
 
   if (*from > *to)
   {
-    int tmp = *from;
+    LONG tmp = *from;
     *from = *to;
     *to = tmp;
     return 1;
@@ -160,7 +160,7 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to)
     /* deselected and caret moved to end of the current selection */
     if (from < 0)
     {
-      int start, end;
+      LONG start, end;
       ME_GetSelectionOfs(editor, &start, &end);
       if (start != end)
       {
@@ -1353,7 +1353,7 @@ BOOL ME_IsSelection(ME_TextEditor *editor)
 
 void ME_DeleteSelection(ME_TextEditor *editor)
 {
-  int from, to;
+  LONG from, to;
   int nStartCursor = ME_GetSelectionOfs(editor, &from, &to);
   int nEndCursor = nStartCursor ^ 1;
   ME_DeleteTextAtCursor(editor, nStartCursor, to - from);
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 429f023ebe4..3f1015513f0 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -1567,7 +1567,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
 {
   RTF_Info parser;
   ME_Style *style;
-  int from, to, nUndoMode;
+  LONG from, to;
+  int nUndoMode;
   int nEventMask = editor->nEventMask;
   ME_InStream inStream;
   BOOL invalidRTF = FALSE;
@@ -2087,7 +2088,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText)
 
     if (ex->flags & GT_SELECTION)
     {
-      int from, to;
+      LONG from, to;
       int nStartCur = ME_GetSelectionOfs(editor, &from, &to);
       start = editor->pCursors[nStartCur];
       nChars = to - from;
@@ -2366,7 +2367,7 @@ HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, i
 static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut )
 {
     HRESULT hr;
-    int offs, count;
+    LONG offs, count;
     int start_cursor = ME_GetSelectionOfs( editor, &offs, &count );
     ME_Cursor *sel_start = &editor->pCursors[start_cursor];
 
@@ -2412,7 +2413,7 @@ static BOOL handle_enter(ME_TextEditor *editor)
     {
         ME_Cursor cursor = editor->pCursors[0];
         ME_Paragraph *para = cursor.para;
-        int from, to;
+        LONG from, to;
         ME_Style *style, *eop_style;
 
         if (editor->props & TXTBIT_READONLY)
@@ -2689,7 +2690,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags )
   {
     ME_Cursor cursor = editor->pCursors[0];
     ME_Paragraph *para = cursor.para;
-    int from, to;
+    LONG from, to;
     BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000;
     ME_GetSelectionOfs(editor, &from, &to);
     if (wstr == '\t' &&
@@ -2845,7 +2846,8 @@ void editor_set_cursor( ME_TextEditor *editor, int x, int y )
 
         else if (ME_IsSelection( editor ))
         {
-            int start, end, offset = ME_GetCursorOfs( &pos );
+            LONG start, end;
+            int offset = ME_GetCursorOfs( &pos );
 
             ME_GetSelectionOfs( editor, &start, &end );
             if (start <= offset && end >= offset) cursor = cursor_arrow;
@@ -3144,7 +3146,8 @@ void link_notify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam)
 
 void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len)
 {
-  int from, to, nStartCursor;
+  LONG from, to;
+  int nStartCursor;
   ME_Style *style;
 
   nStartCursor = ME_GetSelectionOfs(editor, &from, &to);
@@ -3279,10 +3282,10 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
   case EM_GETSEL:
   {
     /* Note: wParam/lParam can be NULL */
-    UINT from, to;
-    PUINT pfrom = wParam ? (PUINT)wParam : &from;
-    PUINT pto = lParam ? (PUINT)lParam : &to;
-    ME_GetSelectionOfs(editor, (int *)pfrom, (int *)pto);
+    LONG from, to;
+    PLONG pfrom = wParam ? (PLONG)wParam : &from;
+    PLONG pto = lParam ? (PLONG)lParam : &to;
+    ME_GetSelectionOfs(editor, pfrom, pto);
     if ((*pfrom|*pto) & 0xFFFF0000)
       return -1;
     return MAKELONG(*pfrom,*pto);
@@ -3388,7 +3391,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
   {
     LPWSTR wszText;
     SETTEXTEX *pStruct = (SETTEXTEX *)wParam;
-    int from, to, len;
+    LONG from, to;
+    int len;
     ME_Style *style;
     BOOL bRtf, bUnicode, bSelection, bUTF8;
     int oldModify = editor->nModifyStep;
@@ -3545,7 +3549,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
   }
   case WM_CLEAR:
   {
-    int from, to;
+    LONG from, to;
     int nStartCursor = ME_GetSelectionOfs(editor, &from, &to);
     ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE);
     ME_CommitUndo(editor);
@@ -3660,7 +3664,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
     return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam);
   case EM_GETSELTEXT:
   {
-    int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo);
+    LONG nFrom, nTo;
+    int nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo);
     ME_Cursor *from = &editor->pCursors[nStartCur];
     return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom );
   }
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index 8a46e942581..e0df63ae92d 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -182,7 +182,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO
 BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN;
 
 int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN;
-int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) DECLSPEC_HIDDEN;
+int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) DECLSPEC_HIDDEN;
 int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DECLSPEC_HIDDEN;
 BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN;
 void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN;
diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index 22cfd74722c..889795de189 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -401,7 +401,7 @@ typedef struct tagME_TextEditor
   int nUndoLimit;
   ME_UndoMode nUndoMode;
   int nParagraphs;
-  int nLastSelStart, nLastSelEnd;
+  LONG nLastSelStart, nLastSelEnd;
   ME_Paragraph *last_sel_start_para, *last_sel_end_para;
   ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE];
   int nZoomNumerator, nZoomDenominator;
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 6ab7e4de76b..245afff77dc 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -459,7 +459,7 @@ static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor )
   ME_Row *row;
   ME_Run *run = cursor->run;
   int runofs = run_char_ofs( run, cursor->nOffset );
-  int nSelFrom, nSelTo;
+  LONG nSelFrom, nSelTo;
 
   if (run->nFlags & MERF_HIDDEN) return;
 
@@ -1248,7 +1248,7 @@ ME_InvalidateSelection(ME_TextEditor *editor)
 {
   ME_Paragraph *sel_start, *sel_end;
   ME_Paragraph *repaint_start = NULL, *repaint_end = NULL;
-  int nStart, nEnd;
+  LONG nStart, nEnd;
   int len = ME_GetTextLength(editor);
 
   ME_GetSelectionOfs(editor, &nStart, &nEnd);
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 03572511ff7..47194096bdc 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1254,7 +1254,8 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *iface, CHARRANGE *lpchrg,
         return E_INVALIDARG;
     if(!lpchrg)
     {
-        int nFrom, nTo, nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo );
+        LONG nFrom, nTo;
+        int nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo );
         start = services->editor->pCursors[nStartCur];
         nChars = nTo - nFrom;
     }
@@ -4661,7 +4662,8 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str)
 {
     struct text_selection *This = impl_from_ITextSelection(me);
     ME_TextEditor *editor;
-    int len, to, from;
+    int len;
+    LONG to, from;
 
     TRACE("(%p)->(%s)\n", This, debugstr_w(str));
 
diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c
index d6c687daab9..c4f79ce6f5b 100644
--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -1198,7 +1198,7 @@ ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream)
   int nChars;
 
   if (dwFormat & SFF_SELECTION) {
-    int nStart, nTo;
+    LONG nStart, nTo;
     start = editor->pCursors[ME_GetSelectionOfs(editor, &nStart, &nTo)];
     nChars = nTo - nStart;
   } else {

[PATCH 05/17] dlls/windowscodec: removes useless casts to long

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/windowscodecs/ungif.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c
index c6711c8e24c..0f5ed6e25d5 100644
--- a/dlls/windowscodecs/ungif.c
+++ b/dlls/windowscodecs/ungif.c
@@ -460,8 +460,7 @@ DGifGetImageDesc(GifFileType * GifFile) {
 
     GifFile->ImageCount++;
 
-    Private->PixelCount = (long)GifFile->Image.Width *
-       (long)GifFile->Image.Height;
+    Private->PixelCount = GifFile->Image.Width * GifFile->Image.Height;
 
     DGifSetupDecompress(GifFile);  /* Reset decompress algorithm parameters. */

[PATCH 06/17] dlls/mf: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/mf/copier.c   |    4 ++--
 dlls/mf/evr.c      |    4 ++--
 dlls/mf/main.c     |    3 ++-
 dlls/mf/sar.c      |    7 ++++---
 dlls/mf/session.c  |   29 ++++++++++++++++-------------
 dlls/mf/topology.c |    5 +++--
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c
index b05ae3383ab..fe5664ee4c7 100644
--- a/dlls/mf/copier.c
+++ b/dlls/mf/copier.c
@@ -247,7 +247,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputAvailableType(IMFTransfor
     return hr;
 }
 
-static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size)
+static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, UINT32 *size)
 {
     GUID major, subtype;
     UINT64 frame_size;
@@ -281,7 +281,7 @@ static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size)
 static HRESULT sample_copier_set_media_type(struct sample_copier *transform, BOOL input, DWORD id, IMFMediaType *type,
         DWORD flags)
 {
-    DWORD buffer_size;
+    UINT32 buffer_size;
     HRESULT hr = S_OK;
 
     if (id)
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index 9552990006d..5e8b559af04 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -1633,8 +1633,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer)
 
     if (SUCCEEDED(hr))
     {
-        unsigned int input_count, output_count;
-        unsigned int *ids, *oids;
+        DWORD input_count, output_count;
+        DWORD *ids, *oids;
         size_t i;
 
         /* Create stream sinks for inputs that mixer already has by default. */
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index acbb8377e52..50451170275 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -1072,10 +1072,11 @@ static int __cdecl qsort_string_compare(const void *a, const void *b)
 static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst)
 {
     static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
-    unsigned int capacity = 0, count, size;
+    unsigned int capacity = 0, count;
     HRESULT hr = S_OK;
     int i, index;
     WCHAR *buffW;
+    DWORD size;
 
     if (!(buffW = calloc(maxlen, sizeof(*buffW))))
         return E_OUTOFMEMORY;
diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
index f6f2b32dd2d..3c9bac90c9f 100644
--- a/dlls/mf/sar.c
+++ b/dlls/mf/sar.c
@@ -1493,7 +1493,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM
         IMFMediaType *in_type, IMFMediaType **out_type)
 {
     struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface);
-    unsigned int flags;
+    DWORD flags;
     HRESULT hr;
 
     TRACE("%p, %p, %p.\n", iface, in_type, out_type);
@@ -1618,8 +1618,8 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF
     struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface);
     const unsigned int test_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES;
     BOOL compare_result;
-    unsigned int flags;
     HRESULT hr = S_OK;
+    DWORD flags;
 
     TRACE("%p, %p.\n", iface, media_type);
 
@@ -1777,11 +1777,12 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb
 
 static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result)
 {
-    unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len;
+    unsigned int src_frames, dst_frames, max_frames, pad_frames;
     struct queued_object *obj, *obj2;
     BOOL keep_sample = FALSE;
     IMFMediaBuffer *buffer;
     BYTE *dst, *src;
+    DWORD src_len;
     HRESULT hr;
 
     LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index c365495ee48..46909a72d9f 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -185,7 +185,7 @@ struct topo_node
         struct
         {
             IMFMediaSource *source;
-            unsigned int stream_id;
+            DWORD stream_id;
         } source;
         struct
         {
@@ -197,11 +197,11 @@ struct topo_node
         struct
         {
             struct transform_stream *inputs;
-            unsigned int *input_map;
+            DWORD *input_map;
             unsigned int input_count;
 
             struct transform_stream *outputs;
-            unsigned int *output_map;
+            DWORD *output_map;
             unsigned int output_count;
         } transform;
     } u;
@@ -867,8 +867,9 @@ static void session_start(struct media_session *session, const GUID *time_format
 static void session_set_started(struct media_session *session)
 {
     struct media_source *source;
-    unsigned int caps, flags;
     IMFMediaEvent *event;
+    unsigned int caps;
+    DWORD flags;
 
     session->state = SESSION_STATE_STARTED;
 
@@ -1183,15 +1184,16 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology
 
 static unsigned int transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index)
 {
-    unsigned int *map = output ? node->u.transform.output_map : node->u.transform.input_map;
+    DWORD *map = output ? node->u.transform.output_map : node->u.transform.input_map;
     return map ? map[index] : index;
 }
 
 static HRESULT session_set_transform_stream_info(struct topo_node *node)
 {
-    unsigned int *input_map = NULL, *output_map = NULL;
-    unsigned int i, input_count, output_count, block_alignment;
+    DWORD *input_map = NULL, *output_map = NULL;
+    DWORD i, input_count, output_count;
     struct transform_stream *streams;
+    unsigned int block_alignment;
     IMFMediaType *media_type;
     GUID major = { 0 };
     HRESULT hr;
@@ -2130,7 +2132,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
     struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface);
     struct topo_node *topo_node;
     IMFTopologyNode *upstream_node;
-    unsigned int upstream_output;
+    DWORD upstream_output;
 
     EnterCriticalSection(&session->cs);
 
@@ -2460,8 +2462,8 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
     struct media_sink *sink;
     enum object_state state;
     struct topo_node *node;
-    unsigned int i, count;
     BOOL changed = FALSE;
+    DWORD i, count;
     HRESULT hr;
 
     if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID)
@@ -2666,10 +2668,11 @@ static struct sample *transform_create_sample(IMFSample *sample)
 static HRESULT transform_get_external_output_sample(const struct media_session *session, struct topo_node *transform,
         unsigned int output_index, const MFT_OUTPUT_STREAM_INFO *stream_info, IMFSample **sample)
 {
-    unsigned int buffer_size, downstream_input;
     IMFTopologyNode *downstream_node;
     IMFMediaBuffer *buffer = NULL;
     struct topo_node *topo_node;
+    unsigned int buffer_size;
+    DWORD downstream_input;
     TOPOID node_id;
     HRESULT hr;
 
@@ -2711,9 +2714,9 @@ static HRESULT transform_node_pull_samples(const struct media_session *session,
     MFT_OUTPUT_STREAM_INFO stream_info;
     MFT_OUTPUT_DATA_BUFFER *buffers;
     struct sample *queued_sample;
+    HRESULT hr = E_UNEXPECTED;
     DWORD status = 0;
     unsigned int i;
-    HRESULT hr = E_UNEXPECTED;
 
     if (!(buffers = calloc(node->u.transform.output_count, sizeof(*buffers))))
         return E_OUTOFMEMORY;
@@ -2886,7 +2889,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
 static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output)
 {
     IMFTopologyNode *downstream_node, *upstream_node;
-    unsigned int downstream_input, upstream_output;
+    DWORD downstream_input, upstream_output;
     struct topo_node *topo_node;
     MF_TOPOLOGY_TYPE node_type;
     struct sample *sample;
@@ -3535,8 +3538,8 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess
     struct media_source *source;
     struct media_sink *sink;
     float value = 0.0f, tmp;
-    unsigned int flags;
     HRESULT hr = S_OK;
+    DWORD flags;
 
     if (!nearest_rate) nearest_rate = &tmp;
 
diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c
index f97c0cc75d3..5a25edccc9a 100644
--- a/dlls/mf/topology.c
+++ b/dlls/mf/topology.c
@@ -2381,8 +2381,9 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context
 static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size)
 {
     IMFTopologyNode *downstream_node, *node, *orig_node;
-    unsigned int input_index, size = 0;
     MF_TOPOLOGY_TYPE node_type;
+    unsigned int size = 0;
+    DWORD input_index;
     HRESULT hr = S_OK;
     TOPOID id;
 
@@ -2506,8 +2507,8 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context
         IMFTopologyNode *node)
 {
     IMFTopologyNode *upstream_node;
-    unsigned int upstream_output;
     IMFStreamSink *stream_sink;
+    DWORD upstream_output;
     IMFTransform *copier = NULL;
     HRESULT hr;

[PATCH 07/17] dlls/mfreadwrite: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/mfreadwrite/reader.c |   32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index be77e1c5b1d..2ac6f0810a1 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -87,7 +87,7 @@ struct media_stream
     struct stream_transform decoder;
     IMFVideoSampleAllocatorEx *allocator;
     IMFVideoSampleAllocatorNotify notify_cb;
-    unsigned int id;
+    DWORD id;
     unsigned int index;
     enum media_stream_state state;
     unsigned int flags;
@@ -162,9 +162,9 @@ struct source_reader
     unsigned int first_audio_stream_index;
     unsigned int first_video_stream_index;
     unsigned int last_read_index;
-    unsigned int stream_count;
+    DWORD stream_count;
     unsigned int flags;
-    unsigned int queue;
+    DWORD queue;
     enum media_source_state source_state;
     struct media_stream *streams;
     struct list responses;
@@ -368,8 +368,8 @@ static void source_reader_response_ready(struct source_reader *reader, struct st
 static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst)
 {
     IMFMediaBuffer *buffer;
-    unsigned int flags;
     LONGLONG time;
+    DWORD flags;
     HRESULT hr;
 
     IMFSample_CopyAllItems(src, (IMFAttributes *)dst);
@@ -1057,7 +1057,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m
     return !request_sample;
 }
 
-static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index)
+static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index)
 {
     unsigned int i, first_selected = ~0u, requests = ~0u;
     BOOL selected, stream_drained;
@@ -1095,7 +1095,7 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read
     return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK;
 }
 
-static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index)
+static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, DWORD *stream_index)
 {
     BOOL selected;
     HRESULT hr;
@@ -1814,7 +1814,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG
 {
     struct source_reader *reader = impl_from_IMFSourceReader(iface);
     struct source_reader_async_command *command;
-    unsigned int i, flags;
+    unsigned int i;
+    DWORD flags;
     HRESULT hr;
 
     TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position);
@@ -1871,8 +1872,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG
 static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index,
         DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample)
 {
-    unsigned int actual_index_tmp;
     struct media_stream *stream;
+    DWORD actual_index_tmp;
     LONGLONG timestamp_tmp;
     DWORD stream_index;
     HRESULT hr = S_OK;
@@ -1931,7 +1932,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind
 }
 
 static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags,
-        unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample)
+        DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample)
 {
     struct source_reader_async_command *command;
     HRESULT hr;
@@ -2166,7 +2167,7 @@ static const IMFSourceReaderVtbl srcreader_vtbl =
 
 static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major)
 {
-    unsigned int count, i;
+    DWORD count, i;
     BOOL selected;
     HRESULT hr;
     GUID guid;
@@ -2415,8 +2416,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url)
         { mp4vmagic, L".m4v", mp4mask },
     };
     unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)];
-    unsigned int i, j, length = 0, caps = 0;
+    unsigned int i, j, length = 0;
     IMFAttributes *attributes;
+    DWORD ulength, caps = 0;
     QWORD position;
     HRESULT hr;
 
@@ -2440,12 +2442,12 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url)
     if (FAILED(hr = IMFByteStream_GetCurrentPosition(stream, &position)))
         return hr;
 
-    hr = IMFByteStream_Read(stream, buffer, sizeof(buffer), &length);
+    hr = IMFByteStream_Read(stream, buffer, sizeof(buffer), &ulength);
     IMFByteStream_SetCurrentPosition(stream, position);
     if (FAILED(hr))
         return hr;
 
-    if (length < sizeof(buffer))
+    if (ulength < sizeof(buffer))
         return S_OK;
 
     for (i = 0; i < ARRAY_SIZE(url_hints); ++i)
@@ -2468,9 +2470,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url)
     }
 
     if (*url)
-        TRACE("Stream type guessed as %s from %s.\n", debugstr_w(*url), debugstr_an((char *)buffer, length));
+        TRACE("Stream type guessed as %s from %s.\n", debugstr_w(*url), debugstr_an((char *)buffer, ulength));
     else
-        WARN("Unrecognized content type %s.\n", debugstr_an((char *)buffer, length));
+        WARN("Unrecognized content type %s.\n", debugstr_an((char *)buffer, ulength));
 
     return S_OK;
 }

[PATCH 08/17] dlls/mfmediaengine: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/mfmediaengine/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 4b5a3f83446..fb8b4b8e9ae 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -1074,8 +1074,8 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I
 static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source)
 {
     IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL;
-    unsigned int stream_count = 0, i;
     IMFPresentationDescriptor *pd;
+    DWORD stream_count = 0, i;
     IMFTopology *topology;
     UINT64 duration;
     HRESULT hr;

[PATCH 08/17] dlls/mfmediaengine: use correct integral type

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

[PATCH 09/17] dlls/mfplat: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/mfplat/buffer.c    |    7 ++++---
 dlls/mfplat/main.c      |    8 +++++---
 dlls/mfplat/mediatype.c |   16 ++++++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index 9081dc39eab..f161bb29d80 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -49,7 +49,7 @@ struct buffer
     struct
     {
         BYTE *linear_buffer;
-        unsigned int plane_size;
+        DWORD plane_size;
 
         BYTE *scanline0;
         unsigned int width;
@@ -1306,9 +1306,10 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc)
 
 static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer)
 {
-    unsigned int stride, max_length, plane_size;
-    struct buffer *object;
+    unsigned int stride, max_length;
     unsigned int row_alignment;
+    struct buffer *object;
+    DWORD plane_size;
     GUID subtype;
     BOOL is_yuv;
     HRESULT hr;
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index e2f892ed91d..e79f59d41dd 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -702,9 +702,10 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32
     HRESULT hr = S_OK;
     HKEY hclsid = 0;
     WCHAR buffer[64];
-    DWORD size, ret;
     WCHAR str[250];
     UINT8 *blob;
+    UINT32 size;
+    DWORD ret;
 
     guid_to_string(buffer, clsid);
     swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer);
@@ -6094,8 +6095,9 @@ static const IRtwqAsyncCallbackVtbl source_resolver_callback_url_vtbl =
 
 static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler)
 {
-    unsigned int j = 0, name_length, type;
+    DWORD name_length, type;
     HRESULT hr = E_FAIL;
+    unsigned int j = 0;
     WCHAR clsidW[39];
     CLSID clsid;
 
@@ -9207,7 +9209,7 @@ static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom)
 {
     ULARGE_INTEGER q1, q0, rhat;
     ULARGE_INTEGER v, cmp1, cmp2;
-    unsigned int s = 0;
+    DWORD s = 0;
 
     v.QuadPart = llabs(denom);
 
diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index 4f24ccbd237..c20e0c68235 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -2926,8 +2926,10 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
 
     if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value)))
         format->nChannels = value;
-    IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec);
-    IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec);
+    if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value)))
+        format->nSamplesPerSec = value;
+    if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value)))
+        format->nAvgBytesPerSec = value;
     if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value)))
         format->nBlockAlign = value;
     if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value)))
@@ -2939,7 +2941,8 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
         if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value)))
             format_ext->Samples.wSamplesPerBlock = value;
 
-        IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask);
+        if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value)))
+            format_ext->dwChannelMask = value;
         memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat));
     }
 
@@ -3085,8 +3088,8 @@ HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaT
     return S_OK;
 }
 
-static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator,
-        UINT32 *denominator)
+static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, DWORD *numerator,
+                                 DWORD *denominator)
 {
     UINT64 value;
 
@@ -3166,7 +3169,8 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF
         format->compressedInfo.AvgBitrate = avgrate;
     if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate)))
         format->compressedInfo.AvgBitErrorRate = avgrate;
-    IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing);
+    if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &avgrate)))
+        format->compressedInfo.MaxKeyFrameSpacing = avgrate;
 
     /* Palette. */
     if (palette_size)

[PATCH 09/17] dlls/mfplat: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106852

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
Task: Patch failed to apply

[PATCH 10/17] dlls/mfplay: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/mfplay/player.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index 5abee9d7de8..85125c4bb4c 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -657,16 +657,17 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface,
 static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags)
 {
     struct media_item *item = impl_from_IMFPMediaItem(iface);
+    DWORD value;
     HRESULT hr;
 
     TRACE("%p, %p.\n", iface, flags);
 
     *flags = 0;
 
-    if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags)))
+    if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, &value)))
     {
-        *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK |
-                MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK);
+        *flags = value & (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK |
+                          MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK);
     }
 
     return hr;

[PATCH 10/17] dlls/mfplay: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106853

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
Task: Patch failed to apply

[PATCH 11/17] dlls/scrobj: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/scrobj/scrobj.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c
index 228cfb14904..5537fbb7b88 100644
--- a/dlls/scrobj/scrobj.c
+++ b/dlls/scrobj/scrobj.c
@@ -1598,7 +1598,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct
     XmlNodeType node_type;
     size_t buf_size, size;
     WCHAR *new_body;
-    DWORD read;
+    UINT read;
     HRESULT hres;
 
     TRACE("\n");

[PATCH 11/17] dlls/scrobj: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106854

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
Task: Patch failed to apply

[PATCH 12/17] dlls/setupapi: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/setupapi/install.c |    7 ++++---
 dlls/setupapi/queue.c   |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index df39fd440b3..28ef0820ebf 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -826,7 +826,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
 {
     WCHAR lnkpath[MAX_PATH];
     LPWSTR cmdline=NULL, lnkpath_end;
-    unsigned int name_size;
+    DWORD name_size;
     INFCONTEXT name_context, context;
     int attrs=0;
 
@@ -846,7 +846,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
 
     if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, L"SubDir", &context ))
     {
-        unsigned int subdir_size;
+        DWORD subdir_size;
 
         if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size ))
             return TRUE;
@@ -878,7 +878,8 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg )
         /* calculate command line */
         if (SetupFindFirstLineW( hinf, field, L"CmdLine", &context ))
         {
-            unsigned int dir_len=0, subdir_size=0, filename_size=0;
+            unsigned int dir_len=0;
+            DWORD subdir_size=0, filename_size=0;
             int dirid=0;
             LPCWSTR dir;
             LPWSTR cmdline_end;
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index dc718cc66fc..e0287f63593 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -1275,7 +1275,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour
 {
     BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE));
     WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH];
-    unsigned int len;
+    DWORD len;
 
     TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root),
           debugstr_w(dest), style, handler, context, in_use);

[PATCH 12/17] dlls/setupapi: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106855

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
Task: Patch failed to apply

[PATCH 13/17] dlls/shell32: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/shell32/iconcache.c |   10 +++++++---
 dlls/shell32/shellpath.c |    8 ++++----
 dlls/shell32/shlview.c   |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 1ca4840dc58..1c61374a732 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -337,9 +337,13 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons
 
 static BOOL get_imagelist_icon_size(int list, SIZE *size)
 {
+    int cx, cy;
     if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE;
 
-    return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy );
+    if (!ImageList_GetIconSize( shell_imagelists[list], &cx, &cy )) return FALSE;
+    size->cx = cx;
+    size->cy = cy;
+    return TRUE;
 }
 
 /****************************************************************************
@@ -358,8 +362,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags)
 
     for (i = 0; i < ARRAY_SIZE(hicons); i++)
     {
-        get_imagelist_icon_size( i, &size );
-        if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 ))
+        if (!get_imagelist_icon_size( i, &size ) ||
+            !PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 ))
             WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile));
         if (!hicons[i]) goto fail;
     }
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 2f1573f8221..2c62f9d4b6a 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3677,7 +3677,7 @@ static HRESULT get_known_folder_redirection_place(
 {
     HRESULT hr;
     LPWSTR lpRegistryPath = NULL;
-    KF_CATEGORY category;
+    DWORD category;
 
     /* first, get known folder's category */
     hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath);
@@ -3918,7 +3918,7 @@ static HRESULT WINAPI knownfolder_GetCategory(
         hr = E_FAIL;
 
     if(SUCCEEDED(hr))
-        hr = get_known_folder_dword(knownfolder->registryPath, L"Category", pCategory);
+        hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)pCategory);
 
     return hr;
 }
@@ -3943,7 +3943,7 @@ static HRESULT get_known_folder_path(
     DWORD dwSize, dwType;
     WCHAR path[MAX_PATH] = {0};
     WCHAR parentGuid[39];
-    KF_CATEGORY category;
+    DWORD category;
     LPWSTR parentRegistryPath, parentPath;
     HKEY hRedirectionRootKey = NULL;
 
@@ -4138,7 +4138,7 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition(
     ZeroMemory(pKFD, sizeof(*pKFD));
 
     /* required fields */
-    hr = get_known_folder_dword(knownfolder->registryPath, L"Category", &pKFD->category);
+    hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)&pKFD->category);
     if(FAILED(hr))
         return hr;
 
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index a2afc72b7a9..5f5455bb6f2 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -3243,7 +3243,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedCount(
     if (FAILED(hr))
         return hr;
 
-    hr = IShellItemArray_GetCount(selection, count);
+    hr = IShellItemArray_GetCount(selection, (DWORD *)count);
     IShellItemArray_Release(selection);
     return hr;
 }

[PATCH 13/17] dlls/shell32: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106856

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
Task: Patch failed to apply

[PATCH 14/17] dlls/taskschd: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/taskschd/regtask.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c
index 094f34d8f79..9a18fed8714 100644
--- a/dlls/taskschd/regtask.c
+++ b/dlls/taskschd/regtask.c
@@ -158,7 +158,7 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat
 
     if (!state) return E_POINTER;
 
-    return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state);
+    return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, (DWORD *)state);
 }
 
 static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *v_enabled)

[PATCH 14/17] dlls/taskschd: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106857

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
Task: Patch failed to apply

[PATCH 15/17] dlls/user32: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/user32/input.c        |    2 +-
 dlls/user32/spy.c          |    2 +-
 dlls/user32/user_private.h |    2 +-
 dlls/user32/win.c          |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index fde4b9965ed..eca8c3f115a 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -49,7 +49,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(win);
 WINE_DECLARE_DEBUG_CHANNEL(keyboard);
 
-INT global_key_state_counter = 0;
+LONG global_key_state_counter = 0;
 
 /***********************************************************************
  *           get_key_state
diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c
index 727094be05d..e4651661ae0 100644
--- a/dlls/user32/spy.c
+++ b/dlls/user32/spy.c
@@ -2045,7 +2045,7 @@ typedef struct
     WCHAR      wnd_name[16];     /* window name for message            */
 } SPY_INSTANCE;
 
-static int indent_tls_index = TLS_OUT_OF_INDEXES;
+static LONG indent_tls_index = TLS_OUT_OF_INDEXES;
 
 /***********************************************************************
  *           get_indent_level
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index d1016780658..9e65e9f1f66 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -120,7 +120,7 @@ struct rawinput_thread_data
     RAWINPUT buffer[1]; /* rawinput message data buffer */
 };
 
-extern INT global_key_state_counter DECLSPEC_HIDDEN;
+extern LONG global_key_state_counter DECLSPEC_HIDDEN;
 extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN;
 extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN;
 #define WM_IME_INTERNAL 0x287
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 4f1f70d9802..02891cd34ce 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -4192,7 +4192,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout )
     if (process_layout == ~0u)
     {
         WCHAR *str, buffer[MAX_PATH];
-        DWORD i, len, version_layout = 0;
+        DWORD i, version_layout = 0;
+        UINT len;
         DWORD user_lang = GetUserDefaultLangID();
         DWORD *languages;
         void *data = NULL;

[PATCH 15/17] dlls/user32: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106858

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
Task: Patch failed to apply

[PATCH 16/17] dlls/uxtheme: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/uxtheme/msstyles.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index c0f626d54aa..376d8bc6db9 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
  */
 
 static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value);
+static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value);
 static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize);
 static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics);
 static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont);
@@ -1159,10 +1160,10 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha
     return img->image;
 }
 
-static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value)
+static BOOL MSSTYLES_GetNextLong(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LONG *value)
 {
     LPCWSTR cur = lpStringStart;
-    int total = 0;
+    LONG total = 0;
     BOOL gotNeg = FALSE;
 
     while(cur < lpStringEnd && (*cur < '0' || *cur > '9' || *cur == '-')) cur++;
@@ -1183,6 +1184,11 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd,
     return TRUE;
 }
 
+static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value)
+{
+    return MSSTYLES_GetNextLong(lpStringStart, lpStringEnd, lpValEnd, (LONG *)value);
+}
+
 static inline BOOL isSpace(WCHAR c)
 {
     return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
@@ -1377,10 +1383,10 @@ HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect)
     LPCWSTR lpCur = tp->lpValue;
     LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen;
 
-    MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->left);
-    MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->top);
-    MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->right);
-    if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->bottom)) {
+    MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->left);
+    MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->top);
+    MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->right);
+    if(!MSSTYLES_GetNextLong(lpCur, lpEnd, &lpCur, &pRect->bottom)) {
         TRACE("Could not parse rect property\n");
         return E_PROP_ID_UNSUPPORTED;
     }

[PATCH 16/17] dlls/uxtheme: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106859

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
error: patch failed: dlls/uxtheme/msstyles.c:42
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
error: patch failed: dlls/uxtheme/msstyles.c:42
Task: Patch failed to apply

[PATCH 17/17] dlls/vbscript: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/vbscript/interp.c |    2 +-
 dlls/vbscript/vbdisp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 2d9d1eee741..f33454604d0 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -563,7 +563,7 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V
     }
 
     for(i=0; i<argc; i++) {
-        hres = to_int(get_arg(dp, i), indices+i);
+        hres = to_int(get_arg(dp, i), (int *)(indices+i));
         if(FAILED(hres)) {
             heap_free(indices);
             SafeArrayUnlock(array);
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index 6b9a1a0a5d0..d67a1831bbe 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -1683,7 +1683,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags,
         hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */);
         IDispatchEx_Release(dispex);
     }else {
-        ULONG err = 0;
+        UINT err = 0;
 
         TRACE("using IDispatch\n");
         hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err);

[PATCH 17/17] dlls/vbscript: use correct integral type

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106860

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
error: patch failed: dlls/uxtheme/msstyles.c:42
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: dlls/ole32/compobj.c:396
error: patch failed: dlls/riched20/caret.c:39
error: patch failed: dlls/riched20/editor.c:1567
error: patch failed: dlls/riched20/editor.h:182
error: patch failed: dlls/riched20/editstr.h:401
error: patch failed: dlls/riched20/paint.c:459
error: patch failed: dlls/riched20/richole.c:1254
error: patch failed: dlls/riched20/writer.c:1198
error: patch failed: dlls/windowscodecs/ungif.c:460
error: patch failed: dlls/mfreadwrite/reader.c:87
error: patch failed: dlls/mfmediaengine/main.c:1074
error: patch failed: dlls/mfplay/player.c:657
error: patch failed: dlls/scrobj/scrobj.c:1598
error: patch failed: dlls/setupapi/install.c:826
error: patch failed: dlls/setupapi/queue.c:1275
error: patch failed: dlls/shell32/iconcache.c:337
error: patch failed: dlls/shell32/shellpath.c:3677
error: patch failed: dlls/shell32/shlview.c:3243
error: patch failed: dlls/taskschd/regtask.c:158
error: patch failed: dlls/user32/input.c:49
error: patch failed: dlls/user32/spy.c:2045
error: patch failed: dlls/user32/user_private.h:120
error: patch failed: dlls/user32/win.c:4192
error: patch failed: dlls/uxtheme/msstyles.c:42
Task: Patch failed to apply

[PATCH 17/17] dlls/vbscript: use correct integral type

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>