[PATCH 00/17] Some more preparation for migration to long types.

Eric Pouech eric.pouech at gmail.com
Tue Feb 1 07:04:14 CST 2022


The following series implements:
- another fix for macros returning unsigned long (missed yesterday)
- continuing fixing int*/long* mismatches
- some cleanups for code using casts to long
- some modifications for unixlib:
  to make it short, in Unixlib, a DWORD is a long on 32 bits compilation,
  and unsigned in 64bits compilations. This is make it hard in traces,
  scanf... without warnings.
  The idea here, which should be kept as a rule of thumb in (future)
  Unixlib code: keep the use of Wine traces and Windows types as low as
  possible.

NB: there will me more fixes required for msvcrt*.

A+
---

Eric Pouech (17):
      include/basetsd.h: Define PtrTo(Ul|L)ong to return a long (as SDK does).
      dlls/win32u: change NtGdiPolyPolyDraw parameter to ULONG
      dlls/jscript: use correct integral type
      dlls/msvcrt*: use correct integral type
      dlls/mshtml: use correct integral type
      dlls/ole32: use correct integral type
      dlls/oleaut32: use correct integral type
      dlls/oledb32: use correct integral type
      dlls/quartz: use correct integral type
      dlls/riched20: use correct integral type
      dlls/comdlg32: removed useless casts to long
      dlls/kernelbase: removed useless casts to long
      dlls/mciseq: removed useless casts to long
      dlls/windowscodec: removes useless casts to long
      dlls/bcrypt: in unixlib, don't use Windows long type
      dlls/kerberos: in unixlib, don't use Windows long type
      dlls/netapi32: in unixlib, don't use Windows long type


 dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++-----------
 dlls/bcrypt/gnutls.c          | 14 +++++++-------
 dlls/comdlg32/colordlg.c      | 21 +++++++++------------
 dlls/concrt140/details.c      |  2 +-
 dlls/gdi32/dc.c               |  6 +++---
 dlls/gdi32/objects.c          |  2 +-
 dlls/jscript/array.c          | 24 ++++++++++++------------
 dlls/jscript/engine.c         |  8 ++++----
 dlls/jscript/function.c       |  2 +-
 dlls/jscript/jscript.h        |  1 +
 dlls/jscript/jsregexp.c       |  4 ++--
 dlls/jscript/jsutils.c        |  5 +++++
 dlls/jscript/string.c         |  2 +-
 dlls/jscript/vbarray.c        | 17 +++++++++--------
 dlls/kerberos/unixlib.c       |  6 +++---
 dlls/kerberos/unixlib.h       |  4 ++--
 dlls/kernelbase/debug.c       |  4 ++--
 dlls/mciseq/mcimidi.c         |  8 +++-----
 dlls/mshtml/dispex.c          |  2 +-
 dlls/mshtml/htmlevent.c       | 16 ++++++++--------
 dlls/mshtml/htmlinput.c       |  4 ++--
 dlls/mshtml/htmlnode.c        |  2 +-
 dlls/mshtml/htmlselect.c      |  2 +-
 dlls/mshtml/htmlwindow.c      |  8 ++++----
 dlls/mshtml/pluginhost.c      |  6 +++---
 dlls/mshtml/range.c           |  2 +-
 dlls/mshtml/xmlhttprequest.c  |  2 +-
 dlls/msvcp90/details.c        |  2 +-
 dlls/netapi32/unixlib.c       | 12 ++++++------
 dlls/ole32/compobj.c          |  2 +-
 dlls/oleaut32/typelib.c       |  2 +-
 dlls/oledb32/convert.c        |  2 +-
 dlls/oledb32/datainit.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/win32u/font.c            |  6 +++---
 dlls/win32u/painting.c        |  6 +++---
 dlls/win32u/wrappers.c        |  2 +-
 dlls/windowscodecs/ungif.c    |  3 +--
 include/basetsd.h             | 32 ++++++++++++++++++++++----------
 include/ntgdi.h               |  2 +-
 47 files changed, 176 insertions(+), 155 deletions(-)




More information about the wine-devel mailing list